Skip to content

Commit cc2ae0c

Browse files
committed
fix: don't compare native event types with react event types
1 parent 0e98446 commit cc2ae0c

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

packages/react-dom/src/events/DOMPluginEventSystem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ export function accumulateSinglePhaseListeners(
709709

710710
let instance = targetFiber;
711711
let lastHostComponent = null;
712-
const targetType = event.type;
712+
const targetType = event.nativeEvent.type;
713713

714714
// Accumulate all instances and listeners via the target ->rootpath.
715715
while(instance!==null){

packages/react-dom/src/events/ReactSyntheticEventType.js

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export type ReactSyntheticEvent = {|
2929
_dispatchListeners?: null|Array<Function>|Function,
3030
_reactName: string,
3131
_targetInst: Fiber,
32+
nativeEvent: Event,
3233
type: string,
3334
currentTarget: null|EventTarget,
3435
|};

packages/react-interactions/events/src/dom/create-event-handle/Focus.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ export function useFocus(
200200
conststateRef=useRef<null|{isFocused: boolean,isFocusVisible: boolean}>(
201201
{isFocused: false,isFocusVisible: false},
202202
);
203-
constfocusHandle=useEvent('focus',passiveObjectWithPriority);
204-
constblurHandle=useEvent('blur',passiveObjectWithPriority);
203+
constfocusHandle=useEvent('focusin',passiveObjectWithPriority);
204+
constblurHandle=useEvent('focusout',passiveObjectWithPriority);
205205
constfocusVisibleHandles=useFocusVisibleInputHandles();
206206

207207
useLayoutEffect(()=>{
@@ -297,8 +297,8 @@ export function useFocusWithin<T>(
297297
conststateRef=useRef<null|{isFocused: boolean,isFocusVisible: boolean}>(
298298
{isFocused: false,isFocusVisible: false},
299299
);
300-
constfocusHandle=useEvent('focus',passiveObjectWithPriority);
301-
constblurHandle=useEvent('blur',passiveObjectWithPriority);
300+
constfocusHandle=useEvent('focusin',passiveObjectWithPriority);
301+
constblurHandle=useEvent('focusout',passiveObjectWithPriority);
302302
constafterBlurHandle=useEvent('afterblur',passiveObject);
303303
constbeforeBlurHandle=useEvent('beforeblur',passiveObject);
304304
constfocusVisibleHandles=useFocusVisibleInputHandles();

packages/react-interactions/events/src/dom/create-event-handle/__tests__/useFocus-test.internal.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
9191
useFocus(ref,{
9292
onBlur,
9393
});
94-
return<divref={ref}onBlur={()=>{}}onFocus={()=>{}}/>;
94+
return<divref={ref}/>;
9595
};
9696
ReactDOM.render(<Component/>,container);
9797
Scheduler.unstable_flushAll();
@@ -119,7 +119,7 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
119119
onFocus,
120120
});
121121
return(
122-
<divref={ref}onFocus={()=>{}}>
122+
<divref={ref}>
123123
<aref={innerRef}/>
124124
</div>
125125
);
@@ -158,7 +158,7 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
158158
});
159159
return(
160160
<divref={ref}>
161-
<divref={innerRef}onBlur={()=>{}}onFocus={()=>{}}/>
161+
<divref={innerRef}/>
162162
</div>
163163
);
164164
};
@@ -201,7 +201,7 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
201201
onFocusVisibleChange,
202202
});
203203
return(
204-
<divref={ref}onBlur={()=>{}}onFocus={()=>{}}>
204+
<divref={ref}>
205205
<divref={innerRef}/>
206206
</div>
207207
);
@@ -295,7 +295,7 @@ describe.each(table)(`useFocus hasPointerEvents=%s`, hasPointerEvents => {
295295
onFocusChange: createEventHandler('outer: onFocusChange'),
296296
});
297297
return(
298-
<divref={outerRef}onBlur={()=>{}}onFocus={()=>{}}>
298+
<divref={outerRef}>
299299
<Inner/>
300300
</div>
301301
);

0 commit comments

Comments
 (0)
close