diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js index 80f4b209c0de09..d607d74eb36cf7 100644 --- a/Libraries/StyleSheet/StyleSheet.js +++ b/Libraries/StyleSheet/StyleSheet.js @@ -17,7 +17,7 @@ const StyleSheetValidation = require('StyleSheetValidation'); const flatten = require('flattenStyle'); import type { - StyleSheetStyle as _StyleSheetStyle, + ____StyleSheetInternalStyleIdentifier_Internal as StyleSheetInternalStyleIdentifier, Styles as _Styles, ____StyleObj_Internal, ____ViewStyleProp_Internal, @@ -32,8 +32,6 @@ export type TextStyleProp = ____TextStyleProp_Internal; export type ImageStyleProp = ____ImageStyleProp_Internal; export type Styles = _Styles; -export type StyleSheetStyle = _StyleSheetStyle; -type StyleSheet<+S: Styles> = $ObjMap StyleSheetStyle>; let hairlineWidth = PixelRatio.roundToNearestPixel(0.4); if (hairlineWidth === 0) { @@ -47,7 +45,7 @@ const absoluteFillObject: LayoutStyle = { top: 0, bottom: 0, }; -const absoluteFill: StyleSheetStyle = +const absoluteFill: StyleSheetInternalStyleIdentifier = ReactNativePropRegistry.register(absoluteFillObject); // This also freezes it /** @@ -223,7 +221,7 @@ module.exports = { /** * Creates a StyleSheet style reference from the given object. */ - create(obj: S): StyleSheet { + create<+S: Styles>(obj: S): $ObjMap StyleSheetInternalStyleIdentifier> { const result = {}; for (const key in obj) { StyleSheetValidation.validateStyle(key, obj); diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js index eeef8bc6680af9..4aeaf0623a059e 100644 --- a/Libraries/StyleSheet/StyleSheetTypes.js +++ b/Libraries/StyleSheet/StyleSheetTypes.js @@ -13,7 +13,7 @@ import AnimatedNode from 'AnimatedNode'; -export opaque type StyleSheetStyle: number = number; +export opaque type ____StyleSheetInternalStyleIdentifier_Internal: number = number; export type ColorValue = null | string; export type DimensionValue = null | number | string | AnimatedNode; @@ -224,7 +224,7 @@ type GenericStyleProp<+T> = | null | void | T - | StyleSheetStyle + | ____StyleSheetInternalStyleIdentifier_Internal | number | false | ''