@maas/vue-equipment 1.0.0-beta.42 → 1.0.0-beta.44

package/dist/plugins/MagicToast/src/composables/private/useToastState.d.ts

@@ -1,7 +1,6 @@
-import { type Ref, type MaybeRef } from 'vue';
+import { type MaybeRef } from 'vue';
 import type { ToastState, MagicToastOptions } from '../../types/index.js';
 export declare function useToastState(instanceId: MaybeRef<string>): {
     initializeState: (options?: MagicToastOptions) => ToastState;
-    deleteState: () => void;
-    toastStateStore: Ref<ToastState[], ToastState[]>;
+    toastStateStore: import("vue").Ref<ToastState[], ToastState[]>;
 };

package/dist/plugins/MagicToast/src/composables/private/useToastState.mjs

@@ -1,11 +1,18 @@
-import { ref, reactive, toValue } from "vue";
+import { reactive, toValue, onScopeDispose } from "vue";
 import { defu } from "defu";
+import { createStateStore } from "@maas/vue-equipment/utils";
 import { defaultOptions } from "../../utils/defaultOptions.mjs";
-const toastStateStore = ref([]);
+const getToastStateStore = createStateStore(
+  "MagicToast",
+  () => []
+);
 export function useToastState(instanceId) {
+  const toastStateStore = getToastStateStore();
+  let scopeCounted = false;
   function createState(id) {
     const state = {
       id,
+      refCount: 0,
       options: { ...defaultOptions },
       views: [],
       expanded: false,
@@ -18,12 +25,21 @@ export function useToastState(instanceId) {
     toastStateStore.value = [...toastStateStore.value, state];
     return state;
   }
+  function deleteState() {
+    const currentId = toValue(instanceId);
+    toastStateStore.value = toastStateStore.value.filter(
+      (x) => x.id !== currentId
+    );
+  }
   function initializeState(options) {
-    let state = toastStateStore.value.find((entry) => {
-      return entry.id === toValue(instanceId);
-    });
+    const currentId = toValue(instanceId);
+    let state = toastStateStore.value.find((entry) => entry.id === currentId);
     if (!state) {
-      state = addState(toValue(instanceId));
+      state = addState(currentId);
+    }
+    if (!scopeCounted) {
+      state.refCount++;
+      scopeCounted = true;
     }
     if (options) {
       const mappedOptions = defu(options, defaultOptions);
@@ -32,14 +48,21 @@ export function useToastState(instanceId) {
     }
     return state;
   }
-  function deleteState() {
-    toastStateStore.value = toastStateStore.value.filter(
-      (x) => x.id !== toValue(instanceId)
-    );
-  }
+  onScopeDispose(() => {
+    if (!scopeCounted) {
+      return;
+    }
+    const currentId = toValue(instanceId);
+    const state = toastStateStore.value.find((entry) => entry.id === currentId);
+    if (state) {
+      state.refCount--;
+      if (state.refCount <= 0) {
+        deleteState();
+      }
+    }
+  });
   return {
     initializeState,
-    deleteState,
     toastStateStore
   };
 }

package/dist/plugins/MagicToast/src/types/index.d.ts

@@ -27,6 +27,7 @@ export interface ToastView {
 }
 export interface ToastState {
     id: string;
+    refCount: number;
     views: ToastView[];
     options: ToastDefaultOptions;
     expanded: boolean;

package/dist/utils/index.d.ts

@@ -1,5 +1,10 @@
+import { Ref } from 'vue';
+
 declare function clampValue(value: number, min: number, max: number): number;
 
+type CreateStore<T> = () => Ref<T>;
+declare function createStateStore<T>(key: string, setInitialValue: () => T): CreateStore<T>;
+
 declare function linear(t: number): number;
 declare function easeInQuad(t: number): number;
 declare function easeOutQuad(t: number): number;
@@ -27,6 +32,8 @@ type InterpolateArgs = {
 };
 declare function interpolate(args: InterpolateArgs): number;
 
+declare function isAndroid(): boolean;
+
 declare function isIOS(): boolean;
 
 interface isWithinRangeArgs {
@@ -81,4 +88,4 @@ type RequireAllNested<T> = {
 
 type ValueOf<T> = T[keyof T];
 
-export { type InterpolateArgs, type PickPartial, type RequireAll, type RequireAllNested, type SlugifyOptions, type ValueOf, clampValue, easeInCubic, easeInOutCubic, easeInOutQuad, easeInOutQuart, easeInOutQuint, easeInQuad, easeInQuart, easeInQuint, easeOutBack, easeOutCubic, easeOutQuad, easeOutQuart, easeOutQuint, formatTime, guardedReleasePointerCapture, guardedSetPointerCapture, interpolate, isIOS, isWithinRange, linear, mapValue, matchClass, scrollbarGutterSupport, scrollbarWidth, slugify, uniq };
+export { type CreateStore, type InterpolateArgs, type PickPartial, type RequireAll, type RequireAllNested, type SlugifyOptions, type ValueOf, clampValue, createStateStore, easeInCubic, easeInOutCubic, easeInOutQuad, easeInOutQuart, easeInOutQuint, easeInQuad, easeInQuart, easeInQuint, easeOutBack, easeOutCubic, easeOutQuad, easeOutQuart, easeOutQuint, formatTime, guardedReleasePointerCapture, guardedSetPointerCapture, interpolate, isAndroid, isIOS, isWithinRange, linear, mapValue, matchClass, scrollbarGutterSupport, scrollbarWidth, slugify, uniq };