@maas/vue-equipment 1.0.0-beta.62 → 1.0.0-beta.64

package/dist/nuxt/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@maas/vue-equipment/nuxt",
   "configKey": "vueEquipment",
-  "version": "1.0.0-beta.61",
+  "version": "1.0.0-beta.63",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/plugins/MagicCommand/src/components/MagicCommandItem.d.vue.ts

@@ -11,11 +11,11 @@ type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_1) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<MagicCommandItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    click: (event: MouseEvent) => any;
     enter: () => any;
+    click: (event: MouseEvent) => any;
 }, string, import("vue").PublicProps, Readonly<MagicCommandItemProps> & Readonly<{
-    onClick?: ((event: MouseEvent) => any) | undefined;
     onEnter?: (() => any) | undefined;
+    onClick?: ((event: MouseEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/plugins/MagicCommand/src/components/MagicCommandItem.vue.d.ts

@@ -11,11 +11,11 @@ type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_1) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<MagicCommandItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    click: (event: MouseEvent) => any;
     enter: () => any;
+    click: (event: MouseEvent) => any;
 }, string, import("vue").PublicProps, Readonly<MagicCommandItemProps> & Readonly<{
-    onClick?: ((event: MouseEvent) => any) | undefined;
     onEnter?: (() => any) | undefined;
+    onClick?: ((event: MouseEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/plugins/MagicMenu/src/components/MagicMenuItem.d.vue.ts

@@ -10,11 +10,11 @@ type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_1) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<MagicMenuItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    click: (event: MouseEvent) => any;
     enter: () => any;
+    click: (event: MouseEvent) => any;
 }, string, import("vue").PublicProps, Readonly<MagicMenuItemProps> & Readonly<{
-    onClick?: ((event: MouseEvent) => any) | undefined;
     onEnter?: (() => any) | undefined;
+    onClick?: ((event: MouseEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/plugins/MagicMenu/src/components/MagicMenuItem.vue.d.ts

@@ -10,11 +10,11 @@ type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_1) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<MagicMenuItemProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    click: (event: MouseEvent) => any;
     enter: () => any;
+    click: (event: MouseEvent) => any;
 }, string, import("vue").PublicProps, Readonly<MagicMenuItemProps> & Readonly<{
-    onClick?: ((event: MouseEvent) => any) | undefined;
     onEnter?: (() => any) | undefined;
+    onClick?: ((event: MouseEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/plugins/MagicModal/src/components/MagicModalContent.d.vue.ts

@@ -1,8 +1,8 @@
 import '@maas/vue-equipment/utils/css/keyframes/fade-in.css';
 import '@maas/vue-equipment/utils/css/keyframes/fade-out.css';
-declare var __VLS_22: {};
+declare var __VLS_24: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_22) => any;
+    default?: (props: typeof __VLS_24) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/plugins/MagicModal/src/components/MagicModalContent.vue

@@ -18,7 +18,9 @@
         :is="state.options.tag"
         v-show="active.innerActive"
         class="magic-modal-content__inner"
-        @click.self="guardedClose"
+        @pointerdown="onPointerdown"
+        @touchstart="onTouchstart"
+        @click.self="guardedClick"
       >
         <slot />
       </component>
@@ -76,8 +78,17 @@ const {
   releaseFocus,
   active
 });
-function guardedClose() {
-  close();
+let target = void 0;
+function onPointerdown(e) {
+  target = e.target;
+}
+function onTouchstart(e) {
+  target = e.target;
+}
+function guardedClick(e) {
+  if (e.currentTarget === target) {
+    close();
+  }
 }
 onUnmounted(() => {
   if (state.options.scrollLock) {
@@ -88,6 +99,7 @@ onUnmounted(() => {
   if (state.options.focusTrap) {
     releaseFocus();
   }
+  target = void 0;
 });
 </script>
 

package/dist/plugins/MagicModal/src/components/MagicModalContent.vue.d.ts

@@ -1,8 +1,8 @@
 import '@maas/vue-equipment/utils/css/keyframes/fade-in.css';
 import '@maas/vue-equipment/utils/css/keyframes/fade-out.css';
-declare var __VLS_22: {};
+declare var __VLS_24: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_22) => any;
+    default?: (props: typeof __VLS_24) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/plugins/MagicScroll/src/composables/private/useScrollApi.mjs

@@ -1,4 +1,5 @@
 import {
+  computed,
   shallowRef,
   inject,
   toValue
@@ -22,7 +23,9 @@ export function useScrollApi(args) {
   };
   const childBoundingRect = useElementBounding(child);
   const parentBoundingRect = useElementBounding(parent);
-  const mappedParentBoundingRect = toValue(parent) ? parentBoundingRect : windowBoundingRect;
+  const mappedParentBoundingRect = computed(
+    () => toValue(parent) ? parentBoundingRect : windowBoundingRect
+  );
   function splitLocation(location) {
     return {
       child: location.match(/^[a-z]+/)[0],
@@ -32,8 +35,8 @@ export function useScrollApi(args) {
   function getOffsetTop(points) {
     let y = 0;
     const scrollY = toValue(scrollReturn?.y) || 0;
-    const parentTop = mappedParentBoundingRect.top.value;
-    const parentHeight = mappedParentBoundingRect.height.value;
+    const parentTop = mappedParentBoundingRect.value.top.value;
+    const parentHeight = mappedParentBoundingRect.value.height.value;
     const childTop = childBoundingRect.top.value;
     const childHeight = childBoundingRect.height.value;
     if (!childHeight) {
@@ -50,7 +53,7 @@ export function useScrollApi(args) {
         y += childTop + childHeight + scrollY;
         break;
     }
-    if (!mappedParentBoundingRect.height.value) {
+    if (!parentHeight) {
       return y;
     }
     switch (points.parent) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maas/vue-equipment",
   "description": "Our Frontend Toolkit, Free and Open Source",
-  "version": "1.0.0-beta.62",
+  "version": "1.0.0-beta.64",
   "contributors": [
     {
       "name": "Robin Scholz",

package/dist/plugins/MagicModal/src/composables/private/useModalStore.d.ts

@@ -1 +0,0 @@
-export { useModalState } from './useModalState.js';

package/dist/plugins/MagicModal/src/composables/private/useModalStore.mjs

@@ -1 +0,0 @@
-export { useModalState } from "./useModalState.mjs";