[change] Update flow-bin to 0.95.1

Fix related type errors

Close #1269

Co-authored-by: Nicolas Gallagher <nicolasgallagher@gmail.com>

.flowconfig

@@ -1,5 +1,5 @@
 [version]
-^0.63.0
+^0.95.1
 
 [ignore]
 <PROJECT_ROOT>/.*/__tests__/.*
@@ -14,4 +14,3 @@
 <PROJECT_ROOT>/types
 
 [options]
-

package.json

@@ -47,7 +47,7 @@
     "eslint-config-prettier": "^3.3.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-react": "^7.7.0",
-    "flow-bin": "^0.63.1",
+    "flow-bin": "^0.95.1",
     "glob": "^7.1.2",
     "husky": "^0.14.3",
     "inline-style-prefixer": "^5.0.3",

packages/react-native-web/src/exports/Picker/index.js

@@ -15,8 +15,7 @@ import PickerItem from './PickerItem';
 import PickerItemPropType from './PickerItemPropType';
 import PickerStylePropTypes from './PickerStylePropTypes';
 import StyleSheetPropType from '../../modules/StyleSheetPropType';
-import StyleSheet from '../StyleSheet';
-import TextPropTypes from '../Text/TextPropTypes';
+import StyleSheet, { type StyleObj } from '../StyleSheet';
 import { arrayOf, bool, func, number, oneOfType, string } from 'prop-types';
 import ViewPropTypes, { type ViewProps } from '../ViewPropTypes';
 
@@ -27,10 +26,10 @@ type Props = ViewProps & {
   enabled?: boolean,
   onValueChange?: Function,
   selectedValue?: number | string,
-  style?: pickerStyleType,
+  style?: StyleObj,
   testID?: string,
   /* compat */
-  itemStyle?: TextPropTypes.style,
+  itemStyle?: StyleObj,
   mode?: string,
   prompt?: string
 };

packages/react-native-web/src/exports/StyleSheet/StyleSheetTypes.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Nicolas Gallagher.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+type Atom = number | boolean | Object | Array<?Atom>;
+export type StyleObj = Atom;

packages/react-native-web/src/exports/StyleSheet/compile.js

@@ -110,7 +110,9 @@ export function inline(style: Style) {
 export function stringifyValueWithProperty(value: Value, property: ?string) {
   // e.g., 0 => '0px', 'black' => 'rgba(0,0,0,1)'
   const normalizedValue = normalizeValueWithProperty(value, property);
-  return typeof normalizedValue !== 'string' ? JSON.stringify(normalizedValue) : normalizedValue;
+  return typeof normalizedValue !== 'string'
+    ? JSON.stringify(normalizedValue || '')
+    : normalizedValue;
 }
 
 /**

packages/react-native-web/src/exports/StyleSheet/createCompileableStyle.js

@@ -29,7 +29,11 @@ function textShadowReducer(resolvedStyle, style) {
   const blurRadius = normalizeValueWithProperty(radius);
   const color = normalizeValueWithProperty(textShadowColor, 'textShadowColor');
 
-  if (color && (height !== 0 || width !== 0 || radius !== 0)) {
+  if (
+    color &&
+    (height !== 0 || width !== 0 || radius !== 0) &&
+    (offsetX != null && offsetY != null && blurRadius != null)
+  ) {
     resolvedStyle.textShadow = `${offsetX} ${offsetY} ${blurRadius} ${color}`;
   }
 }

packages/react-native-web/src/exports/StyleSheet/flattenStyle.js

@@ -10,9 +10,7 @@
 
 import ReactNativePropRegistry from '../../modules/ReactNativePropRegistry';
 import invariant from 'fbjs/lib/invariant';
-
-type Atom = number | boolean | Object | Array<?Atom>;
-type StyleObj = Atom;
+import type { StyleObj } from './StyleSheetTypes';
 
 function getStyle(style) {
   if (typeof style === 'number') {
@@ -31,7 +29,6 @@ function flattenStyle(style: ?StyleObj): ?Object {
   }
 
   if (!Array.isArray(style)) {
-    // $FlowFixMe
     return getStyle(style);
   }
 

packages/react-native-web/src/exports/StyleSheet/normalizeValueWithProperty.js

@@ -24,10 +24,11 @@ const colorProps = {
 };
 
 export default function normalizeValueWithProperty(value: any, property?: ?string) {
+  let returnValue = value;
   if ((property == null || !unitlessNumbers[property]) && typeof value === 'number') {
-    value = `${value}px`;
+    returnValue = `${value}px`;
   } else if (property != null && colorProps[property]) {
-    value = normalizeColor(value);
+    returnValue = normalizeColor(value);
   }
-  return value;
+  return returnValue;
 }

packages/react-native-web/src/exports/StyleSheet/resolveShadowValue.js

@@ -19,7 +19,7 @@ const resolveShadowValue = (style: Object) => {
   const offsetY = normalizeValueWithProperty(height);
   const blurRadius = normalizeValueWithProperty(shadowRadius || 0);
   const color = normalizeColor(shadowColor || 'black', shadowOpacity);
-  if (color) {
+  if (color != null && offsetX != null && offsetY != null && blurRadius != null) {
     return `${offsetX} ${offsetY} ${blurRadius} ${color}`;
   }
 };

packages/react-native-web/src/exports/StyleSheet/validate.js

@@ -67,15 +67,13 @@ export default function validate(key: string, styles: Object) {
   for (const k in obj) {
     const prop = k.trim();
     const value = obj[prop];
-    const isValidProp = validProperties[prop];
-    const isInvalidShorthand = invalidShortforms[prop];
     let isInvalid = false;
 
     if (value === null) {
       continue;
     }
 
-    if (!isValidProp) {
+    if (validProperties[prop] == null) {
       let suggestion = '';
       if (prop === 'animation' || prop === 'animationName') {
         suggestion = 'Did you mean "animationKeyframes"?';
@@ -85,7 +83,7 @@ export default function validate(key: string, styles: Object) {
         suggestion = 'Did you mean "writingDirection"?';
       } else if (prop === 'verticalAlign') {
         suggestion = 'Did you mean "textAlignVertical"?';
-      } else if (isInvalidShorthand) {
+      } else if (invalidShortforms[prop]) {
         suggestion = 'Please use long-form properties.';
       }
       isInvalid = true;

packages/react-native-web/src/exports/View/ViewPropTypes.js

@@ -12,6 +12,7 @@ import EdgeInsetsPropType, { type EdgeInsetsProp } from '../EdgeInsetsPropType';
 import StyleSheetPropType from '../../modules/StyleSheetPropType';
 import ViewStylePropTypes from './ViewStylePropTypes';
 import { any, array, arrayOf, bool, func, object, oneOf, oneOfType, string } from 'prop-types';
+import { type StyleObj } from '../StyleSheet/StyleSheetTypes';
 
 const stylePropType = StyleSheetPropType(ViewStylePropTypes);
 
@@ -65,7 +66,7 @@ export type ViewProps = {
   onTouchStart?: Function,
   onTouchStartCapture?: Function,
   pointerEvents?: 'box-none' | 'none' | 'box-only' | 'auto',
-  style?: stylePropType,
+  style?: StyleObj,
   testID?: string,
   // web extensions
   onContextMenu?: Function,

packages/react-native-web/src/vendor/react-native/Animated/nodes/AnimatedInterpolation.js

@@ -346,7 +346,7 @@ class AnimatedInterpolation extends AnimatedWithChildren {
     super.__detach();
   }
 
-  __transformDataType(range: Array<any>) {
+  __transformDataType(range: Array<string>): Array<number> {
     // Change the string array type to number array
     // So we can reuse the same logic in iOS and Android platform
     return range.map(function(value) {

packages/react-native-web/src/vendor/react-native/Animated/nodes/AnimatedNode.js

@@ -16,6 +16,8 @@ import invariant from 'fbjs/lib/invariant';
 // Note(vjeux): this would be better as an interface but flow doesn't
 // support them yet
 class AnimatedNode {
+  +update: () => void
+  
   __attach(): void {}
   __detach(): void {
     if (this.__isNative && this.__nativeTag != null) {

packages/react-native-web/src/vendor/react-native/Animated/nodes/AnimatedValue.js

@@ -57,7 +57,6 @@ function _flush(rootNode: AnimatedValue): void {
     }
   }
   findAnimatedStyles(rootNode);
-  /* $FlowFixMe */
   animatedStyles.forEach(animatedStyle => animatedStyle.update());
 }
 

yarn.lock

@@ -4797,9 +4797,10 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
-flow-bin@^0.63.1:
-  version "0.63.1"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.63.1.tgz#ab00067c197169a5fb5b4996c8f6927b06694828"
+flow-bin@^0.95.1:
+  version "0.95.1"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.95.1.tgz#633113831ccff4b7ee70a2730f63fc43b69ba85f"
+  integrity sha512-06IOC/pqPMNRYtC6AMZEWYR9Fi6UdBC7gImGinPuNUpPZFnP5E9/0cBCl3DWrH4zz/gSM2HdDilU7vPGpYIr2w==
 
 flush-write-stream@^1.0.0:
   version "1.0.3"