From fa868ea222efe56530158431fa25757c7f1a171b Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:33:37 +0100 Subject: [PATCH] Properly detect "reading mode" and "tap zone" changes for preview --- src/modules/reader/screens/Reader.tsx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/modules/reader/screens/Reader.tsx b/src/modules/reader/screens/Reader.tsx index 3e1141bc..1f255509 100644 --- a/src/modules/reader/screens/Reader.tsx +++ b/src/modules/reader/screens/Reader.tsx @@ -292,20 +292,27 @@ const BaseReader = ({ const didReadingModeChange = JSON.stringify(readingMode) !== JSON.stringify(previousReadingMode.current); const showReadingModePreview = shouldShowReadingModePreview && didReadingModeChange; if (showReadingModePreview) { - previousReadingMode.current = readingMode; makeToast(t(READING_MODE_VALUE_TO_DISPLAY_DATA[readingMode.value].title as TranslationKey)); } + previousReadingMode.current = readingMode; const didTapZoneLayoutChange = - JSON.stringify(tapZoneLayout.value) !== JSON.stringify(previousTapZoneLayout.current) || - JSON.stringify(tapZoneInvertMode.value) !== JSON.stringify(previousTapZoneInvertMode.current); + JSON.stringify(tapZoneLayout) !== JSON.stringify(previousTapZoneLayout.current) || + JSON.stringify(tapZoneInvertMode) !== JSON.stringify(previousTapZoneInvertMode.current); const showTapZoneLayoutPreview = shouldShowTapZoneLayoutPreview && didTapZoneLayoutChange; if (showTapZoneLayoutPreview) { - previousTapZoneLayout.current = tapZoneLayout; - previousTapZoneInvertMode.current = tapZoneInvertMode; setShowPreview(true); } - }, [readingMode, tapZoneInvertMode, shouldShowReadingModePreview, shouldShowTapZoneLayoutPreview]); + previousTapZoneLayout.current = tapZoneLayout; + previousTapZoneInvertMode.current = tapZoneInvertMode; + }, [ + readingMode.value, + readingMode.isDefault, + tapZoneLayout.value, + tapZoneLayout.isDefault, + tapZoneInvertMode.value, + tapZoneInvertMode.isDefault, + ]); // set chapters state useEffect(() => {