diff --git a/src/modules/core/components/buttons/ResetButton.tsx b/src/modules/core/components/buttons/ResetButton.tsx new file mode 100644 index 00000000..bdab835f --- /dev/null +++ b/src/modules/core/components/buttons/ResetButton.tsx @@ -0,0 +1,21 @@ +/* + * Copyright (C) Contributors to the Suwayomi project + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +import Button, { ButtonProps } from '@mui/material/Button'; +import { useTranslation } from 'react-i18next'; +import RestartAltIcon from '@mui/icons-material/RestartAlt'; + +export const ResetButton = (props: ButtonProps) => { + const { t } = useTranslation(); + + return ( + + ); +}; diff --git a/src/modules/core/components/inputs/SliderInput.tsx b/src/modules/core/components/inputs/SliderInput.tsx index c06bd1fd..e2d5afb5 100644 --- a/src/modules/core/components/inputs/SliderInput.tsx +++ b/src/modules/core/components/inputs/SliderInput.tsx @@ -9,21 +9,24 @@ import Slider, { SliderProps } from '@mui/material/Slider'; import Typography, { TypographyProps } from '@mui/material/Typography'; import Stack from '@mui/material/Stack'; +import { ResetButton } from '@/modules/core/components/buttons/ResetButton.tsx'; export const SliderInput = ({ label, value, + onDefault, slotProps, }: { label: string; value: number | string; + onDefault?: () => void; slotProps?: { label?: TypographyProps; value?: TypographyProps; slider?: SliderProps; }; }) => ( - + {label} @@ -33,5 +36,6 @@ export const SliderInput = ({ + {onDefault && } ); diff --git a/src/modules/reader/components/settings/hotkeys/ReaderHotkeysSettings.tsx b/src/modules/reader/components/settings/hotkeys/ReaderHotkeysSettings.tsx index d9ba5ad5..4082c517 100644 --- a/src/modules/reader/components/settings/hotkeys/ReaderHotkeysSettings.tsx +++ b/src/modules/reader/components/settings/hotkeys/ReaderHotkeysSettings.tsx @@ -9,11 +9,10 @@ import Stack from '@mui/material/Stack'; import { useTranslation } from 'react-i18next'; import Typography from '@mui/material/Typography'; -import Button from '@mui/material/Button'; -import RestartAltIcon from '@mui/icons-material/RestartAlt'; import { ReaderSettingsTypeProps } from '@/modules/reader/types/Reader.types.ts'; import { ReaderSettingHotkey } from '@/modules/reader/components/settings/hotkeys/ReaderSettingHotkey.tsx'; import { DEFAULT_READER_SETTINGS, READER_HOTKEYS } from '@/modules/reader/constants/ReaderSettings.constants.tsx'; +import { ResetButton } from '@/modules/core/components/buttons/ResetButton.tsx'; export const ReaderHotkeysSettings = ({ settings, updateSetting }: ReaderSettingsTypeProps) => { const { t } = useTranslation(); @@ -33,13 +32,7 @@ export const ReaderHotkeysSettings = ({ settings, updateSetting }: ReaderSetting /> ))} - + updateSetting('hotkeys', DEFAULT_READER_SETTINGS.hotkeys)} /> ); diff --git a/src/modules/reader/components/settings/layout/ReaderLayoutSettings.tsx b/src/modules/reader/components/settings/layout/ReaderLayoutSettings.tsx index 71120ea5..7455e313 100644 --- a/src/modules/reader/components/settings/layout/ReaderLayoutSettings.tsx +++ b/src/modules/reader/components/settings/layout/ReaderLayoutSettings.tsx @@ -42,6 +42,8 @@ export const ReaderLayoutSettings = ({ onDefault?.('pageGap')} updateSetting={(...args) => updateSetting('pageGap', ...args)} /> onDefault?.('readerWidth')} updateSetting={(...args) => updateSetting(...args)} /> diff --git a/src/modules/reader/components/settings/layout/ReaderSettingPageGap.tsx b/src/modules/reader/components/settings/layout/ReaderSettingPageGap.tsx index 50bb2566..f3d7b543 100644 --- a/src/modules/reader/components/settings/layout/ReaderSettingPageGap.tsx +++ b/src/modules/reader/components/settings/layout/ReaderSettingPageGap.tsx @@ -7,18 +7,21 @@ */ import { useTranslation } from 'react-i18next'; -import { IReaderSettingsWithDefaultFlag, ReadingMode } from '@/modules/reader/types/Reader.types.ts'; +import { IReaderSettings, IReaderSettingsWithDefaultFlag, ReadingMode } from '@/modules/reader/types/Reader.types.ts'; import { SliderInput } from '@/modules/core/components/inputs/SliderInput.tsx'; import { DEFAULT_READER_SETTINGS } from '@/modules/reader/constants/ReaderSettings.constants.tsx'; import { isContinuousReadingMode } from '@/modules/reader/utils/ReaderSettings.utils.tsx'; +import { MultiValueButtonDefaultableProps } from '@/modules/core/Core.types.ts'; export const ReaderSettingPageGap = ({ pageGap, readingMode, + onDefault, updateSetting, -}: Pick & { - updateSetting: (gap: number, commit: boolean) => void; -}) => { +}: Pick & + Pick, 'isDefaultable' | 'onDefault'> & { + updateSetting: (gap: number, commit: boolean) => void; + }) => { const { t } = useTranslation(); const isChangeable = readingMode.value !== ReadingMode.WEBTOON && isContinuousReadingMode(readingMode.value); @@ -30,6 +33,7 @@ export const ReaderSettingPageGap = ({ & { - updateSetting: (...args: OmitFirst>) => void; -}) => { +}: Pick & + Pick, 'isDefaultable' | 'onDefault'> & { + updateSetting: (...args: OmitFirst>) => void; + }) => { const { t } = useTranslation(); if (!isReaderWidthEditable(pageScaleMode)) { @@ -30,11 +34,14 @@ export const ReaderSettingWidth = ({ return ( - updateSetting('readerWidth', { ...readerWidth, enabled: checked }, true)} - /> + + updateSetting('readerWidth', { ...readerWidth, enabled: checked }, true)} + /> + {onDefault && } + {readerWidth.enabled && (