From 4d118698b4df2c0f504badd79b6c99772103417a Mon Sep 17 00:00:00 2001 From: blessedcoolant Date: Fri, 8 Apr 2022 17:04:55 +1200 Subject: [PATCH] Fix bug with Shortcuts Modal & added missing useEffect dependencies --- .../app/src/components/Editor/Editor.tsx | 22 +++++++++---------- .../src/components/Header/ThemeChanger.tsx | 2 +- .../components/Shortcuts/ShortcutsModal.tsx | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lama_cleaner/app/src/components/Editor/Editor.tsx b/lama_cleaner/app/src/components/Editor/Editor.tsx index 7514ed6..0b2d554 100644 --- a/lama_cleaner/app/src/components/Editor/Editor.tsx +++ b/lama_cleaner/app/src/components/Editor/Editor.tsx @@ -240,17 +240,6 @@ export default function Editor(props: EditorProps) { } }, [context?.canvas, draw, original, isOriginalLoaded, windowSize]) - useEffect(() => { - window.addEventListener('resize', () => { - resetZoom() - }) - return () => { - window.removeEventListener('resize', () => { - resetZoom() - }) - } - }, [windowSize]) - // Zoom reset const resetZoom = useCallback(() => { if (!minScale || !original || !windowSize) { @@ -267,6 +256,17 @@ export default function Editor(props: EditorProps) { setScale(minScale) }, [viewportRef, minScale, original, windowSize]) + useEffect(() => { + window.addEventListener('resize', () => { + resetZoom() + }) + return () => { + window.removeEventListener('resize', () => { + resetZoom() + }) + } + }, [windowSize, resetZoom]) + const handleEscPressed = () => { if (isInpaintingLoading) { return diff --git a/lama_cleaner/app/src/components/Header/ThemeChanger.tsx b/lama_cleaner/app/src/components/Header/ThemeChanger.tsx index a22314d..17c11c5 100644 --- a/lama_cleaner/app/src/components/Header/ThemeChanger.tsx +++ b/lama_cleaner/app/src/components/Header/ThemeChanger.tsx @@ -17,7 +17,7 @@ export const ThemeChanger = () => { } else { setTheme('light') } - }, []) + }, [setTheme]) const themeSwitchHandler = () => { const newTheme = theme === 'light' ? 'dark' : 'light' diff --git a/lama_cleaner/app/src/components/Shortcuts/ShortcutsModal.tsx b/lama_cleaner/app/src/components/Shortcuts/ShortcutsModal.tsx index 2b029df..a341d4a 100644 --- a/lama_cleaner/app/src/components/Shortcuts/ShortcutsModal.tsx +++ b/lama_cleaner/app/src/components/Shortcuts/ShortcutsModal.tsx @@ -1,7 +1,7 @@ import React, { ReactNode } from 'react' import { useSetRecoilState } from 'recoil' import { shortcutsState } from '../../store/Atoms' -import Modal, { ModalProps } from '../shared/Modal' +import Modal from '../shared/Modal' interface Shortcut { children: ReactNode @@ -28,7 +28,7 @@ export default function ShortcutsModal(props: ShortcutsModalProps) { const setShortcutState = useSetRecoilState(shortcutsState) const shortcutStateHandler = () => { - setShortcutState(prevShortcutState => !prevShortcutState) + setShortcutState(false) } return (