@maas/vue-equipment 1.0.0-beta.9 → 1.0.1

package/dist/plugins/MagicAccordion/src/components/MagicAccordionProvider.vue

@@ -1,37 +1,31 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { renderSlot as _renderSlot, unref as _unref, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
-import { onBeforeUnmount, provide } from "vue";
-import { Primitive } from "@maas/vue-primitive";
-import { MagicAccordionInstanceId } from "../symbols";
+<template>
+  <vue-primitive
+    :data-id="id"
+    :as-child="asChild"
+    class="magic-accordion-provider"
+  >
+    <slot />
+  </vue-primitive>
+</template>
+
+<script setup>
+import { provide, watch } from "vue";
+import { VuePrimitive } from "@maas/vue-primitive";
 import { useAccordionState } from "../composables/private/useAccordionState";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicAccordionProvider",
-  props: {
-    id: { type: null, required: true },
-    asChild: { type: Boolean, required: false },
-    options: { type: Object, required: false }
-  },
-  setup(__props) {
-    const { deleteState, initializeState } = useAccordionState(__props.id);
-    initializeState(__props.options);
-    onBeforeUnmount(() => {
-      deleteState();
-    });
-    provide(MagicAccordionInstanceId, __props.id);
-    return (_ctx, _cache) => {
-      return _openBlock(), _createBlock(_unref(Primitive), {
-        "data-id": _ctx.id,
-        "as-child": _ctx.asChild,
-        class: "magic-accordion-provider"
-      }, {
-        default: _withCtx(() => [
-          _renderSlot(_ctx.$slots, "default")
-        ]),
-        _: 3
-        /* FORWARDED */
-      }, 8, ["data-id", "as-child"]);
-    };
-  }
+import { MagicAccordionInstanceId } from "../symbols";
+const { id, asChild, options } = defineProps({
+  id: { type: null, required: true },
+  asChild: { type: Boolean, required: false },
+  options: { type: Object, required: false }
 });
+const { initializeState } = useAccordionState(id);
+initializeState(options);
+watch(
+  () => options,
+  (value) => {
+    initializeState(value);
+  },
+  { deep: true }
+);
+provide(MagicAccordionInstanceId, id);
 </script>

package/dist/plugins/MagicAccordion/src/components/MagicAccordionProvider.vue.d.ts

@@ -1,21 +1,17 @@
-import { type MaybeRef } from 'vue';
-import { Primitive } from '@maas/vue-primitive';
+import type { MaybeRef } from 'vue';
 import type { MagicAccordionOptions } from '../types/index.js';
 interface MagicAccordionProviderProps {
     id: MaybeRef<string>;
     asChild?: boolean;
     options?: MagicAccordionOptions;
 }
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
-declare var __VLS_6: {};
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
-    default?: (props: typeof __VLS_6) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<MagicAccordionProviderProps, {
-    Primitive: typeof Primitive;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_component: import("vue").DefineComponent<MagicAccordionProviderProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+declare var __VLS_8: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_8) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<MagicAccordionProviderProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/plugins/MagicAccordion/src/components/MagicAccordionTrigger.d.vue.ts

@@ -0,0 +1,23 @@
+import type { MaybeRef } from 'vue';
+import type { Interaction } from '../types/index.js';
+interface MagicAccordionTriggerProps {
+    viewId?: string;
+    disabled?: MaybeRef<boolean>;
+    trigger?: Interaction;
+    asChild?: boolean;
+}
+declare var __VLS_12: {
+    viewActive: any;
+};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_12) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<MagicAccordionTriggerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionTriggerProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/plugins/MagicAccordion/src/components/MagicAccordionTrigger.vue

@@ -1,73 +1,69 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, renderSlot as _renderSlot, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
-import { useTemplateRef, inject, computed, toValue } from "vue";
-import { Primitive } from "@maas/vue-primitive";
+<template>
+  <vue-primitive
+    ref="el"
+    :as-child="asChild"
+    :data-id="`${mappedViewId}-trigger`"
+    :data-disabled="mappedDisabled"
+    as="button"
+    class="magic-accordion-trigger"
+    @mouseenter="onMouseenter"
+    @click="onClick"
+  >
+    <slot :view-active="view?.active" />
+  </vue-primitive>
+</template>
+
+<script setup>
+import { computed, inject, toValue, useTemplateRef } from "vue";
 import { onKeyStroke } from "@vueuse/core";
+import { VuePrimitive } from "@maas/vue-primitive";
+import { useMagicError } from "@maas/vue-equipment/plugins/MagicError";
 import { useAccordionTrigger } from "../composables/private/useAccordionTrigger";
 import { useAccordionState } from "../composables/private/useAccordionState";
 import { useAccordionView } from "../composables/private/useAccordionView";
 import { MagicAccordionInstanceId, MagicAccordionViewId } from "../symbols";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicAccordionTrigger",
-  props: {
-    viewId: { type: String, required: false },
-    disabled: { type: null, required: false, default: false },
-    trigger: { type: String, required: false, default: "click" },
-    asChild: { type: Boolean, required: false, default: false }
-  },
-  setup(__props) {
-    const elRef = useTemplateRef("el");
-    const instanceId = inject(MagicAccordionInstanceId, void 0);
-    const injectedViewId = inject(MagicAccordionViewId, void 0);
-    const mappedViewId = computed(() => __props.viewId ?? injectedViewId);
-    if (!instanceId) {
-      throw new Error(
-        "MagicAccordionTrigger must be nested inside MagicAccordionProvider"
-      );
-    }
-    if (!mappedViewId.value) {
-      throw new Error(
-        "MagicAccordionTrigger must be nested inside MagicAccordionView or a viewId must be provided"
-      );
-    }
-    const { initializeState } = useAccordionState(instanceId);
-    const state = initializeState();
-    const { getView } = useAccordionView(instanceId);
-    const view = getView(mappedViewId.value);
-    const mappedDisabled = computed(
-      () => toValue(__props.disabled) || state.options.disabled
-    );
-    const { onMouseenter, onClick, onEnter } = useAccordionTrigger({
-      elRef,
-      instanceId,
-      viewId: mappedViewId.value,
-      disabled: __props.disabled,
-      trigger: __props.trigger
-    });
-    onKeyStroke("Enter", onEnter);
-    return (_ctx, _cache) => {
-      return _openBlock(), _createBlock(_unref(Primitive), {
-        ref: "el",
-        "as-child": _ctx.asChild,
-        "data-id": `${mappedViewId.value}-trigger`,
-        "data-disabled": mappedDisabled.value,
-        as: "button",
-        class: "magic-accordion-trigger",
-        onMouseenter: _unref(onMouseenter),
-        onClick: _unref(onClick)
-      }, {
-        default: _withCtx(() => [
-          _renderSlot(_ctx.$slots, "default", {
-            viewActive: _unref(view)?.active
-          })
-        ]),
-        _: 3
-        /* FORWARDED */
-      }, 8, ["as-child", "data-id", "data-disabled", "onMouseenter", "onClick"]);
-    };
-  }
+const {
+  viewId,
+  disabled = false,
+  trigger = "click",
+  asChild = false
+} = defineProps({
+  viewId: { type: String, required: false },
+  disabled: { type: null, required: false },
+  trigger: { type: String, required: false },
+  asChild: { type: Boolean, required: false }
+});
+const magicError = useMagicError({
+  prefix: "MagicAccordion",
+  source: "MagicAccordion"
+});
+const elRef = useTemplateRef("el");
+const instanceId = inject(MagicAccordionInstanceId, void 0);
+const injectedViewId = inject(MagicAccordionViewId, void 0);
+const mappedViewId = computed(() => viewId ?? injectedViewId);
+magicError.assert(instanceId, {
+  message: "MagicAccordionTrigger must be nested inside MagicAccordionProvider",
+  errorCode: "missing_instance_id"
+});
+magicError.assert(mappedViewId.value, {
+  message: "MagicAccordionTrigger must be nested inside MagicAccordionView or a viewId must be provided",
+  errorCode: "missing_view_id"
+});
+const { initializeState } = useAccordionState(instanceId);
+const state = initializeState();
+const { getView } = useAccordionView(instanceId);
+const view = getView(mappedViewId.value);
+const mappedDisabled = computed(
+  () => (toValue(disabled) || state.options.disabled) ?? false
+);
+const { onMouseenter, onClick, onKeypress } = useAccordionTrigger({
+  elRef,
+  instanceId,
+  mappedDisabled,
+  viewId: mappedViewId.value,
+  trigger
 });
+onKeyStroke("Enter", onKeypress);
 </script>
 
 <style>

package/dist/plugins/MagicAccordion/src/components/MagicAccordionTrigger.vue.d.ts

@@ -1,5 +1,4 @@
-import { type MaybeRef } from 'vue';
-import { Primitive } from '@maas/vue-primitive';
+import type { MaybeRef } from 'vue';
 import type { Interaction } from '../types/index.js';
 interface MagicAccordionTriggerProps {
     viewId?: string;
@@ -7,27 +6,15 @@ interface MagicAccordionTriggerProps {
     trigger?: Interaction;
     asChild?: boolean;
 }
-declare const mappedViewId: import("vue").ComputedRef<string | undefined>;
-declare const view: import("../types").AccordionView | undefined;
-declare const mappedDisabled: import("vue").ComputedRef<boolean | undefined>;
-declare const onMouseenter: () => void, onClick: () => void;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
 declare var __VLS_12: {
-    viewActive: boolean | undefined;
+    viewActive: any;
 };
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_12) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<MagicAccordionTriggerProps, {
-    Primitive: typeof Primitive;
-    mappedViewId: typeof mappedViewId;
-    view: typeof view;
-    mappedDisabled: typeof mappedDisabled;
-    onMouseenter: typeof onMouseenter;
-    onClick: typeof onClick;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionTriggerProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_component: import("vue").DefineComponent<MagicAccordionTriggerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionTriggerProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+};
+declare const __VLS_base: import("vue").DefineComponent<MagicAccordionTriggerProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionTriggerProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/plugins/MagicAccordion/src/components/MagicAccordionView.d.vue.ts

@@ -0,0 +1,20 @@
+interface MagicAccordionViewProps {
+    id?: string;
+    asChild?: boolean;
+    active?: boolean;
+}
+declare var __VLS_8: {
+    viewActive: any;
+};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_8) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<MagicAccordionViewProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionViewProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/dist/plugins/MagicAccordion/src/components/MagicAccordionView.vue

@@ -1,56 +1,49 @@
-<script>
-import { defineComponent as _defineComponent } from "vue";
-import { unref as _unref, renderSlot as _renderSlot, withCtx as _withCtx, openBlock as _openBlock, createBlock as _createBlock } from "vue";
+<template>
+  <vue-primitive
+    :as-child="asChild"
+    :data-id="mappedId"
+    :data-active="mappedActive"
+    class="magic-accordion-view"
+  >
+    <slot :view-active="mappedActive" />
+  </vue-primitive>
+</template>
+
+<script setup>
 import { computed, inject, onBeforeUnmount, provide, useId } from "vue";
-import { Primitive } from "@maas/vue-primitive";
+import { VuePrimitive } from "@maas/vue-primitive";
+import { useMagicError } from "@maas/vue-equipment/plugins/MagicError";
 import {
   MagicAccordionInstanceId,
   MagicAccordionViewActive,
   MagicAccordionViewId
 } from "../symbols";
 import { useAccordionView } from "../composables/private/useAccordionView";
-export default /* @__PURE__ */ _defineComponent({
-  __name: "MagicAccordionView",
-  props: {
-    id: { type: String, required: false },
-    asChild: { type: Boolean, required: false },
-    active: { type: Boolean, required: false }
-  },
-  setup(__props) {
-    const instanceId = inject(MagicAccordionInstanceId, void 0);
-    if (!instanceId) {
-      throw new Error(
-        "MagicAccordionView must be nested inside MagicAccordionProvider"
-      );
-    }
-    const mappedId = computed(() => __props.id ?? `magic-accordion-view-${useId()}`);
-    const mappedActive = computed(() => view.active);
-    const { initializeView, deleteView } = useAccordionView(instanceId);
-    const view = initializeView({
-      id: mappedId.value,
-      active: __props.active ?? false
-    });
-    provide(MagicAccordionViewId, mappedId.value);
-    provide(MagicAccordionViewActive, mappedActive);
-    onBeforeUnmount(() => {
-      deleteView(mappedId.value);
-    });
-    return (_ctx, _cache) => {
-      return _openBlock(), _createBlock(_unref(Primitive), {
-        "as-child": _ctx.asChild,
-        "data-id": mappedId.value,
-        "data-active": _unref(view)?.active,
-        class: "magic-accordion-view"
-      }, {
-        default: _withCtx(() => [
-          _renderSlot(_ctx.$slots, "default", {
-            viewActive: _unref(view)?.active
-          })
-        ]),
-        _: 3
-        /* FORWARDED */
-      }, 8, ["as-child", "data-id", "data-active"]);
-    };
-  }
+const { id, active = false } = defineProps({
+  id: { type: String, required: false },
+  asChild: { type: Boolean, required: false },
+  active: { type: Boolean, required: false }
+});
+const magicError = useMagicError({
+  prefix: "MagicAccordion",
+  source: "MagicAccordionView"
+});
+const instanceId = inject(MagicAccordionInstanceId, void 0);
+magicError.assert(instanceId, {
+  message: "MagicAccordionView must be nested inside MagicAccordionProvider",
+  errorCode: "missing_instance_id"
+});
+const uuid = useId();
+const mappedId = computed(() => id ?? `magic-accordion-view-${uuid}`);
+const mappedActive = computed(() => view.active);
+const { initializeView, deleteView } = useAccordionView(instanceId);
+const view = initializeView({
+  id: mappedId.value,
+  active
+});
+provide(MagicAccordionViewId, mappedId.value);
+provide(MagicAccordionViewActive, mappedActive);
+onBeforeUnmount(() => {
+  deleteView(mappedId.value);
 });
 </script>

package/dist/plugins/MagicAccordion/src/components/MagicAccordionView.vue.d.ts

@@ -1,25 +1,17 @@
-import { Primitive } from '@maas/vue-primitive';
 interface MagicAccordionViewProps {
     id?: string;
     asChild?: boolean;
     active?: boolean;
 }
-declare const mappedId: import("vue").ComputedRef<string>;
-declare const view: import("../types").AccordionView;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
-declare var __VLS_6: {
-    viewActive: boolean;
+declare var __VLS_8: {
+    viewActive: any;
 };
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
-    default?: (props: typeof __VLS_6) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<MagicAccordionViewProps, {
-    Primitive: typeof Primitive;
-    mappedId: typeof mappedId;
-    view: typeof view;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionViewProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_component: import("vue").DefineComponent<MagicAccordionViewProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionViewProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_8) => any;
+};
+declare const __VLS_base: import("vue").DefineComponent<MagicAccordionViewProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<MagicAccordionViewProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
+declare const _default: typeof __VLS_export;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionCallback.d.ts

@@ -1,4 +1,4 @@
-import { type MaybeRef } from 'vue';
+import type { MaybeRef } from 'vue';
 type UseModalCallbackArgs = {
     viewId: string;
     instanceId: MaybeRef<string>;

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionCallback.mjs

@@ -1,5 +1,5 @@
 import { toValue } from "vue";
-import { useMagicEmitter } from "@maas/vue-equipment/plugins";
+import { useMagicEmitter } from "@maas/vue-equipment/plugins/MagicEmitter";
 export function useAccordionCallback(args) {
   const { viewId, instanceId } = args;
   const emitter = useMagicEmitter();

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionState.d.ts

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

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionState.mjs

@@ -1,11 +1,18 @@
-import { ref, reactive, toValue } from "vue";
+import { onScopeDispose, reactive, toValue } from "vue";
 import { defu } from "defu";
+import { createStateStore } from "@maas/vue-equipment/utils";
 import { defaultOptions } from "../../utils/defaultOptions.mjs";
-const accordionStateStore = ref([]);
+const getAccordionStateStore = createStateStore(
+  "MagicAccordion",
+  () => []
+);
 export function useAccordionState(instanceId) {
+  const accordionStateStore = getAccordionStateStore();
+  let scopeCounted = false;
   function createState(id) {
     const state = {
       id,
+      refCount: 0,
       options: { ...defaultOptions },
       views: []
     };
@@ -16,12 +23,23 @@ export function useAccordionState(instanceId) {
     accordionStateStore.value = [...accordionStateStore.value, state];
     return state;
   }
+  function deleteState() {
+    const currentId = toValue(instanceId);
+    accordionStateStore.value = accordionStateStore.value.filter(
+      (x) => x.id !== currentId
+    );
+  }
   function initializeState(options) {
-    let state = accordionStateStore.value.find((entry) => {
-      return entry.id === toValue(instanceId);
-    });
+    const currentId = toValue(instanceId);
+    let state = accordionStateStore.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);
@@ -29,14 +47,23 @@ export function useAccordionState(instanceId) {
     }
     return state;
   }
-  function deleteState() {
-    accordionStateStore.value = accordionStateStore.value.filter(
-      (x) => x.id !== toValue(instanceId)
+  onScopeDispose(() => {
+    if (!scopeCounted) {
+      return;
+    }
+    const currentId = toValue(instanceId);
+    const state = accordionStateStore.value.find(
+      (entry) => entry.id === currentId
     );
-  }
+    if (state) {
+      state.refCount--;
+      if (state.refCount <= 0) {
+        deleteState();
+      }
+    }
+  }, true);
   return {
     initializeState,
-    deleteState,
     accordionStateStore
   };
 }

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionTrigger.d.ts

@@ -1,16 +1,16 @@
-import { type MaybeRef, type Ref } from 'vue';
-import { Primitive } from '@maas/vue-primitive';
+import type { ComputedRef, MaybeRef, Ref } from 'vue';
+import type { VuePrimitive } from '@maas/vue-primitive';
 import type { Interaction } from '../../types/index.js';
 interface UseAccordionTriggerArgs {
     instanceId: MaybeRef<string>;
     viewId: string;
     trigger: Interaction;
-    disabled: MaybeRef<boolean>;
-    elRef: Ref<InstanceType<typeof Primitive> | null>;
+    mappedDisabled: ComputedRef<boolean>;
+    elRef: Ref<InstanceType<typeof VuePrimitive> | null>;
 }
 export declare function useAccordionTrigger(args: UseAccordionTriggerArgs): {
     onMouseenter: () => void;
     onClick: () => void;
-    onEnter: (e: KeyboardEvent) => void;
+    onKeypress: (e: KeyboardEvent) => void;
 };
 export {};

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionTrigger.mjs

@@ -1,18 +1,17 @@
-import { toValue } from "vue";
-import { useAccordionView } from "./useAccordionView.mjs";
 import { useFocus } from "@vueuse/core";
+import { useAccordionView } from "./useAccordionView.mjs";
 export function useAccordionTrigger(args) {
-  const { instanceId, viewId, elRef, disabled, trigger } = args;
+  const { instanceId, viewId, elRef, mappedDisabled, trigger } = args;
   const { selectView, unselectView, getView } = useAccordionView(instanceId);
   const view = getView(viewId);
   const { focused } = useFocus(elRef);
   function onMouseenter() {
-    if (!toValue(disabled) && trigger === "mouseenter") {
+    if (!mappedDisabled.value && trigger === "mouseenter") {
       selectView(viewId);
     }
   }
   function onClick() {
-    if (!toValue(disabled) && trigger === "click") {
+    if (!mappedDisabled.value && trigger === "click") {
       if (view?.active) {
         unselectView(viewId);
       } else {
@@ -20,8 +19,8 @@ export function useAccordionTrigger(args) {
       }
     }
   }
-  function onEnter(e) {
-    if (focused.value && !toValue(disabled) && !view?.active) {
+  function onKeypress(e) {
+    if (focused.value && !mappedDisabled.value && !view?.active) {
       e.preventDefault();
       e.stopPropagation();
       if (view?.active) {
@@ -34,6 +33,6 @@ export function useAccordionTrigger(args) {
   return {
     onMouseenter,
     onClick,
-    onEnter
+    onKeypress
   };
 }

package/dist/plugins/MagicAccordion/src/composables/private/useAccordionView.d.ts

@@ -1,10 +1,10 @@
-import { type MaybeRef } from 'vue';
-import { type AccordionView } from '../../types/index.js';
+import type { MaybeRef } from 'vue';
+import type { AccordionView } from '../../types/index.js';
 type InitializeViewArgs = Pick<AccordionView, 'id' | 'active'>;
 export declare function useAccordionView(instanceId: MaybeRef<string>): {
-    initializeView: (args: InitializeViewArgs) => AccordionView;
+    initializeView: (args: InitializeViewArgs) => any;
     deleteView: (id: string) => void;
-    getView: (id: string) => AccordionView | undefined;
+    getView: (id: string) => any;
     selectView: (id: string) => void;
     unselectView: (id: string) => void;
     unselectAllViews: () => void;