{"files":[{"status":"M","path":"packages\/react-native-renderer\/src\/NativeMethodsMixin.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactFabricHostConfig.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeAttributePayload.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeComponent.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeHostConfig.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactNativeTypes.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/__mocks__\/ReactNativeViewConfigRegistry.js"},{"status":"M","path":"packages\/shared\/ReactFeatureFlags.js"},{"status":"M","path":"scripts\/rollup\/shims\/react-native\/createReactNativeComponentClass.js"}],"patch":"diff --git a\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js b\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js\nindex 5c38b29656..ae1c2e9e4b 100644\n--- a\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js\n+++ b\/packages\/react-native-renderer\/src\/NativeMethodsMixin.js\n@@ -142,7 +142,7 @@ export default function(\n return;\n }\n \n- const viewConfig: ReactNativeBaseComponentViewConfig =\n+ const viewConfig: ReactNativeBaseComponentViewConfig<> =\n maybeInstance.viewConfig;\n \n if (__DEV__) {\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\nindex 559f63d3de..83a266c112 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n@@ -82,12 +82,12 @@ if (registerEventHandler) {\n *\/\n class ReactFabricHostComponent {\n _nativeTag: number;\n- viewConfig: ReactNativeBaseComponentViewConfig;\n+ viewConfig: ReactNativeBaseComponentViewConfig<>;\n currentProps: Props;\n \n constructor(\n tag: number,\n- viewConfig: ReactNativeBaseComponentViewConfig,\n+ viewConfig: ReactNativeBaseComponentViewConfig<>,\n props: Props,\n ) {\n this._nativeTag = tag;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeAttributePayload.js b\/packages\/react-native-renderer\/src\/ReactNativeAttributePayload.js\nindex d1087d47ff..d0f6ad9faa 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeAttributePayload.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeAttributePayload.js\n@@ -11,6 +11,8 @@\n import deepDiffer from 'deepDiffer';\n import flattenStyle from 'flattenStyle';\n \n+import type {AttributeConfiguration} from '.\/ReactNativeTypes';\n+\n const emptyObject = {};\n \n \/**\n@@ -22,20 +24,6 @@ const emptyObject = {};\n * across modules, I've kept them isolated to this module.\n *\/\n \n-type AttributeDiffer = (prevProp: mixed, nextProp: mixed) => boolean;\n-type AttributePreprocessor = (nextProp: mixed) => mixed;\n-\n-type CustomAttributeConfiguration =\n- | {diff: AttributeDiffer, process: AttributePreprocessor}\n- | {diff: AttributeDiffer}\n- | {process: AttributePreprocessor};\n-\n-type AttributeConfiguration = {\n- [key: string]:\n- | CustomAttributeConfiguration\n- | AttributeConfiguration \/*| boolean*\/,\n-};\n-\n type NestedNode = Array | Object;\n \n \/\/ Tracks removed keys\n@@ -55,7 +43,7 @@ function defaultDiffer(prevProp: mixed, nextProp: mixed): boolean {\n function restoreDeletedValuesInNestedArray(\n updatePayload: Object,\n node: NestedNode,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ) {\n if (Array.isArray(node)) {\n let i = node.length;\n@@ -113,7 +101,7 @@ function diffNestedArrayProperty(\n updatePayload: null | Object,\n prevArray: Array,\n nextArray: Array,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n const minLength =\n prevArray.length < nextArray.length ? prevArray.length : nextArray.length;\n@@ -151,7 +139,7 @@ function diffNestedProperty(\n updatePayload: null | Object,\n prevProp: NestedNode,\n nextProp: NestedNode,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n if (!updatePayload && prevProp === nextProp) {\n \/\/ If no properties have been added, then we can bail out quickly on object\n@@ -212,7 +200,7 @@ function diffNestedProperty(\n function addNestedProperty(\n updatePayload: null | Object,\n nextProp: NestedNode,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ) {\n if (!nextProp) {\n return updatePayload;\n@@ -242,7 +230,7 @@ function addNestedProperty(\n function clearNestedProperty(\n updatePayload: null | Object,\n prevProp: NestedNode,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n if (!prevProp) {\n return updatePayload;\n@@ -274,9 +262,9 @@ function diffProperties(\n updatePayload: null | Object,\n prevProps: Object,\n nextProps: Object,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n- let attributeConfig: ?(CustomAttributeConfiguration | AttributeConfiguration);\n+ let attributeConfig;\n let nextProp;\n let prevProp;\n \n@@ -375,13 +363,13 @@ function diffProperties(\n updatePayload,\n prevProp,\n nextProp,\n- ((attributeConfig: any): AttributeConfiguration),\n+ ((attributeConfig: any): AttributeConfiguration<>),\n );\n if (removedKeyCount > 0 && updatePayload) {\n restoreDeletedValuesInNestedArray(\n updatePayload,\n nextProp,\n- ((attributeConfig: any): AttributeConfiguration),\n+ ((attributeConfig: any): AttributeConfiguration<>),\n );\n removedKeys = null;\n }\n@@ -432,7 +420,7 @@ function diffProperties(\n updatePayload = clearNestedProperty(\n updatePayload,\n prevProp,\n- ((attributeConfig: any): AttributeConfiguration),\n+ ((attributeConfig: any): AttributeConfiguration<>),\n );\n }\n }\n@@ -445,7 +433,7 @@ function diffProperties(\n function addProperties(\n updatePayload: null | Object,\n props: Object,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n \/\/ TODO: Fast path\n return diffProperties(updatePayload, emptyObject, props, validAttributes);\n@@ -458,7 +446,7 @@ function addProperties(\n function clearProperties(\n updatePayload: null | Object,\n prevProps: Object,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n \/\/ TODO: Fast path\n return diffProperties(updatePayload, prevProps, emptyObject, validAttributes);\n@@ -466,7 +454,7 @@ function clearProperties(\n \n export function create(\n props: Object,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n return addProperties(\n null, \/\/ updatePayload\n@@ -478,7 +466,7 @@ export function create(\n export function diff(\n prevProps: Object,\n nextProps: Object,\n- validAttributes: AttributeConfiguration,\n+ validAttributes: AttributeConfiguration<>,\n ): null | Object {\n return diffProperties(\n null, \/\/ updatePayload\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeComponent.js b\/packages\/react-native-renderer\/src\/ReactNativeComponent.js\nindex 2b38cc89d6..ecf859973f 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeComponent.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeComponent.js\n@@ -153,7 +153,7 @@ export default function(\n return;\n }\n \n- const viewConfig: ReactNativeBaseComponentViewConfig =\n+ const viewConfig: ReactNativeBaseComponentViewConfig<> =\n maybeInstance.viewConfig || maybeInstance.canonical.viewConfig;\n \n const updatePayload = ReactNativeAttributePayload.create(\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js b\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js\nindex 3d5bf5bbc9..1508b88f1c 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeFiberHostComponent.js\n@@ -33,9 +33,9 @@ import {mountSafeCallback, warnForStyleProps} from '.\/NativeMethodsMixinUtils';\n class ReactNativeFiberHostComponent {\n _children: Array;\n _nativeTag: number;\n- viewConfig: ReactNativeBaseComponentViewConfig;\n+ viewConfig: ReactNativeBaseComponentViewConfig<>;\n \n- constructor(tag: number, viewConfig: ReactNativeBaseComponentViewConfig) {\n+ constructor(tag: number, viewConfig: ReactNativeBaseComponentViewConfig<>) {\n this._nativeTag = tag;\n this._children = [];\n this.viewConfig = viewConfig;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\nindex 7a8f3d14de..cec694bb7a 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeHostConfig.js\n@@ -31,7 +31,7 @@ export type Container = number;\n export type Instance = {\n _children: Array,\n _nativeTag: number,\n- viewConfig: ReactNativeBaseComponentViewConfig,\n+ viewConfig: ReactNativeBaseComponentViewConfig<>,\n };\n export type TextInstance = number;\n export type HydratableInstance = Instance | TextInstance;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactNativeTypes.js b\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\nindex 991aa338e7..6c3618cb06 100644\n--- a\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\n+++ b\/packages\/react-native-renderer\/src\/ReactNativeTypes.js\n@@ -33,26 +33,52 @@ export type MeasureLayoutOnSuccessCallback = (\n height: number,\n ) => void;\n \n-type BubblingEventType = {\n- phasedRegistrationNames: {\n- captured: string,\n- bubbled: string,\n- },\n-};\n-\n-type DirectEventType = {\n- registrationName: string,\n-};\n-\n-export type ReactNativeBaseComponentViewConfig = {\n- validAttributes: Object,\n+type AttributeType =\n+ | true\n+ | $ReadOnly<{|\n+ diff: ?(arg1: T, arg2: T) => boolean,\n+ process: ?(arg1: any) => any,\n+ |}>;\n+\n+export type AttributeConfiguration<\n+ TProps = string,\n+ TStyleProps = string,\n+> = $ReadOnly<{\n+ [propName: TProps]: AttributeType,\n+ style: $ReadOnly<{\n+ [propName: TStyleProps]: AttributeType,\n+ }>,\n+}>;\n+\n+export type ReactNativeBaseComponentViewConfig<\n+ TProps = string,\n+ TStyleProps = string,\n+> = $ReadOnly<{|\n+ baseModuleName?: string,\n+ bubblingEventTypes?: $ReadOnly<{\n+ [eventName: string]: $ReadOnly<{|\n+ phasedRegistrationNames: $ReadOnly<{|\n+ captured: string,\n+ bubbled: string,\n+ |}>,\n+ |}>,\n+ }>,\n+ Commands?: $ReadOnly<{\n+ [commandName: string]: number,\n+ }>,\n+ directEventTypes?: $ReadOnly<{\n+ [eventName: string]: $ReadOnly<{|\n+ registrationName: string,\n+ |}>,\n+ }>,\n+ NativeProps?: $ReadOnly<{\n+ [propName: string]: string,\n+ }>,\n uiViewClassName: string,\n- bubblingEventTypes?: {[topLevelType: string]: BubblingEventType},\n- directEventTypes?: {[topLevelType: string]: DirectEventType},\n- propTypes?: Object,\n-};\n+ validAttributes: AttributeConfiguration,\n+|}>;\n \n-export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig;\n+export type ViewConfigGetter = () => ReactNativeBaseComponentViewConfig<>;\n \n \/**\n * Class only exists for its Flow type.\ndiff --git a\/packages\/react-native-renderer\/src\/__mocks__\/ReactNativeViewConfigRegistry.js b\/packages\/react-native-renderer\/src\/__mocks__\/ReactNativeViewConfigRegistry.js\nindex 044bf4a34e..a0f66bddc2 100644\n--- a\/packages\/react-native-renderer\/src\/__mocks__\/ReactNativeViewConfigRegistry.js\n+++ b\/packages\/react-native-renderer\/src\/__mocks__\/ReactNativeViewConfigRegistry.js\n@@ -4,8 +4,9 @@\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n *\n- * @flow\n+ * @flow strict-local\n *\/\n+\n 'use strict';\n \n import type {\n@@ -28,7 +29,7 @@ const viewConfigCallbacks = new Map();\n const viewConfigs = new Map();\n \n function processEventTypes(\n- viewConfig: ReactNativeBaseComponentViewConfig,\n+ viewConfig: ReactNativeBaseComponentViewConfig<>,\n ): void {\n const {bubblingEventTypes, directEventTypes} = viewConfig;\n \n@@ -84,7 +85,7 @@ exports.register = function(name: string, callback: ViewConfigGetter): string {\n * If this is the first time the view has been used,\n * This configuration will be lazy-loaded from UIManager.\n *\/\n-exports.get = function(name: string): ReactNativeBaseComponentViewConfig {\n+exports.get = function(name: string): ReactNativeBaseComponentViewConfig<> {\n let viewConfig;\n if (!viewConfigs.has(name)) {\n const callback = viewConfigCallbacks.get(name);\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 7478a9c874..aa9fc017fc 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -4,7 +4,7 @@\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n *\n- * @flow\n+ * @flow strict\n *\/\n \n import invariant from 'shared\/invariant';\ndiff --git a\/scripts\/rollup\/shims\/react-native\/createReactNativeComponentClass.js b\/scripts\/rollup\/shims\/react-native\/createReactNativeComponentClass.js\nindex 4ea7d28183..33e708b7c3 100644\n--- a\/scripts\/rollup\/shims\/react-native\/createReactNativeComponentClass.js\n+++ b\/scripts\/rollup\/shims\/react-native\/createReactNativeComponentClass.js\n@@ -5,7 +5,7 @@\n * LICENSE file in the root directory of this source tree.\n *\n * @format\n- * @flow\n+ * @flow strict-local\n *\/\n \n 'use strict';\n","body":"","commit":{"subject":"Sync React Native Flow Changes (#13513)","revision":"d2123d65699d4d8e36537e2eb3a2299e7558eefa","authoredAt":"2018-08-29T13:54:58-07:00","shortRevision":"d2123d6569","authorEmail":"yungsters@gmail.com","authorName":"Timothy Yung"},"parents":["1c0ba70b4b753178d1bb9d9d8e32b90c50ec7e2c"]}

dillon1000/react

Files changed