From 2e8c0bd7ea7db1aac183eb7f656772d3cffcb132 Mon Sep 17 00:00:00 2001 From: Tim Yung Date: Fri, 11 Jun 2021 23:51:00 -0700 Subject: [PATCH] RN: Delete `StyleSheetValidation` Summary: Deletes `StyleSheetValidation` because it is `prop-types` in disguise. Changelog: [General][Removed] - `StyleSheet.create` will no longer do DEV-time validation. Reviewed By: TheSavior Differential Revision: D29019310 fbshipit-source-id: bfe886d8dc09a1aa8dac4a73bfd62f481e3eb9e9 --- Libraries/StyleSheet/StyleSheet.js | 2 - Libraries/StyleSheet/StyleSheetValidation.js | 100 ------------------ .../StyleSheet/__tests__/flattenStyle-test.js | 6 -- 3 files changed, 108 deletions(-) delete mode 100644 Libraries/StyleSheet/StyleSheetValidation.js diff --git a/Libraries/StyleSheet/StyleSheet.js b/Libraries/StyleSheet/StyleSheet.js index c4de35ce721987..d582efe9179a1f 100644 --- a/Libraries/StyleSheet/StyleSheet.js +++ b/Libraries/StyleSheet/StyleSheet.js @@ -12,7 +12,6 @@ const PixelRatio = require('../Utilities/PixelRatio'); const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes'); -const StyleSheetValidation = require('./StyleSheetValidation'); const flatten = require('./flattenStyle'); @@ -363,7 +362,6 @@ module.exports = { // return value as a number (even though it was opaque). if (__DEV__) { for (const key in obj) { - StyleSheetValidation.validateStyle(key, obj); if (obj[key]) { Object.freeze(obj[key]); } diff --git a/Libraries/StyleSheet/StyleSheetValidation.js b/Libraries/StyleSheet/StyleSheetValidation.js deleted file mode 100644 index ba88ba1188bd4b..00000000000000 --- a/Libraries/StyleSheet/StyleSheetValidation.js +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - * @flow - */ - -'use strict'; - -const DeprecatedImageStylePropTypes = require('../DeprecatedPropTypes/DeprecatedImageStylePropTypes'); -const DeprecatedTextStylePropTypes = require('../DeprecatedPropTypes/DeprecatedTextStylePropTypes'); -const DeprecatedViewStylePropTypes = require('../DeprecatedPropTypes/DeprecatedViewStylePropTypes'); - -const invariant = require('invariant'); - -// Hardcoded because this is a legit case but we don't want to load it from -// a private API. We might likely want to unify style sheet creation with how it -// is done in the DOM so this might move into React. I know what I'm doing so -// plz don't fire me. -const ReactPropTypesSecret = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'; - -class StyleSheetValidation { - static validateStyleProp(prop: string, style: Object, caller: string) { - if (!__DEV__ || global.__RCTProfileIsProfiling) { - return; - } - if (allStylePropTypes[prop] === undefined) { - const message1 = '"' + prop + '" is not a valid style property.'; - const message2 = - '\nValid style props: ' + - JSON.stringify(Object.keys(allStylePropTypes).sort(), null, ' '); - styleError(message1, style, caller, message2); - } - const error = allStylePropTypes[prop]( - style, - prop, - caller, - 'prop', - null, - ReactPropTypesSecret, - ); - if (error) { - styleError(error.message, style, caller); - } - } - - static validateStyle(name: string, styles: Object) { - if (!__DEV__ || global.__RCTProfileIsProfiling) { - return; - } - if (!styles[name]) { - return; - } - const styleProps = Object.keys(styles[name]); - for (const prop of styleProps) { - StyleSheetValidation.validateStyleProp( - prop, - styles[name], - 'StyleSheet ' + name, - ); - } - } - - /* $FlowFixMe[signature-verification-failure] (>=0.85.0 site=react_native_fb) - * This comment suppresses an error found when Flow v0.85 was deployed. To - * see the error, delete this comment and run Flow. */ - static addValidStylePropTypes(stylePropTypes) { - if (!__DEV__ || global.__RCTProfileIsProfiling) { - return; - } - for (const key in stylePropTypes) { - allStylePropTypes[key] = stylePropTypes[key]; - } - } -} - -const styleError = function(message1, style, caller?, message2?) { - invariant( - false, - message1 + - '\n' + - (caller || '<>') + - ': ' + - JSON.stringify(style, null, ' ') + - (message2 || ''), - ); -}; - -const allStylePropTypes = {}; - -if (__DEV__ && !global.__RCTProfileIsProfiling) { - StyleSheetValidation.addValidStylePropTypes(DeprecatedImageStylePropTypes); - StyleSheetValidation.addValidStylePropTypes(DeprecatedTextStylePropTypes); - StyleSheetValidation.addValidStylePropTypes(DeprecatedViewStylePropTypes); -} - -module.exports = StyleSheetValidation; diff --git a/Libraries/StyleSheet/__tests__/flattenStyle-test.js b/Libraries/StyleSheet/__tests__/flattenStyle-test.js index 3051b5d77dcc10..8134743039954b 100644 --- a/Libraries/StyleSheet/__tests__/flattenStyle-test.js +++ b/Libraries/StyleSheet/__tests__/flattenStyle-test.js @@ -11,15 +11,9 @@ 'use strict'; const StyleSheet = require('../StyleSheet'); -const StyleSheetValidation = require('../StyleSheetValidation'); const flattenStyle = require('../flattenStyle'); function getFixture() { - StyleSheetValidation.addValidStylePropTypes({ - styleA: () => {}, - styleB: () => {}, - }); - return StyleSheet.create({ elementA: { styleA: 'moduleA/elementA/styleA',