nuxt-hs-ui 2.1.12 → 2.1.14

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "2.1.12",
+  "version": "2.1.14",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/composables/use-hs-misc.d.ts

@@ -1,4 +1,4 @@
-interface StoreState {
+export declare const useHsMisc: import("pinia").StoreDefinition<"HsMisc", Pick<{
     state: {
         isInit: boolean;
         isReady: boolean;
@@ -10,11 +10,43 @@ interface StoreState {
         };
         scrollbarWidth: number;
     };
-}
-export declare const useHsMisc: import("pinia").StoreDefinition<"HsMisc", StoreState, {}, {
-    IsMobile(): boolean;
-    Init(arg?: {
+    GetUa: () => string;
+    IsMobile: () => boolean;
+    Init: (arg?: {
         readyDeray?: number;
-    }): Promise<void>;
-}>;
-export {};
+    }) => Promise<void>;
+}, "state">, Pick<{
+    state: {
+        isInit: boolean;
+        isReady: boolean;
+        isMobile: boolean;
+        readyDeray: number;
+        window: {
+            h: number;
+            w: number;
+        };
+        scrollbarWidth: number;
+    };
+    GetUa: () => string;
+    IsMobile: () => boolean;
+    Init: (arg?: {
+        readyDeray?: number;
+    }) => Promise<void>;
+}, never>, Pick<{
+    state: {
+        isInit: boolean;
+        isReady: boolean;
+        isMobile: boolean;
+        readyDeray: number;
+        window: {
+            h: number;
+            w: number;
+        };
+        scrollbarWidth: number;
+    };
+    GetUa: () => string;
+    IsMobile: () => boolean;
+    Init: (arg?: {
+        readyDeray?: number;
+    }) => Promise<void>;
+}, "Init" | "GetUa" | "IsMobile">>;

package/dist/runtime/composables/use-hs-misc.js

@@ -1,59 +1,79 @@
 import { defineStore } from "pinia";
-import { nextTick } from "vue";
+import { nextTick, reactive } from "vue";
 import { useEventListener } from "@vueuse/core";
-import { Sleep, IsMobile } from "../utils/com.js";
-export const useHsMisc = defineStore("HsMisc", {
-  state: () => {
-    return {
-      state: {
-        isInit: false,
-        isReady: false,
-        isMobile: IsMobile(),
-        readyDeray: 10,
-        window: {
-          h: 0,
-          w: 0
-        },
-        scrollbarWidth: 0
+import { useRequestHeaders } from "#app";
+import { Sleep } from "../utils/com.js";
+export const useHsMisc = defineStore("HsMisc", () => {
+  const GetUa = () => {
+    try {
+      if (import.meta.client) {
+        if (navigator === void 0) return "";
+        return navigator.userAgent.toLowerCase();
       }
-    };
-  },
-  // ----------------------------------------------------------------------------
-  actions: {
-    IsMobile() {
-      return IsMobile();
-    },
-    // ---------------------
-    async Init(arg) {
-      await Sleep(0);
-      const state = this.state;
-      if (state.isInit) return;
-      if (arg?.readyDeray) {
-        state.readyDeray = arg.readyDeray;
+      if (import.meta.server) {
+        return useRequestHeaders(["User-Agent"])["user-agent"] || "";
       }
-      state.isInit = true;
-      state.isMobile = IsMobile();
-      const initWindow = () => {
-        useEventListener(window, "resize", () => {
-          state.window = {
-            h: window.innerHeight,
-            w: window.innerWidth
-          };
-          state.scrollbarWidth = window.innerWidth - document.body.clientWidth < 0 ? 0 : window.innerWidth - document.body.clientWidth;
-        });
+      return "";
+    } catch (err) {
+      console.error(err);
+      return "";
+    }
+  };
+  const IsMobile = () => {
+    const ua = GetUa();
+    if (/\(iPad.*OS/i.test(ua)) return true;
+    if (/iP(?:ad|hone|od)/i.test(ua)) return true;
+    if (/android|ipod|ipad|iphone|mobile/i.test(ua)) return true;
+    if (/Macintosh/.test(ua) && import.meta.client) {
+      if (navigator === void 0) return false;
+      return navigator.maxTouchPoints > 1;
+    }
+    return false;
+  };
+  const state = reactive({
+    isInit: false,
+    isReady: false,
+    isMobile: IsMobile(),
+    readyDeray: 10,
+    window: {
+      h: 0,
+      w: 0
+    },
+    scrollbarWidth: 0
+  });
+  const Init = async (arg) => {
+    await Sleep(0);
+    if (state.isInit) return;
+    if (arg?.readyDeray) {
+      state.readyDeray = arg.readyDeray;
+    }
+    state.isInit = true;
+    state.isMobile = IsMobile();
+    const initWindow = () => {
+      useEventListener(window, "resize", () => {
         state.window = {
           h: window.innerHeight,
           w: window.innerWidth
         };
-        setTimeout(() => {
-          state.scrollbarWidth = window.innerWidth - document.body.clientWidth < 0 ? 0 : window.innerWidth - document.body.clientWidth;
-        }, 1e3);
+        state.scrollbarWidth = window.innerWidth - document.body.clientWidth < 0 ? 0 : window.innerWidth - document.body.clientWidth;
+      });
+      state.window = {
+        h: window.innerHeight,
+        w: window.innerWidth
       };
-      initWindow();
-      await Sleep(state.readyDeray);
-      state.isReady = true;
-      await nextTick();
-    }
-    // ---------------------
-  }
+      setTimeout(() => {
+        state.scrollbarWidth = window.innerWidth - document.body.clientWidth < 0 ? 0 : window.innerWidth - document.body.clientWidth;
+      }, 1e3);
+    };
+    initWindow();
+    await Sleep(state.readyDeray);
+    state.isReady = true;
+    await nextTick();
+  };
+  return {
+    state,
+    GetUa,
+    IsMobile,
+    Init
+  };
 });

package/dist/runtime/utils/com.d.ts

@@ -2,8 +2,3 @@
 export declare const GenerateUniqeKey: (len?: number) => string;
 /** 一定時間処理を待機 */
 export declare const Sleep: (time: number) => Promise<unknown>;
-export declare const GetUa: () => string;
-export declare const IsTouchDevice: () => boolean;
-/** モバイル系デバイスかどうかの判定
- * - ブラウザ側で実行すること */
-export declare const IsMobile: () => boolean;

package/dist/runtime/utils/com.js

@@ -1,5 +1,4 @@
 import dayjs from "dayjs/esm/index";
-import { useRequestHeaders } from "#app";
 export const GenerateUniqeKey = (len = 32) => {
   const S = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
   const word = len < 14 ? 14 : len - 15;
@@ -12,35 +11,3 @@ export const Sleep = (time) => {
     }, time);
   });
 };
-export const GetUa = () => {
-  try {
-    if (import.meta.client) {
-      if (navigator === void 0) return "";
-      return navigator.userAgent.toLowerCase();
-    }
-    if (import.meta.server) {
-      return useRequestHeaders(["User-Agent"])["user-agent"] || "";
-    }
-    return "";
-  } catch (err) {
-    console.error(err);
-    return "";
-  }
-};
-export const IsTouchDevice = () => {
-  try {
-    if (import.meta.client) return "ontouchend" in document;
-    return false;
-  } catch (err) {
-    console.error(err);
-    return false;
-  }
-};
-export const IsMobile = () => {
-  const ua = GetUa();
-  if (/android|ipod|ipad|iphone|macintosh/.test(ua) || IsTouchDevice()) {
-    return true;
-  } else {
-    return false;
-  }
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-hs-ui",
-  "version": "2.1.12",
+  "version": "2.1.14",
   "description": "My new Nuxt module",
   "repository": "https://github.com/hare-systems-ryo/nuxt-hs-ui",
   "license": "MIT",