x-next 1.9.0 → 1.10.1

package/dist/es/components/form-select/SelectOption.vue.js

@@ -1,5 +1,5 @@
 import c from "./SelectOption.vue2.js";
-import { resolveComponent as u, withDirectives as f, openBlock as s, createBlock as n, resolveDynamicComponent as p, normalizeClass as o, withCtx as i, createElementBlock as a, renderSlot as l, createCommentVNode as t, createTextVNode as r, toDisplayString as d, vShow as k } from "vue";
+import { resolveComponent as u, withDirectives as f, openBlock as s, createBlock as n, resolveDynamicComponent as p, normalizeClass as o, withCtx as i, createElementBlock as a, renderSlot as l, createCommentVNode as t, createTextVNode as d, toDisplayString as r, vShow as k } from "vue";
 import b from "../../_virtual/_plugin-vue_export-helper.js";
 function h(e, $, v, C, N, y) {
   const m = u("checkbox");
@@ -26,11 +26,13 @@ function h(e, $, v, C, N, y) {
         class: o(e.className.element("checkbox")),
         "model-value": e.isSelected,
         disabled: e.disabled,
+        tabindex: -1,
+        "aria-hidden": "true",
         "uninject-group-context": ""
       }, {
         default: i(() => [
           l(e.$slots, "default", {}, () => [
-            r(d(e.label), 1)
+            d(r(e.label), 1)
           ])
         ]),
         _: 3
@@ -39,7 +41,7 @@ function h(e, $, v, C, N, y) {
         class: o(e.className.element("content"))
       }, [
         l(e.$slots, "default", {}, () => [
-          r(d(e.label), 1)
+          d(r(e.label), 1)
         ])
       ], 2)),
       e.$slots.suffix ? (s(), a("span", {

package/dist/es/components/form-select/SelectOption.vue2.js

@@ -1,10 +1,11 @@
-import { defineComponent as B, toRefs as M, inject as N, getCurrentInstance as P, ref as r, watch as A, computed as i, onMounted as _, onUpdated as w, reactive as E, onBeforeUnmount as R } from "vue";
+import { defineComponent as B, toRefs as M, inject as N, provide as P, getCurrentInstance as A, ref as f, watch as _, computed as i, onMounted as q, onUpdated as w, reactive as E, onBeforeUnmount as R } from "vue";
 import U from "../form-checkbox/Checkbox.js";
-import { selectInjectionKey as q } from "./context.js";
-import { getKeyFromValue as F, isValidOption as L } from "./utils.js";
-import { isEqual as T } from "../../_utils/is-equal.js";
-import { getClassNameMixin as z } from "../../_utils/config.js";
-const X = B({
+import { selectInjectionKey as F } from "./context.js";
+import { getKeyFromValue as L, isValidOption as T } from "./utils.js";
+import { isEqual as z } from "../../_utils/is-equal.js";
+import { getClassNameMixin as D } from "../../_utils/config.js";
+import { formItemInjectionKey as G } from "../form/context.js";
+const $ = B({
   name: "Option",
   components: {
     Checkbox: U
@@ -55,76 +56,80 @@ const X = B({
     // private
     internal: Boolean
   },
-  setup(o) {
-    const { disabled: v, tagProps: s, index: g } = M(o), a = z("select--option"), e = N(q, void 0), l = P(), u = r(), f = r(s.value);
-    A(s, (n, k) => {
-      T(n, k) || (f.value = n);
+  setup(n) {
+    const { disabled: v, tagProps: s, index: O } = M(n), t = D("select--option"), e = N(F, void 0);
+    e && P(G, {});
+    const l = A(), u = f(), m = f(s.value);
+    _(s, (o, r) => {
+      z(o, r) || (m.value = o);
     });
-    const d = r(""), m = i(() => o.value ?? o.label ?? d.value), c = i(() => o.label ?? d.value), t = i(() => F(m.value, e == null ? void 0 : e.valueKey)), O = i(() => (e == null ? void 0 : e.component) ?? "li"), I = i(() => e == null ? void 0 : e.getOptionId(t.value)), p = () => {
-      if (!o.label && u.value) {
-        const n = u.value.textContent ?? "";
-        d.value !== n && (d.value = n);
+    const d = f(""), c = i(() => n.value ?? n.label ?? d.value), p = i(() => n.label ?? d.value), a = i(() => L(c.value, e == null ? void 0 : e.valueKey)), I = i(() => (e == null ? void 0 : e.component) ?? "li"), K = i(() => e == null ? void 0 : e.getOptionId(a.value)), b = () => {
+      if (!n.label && u.value) {
+        const o = u.value.querySelector(
+          ".x-select--option--content, .x-checkbox--label"
+        ), r = (o == null ? void 0 : o.textContent) ?? "";
+        d.value !== r && (d.value = r);
       }
     };
-    _(() => p()), w(() => p());
-    const b = i(() => (e == null ? void 0 : e.valueKeys.includes(t.value)) ?? !1), K = i(() => (e == null ? void 0 : e.activeKey) === t.value);
-    let y = r(!0);
-    if (!o.internal) {
-      const n = E({
+    q(() => b()), w(() => b());
+    const y = i(() => (e == null ? void 0 : e.valueKeys.includes(a.value)) ?? !1), S = i(() => (e == null ? void 0 : e.activeKey) === a.value);
+    let g = f(!0);
+    if (!n.internal) {
+      const o = E({
         raw: {
-          value: m,
-          label: c,
+          value: c,
+          label: p,
           disabled: v,
-          tagProps: f
+          tagProps: m
         },
         ref: u,
-        index: g,
-        key: t,
+        index: O,
+        key: a,
         origin: "slot",
-        value: m,
-        label: c,
+        value: c,
+        label: p,
         disabled: v,
-        tagProps: f
+        tagProps: m
       });
-      y = i(
-        () => L(n, {
+      g = i(
+        () => T(o, {
           inputValue: e == null ? void 0 : e.inputValue,
           filterOption: e == null ? void 0 : e.filterOption
         })
-      ), l && (e == null || e.addSlotOptionInfo(l.uid, n)), R(() => {
+      ), l && (e == null || e.addSlotOptionInfo(l.uid, o)), R(() => {
         l && (e == null || e.removeSlotOptionInfo(l.uid));
       });
     }
-    const S = (n) => {
-      o.disabled || e == null || e.onSelect(t.value, n);
-    }, h = () => {
-      o.disabled || e == null || e.setActiveKey(t.value);
+    const h = (o) => {
+      n.disabled || e == null || e.onSelect(a.value, o);
     }, j = () => {
-      o.disabled || e == null || e.setActiveKey();
+      n.disabled || e == null || e.setActiveKey(a.value);
+    }, k = () => {
+      n.disabled || e == null || e.setActiveKey();
     }, V = i(() => [
-      a.block,
+      t.block,
       {
-        [a.modifier("disabled")]: o.disabled,
-        [a.modifier("selected")]: b.value,
-        [a.modifier("active")]: K.value,
-        [a.modifier("multiple")]: e == null ? void 0 : e.multiple
+        [t.modifier("disabled")]: n.disabled,
+        [t.modifier("selected")]: y.value,
+        [t.modifier("active")]: S.value,
+        [t.modifier("multiple")]: e == null ? void 0 : e.multiple
       }
     ]);
     return {
-      className: a,
+      className: t,
       cls: V,
       selectCtx: e,
       itemRef: u,
-      component: O,
-      optionId: I,
-      isSelected: b,
-      isValid: y,
-      handleClick: S,
-      handleMouseEnter: h,
-      handleMouseLeave: j
+      component: I,
+      optionId: K,
+      isSelected: y,
+      isValid: g,
+      handleClick: h,
+      handleMouseEnter: j,
+      handleMouseLeave: k
     };
   }
 });
 export {
-  X as default
+  $ as default
 };

package/dist/es/components/form-select/SelectOptionGroup.vue.js

@@ -1,19 +1,23 @@
-import o from "./SelectOptionGroup.vue2.js";
-import { openBlock as l, createElementBlock as r, Fragment as a, createElementVNode as s, normalizeClass as n, renderSlot as t, createTextVNode as m, toDisplayString as p } from "vue";
-import c from "../../_virtual/_plugin-vue_export-helper.js";
-function i(e, f, d, u, $, _) {
-  return l(), r(a, null, [
-    s("li", {
-      class: n(e.className.element("title"))
-    }, [
-      t(e.$slots, "label", {}, () => [
-        m(p(e.label), 1)
-      ])
-    ], 2),
+import l from "./SelectOptionGroup.vue2.js";
+import { openBlock as o, createElementBlock as r, Fragment as n, createBlock as a, resolveDynamicComponent as s, normalizeClass as p, withCtx as c, renderSlot as t, createTextVNode as m, toDisplayString as i } from "vue";
+import f from "../../_virtual/_plugin-vue_export-helper.js";
+function d(e, u, $, _, k, B) {
+  return o(), r(n, null, [
+    (o(), a(s(e.component), {
+      class: p(e.className.element("title")),
+      role: "presentation"
+    }, {
+      default: c(() => [
+        t(e.$slots, "label", {}, () => [
+          m(i(e.label), 1)
+        ])
+      ]),
+      _: 3
+    }, 8, ["class"])),
     t(e.$slots, "default")
   ], 64);
 }
-const g = /* @__PURE__ */ c(o, [["render", i]]);
+const g = /* @__PURE__ */ f(l, [["render", d]]);
 export {
   g as default
 };

package/dist/es/components/form-select/SelectOptionGroup.vue2.js

@@ -1,6 +1,7 @@
-import { defineComponent as e } from "vue";
-import { getClassNameMixin as t } from "../../_utils/config.js";
-const p = e({
+import { defineComponent as n, inject as p, computed as i } from "vue";
+import { getClassNameMixin as m } from "../../_utils/config.js";
+import { selectInjectionKey as c } from "./context.js";
+const l = n({
   name: "SelectOptionGroup",
   props: {
     /**
@@ -18,11 +19,13 @@ const p = e({
    * @version 2.10.0
    */
   setup() {
+    const e = m("select--option--group"), o = p(c, void 0), t = i(() => (o == null ? void 0 : o.component) ?? "li");
     return {
-      className: t("select--option--group")
+      className: e,
+      component: t
     };
   }
 });
 export {
-  p as default
+  l as default
 };

package/dist/es/components/form-select/hooks/use-options.js

@@ -1,95 +1,95 @@
-import { computed as s, reactive as g, watch as z, ref as f } from "vue";
-import { getOptionInfos as S, getValidOptions as b, isValidOption as F } from "../utils.js";
-import { isNumber as k } from "../../../_utils/is.js";
-const N = {
+import { computed as r, reactive as u, watch as D } from "vue";
+import { getOptionInfos as g, getValidOptions as S, isValidOption as z } from "../utils.js";
+import { isNumber as b } from "../../../_utils/is.js";
+const F = {
   value: "value",
   label: "label",
   disabled: "disabled",
   tagProps: "tagProps",
   render: "render"
-}, j = ({
-  options: c,
-  extraOptions: v,
+}, T = ({
+  options: v,
+  extraOptions: I,
   inputValue: n,
   filterOption: a,
-  showExtraOptions: d,
-  valueKey: r,
+  showExtraOptions: s,
+  valueKey: d,
   fieldNames: l
 }) => {
-  const p = s(() => ({
-    ...N,
+  const m = r(() => ({
+    ...F,
     ...l == null ? void 0 : l.value
-  })), I = g(/* @__PURE__ */ new Map()), m = s(
-    () => Array.from(I.values()).sort((o, t) => k(o.index) && k(t.index) ? o.index - t.index : 0)
-  ), M = s(() => {
+  })), c = u(/* @__PURE__ */ new Map()), M = r(
+    () => Array.from(c.values()).sort((o, t) => b(o.index) && b(t.index) ? o.index - t.index : 0)
+  ), p = r(() => {
     const o = /* @__PURE__ */ new Map();
     return {
-      optionInfos: S((c == null ? void 0 : c.value) ?? [], {
-        valueKey: (r == null ? void 0 : r.value) ?? "value",
-        fieldNames: p.value,
+      optionInfos: g((v == null ? void 0 : v.value) ?? [], {
+        valueKey: (d == null ? void 0 : d.value) ?? "value",
+        fieldNames: m.value,
         origin: "options",
         optionInfoMap: o
       }),
       optionInfoMap: o
     };
-  }), u = s(() => {
+  }), f = r(() => {
     const o = /* @__PURE__ */ new Map();
     return {
-      optionInfos: S((v == null ? void 0 : v.value) ?? [], {
-        valueKey: (r == null ? void 0 : r.value) ?? "value",
-        fieldNames: p.value,
+      optionInfos: g((I == null ? void 0 : I.value) ?? [], {
+        valueKey: (d == null ? void 0 : d.value) ?? "value",
+        fieldNames: m.value,
         origin: "extraOptions",
         optionInfoMap: o
       }),
       optionInfoMap: o
     };
-  }), e = g(/* @__PURE__ */ new Map());
-  z(
-    [m, c ?? f([]), v ?? f([]), r ?? f("value")],
+  }), e = u(/* @__PURE__ */ new Map());
+  D(
+    [M, p, f],
     () => {
-      e.clear(), m.value.forEach((o, t) => {
+      e.clear(), M.value.forEach((o, t) => {
         e.set(o.key, { ...o, index: t });
-      }), M.value.optionInfoMap.forEach((o) => {
+      }), p.value.optionInfoMap.forEach((o) => {
         e.has(o.key) || (o.index = e.size, e.set(o.key, o));
-      }), u.value.optionInfoMap.forEach((o) => {
+      }), f.value.optionInfoMap.forEach((o) => {
         e.has(o.key) || (o.index = e.size, e.set(o.key, o));
       });
     },
     { immediate: !0, deep: !0 }
   );
-  const A = s(() => {
-    const o = b(M.value.optionInfos, {
+  const k = r(() => {
+    const o = S(p.value.optionInfos, {
       inputValue: n == null ? void 0 : n.value,
       filterOption: a == null ? void 0 : a.value
     });
-    return ((d == null ? void 0 : d.value) ?? !0) && o.push(
-      ...b(u.value.optionInfos, {
+    return ((s == null ? void 0 : s.value) ?? !0) && o.push(
+      ...S(f.value.optionInfos, {
         inputValue: n == null ? void 0 : n.value,
         filterOption: a == null ? void 0 : a.value
       })
     ), o;
-  }), i = s(
-    () => Array.from(e.values()).filter((o) => o.origin === "extraOptions" && (d == null ? void 0 : d.value) === !1 ? !1 : F(o, {
+  }), i = r(
+    () => Array.from(e.values()).filter((o) => o.origin === "extraOptions" && (s == null ? void 0 : s.value) === !1 ? !1 : z(o, {
       inputValue: n == null ? void 0 : n.value,
       filterOption: a == null ? void 0 : a.value
     }))
-  ), D = s(
+  ), A = r(
     () => i.value.filter((o) => !o.disabled).map((o) => o.key)
   );
   return {
-    validOptions: A,
+    validOptions: k,
     optionInfoMap: e,
     validOptionInfos: i,
-    enabledOptionKeys: D,
-    getNextSlotOptionIndex: () => I.size,
+    enabledOptionKeys: A,
+    getNextSlotOptionIndex: () => c.size,
     addSlotOptionInfo: (o, t) => {
-      I.set(o, t);
+      c.set(o, t);
     },
     removeSlotOptionInfo: (o) => {
-      I.delete(o);
+      c.delete(o);
     }
   };
 };
 export {
-  j as useOptions
+  T as useOptions
 };

package/dist/es/components/form-select/hooks/use-select.js

@@ -1,130 +1,135 @@
-import { ref as X, watch as U, nextTick as Z, provide as $, reactive as p } from "vue";
-import { getRelativeRect as R } from "../../../_utils/dom.js";
-import { useOptions as F } from "./use-options.js";
+import { ref as X, watch as W, nextTick as Z, provide as $, reactive as R } from "vue";
+import { getRelativeRect as F } from "../../../_utils/dom.js";
+import { useOptions as L } from "./use-options.js";
 import { KEYBOARD_KEY as a } from "../../../_utils/keyboard.js";
-import { selectInjectionKey as L } from "../context.js";
+import { selectInjectionKey as p } from "../context.js";
 import { isUndefined as f } from "../../../_utils/is.js";
 const le = ({
-  multiple: B,
-  options: H,
+  multiple: U,
+  options: B,
   extraOptions: Y,
-  inputValue: T,
-  filterOption: E,
+  inputValue: v,
+  filterOption: T,
   showExtraOptions: j,
   component: M,
   valueKey: h,
   fieldNames: q,
-  loading: m,
-  disabled: y,
-  popupVisible: c,
+  loading: k,
+  disabled: K,
+  popupVisible: u,
   valueKeys: x,
-  dropdownRef: K,
+  dropdownRef: g,
   optionRefs: O,
-  virtualListRef: v,
-  onSelect: k,
+  virtualListRef: s,
+  onSelect: d,
   onPopupVisibleChange: i,
   getOptionId: z,
   enterToOpen: C = !0,
-  defaultActiveFirstOption: g
+  defaultActiveFirstOption: E
 }) => {
   const {
     validOptions: G,
     optionInfoMap: D,
     validOptionInfos: J,
-    enabledOptionKeys: l,
+    enabledOptionKeys: c,
     getNextSlotOptionIndex: P,
     addSlotOptionInfo: S,
     removeSlotOptionInfo: _
-  } = F({
-    options: H,
+  } = L({
+    options: B,
     extraOptions: Y,
-    inputValue: T,
-    filterOption: E,
+    inputValue: v,
+    filterOption: T,
     showExtraOptions: j,
     valueKey: h,
     fieldNames: q
-  }), t = X();
-  let u;
-  const w = () => {
-    const e = l.value, r = x.value[x.value.length - 1];
-    return e.includes(r) ? r : u ? u === "up" ? e[e.length - 1] : e[0] : (g == null ? void 0 : g.value) ?? !0 ? e[0] : void 0;
+  }), r = X();
+  let n;
+  const I = () => {
+    const e = c.value, t = x.value[x.value.length - 1];
+    return e.includes(t) ? t : n ? n === "up" ? e[e.length - 1] : e[0] : (E == null ? void 0 : E.value) ?? !0 ? e[0] : void 0;
   };
-  U(l, (e) => {
-    c.value && u ? t.value = w() : (f(t.value) || !e.includes(t.value)) && (t.value = e[0]);
+  W(c, (e) => {
+    (u.value && n || f(r.value) || !e.includes(r.value)) && (r.value = I());
   });
-  const A = (e) => {
-    t.value = e;
-  }, N = (e) => {
-    const r = l.value.length;
-    if (r === 0)
+  const w = (e) => {
+    r.value = e;
+  }, A = (e) => {
+    const t = c.value.length;
+    if (t === 0)
       return;
-    if (f(t.value))
-      return e === "down" ? l.value[0] : l.value[r - 1];
-    const o = l.value.indexOf(t.value), n = (r + o + (e === "up" ? -1 : 1)) % r;
-    return l.value[n];
-  }, I = (e) => {
-    var d;
-    v != null && v.value && v.value.scrollTo({ key: e });
-    const r = D.get(e), o = (d = K == null ? void 0 : K.value) == null ? void 0 : d.wrapperRef, n = (O == null ? void 0 : O.value[e]) ?? (r == null ? void 0 : r.ref);
-    if (!o || !n || o.scrollHeight === o.offsetHeight)
+    if (f(r.value))
+      return e === "down" ? c.value[0] : c.value[t - 1];
+    const o = c.value.indexOf(r.value), l = (t + o + (e === "up" ? -1 : 1)) % t;
+    return c.value[l];
+  }, m = (e) => {
+    var N;
+    s != null && s.value && s.value.scrollTo({ key: e });
+    const t = D.get(e), o = (N = g == null ? void 0 : g.value) == null ? void 0 : N.wrapperRef, l = (O == null ? void 0 : O.value[e]) ?? (t == null ? void 0 : t.ref);
+    if (!o || !l || o.scrollHeight === o.offsetHeight)
       return;
-    const s = R(n, o), W = o.scrollTop;
-    s.top < 0 ? o.scrollTo(0, W + s.top) : s.bottom < 0 && o.scrollTo(0, W - s.bottom);
+    const y = F(l, o), H = o.scrollTop;
+    y.top < 0 ? o.scrollTo(0, H + y.top) : y.bottom < 0 && o.scrollTo(0, H - y.bottom);
   };
-  U(
-    c,
+  W(
+    u,
     (e) => {
-      e ? (t.value = w(), Z(() => {
-        u = void 0, c.value && !f(t.value) && I(t.value);
-      })) : u = void 0;
+      e ? (r.value = I(), Z(() => {
+        n = void 0, u.value && !f(r.value) && m(r.value);
+      })) : n = void 0;
     },
     { immediate: !0 }
   );
   const Q = (e) => {
-    if (y != null && y.value || e.isComposing || e.keyCode === 229 || e.ctrlKey || e.altKey || e.metaKey)
+    if (K != null && K.value || e.isComposing || e.keyCode === 229 || e.ctrlKey || e.altKey || e.metaKey)
       return;
     if (e.key === a.TAB) {
-      u = void 0, c.value && i(!1);
+      n = void 0, u.value && i(!1);
       return;
     }
     if (e.shiftKey)
       return;
-    const r = () => {
+    const t = () => {
       e.stopPropagation(), e.preventDefault();
     };
     if (e.key === a.ESC) {
-      u = void 0, c.value && (r(), i(!1));
+      n = void 0, u.value && (t(), i(!1));
       return;
     }
-    if (!(m != null && m.value)) {
+    if (!(k != null && k.value)) {
+      if (u.value && !(v != null && v.value) && (e.key === "Home" || e.key === "End")) {
+        const o = c.value, l = e.key === "Home" ? o[0] : o[o.length - 1];
+        f(l) || (t(), r.value = l, m(l));
+        return;
+      }
       if (e.key === a.ENTER) {
-        c.value ? !f(t.value) && l.value.includes(t.value) && (r(), k(t.value, e)) : C && (u = void 0, r(), i(!0));
+        u.value ? !f(r.value) && c.value.includes(r.value) && (t(), d(r.value, e)) : C && (n = void 0, t(), i(!0));
         return;
       }
       if (e.key === a.ARROW_DOWN || e.key === a.ARROW_UP) {
         const o = e.key === a.ARROW_UP ? "up" : "down";
-        if (r(), !c.value)
-          u = o, i(!0);
+        if (t(), !u.value)
+          n = o, i(!0);
         else {
-          const n = N(o);
-          f(n) || (t.value = n, I(n));
+          const l = A(o);
+          f(l) || (r.value = l, m(l));
         }
       }
     }
   };
   return $(
-    L,
-    p({
-      multiple: B,
+    p,
+    R({
+      multiple: U,
       valueKey: h,
-      inputValue: T,
-      filterOption: E,
+      inputValue: v,
+      filterOption: T,
       component: M,
       valueKeys: x,
-      activeKey: t,
+      activeKey: r,
       getOptionId: z,
-      setActiveKey: A,
-      onSelect: k,
+      setActiveKey: w,
+      onSelect: d,
       getNextSlotOptionIndex: P,
       addSlotOptionInfo: S,
       removeSlotOptionInfo: _
@@ -133,13 +138,13 @@ const le = ({
     validOptions: G,
     optionInfoMap: D,
     validOptionInfos: J,
-    enabledOptionKeys: l,
-    activeKey: t,
-    setActiveKey: A,
+    enabledOptionKeys: c,
+    activeKey: r,
+    setActiveKey: w,
     addSlotOptionInfo: S,
     removeSlotOptionInfo: _,
-    getNextActiveKey: N,
-    scrollIntoView: I,
+    getNextActiveKey: A,
+    scrollIntoView: m,
     handleKeyDown: Q
   };
 };