@element-plus/nightly 0.0.20260109 → 0.0.20260110

package/es/components/radio/src/radio-group2.mjs

@@ -1,58 +1,110 @@
-import { radioEmits } from './radio.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { useSizeProp } from '../../../hooks/use-size/index.mjs';
-import { useAriaProps } from '../../../hooks/use-aria/index.mjs';
+import { defineComponent, ref, onMounted, computed, provide, reactive, toRefs, watch, openBlock, createElementBlock, unref, normalizeClass, renderSlot, Fragment, renderList, createBlock, resolveDynamicComponent, mergeProps, nextTick } from 'vue';
+import { radioGroupProps, radioGroupEmits, radioDefaultProps } from './radio-group.mjs';
+import { radioGroupKey } from './constants.mjs';
+import { isEqual, omit } from 'lodash-unified';
+import Radio from './radio2.mjs';
+import RadioButton from './radio-button2.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { useId } from '../../../hooks/use-id/index.mjs';
+import { useFormItem, useFormItemInputId } from '../../form/src/hooks/use-form-item.mjs';
+import { debugWarn } from '../../../utils/error.mjs';
+import { UPDATE_MODEL_EVENT, CHANGE_EVENT } from '../../../constants/event.mjs';
 
-const radioGroupProps = buildProps({
-  id: {
-    type: String,
-    default: void 0
+const _hoisted_1 = ["id", "aria-label", "aria-labelledby"];
+const _sfc_main = defineComponent({
+  ...{
+    name: "ElRadioGroup"
   },
-  size: useSizeProp,
-  disabled: {
-    type: Boolean,
-    default: void 0
-  },
-  modelValue: {
-    type: [String, Number, Boolean],
-    default: void 0
-  },
-  fill: {
-    type: String,
-    default: ""
-  },
-  textColor: {
-    type: String,
-    default: ""
-  },
-  name: {
-    type: String,
-    default: void 0
-  },
-  validateEvent: {
-    type: Boolean,
-    default: true
-  },
-  options: {
-    type: definePropType(Array)
-  },
-  props: {
-    type: definePropType(Object),
-    default: () => radioDefaultProps
-  },
-  type: {
-    type: String,
-    values: ["radio", "button"],
-    default: "radio"
-  },
-  ...useAriaProps(["ariaLabel"])
+  __name: "radio-group",
+  props: radioGroupProps,
+  emits: radioGroupEmits,
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const ns = useNamespace("radio");
+    const radioId = useId();
+    const radioGroupRef = ref();
+    const { formItem } = useFormItem();
+    const { inputId: groupId, isLabeledByFormItem } = useFormItemInputId(props, {
+      formItemContext: formItem
+    });
+    const changeEvent = (value) => {
+      emit(UPDATE_MODEL_EVENT, value);
+      nextTick(() => emit(CHANGE_EVENT, value));
+    };
+    onMounted(() => {
+      const radios = radioGroupRef.value.querySelectorAll("[type=radio]");
+      const firstLabel = radios[0];
+      if (!Array.from(radios).some((radio) => radio.checked) && firstLabel) {
+        firstLabel.tabIndex = 0;
+      }
+    });
+    const name = computed(() => {
+      return props.name || radioId.value;
+    });
+    const aliasProps = computed(() => ({
+      ...radioDefaultProps,
+      ...props.props
+    }));
+    const getOptionProps = (option) => {
+      const { label, value, disabled } = aliasProps.value;
+      const base = {
+        label: option[label],
+        value: option[value],
+        disabled: option[disabled]
+      };
+      return { ...omit(option, [label, value, disabled]), ...base };
+    };
+    const optionComponent = computed(
+      () => props.type === "button" ? RadioButton : Radio
+    );
+    provide(
+      radioGroupKey,
+      reactive({
+        ...toRefs(props),
+        changeEvent,
+        name
+      })
+    );
+    watch(
+      () => props.modelValue,
+      (newVal, oldValue) => {
+        if (props.validateEvent && !isEqual(newVal, oldValue)) {
+          formItem == null ? void 0 : formItem.validate("change").catch((err) => debugWarn(err));
+        }
+      }
+    );
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        id: unref(groupId),
+        ref_key: "radioGroupRef",
+        ref: radioGroupRef,
+        class: normalizeClass(unref(ns).b("group")),
+        role: "radiogroup",
+        "aria-label": !unref(isLabeledByFormItem) ? _ctx.ariaLabel || "radio-group" : void 0,
+        "aria-labelledby": unref(isLabeledByFormItem) ? unref(formItem).labelId : void 0
+      }, [
+        renderSlot(_ctx.$slots, "default", {}, () => [
+          (openBlock(true), createElementBlock(
+            Fragment,
+            null,
+            renderList(_ctx.options, (item, index) => {
+              return openBlock(), createBlock(
+                resolveDynamicComponent(optionComponent.value),
+                mergeProps({ key: index }, { ref_for: true }, getOptionProps(item)),
+                null,
+                16
+              );
+            }),
+            128
+          ))
+        ])
+      ], 10, _hoisted_1);
+    };
+  }
 });
-const radioGroupEmits = radioEmits;
-const radioDefaultProps = {
-  label: "label",
-  value: "value",
-  disabled: "disabled"
-};
+var RadioGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/radio/src/radio-group.vue"]]);
 
-export { radioDefaultProps, radioGroupEmits, radioGroupProps };
+export { RadioGroup as default };
 //# sourceMappingURL=radio-group2.mjs.map

package/es/components/radio/src/radio-group2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"radio-group2.mjs","sources":["../../../../../../packages/components/radio/src/radio-group.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-plus/utils'\nimport { useAriaProps, useSizeProp } from '@element-plus/hooks'\nimport { radioEmits } from './radio'\n\nimport type { RadioPropsPublic } from './radio'\nimport type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'\nimport type RadioGroup from './radio-group.vue'\n\nexport const radioGroupProps = buildProps({\n  /**\n   * @description native `id` attribute\n   */\n  id: {\n    type: String,\n    default: undefined,\n  },\n  /**\n   * @description the size of radio buttons or bordered radios\n   */\n  size: useSizeProp,\n  /**\n   * @description whether the nesting radios are disabled\n   */\n  disabled: {\n    type: Boolean,\n    default: undefined,\n  },\n  /**\n   * @description binding value\n   */\n  modelValue: {\n    type: [String, Number, Boolean],\n    default: undefined,\n  },\n  /**\n   * @description border and background color when button is active\n   */\n  fill: {\n    type: String,\n    default: '',\n  },\n  /**\n   * @description font color when button is active\n   */\n  textColor: {\n    type: String,\n    default: '',\n  },\n  /**\n   * @description native `name` attribute\n   */\n  name: {\n    type: String,\n    default: undefined,\n  },\n  /**\n   * @description whether to trigger form validation\n   */\n  validateEvent: {\n    type: Boolean,\n    default: true,\n  },\n  options: {\n    type: definePropType<radioOption[]>(Array),\n  },\n  props: {\n    type: definePropType<radioOptionProp>(Object),\n    default: () => radioDefaultProps,\n  },\n  type: {\n    type: String,\n    values: ['radio', 'button'] as const,\n    default: 'radio',\n  },\n  ...useAriaProps(['ariaLabel']),\n} as const)\nexport type RadioGroupProps = ExtractPropTypes<typeof radioGroupProps>\nexport type RadioGroupPropsPublic = ExtractPublicPropTypes<\n  typeof radioGroupProps\n>\n\nexport const radioGroupEmits = radioEmits\nexport type RadioGroupEmits = typeof radioGroupEmits\nexport type RadioGroupInstance = InstanceType<typeof RadioGroup> & unknown\n\nexport type radioOption = RadioPropsPublic & Record<string, any>\n\nexport const radioDefaultProps: Required<radioOptionProp> = {\n  label: 'label',\n  value: 'value',\n  disabled: 'disabled',\n}\nexport type radioOptionProp = {\n  value?: string\n  label?: string\n  disabled?: string\n}\n"],"names":[],"mappings":";;;;;AAQO,MAAM,kBAAkB,UAAW,CAAA;AAAA,EAIxC,EAAI,EAAA;AAAA,IACF,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,KAAA,CAAA;AAAA,GACX;AAAA,EAIA,IAAM,EAAA,WAAA;AAAA,EAIN,QAAU,EAAA;AAAA,IACR,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA,CAAA;AAAA,GACX;AAAA,EAIA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,CAAC,MAAQ,EAAA,MAAA,EAAQ,OAAO,CAAA;AAAA,IAC9B,OAAS,EAAA,KAAA,CAAA;AAAA,GACX;AAAA,EAIA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA,EAIA,SAAW,EAAA;AAAA,IACT,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,EAAA;AAAA,GACX;AAAA,EAIA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,MAAA;AAAA,IACN,OAAS,EAAA,KAAA,CAAA;AAAA,GACX;AAAA,EAIA,aAAe,EAAA;AAAA,IACb,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA,EACA,OAAS,EAAA;AAAA,IACP,IAAA,EAAM,eAA8B,KAAK,CAAA;AAAA,GAC3C;AAAA,EACA,KAAO,EAAA;AAAA,IACL,IAAA,EAAM,eAAgC,MAAM,CAAA;AAAA,IAC5C,SAAS,MAAM,iBAAA;AAAA,GACjB;AAAA,EACA,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,MAAA;AAAA,IACN,MAAA,EAAQ,CAAC,OAAA,EAAS,QAAQ,CAAA;AAAA,IAC1B,OAAS,EAAA,OAAA;AAAA,GACX;AAAA,EACA,GAAG,YAAA,CAAa,CAAC,WAAW,CAAC,CAAA;AAC/B,CAAU,EAAA;AAMH,MAAM,eAAkB,GAAA,WAAA;AAMxB,MAAM,iBAA+C,GAAA;AAAA,EAC1D,KAAO,EAAA,OAAA;AAAA,EACP,KAAO,EAAA,OAAA;AAAA,EACP,QAAU,EAAA,UAAA;AACZ;;;;"}
+{"version":3,"file":"radio-group2.mjs","sources":["../../../../../../packages/components/radio/src/radio-group.vue"],"sourcesContent":["<template>\n  <div\n    :id=\"groupId\"\n    ref=\"radioGroupRef\"\n    :class=\"ns.b('group')\"\n    role=\"radiogroup\"\n    :aria-label=\"!isLabeledByFormItem ? ariaLabel || 'radio-group' : undefined\"\n    :aria-labelledby=\"isLabeledByFormItem ? formItem!.labelId : undefined\"\n  >\n    <slot>\n      <component\n        :is=\"optionComponent\"\n        v-for=\"(item, index) in options\"\n        :key=\"index\"\n        v-bind=\"getOptionProps(item)\"\n      />\n    </slot>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport {\n  computed,\n  nextTick,\n  onMounted,\n  provide,\n  reactive,\n  ref,\n  toRefs,\n  watch,\n} from 'vue'\nimport { useFormItem, useFormItemInputId } from '@element-plus/components/form'\nimport { CHANGE_EVENT, UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { useId, useNamespace } from '@element-plus/hooks'\nimport { debugWarn } from '@element-plus/utils'\nimport {\n  radioDefaultProps,\n  radioGroupEmits,\n  radioGroupProps,\n} from './radio-group'\nimport { radioGroupKey } from './constants'\nimport { isEqual, omit } from 'lodash-unified'\nimport ElRadio from './radio.vue'\nimport ElRadioButton from './radio-button.vue'\n\nimport type { RadioGroupProps } from './radio-group'\n\ndefineOptions({\n  name: 'ElRadioGroup',\n})\n\nconst props = defineProps(radioGroupProps)\nconst emit = defineEmits(radioGroupEmits)\n\nconst ns = useNamespace('radio')\nconst radioId = useId()\nconst radioGroupRef = ref<HTMLDivElement>()\nconst { formItem } = useFormItem()\nconst { inputId: groupId, isLabeledByFormItem } = useFormItemInputId(props, {\n  formItemContext: formItem,\n})\n\nconst changeEvent = (value: RadioGroupProps['modelValue']) => {\n  emit(UPDATE_MODEL_EVENT, value)\n  nextTick(() => emit(CHANGE_EVENT, value))\n}\n\nonMounted(() => {\n  const radios =\n    radioGroupRef.value!.querySelectorAll<HTMLInputElement>('[type=radio]')\n  const firstLabel = radios[0]\n  if (!Array.from(radios).some((radio) => radio.checked) && firstLabel) {\n    firstLabel.tabIndex = 0\n  }\n})\n\nconst name = computed(() => {\n  return props.name || radioId.value\n})\n\nconst aliasProps = computed(() => ({\n  ...radioDefaultProps,\n  ...props.props,\n}))\nconst getOptionProps = (option: Record<string, any>) => {\n  const { label, value, disabled } = aliasProps.value\n  const base = {\n    label: option[label],\n    value: option[value],\n    disabled: option[disabled],\n  }\n  return { ...omit(option, [label, value, disabled]), ...base }\n}\n\nconst optionComponent = computed(() =>\n  props.type === 'button' ? ElRadioButton : ElRadio\n)\n\nprovide(\n  radioGroupKey,\n  reactive({\n    ...toRefs(props),\n    changeEvent,\n    name,\n  })\n)\n\nwatch(\n  () => props.modelValue,\n  (newVal, oldValue) => {\n    if (props.validateEvent && !isEqual(newVal, oldValue)) {\n      formItem?.validate('change').catch((err) => debugWarn(err))\n    }\n  }\n)\n</script>\n"],"names":["ElRadioButton","ElRadio","_createElementBlock","_unref","_normalizeClass","ariaLabel","_renderSlot","_openBlock","_Fragment","options","_createBlock","_resolveDynamicComponent","_mergeProps"],"mappings":"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"}

package/es/components/roving-focus-group/index.mjs

@@ -1,7 +1,7 @@
-import ElRovingFocusGroup from './src/roving-focus-group.mjs';
-export { default as ElRovingFocusGroup, default } from './src/roving-focus-group.mjs';
+import ElRovingFocusGroup from './src/roving-focus-group2.mjs';
+export { default as ElRovingFocusGroup, default } from './src/roving-focus-group2.mjs';
 export { default as ElRovingFocusItem } from './src/roving-focus-item.mjs';
 export { ROVING_FOCUS_GROUP_INJECTION_KEY, ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY } from './src/tokens.mjs';
 export { focusFirst, getFocusIntent, reorderArray } from './src/utils.mjs';
-export { ROVING_FOCUS_COLLECTION_INJECTION_KEY, ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY } from './src/roving-focus-group2.mjs';
+export { ROVING_FOCUS_COLLECTION_INJECTION_KEY, ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY } from './src/roving-focus-group.mjs';
 //# sourceMappingURL=index.mjs.map

package/es/components/roving-focus-group/src/roving-focus-group-impl.mjs

@@ -1,6 +1,6 @@
 import { defineComponent, ref, inject, computed, provide, readonly, toRef, unref, watch, nextTick, renderSlot } from 'vue';
 import { useEventListener } from '@vueuse/core';
-import { rovingFocusGroupProps, ROVING_FOCUS_COLLECTION_INJECTION_KEY as COLLECTION_INJECTION_KEY } from './roving-focus-group2.mjs';
+import { rovingFocusGroupProps, ROVING_FOCUS_COLLECTION_INJECTION_KEY as COLLECTION_INJECTION_KEY } from './roving-focus-group.mjs';
 import { ROVING_FOCUS_GROUP_INJECTION_KEY } from './tokens.mjs';
 import { getFocusIntent, reorderArray, focusFirst } from './utils.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';

package/es/components/roving-focus-group/src/roving-focus-group.mjs

@@ -1,36 +1,31 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createVNode, normalizeProps, guardReactiveProps, renderSlot } from 'vue';
-import ElRovingFocusGroupImpl from './roving-focus-group-impl.mjs';
-import { ElCollection } from './roving-focus-group2.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { createCollectionWithScope } from '../../collection/src/collection.mjs';
+import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
 
-const _sfc_main = defineComponent({
-  name: "ElRovingFocusGroup",
-  components: {
-    ElFocusGroupCollection: ElCollection,
-    ElRovingFocusGroupImpl
-  }
+const rovingFocusGroupProps = buildProps({
+  style: { type: definePropType([String, Array, Object]) },
+  currentTabId: {
+    type: definePropType(String)
+  },
+  defaultCurrentTabId: String,
+  loop: Boolean,
+  dir: {
+    type: String,
+    values: ["ltr", "rtl"],
+    default: "ltr"
+  },
+  orientation: {
+    type: definePropType(String)
+  },
+  onBlur: Function,
+  onFocus: Function,
+  onMousedown: Function
 });
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_el_roving_focus_group_impl = resolveComponent("el-roving-focus-group-impl");
-  const _component_el_focus_group_collection = resolveComponent("el-focus-group-collection");
-  return openBlock(), createBlock(_component_el_focus_group_collection, null, {
-    default: withCtx(() => [
-      createVNode(
-        _component_el_roving_focus_group_impl,
-        normalizeProps(guardReactiveProps(_ctx.$attrs)),
-        {
-          default: withCtx(() => [
-            renderSlot(_ctx.$slots, "default")
-          ]),
-          _: 3
-        },
-        16
-      )
-    ]),
-    _: 3
-  });
-}
-var ElRovingFocusGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/element-plus/element-plus/packages/components/roving-focus-group/src/roving-focus-group.vue"]]);
+const {
+  ElCollection,
+  ElCollectionItem,
+  COLLECTION_INJECTION_KEY,
+  COLLECTION_ITEM_INJECTION_KEY
+} = createCollectionWithScope("RovingFocusGroup");
 
-export { ElRovingFocusGroup as default };
+export { ElCollection, ElCollectionItem, COLLECTION_INJECTION_KEY as ROVING_FOCUS_COLLECTION_INJECTION_KEY, COLLECTION_ITEM_INJECTION_KEY as ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY, rovingFocusGroupProps };
 //# sourceMappingURL=roving-focus-group.mjs.map

package/es/components/roving-focus-group/src/roving-focus-group.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"roving-focus-group.mjs","sources":["../../../../../../packages/components/roving-focus-group/src/roving-focus-group.vue"],"sourcesContent":["<template>\n  <el-focus-group-collection>\n    <el-roving-focus-group-impl v-bind=\"$attrs\">\n      <slot />\n    </el-roving-focus-group-impl>\n  </el-focus-group-collection>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent } from 'vue'\nimport ElRovingFocusGroupImpl from './roving-focus-group-impl.vue'\nimport { ElCollection as ElFocusGroupCollection } from './roving-focus-group'\n\nexport default defineComponent({\n  name: 'ElRovingFocusGroup',\n  components: {\n    ElFocusGroupCollection,\n    ElRovingFocusGroupImpl,\n  },\n})\n</script>\n"],"names":["ElFocusGroupCollection","_createBlock","_withCtx","_createVNode","_normalizeProps","_guardReactiveProps","_renderSlot"],"mappings":";;;;;AAaA,MAAK,YAAa,eAAa,CAAA;AAAA,EAC7B,IAAM,EAAA,oBAAA;AAAA,EACN,UAAY,EAAA;AAAA,4BACVA,YAAA;AAAA,IACA,sBAAA;AAAA,GACF;AACF,CAAC,CAAA,CAAA;;;;sBAlBCC,WAI4B,CAAA,oCAAA,EAAA,IAAA,EAAA;AAAA,IAAA,OAAA,EAAAC,QAH1B,MAE6B;AAAA,MAF7BC,WAAA;AAAA,QAE6B,qCAAA;AAAA,QAAAC,cAAA,CAAAC,kBAAA,CAFO,IAAM,CAAA,MAAA,CAAA,CAAA;AAAA,QAAA;AAAA,UAAA,OAAA,EAAAH,QACxC,MAAQ;AAAA,YAARI,UAAA,CAAQ,IAAA,CAAA,MAAA,EAAA,SAAA,CAAA;AAAA,WAAA,CAAA;AAAA;;;;;;;;;;;;"}
+{"version":3,"file":"roving-focus-group.mjs","sources":["../../../../../../packages/components/roving-focus-group/src/roving-focus-group.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-plus/utils'\nimport { createCollectionWithScope } from '@element-plus/components/collection'\n\nimport type {\n  ExtractPropTypes,\n  ExtractPublicPropTypes,\n  HTMLAttributes,\n  StyleValue,\n} from 'vue'\n\nexport const rovingFocusGroupProps = buildProps({\n  style: { type: definePropType<StyleValue>([String, Array, Object]) },\n  currentTabId: {\n    type: definePropType<string | null>(String),\n  },\n  defaultCurrentTabId: String,\n  loop: Boolean,\n  dir: {\n    type: String, // left for direction support\n    values: ['ltr', 'rtl'],\n    default: 'ltr',\n  },\n  orientation: {\n    // left for orientation support\n    type: definePropType<HTMLAttributes['aria-orientation']>(String),\n  },\n\n  onBlur: Function,\n  onFocus: Function,\n  onMousedown: Function,\n})\n\nexport type ElRovingFocusGroupProps = ExtractPropTypes<\n  typeof rovingFocusGroupProps\n>\n\nexport type ElRovingFocusGroupPropsPublic = ExtractPublicPropTypes<\n  typeof rovingFocusGroupProps\n>\n\nconst {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY,\n} = createCollectionWithScope('RovingFocusGroup')\n\nexport {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY as ROVING_FOCUS_COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY as ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY,\n}\n"],"names":[],"mappings":";;;AAUO,MAAM,wBAAwB,UAAW,CAAA;AAAA,EAC9C,KAAA,EAAO,EAAE,IAAM,EAAA,cAAA,CAA2B,CAAC,MAAQ,EAAA,KAAA,EAAO,MAAM,CAAC,CAAE,EAAA;AAAA,EACnE,YAAc,EAAA;AAAA,IACZ,IAAA,EAAM,eAA8B,MAAM,CAAA;AAAA,GAC5C;AAAA,EACA,mBAAqB,EAAA,MAAA;AAAA,EACrB,IAAM,EAAA,OAAA;AAAA,EACN,GAAK,EAAA;AAAA,IACH,IAAM,EAAA,MAAA;AAAA,IACN,MAAA,EAAQ,CAAC,KAAA,EAAO,KAAK,CAAA;AAAA,IACrB,OAAS,EAAA,KAAA;AAAA,GACX;AAAA,EACA,WAAa,EAAA;AAAA,IAEX,IAAA,EAAM,eAAmD,MAAM,CAAA;AAAA,GACjE;AAAA,EAEA,MAAQ,EAAA,QAAA;AAAA,EACR,OAAS,EAAA,QAAA;AAAA,EACT,WAAa,EAAA,QAAA;AACf,CAAC,EAAA;AAUK,MAAA;AAAA,EACJ,YAAA;AAAA,EACA,gBAAA;AAAA,EACA,wBAAA;AAAA,EACA,6BAAA;AACF,CAAA,GAAI,0BAA0B,kBAAkB;;;;"}

package/es/components/roving-focus-group/src/roving-focus-group2.mjs

@@ -1,31 +1,36 @@
-import { createCollectionWithScope } from '../../collection/src/collection.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createVNode, normalizeProps, guardReactiveProps, renderSlot } from 'vue';
+import ElRovingFocusGroupImpl from './roving-focus-group-impl.mjs';
+import { ElCollection } from './roving-focus-group.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 
-const rovingFocusGroupProps = buildProps({
-  style: { type: definePropType([String, Array, Object]) },
-  currentTabId: {
-    type: definePropType(String)
-  },
-  defaultCurrentTabId: String,
-  loop: Boolean,
-  dir: {
-    type: String,
-    values: ["ltr", "rtl"],
-    default: "ltr"
-  },
-  orientation: {
-    type: definePropType(String)
-  },
-  onBlur: Function,
-  onFocus: Function,
-  onMousedown: Function
+const _sfc_main = defineComponent({
+  name: "ElRovingFocusGroup",
+  components: {
+    ElFocusGroupCollection: ElCollection,
+    ElRovingFocusGroupImpl
+  }
 });
-const {
-  ElCollection,
-  ElCollectionItem,
-  COLLECTION_INJECTION_KEY,
-  COLLECTION_ITEM_INJECTION_KEY
-} = createCollectionWithScope("RovingFocusGroup");
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_el_roving_focus_group_impl = resolveComponent("el-roving-focus-group-impl");
+  const _component_el_focus_group_collection = resolveComponent("el-focus-group-collection");
+  return openBlock(), createBlock(_component_el_focus_group_collection, null, {
+    default: withCtx(() => [
+      createVNode(
+        _component_el_roving_focus_group_impl,
+        normalizeProps(guardReactiveProps(_ctx.$attrs)),
+        {
+          default: withCtx(() => [
+            renderSlot(_ctx.$slots, "default")
+          ]),
+          _: 3
+        },
+        16
+      )
+    ]),
+    _: 3
+  });
+}
+var ElRovingFocusGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "/home/runner/work/element-plus/element-plus/packages/components/roving-focus-group/src/roving-focus-group.vue"]]);
 
-export { ElCollection, ElCollectionItem, COLLECTION_INJECTION_KEY as ROVING_FOCUS_COLLECTION_INJECTION_KEY, COLLECTION_ITEM_INJECTION_KEY as ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY, rovingFocusGroupProps };
+export { ElRovingFocusGroup as default };
 //# sourceMappingURL=roving-focus-group2.mjs.map

package/es/components/roving-focus-group/src/roving-focus-group2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"roving-focus-group2.mjs","sources":["../../../../../../packages/components/roving-focus-group/src/roving-focus-group.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-plus/utils'\nimport { createCollectionWithScope } from '@element-plus/components/collection'\n\nimport type {\n  ExtractPropTypes,\n  ExtractPublicPropTypes,\n  HTMLAttributes,\n  StyleValue,\n} from 'vue'\n\nexport const rovingFocusGroupProps = buildProps({\n  style: { type: definePropType<StyleValue>([String, Array, Object]) },\n  currentTabId: {\n    type: definePropType<string | null>(String),\n  },\n  defaultCurrentTabId: String,\n  loop: Boolean,\n  dir: {\n    type: String, // left for direction support\n    values: ['ltr', 'rtl'],\n    default: 'ltr',\n  },\n  orientation: {\n    // left for orientation support\n    type: definePropType<HTMLAttributes['aria-orientation']>(String),\n  },\n\n  onBlur: Function,\n  onFocus: Function,\n  onMousedown: Function,\n})\n\nexport type ElRovingFocusGroupProps = ExtractPropTypes<\n  typeof rovingFocusGroupProps\n>\n\nexport type ElRovingFocusGroupPropsPublic = ExtractPublicPropTypes<\n  typeof rovingFocusGroupProps\n>\n\nconst {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY,\n} = createCollectionWithScope('RovingFocusGroup')\n\nexport {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY as ROVING_FOCUS_COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY as ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY,\n}\n"],"names":[],"mappings":";;;AAUO,MAAM,wBAAwB,UAAW,CAAA;AAAA,EAC9C,KAAA,EAAO,EAAE,IAAM,EAAA,cAAA,CAA2B,CAAC,MAAQ,EAAA,KAAA,EAAO,MAAM,CAAC,CAAE,EAAA;AAAA,EACnE,YAAc,EAAA;AAAA,IACZ,IAAA,EAAM,eAA8B,MAAM,CAAA;AAAA,GAC5C;AAAA,EACA,mBAAqB,EAAA,MAAA;AAAA,EACrB,IAAM,EAAA,OAAA;AAAA,EACN,GAAK,EAAA;AAAA,IACH,IAAM,EAAA,MAAA;AAAA,IACN,MAAA,EAAQ,CAAC,KAAA,EAAO,KAAK,CAAA;AAAA,IACrB,OAAS,EAAA,KAAA;AAAA,GACX;AAAA,EACA,WAAa,EAAA;AAAA,IAEX,IAAA,EAAM,eAAmD,MAAM,CAAA;AAAA,GACjE;AAAA,EAEA,MAAQ,EAAA,QAAA;AAAA,EACR,OAAS,EAAA,QAAA;AAAA,EACT,WAAa,EAAA,QAAA;AACf,CAAC,EAAA;AAUK,MAAA;AAAA,EACJ,YAAA;AAAA,EACA,gBAAA;AAAA,EACA,wBAAA;AAAA,EACA,6BAAA;AACF,CAAA,GAAI,0BAA0B,kBAAkB;;;;"}
+{"version":3,"file":"roving-focus-group2.mjs","sources":["../../../../../../packages/components/roving-focus-group/src/roving-focus-group.vue"],"sourcesContent":["<template>\n  <el-focus-group-collection>\n    <el-roving-focus-group-impl v-bind=\"$attrs\">\n      <slot />\n    </el-roving-focus-group-impl>\n  </el-focus-group-collection>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent } from 'vue'\nimport ElRovingFocusGroupImpl from './roving-focus-group-impl.vue'\nimport { ElCollection as ElFocusGroupCollection } from './roving-focus-group'\n\nexport default defineComponent({\n  name: 'ElRovingFocusGroup',\n  components: {\n    ElFocusGroupCollection,\n    ElRovingFocusGroupImpl,\n  },\n})\n</script>\n"],"names":["ElFocusGroupCollection","_createBlock","_withCtx","_createVNode","_normalizeProps","_guardReactiveProps","_renderSlot"],"mappings":";;;;;AAaA,MAAK,YAAa,eAAa,CAAA;AAAA,EAC7B,IAAM,EAAA,oBAAA;AAAA,EACN,UAAY,EAAA;AAAA,4BACVA,YAAA;AAAA,IACA,sBAAA;AAAA,GACF;AACF,CAAC,CAAA,CAAA;;;;sBAlBCC,WAI4B,CAAA,oCAAA,EAAA,IAAA,EAAA;AAAA,IAAA,OAAA,EAAAC,QAH1B,MAE6B;AAAA,MAF7BC,WAAA;AAAA,QAE6B,qCAAA;AAAA,QAAAC,cAAA,CAAAC,kBAAA,CAFO,IAAM,CAAA,MAAA,CAAA,CAAA;AAAA,QAAA;AAAA,UAAA,OAAA,EAAAH,QACxC,MAAQ;AAAA,YAARI,UAAA,CAAQ,IAAA,CAAA,MAAA,EAAA,SAAA,CAAA;AAAA,WAAA,CAAA;AAAA;;;;;;;;;;;;"}

package/es/components/roving-focus-group/src/roving-focus-item.mjs

@@ -1,5 +1,5 @@
 import { defineComponent, inject, ref, computed, unref, provide, resolveComponent, openBlock, createBlock, withCtx, renderSlot } from 'vue';
-import { ElCollectionItem } from './roving-focus-group2.mjs';
+import { ElCollectionItem } from './roving-focus-group.mjs';
 import { ROVING_FOCUS_GROUP_INJECTION_KEY, ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY } from './tokens.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 import { useId } from '../../../hooks/use-id/index.mjs';

package/es/components/scrollbar/index.mjs

@@ -1,7 +1,7 @@
 import Scrollbar from './src/scrollbar2.mjs';
 export { BAR_MAP, GAP, renderThumbStyle } from './src/util.mjs';
 export { scrollbarEmits, scrollbarProps } from './src/scrollbar.mjs';
-export { thumbProps } from './src/thumb.mjs';
+export { thumbProps } from './src/thumb2.mjs';
 export { scrollbarContextKey } from './src/constants.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';
 

package/es/components/scrollbar/src/bar.mjs

@@ -1,15 +1,74 @@
-import { buildProps } from '../../../utils/vue/props/runtime.mjs';
+import { defineComponent, inject, ref, openBlock, createElementBlock, Fragment, createVNode } from 'vue';
+import { GAP } from './util.mjs';
+import Thumb from './thumb.mjs';
+import { barProps } from './bar2.mjs';
+import { scrollbarContextKey } from './constants.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 
-const barProps = buildProps({
-  always: {
-    type: Boolean,
-    default: true
-  },
-  minSize: {
-    type: Number,
-    required: true
+const _sfc_main = defineComponent({
+  __name: "bar",
+  props: barProps,
+  setup(__props, { expose: __expose }) {
+    const props = __props;
+    const scrollbar = inject(scrollbarContextKey);
+    const moveX = ref(0);
+    const moveY = ref(0);
+    const sizeWidth = ref("");
+    const sizeHeight = ref("");
+    const ratioY = ref(1);
+    const ratioX = ref(1);
+    const handleScroll = (wrap) => {
+      if (wrap) {
+        const offsetHeight = wrap.offsetHeight - GAP;
+        const offsetWidth = wrap.offsetWidth - GAP;
+        moveY.value = wrap.scrollTop * 100 / offsetHeight * ratioY.value;
+        moveX.value = wrap.scrollLeft * 100 / offsetWidth * ratioX.value;
+      }
+    };
+    const update = () => {
+      const wrap = scrollbar == null ? void 0 : scrollbar.wrapElement;
+      if (!wrap)
+        return;
+      const offsetHeight = wrap.offsetHeight - GAP;
+      const offsetWidth = wrap.offsetWidth - GAP;
+      const originalHeight = offsetHeight ** 2 / wrap.scrollHeight;
+      const originalWidth = offsetWidth ** 2 / wrap.scrollWidth;
+      const height = Math.max(originalHeight, props.minSize);
+      const width = Math.max(originalWidth, props.minSize);
+      ratioY.value = originalHeight / (offsetHeight - originalHeight) / (height / (offsetHeight - height));
+      ratioX.value = originalWidth / (offsetWidth - originalWidth) / (width / (offsetWidth - width));
+      sizeHeight.value = height + GAP < offsetHeight ? `${height}px` : "";
+      sizeWidth.value = width + GAP < offsetWidth ? `${width}px` : "";
+    };
+    __expose({
+      handleScroll,
+      update
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(
+        Fragment,
+        null,
+        [
+          createVNode(Thumb, {
+            move: moveX.value,
+            ratio: ratioX.value,
+            size: sizeWidth.value,
+            always: _ctx.always
+          }, null, 8, ["move", "ratio", "size", "always"]),
+          createVNode(Thumb, {
+            move: moveY.value,
+            ratio: ratioY.value,
+            size: sizeHeight.value,
+            vertical: "",
+            always: _ctx.always
+          }, null, 8, ["move", "ratio", "size", "always"])
+        ],
+        64
+      );
+    };
   }
 });
+var Bar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/scrollbar/src/bar.vue"]]);
 
-export { barProps };
+export { Bar as default };
 //# sourceMappingURL=bar.mjs.map

package/es/components/scrollbar/src/bar.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bar.mjs","sources":["../../../../../../packages/components/scrollbar/src/bar.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\n\nimport type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'\nimport type Bar from './bar.vue'\n\nexport const barProps = buildProps({\n  always: {\n    type: Boolean,\n    default: true,\n  },\n  minSize: {\n    type: Number,\n    required: true,\n  },\n} as const)\nexport type BarProps = ExtractPropTypes<typeof barProps>\nexport type BarPropsPublic = ExtractPublicPropTypes<typeof barProps>\n\nexport type BarInstance = InstanceType<typeof Bar> & unknown\n"],"names":[],"mappings":";;AAKO,MAAM,WAAW,UAAW,CAAA;AAAA,EACjC,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA,EACA,OAAS,EAAA;AAAA,IACP,IAAM,EAAA,MAAA;AAAA,IACN,QAAU,EAAA,IAAA;AAAA,GACZ;AACF,CAAU;;;;"}
+{"version":3,"file":"bar.mjs","sources":["../../../../../../packages/components/scrollbar/src/bar.vue"],"sourcesContent":["<template>\n  <thumb :move=\"moveX\" :ratio=\"ratioX\" :size=\"sizeWidth\" :always=\"always\" />\n  <thumb\n    :move=\"moveY\"\n    :ratio=\"ratioY\"\n    :size=\"sizeHeight\"\n    vertical\n    :always=\"always\"\n  />\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject, ref } from 'vue'\nimport { GAP } from './util'\nimport Thumb from './thumb.vue'\nimport { barProps } from './bar'\nimport { scrollbarContextKey } from './constants'\n\nconst props = defineProps(barProps)\n\nconst scrollbar = inject(scrollbarContextKey)\n\nconst moveX = ref(0)\nconst moveY = ref(0)\nconst sizeWidth = ref('')\nconst sizeHeight = ref('')\nconst ratioY = ref(1)\nconst ratioX = ref(1)\n\nconst handleScroll = (wrap: HTMLDivElement) => {\n  if (wrap) {\n    const offsetHeight = wrap.offsetHeight - GAP\n    const offsetWidth = wrap.offsetWidth - GAP\n\n    moveY.value = ((wrap.scrollTop * 100) / offsetHeight) * ratioY.value\n    moveX.value = ((wrap.scrollLeft * 100) / offsetWidth) * ratioX.value\n  }\n}\n\nconst update = () => {\n  const wrap = scrollbar?.wrapElement\n  if (!wrap) return\n  const offsetHeight = wrap.offsetHeight - GAP\n  const offsetWidth = wrap.offsetWidth - GAP\n\n  const originalHeight = offsetHeight ** 2 / wrap.scrollHeight\n  const originalWidth = offsetWidth ** 2 / wrap.scrollWidth\n  const height = Math.max(originalHeight, props.minSize)\n  const width = Math.max(originalWidth, props.minSize)\n\n  ratioY.value =\n    originalHeight /\n    (offsetHeight - originalHeight) /\n    (height / (offsetHeight - height))\n  ratioX.value =\n    originalWidth /\n    (offsetWidth - originalWidth) /\n    (width / (offsetWidth - width))\n\n  sizeHeight.value = height + GAP < offsetHeight ? `${height}px` : ''\n  sizeWidth.value = width + GAP < offsetWidth ? `${width}px` : ''\n}\n\ndefineExpose({\n  handleScroll,\n  update,\n})\n</script>\n"],"names":["_createVNode","always"],"mappings":"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"}

package/es/components/scrollbar/src/bar2.mjs

@@ -1,74 +1,15 @@
-import { defineComponent, inject, ref, openBlock, createElementBlock, Fragment, createVNode } from 'vue';
-import { GAP } from './util.mjs';
-import Thumb from './thumb2.mjs';
-import { barProps } from './bar.mjs';
-import { scrollbarContextKey } from './constants.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { buildProps } from '../../../utils/vue/props/runtime.mjs';
 
-const _sfc_main = defineComponent({
-  __name: "bar",
-  props: barProps,
-  setup(__props, { expose: __expose }) {
-    const props = __props;
-    const scrollbar = inject(scrollbarContextKey);
-    const moveX = ref(0);
-    const moveY = ref(0);
-    const sizeWidth = ref("");
-    const sizeHeight = ref("");
-    const ratioY = ref(1);
-    const ratioX = ref(1);
-    const handleScroll = (wrap) => {
-      if (wrap) {
-        const offsetHeight = wrap.offsetHeight - GAP;
-        const offsetWidth = wrap.offsetWidth - GAP;
-        moveY.value = wrap.scrollTop * 100 / offsetHeight * ratioY.value;
-        moveX.value = wrap.scrollLeft * 100 / offsetWidth * ratioX.value;
-      }
-    };
-    const update = () => {
-      const wrap = scrollbar == null ? void 0 : scrollbar.wrapElement;
-      if (!wrap)
-        return;
-      const offsetHeight = wrap.offsetHeight - GAP;
-      const offsetWidth = wrap.offsetWidth - GAP;
-      const originalHeight = offsetHeight ** 2 / wrap.scrollHeight;
-      const originalWidth = offsetWidth ** 2 / wrap.scrollWidth;
-      const height = Math.max(originalHeight, props.minSize);
-      const width = Math.max(originalWidth, props.minSize);
-      ratioY.value = originalHeight / (offsetHeight - originalHeight) / (height / (offsetHeight - height));
-      ratioX.value = originalWidth / (offsetWidth - originalWidth) / (width / (offsetWidth - width));
-      sizeHeight.value = height + GAP < offsetHeight ? `${height}px` : "";
-      sizeWidth.value = width + GAP < offsetWidth ? `${width}px` : "";
-    };
-    __expose({
-      handleScroll,
-      update
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(
-        Fragment,
-        null,
-        [
-          createVNode(Thumb, {
-            move: moveX.value,
-            ratio: ratioX.value,
-            size: sizeWidth.value,
-            always: _ctx.always
-          }, null, 8, ["move", "ratio", "size", "always"]),
-          createVNode(Thumb, {
-            move: moveY.value,
-            ratio: ratioY.value,
-            size: sizeHeight.value,
-            vertical: "",
-            always: _ctx.always
-          }, null, 8, ["move", "ratio", "size", "always"])
-        ],
-        64
-      );
-    };
+const barProps = buildProps({
+  always: {
+    type: Boolean,
+    default: true
+  },
+  minSize: {
+    type: Number,
+    required: true
   }
 });
-var Bar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/scrollbar/src/bar.vue"]]);
 
-export { Bar as default };
+export { barProps };
 //# sourceMappingURL=bar2.mjs.map

package/es/components/scrollbar/src/bar2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bar2.mjs","sources":["../../../../../../packages/components/scrollbar/src/bar.vue"],"sourcesContent":["<template>\n  <thumb :move=\"moveX\" :ratio=\"ratioX\" :size=\"sizeWidth\" :always=\"always\" />\n  <thumb\n    :move=\"moveY\"\n    :ratio=\"ratioY\"\n    :size=\"sizeHeight\"\n    vertical\n    :always=\"always\"\n  />\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject, ref } from 'vue'\nimport { GAP } from './util'\nimport Thumb from './thumb.vue'\nimport { barProps } from './bar'\nimport { scrollbarContextKey } from './constants'\n\nconst props = defineProps(barProps)\n\nconst scrollbar = inject(scrollbarContextKey)\n\nconst moveX = ref(0)\nconst moveY = ref(0)\nconst sizeWidth = ref('')\nconst sizeHeight = ref('')\nconst ratioY = ref(1)\nconst ratioX = ref(1)\n\nconst handleScroll = (wrap: HTMLDivElement) => {\n  if (wrap) {\n    const offsetHeight = wrap.offsetHeight - GAP\n    const offsetWidth = wrap.offsetWidth - GAP\n\n    moveY.value = ((wrap.scrollTop * 100) / offsetHeight) * ratioY.value\n    moveX.value = ((wrap.scrollLeft * 100) / offsetWidth) * ratioX.value\n  }\n}\n\nconst update = () => {\n  const wrap = scrollbar?.wrapElement\n  if (!wrap) return\n  const offsetHeight = wrap.offsetHeight - GAP\n  const offsetWidth = wrap.offsetWidth - GAP\n\n  const originalHeight = offsetHeight ** 2 / wrap.scrollHeight\n  const originalWidth = offsetWidth ** 2 / wrap.scrollWidth\n  const height = Math.max(originalHeight, props.minSize)\n  const width = Math.max(originalWidth, props.minSize)\n\n  ratioY.value =\n    originalHeight /\n    (offsetHeight - originalHeight) /\n    (height / (offsetHeight - height))\n  ratioX.value =\n    originalWidth /\n    (offsetWidth - originalWidth) /\n    (width / (offsetWidth - width))\n\n  sizeHeight.value = height + GAP < offsetHeight ? `${height}px` : ''\n  sizeWidth.value = width + GAP < offsetWidth ? `${width}px` : ''\n}\n\ndefineExpose({\n  handleScroll,\n  update,\n})\n</script>\n"],"names":["_createVNode","always"],"mappings":"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"}
+{"version":3,"file":"bar2.mjs","sources":["../../../../../../packages/components/scrollbar/src/bar.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\n\nimport type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'\nimport type Bar from './bar.vue'\n\nexport const barProps = buildProps({\n  always: {\n    type: Boolean,\n    default: true,\n  },\n  minSize: {\n    type: Number,\n    required: true,\n  },\n} as const)\nexport type BarProps = ExtractPropTypes<typeof barProps>\nexport type BarPropsPublic = ExtractPublicPropTypes<typeof barProps>\n\nexport type BarInstance = InstanceType<typeof Bar> & unknown\n"],"names":[],"mappings":";;AAKO,MAAM,WAAW,UAAW,CAAA;AAAA,EACjC,MAAQ,EAAA;AAAA,IACN,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,IAAA;AAAA,GACX;AAAA,EACA,OAAS,EAAA;AAAA,IACP,IAAM,EAAA,MAAA;AAAA,IACN,QAAU,EAAA,IAAA;AAAA,GACZ;AACF,CAAU;;;;"}

package/es/components/scrollbar/src/scrollbar2.mjs

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, watch, nextTick, provide, reactive, onActivated, onMounted, onUpdated, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, normalizeStyle, createBlock, resolveDynamicComponent, withCtx, renderSlot, createCommentVNode } from 'vue';
 import { useResizeObserver, useEventListener } from '@vueuse/core';
-import Bar from './bar2.mjs';
+import Bar from './bar.mjs';
 import { scrollbarContextKey } from './constants.mjs';
 import { scrollbarProps, scrollbarEmits } from './scrollbar.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';