From 1228b5ac2aabdd4eb332d80c1f5e75564d6e2518 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Tue, 2 Jun 2026 13:39:47 +0200 Subject: [PATCH] Rename "MultiValueButton" props to "SelectButton" props --- src/base/components/buttons/SelectButton.tsx | 15 +++++++-------- .../components/ReaderNavBarDesktopPageScale.tsx | 4 ++-- .../ReaderNavBarDesktopReadingDirection.tsx | 4 ++-- .../components/ReaderNavBarDesktopReadingMode.tsx | 4 ++-- .../layout/components/ReaderSettingPageGap.tsx | 4 ++-- .../components/ReaderSettingPageScaleMode.tsx | 4 ++-- .../components/ReaderSettingReadingDirection.tsx | 4 ++-- .../components/ReaderSettingReadingMode.tsx | 4 ++-- .../components/ReaderSettingTapZoneInvertMode.tsx | 4 ++-- .../components/ReaderSettingTapZoneLayout.tsx | 4 ++-- .../layout/components/ReaderSettingWidth.tsx | 4 ++-- 11 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/base/components/buttons/SelectButton.tsx b/src/base/components/buttons/SelectButton.tsx index 4a4cffe5..691ca660 100644 --- a/src/base/components/buttons/SelectButton.tsx +++ b/src/base/components/buttons/SelectButton.tsx @@ -13,7 +13,7 @@ import { CustomTooltip } from '@/base/components/CustomTooltip.tsx'; import { Superscript } from '@/base/components/texts/Superscript.tsx'; import type { ValueToDisplayData } from '@/base/Base.types.ts'; -export interface MultiValueButtonBaseProps { +export interface SelectButtonBaseProps { value: MultiValue; defaultValue?: Value; values: Value[]; @@ -21,18 +21,17 @@ export interface MultiValueButtonBaseProps; } -export interface MultiValueButtonDefaultableProps< +export interface SelectButtonDefaultableProps< Value extends string | number, MultiValue extends Value | Value[] = Value, -> extends OptionalProperty, 'value'> { +> extends OptionalProperty, 'value'> { isDefaultable?: boolean; onDefault?: () => void; } -export type MultiValueButtonProps = - | (MultiValueButtonBaseProps & - PropertiesNever>) - | MultiValueButtonDefaultableProps; +export type SelectButtonProps = + | (SelectButtonBaseProps & PropertiesNever>) + | SelectButtonDefaultableProps; export const SelectButton = ({ value, @@ -42,7 +41,7 @@ export const SelectButton = ) => { +}: SelectButtonProps) => { const { t } = useLingui(); return ( diff --git a/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopPageScale.tsx b/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopPageScale.tsx index 3af76921..ec1d224d 100644 --- a/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopPageScale.tsx +++ b/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopPageScale.tsx @@ -22,7 +22,7 @@ import { READER_PAGE_SCALE_MODE_VALUES, } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { CustomIconButton } from '@/base/components/buttons/CustomIconButton.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderNavBarDesktopPageScale = ({ pageScaleMode, @@ -30,7 +30,7 @@ export const ReaderNavBarDesktopPageScale = ({ updateSetting, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { updateSetting: >( setting: Setting, value: IReaderSettings[Setting], diff --git a/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingDirection.tsx b/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingDirection.tsx index de52c10f..2e19cb35 100644 --- a/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingDirection.tsx +++ b/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingDirection.tsx @@ -14,14 +14,14 @@ import { READING_DIRECTION_VALUE_TO_DISPLAY_DATA, } from '@/features/reader/settings/ReaderSettings.constants.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderNavBarDesktopReadingDirection = ({ readingDirection, setReadingDirection, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setReadingDirection: (readingDirection: ReadingDirection) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingMode.tsx b/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingMode.tsx index 42b8835c..486fee0a 100644 --- a/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingMode.tsx +++ b/src/features/reader/overlay/navigation/desktop/quick-settings/components/ReaderNavBarDesktopReadingMode.tsx @@ -14,14 +14,14 @@ import { READING_MODE_VALUES, } from '@/features/reader/settings/ReaderSettings.constants.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderNavBarDesktopReadingMode = ({ readingMode, setReadingMode, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setReadingMode: (mode: ReadingMode) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingPageGap.tsx b/src/features/reader/settings/layout/components/ReaderSettingPageGap.tsx index 5d6a3e66..7d51d40f 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingPageGap.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingPageGap.tsx @@ -13,7 +13,7 @@ import { SliderInput } from '@/base/components/inputs/SliderInput.tsx'; import { DEFAULT_READER_SETTINGS, PAGE_GAP } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { isContinuousReadingMode } from '@/features/reader/settings/ReaderSettings.utils.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderSettingPageGap = ({ pageGap, @@ -22,7 +22,7 @@ export const ReaderSettingPageGap = ({ onDefault, updateSetting, }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { updateSetting: (gap: number, commit: boolean) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingPageScaleMode.tsx b/src/features/reader/settings/layout/components/ReaderSettingPageScaleMode.tsx index 73a836ba..21314458 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingPageScaleMode.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingPageScaleMode.tsx @@ -18,14 +18,14 @@ import { } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { ButtonSelectInput } from '@/base/components/inputs/ButtonSelectInput.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderSettingPageScaleMode = ({ pageScaleMode, setPageScaleMode, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setPageScaleMode: (mode: IReaderSettings['pageScaleMode']) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingReadingDirection.tsx b/src/features/reader/settings/layout/components/ReaderSettingReadingDirection.tsx index d13153c8..8c697e64 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingReadingDirection.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingReadingDirection.tsx @@ -14,7 +14,7 @@ import type { IReaderSettingsWithDefaultFlag } from '@/features/reader/Reader.ty import { ReadingDirection } from '@/features/reader/Reader.types.ts'; import type { ValueToDisplayData } from '@/base/Base.types.ts'; import { ButtonSelectInput } from '@/base/components/inputs/ButtonSelectInput.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; const VALUE_TO_DISPLAY_DATA: ValueToDisplayData = { [ReadingDirection.LTR]: { @@ -34,7 +34,7 @@ export const ReaderSettingReadingDirection = ({ setReadingDirection, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setReadingDirection: (readingDirection: ReadingDirection) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingReadingMode.tsx b/src/features/reader/settings/layout/components/ReaderSettingReadingMode.tsx index cf06e2d2..915f0efe 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingReadingMode.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingReadingMode.tsx @@ -14,14 +14,14 @@ import { } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { ButtonSelectInput } from '@/base/components/inputs/ButtonSelectInput.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderSettingReadingMode = ({ readingMode, setReadingMode, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setReadingMode: (mode: ReadingMode) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingTapZoneInvertMode.tsx b/src/features/reader/settings/layout/components/ReaderSettingTapZoneInvertMode.tsx index 14787844..2dd31bf1 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingTapZoneInvertMode.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingTapZoneInvertMode.tsx @@ -16,7 +16,7 @@ import type { } from '@/features/reader/Reader.types.ts'; import type { TapZoneInvertMode } from '@/features/reader/tap-zones/TapZoneLayout.types.ts'; import { ButtonSelectInput } from '@/base/components/inputs/ButtonSelectInput.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; enum TapZonesInvertOption { NONE, @@ -86,7 +86,7 @@ export const ReaderSettingTapZoneInvertMode = ({ setTapZoneInvertMode, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setTapZoneInvertMode: (invert: IReaderSettings['tapZoneInvertMode']) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingTapZoneLayout.tsx b/src/features/reader/settings/layout/components/ReaderSettingTapZoneLayout.tsx index ec0841e3..470a4da2 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingTapZoneLayout.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingTapZoneLayout.tsx @@ -12,7 +12,7 @@ import { TapZoneLayouts } from '@/features/reader/tap-zones/TapZoneLayout.types. import type { ValueToDisplayData } from '@/base/Base.types.ts'; import type { IReaderSettingsWithDefaultFlag, ReadingDirection } from '@/features/reader/Reader.types.ts'; import { ButtonSelectInput } from '@/base/components/inputs/ButtonSelectInput.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; const VALUE_TO_DISPLAY_DATA: ValueToDisplayData = { [TapZoneLayouts.EDGE]: { @@ -44,7 +44,7 @@ export const ReaderSettingTapZoneLayout = ({ setTapZoneLayout, ...buttonSelectInputProps }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { setTapZoneLayout: (layout: TapZoneLayouts) => void; }) => { const { t } = useLingui(); diff --git a/src/features/reader/settings/layout/components/ReaderSettingWidth.tsx b/src/features/reader/settings/layout/components/ReaderSettingWidth.tsx index f2e87656..a80ecb61 100644 --- a/src/features/reader/settings/layout/components/ReaderSettingWidth.tsx +++ b/src/features/reader/settings/layout/components/ReaderSettingWidth.tsx @@ -15,7 +15,7 @@ import { SliderInput } from '@/base/components/inputs/SliderInput.tsx'; import { DEFAULT_READER_SETTINGS } from '@/features/reader/settings/ReaderSettings.constants.tsx'; import { isReaderWidthEditable } from '@/features/reader/settings/ReaderSettings.utils.tsx'; import { ResetButton } from '@/base/components/buttons/ResetButton.tsx'; -import type { MultiValueButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; +import type { SelectButtonDefaultableProps } from '@/base/components/buttons/SelectButton.tsx'; export const ReaderSettingWidth = ({ readerWidth, @@ -25,7 +25,7 @@ export const ReaderSettingWidth = ({ updateSetting, setTransparent, }: Pick & - Pick, 'isDefaultable' | 'onDefault'> & { + Pick, 'isDefaultable' | 'onDefault'> & { updateSetting: (...args: Parameters) => void; setTransparent?: (transparent: boolean) => void; }) => {