@element-plus/nightly 0.0.20220120 → 0.0.20220124

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

@@ -1,9 +1,7 @@
-import './src/roving-focus-group2.mjs';
-import './src/roving-focus-item.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-group.mjs';
-import script from './src/roving-focus-group.vue_vue_type_script_lang.mjs';
-export { default as ElRovingFocusGroup, default } from './src/roving-focus-group.vue_vue_type_script_lang.mjs';
-export { default as ElRovingFocusItem } from './src/roving-focus-item.vue_vue_type_script_lang.mjs';
 //# sourceMappingURL=index.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}

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

@@ -1,7 +1,107 @@
-import script from './roving-focus-group-impl.vue_vue_type_script_lang.mjs';
-export { default } from './roving-focus-group-impl.vue_vue_type_script_lang.mjs';
-import { render } from './roving-focus-group-impl.vue_vue_type_template_id_e5cee750_lang.mjs';
+import { defineComponent, ref, inject, computed, unref, provide, readonly, toRef, watch, onMounted, onBeforeUnmount, renderSlot } from 'vue';
+import { composeEventHandlers, on, off } from '../../../utils/dom.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 { focusFirst } from './utils.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 
-script.render = render;
-script.__file = "packages/components/roving-focus-group/src/roving-focus-group-impl.vue";
+const CURRENT_TAB_ID_CHANGE_EVT = "currentTabIdChange";
+const ENTRY_FOCUS_EVT = "rovingFocusGroup.entryFocus";
+const EVT_OPTS = { bubbles: false, cancelable: true };
+const _sfc_main = defineComponent({
+  name: "ElRovingFocusGroupImpl",
+  inheritAttrs: false,
+  props: rovingFocusGroupProps,
+  emits: [CURRENT_TAB_ID_CHANGE_EVT, "entryFocus"],
+  setup(props, { emit }) {
+    var _a;
+    const currentTabbedId = ref((_a = props.currentTabId || props.defaultCurrentTabId) != null ? _a : null);
+    const isBackingOut = ref(false);
+    const isClickFocus = ref(false);
+    const rovingFocusGroupRef = ref(null);
+    const { getItems } = inject(COLLECTION_INJECTION_KEY, void 0);
+    const rovingFocusGroupRootStyle = computed(() => {
+      return [
+        {
+          outline: "none"
+        },
+        props.style
+      ];
+    });
+    const onItemFocus = (tabbedId) => {
+      emit(CURRENT_TAB_ID_CHANGE_EVT, tabbedId);
+    };
+    const onItemShiftTab = () => {
+      isBackingOut.value = true;
+    };
+    const onMousedown = composeEventHandlers((e) => {
+      var _a2;
+      (_a2 = props.onMousedown) == null ? void 0 : _a2.call(props, e);
+    }, () => {
+      isClickFocus.value = true;
+    });
+    const onFocus = composeEventHandlers((e) => {
+      var _a2;
+      (_a2 = props.onFocus) == null ? void 0 : _a2.call(props, e);
+    }, (e) => {
+      const isKeyboardFocus = !unref(isClickFocus);
+      const { target, currentTarget } = e;
+      if (target === currentTarget && isKeyboardFocus && !unref(isBackingOut)) {
+        const entryFocusEvt = new Event(ENTRY_FOCUS_EVT, EVT_OPTS);
+        currentTarget == null ? void 0 : currentTarget.dispatchEvent(entryFocusEvt);
+        if (!entryFocusEvt.defaultPrevented) {
+          const items = getItems().filter((item) => item.focusable);
+          const activeItem = items.find((item) => item.active);
+          const currentItem = items.find((item) => item.id === unref(currentTabbedId));
+          const candidates = [activeItem, currentItem, ...items].filter(Boolean);
+          const candidateNodes = candidates.map((item) => item.ref);
+          focusFirst(candidateNodes);
+        }
+      }
+      isClickFocus.value = false;
+    });
+    const onBlur = composeEventHandlers((e) => {
+      var _a2;
+      (_a2 = props.onBlur) == null ? void 0 : _a2.call(props, e);
+    }, () => {
+      isBackingOut.value = false;
+    });
+    const handleEntryFocus = (...args) => {
+      emit("entryFocus", ...args);
+    };
+    provide(ROVING_FOCUS_GROUP_INJECTION_KEY, {
+      currentTabbedId: readonly(currentTabbedId),
+      loop: toRef(props, "loop"),
+      tabIndex: computed(() => {
+        return unref(isBackingOut) ? -1 : 0;
+      }),
+      rovingFocusGroupRef,
+      rovingFocusGroupRootStyle,
+      orientation: toRef(props, "orientation"),
+      dir: toRef(props, "dir"),
+      onItemFocus,
+      onItemShiftTab,
+      onBlur,
+      onFocus,
+      onMousedown
+    });
+    watch(() => props.currentTabId, (val) => {
+      currentTabbedId.value = val != null ? val : null;
+    });
+    onMounted(() => {
+      const rovingFocusGroupEl = unref(rovingFocusGroupRef);
+      on(rovingFocusGroupEl, ENTRY_FOCUS_EVT, handleEntryFocus);
+    });
+    onBeforeUnmount(() => {
+      const rovingFocusGroupEl = unref(rovingFocusGroupRef);
+      off(rovingFocusGroupEl, ENTRY_FOCUS_EVT, handleEntryFocus);
+    });
+  }
+});
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return renderSlot(_ctx.$slots, "default");
+}
+var ElRovingFocusGroupImpl = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+
+export { ElRovingFocusGroupImpl as default };
 //# sourceMappingURL=roving-focus-group-impl.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"roving-focus-group-impl.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"version":3,"file":"roving-focus-group-impl.mjs","sources":["../../../../../../packages/components/roving-focus-group/src/roving-focus-group-impl.vue"],"sourcesContent":["<template>\n  <slot />\n</template>\n\n<script lang=\"ts\">\nimport {\n  computed,\n  defineComponent,\n  provide,\n  onBeforeUnmount,\n  onMounted,\n  ref,\n  unref,\n  inject,\n  watch,\n  readonly,\n  toRef,\n} from 'vue'\nimport { composeEventHandlers, on, off } from '@element-plus/utils/dom'\nimport {\n  rovingFocusGroupProps,\n  ROVING_FOCUS_COLLECTION_INJECTION_KEY,\n} from './roving-focus-group'\nimport { ROVING_FOCUS_GROUP_INJECTION_KEY } from './tokens'\nimport { focusFirst } from './utils'\n\nimport type { StyleValue } from 'vue'\n\nconst CURRENT_TAB_ID_CHANGE_EVT = 'currentTabIdChange'\n\nconst ENTRY_FOCUS_EVT = 'rovingFocusGroup.entryFocus'\nconst EVT_OPTS: EventInit = { bubbles: false, cancelable: true }\nexport default defineComponent({\n  name: 'ElRovingFocusGroupImpl',\n  inheritAttrs: false,\n  props: rovingFocusGroupProps,\n  emits: [CURRENT_TAB_ID_CHANGE_EVT, 'entryFocus'],\n  setup(props, { emit }) {\n    const currentTabbedId = ref<string | null>(\n      (props.currentTabId || props.defaultCurrentTabId) ?? null\n    )\n    const isBackingOut = ref(false)\n    const isClickFocus = ref(false)\n    const rovingFocusGroupRef = ref<HTMLElement | null>(null)\n    const { getItems } = inject(\n      ROVING_FOCUS_COLLECTION_INJECTION_KEY,\n      undefined\n    )!\n    const rovingFocusGroupRootStyle = computed(() => {\n      // casting to any for fix compiler error since HTMLElement.StyleValue does not\n      // support CSSProperties\n      return [\n        {\n          outline: 'none',\n        },\n        props.style as StyleValue,\n      ] as any\n    })\n\n    const onItemFocus = (tabbedId: string) => {\n      emit(CURRENT_TAB_ID_CHANGE_EVT, tabbedId)\n    }\n\n    const onItemShiftTab = () => {\n      isBackingOut.value = true\n    }\n\n    const onMousedown = composeEventHandlers(\n      (e: Event) => {\n        props.onMousedown?.(e)\n      },\n      () => {\n        isClickFocus.value = true\n      }\n    )\n\n    const onFocus = composeEventHandlers(\n      (e: FocusEvent) => {\n        props.onFocus?.(e)\n      },\n      (e) => {\n        const isKeyboardFocus = !unref(isClickFocus)\n        const { target, currentTarget } = e\n        if (\n          target === currentTarget &&\n          isKeyboardFocus &&\n          !unref(isBackingOut)\n        ) {\n          const entryFocusEvt = new Event(ENTRY_FOCUS_EVT, EVT_OPTS)\n          currentTarget?.dispatchEvent(entryFocusEvt)\n\n          if (!entryFocusEvt.defaultPrevented) {\n            const items = getItems<{\n              id: string\n              focusable: boolean\n              active: boolean\n            }>().filter((item) => item.focusable)\n            const activeItem = items.find((item) => item.active)\n            const currentItem = items.find(\n              (item) => item.id === unref(currentTabbedId)\n            )\n            const candidates = [activeItem!, currentItem!, ...items].filter(\n              Boolean\n            )\n            const candidateNodes = candidates.map((item) => item.ref!)\n            focusFirst(candidateNodes)\n          }\n        }\n\n        isClickFocus.value = false\n      }\n    )\n\n    const onBlur = composeEventHandlers(\n      (e: Event) => {\n        props.onBlur?.(e)\n      },\n      () => {\n        isBackingOut.value = false\n      }\n    )\n\n    const handleEntryFocus = (...args: any[]) => {\n      emit('entryFocus', ...args)\n    }\n\n    provide(ROVING_FOCUS_GROUP_INJECTION_KEY, {\n      currentTabbedId: readonly(currentTabbedId),\n      loop: toRef(props, 'loop'),\n      tabIndex: computed(() => {\n        return unref(isBackingOut) ? -1 : 0\n      }),\n      rovingFocusGroupRef,\n      rovingFocusGroupRootStyle,\n      orientation: toRef(props, 'orientation'),\n      dir: toRef(props, 'dir'),\n      onItemFocus,\n      onItemShiftTab,\n      onBlur,\n      onFocus,\n      onMousedown,\n    })\n\n    watch(\n      () => props.currentTabId,\n      (val) => {\n        currentTabbedId.value = val ?? null\n      }\n    )\n\n    onMounted(() => {\n      const rovingFocusGroupEl = unref(rovingFocusGroupRef)!\n      on(rovingFocusGroupEl, ENTRY_FOCUS_EVT, handleEntryFocus)\n    })\n\n    onBeforeUnmount(() => {\n      const rovingFocusGroupEl = unref(rovingFocusGroupRef)!\n      off(rovingFocusGroupEl, ENTRY_FOCUS_EVT, handleEntryFocus)\n    })\n  },\n})\n</script>\n"],"names":[],"mappings":";;;;;;;AA4BA,MAAM,4BAA4B;AAElC,MAAM,kBAAkB;AACxB,MAAM,WAAsB,EAAE,SAAS,OAAO,YAAY;AAC1D,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,cAAc;AAAA,EACd,OAAO;AAAA,EACP,OAAO,CAAC,2BAA2B;AAAA,EACnC,MAAM,OAAO,EAAE,QAAQ;AACrB,UAAM;AAGN,UAAM,eAAe;AACrB,UAAM,eAAe,IAAI;AACzB,UAAM,0BAA8C;AACpD,UAAM,sBACJ;AAGF,UAAM;AAGJ;AAAO;AACL;AACW;AAAA;AAEL;AAAA;AAIV;AACE,sCAAgC;AAAA;AAGlC;AACE,2BAAqB;AAAA;AAGvB;AAEI;AAAoB,aAEhB;AACJ,mBAAa;AAAQ;AAIzB;AAEI;AAAgB;AAGhB;AACA;AACA;AAKE,8BAAsB;AACtB,qCAA6B;AAE7B;AACE,yDAI2B;AAC3B,6BAAmB,YAAY,cAAc;AAC7C;AAGA,gBAAM,0BAA2B;AAGjC,gBAAM,+CAA+C;AACrD;AAAW;AAAA;AAIf;AAAqB;AAIzB;AAEI;AAAe,OAEjB;AACE,mBAAa;AAAQ;AAIzB,UAAM,gCAAuC;AAC3C;AAAsB;AAGxB;AAA0C;AACd,MAC1B,mBAAmB;AAAA,MACnB;AACE;AAAkC;AAAA,MAEpC;AAAA,MACA;AAAA;AAC0B;AACR,MAClB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAGF;AAGI;AAA+B;AAInC;AACE;AACA;AAAwC;AAG1C,oBAAgB;AACd,YAAM,qBAAqB,MAAM;AACjC;AAAyC;AAAA;AAAA;;;;;;;;;;;;"}

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

@@ -1,7 +1,31 @@
-import script from './roving-focus-group.vue_vue_type_script_lang.mjs';
-export { default } from './roving-focus-group.vue_vue_type_script_lang.mjs';
-import { render } from './roving-focus-group.vue_vue_type_template_id_91b51b76_lang.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';
 
-script.render = render;
-script.__file = "packages/components/roving-focus-group/src/roving-focus-group.vue";
+const _sfc_main = defineComponent({
+  name: "ElRovingFocusGroup",
+  components: {
+    ElFocusGroupCollection: ElCollection,
+    ElRovingFocusGroupImpl
+  }
+});
+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]]);
+
+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":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"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","_normalizeProps"],"mappings":";;;;;AAaA,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,YAAY;AAAA,4BACVA;AAAA,IACA;AAAA;AAAA;;;;sBAb6BC;AAAA,aAF7BC,QAE6B;AAAA,yDADnBC;AAAA,iBAARD,QAAQ;AAAA;;;;;;;;;;;;"}

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

@@ -1,7 +1,115 @@
-import script from './roving-focus-item.vue_vue_type_script_lang.mjs';
-export { default } from './roving-focus-item.vue_vue_type_script_lang.mjs';
-import { render } from './roving-focus-item.vue_vue_type_template_id_5f657dbd_lang.mjs';
+import { defineComponent, inject, ref, unref, nextTick, computed, provide, resolveComponent, openBlock, createBlock, withCtx, renderSlot } from 'vue';
+import '../../../hooks/index.mjs';
+import { composeEventHandlers } from '../../../utils/dom.mjs';
+import { EVENT_CODE } from '../../../utils/aria.mjs';
+import { ElCollectionItem, ROVING_FOCUS_COLLECTION_INJECTION_KEY as COLLECTION_INJECTION_KEY } from './roving-focus-group.mjs';
+import { ROVING_FOCUS_GROUP_INJECTION_KEY, ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY } from './tokens.mjs';
+import { getFocusIntent, reorderArray, focusFirst } from './utils.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useId } from '../../../hooks/use-id/index.mjs';
 
-script.render = render;
-script.__file = "packages/components/roving-focus-group/src/roving-focus-item.vue";
+const _sfc_main = defineComponent({
+  components: {
+    ElRovingFocusCollectionItem: ElCollectionItem
+  },
+  props: {
+    focusable: {
+      type: Boolean,
+      default: true
+    },
+    active: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ["mousedown", "focus", "keydown"],
+  setup(props, { emit }) {
+    const { currentTabbedId, loop, onItemFocus, onItemShiftTab } = inject(ROVING_FOCUS_GROUP_INJECTION_KEY, void 0);
+    const { getItems } = inject(COLLECTION_INJECTION_KEY, void 0);
+    const id = useId();
+    const rovingFocusGroupItemRef = ref(null);
+    const handleMousedown = composeEventHandlers((e) => {
+      emit("mousedown", e);
+    }, (e) => {
+      if (!props.focusable) {
+        e.preventDefault();
+      } else {
+        onItemFocus(unref(id));
+      }
+    });
+    const handleFocus = composeEventHandlers((e) => {
+      emit("focus", e);
+    }, () => {
+      onItemFocus(unref(id));
+    });
+    const handleKeydown = composeEventHandlers((e) => {
+      emit("keydown", e);
+    }, (e) => {
+      const { key, shiftKey, target, currentTarget } = e;
+      if (key === EVENT_CODE.tab && shiftKey) {
+        onItemShiftTab();
+        return;
+      }
+      if (target !== currentTarget)
+        return;
+      const focusIntent = getFocusIntent(e);
+      if (focusIntent) {
+        e.preventDefault();
+        const items = getItems().filter((item) => item.focusable);
+        let elements = items.map((item) => item.ref);
+        switch (focusIntent) {
+          case "last": {
+            elements.reverse();
+            break;
+          }
+          case "prev":
+          case "next": {
+            if (focusIntent === "prev") {
+              elements.reverse();
+            }
+            const currentIdx = elements.indexOf(currentTarget);
+            elements = loop.value ? reorderArray(elements, currentIdx + 1) : elements.slice(currentIdx + 1);
+            break;
+          }
+          default: {
+            break;
+          }
+        }
+        nextTick(() => {
+          focusFirst(elements);
+        });
+      }
+    });
+    const isCurrentTab = computed(() => currentTabbedId.value === unref(id));
+    provide(ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY, {
+      rovingFocusGroupItemRef,
+      tabIndex: computed(() => unref(isCurrentTab) ? 0 : -1),
+      handleMousedown,
+      handleFocus,
+      handleKeydown
+    });
+    return {
+      id,
+      handleKeydown,
+      handleFocus,
+      handleMousedown
+    };
+  }
+});
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_el_roving_focus_collection_item = resolveComponent("el-roving-focus-collection-item");
+  return openBlock(), createBlock(_component_el_roving_focus_collection_item, {
+    id: _ctx.id,
+    focusable: _ctx.focusable,
+    active: _ctx.active
+  }, {
+    default: withCtx(() => [
+      renderSlot(_ctx.$slots, "default")
+    ]),
+    _: 3
+  }, 8, ["id", "focusable", "active"]);
+}
+var ElRovingFocusItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+
+export { ElRovingFocusItem as default };
 //# sourceMappingURL=roving-focus-item.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"roving-focus-item.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"version":3,"file":"roving-focus-item.mjs","sources":["../../../../../../packages/components/roving-focus-group/src/roving-focus-item.vue"],"sourcesContent":["<template>\n  <el-roving-focus-collection-item\n    :id=\"id\"\n    :focusable=\"focusable\"\n    :active=\"active\"\n  >\n    <slot />\n  </el-roving-focus-collection-item>\n</template>\n\n<script lang=\"ts\">\nimport {\n  computed,\n  defineComponent,\n  inject,\n  ref,\n  unref,\n  nextTick,\n  provide,\n} from 'vue'\nimport { useId } from '@element-plus/hooks'\nimport { composeEventHandlers } from '@element-plus/utils/dom'\nimport { EVENT_CODE } from '@element-plus/utils/aria'\nimport {\n  ROVING_FOCUS_COLLECTION_INJECTION_KEY,\n  ElCollectionItem as ElRovingFocusCollectionItem,\n} from './roving-focus-group'\nimport {\n  ROVING_FOCUS_GROUP_INJECTION_KEY,\n  ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY,\n} from './tokens'\nimport { getFocusIntent, reorderArray, focusFirst } from './utils'\n\nexport default defineComponent({\n  components: {\n    ElRovingFocusCollectionItem,\n  },\n  props: {\n    focusable: {\n      type: Boolean,\n      default: true,\n    },\n    active: {\n      type: Boolean,\n      default: false,\n    },\n  },\n  emits: ['mousedown', 'focus', 'keydown'],\n  setup(props, { emit }) {\n    const { currentTabbedId, loop, onItemFocus, onItemShiftTab } = inject(\n      ROVING_FOCUS_GROUP_INJECTION_KEY,\n      undefined\n    )!\n\n    const { getItems } = inject(\n      ROVING_FOCUS_COLLECTION_INJECTION_KEY,\n      undefined\n    )!\n\n    const id = useId()\n    const rovingFocusGroupItemRef = ref<HTMLElement | null>(null)\n\n    const handleMousedown = composeEventHandlers(\n      (e: Event) => {\n        emit('mousedown', e)\n      },\n      (e) => {\n        if (!props.focusable) {\n          e.preventDefault()\n        } else {\n          onItemFocus(unref(id))\n        }\n      }\n    )\n\n    const handleFocus = composeEventHandlers(\n      (e: Event) => {\n        emit('focus', e)\n      },\n      () => {\n        onItemFocus(unref(id))\n      }\n    )\n\n    const handleKeydown = composeEventHandlers(\n      (e: Event) => {\n        emit('keydown', e)\n      },\n      (e) => {\n        const { key, shiftKey, target, currentTarget } = e as KeyboardEvent\n        if (key === EVENT_CODE.tab && shiftKey) {\n          onItemShiftTab()\n          return\n        }\n        if (target !== currentTarget) return\n        const focusIntent = getFocusIntent(e as KeyboardEvent)\n\n        if (focusIntent) {\n          e.preventDefault()\n          const items = getItems<typeof props>().filter(\n            (item) => item.focusable\n          )\n\n          let elements = items.map((item) => item.ref!)\n\n          switch (focusIntent) {\n            case 'last': {\n              elements.reverse()\n              break\n            }\n            case 'prev':\n            case 'next': {\n              if (focusIntent === 'prev') {\n                elements.reverse()\n              }\n              const currentIdx = elements.indexOf(currentTarget as HTMLElement)\n              elements = loop.value\n                ? reorderArray(elements, currentIdx + 1)\n                : elements.slice(currentIdx + 1)\n              break\n            }\n            default: {\n              break\n            }\n          }\n\n          nextTick(() => {\n            focusFirst(elements)\n          })\n        }\n      }\n    )\n\n    const isCurrentTab = computed(() => currentTabbedId.value === unref(id))\n\n    provide(ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY, {\n      rovingFocusGroupItemRef,\n      tabIndex: computed(() => (unref(isCurrentTab) ? 0 : -1)),\n      handleMousedown,\n      handleFocus,\n      handleKeydown,\n    })\n\n    return {\n      id,\n      handleKeydown,\n      handleFocus,\n      handleMousedown,\n    }\n  },\n})\n</script>\n"],"names":["ElRovingFocusCollectionItem","ROVING_FOCUS_COLLECTION_INJECTION_KEY","_openBlock","_createBlock","_withCtx"],"mappings":";;;;;;;;;;AAiCA,MAAK,YAAa,gBAAa;AAAA,EAC7B,YAAY;AAAA,iCACVA;AAAA;AAAA,EAEF,OAAO;AAAA,IACL,WAAW;AAAA,MACT,MAAM;AAAA,MACN,SAAS;AAAA;AAAA,IAEX,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,SAAS;AAAA;AAAA;AAAA,EAGb,OAAO,CAAC,aAAa,SAAS;AAAA,EAC9B,MAAM,OAAO,EAAE,QAAQ;AACrB,UAAM,EAAE,iBAAiB,MAAM,aAAa,mBAAmB,OAC7D,kCACA;AAGF,UAAM,EAAE,aAAa,OACnBC,0BACA;AAGF,UAAM,KAAK;AACX,UAAM,0BAA0B,IAAwB;AAExD,UAAM,kBAAkB,qBACtB,CAAC,MAAa;AACZ,WAAK,aAAa;AAAA,OAEpB,CAAC,MAAM;AACL,UAAI,CAAC,MAAM,WAAW;AACpB,UAAE;AAAA,aACG;AACL,oBAAY,MAAM;AAAA;AAAA;AAKxB,UAAM,cAAc,qBAClB,CAAC,MAAa;AACZ,WAAK,SAAS;AAAA,OAEhB,MAAM;AACJ,kBAAY,MAAM;AAAA;AAItB,UAAM,gBAAgB,qBACpB,CAAC,MAAa;AACZ,WAAK,WAAW;AAAA,OAElB,CAAC,MAAM;AACL,YAAM,EAAE,KAAK,UAAU,QAAQ,kBAAkB;AACjD,UAAI,QAAQ,WAAW,OAAO,UAAU;AACtC;AACA;AAAA;AAEF,UAAI,WAAW;AAAe;AAC9B,YAAM,cAAc,eAAe;AAEnC,UAAI,aAAa;AACf,UAAE;AACF,cAAM,QAAQ,WAAyB,OACrC,CAAC,SAAS,KAAK;AAGjB,YAAI,WAAW,MAAM,IAAI,CAAC,SAAS,KAAK;AAExC,gBAAQ;AAAA,eACD,QAAQ;AACX,qBAAS;AACT;AAAA;AAAA,eAEG;AAAA,eACA,QAAQ;AACX,gBAAI,gBAAgB,QAAQ;AAC1B,uBAAS;AAAA;AAEX,kBAAM,aAAa,SAAS,QAAQ;AACpC,uBAAW,KAAK,QACZ,aAAa,UAAU,aAAa,KACpC,SAAS,MAAM,aAAa;AAChC;AAAA;AAAA,mBAEO;AACP;AAAA;AAAA;AAIJ,iBAAS,MAAM;AACb,qBAAW;AAAA;AAAA;AAAA;AAMnB,UAAM,eAAe,SAAS,MAAM,gBAAgB,UAAU,MAAM;AAEpE,YAAQ,uCAAuC;AAAA,MAC7C;AAAA,MACA,UAAU,SAAS,MAAO,MAAM,gBAAgB,IAAI;AAAA,MACpD;AAAA,MACA;AAAA,MACA;AAAA;AAGF,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA;;;SAjJGC,aAAEC;AAAA,IACN,SAAS;AAAA,IACT,WAAQ;AAAA;;aAETC,QAAQ;AAAA;;;;;;;;;"}

package/es/components/scrollbar/index.mjs

@@ -1,11 +1,10 @@
 import { withInstall } from '../../utils/with-install.mjs';
-import './src/scrollbar2.mjs';
+import Scrollbar from './src/scrollbar2.mjs';
 export { BAR_MAP, renderThumbStyle } from './src/util.mjs';
 export { scrollbarEmits, scrollbarProps } from './src/scrollbar.mjs';
 export { barProps } from './src/bar.mjs';
-import script from './src/scrollbar.vue_vue_type_script_lang.mjs';
 
-const ElScrollbar = withInstall(script);
+const ElScrollbar = withInstall(Scrollbar);
 
 export { ElScrollbar, ElScrollbar as default };
 //# sourceMappingURL=index.mjs.map

package/es/components/scrollbar/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../packages/components/scrollbar/index.ts"],"sourcesContent":["import { withInstall } from '@element-plus/utils/with-install'\n\nimport Scrollbar from './src/scrollbar.vue'\n\nexport const ElScrollbar = withInstall(Scrollbar)\nexport default ElScrollbar\n\nexport * from './src/util'\nexport * from './src/scrollbar'\nexport * from './src/bar'\n"],"names":["Scrollbar"],"mappings":";;;;;;;AAEY,MAAC,WAAW,GAAG,WAAW,CAACA,MAAS;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../../../../packages/components/scrollbar/index.ts"],"sourcesContent":["import { withInstall } from '@element-plus/utils/with-install'\n\nimport Scrollbar from './src/scrollbar.vue'\n\nexport const ElScrollbar = withInstall(Scrollbar)\nexport default ElScrollbar\n\nexport * from './src/util'\nexport * from './src/scrollbar'\nexport * from './src/bar'\n"],"names":[],"mappings":";;;;;;AAEY,MAAC,WAAW,GAAG,WAAW,CAAC,SAAS;;;;"}

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

@@ -1,7 +1,135 @@
-import script from './bar.vue_vue_type_script_lang.mjs';
-export { default } from './bar.vue_vue_type_script_lang.mjs';
-import { render } from './bar.vue_vue_type_template_id_2f63f10a_lang.mjs';
+import { defineComponent, inject, ref, computed, onBeforeUnmount, toRef, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, normalizeStyle, vShow } from 'vue';
+import { isClient, useEventListener } from '@vueuse/core';
+import '../../../tokens/index.mjs';
+import { throwError } from '../../../utils/error.mjs';
+import { BAR_MAP, renderThumbStyle } from './util.mjs';
+import { barProps } from './bar.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { scrollbarContextKey } from '../../../tokens/scrollbar.mjs';
 
-script.render = render;
-script.__file = "packages/components/scrollbar/src/bar.vue";
+const COMPONENT_NAME = "Bar";
+const _sfc_main = defineComponent({
+  name: COMPONENT_NAME,
+  props: barProps,
+  setup(props) {
+    const scrollbar = inject(scrollbarContextKey);
+    if (!scrollbar)
+      throwError(COMPONENT_NAME, "can not inject scrollbar context");
+    const instance = ref();
+    const thumb = ref();
+    const barStore = ref({});
+    const visible = ref(false);
+    let cursorDown = false;
+    let cursorLeave = false;
+    let onselectstartStore = isClient ? document.onselectstart : null;
+    const bar = computed(() => BAR_MAP[props.vertical ? "vertical" : "horizontal"]);
+    const thumbStyle = computed(() => renderThumbStyle({
+      size: props.size,
+      move: props.move,
+      bar: bar.value
+    }));
+    const offsetRatio = computed(() => instance.value[bar.value.offset] ** 2 / scrollbar.wrapElement[bar.value.scrollSize] / props.ratio / thumb.value[bar.value.offset]);
+    const clickThumbHandler = (e) => {
+      var _a;
+      e.stopPropagation();
+      if (e.ctrlKey || [1, 2].includes(e.button))
+        return;
+      (_a = window.getSelection()) == null ? void 0 : _a.removeAllRanges();
+      startDrag(e);
+      const el = e.currentTarget;
+      if (!el)
+        return;
+      barStore.value[bar.value.axis] = el[bar.value.offset] - (e[bar.value.client] - el.getBoundingClientRect()[bar.value.direction]);
+    };
+    const clickTrackHandler = (e) => {
+      if (!thumb.value || !instance.value || !scrollbar.wrapElement)
+        return;
+      const offset = Math.abs(e.target.getBoundingClientRect()[bar.value.direction] - e[bar.value.client]);
+      const thumbHalf = thumb.value[bar.value.offset] / 2;
+      const thumbPositionPercentage = (offset - thumbHalf) * 100 * offsetRatio.value / instance.value[bar.value.offset];
+      scrollbar.wrapElement[bar.value.scroll] = thumbPositionPercentage * scrollbar.wrapElement[bar.value.scrollSize] / 100;
+    };
+    const startDrag = (e) => {
+      e.stopImmediatePropagation();
+      cursorDown = true;
+      document.addEventListener("mousemove", mouseMoveDocumentHandler);
+      document.addEventListener("mouseup", mouseUpDocumentHandler);
+      onselectstartStore = document.onselectstart;
+      document.onselectstart = () => false;
+    };
+    const mouseMoveDocumentHandler = (e) => {
+      if (!instance.value || !thumb.value)
+        return;
+      if (cursorDown === false)
+        return;
+      const prevPage = barStore.value[bar.value.axis];
+      if (!prevPage)
+        return;
+      const offset = (instance.value.getBoundingClientRect()[bar.value.direction] - e[bar.value.client]) * -1;
+      const thumbClickPosition = thumb.value[bar.value.offset] - prevPage;
+      const thumbPositionPercentage = (offset - thumbClickPosition) * 100 * offsetRatio.value / instance.value[bar.value.offset];
+      scrollbar.wrapElement[bar.value.scroll] = thumbPositionPercentage * scrollbar.wrapElement[bar.value.scrollSize] / 100;
+    };
+    const mouseUpDocumentHandler = () => {
+      cursorDown = false;
+      barStore.value[bar.value.axis] = 0;
+      document.removeEventListener("mousemove", mouseMoveDocumentHandler);
+      document.removeEventListener("mouseup", mouseUpDocumentHandler);
+      restoreOnselectstart();
+      if (cursorLeave)
+        visible.value = false;
+    };
+    const mouseMoveScrollbarHandler = () => {
+      cursorLeave = false;
+      visible.value = !!props.size;
+    };
+    const mouseLeaveScrollbarHandler = () => {
+      cursorLeave = true;
+      visible.value = cursorDown;
+    };
+    onBeforeUnmount(() => {
+      restoreOnselectstart();
+      document.removeEventListener("mouseup", mouseUpDocumentHandler);
+    });
+    const restoreOnselectstart = () => {
+      if (document.onselectstart !== onselectstartStore)
+        document.onselectstart = onselectstartStore;
+    };
+    useEventListener(toRef(scrollbar, "scrollbarElement"), "mousemove", mouseMoveScrollbarHandler);
+    useEventListener(toRef(scrollbar, "scrollbarElement"), "mouseleave", mouseLeaveScrollbarHandler);
+    return {
+      instance,
+      thumb,
+      bar,
+      thumbStyle,
+      visible,
+      clickTrackHandler,
+      clickThumbHandler
+    };
+  }
+});
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createBlock(Transition, { name: "el-scrollbar-fade" }, {
+    default: withCtx(() => [
+      withDirectives(createElementVNode("div", {
+        ref: "instance",
+        class: normalizeClass(["el-scrollbar__bar", "is-" + _ctx.bar.key]),
+        onMousedown: _cache[1] || (_cache[1] = (...args) => _ctx.clickTrackHandler && _ctx.clickTrackHandler(...args))
+      }, [
+        createElementVNode("div", {
+          ref: "thumb",
+          class: "el-scrollbar__thumb",
+          style: normalizeStyle(_ctx.thumbStyle),
+          onMousedown: _cache[0] || (_cache[0] = (...args) => _ctx.clickThumbHandler && _ctx.clickThumbHandler(...args))
+        }, null, 36)
+      ], 34), [
+        [vShow, _ctx.always || _ctx.visible]
+      ])
+    ]),
+    _: 1
+  });
+}
+var Bar = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+
+export { Bar as default };
 //# sourceMappingURL=bar2.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"bar2.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"version":3,"file":"bar2.mjs","sources":["../../../../../../packages/components/scrollbar/src/bar.vue"],"sourcesContent":["<template>\n  <transition name=\"el-scrollbar-fade\">\n    <div\n      v-show=\"always || visible\"\n      ref=\"instance\"\n      :class=\"['el-scrollbar__bar', 'is-' + bar.key]\"\n      @mousedown=\"clickTrackHandler\"\n    >\n      <div\n        ref=\"thumb\"\n        class=\"el-scrollbar__thumb\"\n        :style=\"thumbStyle\"\n        @mousedown=\"clickThumbHandler\"\n      ></div>\n    </div>\n  </transition>\n</template>\n\n<script lang=\"ts\">\nimport {\n  computed,\n  defineComponent,\n  inject,\n  onBeforeUnmount,\n  ref,\n  toRef,\n} from 'vue'\nimport { useEventListener, isClient } from '@vueuse/core'\nimport { scrollbarContextKey } from '@element-plus/tokens'\nimport { throwError } from '@element-plus/utils/error'\nimport { BAR_MAP, renderThumbStyle } from './util'\n\nimport { barProps } from './bar'\n\nconst COMPONENT_NAME = 'Bar'\nexport default defineComponent({\n  name: COMPONENT_NAME,\n  props: barProps,\n\n  setup(props) {\n    const scrollbar = inject(scrollbarContextKey)\n    if (!scrollbar)\n      throwError(COMPONENT_NAME, 'can not inject scrollbar context')\n\n    const instance = ref<HTMLDivElement>()\n    const thumb = ref<HTMLDivElement>()\n\n    const barStore = ref({})\n    const visible = ref(false)\n\n    let cursorDown = false\n    let cursorLeave = false\n    let onselectstartStore:\n      | ((this: GlobalEventHandlers, ev: Event) => any)\n      | null = isClient ? document.onselectstart : null\n\n    const bar = computed(\n      () => BAR_MAP[props.vertical ? 'vertical' : 'horizontal']\n    )\n\n    const thumbStyle = computed(() =>\n      renderThumbStyle({\n        size: props.size,\n        move: props.move,\n        bar: bar.value,\n      })\n    )\n\n    const offsetRatio = computed(\n      () =>\n        // offsetRatioX = original width of thumb / current width of thumb / ratioX\n        // offsetRatioY = original height of thumb / current height of thumb / ratioY\n        // instance height = wrap height - GAP\n        instance.value![bar.value.offset] ** 2 /\n        scrollbar.wrapElement![bar.value.scrollSize] /\n        props.ratio /\n        thumb.value![bar.value.offset]\n    )\n\n    const clickThumbHandler = (e: MouseEvent) => {\n      // prevent click event of middle and right button\n      e.stopPropagation()\n      if (e.ctrlKey || [1, 2].includes(e.button)) return\n\n      window.getSelection()?.removeAllRanges()\n      startDrag(e)\n\n      const el = e.currentTarget as HTMLDivElement\n      if (!el) return\n      barStore.value[bar.value.axis] =\n        el[bar.value.offset] -\n        (e[bar.value.client] - el.getBoundingClientRect()[bar.value.direction])\n    }\n\n    const clickTrackHandler = (e: MouseEvent) => {\n      if (!thumb.value || !instance.value || !scrollbar.wrapElement) return\n\n      const offset = Math.abs(\n        (e.target as HTMLElement).getBoundingClientRect()[bar.value.direction] -\n          e[bar.value.client]\n      )\n      const thumbHalf = thumb.value[bar.value.offset] / 2\n      const thumbPositionPercentage =\n        ((offset - thumbHalf) * 100 * offsetRatio.value) /\n        instance.value[bar.value.offset]\n\n      scrollbar.wrapElement[bar.value.scroll] =\n        (thumbPositionPercentage *\n          scrollbar.wrapElement[bar.value.scrollSize]) /\n        100\n    }\n\n    const startDrag = (e: MouseEvent) => {\n      e.stopImmediatePropagation()\n      cursorDown = true\n      document.addEventListener('mousemove', mouseMoveDocumentHandler)\n      document.addEventListener('mouseup', mouseUpDocumentHandler)\n      onselectstartStore = document.onselectstart\n      document.onselectstart = () => false\n    }\n\n    const mouseMoveDocumentHandler = (e: MouseEvent) => {\n      if (!instance.value || !thumb.value) return\n      if (cursorDown === false) return\n\n      const prevPage = barStore.value[bar.value.axis]\n      if (!prevPage) return\n\n      const offset =\n        (instance.value.getBoundingClientRect()[bar.value.direction] -\n          e[bar.value.client]) *\n        -1\n      const thumbClickPosition = thumb.value[bar.value.offset] - prevPage\n      const thumbPositionPercentage =\n        ((offset - thumbClickPosition) * 100 * offsetRatio.value) /\n        instance.value[bar.value.offset]\n      scrollbar.wrapElement[bar.value.scroll] =\n        (thumbPositionPercentage *\n          scrollbar.wrapElement[bar.value.scrollSize]) /\n        100\n    }\n\n    const mouseUpDocumentHandler = () => {\n      cursorDown = false\n      barStore.value[bar.value.axis] = 0\n      document.removeEventListener('mousemove', mouseMoveDocumentHandler)\n      document.removeEventListener('mouseup', mouseUpDocumentHandler)\n      restoreOnselectstart()\n      if (cursorLeave) visible.value = false\n    }\n\n    const mouseMoveScrollbarHandler = () => {\n      cursorLeave = false\n      visible.value = !!props.size\n    }\n\n    const mouseLeaveScrollbarHandler = () => {\n      cursorLeave = true\n      visible.value = cursorDown\n    }\n\n    onBeforeUnmount(() => {\n      restoreOnselectstart()\n      document.removeEventListener('mouseup', mouseUpDocumentHandler)\n    })\n\n    const restoreOnselectstart = () => {\n      if (document.onselectstart !== onselectstartStore)\n        document.onselectstart = onselectstartStore\n    }\n\n    useEventListener(\n      toRef(scrollbar, 'scrollbarElement'),\n      'mousemove',\n      mouseMoveScrollbarHandler\n    )\n    useEventListener(\n      toRef(scrollbar, 'scrollbarElement'),\n      'mouseleave',\n      mouseLeaveScrollbarHandler\n    )\n\n    return {\n      instance,\n      thumb,\n      bar,\n      thumbStyle,\n      visible,\n      clickTrackHandler,\n      clickThumbHandler,\n    }\n  },\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;AAkCA,MAAM,iBAAiB;AACvB,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,OAAO;AAAA,EAEP,MAAM,OAAO;AACX,UAAM,YAAY,OAAO;AACzB,QAAI,CAAC;AACH,iBAAW,gBAAgB;AAE7B,UAAM,WAAW;AACjB,UAAM,QAAQ;AAEd,UAAM,WAAW,IAAI;AACrB,UAAM,UAAU,IAAI;AAEpB,QAAI,aAAa;AACjB,QAAI,cAAc;AAClB,QAAI,qBAEO,WAAW,SAAS,gBAAgB;AAE/C,UAAM,MAAM,SACV,MAAM,QAAQ,MAAM,WAAW,aAAa;AAG9C,UAAM,aAAa,SAAS,MAC1B,iBAAiB;AAAA,MACf,MAAM,MAAM;AAAA,MACZ,MAAM,MAAM;AAAA,MACZ,KAAK,IAAI;AAAA;AAIb,UAAM,cAAc,SAClB,MAIE,SAAS,MAAO,IAAI,MAAM,WAAW,IACrC,UAAU,YAAa,IAAI,MAAM,cACjC,MAAM,QACN,MAAM,MAAO,IAAI,MAAM;AAG3B,UAAM,oBAAoB,CAAC,MAAkB;AAE3C;AACA,uBAAiB;AAA2B;AAE5C;AACA;AAEA,iBAAW,EAAE;AACb;AAAS;AACT,eAAS;AAEqD;AAGhE;AACE,UAAI,iBAAiB;AAA0C;AAE/D;AAIA,YAAM,kBAAkB;AACxB,YAAM;AAIN,sCAAgC,UAC7B,oCACW,YAAY,UAAU,cAClC;AAAA;AAGJ;AACE;AACA;AACA;AACA,eAAS,iBAAiB,WAAW;AACrC;AACA;AAA+B;AAGjC;AACE,UAAI;AAAiC;AACrC;AAA0B;AAE1B;AACA;AAAe;AAEf;AAIA,YAAM,qDAAqD;AAC3D,YAAM,0BACF,UAAS;AAEb,sCAAgC,UAC7B,gDACuB,wBACxB;AAAA;AAGJ;AACE;AACA,yBAAmB;AACnB,eAAS,oBAAoB;AAC7B,eAAS,oBAAoB,WAAW;AACxC;AACA;AAAiB;AAAgB;AAGnC;AACE;AACA;AAAwB;AAG1B;AACE;AACA;AAAgB;AAGlB;AACE;AACA;AAAwC;AAG1C;AACE,UAAI;AACF;AAAyB;AAG7B;AAKA,qBACE,MAAM,WAAW,qBACjB;AAIF;AAAO;AACL,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA;;;AA/KI;AAZN,qBAEM;AAAU;AACR,QACL;AAAW;;AAEZ;AACa;AACN,UACJ;AAAK,UACL;AAAS;;;AATM;;;;;;;;;;;"}