{"body":"","parents":["996acf9036b8fcf39cca8dc63102d677d529afe2"],"patch":"diff --git a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\nindex 267b9ce63b..0544b24cec 100644\n--- a\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n+++ b\/packages\/react-dom\/src\/events\/DOMEventResponderSystem.js\n@@ -12,7 +12,7 @@ import {\n PASSIVE_NOT_SUPPORTED,\n } from 'legacy-events\/EventSystemFlags';\n import type {AnyNativeEvent} from 'legacy-events\/PluginModuleType';\n-import {HostComponent, SuspenseComponent} from 'shared\/ReactWorkTags';\n+import {HostComponent} from 'shared\/ReactWorkTags';\n import type {EventPriority} from 'shared\/ReactTypes';\n import type {\n ReactDOMEventResponder,\n@@ -238,28 +238,6 @@ const eventResponderContext: ReactDOMResponderContext = {\n }\n }\n },\n- getFocusableElementsInScope(deep: boolean): Array {\n- validateResponderContext();\n- const focusableElements = [];\n- const eventResponderInstance = ((currentInstance: any): ReactDOMEventResponderInstance);\n- const currentResponder = eventResponderInstance.responder;\n- let focusScopeFiber = eventResponderInstance.fiber;\n- if (deep) {\n- let deepNode = focusScopeFiber.return;\n- while (deepNode !== null) {\n- if (doesFiberHaveResponder(deepNode, currentResponder)) {\n- focusScopeFiber = deepNode;\n- }\n- deepNode = deepNode.return;\n- }\n- }\n- const child = focusScopeFiber.child;\n-\n- if (child !== null) {\n- collectFocusableElements(child, focusableElements);\n- }\n- return focusableElements;\n- },\n getActiveDocument,\n objectAssign: Object.assign,\n getTimeStamp(): number {\n@@ -335,33 +313,6 @@ function validateEventValue(eventValue: any): void {\n }\n }\n \n-function collectFocusableElements(\n- node: Fiber,\n- focusableElements: Array,\n-): void {\n- if (isFiberSuspenseAndTimedOut(node)) {\n- const fallbackChild = getSuspenseFallbackChild(node);\n- if (fallbackChild !== null) {\n- collectFocusableElements(fallbackChild, focusableElements);\n- }\n- } else {\n- if (isFiberHostComponentFocusable(node)) {\n- focusableElements.push(node.stateNode);\n- } else {\n- const child = node.child;\n-\n- if (child !== null) {\n- collectFocusableElements(child, focusableElements);\n- }\n- }\n- }\n- const sibling = node.sibling;\n-\n- if (sibling !== null) {\n- collectFocusableElements(sibling, focusableElements);\n- }\n-}\n-\n function doesFiberHaveResponder(\n fiber: Fiber,\n responder: ReactDOMEventResponder,\n@@ -382,33 +333,6 @@ function getActiveDocument(): Document {\n return ((currentDocument: any): Document);\n }\n \n-function isFiberHostComponentFocusable(fiber: Fiber): boolean {\n- if (fiber.tag !== HostComponent) {\n- return false;\n- }\n- const {type, memoizedProps} = fiber;\n- if (memoizedProps.tabIndex === -1 || memoizedProps.disabled) {\n- return false;\n- }\n- if (memoizedProps.tabIndex === 0 || memoizedProps.contentEditable === true) {\n- return true;\n- }\n- if (type === 'a' || type === 'area') {\n- return !!memoizedProps.href && memoizedProps.rel !== 'ignore';\n- }\n- if (type === 'input') {\n- return memoizedProps.type !== 'hidden' && memoizedProps.type !== 'file';\n- }\n- return (\n- type === 'button' ||\n- type === 'textarea' ||\n- type === 'object' ||\n- type === 'select' ||\n- type === 'iframe' ||\n- type === 'embed'\n- );\n-}\n-\n function processTimers(\n timers: Map,\n delay: number,\n@@ -626,14 +550,6 @@ function validateResponderContext(): void {\n );\n }\n \n-function isFiberSuspenseAndTimedOut(fiber: Fiber): boolean {\n- return fiber.tag === SuspenseComponent && fiber.memoizedState !== null;\n-}\n-\n-function getSuspenseFallbackChild(fiber: Fiber): Fiber | null {\n- return ((((fiber.child: any): Fiber).sibling: any): Fiber).child;\n-}\n-\n export function dispatchEventForResponderEventSystem(\n topLevelType: string,\n targetFiber: null | Fiber,\ndiff --git a\/packages\/react-events\/README.md b\/packages\/react-events\/README.md\nindex 1338d152cb..25d68d870a 100644\n--- a\/packages\/react-events\/README.md\n+++ b\/packages\/react-events\/README.md\n@@ -92,11 +92,6 @@ const event = { type: 'press', target, pointerType, x, y };\n context.dispatchEvent('onPress', event, DiscreteEvent);\n ```\n \n-### getFocusableElementsInScope(): Array\n-\n-Returns every DOM element that can be focused within the scope of the Event\n-Responder instance.\n-\n ### isTargetWithinNode(target: Element, element: Element): boolean\n \n Returns `true` if `target` is a child of `element`.\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.js b\/packages\/react-reconciler\/src\/ReactFiber.js\nindex 485edb72f3..1b9feda262 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.js\n@@ -15,6 +15,7 @@ import type {\n ReactEventResponder,\n ReactEventResponderInstance,\n ReactFundamentalComponent,\n+ ReactScope,\n } from 'shared\/ReactTypes';\n import type {RootTag} from 'shared\/ReactRootTags';\n import type {WorkTag} from 'shared\/ReactWorkTags';\n@@ -32,6 +33,7 @@ import {\n enableProfilerTimer,\n enableFundamentalAPI,\n enableUserTimingAPI,\n+ enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import {NoEffect, Placement} from 'shared\/ReactSideEffectTags';\n import {ConcurrentRoot, BatchedRoot} from 'shared\/ReactRootTags';\n@@ -56,6 +58,7 @@ import {\n SimpleMemoComponent,\n LazyComponent,\n FundamentalComponent,\n+ ScopeComponent,\n } from 'shared\/ReactWorkTags';\n import getComponentName from 'shared\/getComponentName';\n \n@@ -86,6 +89,7 @@ import {\n REACT_MEMO_TYPE,\n REACT_LAZY_TYPE,\n REACT_FUNDAMENTAL_TYPE,\n+ REACT_SCOPE_TYPE,\n } from 'shared\/ReactSymbols';\n \n let hasBadMapPolyfill;\n@@ -674,6 +678,16 @@ export function createFiberFromTypeAndProps(\n );\n }\n break;\n+ case REACT_SCOPE_TYPE:\n+ if (enableScopeAPI) {\n+ return createFiberFromScope(\n+ type,\n+ pendingProps,\n+ mode,\n+ expirationTime,\n+ key,\n+ );\n+ }\n }\n }\n let info = '';\n@@ -766,6 +780,19 @@ export function createFiberFromFundamental(\n return fiber;\n }\n \n+function createFiberFromScope(\n+ scope: ReactScope,\n+ pendingProps: any,\n+ mode: TypeOfMode,\n+ expirationTime: ExpirationTime,\n+ key: null | string,\n+) {\n+ const fiber = createFiber(ScopeComponent, pendingProps, key, mode);\n+ fiber.type = scope;\n+ fiber.expirationTime = expirationTime;\n+ return fiber;\n+}\n+\n function createFiberFromProfiler(\n pendingProps: any,\n mode: TypeOfMode,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 4ece9c03d2..c75a4cebec 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -41,6 +41,7 @@ import {\n LazyComponent,\n IncompleteClassComponent,\n FundamentalComponent,\n+ ScopeComponent,\n } from 'shared\/ReactWorkTags';\n import {\n NoEffect,\n@@ -63,6 +64,7 @@ import {\n enableSuspenseServerRenderer,\n enableFundamentalAPI,\n warnAboutDefaultPropsOnFunctionComponents,\n+ enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import invariant from 'shared\/invariant';\n import shallowEqual from 'shared\/shallowEqual';\n@@ -2672,6 +2674,19 @@ function updateFundamentalComponent(\n return workInProgress.child;\n }\n \n+function updateScopeComponent(current, workInProgress, renderExpirationTime) {\n+ const nextProps = workInProgress.pendingProps;\n+ const nextChildren = nextProps.children;\n+\n+ reconcileChildren(\n+ current,\n+ workInProgress,\n+ nextChildren,\n+ renderExpirationTime,\n+ );\n+ return workInProgress.child;\n+}\n+\n export function markWorkInProgressReceivedUpdate() {\n didReceiveUpdate = true;\n }\n@@ -3158,6 +3173,16 @@ function beginWork(\n }\n break;\n }\n+ case ScopeComponent: {\n+ if (enableScopeAPI) {\n+ return updateScopeComponent(\n+ current,\n+ workInProgress,\n+ renderExpirationTime,\n+ );\n+ }\n+ break;\n+ }\n }\n invariant(\n false,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\nindex 072e0fa8c8..b289a40614 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n@@ -32,6 +32,7 @@ import {\n enableFlareAPI,\n enableFundamentalAPI,\n enableSuspenseCallback,\n+ enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import {\n FunctionComponent,\n@@ -49,6 +50,7 @@ import {\n SimpleMemoComponent,\n SuspenseListComponent,\n FundamentalComponent,\n+ ScopeComponent,\n } from 'shared\/ReactWorkTags';\n import {\n invokeGuardedCallback,\n@@ -617,6 +619,7 @@ function commitLifeCycles(\n case SuspenseListComponent:\n case IncompleteClassComponent:\n case FundamentalComponent:\n+ case ScopeComponent:\n return;\n default: {\n invariant(\n@@ -691,6 +694,10 @@ function commitAttachRef(finishedWork: Fiber) {\n default:\n instanceToUse = instance;\n }\n+ \/\/ Moved outside to ensure DCE works with this flag\n+ if (enableScopeAPI && finishedWork.tag === ScopeComponent) {\n+ instanceToUse = instance.methods;\n+ }\n if (typeof ref === 'function') {\n ref(instanceToUse);\n } else {\n@@ -1383,6 +1390,13 @@ function commitWork(current: Fiber | null, finishedWork: Fiber): void {\n }\n return;\n }\n+ case ScopeComponent: {\n+ if (enableScopeAPI) {\n+ const scopeInstance = finishedWork.stateNode;\n+ scopeInstance.fiber = finishedWork;\n+ }\n+ return;\n+ }\n default: {\n invariant(\n false,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\nindex f77eb30bf6..8f9addc35a 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n@@ -9,7 +9,10 @@\n \n import type {Fiber} from '.\/ReactFiber';\n import type {ExpirationTime} from '.\/ReactFiberExpirationTime';\n-import type {ReactFundamentalComponentInstance} from 'shared\/ReactTypes';\n+import type {\n+ ReactFundamentalComponentInstance,\n+ ReactScopeInstance,\n+} from 'shared\/ReactTypes';\n import type {FiberRoot} from '.\/ReactFiberRoot';\n import type {\n Instance,\n@@ -47,6 +50,7 @@ import {\n LazyComponent,\n IncompleteClassComponent,\n FundamentalComponent,\n+ ScopeComponent,\n } from 'shared\/ReactWorkTags';\n import {NoMode, BatchedMode} from '.\/ReactTypeOfMode';\n import {\n@@ -112,6 +116,7 @@ import {\n enableSuspenseServerRenderer,\n enableFlareAPI,\n enableFundamentalAPI,\n+ enableScopeAPI,\n } from 'shared\/ReactFeatureFlags';\n import {\n markSpawnedWork,\n@@ -123,6 +128,7 @@ import {createFundamentalStateInstance} from '.\/ReactFiberFundamental';\n import {Never} from '.\/ReactFiberExpirationTime';\n import {resetChildFibers} from '.\/ReactChildFiber';\n import {updateEventListeners} from '.\/ReactFiberEvents';\n+import {createScopeMethods} from '.\/ReactFiberScope';\n \n function markUpdate(workInProgress: Fiber) {\n \/\/ Tag the fiber with an update effect. This turns a Placement into\n@@ -1213,6 +1219,31 @@ function completeWork(\n }\n break;\n }\n+ case ScopeComponent: {\n+ if (enableScopeAPI) {\n+ if (current === null) {\n+ const type = workInProgress.type;\n+ const scopeInstance: ReactScopeInstance = {\n+ fiber: workInProgress,\n+ methods: null,\n+ };\n+ workInProgress.stateNode = scopeInstance;\n+ scopeInstance.methods = createScopeMethods(type, scopeInstance);\n+ if (workInProgress.ref !== null) {\n+ markRef(workInProgress);\n+ markUpdate(workInProgress);\n+ }\n+ } else {\n+ if (current.ref !== workInProgress.ref) {\n+ markRef(workInProgress);\n+ }\n+ if (workInProgress.ref !== null) {\n+ markUpdate(workInProgress);\n+ }\n+ }\n+ }\n+ break;\n+ }\n default:\n invariant(\n false,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberScope.js b\/packages\/react-reconciler\/src\/ReactFiberScope.js\nnew file mode 100644\nindex 0000000000..2b1d9eb27e\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberScope.js\n@@ -0,0 +1,130 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {Fiber} from '.\/ReactFiber';\n+import type {\n+ ReactScope,\n+ ReactScopeInstance,\n+ ReactScopeMethods,\n+} from 'shared\/ReactTypes';\n+\n+import {\n+ HostComponent,\n+ SuspenseComponent,\n+ ScopeComponent,\n+} from 'shared\/ReactWorkTags';\n+\n+function isFiberSuspenseAndTimedOut(fiber: Fiber): boolean {\n+ return fiber.tag === SuspenseComponent && fiber.memoizedState !== null;\n+}\n+\n+function getSuspenseFallbackChild(fiber: Fiber): Fiber | null {\n+ return ((((fiber.child: any): Fiber).sibling: any): Fiber).child;\n+}\n+\n+function collectScopedNodes(\n+ node: Fiber,\n+ fn: (type: string | Object, props: Object) => boolean,\n+ scopedNodes: Array,\n+): void {\n+ if (node.tag === HostComponent) {\n+ const {type, memoizedProps} = node;\n+ if (fn(type, memoizedProps) === true) {\n+ scopedNodes.push(node.stateNode);\n+ }\n+ }\n+ let child = node.child;\n+\n+ if (isFiberSuspenseAndTimedOut(node)) {\n+ child = getSuspenseFallbackChild(node);\n+ }\n+ if (child !== null) {\n+ collectScopedNodesFromChildren(child, fn, scopedNodes);\n+ }\n+}\n+\n+function collectScopedNodesFromChildren(\n+ startingChild: Fiber,\n+ fn: (type: string | Object, props: Object) => boolean,\n+ scopedNodes: Array,\n+): void {\n+ let child = startingChild;\n+ while (child !== null) {\n+ collectScopedNodes(child, fn, scopedNodes);\n+ child = child.sibling;\n+ }\n+}\n+\n+function collectNearestScopeMethods(\n+ node: Fiber,\n+ scope: ReactScope,\n+ childrenScopes: Array,\n+): void {\n+ if (node.tag === ScopeComponent && node.type === scope) {\n+ childrenScopes.push(node.stateNode.methods);\n+ } else {\n+ let child = node.child;\n+\n+ if (isFiberSuspenseAndTimedOut(node)) {\n+ child = getSuspenseFallbackChild(node);\n+ }\n+ if (child !== null) {\n+ collectNearestChildScopeMethods(child, scope, childrenScopes);\n+ }\n+ }\n+}\n+\n+function collectNearestChildScopeMethods(\n+ startingChild: Fiber,\n+ scope: ReactScope,\n+ childrenScopes: Array,\n+): void {\n+ let child = startingChild;\n+ while (child !== null) {\n+ collectNearestScopeMethods(child, scope, childrenScopes);\n+ child = child.sibling;\n+ }\n+}\n+\n+export function createScopeMethods(\n+ scope: ReactScope,\n+ instance: ReactScopeInstance,\n+): ReactScopeMethods {\n+ const fn = scope.fn;\n+ return {\n+ getChildren(): null | Array {\n+ const currentFiber = ((instance.fiber: any): Fiber);\n+ const child = currentFiber.child;\n+ const childrenScopes = [];\n+ if (child !== null) {\n+ collectNearestChildScopeMethods(child, scope, childrenScopes);\n+ }\n+ return childrenScopes.length === 0 ? null : childrenScopes;\n+ },\n+ getParent(): null | ReactScopeMethods {\n+ let node = ((instance.fiber: any): Fiber).return;\n+ while (node !== null) {\n+ if (node.tag === ScopeComponent && node.type === scope) {\n+ return node.stateNode.methods;\n+ }\n+ node = node.return;\n+ }\n+ return null;\n+ },\n+ getScopedNodes(): null | Array

dillon1000/react

Files changed