From 4895c645ea17ff939811f3d5ec6218cd4e31c5fb Mon Sep 17 00:00:00 2001 From: Eli White Date: Thu, 8 Mar 2018 00:35:58 -0800 Subject: [PATCH] Rename Style to DangerouslyImpreciseStyle Reviewed By: yungsters Differential Revision: D7190268 fbshipit-source-id: d652a95be7550d65cfbfc59f41d7bda92915bacf --- Libraries/StyleSheet/StyleSheet.js | 4 ++-- Libraries/StyleSheet/StyleSheetTypes.js | 12 ++++++++---- Libraries/StyleSheet/flattenStyle.js | 7 +++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js index e7af29e2c..3320c459b 100644 --- a/Libraries/StyleSheet/StyleSheet.js +++ b/Libraries/StyleSheet/StyleSheet.js @@ -20,14 +20,14 @@ const flatten = require('flattenStyle'); import type { ____StyleSheetInternalStyleIdentifier_Internal as StyleSheetInternalStyleIdentifier, ____Styles_Internal, - ____StyleObj_Internal, + ____DangerouslyImpreciseStyleProp_Internal, ____ViewStyleProp_Internal, ____TextStyleProp_Internal, ____ImageStyleProp_Internal, LayoutStyle, } from 'StyleSheetTypes'; -export type DangerouslyImpreciseStyleProp = ____StyleObj_Internal; +export type DangerouslyImpreciseStyleProp = ____DangerouslyImpreciseStyleProp_Internal; export type ViewStyleProp = ____ViewStyleProp_Internal; export type TextStyleProp = ____TextStyleProp_Internal; export type ImageStyleProp = ____ImageStyleProp_Internal; diff --git a/Libraries/StyleSheet/StyleSheetTypes.js b/Libraries/StyleSheet/StyleSheetTypes.js index 72db60b2c..b9c3c59fd 100644 --- a/Libraries/StyleSheet/StyleSheetTypes.js +++ b/Libraries/StyleSheet/StyleSheetTypes.js @@ -213,7 +213,7 @@ export type ImageStyle = $ReadOnly<{| overlayColor?: string, |}>; -export type Style = { +export type DangerouslyImpreciseStyle = { ...$Exact, +resizeMode?: 'contain' | 'cover' | 'stretch' | 'center' | 'repeat', +tintColor?: ColorValue, @@ -230,7 +230,9 @@ type GenericStyleProp<+T> = | '' | $ReadOnlyArray>; -export type ____StyleObj_Internal = GenericStyleProp<$Shape