From 31734540dc1b507982cae839536f757de964dcd5 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 2 Apr 2020 11:55:17 +0100 Subject: [PATCH] Remove a flag for style collision warning (#18462) --- packages/react-dom/src/shared/CSSPropertyOperations.js | 6 ------ packages/shared/ReactFeatureFlags.js | 4 ---- packages/shared/forks/ReactFeatureFlags.native-fb.js | 1 - packages/shared/forks/ReactFeatureFlags.native-oss.js | 1 - packages/shared/forks/ReactFeatureFlags.test-renderer.js | 1 - .../shared/forks/ReactFeatureFlags.test-renderer.www.js | 1 - packages/shared/forks/ReactFeatureFlags.testing.js | 1 - packages/shared/forks/ReactFeatureFlags.testing.www.js | 1 - packages/shared/forks/ReactFeatureFlags.www-dynamic.js | 1 - packages/shared/forks/ReactFeatureFlags.www.js | 1 - 10 files changed, 18 deletions(-) diff --git a/packages/react-dom/src/shared/CSSPropertyOperations.js b/packages/react-dom/src/shared/CSSPropertyOperations.js index f307510813..8aaa78fe68 100644 --- a/packages/react-dom/src/shared/CSSPropertyOperations.js +++ b/packages/react-dom/src/shared/CSSPropertyOperations.js @@ -11,8 +11,6 @@ import dangerousStyleValue from './dangerousStyleValue'; import hyphenateStyleName from './hyphenateStyleName'; import warnValidStyle from './warnValidStyle'; -import {warnAboutShorthandPropertyCollision} from 'shared/ReactFeatureFlags'; - /** * Operations for dealing with CSS properties. */ @@ -128,10 +126,6 @@ export function validateShorthandPropertyCollisionInDev( nextStyles, ) { if (__DEV__) { - if (!warnAboutShorthandPropertyCollision) { - return; - } - if (!nextStyles) { return; } diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index a48a91c924..be755e1893 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -40,10 +40,6 @@ export const enableSchedulerDebugging = false; // Disable javascript: URL strings in href for XSS protection. export const disableJavaScriptURLs = false; -// Warns when a combination of updates on a dom can cause a style declaration -// that clashes with a previous one https://github.com/facebook/react/pull/14181 -export const warnAboutShorthandPropertyCollision = true; - // Experimental React Flare event system and event components support. export const enableDeprecatedFlareAPI = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index e8b0359f90..e0fc5148e2 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -17,7 +17,6 @@ export const enableSchedulerTracing = __PROFILE__; export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableBlocksAPI = false; -export const warnAboutShorthandPropertyCollision = true; export const enableSchedulerDebugging = false; export const debugRenderPhaseSideEffectsForStrictMode = true; export const disableJavaScriptURLs = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 35607e03c9..1a26312ae4 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -21,7 +21,6 @@ export const enableSelectiveHydration = false; export const enableBlocksAPI = false; export const disableJavaScriptURLs = false; export const disableInputAttributeSyncing = false; -export const warnAboutShorthandPropertyCollision = true; export const enableSchedulerDebugging = false; export const enableDeprecatedFlareAPI = false; export const enableFundamentalAPI = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index fb45d03ea3..bd121f4c57 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -21,7 +21,6 @@ export const enableSelectiveHydration = false; export const enableBlocksAPI = false; export const disableJavaScriptURLs = false; export const disableInputAttributeSyncing = false; -export const warnAboutShorthandPropertyCollision = true; export const enableSchedulerDebugging = false; export const enableDeprecatedFlareAPI = false; export const enableFundamentalAPI = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index ac30263aea..19f400271d 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -19,7 +19,6 @@ export const enableSchedulerTracing = __PROFILE__; export const enableSuspenseServerRenderer = false; export const enableSelectiveHydration = false; export const enableBlocksAPI = false; -export const warnAboutShorthandPropertyCollision = true; export const enableSchedulerDebugging = false; export const disableJavaScriptURLs = false; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.testing.js b/packages/shared/forks/ReactFeatureFlags.testing.js index d955673e1c..9ad62d045e 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.js @@ -21,7 +21,6 @@ export const enableSelectiveHydration = false; export const enableBlocksAPI = false; export const disableJavaScriptURLs = false; export const disableInputAttributeSyncing = false; -export const warnAboutShorthandPropertyCollision = true; export const enableSchedulerDebugging = false; export const enableDeprecatedFlareAPI = false; export const enableFundamentalAPI = false; diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js index 7a18e2d910..0fdd033397 100644 --- a/packages/shared/forks/ReactFeatureFlags.testing.www.js +++ b/packages/shared/forks/ReactFeatureFlags.testing.www.js @@ -21,7 +21,6 @@ export const enableSelectiveHydration = true; export const enableBlocksAPI = true; export const disableJavaScriptURLs = true; export const disableInputAttributeSyncing = false; -export const warnAboutShorthandPropertyCollision = true; export const enableSchedulerDebugging = false; export const enableDeprecatedFlareAPI = true; export const enableFundamentalAPI = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index 923372abb7..45cc2462f5 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -25,7 +25,6 @@ export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__; // Update the tests so that they pass in either mode, then set these // to __VARIANT__. export const enableTrustedTypesIntegration = false; -export const warnAboutShorthandPropertyCollision = true; export const disableInputAttributeSyncing = false; export const disableSchedulerTimeoutBasedOnReactExpirationTime = false; export const enableModernEventSystem = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index b281c14d25..784e441e43 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -19,7 +19,6 @@ export const { disableModulePatternComponents, disableInputAttributeSyncing, enableTrustedTypesIntegration, - warnAboutShorthandPropertyCollision, disableSchedulerTimeoutBasedOnReactExpirationTime, warnAboutSpreadingKeyToJSX, replayFailedUnitOfWorkWithInvokeGuardedCallback,