vft 0.0.249 → 0.0.252

package/es/components/multiple-tabs/tab-content.vue2.js

@@ -1,108 +1,14 @@
-import { defineComponent as c, computed as r, createBlock as l, openBlock as f, unref as s, withModifiers as x } from "vue";
-import { singleAttrToObj as b } from "@vft/utils";
+import { defineComponent as l, computed as i, createBlock as f, openBlock as s, unref as x, withModifiers as b } from "vue";
+import { singleAttrToObj as p } from "@vft/utils";
 import "../context-menu/context-menu.vue2.js";
-import "../alert/index.js";
-import "../avatar/index.js";
-import "../backtop/index.js";
-import "../button/index.js";
-import "../card/index.js";
-import "../check-tag/index.js";
-import "../checkbox/index.js";
-import "../clamp/index.js";
-import "../clamp-toggle/index.js";
-import "../clamp-tooltip/index.js";
-import "../col/index.js";
-import "../collapse-transition/index.js";
-import "../color-picker/index.js";
-import "../config-provider/index.js";
-import "../container/index.js";
-import "../date-picker/index.js";
-import "../date-time-select/index.js";
-import "../descriptions/index.js";
-import "../dialog/index.js";
-import "../divider/index.js";
-import "../drawer/index.js";
-import "../dropdown/index.js";
-import "../empty/index.js";
-import "../exception/index.js";
-import "../footer-layout/index.js";
-import "../form/index.js";
-import "../full-screen/index.js";
-import "../header-layout/index.js";
-import "../horizontal-menu/index.js";
 import "../icon/index.js";
-import { VftIconText as I } from "../icon-text/index.js";
-import "../iframe-layout/index.js";
-import "../image/index.js";
-import "../image-viewer/index.js";
-import "../input/index.js";
-import "../input-number/index.js";
-import "../link/index.js";
-import "../list-cell/index.js";
-import "../logo/index.js";
-import "../menu/index.js";
-import "./index.js";
-import "../overlay/index.js";
-import "../page-wrapper/index.js";
-import "../pagination/index.js";
-import "../popconfirm/index.js";
-import "../popover/index.js";
-import "../popper/index.js";
-import "../qrcode/index.js";
-import "../radio/index.js";
-import "../result/index.js";
-import "../router-view-content/index.js";
-import "../row/index.js";
-import "../scrollbar/index.js";
-import "../search/index.js";
-import "../select/index.js";
-import "../side-menu/index.js";
-import "../skeleton/index.js";
-import "../slider/index.js";
-import "../space/index.js";
-import "../switch/index.js";
-import "../table/index.js";
-import "../tabs/index.js";
-import "../tag/index.js";
-import "../time-picker/index.js";
-import "../tooltip/index.js";
-import "../tree/index.js";
-import "../verify-code/index.js";
-import "../virtual-list/components/dynamic-size-grid.js";
-import "../virtual-list/components/dynamic-size-list.js";
-import "../virtual-list/components/fixed-size-grid.js";
-import "../virtual-list/components/fixed-size-list.js";
-import "../virtual-list/props.js";
-import "../steps/index.js";
-import "../autocomplete/index.js";
-import "../modal/index.js";
-import "../progress/index.js";
-import "../super-form/index.js";
-import "../upload/index.js";
-import "../carousel/index.js";
-import "../timeline/index.js";
-import "../md-code-demo/index.js";
-import "../md-code-tabs/index.js";
-import "../md-comment/index.js";
-import "../md-container/index.js";
-import "../md-tabs/index.js";
-import "../md-vue-playground/index.js";
-import "@vueuse/core";
-import "../../utils/ns-cover.js";
-import "lodash-es";
-import "../config-provider/hooks/use-global-config.js";
-import "../../hooks/use-model-toggle/index.js";
-import "@popperjs/core";
-import "../../hooks/use-z-index/index.js";
-import "../message/index.js";
-import "../infinite-scroll/index.js";
-import "../progress-i/index.js";
-import { useContextMenu as d } from "../context-menu/useContextMenu.js";
+import { useContextMenu as I } from "../context-menu/useContextMenu.js";
+import { VftIconText as d } from "../icon-text/index.js";
 import "vue-router";
 import "@vft/store";
 import "@vft/use";
 import { useTabDropdown as v } from "./use/use-tab-dropdown.js";
-const Io = /* @__PURE__ */ c({
+const S = /* @__PURE__ */ l({
   __name: "tab-content",
   props: {
     tabItem: {},
@@ -110,29 +16,29 @@ const Io = /* @__PURE__ */ c({
     contextMenuStyle: {},
     visible: { type: Boolean }
   },
-  setup(t, { expose: p }) {
-    const [e] = d(), i = r(() => t.tabItem.meta && t.tabItem.meta.title), n = r(() => b(t.tabItem.meta?.icon, "icon")), { getDropMenuList: a, handleContextMenu: u } = v(
+  setup(t, { expose: m }) {
+    const [a] = I(), n = i(() => t.tabItem.meta && t.tabItem.meta.title), r = i(() => p(t.tabItem.meta?.icon, "icon")), { getDropMenuList: u, handleContextMenu: c } = v(
       t.tabItem,
       t.affixNum
     );
-    function m(o) {
-      u(t.tabItem)(o), e({
-        event: o,
+    function o(e) {
+      c(t.tabItem)(e), a({
+        event: e,
         styles: t.contextMenuStyle,
-        items: a.value
+        items: u.value
       });
     }
-    return p({
-      handleContext: m
-    }), (o, M) => (f(), l(s(I), {
+    return m({
+      handleContext: o
+    }), (e, M) => (s(), f(x(d), {
       class: "vft-multiple-tabs__title",
-      title: i.value,
-      icon: n.value,
-      text: i.value,
-      onContextmenu: x(m, ["stop"])
+      title: n.value,
+      icon: r.value,
+      text: n.value,
+      onContextmenu: b(o, ["stop"])
     }, null, 8, ["title", "icon", "text"]));
   }
 });
 export {
-  Io as default
+  S as default
 };

package/es/components/multiple-tabs/use/use-tab-dropdown.js

@@ -1,179 +1,84 @@
-import { getRouterKeyPath as s } from "@vft/router";
-import { useMultipleTabStore as T, useTabs as C } from "@vft/store";
+import { getRouterKeyPath as d } from "@vft/router";
+import { useMultipleTabStore as C, useTabs as D } from "@vft/store";
 import "@vft/utils";
-import { reactive as D, computed as v } from "vue";
+import { reactive as v, computed as w } from "vue";
 import "../../context-menu/context-menu.vue2.js";
-import "../../alert/index.js";
-import "../../avatar/index.js";
-import "../../backtop/index.js";
-import "../../button/index.js";
-import "../../card/index.js";
-import "../../check-tag/index.js";
-import "../../checkbox/index.js";
-import "../../clamp/index.js";
-import "../../clamp-toggle/index.js";
-import "../../clamp-tooltip/index.js";
-import "../../col/index.js";
-import "../../collapse-transition/index.js";
-import "../../color-picker/index.js";
-import "../../config-provider/index.js";
-import "../../container/index.js";
-import "../../date-picker/index.js";
-import "../../date-time-select/index.js";
-import "../../descriptions/index.js";
-import "../../dialog/index.js";
-import "../../divider/index.js";
-import "../../drawer/index.js";
-import "../../dropdown/index.js";
-import "../../empty/index.js";
-import "../../exception/index.js";
-import "../../footer-layout/index.js";
-import "../../form/index.js";
-import "../../full-screen/index.js";
-import "../../header-layout/index.js";
-import "../../horizontal-menu/index.js";
 import "../../icon/index.js";
-import "../../icon-text/index.js";
-import "../../iframe-layout/index.js";
-import "../../image/index.js";
-import "../../image-viewer/index.js";
-import "../../input/index.js";
-import "../../input-number/index.js";
-import "../../link/index.js";
-import "../../list-cell/index.js";
-import "../../logo/index.js";
-import "../../menu/index.js";
-import "../index.js";
-import "../../overlay/index.js";
-import "../../page-wrapper/index.js";
-import "../../pagination/index.js";
-import "../../popconfirm/index.js";
-import "../../popover/index.js";
-import "../../popper/index.js";
-import "../../qrcode/index.js";
-import "../../radio/index.js";
-import "../../result/index.js";
-import "../../router-view-content/index.js";
-import "../../row/index.js";
-import "../../scrollbar/index.js";
-import "../../search/index.js";
-import "../../select/index.js";
-import "../../side-menu/index.js";
-import "../../skeleton/index.js";
-import "../../slider/index.js";
-import "../../space/index.js";
-import "../../switch/index.js";
-import "../../table/index.js";
-import "../../tabs/index.js";
-import "../../tag/index.js";
-import "../../time-picker/index.js";
-import "../../tooltip/index.js";
-import "../../tree/index.js";
-import "../../verify-code/index.js";
-import "../../virtual-list/components/dynamic-size-grid.js";
-import "../../virtual-list/components/dynamic-size-list.js";
-import "../../virtual-list/components/fixed-size-grid.js";
-import "../../virtual-list/components/fixed-size-list.js";
-import "../../virtual-list/props.js";
-import "../../steps/index.js";
-import "../../autocomplete/index.js";
-import "../../modal/index.js";
-import "../../progress/index.js";
-import "../../super-form/index.js";
-import "../../upload/index.js";
-import "../../carousel/index.js";
-import "../../timeline/index.js";
-import "../../md-code-demo/index.js";
-import "../../md-code-tabs/index.js";
-import "../../md-comment/index.js";
-import "../../md-container/index.js";
-import "../../md-tabs/index.js";
-import "../../md-vue-playground/index.js";
-import "@vueuse/core";
-import "../../../utils/ns-cover.js";
-import "lodash-es";
-import "../../config-provider/hooks/use-global-config.js";
-import "../../../hooks/use-model-toggle/index.js";
-import "@popperjs/core";
-import "../../../hooks/use-z-index/index.js";
-import "../../message/index.js";
-import "../../infinite-scroll/index.js";
-import "../../progress-i/index.js";
 import "vue-router";
-function To(t, r) {
-  const e = D({
+function E(e, n) {
+  const i = v({
     current: null,
     currentIndex: 0
-  }), o = T(), {
-    refreshPage: l,
-    closeAll: d,
-    close: a,
-    closeLeft: g,
-    closeOther: u,
-    closeRight: h,
-    newWinTab: b
-  } = C(), f = v(() => {
-    if (!t)
+  }), t = C(), {
+    refreshPage: a,
+    closeAll: g,
+    close: u,
+    closeLeft: h,
+    closeOther: p,
+    closeRight: b,
+    newWinTab: f
+  } = D(), x = w(() => {
+    if (!e)
       return;
-    const { meta: p } = t, i = e.currentIndex, m = i === 0 || i <= r, n = o.getTabList.length <= r || i === o.getTabList.length - 1 && o.getLastDragEndIndex >= 0, L = o.getTabList.length === r || o.getTabList.length === r + 1 && i === r, c = o.getTabList.length === r;
+    const { meta: r } = e, o = i.currentIndex, c = o === 0 || o <= n, s = t.getTabList.length <= n || o === t.getTabList.length - 1 && t.getLastDragEndIndex >= 0, T = t.getTabList.length === n || t.getTabList.length === n + 1 && o === n, l = t.getTabList.length === n;
     return [
       {
         iconCfg: { icon: "icon-refresh-right" },
         text: "刷新",
-        handler: () => l(t)
+        handler: () => a(e)
       },
       {
         iconCfg: { icon: "icon-new-tab" },
         text: "新页面打开",
-        handler: () => b(t),
+        handler: () => f(e),
         divider: !0
       },
       {
         iconCfg: { icon: "icon-close-tab" },
         text: "关闭标签页",
-        disabled: !!p?.affix || c,
-        handler: () => a(t)
+        disabled: !!r?.affix || l,
+        handler: () => u(e)
       },
       {
         iconCfg: { icon: "icon-arrow-close-left" },
         text: "关闭左侧标签页",
-        disabled: m,
-        handler: () => g(t)
+        disabled: c,
+        handler: () => h(e)
       },
       {
         iconCfg: { icon: "icon-arrow-close-right" },
         text: "关闭右侧标签页",
-        disabled: n,
+        disabled: s,
         divider: !0,
-        handler: () => h(t)
+        handler: () => b(e)
       },
       {
         iconCfg: { icon: "icon-close-box-multiple-outline" },
         text: "关闭其它标签页",
-        disabled: L,
-        handler: () => u(t)
+        disabled: T,
+        handler: () => p(e)
       },
       {
         iconCfg: { icon: "icon-vector-square-delete" },
         text: "关闭所有标签页",
-        disabled: c,
-        handler: () => d()
+        disabled: l,
+        handler: () => g()
       }
     ];
   });
-  function x(p) {
-    return (i) => {
-      if (!p)
+  function L(r) {
+    return (o) => {
+      if (!r)
         return;
-      i?.preventDefault();
-      const m = o.getTabList.findIndex(
-        (n) => s(n) === s(p)
+      o?.preventDefault();
+      const c = t.getTabList.findIndex(
+        (s) => d(s) === d(r)
       );
-      e.current = p, e.currentIndex = m;
+      i.current = r, i.currentIndex = c;
     };
   }
-  return { getDropMenuList: f, handleContextMenu: x };
+  return { getDropMenuList: x, handleContextMenu: L };
 }
 export {
-  To as useTabDropdown
+  E as useTabDropdown
 };

package/es/components/popconfirm/index.d.ts

@@ -7,19 +7,19 @@ export declare const VftPopconfirm: import("vft/es/utils").SFCWithInstall<{
             type: import("vue").PropType<string | number>;
             default: number;
         };
-        hideAfter: {
-            type: import("vue").PropType<number>;
-            default: number;
-        };
         icon: {
             type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
             default: string;
         };
-        persistent: {
+        teleported: {
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        teleported: {
+        hideAfter: {
+            type: import("vue").PropType<number>;
+            default: number;
+        };
+        persistent: {
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
@@ -52,10 +52,10 @@ export declare const VftPopconfirm: import("vft/es/utils").SFCWithInstall<{
         cancel: (val: MouseEvent) => void;
     }, import("vue").PublicProps, {
         width: string | number;
-        hideAfter: number;
         icon: string | import("vft/es/vft").IconProps;
-        persistent: boolean;
         teleported: boolean;
+        hideAfter: number;
+        persistent: boolean;
         confirmButtonType: import("vft/es/vft").ButtonType;
         iconColor: string;
         hideIcon: boolean;
@@ -74,19 +74,19 @@ export declare const VftPopconfirm: import("vft/es/utils").SFCWithInstall<{
             type: import("vue").PropType<string | number>;
             default: number;
         };
-        hideAfter: {
-            type: import("vue").PropType<number>;
-            default: number;
-        };
         icon: {
             type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
             default: string;
         };
-        persistent: {
+        teleported: {
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
-        teleported: {
+        hideAfter: {
+            type: import("vue").PropType<number>;
+            default: number;
+        };
+        persistent: {
             type: import("vue").PropType<boolean>;
             default: boolean;
         };
@@ -116,10 +116,10 @@ export declare const VftPopconfirm: import("vft/es/utils").SFCWithInstall<{
         onConfirm?: ((val: MouseEvent) => any) | undefined;
     }>, {}, {}, {}, {}, {
         width: string | number;
-        hideAfter: number;
         icon: string | import("vft/es/vft").IconProps;
-        persistent: boolean;
         teleported: boolean;
+        hideAfter: number;
+        persistent: boolean;
         confirmButtonType: import("vft/es/vft").ButtonType;
         iconColor: string;
         hideIcon: boolean;
@@ -135,19 +135,19 @@ export declare const VftPopconfirm: import("vft/es/utils").SFCWithInstall<{
         type: import("vue").PropType<string | number>;
         default: number;
     };
-    hideAfter: {
-        type: import("vue").PropType<number>;
-        default: number;
-    };
     icon: {
         type: import("vue").PropType<string | import("vft/es/vft").IconProps>;
         default: string;
     };
-    persistent: {
+    teleported: {
         type: import("vue").PropType<boolean>;
         default: boolean;
     };
-    teleported: {
+    hideAfter: {
+        type: import("vue").PropType<number>;
+        default: number;
+    };
+    persistent: {
         type: import("vue").PropType<boolean>;
         default: boolean;
     };
@@ -180,10 +180,10 @@ export declare const VftPopconfirm: import("vft/es/utils").SFCWithInstall<{
     cancel: (val: MouseEvent) => void;
 }, string, {
     width: string | number;
-    hideAfter: number;
     icon: string | import("vft/es/vft").IconProps;
-    persistent: boolean;
     teleported: boolean;
+    hideAfter: number;
+    persistent: boolean;
     confirmButtonType: import("vft/es/vft").ButtonType;
     iconColor: string;
     hideIcon: boolean;

package/es/components/popconfirm/popconfirm.vue.d.ts

@@ -43,10 +43,10 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     onConfirm?: ((val: MouseEvent) => any) | undefined;
 }>, {
     width: string | number;
-    hideAfter: number;
     icon: string | IconProps;
-    persistent: boolean;
     teleported: boolean;
+    hideAfter: number;
+    persistent: boolean;
     confirmButtonType: ButtonType;
     iconColor: string;
     hideIcon: boolean;

package/es/components/popover/index.d.ts

@@ -73,19 +73,19 @@ export declare const VftPopover: import("vft/es/utils").SFCWithInstall<{
             type: import("vue").PropType<Function>;
         };
     }>> & Readonly<{
-        "onBefore-leave"?: ((...args: any[]) => any) | undefined;
         "onAfter-leave"?: ((...args: any[]) => any) | undefined;
         "onBefore-enter"?: ((...args: any[]) => any) | undefined;
         "onAfter-enter"?: ((...args: any[]) => any) | undefined;
+        "onBefore-leave"?: ((...args: any[]) => any) | undefined;
         "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
     }>, {
         popperRef: import("vue").ComputedRef<any>;
         hide: () => void;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-        "before-leave": (...args: any[]) => void;
         "after-leave": (...args: any[]) => void;
         "before-enter": (...args: any[]) => void;
         "after-enter": (...args: any[]) => void;
+        "before-leave": (...args: any[]) => void;
         "update:visible": (...args: any[]) => void;
     }, import("vue").PublicProps, {}, true, {}, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, {}, any, import("vue").ComponentProvideOptions, {
         P: {};
@@ -168,10 +168,10 @@ export declare const VftPopover: import("vft/es/utils").SFCWithInstall<{
             type: import("vue").PropType<Function>;
         };
     }>> & Readonly<{
-        "onBefore-leave"?: ((...args: any[]) => any) | undefined;
         "onAfter-leave"?: ((...args: any[]) => any) | undefined;
         "onBefore-enter"?: ((...args: any[]) => any) | undefined;
         "onAfter-enter"?: ((...args: any[]) => any) | undefined;
+        "onBefore-leave"?: ((...args: any[]) => any) | undefined;
         "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
     }>, {
         popperRef: import("vue").ComputedRef<any>;
@@ -254,19 +254,19 @@ export declare const VftPopover: import("vft/es/utils").SFCWithInstall<{
         type: import("vue").PropType<Function>;
     };
 }>> & Readonly<{
-    "onBefore-leave"?: ((...args: any[]) => any) | undefined;
     "onAfter-leave"?: ((...args: any[]) => any) | undefined;
     "onBefore-enter"?: ((...args: any[]) => any) | undefined;
     "onAfter-enter"?: ((...args: any[]) => any) | undefined;
+    "onBefore-leave"?: ((...args: any[]) => any) | undefined;
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
 }>, {
     popperRef: import("vue").ComputedRef<any>;
     hide: () => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "before-leave": (...args: any[]) => void;
     "after-leave": (...args: any[]) => void;
     "before-enter": (...args: any[]) => void;
     "after-enter": (...args: any[]) => void;
+    "before-leave": (...args: any[]) => void;
     "update:visible": (...args: any[]) => void;
 }, string, {}, {}, string, {}, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
     $slots: {

package/es/components/popover/popover.vue.d.ts

@@ -7,16 +7,16 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     popperRef: import("vue").ComputedRef<any>;
     hide: () => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    "before-leave": (...args: any[]) => void;
     "after-leave": (...args: any[]) => void;
     "before-enter": (...args: any[]) => void;
     "after-enter": (...args: any[]) => void;
+    "before-leave": (...args: any[]) => void;
     "update:visible": (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToRuntimeProps<PopoverProps>>> & Readonly<{
-    "onBefore-leave"?: ((...args: any[]) => any) | undefined;
     "onAfter-leave"?: ((...args: any[]) => any) | undefined;
     "onBefore-enter"?: ((...args: any[]) => any) | undefined;
     "onAfter-enter"?: ((...args: any[]) => any) | undefined;
+    "onBefore-leave"?: ((...args: any[]) => any) | undefined;
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/components/popper/composables/use-content.js

@@ -3,13 +3,12 @@ import { isUndefined as U } from "lodash-es";
 import "@vueuse/core";
 import "@vft/utils";
 import "../../../utils/ns-cover.js";
-import "../../config-provider/hooks/use-global-config.js";
 import "../../../hooks/use-model-toggle/index.js";
 import { usePopper as _ } from "../../../hooks/use-popper/index.js";
 import "../../../hooks/use-z-index/index.js";
 import { POPPER_INJECTION_KEY as C } from "../constants.js";
 import { buildPopperOptions as I, unwrapMeasurableEl as L } from "../utils.js";
-const T = 0, W = (r) => {
+const T = 0, S = (r) => {
   const { popperInstanceRef: m, contentRef: i, triggerRef: d, role: u } = F(
     C,
     void 0
@@ -58,5 +57,5 @@ const T = 0, W = (r) => {
   };
 };
 export {
-  W as usePopperContent
+  S as usePopperContent
 };

package/es/components/popper/trigger.vue2.js

@@ -5,7 +5,6 @@ import { unrefElement as L } from "@vueuse/core";
 import "../../utils/ns-cover.js";
 import { isNil as F } from "lodash-es";
 import { useForwardRef as I } from "../../hooks/use-forward-ref/index.js";
-import "../config-provider/hooks/use-global-config.js";
 import "../../hooks/use-model-toggle/index.js";
 import "@popperjs/core";
 import "../../hooks/use-z-index/index.js";
@@ -13,7 +12,7 @@ import { POPPER_INJECTION_KEY as K } from "./constants.js";
 const O = g({
   name: "VftPopperTrigger",
   inheritAttrs: !1
-}), z = /* @__PURE__ */ g({
+}), q = /* @__PURE__ */ g({
   ...O,
   props: {
     virtualRef: {},
@@ -31,13 +30,13 @@ const O = g({
   setup(r, { expose: b }) {
     const h = C(), { role: i, triggerRef: n } = y(K, void 0);
     I(n);
-    const p = s(() => u.value ? r.id : void 0), m = s(() => {
+    const p = s(() => u.value ? r.id : void 0), c = s(() => {
       if (i && i.value === "tooltip")
         return r.open && r.id ? r.id : void 0;
     }), u = s(() => {
       if (i && i.value !== "tooltip")
         return i.value;
-    }), c = s(() => u.value ? `${r.open}` : void 0);
+    }), m = s(() => u.value ? `${r.open}` : void 0);
     let a;
     return E(() => {
       l(
@@ -69,7 +68,7 @@ const O = g({
               t
             ));
           }), a = l(
-            [p, m, u, c],
+            [p, c, u, m],
             (o) => {
               [
                 "aria-controls",
@@ -101,8 +100,8 @@ const O = g({
       triggerRef: n
     }), (e, d) => e.virtualTriggering ? w("", !0) : (A(), B(M(k), P({ key: 0 }, e.$attrs, {
       "aria-controls": p.value,
-      "aria-describedby": m.value,
-      "aria-expanded": c.value,
+      "aria-describedby": c.value,
+      "aria-expanded": m.value,
       "aria-haspopup": u.value
     }), {
       default: R(() => [
@@ -113,5 +112,5 @@ const O = g({
   }
 });
 export {
-  z as default
+  q as default
 };