From 999167e11e2b36fa0cf3c30f63fd0d0ad8ffa917 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Mon, 27 Jan 2020 11:50:29 +0800 Subject: [PATCH] fix hooks deps --- resources/assets/src/components/Modal.tsx | 3 +-- .../assets/src/views/admin/PluginsManagement/InfoBox.tsx | 4 ++-- resources/assets/tests/components/Modal.test.tsx | 9 ++++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/assets/src/components/Modal.tsx b/resources/assets/src/components/Modal.tsx index 21678959..5fb8fa4f 100644 --- a/resources/assets/src/components/Modal.tsx +++ b/resources/assets/src/components/Modal.tsx @@ -74,7 +74,6 @@ const Modal = React.forwardRef( useEffect(() => { const onHide = () => { - /* istanbul ignore else */ if (!hidden) { dismiss() } @@ -87,7 +86,7 @@ const Modal = React.forwardRef( return () => { el.off('hide.bs.modal', onHide).off('hidden.bs.modal', onHidden) } - }, []) + }, [hidden, props.onDismiss]) return (
= props => { props.onDisable(plugin) } }, - [], + [plugin], ) const handleDelete = useCallback(() => { props.onDelete(plugin) - }, []) + }, [plugin]) return (
diff --git a/resources/assets/tests/components/Modal.test.tsx b/resources/assets/tests/components/Modal.test.tsx index fcddd081..41a9725c 100644 --- a/resources/assets/tests/components/Modal.test.tsx +++ b/resources/assets/tests/components/Modal.test.tsx @@ -32,7 +32,14 @@ test('forward ref', () => { test('jQuery events', () => { const ref = React.createRef() - render() + const { getByText } = render() + act(() => { + $(ref.current!) + .trigger('hide.bs.modal') + .trigger('hidden.bs.modal') + }) + + fireEvent.click(getByText(trans('general.cancel'))) act(() => { $(ref.current!) .trigger('hide.bs.modal')