@volverjs/ui-vue 0.0.10-beta.23 → 0.0.10-beta.24

package/dist/components/VvAccordion/VvAccordion.es.js

@@ -1,6 +1,6 @@
-import { unref, inject, computed, toRef, toRefs, defineComponent, useAttrs, ref, openBlock, createElementBlock, normalizeClass, createElementVNode, withModifiers, renderSlot, normalizeProps, guardReactiveProps, createTextVNode, toDisplayString } from "vue";
+import { inject, computed, toRef, unref, defineComponent, useAttrs, toRefs, ref, watch, onBeforeUnmount, openBlock, createElementBlock, normalizeClass, createElementVNode, withModifiers, renderSlot, normalizeProps, guardReactiveProps, createTextVNode, toDisplayString } from "vue";
 import { uid } from "uid";
-import { useToggle } from "@vueuse/core";
+import { useVModel } from "@vueuse/core";
 var Strategy = /* @__PURE__ */ ((Strategy2) => {
   Strategy2["absolute"] = "absolute";
   Strategy2["fixed"] = "fixed";
@@ -49,7 +49,9 @@ var AnchorTarget = /* @__PURE__ */ ((AnchorTarget2) => {
   AnchorTarget2["_top"] = "_top";
   return AnchorTarget2;
 })(AnchorTarget || {});
-const INJECTION_KEY_ACCORDION_GROUP = Symbol.for("accordionGroup");
+const INJECTION_KEY_ACCORDION_GROUP = Symbol.for(
+  "accordionGroup"
+);
 const LinkProps = {
   /**
    * The router-link/nuxt-link property, if it is defined the button is rendered as a ruouter-link or nuxt-link.
@@ -274,18 +276,15 @@ const ModifiersProps = {
     default: ActionTag.button
   }
 });
-function isEmpty(value) {
-  return ((value2) => value2 === null || value2 === void 0 || value2 === "" || Array.isArray(value2) && value2.length === 0 || !(value2 instanceof Date) && typeof value2 === "object" && Object.keys(value2).length === 0)(unref(value));
-}
 function useInjectedGroupState(groupKey) {
   const group = inject(groupKey, void 0);
-  const isInGroup = computed(() => !isEmpty(group));
+  const isInGroup = computed(() => group !== void 0);
   function getGroupOrLocalRef(propName, props, emit) {
-    if (group == null ? void 0 : group.value) {
-      const groupPropValue = unref(group.value)[propName];
+    const groupPropValue = group == null ? void 0 : group[propName];
+    if (groupPropValue) {
       return computed({
         get() {
-          return groupPropValue == null ? void 0 : groupPropValue.value;
+          return groupPropValue.value;
         },
         set(value) {
           groupPropValue.value = value;
@@ -298,8 +297,9 @@ function useInjectedGroupState(groupKey) {
         return propRef.value;
       },
       set(value) {
-        if (emit)
+        if (emit) {
           emit(`update:${propName}`, value);
+        }
       }
     });
   }
@@ -340,23 +340,16 @@ const VvAccordionProps = {
   not: Boolean
 };
 const VvAccordionEvents = ["update:modelValue"];
-function useGroupProps(props, emit) {
-  const { group, isInGroup, getGroupOrLocalRef } = useInjectedGroupState(
+function useGroupProps(props) {
+  const { group, isInGroup } = useInjectedGroupState(
     INJECTION_KEY_ACCORDION_GROUP
   );
-  const { title, content } = toRefs(props);
-  const modelValue = getGroupOrLocalRef("modelValue", props, emit);
-  const not = getGroupOrLocalRef("not", props);
-  const collapse = getGroupOrLocalRef("collapse", props);
   const disabled = computed(
-    () => {
-      var _a;
-      return Boolean(props.disabled || ((_a = group == null ? void 0 : group.value) == null ? void 0 : _a.disabled.value));
-    }
+    () => Boolean(props.disabled || (group == null ? void 0 : group.disabled.value))
   );
   const modifiers = computed(() => {
     let localModifiers = props.modifiers;
-    let groupModifiers = group == null ? void 0 : group.value.modifiers.value;
+    let groupModifiers = group == null ? void 0 : group.modifiers.value;
     const toReturn = /* @__PURE__ */ new Set();
     if (localModifiers) {
       if (!Array.isArray(localModifiers)) {
@@ -374,16 +367,11 @@ function useGroupProps(props, emit) {
   });
   return {
     // group props
-    modelValue,
-    not,
     isInGroup,
     group,
-    collapse,
     modifiers,
     disabled,
-    // local props
-    title,
-    content
+    bus: group == null ? void 0 : group.bus
   };
 }
 function useModifiers(prefix, modifiers, others) {
@@ -419,62 +407,103 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   ...__default__,
   props: VvAccordionProps,
   emits: VvAccordionEvents,
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const attrs = useAttrs();
     const emit = __emit;
+    const modelValue = useVModel(props, "modelValue", emit);
     const accordionName = computed(
       () => props.name || (attrs == null ? void 0 : attrs.id) || uid()
     );
-    const {
-      modifiers,
-      title,
-      content,
-      disabled,
-      collapse,
+    const { title, content, not } = toRefs(props);
+    const { isInGroup, modifiers, disabled, bus } = useGroupProps(props);
+    const isExpanded = ref(false);
+    watch(
       modelValue,
-      isInGroup,
-      not
-    } = useGroupProps(props, emit);
-    const localModelValue = ref(false);
-    const isOpen = computed({
-      get: () => {
-        let toReturn = modelValue.value;
-        if (isInGroup.value) {
-          if (collapse.value && Array.isArray(modelValue.value)) {
-            toReturn = modelValue.value.includes(accordionName.value);
-          } else {
-            toReturn = modelValue.value === accordionName.value;
-          }
-        } else if (modelValue.value === void 0) {
-          toReturn = localModelValue.value;
+      (newValue) => {
+        if (typeof newValue === "boolean") {
+          isExpanded.value = not.value ? !newValue : newValue;
         }
-        return not.value ? !toReturn : toReturn;
       },
-      set: (newValue) => {
-        if (not.value) {
-          newValue = !newValue;
-        }
-        if (isInGroup.value) {
-          if (collapse.value && Array.isArray(modelValue.value)) {
-            if (newValue) {
-              modelValue.value.push(accordionName.value);
-              return;
-            }
-            modelValue.value = modelValue.value.filter(
-              (name) => name !== accordionName.value
-            );
-            return;
+      { immediate: true }
+    );
+    watch(isExpanded, (newValue) => {
+      modelValue.value = not.value ? !newValue : newValue;
+    });
+    bus == null ? void 0 : bus.on("toggle", ({ name, value }) => {
+      if (name !== accordionName.value) {
+        return;
+      }
+      isExpanded.value = value;
+    });
+    const onClick = () => {
+      if (disabled.value) {
+        return;
+      }
+      if (isInGroup.value) {
+        bus == null ? void 0 : bus.emit("toggle", {
+          name: accordionName.value,
+          value: !isExpanded.value
+        });
+        return;
+      }
+      isExpanded.value = !isExpanded.value;
+    };
+    watch(
+      accordionName,
+      (newValue, oldValue) => {
+        if (bus) {
+          if (oldValue && oldValue !== newValue) {
+            bus.emit("unregister", { name: oldValue });
           }
-          modelValue.value = newValue ? accordionName.value : null;
-          return;
+          bus.emit("register", { name: newValue });
         }
-        if (modelValue.value === void 0 && typeof newValue === "boolean") {
-          localModelValue.value = newValue;
-          return;
-        }
-        modelValue.value = newValue;
+      },
+      {
+        immediate: true
+      }
+    );
+    onBeforeUnmount(() => {
+      if (bus) {
+        bus.emit("unregister", { name: accordionName.value });
+      }
+    });
+    const expand = () => {
+      if (isExpanded.value) {
+        return;
+      }
+      onClick();
+    };
+    const collapse = () => {
+      if (!isExpanded.value) {
+        return;
+      }
+      onClick();
+    };
+    const groupExpand = (name) => {
+      if (!bus) {
+        console.warn(
+          `[VvAccordion]: You are trying to expand accordion group of "${accordionName.value}" but it is not in a group`
+        );
+        return;
       }
+      bus.emit("expand", { name });
+    };
+    const groupCollapse = (name) => {
+      if (!bus) {
+        console.warn(
+          `[VvAccordion]: You are trying to collapse accordion group of "${accordionName.value}" but it is not in a group`
+        );
+        return;
+      }
+      bus == null ? void 0 : bus.emit("collapse", { name });
+    };
+    __expose({
+      isExpanded,
+      expand,
+      collapse,
+      groupExpand,
+      groupCollapse
     });
     const bemCssClasses = useModifiers(
       "vv-accordion",
@@ -483,20 +512,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         disabled: disabled.value
       }))
     );
-    const onClick = useToggle(isOpen);
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("details", {
         id: unref(accordionName),
         class: normalizeClass(unref(bemCssClasses)),
-        open: unref(isOpen)
+        open: unref(isExpanded)
       }, [
         createElementVNode("summary", {
           "aria-controls": unref(accordionName),
-          "aria-expanded": unref(isOpen),
+          "aria-expanded": unref(isExpanded),
           class: "vv-accordion__summary",
-          onClick: _cache[0] || (_cache[0] = withModifiers(($event) => unref(onClick)(), ["prevent"]))
+          onClick: _cache[0] || (_cache[0] = withModifiers(($event) => onClick(), ["prevent"]))
         }, [
-          renderSlot(_ctx.$slots, "summary", normalizeProps(guardReactiveProps({ open: unref(isOpen) })), () => [
+          renderSlot(_ctx.$slots, "summary", normalizeProps(guardReactiveProps({
+            isExpanded: unref(isExpanded),
+            expand,
+            collapse,
+            groupExpand,
+            groupCollapse
+          })), () => [
             createTextVNode(
               toDisplayString(unref(title)),
               1
@@ -505,10 +539,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ])
         ], 8, _hoisted_2),
         createElementVNode("div", {
-          "aria-hidden": !unref(isOpen),
+          "aria-hidden": !unref(isExpanded),
           class: "vv-accordion__content"
         }, [
-          renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps({ open: unref(isOpen) })), () => [
+          renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps({
+            isExpanded: unref(isExpanded),
+            expand,
+            collapse,
+            groupExpand,
+            groupCollapse
+          })), () => [
             createTextVNode(
               toDisplayString(unref(content)),
               1

package/dist/components/VvAccordion/VvAccordion.umd.js

@@ -1 +1 @@
-!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("vue"),require("uid"),require("@vueuse/core")):"function"==typeof define&&define.amd?define(["vue","uid","@vueuse/core"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).VvAccordion=o(e.vue,e.uid,e.core)}(this,(function(e,o,t){"use strict";var r=(e=>(e.left="left",e.right="right",e.top="top",e.bottom="bottom",e))(r||{}),n=(e=>(e.before="before",e.after="after",e))(n||{}),u=(e=>(e.button="button",e.submit="submit",e.reset="reset",e))(u||{}),a=(e=>(e.nuxtLink="nuxt-link",e.routerLink="router-link",e.a="a",e.button="button",e))(a||{});const l=Symbol.for("accordionGroup"),i=(Boolean,Boolean,Boolean,Boolean,{modifiers:{type:[String,Array],default:void 0}});function d(o){const t=e.inject(o,void 0),r=e.computed((()=>{return o=t,!(null==(r=e.unref(o))||""===r||Array.isArray(r)&&0===r.length||!(r instanceof Date)&&"object"==typeof r&&0===Object.keys(r).length);var o,r}));return{group:t,isInGroup:r,getGroupOrLocalRef:function(o,r,n){if(null==t?void 0:t.value){const r=e.unref(t.value)[o];return e.computed({get:()=>null==r?void 0:r.value,set(e){r.value=e}})}const u=e.toRef(r,o);return e.computed({get:()=>u.value,set(e){n&&n(`update:${o}`,e)}})}}}n.before,r.bottom,Boolean,Boolean,Boolean,Boolean,Boolean,Boolean,Boolean,Boolean,u.button,a.button;const s={...i,name:String,title:String,content:String,modelValue:{type:Boolean,default:void 0},disabled:Boolean,not:Boolean};const c=["id","open"],v=["aria-controls","aria-expanded"],f=["aria-hidden"];return e.defineComponent({name:"VvAccordion",props:s,emits:["update:modelValue"],setup(r,{emit:n}){const u=r,a=e.useAttrs(),i=n,s=e.computed((()=>u.name||(null==a?void 0:a.id)||o.uid())),{modifiers:p,title:m,content:y,disabled:b,collapse:g,modelValue:B,isInGroup:A,not:h}=function(o,t){const{group:r,isInGroup:n,getGroupOrLocalRef:u}=d(l),{title:a,content:i}=e.toRefs(o),s=u("modelValue",o,t),c=u("not",o),v=u("collapse",o),f=e.computed((()=>{var e;return Boolean(o.disabled||(null==(e=null==r?void 0:r.value)?void 0:e.disabled.value))})),p=e.computed((()=>{let e=o.modifiers,t=null==r?void 0:r.value.modifiers.value;const n=new Set;return e&&(Array.isArray(e)||(e=e.split(" ")),e.forEach((e=>n.add(e)))),t&&(Array.isArray(t)||(t=t.split(" ")),t.forEach((e=>n.add(e)))),Array.from(n)}));return{modelValue:s,not:c,isInGroup:n,group:r,collapse:v,modifiers:p,disabled:f,title:a,content:i}}(u,i),V=e.ref(!1),S=e.computed({get:()=>{let e=B.value;return A.value?e=g.value&&Array.isArray(B.value)?B.value.includes(s.value):B.value===s.value:void 0===B.value&&(e=V.value),h.value?!e:e},set:e=>{if(h.value&&(e=!e),A.value)return g.value&&Array.isArray(B.value)?e?void B.value.push(s.value):void(B.value=B.value.filter((e=>e!==s.value))):void(B.value=e?s.value:null);void 0!==B.value||"boolean"!=typeof e?B.value=e:V.value=e}}),k=function(o,t,r){return e.computed((()=>{const n={[o]:!0},u="string"==typeof(null==t?void 0:t.value)?t.value.split(" "):null==t?void 0:t.value;return u&&Array.isArray(u)&&u.forEach((e=>{e&&(n[`${o}--${e}`]=!0)})),r&&Object.keys(r.value).forEach((t=>{n[`${o}--${t}`]=e.unref(r.value[t])})),n}))}("vv-accordion",p,e.computed((()=>({disabled:b.value})))),x=t.useToggle(S);return(o,t)=>(e.openBlock(),e.createElementBlock("details",{id:e.unref(s),class:e.normalizeClass(e.unref(k)),open:e.unref(S)},[e.createElementVNode("summary",{"aria-controls":e.unref(s),"aria-expanded":e.unref(S),class:"vv-accordion__summary",onClick:t[0]||(t[0]=e.withModifiers((o=>e.unref(x)()),["prevent"]))},[e.renderSlot(o.$slots,"summary",e.normalizeProps(e.guardReactiveProps({open:e.unref(S)})),(()=>[e.createTextVNode(e.toDisplayString(e.unref(m)),1)]))],8,v),e.createElementVNode("div",{"aria-hidden":!e.unref(S),class:"vv-accordion__content"},[e.renderSlot(o.$slots,"default",e.normalizeProps(e.guardReactiveProps({open:e.unref(S)})),(()=>[e.createTextVNode(e.toDisplayString(e.unref(y)),1)]))],8,f)],10,c))}})}));
+!function(e,o){"object"==typeof exports&&"undefined"!=typeof module?module.exports=o(require("vue"),require("uid"),require("@vueuse/core")):"function"==typeof define&&define.amd?define(["vue","uid","@vueuse/core"],o):(e="undefined"!=typeof globalThis?globalThis:e||self).VvAccordion=o(e.vue,e.uid,e.core)}(this,(function(e,o,n){"use strict";var t=(e=>(e.left="left",e.right="right",e.top="top",e.bottom="bottom",e))(t||{}),a=(e=>(e.before="before",e.after="after",e))(a||{}),r=(e=>(e.button="button",e.submit="submit",e.reset="reset",e))(r||{}),u=(e=>(e.nuxtLink="nuxt-link",e.routerLink="router-link",e.a="a",e.button="button",e))(u||{});const l=Symbol.for("accordionGroup"),i=(Boolean,Boolean,Boolean,Boolean,{modifiers:{type:[String,Array],default:void 0}});a.before,t.bottom,Boolean,Boolean,Boolean,Boolean,Boolean,Boolean,Boolean,Boolean,r.button,u.button;const d={...i,name:String,title:String,content:String,modelValue:{type:Boolean,default:void 0},disabled:Boolean,not:Boolean};function s(o){const{group:n,isInGroup:t}=function(o){const n=e.inject(o,void 0),t=e.computed((()=>void 0!==n));return{group:n,isInGroup:t,getGroupOrLocalRef:function(o,t,a){const r=null==n?void 0:n[o];if(r)return e.computed({get:()=>r.value,set(e){r.value=e}});const u=e.toRef(t,o);return e.computed({get:()=>u.value,set(e){a&&a(`update:${o}`,e)}})}}}(l),a=e.computed((()=>Boolean(o.disabled||(null==n?void 0:n.disabled.value)))),r=e.computed((()=>{let e=o.modifiers,t=null==n?void 0:n.modifiers.value;const a=new Set;return e&&(Array.isArray(e)||(e=e.split(" ")),e.forEach((e=>a.add(e)))),t&&(Array.isArray(t)||(t=t.split(" ")),t.forEach((e=>a.add(e)))),Array.from(a)}));return{isInGroup:t,group:n,modifiers:r,disabled:a,bus:null==n?void 0:n.bus}}const c=["id","open"],p=["aria-controls","aria-expanded"],m=["aria-hidden"];return e.defineComponent({name:"VvAccordion",props:d,emits:["update:modelValue"],setup(t,{expose:a,emit:r}){const u=t,l=e.useAttrs(),i=r,d=n.useVModel(u,"modelValue",i),f=e.computed((()=>u.name||(null==l?void 0:l.id)||o.uid())),{title:v,content:g,not:b}=e.toRefs(u),{isInGroup:y,modifiers:x,disabled:B,bus:h}=s(u),A=e.ref(!1);e.watch(d,(e=>{"boolean"==typeof e&&(A.value=b.value?!e:e)}),{immediate:!0}),e.watch(A,(e=>{d.value=b.value?!e:e})),null==h||h.on("toggle",(({name:e,value:o})=>{e===f.value&&(A.value=o)}));const E=()=>{B.value||(y.value?null==h||h.emit("toggle",{name:f.value,value:!A.value}):A.value=!A.value)};e.watch(f,((e,o)=>{h&&(o&&o!==e&&h.emit("unregister",{name:o}),h.emit("register",{name:e}))}),{immediate:!0}),e.onBeforeUnmount((()=>{h&&h.emit("unregister",{name:f.value})}));const V=()=>{A.value||E()},S=()=>{A.value&&E()},$=e=>{h?h.emit("expand",{name:e}):console.warn(`[VvAccordion]: You are trying to expand accordion group of "${f.value}" but it is not in a group`)},k=e=>{h?null==h||h.emit("collapse",{name:e}):console.warn(`[VvAccordion]: You are trying to collapse accordion group of "${f.value}" but it is not in a group`)};a({isExpanded:A,expand:V,collapse:S,groupExpand:$,groupCollapse:k});const w=function(o,n,t){return e.computed((()=>{const a={[o]:!0},r="string"==typeof(null==n?void 0:n.value)?n.value.split(" "):null==n?void 0:n.value;return r&&Array.isArray(r)&&r.forEach((e=>{e&&(a[`${o}--${e}`]=!0)})),t&&Object.keys(t.value).forEach((n=>{a[`${o}--${n}`]=e.unref(t.value[n])})),a}))}("vv-accordion",x,e.computed((()=>({disabled:B.value}))));return(o,n)=>(e.openBlock(),e.createElementBlock("details",{id:e.unref(f),class:e.normalizeClass(e.unref(w)),open:e.unref(A)},[e.createElementVNode("summary",{"aria-controls":e.unref(f),"aria-expanded":e.unref(A),class:"vv-accordion__summary",onClick:n[0]||(n[0]=e.withModifiers((e=>E()),["prevent"]))},[e.renderSlot(o.$slots,"summary",e.normalizeProps(e.guardReactiveProps({isExpanded:e.unref(A),expand:V,collapse:S,groupExpand:$,groupCollapse:k})),(()=>[e.createTextVNode(e.toDisplayString(e.unref(v)),1)]))],8,p),e.createElementVNode("div",{"aria-hidden":!e.unref(A),class:"vv-accordion__content"},[e.renderSlot(o.$slots,"default",e.normalizeProps(e.guardReactiveProps({isExpanded:e.unref(A),expand:V,collapse:S,groupExpand:$,groupCollapse:k})),(()=>[e.createTextVNode(e.toDisplayString(e.unref(g)),1)]))],8,m)],10,c))}})}));

package/dist/components/VvAccordion/VvAccordion.vue.d.ts

@@ -12,7 +12,13 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
         type: globalThis.PropType<string | string[]>;
         default: undefined;
     };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, {
+    isExpanded: globalThis.Ref<boolean>;
+    expand: () => void;
+    collapse: () => void;
+    groupExpand: (name?: string | string[]) => void;
+    groupCollapse: (name?: string | string[]) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     [x: string]: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<globalThis.ExtractPropTypes<{
     name: StringConstructor;
@@ -31,14 +37,22 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{
 }>>, {
     disabled: boolean;
     modelValue: boolean;
-    modifiers: string | string[];
     not: boolean;
+    modifiers: string | string[];
 }, {}>, {
     summary?(_: {
-        open: boolean;
+        isExpanded: boolean;
+        expand: () => void;
+        collapse: () => void;
+        groupExpand: (name?: string | string[]) => void;
+        groupCollapse: (name?: string | string[]) => void;
     }): any;
     default?(_: {
-        open: boolean;
+        isExpanded: boolean;
+        expand: () => void;
+        collapse: () => void;
+        groupExpand: (name?: string | string[]) => void;
+        groupCollapse: (name?: string | string[]) => void;
     }): any;
 }>;
 export default _default;

package/dist/components/VvAccordion/index.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, Ref } from 'vue';
+import type { ExtractPropTypes } from 'vue';
 import type { AccordionGroupState } from '../../types/group';
 export declare const VvAccordionProps: {
     /**
@@ -38,14 +38,10 @@ export type VvAccordionPropsTypes = ExtractPropTypes<typeof VvAccordionProps>;
 /**
  * Merges local and group props
  */
-export declare function useGroupProps(props: VvAccordionPropsTypes, emit: (event: string, value: unknown) => void): {
-    modelValue: globalThis.WritableComputedRef<any>;
-    not: Ref<boolean>;
+export declare function useGroupProps(props: VvAccordionPropsTypes): {
     isInGroup: globalThis.ComputedRef<boolean>;
-    group: Ref<AccordionGroupState> | undefined;
-    collapse: Ref<boolean>;
+    group: AccordionGroupState | undefined;
     modifiers: globalThis.ComputedRef<string[]>;
     disabled: globalThis.ComputedRef<boolean>;
-    title: Ref<string | undefined> | undefined;
-    content: Ref<string | undefined> | undefined;
+    bus: import("mitt").Emitter<import("../../types/group").AccordionGroupBusEvents> | undefined;
 };