mirror of https://github.com/alibaba/ice.git
fix: fix appear event handler callback refs in WeexAppear component
This commit is contained in:
parent
b719564cd9
commit
76ed8ffbc5
|
@ -1,5 +1,5 @@
|
||||||
import type { ForwardedRef } from 'react';
|
import type { ForwardedRef } from 'react';
|
||||||
import { useEffect, useRef, forwardRef, cloneElement, Children } from 'react';
|
import { useEffect, useRef, forwardRef, cloneElement, Children, useCallback } from 'react';
|
||||||
import type { AppearProps } from '../typings';
|
import type { AppearProps } from '../typings';
|
||||||
|
|
||||||
const WeexAppear = forwardRef<any, AppearProps>((props, ref) => {
|
const WeexAppear = forwardRef<any, AppearProps>((props, ref) => {
|
||||||
|
@ -8,27 +8,41 @@ const WeexAppear = forwardRef<any, AppearProps>((props, ref) => {
|
||||||
|
|
||||||
const { children, onAppear, onDisappear } = props;
|
const { children, onAppear, onDisappear } = props;
|
||||||
|
|
||||||
|
const appearHandler = useCallback(
|
||||||
|
(e: CustomEvent) => {
|
||||||
|
onAppear?.(e);
|
||||||
|
},
|
||||||
|
[onAppear],
|
||||||
|
);
|
||||||
|
|
||||||
|
const disappearHandler = useCallback(
|
||||||
|
(e: CustomEvent) => {
|
||||||
|
onDisappear?.(e);
|
||||||
|
},
|
||||||
|
[onDisappear],
|
||||||
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Use copy of childrenRef to avoid ref value changed in cleanup phase.
|
// Use copy of childrenRef to avoid ref value changed in cleanup phase.
|
||||||
const nodeRef = typeof childrenRef === 'object' ? childrenRef.current : null;
|
const nodeRef = typeof childrenRef === 'object' ? childrenRef.current : null;
|
||||||
|
|
||||||
// Return early if onAppear callback not specified.
|
// Return early if onAppear callback not specified.
|
||||||
onAppear && nodeRef?.addEventListener('appear', (e: CustomEvent) => onAppear(e));
|
onAppear && nodeRef?.addEventListener('appear', appearHandler);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
onAppear && nodeRef?.removeEventListener('appear', (e: CustomEvent) => onAppear(e));
|
onAppear && nodeRef?.removeEventListener('appear', appearHandler);
|
||||||
};
|
};
|
||||||
}, [childrenRef, onAppear]);
|
}, [childrenRef, appearHandler, onAppear]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const nodeRef = typeof childrenRef === 'object' ? childrenRef.current : null;
|
const nodeRef = typeof childrenRef === 'object' ? childrenRef.current : null;
|
||||||
|
|
||||||
onDisappear && nodeRef?.addEventListener('disappear', (e: CustomEvent) => onDisappear(e));
|
onDisappear && nodeRef?.addEventListener('disappear', disappearHandler);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
onDisappear && nodeRef?.removeEventListener('disappear', (e: CustomEvent) => onDisappear(e));
|
onDisappear && nodeRef?.removeEventListener('disappear', disappearHandler);
|
||||||
};
|
};
|
||||||
}, [childrenRef, onDisappear]);
|
}, [childrenRef, onDisappear, disappearHandler]);
|
||||||
|
|
||||||
return cloneElement(Children.only(children), { ref: childrenRef });
|
return cloneElement(Children.only(children), { ref: childrenRef });
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue