From 340bfd9393e8173adca5380e6587e1ea1a23cefa Mon Sep 17 00:00:00 2001 From: Sophie Alpert Date: Sun, 26 Aug 2018 13:40:27 -0700 Subject: [PATCH] Rename ReactTypeOfWork to ReactWorkTags, ReactTypeOfSideEffect to ReactSideEffectTags (#13476) * Rename ReactTypeOfWork to ReactWorkTags And `type TypeOfWork` to `type WorkTag`. * Rename ReactTypeOfSideEffect too --- .../ResponderEventPlugin-test.internal.js | 2 +- .../src/client/ReactDOMComponentTree.js | 2 +- .../src/events/ReactDOMEventListener.js | 2 +- .../react-dom/src/test-utils/ReactTestUtils.js | 2 +- .../src/ReactNativeFiberInspector.js | 2 +- .../react-reconciler/src/ReactChildFiber.js | 4 ++-- .../react-reconciler/src/ReactCurrentFiber.js | 2 +- .../src/ReactDebugFiberPerf.js | 2 +- packages/react-reconciler/src/ReactFiber.js | 18 +++++++++--------- .../src/ReactFiberBeginWork.js | 4 ++-- .../src/ReactFiberClassComponent.js | 2 +- .../src/ReactFiberCommitWork.js | 4 ++-- .../src/ReactFiberCompleteWork.js | 4 ++-- .../react-reconciler/src/ReactFiberContext.js | 2 +- .../src/ReactFiberHydrationContext.js | 4 ++-- .../src/ReactFiberNewContext.js | 2 +- .../src/ReactFiberReconciler.js | 2 +- .../src/ReactFiberScheduler.js | 4 ++-- .../src/ReactFiberTreeReflection.js | 4 ++-- .../src/ReactFiberUnwindWork.js | 4 ++-- .../react-reconciler/src/ReactUpdateQueue.js | 8 ++------ .../src/ReactTestRenderer.js | 2 +- ...eOfSideEffect.js => ReactSideEffectTags.js} | 2 +- packages/shared/ReactTreeTraversal.js | 2 +- .../{ReactTypeOfWork.js => ReactWorkTags.js} | 2 +- 25 files changed, 42 insertions(+), 46 deletions(-) rename packages/shared/{ReactTypeOfSideEffect.js => ReactSideEffectTags.js} (96%) rename packages/shared/{ReactTypeOfWork.js => ReactWorkTags.js} (97%) diff --git a/packages/events/__tests__/ResponderEventPlugin-test.internal.js b/packages/events/__tests__/ResponderEventPlugin-test.internal.js index d583126f0b..203fe71997 100644 --- a/packages/events/__tests__/ResponderEventPlugin-test.internal.js +++ b/packages/events/__tests__/ResponderEventPlugin-test.internal.js @@ -9,7 +9,7 @@ 'use strict'; -const {HostComponent} = require('shared/ReactTypeOfWork'); +const {HostComponent} = require('shared/ReactWorkTags'); let EventPluginHub; let ResponderEventPlugin; diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js index a683df5b06..7913c3cc78 100644 --- a/packages/react-dom/src/client/ReactDOMComponentTree.js +++ b/packages/react-dom/src/client/ReactDOMComponentTree.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {HostComponent, HostText} from 'shared/ReactTypeOfWork'; +import {HostComponent, HostText} from 'shared/ReactWorkTags'; import invariant from 'shared/invariant'; const randomKey = Math.random() diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js index 43c5cb4e9f..0a464cbd55 100644 --- a/packages/react-dom/src/events/ReactDOMEventListener.js +++ b/packages/react-dom/src/events/ReactDOMEventListener.js @@ -14,7 +14,7 @@ import type {DOMTopLevelEventType} from 'events/TopLevelEventTypes'; import {batchedUpdates, interactiveUpdates} from 'events/ReactGenericBatching'; import {runExtractedEventsInBatch} from 'events/EventPluginHub'; import {isFiberMounted} from 'react-reconciler/reflection'; -import {HostRoot} from 'shared/ReactTypeOfWork'; +import {HostRoot} from 'shared/ReactWorkTags'; import {addEventBubbleListener, addEventCaptureListener} from './EventListener'; import getEventTarget from './getEventTarget'; diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index 2d31136eb4..3fea1f5bb8 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -16,7 +16,7 @@ import { FunctionalComponentLazy, HostComponent, HostText, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import SyntheticEvent from 'events/SyntheticEvent'; import invariant from 'shared/invariant'; import lowPriorityWarning from 'shared/lowPriorityWarning'; diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js index 17620f3887..2f0d52faed 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js +++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js @@ -14,7 +14,7 @@ import { findCurrentFiberUsingSlowPath, } from 'react-reconciler/reflection'; import getComponentName from 'shared/getComponentName'; -import {HostComponent} from 'shared/ReactTypeOfWork'; +import {HostComponent} from 'shared/ReactWorkTags'; import invariant from 'shared/invariant'; // Module provided by RN: import UIManager from 'UIManager'; diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 7f7c610a71..08aca20329 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -13,7 +13,7 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber'; import type {ExpirationTime} from 'react-reconciler/src/ReactFiberExpirationTime'; import getComponentName from 'shared/getComponentName'; -import {Placement, Deletion} from 'shared/ReactTypeOfSideEffect'; +import {Placement, Deletion} from 'shared/ReactSideEffectTags'; import { getIteratorFn, REACT_ELEMENT_TYPE, @@ -27,7 +27,7 @@ import { HostText, HostPortal, Fragment, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import invariant from 'shared/invariant'; import warning from 'shared/warning'; import warningWithoutStack from 'shared/warningWithoutStack'; diff --git a/packages/react-reconciler/src/ReactCurrentFiber.js b/packages/react-reconciler/src/ReactCurrentFiber.js index 11bd2b4f51..4723993a43 100644 --- a/packages/react-reconciler/src/ReactCurrentFiber.js +++ b/packages/react-reconciler/src/ReactCurrentFiber.js @@ -16,7 +16,7 @@ import { ClassComponentLazy, HostComponent, Mode, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import describeComponentFrame from 'shared/describeComponentFrame'; import getComponentName from 'shared/getComponentName'; diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js index f8d8fc3bb7..cf40005e36 100644 --- a/packages/react-reconciler/src/ReactDebugFiberPerf.js +++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js @@ -20,7 +20,7 @@ import { ContextProvider, ContextConsumer, Mode, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; type MeasurementPhase = | 'componentWillMount' diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 69c9d8ebf8..3c287f0516 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -9,16 +9,16 @@ import type {ReactElement, Source} from 'shared/ReactElementType'; import type {ReactFragment, ReactPortal, RefObject} from 'shared/ReactTypes'; -import type {TypeOfWork} from 'shared/ReactTypeOfWork'; +import type {WorkTag} from 'shared/ReactWorkTags'; import type {TypeOfMode} from './ReactTypeOfMode'; -import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect'; +import type {SideEffectTag} from 'shared/ReactSideEffectTags'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import type {UpdateQueue} from './ReactUpdateQueue'; import type {ContextDependency} from './ReactFiberNewContext'; import invariant from 'shared/invariant'; import {enableProfilerTimer} from 'shared/ReactFeatureFlags'; -import {NoEffect} from 'shared/ReactTypeOfSideEffect'; +import {NoEffect} from 'shared/ReactSideEffectTags'; import { IndeterminateComponent, ClassComponent, @@ -36,7 +36,7 @@ import { FunctionalComponentLazy, ClassComponentLazy, ForwardRefLazy, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import getComponentName from 'shared/getComponentName'; import {isDevToolsPresent} from './ReactFiberDevToolsHook'; @@ -86,7 +86,7 @@ export type Fiber = {| // minimize the number of objects created during the initial render. // Tag identifying the type of fiber. - tag: TypeOfWork, + tag: WorkTag, // Unique identifier of this child. key: null | string, @@ -140,7 +140,7 @@ export type Fiber = {| mode: TypeOfMode, // Effect - effectTag: TypeOfSideEffect, + effectTag: SideEffectTag, // Singly linked list fast path to the next fiber with side-effects. nextEffect: Fiber | null, @@ -201,7 +201,7 @@ if (__DEV__) { } function FiberNode( - tag: TypeOfWork, + tag: WorkTag, pendingProps: mixed, key: null | string, mode: TypeOfMode, @@ -272,7 +272,7 @@ function FiberNode( // 5) It should be easy to port this to a C struct and keep a C implementation // compatible. const createFiber = function( - tag: TypeOfWork, + tag: WorkTag, pendingProps: mixed, key: null | string, mode: TypeOfMode, @@ -294,7 +294,7 @@ function shouldConstruct(Component: Function) { export function resolveLazyComponentTag( fiber: Fiber, Component: Function, -): TypeOfWork { +): WorkTag { if (typeof Component === 'function') { return shouldConstruct(Component) ? ClassComponentLazy diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index b0026d1393..65ca14fe88 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -31,7 +31,7 @@ import { ContextConsumer, Profiler, PlaceholderComponent, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import { NoEffect, PerformedWork, @@ -40,7 +40,7 @@ import { DidCapture, Update, Ref, -} from 'shared/ReactTypeOfSideEffect'; +} from 'shared/ReactSideEffectTags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import { enableGetDerivedStateFromCatch, diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js index 34a1c5a37d..334bae2b72 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.js @@ -11,7 +11,7 @@ import type {Fiber} from './ReactFiber'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import React from 'react'; -import {Update, Snapshot} from 'shared/ReactTypeOfSideEffect'; +import {Update, Snapshot} from 'shared/ReactSideEffectTags'; import { debugRenderPhaseSideEffects, debugRenderPhaseSideEffectsForStrictMode, diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index c5b2a6b430..0cda7b6b22 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -29,7 +29,7 @@ import { HostPortal, Profiler, PlaceholderComponent, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import { invokeGuardedCallback, hasCaughtError, @@ -41,7 +41,7 @@ import { Placement, Snapshot, Update, -} from 'shared/ReactTypeOfSideEffect'; +} from 'shared/ReactSideEffectTags'; import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index feef7e4d84..85b3b0bad3 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -38,8 +38,8 @@ import { Profiler, PlaceholderComponent, ForwardRefLazy, -} from 'shared/ReactTypeOfWork'; -import {Placement, Ref, Update} from 'shared/ReactTypeOfSideEffect'; +} from 'shared/ReactWorkTags'; +import {Placement, Ref, Update} from 'shared/ReactSideEffectTags'; import invariant from 'shared/invariant'; import {getResultFromResolvedThenable} from 'shared/ReactLazyComponent'; diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js index 58c648ad76..19489f2f30 100644 --- a/packages/react-reconciler/src/ReactFiberContext.js +++ b/packages/react-reconciler/src/ReactFiberContext.js @@ -15,7 +15,7 @@ import { ClassComponent, HostRoot, ClassComponentLazy, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index 8983333a30..a268b08a80 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -16,8 +16,8 @@ import type { HostContext, } from './ReactFiberHostConfig'; -import {HostComponent, HostText, HostRoot} from 'shared/ReactTypeOfWork'; -import {Deletion, Placement} from 'shared/ReactTypeOfSideEffect'; +import {HostComponent, HostText, HostRoot} from 'shared/ReactWorkTags'; +import {Deletion, Placement} from 'shared/ReactSideEffectTags'; import invariant from 'shared/invariant'; import {createFiberFromHostInstanceForDeletion} from './ReactFiber'; diff --git a/packages/react-reconciler/src/ReactFiberNewContext.js b/packages/react-reconciler/src/ReactFiberNewContext.js index 06583cdd80..d28b42f821 100644 --- a/packages/react-reconciler/src/ReactFiberNewContext.js +++ b/packages/react-reconciler/src/ReactFiberNewContext.js @@ -27,7 +27,7 @@ import { ContextProvider, ClassComponent, ClassComponentLazy, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import invariant from 'shared/invariant'; import warning from 'shared/warning'; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 280e1cbef2..31a5985c61 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -27,7 +27,7 @@ import { HostComponent, ClassComponent, ClassComponentLazy, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import getComponentName from 'shared/getComponentName'; import invariant from 'shared/invariant'; import warningWithoutStack from 'shared/warningWithoutStack'; diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 10161f42e4..ba9c1e6c27 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -32,7 +32,7 @@ import { Ref, Incomplete, HostEffectMask, -} from 'shared/ReactTypeOfSideEffect'; +} from 'shared/ReactSideEffectTags'; import { HostRoot, ClassComponent, @@ -40,7 +40,7 @@ import { HostComponent, ContextProvider, HostPortal, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import { enableProfilerTimer, enableUserTimingAPI, diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index f41fd35604..ad7c85898c 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -22,8 +22,8 @@ import { HostRoot, HostPortal, HostText, -} from 'shared/ReactTypeOfWork'; -import {NoEffect, Placement} from 'shared/ReactTypeOfSideEffect'; +} from 'shared/ReactWorkTags'; +import {NoEffect, Placement} from 'shared/ReactSideEffectTags'; const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner; diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index a6da20450f..6cafb680dc 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -24,7 +24,7 @@ import { HostPortal, ContextProvider, PlaceholderComponent, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import { DidCapture, Incomplete, @@ -32,7 +32,7 @@ import { ShouldCapture, Update as UpdateEffect, LifecycleEffectMask, -} from 'shared/ReactTypeOfSideEffect'; +} from 'shared/ReactSideEffectTags'; import { enableGetDerivedStateFromCatch, enableSuspense, diff --git a/packages/react-reconciler/src/ReactUpdateQueue.js b/packages/react-reconciler/src/ReactUpdateQueue.js index b636b6c05c..3c94ce3392 100644 --- a/packages/react-reconciler/src/ReactUpdateQueue.js +++ b/packages/react-reconciler/src/ReactUpdateQueue.js @@ -88,12 +88,8 @@ import type {Fiber} from './ReactFiber'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import {NoWork} from './ReactFiberExpirationTime'; -import { - Callback, - ShouldCapture, - DidCapture, -} from 'shared/ReactTypeOfSideEffect'; -import {ClassComponent, ClassComponentLazy} from 'shared/ReactTypeOfWork'; +import {Callback, ShouldCapture, DidCapture} from 'shared/ReactSideEffectTags'; +import {ClassComponent, ClassComponentLazy} from 'shared/ReactWorkTags'; import { debugRenderPhaseSideEffects, diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index 52bccda4c0..c0b839caaf 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -30,7 +30,7 @@ import { ForwardRef, Profiler, ForwardRefLazy, -} from 'shared/ReactTypeOfWork'; +} from 'shared/ReactWorkTags'; import invariant from 'shared/invariant'; import ReactVersion from 'shared/ReactVersion'; diff --git a/packages/shared/ReactTypeOfSideEffect.js b/packages/shared/ReactSideEffectTags.js similarity index 96% rename from packages/shared/ReactTypeOfSideEffect.js rename to packages/shared/ReactSideEffectTags.js index 2a5732c385..a6e3a01760 100644 --- a/packages/shared/ReactTypeOfSideEffect.js +++ b/packages/shared/ReactSideEffectTags.js @@ -7,7 +7,7 @@ * @flow */ -export type TypeOfSideEffect = number; +export type SideEffectTag = number; // Don't change these two values. They're used by React Dev Tools. export const NoEffect = /* */ 0b00000000000; diff --git a/packages/shared/ReactTreeTraversal.js b/packages/shared/ReactTreeTraversal.js index 7db43fdf2f..6ed28e7ac3 100644 --- a/packages/shared/ReactTreeTraversal.js +++ b/packages/shared/ReactTreeTraversal.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {HostComponent} from './ReactTypeOfWork'; +import {HostComponent} from './ReactWorkTags'; function getParent(inst) { do { diff --git a/packages/shared/ReactTypeOfWork.js b/packages/shared/ReactWorkTags.js similarity index 97% rename from packages/shared/ReactTypeOfWork.js rename to packages/shared/ReactWorkTags.js index 601d34a95e..ca2d6d0d2d 100644 --- a/packages/shared/ReactTypeOfWork.js +++ b/packages/shared/ReactWorkTags.js @@ -7,7 +7,7 @@ * @flow */ -export type TypeOfWork = +export type WorkTag = | 0 | 1 | 2