diff --git a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js index bfd180823..9d1b63567 100644 --- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js +++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js @@ -18,11 +18,11 @@ const ViewPropTypes = require('ViewPropTypes'); const requireNativeComponent = require('requireNativeComponent'); -import type {StyleObj} from 'StyleSheetTypes'; +import type {DangerouslyImpreciseStyleProp} from 'StyleSheet'; import type {ViewProps} from 'ViewPropTypes'; class TabBarIOS extends React.Component, - style?: StyleObj, + style?: DangerouslyImpreciseStyleProp, source?: { fileName?: string, lineNumber?: number, diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js index e5b4a8310..13b87ed99 100644 --- a/Libraries/Lists/FlatList.js +++ b/Libraries/Lists/FlatList.js @@ -18,7 +18,7 @@ const ListView = require('ListView'); const invariant = require('fbjs/lib/invariant'); -import type {StyleObj} from 'StyleSheetTypes'; +import type {DangerouslyImpreciseStyleProp} from 'StyleSheet'; import type { ViewabilityConfig, ViewToken, @@ -96,7 +96,7 @@ type OptionalProps = { /** * Optional custom style for multi-item rows generated when numColumns > 1. */ - columnWrapperStyle?: StyleObj, + columnWrapperStyle?: DangerouslyImpreciseStyleProp, /** * A marker property for telling the list to re-render (since it implements `PureComponent`). If * any of your `renderItem`, Header, Footer, etc. functions depend on anything outside of the diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js index e6acee9e7..90e978cf8 100644 --- a/Libraries/Lists/VirtualizedList.js +++ b/Libraries/Lists/VirtualizedList.js @@ -32,7 +32,7 @@ const warning = require('fbjs/lib/warning'); const {computeWindowedRenderLimits} = require('VirtualizeUtils'); -import type {StyleObj} from 'StyleSheetTypes'; +import type {DangerouslyImpreciseStyleProp} from 'StyleSheet'; import type { ViewabilityConfig, ViewToken, @@ -644,7 +644,7 @@ class VirtualizedList extends React.PureComponent { stickyIndicesFromProps: Set, first: number, last: number, - inversionStyle: ?StyleObj, + inversionStyle: ?DangerouslyImpreciseStyleProp, ) { const { CellRendererComponent, @@ -1545,7 +1545,7 @@ class CellRenderer extends React.Component< fillRateHelper: FillRateHelper, horizontal: ?boolean, index: number, - inversionStyle: ?StyleObj, + inversionStyle: ?DangerouslyImpreciseStyleProp, item: Item, onLayout: (event: Object) => void, // This is extracted by ScrollViewStickyHeader onUnmount: (cellKey: string) => void, diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js index 00a69d202..7f5888d8f 100644 --- a/Libraries/StyleSheet/StyleSheet.js +++ b/Libraries/StyleSheet/StyleSheet.js @@ -19,11 +19,11 @@ const flatten = require('flattenStyle'); import type { StyleSheetStyle as _StyleSheetStyle, Styles as _Styles, - StyleObj, + ____StyleObj_Internal, LayoutStyle } from 'StyleSheetTypes'; -export type DangerouslyImpreciseStyleProp = StyleObj; +export type DangerouslyImpreciseStyleProp = ____StyleObj_Internal; export type Styles = _Styles; export type StyleSheetStyle = _StyleSheetStyle; type StyleSheet<+S: Styles> = $ObjMap StyleSheetStyle>; diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js index c51787c61..c8df91073 100644 --- a/Libraries/StyleSheet/StyleSheetTypes.js +++ b/Libraries/StyleSheet/StyleSheetTypes.js @@ -230,7 +230,7 @@ type GenericStyleProp<+T> = | '' | $ReadOnlyArray>; -export type StyleObj = GenericStyleProp<$Shape