@element-plus/nightly 0.0.20250528 → 0.0.20250530

package/es/components/popconfirm/src/popconfirm2.mjs

@@ -1,50 +1,119 @@
-import { QuestionFilled } from '@element-plus/icons-vue';
-import { buttonTypes } from '../../button/src/button.mjs';
-import { buildProps } from '../../../utils/vue/props/runtime.mjs';
-import { iconPropType } from '../../../utils/vue/icon.mjs';
-import { useTooltipContentProps } from '../../tooltip/src/content.mjs';
+import { defineComponent, ref, computed, openBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, normalizeClass, normalizeStyle, resolveDynamicComponent, createCommentVNode, createTextVNode, toDisplayString, renderSlot, createVNode } from 'vue';
+import { ElButton } from '../../button/index.mjs';
+import { ElIcon } from '../../icon/index.mjs';
+import { ElTooltip } from '../../tooltip/index.mjs';
+import { popconfirmProps, popconfirmEmits } from './popconfirm.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useLocale } from '../../../hooks/use-locale/index.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { addUnit } from '../../../utils/dom/style.mjs';
 
-const popconfirmProps = buildProps({
-  title: String,
-  confirmButtonText: String,
-  cancelButtonText: String,
-  confirmButtonType: {
-    type: String,
-    values: buttonTypes,
-    default: "primary"
-  },
-  cancelButtonType: {
-    type: String,
-    values: buttonTypes,
-    default: "text"
-  },
-  icon: {
-    type: iconPropType,
-    default: () => QuestionFilled
-  },
-  iconColor: {
-    type: String,
-    default: "#f90"
-  },
-  hideIcon: {
-    type: Boolean,
-    default: false
-  },
-  hideAfter: {
-    type: Number,
-    default: 200
-  },
-  teleported: useTooltipContentProps.teleported,
-  persistent: useTooltipContentProps.persistent,
-  width: {
-    type: [String, Number],
-    default: 150
+const __default__ = defineComponent({
+  name: "ElPopconfirm"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: popconfirmProps,
+  emits: popconfirmEmits,
+  setup(__props, { emit }) {
+    const props = __props;
+    const { t } = useLocale();
+    const ns = useNamespace("popconfirm");
+    const tooltipRef = ref();
+    const hidePopper = () => {
+      var _a, _b;
+      (_b = (_a = tooltipRef.value) == null ? void 0 : _a.onClose) == null ? void 0 : _b.call(_a);
+    };
+    const style = computed(() => {
+      return {
+        width: addUnit(props.width)
+      };
+    });
+    const confirm = (e) => {
+      emit("confirm", e);
+      hidePopper();
+    };
+    const cancel = (e) => {
+      emit("cancel", e);
+      hidePopper();
+    };
+    const finalConfirmButtonText = computed(() => props.confirmButtonText || t("el.popconfirm.confirmButtonText"));
+    const finalCancelButtonText = computed(() => props.cancelButtonText || t("el.popconfirm.cancelButtonText"));
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(ElTooltip), mergeProps({
+        ref_key: "tooltipRef",
+        ref: tooltipRef,
+        trigger: "click",
+        effect: "light"
+      }, _ctx.$attrs, {
+        "popper-class": `${unref(ns).namespace.value}-popover`,
+        "popper-style": unref(style),
+        teleported: _ctx.teleported,
+        "fallback-placements": ["bottom", "top", "right", "left"],
+        "hide-after": _ctx.hideAfter,
+        persistent: _ctx.persistent
+      }), {
+        content: withCtx(() => [
+          createElementVNode("div", {
+            class: normalizeClass(unref(ns).b())
+          }, [
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("main"))
+            }, [
+              !_ctx.hideIcon && _ctx.icon ? (openBlock(), createBlock(unref(ElIcon), {
+                key: 0,
+                class: normalizeClass(unref(ns).e("icon")),
+                style: normalizeStyle({ color: _ctx.iconColor })
+              }, {
+                default: withCtx(() => [
+                  (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon)))
+                ]),
+                _: 1
+              }, 8, ["class", "style"])) : createCommentVNode("v-if", true),
+              createTextVNode(" " + toDisplayString(_ctx.title), 1)
+            ], 2),
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("action"))
+            }, [
+              renderSlot(_ctx.$slots, "actions", {
+                confirm,
+                cancel
+              }, () => [
+                createVNode(unref(ElButton), {
+                  size: "small",
+                  type: _ctx.cancelButtonType === "text" ? "" : _ctx.cancelButtonType,
+                  text: _ctx.cancelButtonType === "text",
+                  onClick: cancel
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(toDisplayString(unref(finalCancelButtonText)), 1)
+                  ]),
+                  _: 1
+                }, 8, ["type", "text"]),
+                createVNode(unref(ElButton), {
+                  size: "small",
+                  type: _ctx.confirmButtonType === "text" ? "" : _ctx.confirmButtonType,
+                  text: _ctx.confirmButtonType === "text",
+                  onClick: confirm
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(toDisplayString(unref(finalConfirmButtonText)), 1)
+                  ]),
+                  _: 1
+                }, 8, ["type", "text"])
+              ])
+            ], 2)
+          ], 2)
+        ]),
+        default: withCtx(() => [
+          _ctx.$slots.reference ? renderSlot(_ctx.$slots, "reference", { key: 0 }) : createCommentVNode("v-if", true)
+        ]),
+        _: 3
+      }, 16, ["popper-class", "popper-style", "teleported", "hide-after", "persistent"]);
+    };
   }
 });
-const popconfirmEmits = {
-  confirm: (e) => e instanceof MouseEvent,
-  cancel: (e) => e instanceof MouseEvent
-};
+var Popconfirm = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "popconfirm.vue"]]);
 
-export { popconfirmEmits, popconfirmProps };
+export { Popconfirm as default };
 //# sourceMappingURL=popconfirm2.mjs.map

package/es/components/popconfirm/src/popconfirm2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"popconfirm2.mjs","sources":["../../../../../../packages/components/popconfirm/src/popconfirm.ts"],"sourcesContent":["import { buttonTypes } from '@element-plus/components/button'\nimport { QuestionFilled } from '@element-plus/icons-vue'\nimport { buildProps, iconPropType } from '@element-plus/utils'\nimport { useTooltipContentProps } from '@element-plus/components/tooltip'\nimport type { ExtractPropTypes } from 'vue'\nimport type Popconfirm from './popconfirm.vue'\n\nexport const popconfirmProps = buildProps({\n  /**\n   * @description Title\n   */\n  title: String,\n  /**\n   * @description Confirm button text\n   */\n  confirmButtonText: String,\n  /**\n   * @description Cancel button text\n   */\n  cancelButtonText: String,\n  /**\n   * @description Confirm button type\n   */\n  confirmButtonType: {\n    type: String,\n    values: buttonTypes,\n    default: 'primary',\n  },\n  /**\n   * @description Cancel button type\n   */\n  cancelButtonType: {\n    type: String,\n    values: buttonTypes,\n    default: 'text',\n  },\n  /**\n   * @description Icon Component\n   */\n  icon: {\n    type: iconPropType,\n    default: () => QuestionFilled,\n  },\n  /**\n   * @description Icon color\n   */\n  iconColor: {\n    type: String,\n    default: '#f90',\n  },\n  /**\n   * @description is hide Icon\n   */\n  hideIcon: {\n    type: Boolean,\n    default: false,\n  },\n  /**\n   * @description delay of disappear, in millisecond\n   */\n  hideAfter: {\n    type: Number,\n    default: 200,\n  },\n  /**\n   * @description whether popconfirm is teleported to the body\n   */\n  teleported: useTooltipContentProps.teleported,\n  /**\n   * @description when popconfirm inactive and `persistent` is `false` , popconfirm will be destroyed\n   */\n  persistent: useTooltipContentProps.persistent,\n  /**\n   * @description popconfirm width, min width 150px\n   */\n  width: {\n    type: [String, Number],\n    default: 150,\n  },\n} as const)\n\nexport const popconfirmEmits = {\n  /**\n   * @description triggers when click confirm button\n   */\n  confirm: (e: MouseEvent) => e instanceof MouseEvent,\n  /**\n   * @description triggers when click cancel button\n   */\n  cancel: (e: MouseEvent) => e instanceof MouseEvent,\n}\n\nexport type PopconfirmEmits = typeof popconfirmEmits\n\nexport type PopconfirmProps = ExtractPropTypes<typeof popconfirmProps>\n\nexport type PopconfirmInstance = InstanceType<typeof Popconfirm> & unknown\n"],"names":[],"mappings":";;;;;;AAIY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,KAAK,EAAE,MAAM;AACf,EAAE,iBAAiB,EAAE,MAAM;AAC3B,EAAE,gBAAgB,EAAE,MAAM;AAC1B,EAAE,iBAAiB,EAAE;AACrB,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,WAAW;AACvB,IAAI,OAAO,EAAE,SAAS;AACtB,GAAG;AACH,EAAE,gBAAgB,EAAE;AACpB,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,WAAW;AACvB,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,IAAI,OAAO,EAAE,MAAM,cAAc;AACjC,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,EAAE,UAAU,EAAE,sBAAsB,CAAC,UAAU;AAC/C,EAAE,UAAU,EAAE,sBAAsB,CAAC,UAAU;AAC/C,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,eAAe,GAAG;AAC/B,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,UAAU;AACzC,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,UAAU;AACxC;;;;"}
+{"version":3,"file":"popconfirm2.mjs","sources":["../../../../../../packages/components/popconfirm/src/popconfirm.vue"],"sourcesContent":["<template>\n  <el-tooltip\n    ref=\"tooltipRef\"\n    trigger=\"click\"\n    effect=\"light\"\n    v-bind=\"$attrs\"\n    :popper-class=\"`${ns.namespace.value}-popover`\"\n    :popper-style=\"style\"\n    :teleported=\"teleported\"\n    :fallback-placements=\"['bottom', 'top', 'right', 'left']\"\n    :hide-after=\"hideAfter\"\n    :persistent=\"persistent\"\n  >\n    <template #content>\n      <div :class=\"ns.b()\">\n        <div :class=\"ns.e('main')\">\n          <el-icon\n            v-if=\"!hideIcon && icon\"\n            :class=\"ns.e('icon')\"\n            :style=\"{ color: iconColor }\"\n          >\n            <component :is=\"icon\" />\n          </el-icon>\n          {{ title }}\n        </div>\n        <div :class=\"ns.e('action')\">\n          <slot name=\"actions\" :confirm=\"confirm\" :cancel=\"cancel\">\n            <el-button\n              size=\"small\"\n              :type=\"cancelButtonType === 'text' ? '' : cancelButtonType\"\n              :text=\"cancelButtonType === 'text'\"\n              @click=\"cancel\"\n            >\n              {{ finalCancelButtonText }}\n            </el-button>\n            <el-button\n              size=\"small\"\n              :type=\"confirmButtonType === 'text' ? '' : confirmButtonType\"\n              :text=\"confirmButtonType === 'text'\"\n              @click=\"confirm\"\n            >\n              {{ finalConfirmButtonText }}\n            </el-button>\n          </slot>\n        </div>\n      </div>\n    </template>\n    <template v-if=\"$slots.reference\">\n      <slot name=\"reference\" />\n    </template>\n  </el-tooltip>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref } from 'vue'\nimport ElButton from '@element-plus/components/button'\nimport ElIcon from '@element-plus/components/icon'\nimport ElTooltip from '@element-plus/components/tooltip'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport { addUnit } from '@element-plus/utils'\nimport { popconfirmEmits, popconfirmProps } from './popconfirm'\n\nimport type { TooltipInstance } from '@element-plus/components/tooltip'\n\ndefineOptions({\n  name: 'ElPopconfirm',\n})\n\nconst props = defineProps(popconfirmProps)\nconst emit = defineEmits(popconfirmEmits)\n\nconst { t } = useLocale()\nconst ns = useNamespace('popconfirm')\nconst tooltipRef = ref<TooltipInstance>()\n\nconst hidePopper = () => {\n  tooltipRef.value?.onClose?.()\n}\n\nconst style = computed(() => {\n  return {\n    width: addUnit(props.width),\n  }\n})\n\nconst confirm = (e: MouseEvent) => {\n  emit('confirm', e)\n  hidePopper()\n}\nconst cancel = (e: MouseEvent) => {\n  emit('cancel', e)\n  hidePopper()\n}\n\nconst finalConfirmButtonText = computed(\n  () => props.confirmButtonText || t('el.popconfirm.confirmButtonText')\n)\nconst finalCancelButtonText = computed(\n  () => props.cancelButtonText || t('el.popconfirm.cancelButtonText')\n)\n</script>\n"],"names":["_openBlock","_createBlock","_unref","_mergeProps"],"mappings":";;;;;;;;;;mCAgEc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAI,SAAU,EAAA,CAAA;AACxB,IAAM,MAAA,EAAA,GAAK,aAAa,YAAY,CAAA,CAAA;AACpC,IAAA,MAAM,aAAa,GAAqB,EAAA,CAAA;AAExC,IAAA,MAAM,aAAa,MAAM;AACvB,MAAA,IAAA,EAAA,EAAA,EAAA,CAAW;AAAiB,MAC9B,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,UAAA,CAAA,KAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,OAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA;AAEA,KAAM,CAAA;AACJ,IAAO,MAAA,KAAA,GAAA,QAAA,CAAA,MAAA;AAAA,MACL,OAAA;AAA0B,QAC5B,KAAA,EAAA,OAAA,CAAA,KAAA,CAAA,KAAA,CAAA;AAAA,OACD,CAAA;AAED,KAAM,CAAA,CAAA;AACJ,IAAA,MAAA,YAAgB,KAAC;AACjB,MAAW,IAAA,CAAA,SAAA,EAAA,CAAA,CAAA,CAAA;AAAA,MACb,UAAA,EAAA,CAAA;AACA,KAAM,CAAA;AACJ,IAAA,MAAA,WAAe,KAAC;AAChB,MAAW,IAAA,CAAA,QAAA,EAAA,CAAA,CAAA,CAAA;AAAA,MACb,UAAA,EAAA,CAAA;AAEA,KAAA,CAAA;AAA+B,IAAA,MACvB,sBAA2B,GAAA,QAAmC,CAAA,MAAA,KAAA,CAAA,iBAAA,IAAA,CAAA,CAAA,iCAAA,CAAA,CAAA,CAAA;AAAA,IACtE,MAAA,qBAAA,GAAA,QAAA,CAAA,MAAA,KAAA,CAAA,gBAAA,IAAA,CAAA,CAAA,gCAAA,CAAA,CAAA,CAAA;AACA,IAAA,OAA8B,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MAC5B,OAAMA,SAA0B,EAAA,EAAAC,WAAA,CAAEC,KAAgC,CAAA,SAAA,CAAA,EAAAC,UAAA,CAAA;AAAA,QACpE,OAAA,EAAA,YAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/popover/src/popover.mjs

@@ -1,6 +1,6 @@
 import { dropdownProps } from '../../dropdown/src/dropdown.mjs';
 import { buildProps } from '../../../utils/vue/props/runtime.mjs';
-import { useTooltipTriggerProps } from '../../tooltip/src/trigger.mjs';
+import { useTooltipTriggerProps } from '../../tooltip/src/trigger2.mjs';
 import { useTooltipContentProps } from '../../tooltip/src/content.mjs';
 import { isBoolean } from '../../../utils/types.mjs';
 

package/es/components/popper/index.mjs

@@ -1,11 +1,11 @@
 import Popper from './src/popper2.mjs';
-export { default as ElPopperArrow } from './src/arrow2.mjs';
+export { default as ElPopperArrow } from './src/arrow.mjs';
 export { default as ElPopperTrigger } from './src/trigger2.mjs';
 export { default as ElPopperContent } from './src/content2.mjs';
 export { Effect, popperProps, roleTypes, usePopperProps } from './src/popper.mjs';
 export { popperTriggerProps, usePopperTriggerProps } from './src/trigger.mjs';
 export { popperContentEmits, popperContentProps, popperCoreConfigProps, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './src/content.mjs';
-export { popperArrowProps, usePopperArrowProps } from './src/arrow.mjs';
+export { popperArrowProps, usePopperArrowProps } from './src/arrow2.mjs';
 export { POPPER_CONTENT_INJECTION_KEY, POPPER_INJECTION_KEY } from './src/constants.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';
 

package/es/components/popper/src/arrow.mjs

@@ -1,12 +1,35 @@
-import { buildProps } from '../../../utils/vue/props/runtime.mjs';
+import { defineComponent, inject, onBeforeUnmount, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle } from 'vue';
+import { POPPER_CONTENT_INJECTION_KEY } from './constants.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 
-const popperArrowProps = buildProps({
-  arrowOffset: {
-    type: Number,
-    default: 5
+const __default__ = defineComponent({
+  name: "ElPopperArrow",
+  inheritAttrs: false
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  setup(__props, { expose }) {
+    const ns = useNamespace("popper");
+    const { arrowRef, arrowStyle } = inject(POPPER_CONTENT_INJECTION_KEY, void 0);
+    onBeforeUnmount(() => {
+      arrowRef.value = void 0;
+    });
+    expose({
+      arrowRef
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("span", {
+        ref_key: "arrowRef",
+        ref: arrowRef,
+        class: normalizeClass(unref(ns).e("arrow")),
+        style: normalizeStyle(unref(arrowStyle)),
+        "data-popper-arrow": ""
+      }, null, 6);
+    };
   }
 });
-const usePopperArrowProps = popperArrowProps;
+var ElPopperArrow = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "arrow.vue"]]);
 
-export { popperArrowProps, usePopperArrowProps };
+export { ElPopperArrow as default };
 //# sourceMappingURL=arrow.mjs.map

package/es/components/popper/src/arrow.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"arrow.mjs","sources":["../../../../../../packages/components/popper/src/arrow.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Arrow from './arrow.vue'\n\nexport const popperArrowProps = buildProps({\n  arrowOffset: {\n    type: Number,\n    default: 5,\n  },\n} as const)\nexport type PopperArrowProps = ExtractPropTypes<typeof popperArrowProps>\n\nexport type PopperArrowInstance = InstanceType<typeof Arrow> & unknown\n\n/** @deprecated use `popperArrowProps` instead, and it will be deprecated in the next major version */\nexport const usePopperArrowProps = popperArrowProps\n\n/** @deprecated use `PopperArrowProps` instead, and it will be deprecated in the next major version */\nexport type UsePopperArrowProps = PopperArrowProps\n\n/** @deprecated use `PopperArrowInstance` instead, and it will be deprecated in the next major version */\nexport type ElPopperArrowInstance = PopperArrowInstance\n"],"names":[],"mappings":";;AACY,MAAC,gBAAgB,GAAG,UAAU,CAAC;AAC3C,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,CAAC,EAAE;AACS,MAAC,mBAAmB,GAAG;;;;"}
+{"version":3,"file":"arrow.mjs","sources":["../../../../../../packages/components/popper/src/arrow.vue"],"sourcesContent":["<template>\n  <span\n    ref=\"arrowRef\"\n    :class=\"ns.e('arrow')\"\n    :style=\"arrowStyle\"\n    data-popper-arrow\n  />\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject, onBeforeUnmount } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { POPPER_CONTENT_INJECTION_KEY } from './constants'\n\ndefineOptions({\n  name: 'ElPopperArrow',\n  inheritAttrs: false,\n})\n\nconst ns = useNamespace('popper')\nconst { arrowRef, arrowStyle } = inject(\n  POPPER_CONTENT_INJECTION_KEY,\n  undefined\n)!\n\nonBeforeUnmount(() => {\n  arrowRef.value = undefined\n})\n\ndefineExpose({\n  /**\n   * @description Arrow element\n   */\n  arrowRef,\n})\n</script>\n"],"names":["_openBlock","_createElementBlock","_normalizeClass","_unref","_normalizeStyle"],"mappings":";;;;;mCAcc,CAAA;AAAA,EACZ,IAAM,EAAA,eAAA;AAAA,EACN,YAAc,EAAA,KAAA;AAChB,CAAA,CAAA,CAAA;;;;AAEA,IAAM,MAAA,EAAA,GAAK,aAAa,QAAQ,CAAA,CAAA;AAChC,IAAM,MAAA,EAAE,QAAU,EAAA,UAAA,EAAe,GAAA,MAAA,CAAA,4BAAA,EAAA,KAAA,CAAA,CAAA,CAAA;AAAA,IAC/B,eAAA,CAAA,MAAA;AAAA,MACA,QAAA,CAAA,KAAA,GAAA,KAAA,CAAA,CAAA;AAAA,KACF,CAAA,CAAA;AAEA,IAAA,MAAA,CAAA;AACE,MAAA,QAAA;AAAiB,KAClB,CAAA,CAAA;AAED,IAAa,OAAA,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MAAA,OAAAA,SAAA,EAAA,EAAAC,kBAAA,CAAA,MAAA,EAAA;AAAA,QAAA,OAAA,EAAA,UAAA;AAAA,QAAA,GAAA,EAAA,QAAA;AAAA,QAIX,KAAA,EAAAC,cAAA,CAAAC,KAAA,CAAA,EAAA,CAAA,CAAA,CAAA,CAAA,OAAA,CAAA,CAAA;AAAA,QACD,KAAA,EAAAC,cAAA,CAAAD,KAAA,CAAA,UAAA,CAAA,CAAA;;;;;;;;;;"}

package/es/components/popper/src/arrow2.mjs

@@ -1,35 +1,12 @@
-import { defineComponent, inject, onBeforeUnmount, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle } from 'vue';
-import { POPPER_CONTENT_INJECTION_KEY } from './constants.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { buildProps } from '../../../utils/vue/props/runtime.mjs';
 
-const __default__ = defineComponent({
-  name: "ElPopperArrow",
-  inheritAttrs: false
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  setup(__props, { expose }) {
-    const ns = useNamespace("popper");
-    const { arrowRef, arrowStyle } = inject(POPPER_CONTENT_INJECTION_KEY, void 0);
-    onBeforeUnmount(() => {
-      arrowRef.value = void 0;
-    });
-    expose({
-      arrowRef
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("span", {
-        ref_key: "arrowRef",
-        ref: arrowRef,
-        class: normalizeClass(unref(ns).e("arrow")),
-        style: normalizeStyle(unref(arrowStyle)),
-        "data-popper-arrow": ""
-      }, null, 6);
-    };
+const popperArrowProps = buildProps({
+  arrowOffset: {
+    type: Number,
+    default: 5
   }
 });
-var ElPopperArrow = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "arrow.vue"]]);
+const usePopperArrowProps = popperArrowProps;
 
-export { ElPopperArrow as default };
+export { popperArrowProps, usePopperArrowProps };
 //# sourceMappingURL=arrow2.mjs.map

package/es/components/popper/src/arrow2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"arrow2.mjs","sources":["../../../../../../packages/components/popper/src/arrow.vue"],"sourcesContent":["<template>\n  <span\n    ref=\"arrowRef\"\n    :class=\"ns.e('arrow')\"\n    :style=\"arrowStyle\"\n    data-popper-arrow\n  />\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject, onBeforeUnmount } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { POPPER_CONTENT_INJECTION_KEY } from './constants'\n\ndefineOptions({\n  name: 'ElPopperArrow',\n  inheritAttrs: false,\n})\n\nconst ns = useNamespace('popper')\nconst { arrowRef, arrowStyle } = inject(\n  POPPER_CONTENT_INJECTION_KEY,\n  undefined\n)!\n\nonBeforeUnmount(() => {\n  arrowRef.value = undefined\n})\n\ndefineExpose({\n  /**\n   * @description Arrow element\n   */\n  arrowRef,\n})\n</script>\n"],"names":["_openBlock","_createElementBlock","_normalizeClass","_unref","_normalizeStyle"],"mappings":";;;;;mCAcc,CAAA;AAAA,EACZ,IAAM,EAAA,eAAA;AAAA,EACN,YAAc,EAAA,KAAA;AAChB,CAAA,CAAA,CAAA;;;;AAEA,IAAM,MAAA,EAAA,GAAK,aAAa,QAAQ,CAAA,CAAA;AAChC,IAAM,MAAA,EAAE,QAAU,EAAA,UAAA,EAAe,GAAA,MAAA,CAAA,4BAAA,EAAA,KAAA,CAAA,CAAA,CAAA;AAAA,IAC/B,eAAA,CAAA,MAAA;AAAA,MACA,QAAA,CAAA,KAAA,GAAA,KAAA,CAAA,CAAA;AAAA,KACF,CAAA,CAAA;AAEA,IAAA,MAAA,CAAA;AACE,MAAA,QAAA;AAAiB,KAClB,CAAA,CAAA;AAED,IAAa,OAAA,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MAAA,OAAAA,SAAA,EAAA,EAAAC,kBAAA,CAAA,MAAA,EAAA;AAAA,QAAA,OAAA,EAAA,UAAA;AAAA,QAAA,GAAA,EAAA,QAAA;AAAA,QAIX,KAAA,EAAAC,cAAA,CAAAC,KAAA,CAAA,EAAA,CAAA,CAAA,CAAA,CAAA,OAAA,CAAA,CAAA;AAAA,QACD,KAAA,EAAAC,cAAA,CAAAD,KAAA,CAAA,UAAA,CAAA,CAAA;;;;;;;;;;"}
+{"version":3,"file":"arrow2.mjs","sources":["../../../../../../packages/components/popper/src/arrow.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type Arrow from './arrow.vue'\n\nexport const popperArrowProps = buildProps({\n  arrowOffset: {\n    type: Number,\n    default: 5,\n  },\n} as const)\nexport type PopperArrowProps = ExtractPropTypes<typeof popperArrowProps>\n\nexport type PopperArrowInstance = InstanceType<typeof Arrow> & unknown\n\n/** @deprecated use `popperArrowProps` instead, and it will be deprecated in the next major version */\nexport const usePopperArrowProps = popperArrowProps\n\n/** @deprecated use `PopperArrowProps` instead, and it will be deprecated in the next major version */\nexport type UsePopperArrowProps = PopperArrowProps\n\n/** @deprecated use `PopperArrowInstance` instead, and it will be deprecated in the next major version */\nexport type ElPopperArrowInstance = PopperArrowInstance\n"],"names":[],"mappings":";;AACY,MAAC,gBAAgB,GAAG,UAAU,CAAC;AAC3C,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,CAAC,EAAE;AACS,MAAC,mBAAmB,GAAG;;;;"}

package/es/components/popper/src/content.mjs

@@ -1,5 +1,5 @@
 import { placements } from '@popperjs/core';
-import { popperArrowProps } from './arrow.mjs';
+import { popperArrowProps } from './arrow2.mjs';
 import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
 import { useAriaProps } from '../../../hooks/use-aria/index.mjs';
 

package/es/components/radio/index.mjs

@@ -1,9 +1,9 @@
 import Radio from './src/radio2.mjs';
-import RadioButton from './src/radio-button.mjs';
-import RadioGroup from './src/radio-group2.mjs';
+import RadioButton from './src/radio-button2.mjs';
+import RadioGroup from './src/radio-group.mjs';
 export { radioEmits, radioProps, radioPropsBase } from './src/radio.mjs';
-export { radioGroupEmits, radioGroupProps } from './src/radio-group.mjs';
-export { radioButtonProps } from './src/radio-button2.mjs';
+export { radioGroupEmits, radioGroupProps } from './src/radio-group2.mjs';
+export { radioButtonProps } from './src/radio-button.mjs';
 export { radioGroupKey } from './src/constants.mjs';
 import { withInstall, withNoopInstall } from '../../utils/vue/install.mjs';
 

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

@@ -1,69 +1,9 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, unref, withDirectives, createElementVNode, isRef, withModifiers, vModelRadio, normalizeStyle, renderSlot, createTextVNode, toDisplayString } from 'vue';
-import { useRadio } from './use-radio.mjs';
-import { radioButtonProps } from './radio-button2.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { radioPropsBase } from './radio.mjs';
+import { buildProps } from '../../../utils/vue/props/runtime.mjs';
 
-const __default__ = defineComponent({
-  name: "ElRadioButton"
+const radioButtonProps = buildProps({
+  ...radioPropsBase
 });
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: radioButtonProps,
-  setup(__props) {
-    const props = __props;
-    const ns = useNamespace("radio");
-    const { radioRef, focus, size, disabled, modelValue, radioGroup, actualValue } = useRadio(props);
-    const activeStyle = computed(() => {
-      return {
-        backgroundColor: (radioGroup == null ? void 0 : radioGroup.fill) || "",
-        borderColor: (radioGroup == null ? void 0 : radioGroup.fill) || "",
-        boxShadow: (radioGroup == null ? void 0 : radioGroup.fill) ? `-1px 0 0 0 ${radioGroup.fill}` : "",
-        color: (radioGroup == null ? void 0 : radioGroup.textColor) || ""
-      };
-    });
-    return (_ctx, _cache) => {
-      var _a;
-      return openBlock(), createElementBlock("label", {
-        class: normalizeClass([
-          unref(ns).b("button"),
-          unref(ns).is("active", unref(modelValue) === unref(actualValue)),
-          unref(ns).is("disabled", unref(disabled)),
-          unref(ns).is("focus", unref(focus)),
-          unref(ns).bm("button", unref(size))
-        ])
-      }, [
-        withDirectives(createElementVNode("input", {
-          ref_key: "radioRef",
-          ref: radioRef,
-          "onUpdate:modelValue": ($event) => isRef(modelValue) ? modelValue.value = $event : null,
-          class: normalizeClass(unref(ns).be("button", "original-radio")),
-          value: unref(actualValue),
-          type: "radio",
-          name: _ctx.name || ((_a = unref(radioGroup)) == null ? void 0 : _a.name),
-          disabled: unref(disabled),
-          onFocus: ($event) => focus.value = true,
-          onBlur: ($event) => focus.value = false,
-          onClick: withModifiers(() => {
-          }, ["stop"])
-        }, null, 42, ["onUpdate:modelValue", "value", "name", "disabled", "onFocus", "onBlur", "onClick"]), [
-          [vModelRadio, unref(modelValue)]
-        ]),
-        createElementVNode("span", {
-          class: normalizeClass(unref(ns).be("button", "inner")),
-          style: normalizeStyle(unref(modelValue) === unref(actualValue) ? unref(activeStyle) : {}),
-          onKeydown: withModifiers(() => {
-          }, ["stop"])
-        }, [
-          renderSlot(_ctx.$slots, "default", {}, () => [
-            createTextVNode(toDisplayString(_ctx.label), 1)
-          ])
-        ], 46, ["onKeydown"])
-      ], 2);
-    };
-  }
-});
-var RadioButton = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "radio-button.vue"]]);
 
-export { RadioButton as default };
+export { radioButtonProps };
 //# sourceMappingURL=radio-button.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"radio-button.mjs","sources":["../../../../../../packages/components/radio/src/radio-button.vue"],"sourcesContent":["<template>\n  <label\n    :class=\"[\n      ns.b('button'),\n      ns.is('active', modelValue === actualValue),\n      ns.is('disabled', disabled),\n      ns.is('focus', focus),\n      ns.bm('button', size),\n    ]\"\n  >\n    <input\n      ref=\"radioRef\"\n      v-model=\"modelValue\"\n      :class=\"ns.be('button', 'original-radio')\"\n      :value=\"actualValue\"\n      type=\"radio\"\n      :name=\"name || radioGroup?.name\"\n      :disabled=\"disabled\"\n      @focus=\"focus = true\"\n      @blur=\"focus = false\"\n      @click.stop\n    />\n    <span\n      :class=\"ns.be('button', 'inner')\"\n      :style=\"modelValue === actualValue ? activeStyle : {}\"\n      @keydown.stop\n    >\n      <slot>\n        {{ label }}\n      </slot>\n    </span>\n  </label>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { useRadio } from './use-radio'\nimport { radioButtonProps } from './radio-button'\nimport type { CSSProperties } from 'vue'\n\ndefineOptions({\n  name: 'ElRadioButton',\n})\n\nconst props = defineProps(radioButtonProps)\n\nconst ns = useNamespace('radio')\nconst { radioRef, focus, size, disabled, modelValue, radioGroup, actualValue } =\n  useRadio(props)\n\nconst activeStyle = computed<CSSProperties>(() => {\n  return {\n    backgroundColor: radioGroup?.fill || '',\n    borderColor: radioGroup?.fill || '',\n    boxShadow: radioGroup?.fill ? `-1px 0 0 0 ${radioGroup.fill}` : '',\n    color: radioGroup?.textColor || '',\n  }\n})\n</script>\n"],"names":[],"mappings":";;;;;;mCAyCc,CAAA;AAAA,EACZ,IAAM,EAAA,eAAA;AACR,CAAA,CAAA,CAAA;;;;;;AAIA,IAAM,MAAA,EAAA,GAAK,aAAa,OAAO,CAAA,CAAA;AAC/B,IAAM,MAAA,EAAE,QAAU,EAAA,KAAA,EAAO,IAAM,EAAA,QAAA,EAAU,YAAY,UAAY,EAAA,WAAA,EAC/D,GAAA,QAAA,CAAS,KAAK,CAAA,CAAA;AAEhB,IAAM,MAAA,WAAA,GAAc,SAAwB,MAAM;AAChD,MAAO,OAAA;AAAA,QACL,eAAA,EAAiB,eAAoB,IAAA,GAAA,KAAA,CAAA,GAAA,UAAA,CAAA,IAAA,KAAA,EAAA;AAAA,QACrC,WAAA,EAAa,eAAoB,IAAA,GAAA,KAAA,CAAA,GAAA,UAAA,CAAA,IAAA,KAAA,EAAA;AAAA,QACjC,WAAW,CAAY,UAAA,IAAA,IAAO,GAAc,KAAA,CAAA,GAAA,UAAA,CAAA,QAAoB,CAAA,WAAA,EAAA,UAAA,CAAA,IAAA,CAAA,CAAA,GAAA,EAAA;AAAA,QAChE,KAAA,EAAO,eAAyB,IAAA,GAAA,KAAA,CAAA,GAAA,UAAA,CAAA,SAAA,KAAA,EAAA;AAAA,OAClC,CAAA;AAAA,KACD,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"radio-button.mjs","sources":["../../../../../../packages/components/radio/src/radio-button.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\nimport { radioPropsBase } from './radio'\nimport type { ExtractPropTypes } from 'vue'\nimport type RadioButton from './radio-button.vue'\n\nexport const radioButtonProps = buildProps({\n  ...radioPropsBase,\n} as const)\n\nexport type RadioButtonProps = ExtractPropTypes<typeof radioButtonProps>\nexport type RadioButtonInstance = InstanceType<typeof RadioButton> & unknown\n"],"names":[],"mappings":";;;AAEY,MAAC,gBAAgB,GAAG,UAAU,CAAC;AAC3C,EAAE,GAAG,cAAc;AACnB,CAAC;;;;"}

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

@@ -1,9 +1,69 @@
-import { radioPropsBase } from './radio.mjs';
-import { buildProps } from '../../../utils/vue/props/runtime.mjs';
+import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, unref, withDirectives, createElementVNode, isRef, withModifiers, vModelRadio, normalizeStyle, renderSlot, createTextVNode, toDisplayString } from 'vue';
+import { useRadio } from './use-radio.mjs';
+import { radioButtonProps } from './radio-button.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 
-const radioButtonProps = buildProps({
-  ...radioPropsBase
+const __default__ = defineComponent({
+  name: "ElRadioButton"
 });
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: radioButtonProps,
+  setup(__props) {
+    const props = __props;
+    const ns = useNamespace("radio");
+    const { radioRef, focus, size, disabled, modelValue, radioGroup, actualValue } = useRadio(props);
+    const activeStyle = computed(() => {
+      return {
+        backgroundColor: (radioGroup == null ? void 0 : radioGroup.fill) || "",
+        borderColor: (radioGroup == null ? void 0 : radioGroup.fill) || "",
+        boxShadow: (radioGroup == null ? void 0 : radioGroup.fill) ? `-1px 0 0 0 ${radioGroup.fill}` : "",
+        color: (radioGroup == null ? void 0 : radioGroup.textColor) || ""
+      };
+    });
+    return (_ctx, _cache) => {
+      var _a;
+      return openBlock(), createElementBlock("label", {
+        class: normalizeClass([
+          unref(ns).b("button"),
+          unref(ns).is("active", unref(modelValue) === unref(actualValue)),
+          unref(ns).is("disabled", unref(disabled)),
+          unref(ns).is("focus", unref(focus)),
+          unref(ns).bm("button", unref(size))
+        ])
+      }, [
+        withDirectives(createElementVNode("input", {
+          ref_key: "radioRef",
+          ref: radioRef,
+          "onUpdate:modelValue": ($event) => isRef(modelValue) ? modelValue.value = $event : null,
+          class: normalizeClass(unref(ns).be("button", "original-radio")),
+          value: unref(actualValue),
+          type: "radio",
+          name: _ctx.name || ((_a = unref(radioGroup)) == null ? void 0 : _a.name),
+          disabled: unref(disabled),
+          onFocus: ($event) => focus.value = true,
+          onBlur: ($event) => focus.value = false,
+          onClick: withModifiers(() => {
+          }, ["stop"])
+        }, null, 42, ["onUpdate:modelValue", "value", "name", "disabled", "onFocus", "onBlur", "onClick"]), [
+          [vModelRadio, unref(modelValue)]
+        ]),
+        createElementVNode("span", {
+          class: normalizeClass(unref(ns).be("button", "inner")),
+          style: normalizeStyle(unref(modelValue) === unref(actualValue) ? unref(activeStyle) : {}),
+          onKeydown: withModifiers(() => {
+          }, ["stop"])
+        }, [
+          renderSlot(_ctx.$slots, "default", {}, () => [
+            createTextVNode(toDisplayString(_ctx.label), 1)
+          ])
+        ], 46, ["onKeydown"])
+      ], 2);
+    };
+  }
+});
+var RadioButton = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "radio-button.vue"]]);
 
-export { radioButtonProps };
+export { RadioButton as default };
 //# sourceMappingURL=radio-button2.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"radio-button2.mjs","sources":["../../../../../../packages/components/radio/src/radio-button.ts"],"sourcesContent":["import { buildProps } from '@element-plus/utils'\nimport { radioPropsBase } from './radio'\nimport type { ExtractPropTypes } from 'vue'\nimport type RadioButton from './radio-button.vue'\n\nexport const radioButtonProps = buildProps({\n  ...radioPropsBase,\n} as const)\n\nexport type RadioButtonProps = ExtractPropTypes<typeof radioButtonProps>\nexport type RadioButtonInstance = InstanceType<typeof RadioButton> & unknown\n"],"names":[],"mappings":";;;AAEY,MAAC,gBAAgB,GAAG,UAAU,CAAC;AAC3C,EAAE,GAAG,cAAc;AACnB,CAAC;;;;"}
+{"version":3,"file":"radio-button2.mjs","sources":["../../../../../../packages/components/radio/src/radio-button.vue"],"sourcesContent":["<template>\n  <label\n    :class=\"[\n      ns.b('button'),\n      ns.is('active', modelValue === actualValue),\n      ns.is('disabled', disabled),\n      ns.is('focus', focus),\n      ns.bm('button', size),\n    ]\"\n  >\n    <input\n      ref=\"radioRef\"\n      v-model=\"modelValue\"\n      :class=\"ns.be('button', 'original-radio')\"\n      :value=\"actualValue\"\n      type=\"radio\"\n      :name=\"name || radioGroup?.name\"\n      :disabled=\"disabled\"\n      @focus=\"focus = true\"\n      @blur=\"focus = false\"\n      @click.stop\n    />\n    <span\n      :class=\"ns.be('button', 'inner')\"\n      :style=\"modelValue === actualValue ? activeStyle : {}\"\n      @keydown.stop\n    >\n      <slot>\n        {{ label }}\n      </slot>\n    </span>\n  </label>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { useRadio } from './use-radio'\nimport { radioButtonProps } from './radio-button'\nimport type { CSSProperties } from 'vue'\n\ndefineOptions({\n  name: 'ElRadioButton',\n})\n\nconst props = defineProps(radioButtonProps)\n\nconst ns = useNamespace('radio')\nconst { radioRef, focus, size, disabled, modelValue, radioGroup, actualValue } =\n  useRadio(props)\n\nconst activeStyle = computed<CSSProperties>(() => {\n  return {\n    backgroundColor: radioGroup?.fill || '',\n    borderColor: radioGroup?.fill || '',\n    boxShadow: radioGroup?.fill ? `-1px 0 0 0 ${radioGroup.fill}` : '',\n    color: radioGroup?.textColor || '',\n  }\n})\n</script>\n"],"names":[],"mappings":";;;;;;mCAyCc,CAAA;AAAA,EACZ,IAAM,EAAA,eAAA;AACR,CAAA,CAAA,CAAA;;;;;;AAIA,IAAM,MAAA,EAAA,GAAK,aAAa,OAAO,CAAA,CAAA;AAC/B,IAAM,MAAA,EAAE,QAAU,EAAA,KAAA,EAAO,IAAM,EAAA,QAAA,EAAU,YAAY,UAAY,EAAA,WAAA,EAC/D,GAAA,QAAA,CAAS,KAAK,CAAA,CAAA;AAEhB,IAAM,MAAA,WAAA,GAAc,SAAwB,MAAM;AAChD,MAAO,OAAA;AAAA,QACL,eAAA,EAAiB,eAAoB,IAAA,GAAA,KAAA,CAAA,GAAA,UAAA,CAAA,IAAA,KAAA,EAAA;AAAA,QACrC,WAAA,EAAa,eAAoB,IAAA,GAAA,KAAA,CAAA,GAAA,UAAA,CAAA,IAAA,KAAA,EAAA;AAAA,QACjC,WAAW,CAAY,UAAA,IAAA,IAAO,GAAc,KAAA,CAAA,GAAA,UAAA,CAAA,QAAoB,CAAA,WAAA,EAAA,UAAA,CAAA,IAAA,CAAA,CAAA,GAAA,EAAA;AAAA,QAChE,KAAA,EAAO,eAAyB,IAAA,GAAA,KAAA,CAAA,GAAA,UAAA,CAAA,SAAA,KAAA,EAAA;AAAA,OAClC,CAAA;AAAA,KACD,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}