nuxt-hs-ui 2.1.10 → 2.1.12

package/dist/module.json

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

package/dist/runtime/components/misc/tabulator.vue

@@ -10,7 +10,14 @@
 // [ node_modules ]
 import { TabulatorFull as Tabulator } from "tabulator-tables";
 // [ NUXT ]
-import { ref, watch, computed, onMounted, onUnmounted } from "#imports";
+import {
+  ref,
+  watch,
+  computed,
+  onMounted,
+  // onUnmounted,
+  onBeforeUnmount,
+} from "#imports";
 // ----------------------------------------------------------------------------
 // [ utils ]
 import { Option } from "../../utils/tabulator";
@@ -175,7 +182,10 @@ const initTabulator = () => {
 onMounted(() => {
   initTabulator();
 });
-onUnmounted(() => {
+
+onBeforeUnmount(() => {
+  // console.log("onBeforeUnmount");
+  if (tabulator.value === null) return;
   tabulator.value.destroy();
   tabulator.value = null;
 });

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

@@ -3,8 +3,6 @@ interface StoreState {
         isInit: boolean;
         isReady: boolean;
         isMobile: boolean;
-        isBracke: boolean;
-        spBracke: number;
         readyDeray: number;
         window: {
             h: number;
@@ -14,8 +12,8 @@ interface StoreState {
     };
 }
 export declare const useHsMisc: import("pinia").StoreDefinition<"HsMisc", StoreState, {}, {
+    IsMobile(): boolean;
     Init(arg?: {
-        spBracke?: number;
         readyDeray?: number;
     }): Promise<void>;
 }>;

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

@@ -8,9 +8,7 @@ export const useHsMisc = defineStore("HsMisc", {
       state: {
         isInit: false,
         isReady: false,
-        isMobile: false,
-        isBracke: false,
-        spBracke: 768,
+        isMobile: IsMobile(),
         readyDeray: 10,
         window: {
           h: 0,
@@ -22,6 +20,9 @@ export const useHsMisc = defineStore("HsMisc", {
   },
   // ----------------------------------------------------------------------------
   actions: {
+    IsMobile() {
+      return IsMobile();
+    },
     // ---------------------
     async Init(arg) {
       await Sleep(0);
@@ -30,21 +31,16 @@ export const useHsMisc = defineStore("HsMisc", {
       if (arg?.readyDeray) {
         state.readyDeray = arg.readyDeray;
       }
-      if (arg?.spBracke) {
-        state.spBracke = arg.spBracke;
-      }
       state.isInit = true;
       state.isMobile = IsMobile();
       const initWindow = () => {
         useEventListener(window, "resize", () => {
-          state.isBracke = window.innerWidth < state.spBracke;
           state.window = {
             h: window.innerHeight,
             w: window.innerWidth
           };
           state.scrollbarWidth = window.innerWidth - document.body.clientWidth < 0 ? 0 : window.innerWidth - document.body.clientWidth;
         });
-        state.isBracke = window.innerWidth < state.spBracke;
         state.window = {
           h: window.innerHeight,
           w: window.innerWidth

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

@@ -2,6 +2,8 @@
 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,4 +1,5 @@
 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;
@@ -11,10 +12,33 @@ 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 = () => {
-  if (navigator === void 0) return false;
-  const userAgent = navigator.userAgent.toLowerCase();
-  if (/android|ipod|ipad|iphone|macintosh/.test(userAgent) && "ontouchend" in document) {
+  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.10",
+  "version": "2.1.12",
   "description": "My new Nuxt module",
   "repository": "https://github.com/hare-systems-ryo/nuxt-hs-ui",
   "license": "MIT",