maxjhandsome
/
react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Native] Add FeatureFlag to dispatch events with instance currentTarget (#17345) 

* [Native] Add FeatureFlag to dispatch events with instance targets

* Prettier

* [Native] Change currentTarget to be an instance behind a flag 2/2
This commit is contained in:
Eli White 2019-11-11 12:42:06 -08:00 committed by GitHub
parent 2c6ea0b3ff
commit 3dcec3a925
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/react-native-renderer/src/ReactFabricComponentTree.js vendored
View File

@ -7,14 +7,25 @@
import invariant from 'shared/invariant';
import {enableNativeTargetAsInstance} from 'shared/ReactFeatureFlags';
function getInstanceFromInstance(instanceHandle) {
return instanceHandle;
}
function getTagFromInstance(inst) {
let tag = inst.stateNode.canonical._nativeTag;
invariant(tag, 'All native instances should have a tag.');
return tag;
if (enableNativeTargetAsInstance) {
let nativeInstance = inst.stateNode.canonical;
invariant(
nativeInstance._nativeTag,
'All native instances should have a tag.',
);
return nativeInstance;
} else {
let tag = inst.stateNode.canonical._nativeTag;
invariant(tag, 'All native instances should have a tag.');
return tag;
}
}
export {

23
packages/react-native-renderer/src/ReactNativeComponentTree.js vendored
View File

@ -7,6 +7,8 @@
import invariant from 'shared/invariant';
import {enableNativeTargetAsInstance} from 'shared/ReactFeatureFlags';
const instanceCache = new Map();
const instanceProps = new Map();
@ -24,12 +26,23 @@ function getInstanceFromTag(tag) {
}
function getTagFromInstance(inst) {
let tag = inst.stateNode._nativeTag;
if (tag === undefined) {
tag = inst.stateNode.canonical._nativeTag;
if (enableNativeTargetAsInstance) {
let nativeInstance = inst.stateNode;
let tag = nativeInstance._nativeTag;
if (tag === undefined) {
nativeInstance = nativeInstance.canonical;
tag = nativeInstance._nativeTag;
}
invariant(tag, 'All native instances should have a tag.');
return nativeInstance;
} else {
let tag = inst.stateNode._nativeTag;
if (tag === undefined) {
tag = inst.stateNode.canonical._nativeTag;
}
invariant(tag, 'All native instances should have a tag.');
return tag;
}
invariant(tag, 'All native instances should have a tag.');
return tag;
}
export {

12
packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js
View File

@ -826,6 +826,9 @@ describe('ReactFabric', () => {
expect(ReactFabric.findNodeHandle(ref1.current)).toEqual(
event.target,
);
expect(ReactFabric.findNodeHandle(ref1.current)).toEqual(
event.currentTarget,
);
}}
onStartShouldSetResponder={() => true}
/>
@ -837,6 +840,9 @@ describe('ReactFabric', () => {
expect(ReactFabric.findNodeHandle(ref2.current)).toEqual(
event.target,
);
expect(ReactFabric.findNodeHandle(ref2.current)).toEqual(
event.currentTarget,
);
}}
onStartShouldSetResponder={() => true}
/>
@ -875,7 +881,7 @@ describe('ReactFabric', () => {
changedTouches: [],
});
expect.assertions(4);
expect.assertions(6);
});
it('dispatches event with target as instance', () => {
@ -922,6 +928,7 @@ describe('ReactFabric', () => {
expect(ref1.current).not.toBeNull();
// Check for referential equality
expect(ref1.current).toBe(event.target);
expect(ref1.current).toBe(event.currentTarget);
}}
onStartShouldSetResponder={() => true}
/>
@ -932,6 +939,7 @@ describe('ReactFabric', () => {
expect(ref2.current).not.toBeNull();
// Check for referential equality
expect(ref2.current).toBe(event.target);
expect(ref2.current).toBe(event.currentTarget);
}}
onStartShouldSetResponder={() => true}
/>
@ -970,7 +978,7 @@ describe('ReactFabric', () => {
changedTouches: [],
});
expect.assertions(4);
expect.assertions(6);
});
it('findHostInstance_DEPRECATED should warn if used to find a host component inside StrictMode', () => {

12
packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.internal.js
View File

@ -484,6 +484,9 @@ it('dispatches event with target as reactTag', () => {
expect(ReactNative.findNodeHandle(ref1.current)).toEqual(
event.target,
);
expect(ReactNative.findNodeHandle(ref1.current)).toEqual(
event.currentTarget,
);
}}
onStartShouldSetResponder={() => true}
/>
@ -495,6 +498,9 @@ it('dispatches event with target as reactTag', () => {
expect(ReactNative.findNodeHandle(ref2.current)).toEqual(
event.target,
);
expect(ReactNative.findNodeHandle(ref2.current)).toEqual(
event.currentTarget,
);
}}
onStartShouldSetResponder={() => true}
/>
@ -526,7 +532,7 @@ it('dispatches event with target as reactTag', () => {
[0],
);
expect.assertions(4);
expect.assertions(6);
});
it('dispatches event with target as instance', () => {
@ -553,6 +559,7 @@ it('dispatches event with target as instance', () => {
expect(ref1.current).not.toBeNull();
// Check for referential equality
expect(ref1.current).toBe(event.target);
expect(ref1.current).toBe(event.currentTarget);
}}
onStartShouldSetResponder={() => true}
/>
@ -563,6 +570,7 @@ it('dispatches event with target as instance', () => {
expect(ref2.current).not.toBeNull();
// Check for referential equality
expect(ref2.current).toBe(event.target);
expect(ref2.current).toBe(event.currentTarget);
}}
onStartShouldSetResponder={() => true}
/>
@ -594,5 +602,5 @@ it('dispatches event with target as instance', () => {
[0],
);
expect.assertions(4);
expect.assertions(6);
});