Skip to content

Commit

Permalink
Reverted commit D3518381
Browse files Browse the repository at this point in the history
Reviewed By: gabelevi

Differential Revision: D3518381

fbshipit-source-id: 645c25191d5e7cff7689bd4dc583c478eba46496
  • Loading branch information
IanChilds authored and Facebook Github Bot 9 committed Jul 6, 2016
1 parent 21e997a commit 0fde81c
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 37 deletions.
14 changes: 3 additions & 11 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
# Ignore malformed json
.*/node_modules/y18n/test/.*\.json

# Ignore unexpected extra @providesModule
.*/node_modules/commoner/test/source/widget/share.js

# Ignore duplicate module providers
<PROJECT_ROOT>/Libraries/react-native/React.js
<PROJECT_ROOT>/Libraries/react-native/ReactNative.js
<PROJECT_ROOT>/node_modules/jest-runtime/build/__tests__/.*

[include]

[libs]
Expand All @@ -40,9 +32,9 @@ suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-8]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-8]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-7]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-7]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

[version]
^0.28.0
^0.27.0
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class ExampleScene extends Component {
const width = layout.initWidth;
const translateX = position.interpolate({
inputRange,
outputRange: ([width, 0, -10]: Array<number>),
outputRange: [width, 0, -10],
});

return {
Expand Down
9 changes: 1 addition & 8 deletions Examples/UIExplorer/WebSocketExample.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
/**
* Copyright (c) 2013-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* The examples provided by Facebook are for non-commercial testing and
* evaluation purposes only.
*
Expand Down Expand Up @@ -88,7 +81,7 @@ function showValue(value) {
if (typeof ArrayBuffer !== 'undefined' &&
typeof Uint8Array !== 'undefined' &&
value instanceof ArrayBuffer) {
return `ArrayBuffer {${String(Array.from(new Uint8Array(value)))}}`;
return `ArrayBuffer {${Array.from(new Uint8Array(value))}}`;
}
return value;
}
Expand Down
1 change: 0 additions & 1 deletion Libraries/BugReporting/dumpReactTree.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ function convertObject(object: Object, depth: number) {
if (!first) {
output += ', ';
}
// $FlowFixMe(>=0.28.0)
output += `${key}: ${convertValue(object[key], depth + 1)}`;
first = false;
}
Expand Down
1 change: 0 additions & 1 deletion Libraries/CameraRoll/CameraRoll.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ class CameraRoll {

invariant(
type === 'photo' || type === 'video' || type === undefined,
// $FlowFixMe(>=0.28.0)
`The second argument to saveToCameraRoll must be 'photo' or 'video'. You passed ${type}`
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,18 @@ function forHorizontal(props: NavigationSceneRendererProps): Object {

const opacity = position.interpolate({
inputRange,
outputRange: ([1, 1, 0.3]: Array<number>),
outputRange: [1, 1, 0.3],
});

const scale = position.interpolate({
inputRange,
outputRange: ([1, 1, 0.95]: Array<number>),
outputRange: [1, 1, 0.95],
});

const translateY = 0;
const translateX = position.interpolate({
inputRange,
outputRange: ([width, 0, -10]: Array<number>),
outputRange: [width, 0, -10],
});

return {
Expand Down Expand Up @@ -131,18 +131,18 @@ function forVertical(props: NavigationSceneRendererProps): Object {

const opacity = position.interpolate({
inputRange,
outputRange: ([1, 1, 0.3]: Array<number>),
outputRange: [1, 1, 0.3],
});

const scale = position.interpolate({
inputRange,
outputRange: ([1, 1, 0.95]: Array<number>),
outputRange: [1, 1, 0.95],
});

const translateX = 0;
const translateY = position.interpolate({
inputRange,
outputRange: ([height, 0, -10]: Array<number>),
outputRange: [height, 0, -10],
});

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function forLeft(props: NavigationSceneRendererProps): Object {
return {
opacity: position.interpolate({
inputRange: [ index - 1, index, index + 1 ],
outputRange: ([ 0, 1, 0 ]: Array<number>),
outputRange: [ 0, 1, 0 ],
}),
};
}
Expand All @@ -65,13 +65,13 @@ function forCenter(props: NavigationSceneRendererProps): Object {
return {
opacity:position.interpolate({
inputRange: [ index - 1, index, index + 1 ],
outputRange: ([ 0, 1, 0 ]: Array<number>),
outputRange: [ 0, 1, 0 ],
}),
transform: [
{
translateX: position.interpolate({
inputRange: [ index - 1, index + 1 ],
outputRange: ([ 200, -200 ]: Array<number>),
outputRange: [ 200, -200 ],
}),
}
],
Expand All @@ -84,7 +84,7 @@ function forRight(props: NavigationSceneRendererProps): Object {
return {
opacity: position.interpolate({
inputRange: [ index - 1, index, index + 1 ],
outputRange: ([ 0, 1, 0 ]: Array<number>),
outputRange: [ 0, 1, 0 ],
}),
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function forHorizontal(props: NavigationSceneRendererProps): Object {
const width = layout.initWidth;
const translateX = position.interpolate({
inputRange,
outputRange: ([width, 0, -width]: Array<number>),
outputRange: [width, 0, -width],
});

return {
Expand Down
2 changes: 0 additions & 2 deletions Libraries/Experimental/WindowedListView.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,6 @@ class CellRenderer extends React.Component {
if (this.props.asyncRowPerfEventName) {
this._perfUpdateID = g_perf_update_id++;
this._asyncCookie = Systrace.beginAsyncEvent(this.props.asyncRowPerfEventName + this._perfUpdateID);
// $FlowFixMe(>=0.28.0)
infoLog(`perf_asynctest_${this.props.asyncRowPerfEventName}_start ${this._perfUpdateID} ${Date.now()}`);
}
if (this.props.includeInLayout) {
Expand Down Expand Up @@ -663,7 +662,6 @@ class CellRenderer extends React.Component {
// Note this doesn't include the native render time but is more accurate than also including the JS render
// time of anything that has been queued up.
Systrace.endAsyncEvent(this.props.asyncRowPerfEventName + this._perfUpdateID, this._asyncCookie);
// $FlowFixMe(>=0.28.0)
infoLog(`perf_asynctest_${this.props.asyncRowPerfEventName}_end ${this._perfUpdateID} ${Date.now()}`);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/StyleSheet/StyleSheetTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
'use strict';

type Atom = number | bool | Object | Array<?Atom>;
export type StyleObj = Atom;
export type StyleObj = Atom | Array<?StyleObj>;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
"eslint-plugin-babel": "^3.2.0",
"eslint-plugin-flow-vars": "^0.2.1",
"eslint-plugin-react": "^4.2.1",
"flow-bin": "^0.28.0",
"flow-bin": "^0.27.0",
"jest": "^13.1.0",
"jest-repl": "^13.1.0",
"jest-runtime": "^13.1.0",
Expand Down

0 comments on commit 0fde81c

Please sign in to comment.