Structure "reader" in sub-features

src/features/reader/services/ReaderControls.ts

@@ -17,7 +17,7 @@ import {
     getPage,
     getPageForMousePos,
     getProgressBarPositionInfo,
-} from '@/features/reader/utils/ReaderProgressBar.utils.tsx';
+} from '@/features/reader/overlay/progress-bar/ReaderProgressBar.utils.tsx';
 import { getOptionForDirection } from '@/features/theme/services/ThemeCreator.ts';
 import { ReaderService } from '@/features/reader/services/ReaderService.ts';
 import { useReaderStateChaptersContext } from '@/features/reader/contexts/state/ReaderStateChaptersContext.tsx';
@@ -28,32 +28,35 @@ import {
     ReaderTransitionPageMode,
     ReadingDirection,
     ReadingMode,
-} from '@/features/reader/types/Reader.types.ts';
+} from '@/features/reader/Reader.types.ts';
 import { ScrollDirection, ScrollOffset } from '@/features/core/Core.types.ts';
-import { READING_DIRECTION_TO_THEME_DIRECTION } from '@/features/reader/constants/ReaderSettings.constants.tsx';
+import { READING_DIRECTION_TO_THEME_DIRECTION } from '@/features/reader/settings/ReaderSettings.constants.tsx';
 import {
     isATransitionPageVisible,
     isEndOfPageInViewport,
     isPageInViewport,
-} from '@/features/reader/utils/ReaderPager.utils.tsx';
-import { useReaderOverlayContext } from '@/features/reader/contexts/ReaderOverlayContext.tsx';
-import { useReaderTapZoneContext } from '@/features/reader/contexts/ReaderTapZoneContext.tsx';
-import { TapZoneRegionType, TReaderTapZoneContext } from '@/features/reader/types/TapZoneLayout.types.ts';
-import { ReaderTapZoneService } from '@/features/reader/services/ReaderTapZoneService.ts';
-import { isContinuousReadingMode } from '@/features/reader/utils/ReaderSettings.utils.tsx';
+} from '@/features/reader/viewer/pager/ReaderPager.utils.tsx';
+import { useReaderOverlayContext } from '@/features/reader/overlay/contexts/ReaderOverlayContext.tsx';
+import { useReaderTapZoneContext } from '@/features/reader/tap-zones/contexts/ReaderTapZoneContext.tsx';
+import { TapZoneRegionType, TReaderTapZoneContext } from '@/features/reader/tap-zones/TapZoneLayout.types.ts';
+import { ReaderTapZoneService } from '@/features/reader/tap-zones/ReaderTapZoneService.ts';
+import { isContinuousReadingMode } from '@/features/reader/settings/ReaderSettings.utils.tsx';
 import {
     getReaderChapterFromCache,
     getReaderOpenChapterResumeMode,
     updateReaderStateVisibleChapters,
-} from '@/features/reader/utils/Reader.utils.ts';
+} from '@/features/reader/Reader.utils.ts';
 import { Chapters } from '@/features/chapter/services/Chapters.ts';
 import { DirectionOffset, TranslationKey } from '@/Base.types.ts';
 import { useMetadataServerSettings } from '@/features/settings/services/ServerSettingsMetadata.ts';
 import { ChapterIdInfo, TChapterReader } from '@/features/chapter/Chapter.types.ts';
 import { awaitConfirmation } from '@/features/core/utils/AwaitableDialog.tsx';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { TReaderOverlayContext } from '@/features/reader/types/ReaderOverlay.types.ts';
-import { ReaderProgressBarProps, TReaderProgressCurrentPage } from '@/features/reader/types/ReaderProgressBar.types.ts';
+import { TReaderOverlayContext } from '@/features/reader/overlay/ReaderOverlay.types.ts';
+import {
+    ReaderProgressBarProps,
+    TReaderProgressCurrentPage,
+} from '@/features/reader/overlay/progress-bar/ReaderProgressBar.types.ts';
 
 const getScrollDirectionInvert = (
     scrollDirection: ScrollDirection,

src/features/reader/services/ReaderService.ts

@@ -21,12 +21,12 @@ import {
     ReaderStateChapters,
     ReadingDirection,
     ReadingMode,
-} from '@/features/reader/types/Reader.types.ts';
+} from '@/features/reader/Reader.types.ts';
 import { useReaderStateMangaContext } from '@/features/reader/contexts/state/ReaderStateMangaContext.tsx';
 import {
     convertFromReaderSettingsWithDefaultFlag,
     updateReaderSettings,
-} from '@/features/reader/services/ReaderSettingsMetadata.ts';
+} from '@/features/reader/settings/ReaderSettingsMetadata.ts';
 import { MangaIdInfo } from '@/features/manga/Manga.types.ts';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { MANGA_META_FIELDS } from '@/lib/graphql/fragments/MangaFragments.ts';
@@ -35,7 +35,7 @@ import { MediaQuery } from '@/features/core/utils/MediaQuery.tsx';
 import { GLOBAL_METADATA } from '@/lib/graphql/fragments/Fragments.ts';
 import { updateMetadataList } from '@/features/metadata/services/MetadataApolloCacheHandler.ts';
 import { useBackButton } from '@/features/core/hooks/useBackButton.ts';
-import { GLOBAL_READER_SETTING_KEYS } from '@/features/reader/constants/ReaderSettings.constants.tsx';
+import { GLOBAL_READER_SETTING_KEYS } from '@/features/reader/settings/ReaderSettings.constants.tsx';
 import { useReaderStateSettingsContext } from '@/features/reader/contexts/state/ReaderStateSettingsContext.tsx';
 import { UpdateChapterPatchInput } from '@/lib/graphql/generated/graphql.ts';
 import { useReaderStateChaptersContext } from '@/features/reader/contexts/state/ReaderStateChaptersContext.tsx';
@@ -47,7 +47,7 @@ import {
     getReaderChapterFromCache,
     isInDownloadAheadRange,
     updateReaderStateVisibleChapters,
-} from '@/features/reader/utils/Reader.utils.ts';
+} from '@/features/reader/Reader.utils.ts';
 import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
 import { Queue } from '@/lib/Queue.ts';
 import { AppRoutes } from '@/features/core/AppRoute.constants.ts';

src/features/reader/services/ReaderSettingsMetadata.ts

@@ -1,257 +0,0 @@
-/*
- * 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 { useEffect, useMemo } from 'react';
-// eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
-import { requestManager } from '@/lib/requests/RequestManager.ts';
-import {
-    requestUpdateMangaMetadata,
-    requestUpdateServerMetadata,
-} from '@/features/metadata/services/MetadataUpdater.ts';
-import { MangaType } from '@/lib/graphql/generated/graphql.ts';
-import { IReaderSettings, IReaderSettingsWithDefaultFlag, ReadingMode } from '@/features/reader/types/Reader.types.ts';
-import { convertFromGqlMeta } from '@/features/metadata/services/MetadataConverter.ts';
-import { getMetadataFrom } from '@/features/metadata/services/MetadataReader.ts';
-import {
-    AllowedMetadataValueTypes,
-    GqlMetaHolder,
-    Metadata,
-    MetadataHolder,
-    MetadataHolderType,
-} from '@/features/metadata/Metadata.types.ts';
-import { defaultPromiseErrorHandler } from '@/lib/DefaultPromiseErrorHandler.ts';
-import { MangaIdInfo } from '@/features/manga/Manga.types.ts';
-import {
-    DEFAULT_READER_SETTINGS,
-    GLOBAL_READER_SETTING_KEYS,
-} from '@/features/reader/constants/ReaderSettings.constants.tsx';
-import { DEFAULT_DEVICE, getActiveDevice } from '@/features/device/services/Device.ts';
-import { APP_METADATA_KEY_PREFIX } from '@/features/metadata/Metadata.constants.ts';
-import { extractOriginalKey } from '@/features/metadata/Metadata.utils.ts';
-
-export const convertFromReaderSettingsWithDefaultFlag = (settings: IReaderSettingsWithDefaultFlag): IReaderSettings =>
-    Object.fromEntries(
-        Object.entries(settings).map(([key, value]) => [
-            key,
-            Object.hasOwn(value, 'value') && Object.hasOwn(value, 'isDefault') ? value.value : value,
-        ]),
-    ) as IReaderSettings;
-
-const convertToSettingsWithDefaultFlag = (
-    type: Extract<MetadataHolderType, 'global' | 'manga'>,
-    settings: IReaderSettings,
-    metadataHolder: MetadataHolder,
-): IReaderSettingsWithDefaultFlag => {
-    const activeDevice = getActiveDevice();
-    const istDefaultDevice = activeDevice === DEFAULT_DEVICE;
-    const existingSettings = Object.keys(metadataHolder.meta ?? {})
-        // settings that are not for the active device need to be filtered out, otherwise, they mess up the "isDefault" flag
-        .filter((metaKey) => {
-            // the default device is not added as a prefix to the key, thus, there should only be the app prefix for these reader settings
-            if (istDefaultDevice) {
-                return metaKey.match(/_/g)?.length === 1;
-            }
-
-            return metaKey.startsWith(`${APP_METADATA_KEY_PREFIX}_${activeDevice}_`);
-        })
-        .map((metaKey) => extractOriginalKey(metaKey));
-    const settingsWithDefault = Object.fromEntries(
-        (Object.entries(settings) as [keyof IReaderSettings, IReaderSettings[keyof IReaderSettings]][]).map(
-            ([key, value]) => {
-                const isGlobalSetting = GLOBAL_READER_SETTING_KEYS.includes(key);
-                if (isGlobalSetting) {
-                    return [key, value];
-                }
-
-                const isDefaultSetting = type === 'manga' && !existingSettings.includes(key);
-                return [
-                    key,
-                    {
-                        value,
-                        isDefault: isDefaultSetting,
-                    },
-                ];
-            },
-        ),
-    ) as IReaderSettingsWithDefaultFlag;
-
-    return settingsWithDefault;
-};
-
-const convertSettingsToMetadata = (
-    settings: Partial<IReaderSettings>,
-): Metadata<string, AllowedMetadataValueTypes> => ({
-    ...settings,
-    tapZoneInvertMode: JSON.stringify(settings.tapZoneInvertMode),
-    customFilter: JSON.stringify(settings.customFilter),
-    readerWidth: JSON.stringify(settings.readerWidth),
-    hotkeys: JSON.stringify(settings.hotkeys),
-    autoScroll: JSON.stringify(settings.autoScroll),
-});
-
-export const DEFAULT_READER_SETTINGS_WITH_DEFAULT_FLAG = convertToSettingsWithDefaultFlag(
-    'global',
-    DEFAULT_READER_SETTINGS,
-    { meta: convertSettingsToMetadata(DEFAULT_READER_SETTINGS) as Metadata },
-);
-
-export const getReaderSettings = (
-    type: Extract<MetadataHolderType, 'global' | 'manga'>,
-    metadataHolder: (MangaIdInfo & MetadataHolder) | MetadataHolder,
-    defaultSettings: IReaderSettings = DEFAULT_READER_SETTINGS,
-    useEffectFn?: typeof useEffect,
-    profile?: ReadingMode,
-): IReaderSettings =>
-    getMetadataFrom(
-        type as Parameters<typeof getMetadataFrom>[0],
-        metadataHolder as Parameters<typeof getMetadataFrom>[1],
-        defaultSettings,
-        profile !== undefined ? [profile.toString()] : undefined,
-        useEffectFn,
-    );
-
-function getReaderSettingsWithDefaultValueFallback(
-    type: 'global',
-    metadataHolder: MetadataHolder,
-    defaultSettings?: IReaderSettings,
-    useEffectFn?: typeof useEffect,
-    profile?: ReadingMode,
-): IReaderSettingsWithDefaultFlag;
-function getReaderSettingsWithDefaultValueFallback(
-    type: 'manga',
-    metadataHolder: MangaIdInfo & MetadataHolder,
-    defaultSettings?: IReaderSettings,
-    useEffectFn?: typeof useEffect,
-    profile?: ReadingMode,
-): IReaderSettingsWithDefaultFlag;
-function getReaderSettingsWithDefaultValueFallback(
-    type: Extract<MetadataHolderType, 'global' | 'manga'>,
-    metadataHolder: (MangaIdInfo & MetadataHolder) | MetadataHolder,
-    defaultSettings: IReaderSettings = DEFAULT_READER_SETTINGS,
-    useEffectFn?: typeof useEffect,
-    profile?: ReadingMode,
-): IReaderSettingsWithDefaultFlag {
-    const settings = getReaderSettings(type, metadataHolder, defaultSettings, useEffectFn, profile);
-    return convertToSettingsWithDefaultFlag(type, settings, metadataHolder);
-}
-
-const getSettings = (
-    metaHolder: MangaIdInfo & GqlMetaHolder,
-    defaultSettings?: IReaderSettings,
-    useEffectFn?: typeof useEffect,
-    profile?: ReadingMode,
-): IReaderSettingsWithDefaultFlag =>
-    getReaderSettingsWithDefaultValueFallback(
-        'manga',
-        {
-            ...metaHolder,
-            meta: convertFromGqlMeta(
-                metaHolder.meta,
-                (key) => !GLOBAL_READER_SETTING_KEYS.includes(extractOriginalKey(key)),
-            ),
-        },
-        defaultSettings,
-        useEffectFn,
-        profile,
-    );
-
-export const getReaderSettingsFor = (
-    metaHolder: MangaIdInfo & GqlMetaHolder,
-    defaultSettings: IReaderSettings,
-): IReaderSettingsWithDefaultFlag => getSettings(metaHolder, defaultSettings);
-
-export const useGetReaderSettingsFor = (
-    metaHolder: MangaIdInfo & GqlMetaHolder,
-    defaultSettings: IReaderSettings,
-    profile?: ReadingMode,
-): IReaderSettingsWithDefaultFlag => {
-    const settings = getSettings(metaHolder, defaultSettings, useEffect, profile);
-    return useMemo(() => settings, [metaHolder, defaultSettings, profile]);
-};
-
-export const useDefaultReaderSettings = (
-    profile?: ReadingMode,
-): {
-    metadata?: Metadata;
-    settings: IReaderSettings;
-    loading: boolean;
-    request: ReturnType<typeof requestManager.useGetGlobalMeta>;
-} => {
-    const request = requestManager.useGetGlobalMeta({ notifyOnNetworkStatusChange: true });
-    const { data, loading } = request;
-    const metadata = useMemo(() => convertFromGqlMeta(data?.metas.nodes), [data?.metas.nodes]);
-    const metaHolder: MetadataHolder = useMemo(() => ({ meta: metadata }), [metadata]);
-    const tmpSettings = getReaderSettings('global', metaHolder, undefined, useEffect, profile);
-    const settings = useMemo(() => tmpSettings, [metaHolder, profile]);
-
-    return useMemo(
-        () => ({
-            metadata,
-            settings,
-            loading,
-            request,
-        }),
-        [metadata, settings, loading, request],
-    );
-};
-
-export const useDefaultReaderSettingsWithDefaultFlag = (
-    profile?: ReadingMode,
-): {
-    metadata?: Metadata;
-    settings: IReaderSettingsWithDefaultFlag;
-    loading: boolean;
-    request: ReturnType<typeof requestManager.useGetGlobalMeta>;
-} => {
-    const request = requestManager.useGetGlobalMeta({ notifyOnNetworkStatusChange: true });
-    const { data, loading } = request;
-    const metadata = useMemo(() => convertFromGqlMeta(data?.metas.nodes), [data?.metas.nodes]);
-    const metaHolder: MetadataHolder = useMemo(() => ({ meta: metadata }), [metadata]);
-    const tmpSettings = getReaderSettingsWithDefaultValueFallback('global', metaHolder, undefined, useEffect, profile);
-    const settings = useMemo(() => tmpSettings, [metaHolder, profile]);
-
-    return useMemo(
-        () => ({
-            metadata,
-            settings,
-            loading,
-            request,
-        }),
-        [metadata, settings, loading, request],
-    );
-};
-
-export const updateReaderSettings = async <Setting extends keyof IReaderSettings = keyof IReaderSettings>(
-    manga: Pick<MangaType, 'id'> & GqlMetaHolder,
-    setting: Setting,
-    value: IReaderSettings[Setting],
-    isGlobal: boolean = false,
-    profile?: ReadingMode,
-): Promise<void[]> => {
-    const isGlobalSetting = isGlobal || GLOBAL_READER_SETTING_KEYS.includes(setting);
-    if (isGlobalSetting) {
-        return requestUpdateServerMetadata(
-            [[setting, convertSettingsToMetadata({ [setting]: value })[setting]]],
-            profile !== undefined ? [profile?.toString()] : undefined,
-        );
-    }
-
-    return requestUpdateMangaMetadata(
-        manga,
-        [[setting, convertSettingsToMetadata({ [setting]: value })[setting]]],
-        profile !== undefined ? [profile?.toString()] : undefined,
-    );
-};
-export const createUpdateReaderSettings =
-    <Settings extends keyof IReaderSettings>(
-        manga: Pick<MangaType, 'id'> & GqlMetaHolder,
-        handleError: (error: any) => void = defaultPromiseErrorHandler('createUpdateReaderSettings'),
-        profile?: ReadingMode,
-    ): ((...args: OmitFirst<Parameters<typeof updateReaderSettings<Settings>>>) => Promise<void | void[]>) =>
-    (setting, value, isGlobal) =>
-        updateReaderSettings(manga, setting, value, isGlobal, profile).catch(handleError);

src/features/reader/services/ReaderTapZoneService.ts

@@ -1,196 +0,0 @@
-/*
- * 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 i18next, { t as translate } from 'i18next';
-import { CSSProperties } from 'react';
-import {
-    ReaderTapZoneRect,
-    TapZoneInvertMode,
-    TapZoneLayouts,
-    TapZoneRegion,
-    TapZoneRegionType,
-} from '@/features/reader/types/TapZoneLayout.types.ts';
-import {
-    READER_TAP_ZONE_LAYOUTS,
-    TAP_ZONE_REGION_TYPE_DATA,
-} from '@/features/reader/constants/ReaderTapZone.constants.ts';
-
-interface InvertMode extends TapZoneInvertMode {
-    isRTL: boolean;
-}
-
-export class ReaderTapZoneService {
-    private static layout: TapZoneLayouts | null = null;
-
-    private static canvas: HTMLCanvasElement | null = null;
-
-    private static width: number | null = null;
-
-    private static height: number | null = null;
-
-    private static language: string | null = null;
-
-    private static invertMode: InvertMode | null = null;
-
-    private static regions: TapZoneRegion[] | null = null;
-
-    private static fontStyle: CSSProperties | null = null;
-
-    private static invertVertical = ([x, y, width, height]: ReaderTapZoneRect): ReaderTapZoneRect => [
-        x,
-        100 - (y + height),
-        width,
-        height,
-    ];
-
-    private static invertHorizontal = ([x, y, width, height]: ReaderTapZoneRect): ReaderTapZoneRect => [
-        100 - (x + width),
-        y,
-        width,
-        height,
-    ];
-
-    private static invertRect(rect: ReaderTapZoneRect, { vertical, horizontal, isRTL }: InvertMode): ReaderTapZoneRect {
-        const rectInvertedVertical = vertical ? this.invertVertical(rect) : rect;
-        const rectInvertedHorizontal = horizontal ? this.invertHorizontal(rectInvertedVertical) : rectInvertedVertical;
-        return isRTL ? this.invertHorizontal(rectInvertedHorizontal) : rectInvertedHorizontal;
-    }
-
-    private static getRegions(layout: TapZoneLayouts, invertMode: InvertMode): TapZoneRegion[] {
-        const regions = READER_TAP_ZONE_LAYOUTS[layout];
-
-        return regions.map(({ type, rect }) => ({ type, rect: this.invertRect(rect, invertMode) }));
-    }
-
-    private static isCanvasReusable(
-        layout: TapZoneLayouts,
-        canvasWidth: number,
-        canvasHeight: number,
-        fontStyle: CSSProperties,
-        invertMode: InvertMode,
-    ): boolean {
-        const isSameLayout = this.layout === layout;
-        const isSameWidth = this.width === canvasWidth;
-        const isSameHeight = this.height === canvasHeight;
-        const doesCanvasExist = !!this.canvas;
-        const isSameLanguage = this.language === i18next.language;
-        const isSameInvertMode =
-            this.invertMode?.vertical === invertMode.vertical &&
-            this.invertMode.horizontal === invertMode.horizontal &&
-            this.invertMode.isRTL === invertMode.isRTL;
-        const isSameFontStyle = this.fontStyle === fontStyle;
-
-        return (
-            doesCanvasExist &&
-            isSameWidth &&
-            isSameHeight &&
-            isSameLayout &&
-            isSameLanguage &&
-            isSameInvertMode &&
-            isSameFontStyle
-        );
-    }
-
-    private static drawCanvas(
-        context: CanvasRenderingContext2D,
-        canvasWidth: number,
-        canvasHeight: number,
-        fontStyle: CSSProperties,
-        regions: TapZoneRegion[],
-    ): void {
-        regions.forEach(({ type, rect: [rectX, rectY, rectWidth, rectHeight] }) => {
-            const { text: translationKey, color } = TAP_ZONE_REGION_TYPE_DATA[type];
-            const text = translate(translationKey);
-
-            const calcActualValue = (value: number, size: number) => (value / 100) * size;
-            const x = calcActualValue(rectX, canvasWidth);
-            const y = calcActualValue(rectY, canvasHeight);
-            const width = calcActualValue(rectWidth, canvasWidth);
-            const height = calcActualValue(rectHeight, canvasHeight);
-
-            const calcRectCenter = (pos1: number, pos2: number) => (pos1 + pos2) * 0.5 + pos1 * 0.5;
-            const rectCenterX = calcRectCenter(x, width);
-            const rectCenterY = calcRectCenter(y, height);
-
-            context.beginPath();
-
-            context.rect(x, y, width, height);
-            context.fillStyle = color;
-            context.strokeStyle = color;
-            context.lineWidth = 0.1;
-
-            context.stroke();
-            context.fill();
-
-            context.strokeStyle = 'black';
-            context.textAlign = 'center';
-            context.textBaseline = 'middle';
-            context.font = `${fontStyle.fontSize} ${fontStyle.fontFamily}`;
-
-            context.strokeStyle = 'black';
-            context.lineWidth = 3;
-            context.strokeText(text, rectCenterX, rectCenterY);
-
-            context.lineWidth = 1;
-            context.fillStyle = 'white';
-            context.fillText(text, rectCenterX, rectCenterY);
-        });
-    }
-
-    static getOrCreateCanvas(
-        layout: TapZoneLayouts,
-        canvasWidth: number,
-        canvasHeight: number,
-        fontStyle: CSSProperties,
-        invertMode: InvertMode,
-    ): HTMLCanvasElement {
-        if (this.isCanvasReusable(layout, canvasWidth, canvasHeight, fontStyle, invertMode)) {
-            return this.canvas!;
-        }
-
-        const canvas = document.createElement('canvas');
-        const context = canvas.getContext('2d')!;
-
-        context.canvas.width = canvasWidth;
-        context.canvas.height = canvasHeight;
-
-        const regions = this.getRegions(layout, invertMode);
-        this.drawCanvas(context, canvasWidth, canvasHeight, fontStyle, regions);
-
-        this.layout = layout;
-        this.canvas = canvas;
-        this.width = canvasWidth;
-        this.height = canvasHeight;
-        this.language = i18next.language;
-        this.invertMode = invertMode;
-        this.regions = regions;
-        this.fontStyle = fontStyle;
-
-        return canvas;
-    }
-
-    private static doesRegionContainPos(region: TapZoneRegion, x: number, y: number): boolean {
-        const [rectX, rectY, width, height] = region.rect;
-
-        return x >= rectX && x <= rectX + width && y >= rectY && y <= rectY + height;
-    }
-
-    static getAction(x: number, y: number): TapZoneRegionType {
-        const xPercentage = (x / this.width!) * 100;
-        const yPercentage = (y / this.height!) * 100;
-        const region = this.regions?.find((regionToCheck) =>
-            this.doesRegionContainPos(regionToCheck, xPercentage, yPercentage),
-        );
-
-        if (region) {
-            return region.type;
-        }
-
-        return TapZoneRegionType.MENU;
-    }
-}