Revert "Revert: Enable new passive effect behavior for FB builds (#18467

)" (#18468) This reverts commit 3966081.
facebook · Apr 2, 2020 · 4123d72 · 4123d72
1 parent 8815e4c
commit 4123d72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
@@ -37,8 +37,8 @@ export const enableTrustedTypesIntegration = false;
 export const disableTextareaChildren = false;
 export const disableModulePatternComponents = false;
 export const warnUnstableRenderSubtreeIntoContainer = false;
-export const deferPassiveEffectCleanupDuringUnmount = false;
-export const runAllPassiveEffectDestroysBeforeCreates = false;
+export const deferPassiveEffectCleanupDuringUnmount = true;
+export const runAllPassiveEffectDestroysBeforeCreates = true;
 export const enableModernEventSystem = false;
 export const warnAboutSpreadingKeyToJSX = false;
 export const enableLegacyFBSupport = false;

diff --git a/packages/shared/forks/ReactFeatureFlags.testing.www.js b/packages/shared/forks/ReactFeatureFlags.testing.www.js
@@ -37,8 +37,8 @@ export const enableTrustedTypesIntegration = false;
 export const disableTextareaChildren = __EXPERIMENTAL__;
 export const disableModulePatternComponents = true;
 export const warnUnstableRenderSubtreeIntoContainer = false;
-export const deferPassiveEffectCleanupDuringUnmount = false;
-export const runAllPassiveEffectDestroysBeforeCreates = false;
+export const deferPassiveEffectCleanupDuringUnmount = true;
+export const runAllPassiveEffectDestroysBeforeCreates = true;
 export const enableModernEventSystem = false;
 export const warnAboutSpreadingKeyToJSX = false;
 export const enableLegacyFBSupport = !__EXPERIMENTAL__;

diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js
@@ -13,8 +13,6 @@
 // Use __VARIANT__ to simulate a GK. The tests will be run twice: once
 // with the __VARIANT__ set to `true`, and once set to `false`.
 
-export const deferPassiveEffectCleanupDuringUnmount = __VARIANT__;
-export const runAllPassiveEffectDestroysBeforeCreates = __VARIANT__;
 export const warnAboutSpreadingKeyToJSX = __VARIANT__;
 export const disableModulePatternComponents = __VARIANT__;
 export const disableInputAttributeSyncing = __VARIANT__;

diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js
@@ -16,11 +16,9 @@ const dynamicFeatureFlags: DynamicFeatureFlags = require('ReactFeatureFlags');
 
 export const {
   debugRenderPhaseSideEffectsForStrictMode,
-  deferPassiveEffectCleanupDuringUnmount,
   disableModulePatternComponents,
   disableInputAttributeSyncing,
   enableTrustedTypesIntegration,
-  runAllPassiveEffectDestroysBeforeCreates,
   disableSchedulerTimeoutBasedOnReactExpirationTime,
   warnAboutSpreadingKeyToJSX,
   replayFailedUnitOfWorkWithInvokeGuardedCallback,
@@ -79,6 +77,9 @@ export const throwEarlyForMysteriousError = false;
 // to the correct value.
 export const enableNewReconciler = __VARIANT__;
 
+export const deferPassiveEffectCleanupDuringUnmount = true;
+export const runAllPassiveEffectDestroysBeforeCreates = true;
+
 // Flow magic to verify the exports of this file match the original version.
 // eslint-disable-next-line no-unused-vars
 type Check<_X, Y: _X, X: Y = _X> = null;