refactor: ♻️ 统一 fab 显示逻辑

Author: hymbz

src/userscript/core/index.ts

@@ -72,6 +72,8 @@ export type CoreStore<T extends Record<string, any>> = {
     isStored: boolean;
     /** 当前是否还需要判断 autoShow */
     needAutoShow: boolean;
+    /** 当前是否有对应的页面处理逻辑 */
+    hasPageHandler: boolean;
   };
 };
 

src/userscript/core/siteAdapter.ts

@@ -170,7 +170,8 @@ export const setupSiteAdapter = async <
     const isMangePage = newPageCtx?.type === 'manga';
 
     setState((state) => {
-      state.fab.show = isMangePage ? undefined : false;
+      state.flag.hasPageHandler =
+        Boolean(newPageCtx?.type) && Reflect.has(handlers, newPageCtx!.type);
       state.manga.show = false;
     });
 

src/userscript/core/useFab.tsx

@@ -105,7 +105,6 @@ export const useFab = <T extends Record<string, any>>(
 
         state.fab.progress = 1 + loadNum / totalNum;
         state.fab.tip = t('other.read_mode');
-        state.fab.show = !options.hiddenFab && undefined;
       }),
   );
 

src/userscript/core/useInit.tsx

@@ -12,6 +12,7 @@ import {
   t,
   useStore,
 } from 'helper';
+import { createEffect } from 'solid-js';
 
 import { type CoreContext, type CoreStore, type SiteOptions } from '.';
 import { useFab } from './useFab';
@@ -67,6 +68,7 @@ export const useInit = async <T extends Record<string, unknown>>(
     flag: {
       isStored: saveOptions !== undefined,
       needAutoShow: true,
+      hasPageHandler: false,
     },
   });
   setDefaultHotkeys((_hotkeys) => ({
@@ -131,7 +133,6 @@ export const useInit = async <T extends Record<string, unknown>>(
 
     setState('fab', {
       onClick: () => void showComic(),
-      show: !options.hiddenFab && undefined,
     });
 
     if (autoShow && store.flag.needAutoShow && options.autoShow)
@@ -219,6 +220,18 @@ export const useInit = async <T extends Record<string, unknown>>(
     return comic.imgList.filter((_, i) => !comic.adList?.has(i));
   });
 
+  createEffect(() => {
+    // 多选模式下悬浮按钮持续显示
+    if (store.fab.multiSelectCount !== undefined)
+      return setState('fab', 'show', true);
+
+    setState(
+      'fab',
+      'show',
+      store.flag.hasPageHandler && !options.hiddenFab ? undefined : false,
+    );
+  });
+
   createEffectOn(
     nowImgList,
     (list) => list && setState('manga', 'imgList', list),
@@ -235,7 +248,6 @@ export const useInit = async <T extends Record<string, unknown>>(
       options.hiddenFab ? t('other.fab_show') : t('other.fab_hidden'),
       () => {
         setOptions({ hiddenFab: !options.hiddenFab });
-        setState('fab', 'show', !options.hiddenFab && undefined);
         return updateHideFabMenu();
       },
     );

src/userscript/multiSelect/useMultiSelectLoad.tsx

@@ -34,7 +34,7 @@ export type UseMultiSelectLoadOptions = {
 };
 
 export const useMultiSelectLoad = <T extends Record<string, any>>(
-  { setState, showComic, options }: CoreContext<T>,
+  { setState, showComic }: CoreContext<T>,
   { id: initListid, onStart, getImgList }: UseMultiSelectLoadOptions,
 ) =>
   createRoot(async (dispose) => {
@@ -84,7 +84,6 @@ export const useMultiSelectLoad = <T extends Record<string, any>>(
           if (enabled) {
             state.fab.multiSelectCount = count;
             state.fab.onClick = multiSelectLoad;
-            state.fab.show = true;
             state.fab.overrideSpeedDial = [
               {
                 name: t('other.clear'),
@@ -95,7 +94,6 @@ export const useMultiSelectLoad = <T extends Record<string, any>>(
           } else {
             state.fab.multiSelectCount = undefined;
             state.fab.onClick = showComic;
-            state.fab.show = !options.hiddenFab && undefined;
             state.fab.overrideSpeedDial = undefined;
           }
         });