@ulu/frontend-vue 0.6.29 → 0.6.31

package/dist/plugins/popovers/UluPopoverBase.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UluPopoverBase.vue.d.ts","sourceRoot":"","sources":["../../../lib/plugins/popovers/UluPopoverBase.vue"],"names":[],"mappings":"AA+BA;wBAweqB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;;6BAEtE,CAAC,EAAE,CAAC;;;AAdjC;IAzHI;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;oBA0HJ"}
+{"version":3,"file":"UluPopoverBase.vue.d.ts","sourceRoot":"","sources":["../../../lib/plugins/popovers/UluPopoverBase.vue"],"names":[],"mappings":"AA+BA;wBAkfqB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;;6BAEtE,CAAC,EAAE,CAAC;;;AAdjC;IAzHI;;OAEG;;IAEH;;OAEG;;IAEH;;OAEG;;;;;;;;;;;;;;;;;;;;;;oBA0HJ"}

package/dist/plugins/popovers/UluPopoverBase.vue.js

@@ -1,4 +1,4 @@
-import { ref as x, computed as y, watch as L, nextTick as v, onUnmounted as M, createElementBlock as u, openBlock as p, withKeys as T, unref as l, normalizeStyle as O, normalizeClass as j, createElementVNode as A, createCommentVNode as k, renderSlot as C } from "vue";
+import { ref as x, computed as y, watch as L, nextTick as O, onUnmounted as M, createElementBlock as u, openBlock as d, withKeys as T, unref as l, normalizeStyle as v, normalizeClass as j, createElementVNode as A, createCommentVNode as k, renderSlot as C } from "vue";
 import { useUluFloating as H } from "../../composables/useUluFloating.js";
 import { useModifiers as U } from "../../composables/useModifiers.js";
 import { wasClickOutside as $ } from "@ulu/utils/browser/dom.js";
@@ -34,8 +34,8 @@ const z = ["data-placement"], K = { class: "popover__inner" }, N = {
      */
     directFocus: {
       type: Function,
-      default: ({ isOpen: s, trigger: r, content: c }) => {
-        s && c ? c.focus({ preventScroll: !0 }) : !s && r && r instanceof HTMLElement && r.focus({ preventScroll: !0 });
+      default: ({ isOpen: s, trigger: n, content: c }) => {
+        s && c ? c.focus({ preventScroll: !0 }) : !s && n && n instanceof HTMLElement && n.focus({ preventScroll: !0 });
       }
     },
     /**
@@ -58,39 +58,39 @@ const z = ["data-placement"], K = { class: "popover__inner" }, N = {
     modifiers: [String, Array, Object]
   },
   emits: ["close", "update:isOpen"],
-  setup(s, { expose: r, emit: c }) {
-    const d = c, e = s, o = x(null), { resolvedModifiers: _ } = U({ props: e, baseClass: "popover" }), f = y(() => e.config || {}), { floatingStyles: w, placement: E, arrowStyles: F, update: m, isFixedStrategy: S, contentArrow: h } = H(
+  setup(s, { expose: n, emit: c }) {
+    const p = c, e = s, o = x(null), { resolvedModifiers: _ } = U({ props: e, baseClass: "popover" }), f = y(() => e.config || {}), { floatingStyles: w, placement: E, arrowStyles: F, update: m, isFixedStrategy: S, contentArrow: h } = H(
       y(() => e.trigger),
       o,
       f
     ), i = () => {
-      d("close"), d("update:isOpen", !1);
+      p("close"), p("update:isOpen", !1);
     }, b = (t) => {
       e.isOpen && e.escapeCloses && (t.preventDefault(), i());
     };
-    let n = null;
+    let r = null;
     const a = () => {
-      n && (document.removeEventListener("click", n), n = null);
+      r && (document.removeEventListener("click", r), r = null);
     }, B = () => {
-      a(), e.clickOutsideCloses && (n = (t) => {
-        if (!(!e.isOpen || !o.value) && document.body.contains(t.target) && !o.value.contains(t.target) && $(o.value, t)) {
+      a(), e.clickOutsideCloses && (r = (t) => {
+        if (!(!e.isOpen || !o.value) && document.body.contains(t.target) && !o.value.contains(t.target) && !t.target.closest("[data-ulu-tour-ui]") && $(o.value, t)) {
           if (e.trigger instanceof HTMLElement && e.trigger.contains(t.target))
             return;
           i();
         }
       }, setTimeout(() => {
-        n && document.addEventListener("click", n);
+        r && document.addEventListener("click", r);
       }, 0));
     };
     return L(() => e.isOpen, (t, g) => {
-      t ? (m(), B(), e.directFocus && v(() => {
+      t ? (m(), B(), e.directFocus && O(() => {
         e.directFocus({ isOpen: !0, trigger: e.trigger, content: o.value });
-      })) : (a(), e.directFocus && g === !0 && v(() => {
+      })) : (a(), e.directFocus && g === !0 && O(() => {
         e.directFocus({ isOpen: !1, trigger: e.trigger, content: o.value });
       }));
     }, { immediate: !0 }), M(() => {
       a();
-    }), r({
+    }), n({
       /**
        * Emits the close event
        */
@@ -103,7 +103,7 @@ const z = ["data-placement"], K = { class: "popover__inner" }, N = {
        * The internal root popover element reference
        */
       content: o
-    }), (t, g) => (p(), u("span", {
+    }), (t, g) => (d(), u("span", {
       class: j(["popover", [
         {
           "popover--fixed": l(S),
@@ -113,7 +113,7 @@ const z = ["data-placement"], K = { class: "popover__inner" }, N = {
       ]]),
       ref_key: "contentEl",
       ref: o,
-      style: O(l(w)),
+      style: v(l(w)),
       "data-placement": l(E),
       onKeydown: T(b, ["esc"]),
       tabindex: "-1"
@@ -124,18 +124,18 @@ const z = ["data-placement"], K = { class: "popover__inner" }, N = {
           close: i
         })
       ]),
-      t.$slots.footer ? (p(), u("span", N, [
+      t.$slots.footer ? (d(), u("span", N, [
         C(t.$slots, "footer", {
           isOpen: s.isOpen,
           close: i
         })
       ])) : k("", !0),
-      f.value.arrow ? (p(), u("span", {
+      f.value.arrow ? (d(), u("span", {
         key: 1,
         class: "popover__arrow",
         ref_key: "contentArrow",
         ref: h,
-        style: O(l(F)),
+        style: v(l(F)),
         "data-ulu-popover-arrow": ""
       }, null, 4)) : k("", !0)
     ], 46, z));

package/dist/plugins/tour/UluTourDisplay.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UluTourDisplay.vue.d.ts","sourceRoot":"","sources":["../../../lib/plugins/tour/UluTourDisplay.vue"],"names":[],"mappings":"AA+DA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAkhBs4S,GAAG,8CAA8C,GAAG,yBAAyB,GAAG,6DAAmC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA1Vn7S,KAAK"}
+{"version":3,"file":"UluTourDisplay.vue.d.ts","sourceRoot":"","sources":["../../../lib/plugins/tour/UluTourDisplay.vue"],"names":[],"mappings":"AAmEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCA6hBklS,GAAG,8CAA8C,GAAG,yBAAyB,GAAG,6DAAmC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAjW/nS,KAAK"}

package/dist/plugins/tour/UluTourDisplay.vue.js

@@ -1,4 +1,4 @@
-import { computed as i, ref as f, watch as S, nextTick as T, onMounted as b, onUnmounted as L, createBlock as l, openBlock as o, Teleport as F, createElementBlock as x, createCommentVNode as $, unref as v, Fragment as I, resolveDynamicComponent as g, normalizeProps as h, mergeProps as s, createSlots as k, withCtx as c, createVNode as w, normalizeStyle as R } from "vue";
+import { computed as p, ref as f, watch as S, nextTick as T, onMounted as b, onUnmounted as L, createBlock as l, openBlock as o, Teleport as F, createElementBlock as y, createCommentVNode as x, unref as v, Fragment as I, resolveDynamicComponent as g, mergeProps as s, createSlots as $, withCtx as c, normalizeProps as k, createVNode as w, normalizeStyle as R } from "vue";
 import V from "../../components/collapsible/UluModal.vue.js";
 import D from "../popovers/UluPopoverBase.vue.js";
 import P from "./UluTourPager.vue.js";
@@ -7,20 +7,20 @@ import { useTour as M } from "./useTour.js";
 const H = {
   __name: "UluTourDisplay",
   setup(N) {
-    const { api: m, state: a } = M(), t = i(() => a.active?.steps[a.stepIndex]), u = f(null), d = f(null), C = i(() => ({
+    const { api: d, state: u } = M(), t = p(() => u.active?.steps[u.stepIndex]), a = f(null), m = f(null), C = p(() => ({
       placement: t.value?.placement || "bottom",
       arrow: !0,
       offset: 8
-    })), E = i(() => ({
-      ...a.active?.modalProps || {},
+    })), E = p(() => ({
+      ...u.active?.modalProps || {},
       ...t.value?.modalProps || {}
-    })), z = i(() => ({
+    })), z = p(() => ({
       modifiers: "large",
-      ...a.active?.popoverProps || {},
+      ...u.active?.popoverProps || {},
       ...t.value?.popoverProps || {}
-    })), r = f(null), p = () => {
-      if (u.value) {
-        const e = u.value.getBoundingClientRect();
+    })), r = f(null), i = () => {
+      if (a.value) {
+        const e = a.value.getBoundingClientRect();
         r.value = {
           top: e.top,
           left: e.left,
@@ -29,7 +29,7 @@ const H = {
         };
       } else
         r.value = null;
-    }, B = i(() => {
+    }, B = p(() => {
       if (!r.value) return {};
       const e = r.value;
       return {
@@ -60,27 +60,31 @@ const H = {
       if (e?.target) {
         await T();
         const n = document.querySelector(e.target);
-        n ? (u.value = n, d.value && d.value.update(), e.highlight && p()) : console.warn(`Tour target not found: ${e.target}`);
+        n ? (a.value = n, m.value && m.value.update(), e.highlight && i()) : console.warn(`Tour target not found: ${e.target}`);
       } else
-        u.value = null, r.value = null;
+        a.value = null, r.value = null;
     }, { immediate: !0 }), b(() => {
-      window.addEventListener("resize", p), window.addEventListener("scroll", p);
+      window.addEventListener("resize", i), window.addEventListener("scroll", i);
     }), L(() => {
-      window.removeEventListener("resize", p), window.removeEventListener("scroll", p);
+      window.removeEventListener("resize", i), window.removeEventListener("scroll", i);
     }), (e, n) => (o(), l(F, { to: "body" }, [
-      v(a).active ? (o(), x(I, { key: 0 }, [
-        t.value?.component ? (o(), l(g(t.value.component), h(s({ key: 0 }, t.value.componentProps)), null, 16)) : t.value?.target ? (o(), l(D, s({
+      v(u).active ? (o(), y(I, { key: 0 }, [
+        t.value?.component ? (o(), l(g(t.value.component), s({
+          key: 0,
+          "data-ulu-tour-ui": "true"
+        }, t.value.componentProps), null, 16)) : t.value?.target ? (o(), l(D, s({
           key: 2,
           ref_key: "popoverBase",
-          ref: d,
-          trigger: u.value,
+          ref: m,
+          trigger: a.value,
           config: C.value,
           style: { zIndex: 9999 },
           isOpen: !0,
-          onClose: n[1] || (n[1] = (y) => v(m).stop())
-        }, z.value), k({
+          "data-ulu-tour-ui": "true",
+          onClose: n[1] || (n[1] = (h) => v(d).stop())
+        }, z.value), $({
           default: c(() => [
-            t.value?.contentComponent ? (o(), l(g(t.value.contentComponent), h(s({ key: 0 }, t.value.componentProps)), null, 16)) : (o(), l(_, {
+            t.value?.contentComponent ? (o(), l(g(t.value.contentComponent), k(s({ key: 0 }, t.value.componentProps)), null, 16)) : (o(), l(_, {
               key: 1,
               step: t.value,
               "is-modal": !1
@@ -97,12 +101,13 @@ const H = {
           }
         ]), 1040, ["trigger", "config"])) : (o(), l(V, s({
           key: 1,
-          modelValue: !0
+          modelValue: !0,
+          "data-ulu-tour-ui": "true"
         }, E.value, {
-          onClose: n[0] || (n[0] = (y) => v(m).stop())
-        }), k({
+          onClose: n[0] || (n[0] = (h) => v(d).stop())
+        }), $({
           default: c(() => [
-            t.value?.contentComponent ? (o(), l(g(t.value.contentComponent), h(s({ key: 0 }, t.value.componentProps)), null, 16)) : (o(), l(_, {
+            t.value?.contentComponent ? (o(), l(g(t.value.contentComponent), k(s({ key: 0 }, t.value.componentProps)), null, 16)) : (o(), l(_, {
               key: 1,
               step: t.value,
               "is-modal": !0
@@ -118,13 +123,14 @@ const H = {
             key: "0"
           }
         ]), 1040)),
-        t.value?.target && t.value?.highlight && r.value ? (o(), x("div", {
+        t.value?.target && t.value?.highlight && r.value ? (o(), y("div", {
           key: 3,
           class: "tour-highlight-backdrop",
           style: R(B.value),
-          onClick: n[2] || (n[2] = (y) => v(m).stop())
-        }, null, 4)) : $("", !0)
-      ], 64)) : $("", !0)
+          "data-ulu-tour-ui": "true",
+          onClick: n[2] || (n[2] = (h) => v(d).stop())
+        }, null, 4)) : x("", !0)
+      ], 64)) : x("", !0)
     ]));
   }
 };

package/dist/plugins/tour/api.d.ts

@@ -56,5 +56,9 @@ export type TourStep = {
      * - Async hook called before the step is rendered.
      */
     onEnter?: Function | undefined;
+    /**
+     * - Async hook called after the step is exited.
+     */
+    onLeave?: Function | undefined;
 };
 //# sourceMappingURL=api.d.ts.map

package/dist/plugins/tour/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../lib/plugins/tour/api.js"],"names":[],"mappings":"AAyBO,iCAHI,MAAM,GACJ,MAAM,CAgEjB"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../lib/plugins/tour/api.js"],"names":[],"mappings":"AA0BO,iCAHI,MAAM,GACJ,MAAM,CAqFjB"}

package/dist/plugins/tour/api.js

@@ -1,5 +1,5 @@
-import { markRaw as t } from "vue";
-const o = (e) => ({
+import { markRaw as o } from "vue";
+const s = (e) => ({
   /**
    * Starts a new tour
    * @param {Object} tour - The tour configuration object
@@ -10,9 +10,10 @@ const o = (e) => ({
    * @param {String|Array|Object} [tour.modalTitleClass] - Global class applied to the title of modal steps.
    * @param {String|Array|Object} [tour.popoverTitleClass] - Global class applied to the title of popover steps.
    * @param {String|Array|Object} [tour.pagerClass] - Global class applied to the pager.
+   * @param {Function} [tour.onStop] - Async hook called when the tour is closed/finished.
    */
   async start(n) {
-    n?.steps?.length && (await this._runHooks(n.steps[0]), e.active = t(n), e.stepIndex = 0);
+    n?.steps?.length && (await this._runHooks(n.steps[0]), e.active = o(n), e.stepIndex = 0);
   },
   /**
    * Advances the tour to the next step, or stops if it is the last step
@@ -21,10 +22,11 @@ const o = (e) => ({
     const n = e.active;
     if (n)
       if (e.stepIndex < n.steps.length - 1) {
-        const s = e.stepIndex + 1;
-        await this._runHooks(n.steps[s]), e.stepIndex = s;
+        await this._runLeaveHook(n.steps[e.stepIndex]);
+        const i = e.stepIndex + 1;
+        await this._runHooks(n.steps[i]), e.stepIndex = i;
       } else
-        this.stop();
+        await this.stop();
   },
   /**
    * Returns the tour to the previous step
@@ -32,24 +34,33 @@ const o = (e) => ({
   async prev() {
     const n = e.active;
     if (n && e.stepIndex > 0) {
-      const s = e.stepIndex - 1;
-      await this._runHooks(n.steps[s]), e.stepIndex = s;
+      await this._runLeaveHook(n.steps[e.stepIndex]);
+      const i = e.stepIndex - 1;
+      await this._runHooks(n.steps[i]), e.stepIndex = i;
     }
   },
   /**
    * Stops and closes the current tour
    */
-  stop() {
-    e.active = null, e.stepIndex = 0;
+  async stop() {
+    const n = e.active;
+    n && (n.steps[e.stepIndex] && await this._runLeaveHook(n.steps[e.stepIndex]), typeof n.onStop == "function" && await n.onStop()), e.active = null, e.stepIndex = 0;
   },
   /**
-   * Internal method to run asynchronous lifecycle hooks on a step
+   * Internal method to run asynchronous enter hooks on a step
    * @param {Object} step - The tour step configuration
    */
   async _runHooks(n) {
     n && typeof n.onEnter == "function" && await n.onEnter();
+  },
+  /**
+   * Internal method to run asynchronous leave hooks on a step
+   * @param {Object} step - The tour step configuration
+   */
+  async _runLeaveHook(n) {
+    n && typeof n.onLeave == "function" && await n.onLeave();
   }
 });
 export {
-  o as createApi
+  s as createApi
 };

package/lib/components/collapsible/UluModal.vue

@@ -11,6 +11,7 @@
       :aria-describedby="describedby"
       ref="container" 
       :style="{ width: containerWidth }"
+      v-bind="$attrs"
       @cancel.prevent="close"  
       @close="handleDialogCloseEvent"
       @click="handleClick"

package/lib/plugins/tour/api.js

@@ -16,6 +16,7 @@ import { markRaw } from "vue";
  * @property {Object} [modalProps] - Props to pass to the modal (if target is omitted).
  * @property {Object} [popoverProps] - Props to pass to the popover (if target is present).
  * @property {Function} [onEnter] - Async hook called before the step is rendered.
+ * @property {Function} [onLeave] - Async hook called after the step is exited.
  */
 
 /**
@@ -34,6 +35,7 @@ export const createApi = (state) => ({
    * @param {String|Array|Object} [tour.modalTitleClass] - Global class applied to the title of modal steps.
    * @param {String|Array|Object} [tour.popoverTitleClass] - Global class applied to the title of popover steps.
    * @param {String|Array|Object} [tour.pagerClass] - Global class applied to the pager.
+   * @param {Function} [tour.onStop] - Async hook called when the tour is closed/finished.
    */
   async start(tour) {
     if (!tour?.steps?.length) return;
@@ -49,11 +51,12 @@ export const createApi = (state) => ({
     if (!active) return;
     
     if (state.stepIndex < active.steps.length - 1) {
+      await this._runLeaveHook(active.steps[state.stepIndex]);
       const nextIndex = state.stepIndex + 1;
       await this._runHooks(active.steps[nextIndex]);
       state.stepIndex = nextIndex;
     } else {
-      this.stop();
+      await this.stop();
     }
   },
   /**
@@ -64,6 +67,7 @@ export const createApi = (state) => ({
     if (!active) return;
     
     if (state.stepIndex > 0) {
+      await this._runLeaveHook(active.steps[state.stepIndex]);
       const prevIndex = state.stepIndex - 1;
       await this._runHooks(active.steps[prevIndex]);
       state.stepIndex = prevIndex;
@@ -72,17 +76,35 @@ export const createApi = (state) => ({
   /**
    * Stops and closes the current tour
    */
-  stop() {
+  async stop() {
+    const active = state.active;
+    if (active) {
+      if (active.steps[state.stepIndex]) {
+        await this._runLeaveHook(active.steps[state.stepIndex]);
+      }
+      if (typeof active.onStop === 'function') {
+        await active.onStop();
+      }
+    }
     state.active = null;
     state.stepIndex = 0;
   },
   /**
-   * Internal method to run asynchronous lifecycle hooks on a step
+   * Internal method to run asynchronous enter hooks on a step
    * @param {Object} step - The tour step configuration
    */
   async _runHooks(step) {
     if (step && typeof step.onEnter === 'function') {
       await step.onEnter();
     }
+  },
+  /**
+   * Internal method to run asynchronous leave hooks on a step
+   * @param {Object} step - The tour step configuration
+   */
+  async _runLeaveHook(step) {
+    if (step && typeof step.onLeave === 'function') {
+      await step.onLeave();
+    }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ulu/frontend-vue",
-  "version": "0.6.29",
+  "version": "0.6.31",
   "description": "A modular, tree-shakeable Vue 3 component library for the Ulu Frontend theming system, plus general utilities for Vue development",
   "type": "module",
   "files": [