Properly disable hotkey scopes for open reader settings
This commit is contained in:
@@ -6,21 +6,27 @@
|
|||||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useRef } from 'react';
|
||||||
import { useHotkeysContext } from 'react-hotkeys-hook';
|
import { useHotkeysContext } from 'react-hotkeys-hook';
|
||||||
import { HotkeyScope } from '@/modules/hotkeys/Hotkeys.types.ts';
|
import { HotkeyScope } from '@/modules/hotkeys/Hotkeys.types.ts';
|
||||||
|
|
||||||
export const useDisableAllHotkeysWhileMounted = () => {
|
export const useDisableAllHotkeysWhileMounted = (shouldDisable?: boolean) => {
|
||||||
const { enabledScopes, enableScope, disableScope } = useHotkeysContext();
|
const { enabledScopes, enableScope, disableScope } = useHotkeysContext();
|
||||||
const [previouslyEnabledScopes] = useState(enabledScopes);
|
const previouslyEnabledScopes = useRef<typeof enabledScopes>([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (!shouldDisable) {
|
||||||
|
return () => {};
|
||||||
|
}
|
||||||
|
|
||||||
|
previouslyEnabledScopes.current = [...enabledScopes];
|
||||||
|
|
||||||
enableScope(HotkeyScope.NONE);
|
enableScope(HotkeyScope.NONE);
|
||||||
previouslyEnabledScopes.forEach(disableScope);
|
previouslyEnabledScopes.current.forEach(disableScope);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
disableScope(HotkeyScope.NONE);
|
disableScope(HotkeyScope.NONE);
|
||||||
previouslyEnabledScopes.forEach(enableScope);
|
previouslyEnabledScopes.current.forEach(enableScope);
|
||||||
};
|
};
|
||||||
}, []);
|
}, [shouldDisable]);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ export const ReaderSettings = ({ isOpen, close }: { isOpen: boolean; close: () =
|
|||||||
const { manga } = useReaderStateMangaContext();
|
const { manga } = useReaderStateMangaContext();
|
||||||
const settings = ReaderService.useSettings();
|
const settings = ReaderService.useSettings();
|
||||||
|
|
||||||
useDisableAllHotkeysWhileMounted();
|
useDisableAllHotkeysWhileMounted(isOpen);
|
||||||
|
|
||||||
const [activeTab, setActiveTab] = useState(0);
|
const [activeTab, setActiveTab] = useState(0);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user