Event API: remove isTargetDirectlyWithinEventComponent (#15546)
Dominic Gannaway committed
Apr 30, 2019 at 17:38 UTC
ec6691a68716bc59291746fc62f374a56fb435c9
5 files changed
+4
-25
packages/react-dom/src/events/DOMEventResponderSystem.js
-16
@@ -176,22 +176,6 @@ const eventResponderContext: ReactResponderContext = {
176
}
177
return false;
178
},
179
- isTargetDirectlyWithinEventComponent(target: Element | Document): boolean {
180
- validateResponderContext();
181
- if (target != null) {
182
- let fiber = getClosestInstanceFromNode(target);
183
- while (fiber !== null) {
184
- if (fiber.stateNode === currentInstance) {
185
- return true;
186
- }
187
- if (fiber.tag === EventComponent) {
188
- return false;
189
- }
190
- fiber = fiber.return;
191
- }
192
- }
193
- return false;
194
- },
179
isTargetWithinEventResponderScope(target: Element | Document): boolean {
180
validateResponderContext();
181
const responder = ((currentInstance: any): ReactEventComponentInstance)
packages/react-dom/src/events/__tests__/DOMEventResponderSystem-test.internal.js
+2
-2
@@ -710,7 +710,7 @@ describe('DOMEventResponderSystem', () => {
710
]);
711
});
712
713
- it('isTargetDirectlyWithinEventComponent works', () => {
713
+ it('isTargetWithinEventResponderScope works', () => {
714
const buttonRef = React.createRef();
715
const divRef = React.createRef();
716
const log = [];
@@ -720,7 +720,7 @@ describe('DOMEventResponderSystem', () => {
720
undefined,
721
undefined,
722
(event, context) => {
723
- const isWithin = context.isTargetDirectlyWithinEventComponent(
723
+ const isWithin = context.isTargetWithinEventResponderScope(
724
event.nativeEvent.relatedTarget,
725
);
726
log.push(isWithin);
packages/react-events/README.md
-4
@@ -134,10 +134,6 @@ Returns `true` if the instance has taken ownership of the responder.
134
135
Returns `true` if the global coordinates lie within the TouchHitTarget.
136
137
-### isTargetDirectlyWithinEventComponent(target: Element): boolean
138
-
139
-Returns `true` is the target element is within the direct subtree of the Event Component instance, i.e., the target is not nested within an Event Component instance that is a descendant of the current instance.
140
-
137
### isTargetWithinElement(target: Element, element: Element): boolean
138
139
Returns `true` if `target` is a child of `element`.
packages/react-events/src/Hover.js
+2
-2
@@ -98,7 +98,7 @@ function dispatchHoverStartEvents(
98
if (event !== null) {
99
const {nativeEvent} = event;
100
if (
101
- context.isTargetDirectlyWithinEventComponent(
101
+ context.isTargetWithinEventResponderScope(
102
(nativeEvent: any).relatedTarget,
103
)
104
) {
@@ -157,7 +157,7 @@ function dispatchHoverEndEvents(
157
if (event !== null) {
158
const {nativeEvent} = event;
159
if (
160
- context.isTargetDirectlyWithinEventComponent(
160
+ context.isTargetWithinEventResponderScope(
161
(nativeEvent: any).relatedTarget,
162
)
163
) {
packages/shared/ReactTypes.js
-1
@@ -172,7 +172,6 @@ export type ReactResponderContext = {
172
parentTarget: Element | Document,
173
) => boolean,
174
isTargetWithinEventComponent: (Element | Document) => boolean,
175
- isTargetDirectlyWithinEventComponent: (Element | Document) => boolean,
175
isTargetWithinEventResponderScope: (Element | Document) => boolean,
176
isPositionWithinTouchHitTarget: (x: number, y: number) => boolean,
177
addRootEventTypes: (