@element-plus/nightly 0.0.20251025 → 0.0.20251026

package/es/components/dialog/src/dialog2.mjs

@@ -1,79 +1,179 @@
-import { dialogContentProps } from './dialog-content.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { teleportProps } from '../../teleport/src/teleport.mjs';
-import { UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
-import { isBoolean } from '../../../utils/types.mjs';
+import { defineComponent, useSlots, computed, ref, provide, openBlock, createBlock, unref, withCtx, createVNode, Transition, mergeProps, withDirectives, createElementVNode, normalizeClass, normalizeStyle, createSlots, renderSlot, createCommentVNode, vShow } from 'vue';
+import { ElOverlay } from '../../overlay/index.mjs';
+import ElFocusTrap from '../../focus-trap/src/focus-trap.mjs';
+import { ElTeleport } from '../../teleport/index.mjs';
+import ElDialogContent from './dialog-content2.mjs';
+import { dialogInjectionKey } from './constants.mjs';
+import { dialogProps, dialogEmits } from './dialog.mjs';
+import { useDialog } from './use-dialog.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useDeprecated } from '../../../hooks/use-deprecated/index.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { useSameTarget } from '../../../hooks/use-same-target/index.mjs';
 
-const dialogProps = buildProps({
-  ...dialogContentProps,
-  appendToBody: Boolean,
-  appendTo: {
-    type: teleportProps.to.type,
-    default: "body"
-  },
-  beforeClose: {
-    type: definePropType(Function)
-  },
-  destroyOnClose: Boolean,
-  closeOnClickModal: {
-    type: Boolean,
-    default: true
-  },
-  closeOnPressEscape: {
-    type: Boolean,
-    default: true
-  },
-  lockScroll: {
-    type: Boolean,
-    default: true
-  },
-  modal: {
-    type: Boolean,
-    default: true
-  },
-  modalPenetrable: Boolean,
-  openDelay: {
-    type: Number,
-    default: 0
-  },
-  closeDelay: {
-    type: Number,
-    default: 0
-  },
-  top: {
-    type: String
-  },
-  modelValue: Boolean,
-  modalClass: String,
-  headerClass: String,
-  bodyClass: String,
-  footerClass: String,
-  width: {
-    type: [String, Number]
-  },
-  zIndex: {
-    type: Number
-  },
-  trapFocus: Boolean,
-  headerAriaLevel: {
-    type: String,
-    default: "2"
-  },
-  transition: {
-    type: definePropType([String, Object]),
-    default: void 0
+const __default__ = defineComponent({
+  name: "ElDialog",
+  inheritAttrs: false
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: dialogProps,
+  emits: dialogEmits,
+  setup(__props, { expose }) {
+    const props = __props;
+    const slots = useSlots();
+    useDeprecated({
+      scope: "el-dialog",
+      from: "the title slot",
+      replacement: "the header slot",
+      version: "3.0.0",
+      ref: "https://element-plus.org/en-US/component/dialog.html#slots"
+    }, computed(() => !!slots.title));
+    const ns = useNamespace("dialog");
+    const dialogRef = ref();
+    const headerRef = ref();
+    const dialogContentRef = ref();
+    const {
+      visible,
+      titleId,
+      bodyId,
+      style,
+      overlayDialogStyle,
+      rendered,
+      transitionConfig,
+      zIndex,
+      _draggable,
+      _alignCenter,
+      _overflow,
+      handleClose,
+      onModalClick,
+      onOpenAutoFocus,
+      onCloseAutoFocus,
+      onCloseRequested,
+      onFocusoutPrevented
+    } = useDialog(props, dialogRef);
+    provide(dialogInjectionKey, {
+      dialogRef,
+      headerRef,
+      bodyId,
+      ns,
+      rendered,
+      style
+    });
+    const overlayEvent = useSameTarget(onModalClick);
+    const penetrable = computed(() => props.modalPenetrable && !props.modal && !props.fullscreen);
+    const resetPosition = () => {
+      var _a;
+      (_a = dialogContentRef.value) == null ? void 0 : _a.resetPosition();
+    };
+    expose({
+      visible,
+      dialogContentRef,
+      resetPosition,
+      handleClose
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(ElTeleport), {
+        to: _ctx.appendTo,
+        disabled: _ctx.appendTo !== "body" ? false : !_ctx.appendToBody
+      }, {
+        default: withCtx(() => [
+          createVNode(Transition, mergeProps(unref(transitionConfig), { persisted: "" }), {
+            default: withCtx(() => {
+              var _a;
+              return [
+                withDirectives(createVNode(unref(ElOverlay), {
+                  "custom-mask-event": "",
+                  mask: _ctx.modal,
+                  "overlay-class": [
+                    (_a = _ctx.modalClass) != null ? _a : "",
+                    `${unref(ns).namespace.value}-modal-dialog`,
+                    unref(ns).is("penetrable", unref(penetrable))
+                  ],
+                  "z-index": unref(zIndex)
+                }, {
+                  default: withCtx(() => [
+                    createElementVNode("div", {
+                      role: "dialog",
+                      "aria-modal": "true",
+                      "aria-label": _ctx.title || void 0,
+                      "aria-labelledby": !_ctx.title ? unref(titleId) : void 0,
+                      "aria-describedby": unref(bodyId),
+                      class: normalizeClass(`${unref(ns).namespace.value}-overlay-dialog`),
+                      style: normalizeStyle(unref(overlayDialogStyle)),
+                      onClick: unref(overlayEvent).onClick,
+                      onMousedown: unref(overlayEvent).onMousedown,
+                      onMouseup: unref(overlayEvent).onMouseup
+                    }, [
+                      createVNode(unref(ElFocusTrap), {
+                        loop: "",
+                        trapped: unref(visible),
+                        "focus-start-el": "container",
+                        onFocusAfterTrapped: unref(onOpenAutoFocus),
+                        onFocusAfterReleased: unref(onCloseAutoFocus),
+                        onFocusoutPrevented: unref(onFocusoutPrevented),
+                        onReleaseRequested: unref(onCloseRequested)
+                      }, {
+                        default: withCtx(() => [
+                          unref(rendered) ? (openBlock(), createBlock(ElDialogContent, mergeProps({
+                            key: 0,
+                            ref_key: "dialogContentRef",
+                            ref: dialogContentRef
+                          }, _ctx.$attrs, {
+                            center: _ctx.center,
+                            "align-center": unref(_alignCenter),
+                            "close-icon": _ctx.closeIcon,
+                            draggable: unref(_draggable),
+                            overflow: unref(_overflow),
+                            fullscreen: _ctx.fullscreen,
+                            "header-class": _ctx.headerClass,
+                            "body-class": _ctx.bodyClass,
+                            "footer-class": _ctx.footerClass,
+                            "show-close": _ctx.showClose,
+                            title: _ctx.title,
+                            "aria-level": _ctx.headerAriaLevel,
+                            onClose: unref(handleClose)
+                          }), createSlots({
+                            header: withCtx(() => [
+                              !_ctx.$slots.title ? renderSlot(_ctx.$slots, "header", {
+                                key: 0,
+                                close: unref(handleClose),
+                                titleId: unref(titleId),
+                                titleClass: unref(ns).e("title")
+                              }) : renderSlot(_ctx.$slots, "title", { key: 1 })
+                            ]),
+                            default: withCtx(() => [
+                              renderSlot(_ctx.$slots, "default")
+                            ]),
+                            _: 2
+                          }, [
+                            _ctx.$slots.footer ? {
+                              name: "footer",
+                              fn: withCtx(() => [
+                                renderSlot(_ctx.$slots, "footer")
+                              ])
+                            } : void 0
+                          ]), 1040, ["center", "align-center", "close-icon", "draggable", "overflow", "fullscreen", "header-class", "body-class", "footer-class", "show-close", "title", "aria-level", "onClose"])) : createCommentVNode("v-if", true)
+                        ]),
+                        _: 3
+                      }, 8, ["trapped", "onFocusAfterTrapped", "onFocusAfterReleased", "onFocusoutPrevented", "onReleaseRequested"])
+                    ], 46, ["aria-label", "aria-labelledby", "aria-describedby", "onClick", "onMousedown", "onMouseup"])
+                  ]),
+                  _: 3
+                }, 8, ["mask", "overlay-class", "z-index"]), [
+                  [vShow, unref(visible)]
+                ])
+              ];
+            }),
+            _: 3
+          }, 16)
+        ]),
+        _: 3
+      }, 8, ["to", "disabled"]);
+    };
   }
 });
-const dialogEmits = {
-  open: () => true,
-  opened: () => true,
-  close: () => true,
-  closed: () => true,
-  [UPDATE_MODEL_EVENT]: (value) => isBoolean(value),
-  openAutoFocus: () => true,
-  closeAutoFocus: () => true
-};
-const dialogContextKey = Symbol("dialogContextKey");
+var Dialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "dialog.vue"]]);
 
-export { dialogContextKey, dialogEmits, dialogProps };
+export { Dialog as default };
 //# sourceMappingURL=dialog2.mjs.map

package/es/components/dialog/src/dialog2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dialog2.mjs","sources":["../../../../../../packages/components/dialog/src/dialog.ts"],"sourcesContent":["import { buildProps, definePropType, isBoolean } from '@element-plus/utils'\nimport { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { teleportProps } from '@element-plus/components/teleport'\nimport { dialogContentProps } from './dialog-content'\n\nimport type {\n  ExtractPropTypes,\n  InjectionKey,\n  TransitionProps,\n  __ExtractPublicPropTypes,\n} from 'vue'\nimport type Dialog from './dialog.vue'\n\ntype DoneFn = (cancel?: boolean) => void\n\nexport type DialogBeforeCloseFn = (done: DoneFn) => void\n\nexport type DialogTransition = string | TransitionProps\n\nexport const dialogProps = buildProps({\n  ...dialogContentProps,\n  /**\n   * @description whether to append Dialog itself to body. A nested Dialog should have this attribute set to `true`\n   */\n  appendToBody: Boolean,\n  /**\n   * @description which element the Dialog appends to\n   */\n  appendTo: {\n    type: teleportProps.to.type,\n    default: 'body',\n  },\n  /**\n   * @description callback before Dialog closes, and it will prevent Dialog from closing, use done to close the dialog\n   */\n  beforeClose: {\n    type: definePropType<DialogBeforeCloseFn>(Function),\n  },\n  /**\n   * @description destroy elements in Dialog when closed\n   */\n  destroyOnClose: Boolean,\n  /**\n   * @description whether the Dialog can be closed by clicking the mask\n   */\n  closeOnClickModal: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description whether the Dialog can be closed by pressing ESC\n   */\n  closeOnPressEscape: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description whether scroll of body is disabled while Dialog is displayed\n   */\n  lockScroll: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description whether a mask is displayed\n   */\n  modal: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description whether the mask is penetrable\n   */\n  modalPenetrable: Boolean,\n  /**\n   * @description the Time(milliseconds) before open\n   */\n  openDelay: {\n    type: Number,\n    default: 0,\n  },\n  /**\n   * @description the Time(milliseconds) before close\n   */\n  closeDelay: {\n    type: Number,\n    default: 0,\n  },\n  /**\n   * @description value for `margin-top` of Dialog CSS, default is 15vh\n   */\n  top: {\n    type: String,\n  },\n  /**\n   * @description visibility of Dialog\n   */\n  modelValue: Boolean,\n  /**\n   * @description custom class names for mask\n   */\n  modalClass: String,\n  /**\n   * @description custom class names for header wrapper\n   */\n  headerClass: String,\n  /**\n   * @description custom class names for body wrapper\n   */\n  bodyClass: String,\n  /**\n   * @description custom class names for footer wrapper\n   */\n  footerClass: String,\n  /**\n   * @description width of Dialog, default is 50%\n   */\n  width: {\n    type: [String, Number],\n  },\n  /**\n   * @description same as z-index in native CSS, z-order of dialog\n   */\n  zIndex: {\n    type: Number,\n  },\n  trapFocus: Boolean,\n  /**\n   * @description header's aria-level attribute\n   */\n  headerAriaLevel: {\n    type: String,\n    default: '2',\n  },\n  /**\n   * @description custom transition configuration for dialog animation, it can be a string (transition name) or an object with Vue transition props\n   */\n  transition: {\n    type: definePropType<DialogTransition>([String, Object]),\n    default: undefined,\n  },\n} as const)\n\nexport type DialogProps = ExtractPropTypes<typeof dialogProps>\nexport type DialogPropsPublic = __ExtractPublicPropTypes<typeof dialogProps>\n\nexport const dialogEmits = {\n  open: () => true,\n  opened: () => true,\n  close: () => true,\n  closed: () => true,\n  [UPDATE_MODEL_EVENT]: (value: boolean) => isBoolean(value),\n  openAutoFocus: () => true,\n  closeAutoFocus: () => true,\n}\nexport type DialogEmits = typeof dialogEmits\nexport type DialogInstance = InstanceType<typeof Dialog> & unknown\nexport interface DialogConfigContext {\n  alignCenter?: boolean\n  draggable?: boolean\n  overflow?: boolean\n  transition?: DialogTransition\n}\n\nexport const dialogContextKey: InjectionKey<DialogConfigContext> =\n  Symbol('dialogContextKey')\n"],"names":[],"mappings":";;;;;;AAIY,MAAC,WAAW,GAAG,UAAU,CAAC;AACtC,EAAE,GAAG,kBAAkB;AACvB,EAAE,YAAY,EAAE,OAAO;AACvB,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI;AAC/B,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,GAAG;AACH,EAAE,cAAc,EAAE,OAAO;AACzB,EAAE,iBAAiB,EAAE;AACrB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,kBAAkB,EAAE;AACtB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,eAAe,EAAE,OAAO;AAC1B,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,UAAU,EAAE,OAAO;AACrB,EAAE,UAAU,EAAE,MAAM;AACpB,EAAE,WAAW,EAAE,MAAM;AACrB,EAAE,SAAS,EAAE,MAAM;AACnB,EAAE,WAAW,EAAE,MAAM;AACrB,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,GAAG;AACH,EAAE,MAAM,EAAE;AACV,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,SAAS,EAAE,OAAO;AACpB,EAAE,eAAe,EAAE;AACnB,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1C,IAAI,OAAO,EAAE,KAAK,CAAC;AACnB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,WAAW,GAAG;AAC3B,EAAE,IAAI,EAAE,MAAM,IAAI;AAClB,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,KAAK,EAAE,MAAM,IAAI;AACnB,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,CAAC,kBAAkB,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC;AACnD,EAAE,aAAa,EAAE,MAAM,IAAI;AAC3B,EAAE,cAAc,EAAE,MAAM,IAAI;AAC5B,EAAE;AACU,MAAC,gBAAgB,GAAG,MAAM,CAAC,kBAAkB;;;;"}
+{"version":3,"file":"dialog2.mjs","sources":["../../../../../../packages/components/dialog/src/dialog.vue"],"sourcesContent":["<template>\n  <el-teleport\n    :to=\"appendTo\"\n    :disabled=\"appendTo !== 'body' ? false : !appendToBody\"\n  >\n    <transition v-bind=\"transitionConfig\">\n      <el-overlay\n        v-show=\"visible\"\n        custom-mask-event\n        :mask=\"modal\"\n        :overlay-class=\"[\n          modalClass ?? '',\n          `${ns.namespace.value}-modal-dialog`,\n          ns.is('penetrable', penetrable),\n        ]\"\n        :z-index=\"zIndex\"\n      >\n        <div\n          role=\"dialog\"\n          aria-modal=\"true\"\n          :aria-label=\"title || undefined\"\n          :aria-labelledby=\"!title ? titleId : undefined\"\n          :aria-describedby=\"bodyId\"\n          :class=\"`${ns.namespace.value}-overlay-dialog`\"\n          :style=\"overlayDialogStyle\"\n          @click=\"overlayEvent.onClick\"\n          @mousedown=\"overlayEvent.onMousedown\"\n          @mouseup=\"overlayEvent.onMouseup\"\n        >\n          <el-focus-trap\n            loop\n            :trapped=\"visible\"\n            focus-start-el=\"container\"\n            @focus-after-trapped=\"onOpenAutoFocus\"\n            @focus-after-released=\"onCloseAutoFocus\"\n            @focusout-prevented=\"onFocusoutPrevented\"\n            @release-requested=\"onCloseRequested\"\n          >\n            <el-dialog-content\n              v-if=\"rendered\"\n              ref=\"dialogContentRef\"\n              v-bind=\"$attrs\"\n              :center=\"center\"\n              :align-center=\"_alignCenter\"\n              :close-icon=\"closeIcon\"\n              :draggable=\"_draggable\"\n              :overflow=\"_overflow\"\n              :fullscreen=\"fullscreen\"\n              :header-class=\"headerClass\"\n              :body-class=\"bodyClass\"\n              :footer-class=\"footerClass\"\n              :show-close=\"showClose\"\n              :title=\"title\"\n              :aria-level=\"headerAriaLevel\"\n              @close=\"handleClose\"\n            >\n              <template #header>\n                <slot\n                  v-if=\"!$slots.title\"\n                  name=\"header\"\n                  :close=\"handleClose\"\n                  :title-id=\"titleId\"\n                  :title-class=\"ns.e('title')\"\n                />\n                <slot v-else name=\"title\" />\n              </template>\n              <slot />\n              <template v-if=\"$slots.footer\" #footer>\n                <slot name=\"footer\" />\n              </template>\n            </el-dialog-content>\n          </el-focus-trap>\n        </div>\n      </el-overlay>\n    </transition>\n  </el-teleport>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, provide, ref, useSlots } from 'vue'\nimport { ElOverlay } from '@element-plus/components/overlay'\nimport { useDeprecated, useNamespace, useSameTarget } from '@element-plus/hooks'\nimport ElFocusTrap from '@element-plus/components/focus-trap'\nimport ElTeleport from '@element-plus/components/teleport'\nimport ElDialogContent from './dialog-content.vue'\nimport { dialogInjectionKey } from './constants'\nimport { dialogEmits, dialogProps } from './dialog'\nimport { useDialog } from './use-dialog'\n\ndefineOptions({\n  name: 'ElDialog',\n  inheritAttrs: false,\n})\n\nconst props = defineProps(dialogProps)\ndefineEmits(dialogEmits)\nconst slots = useSlots()\n\nuseDeprecated(\n  {\n    scope: 'el-dialog',\n    from: 'the title slot',\n    replacement: 'the header slot',\n    version: '3.0.0',\n    ref: 'https://element-plus.org/en-US/component/dialog.html#slots',\n  },\n  computed(() => !!slots.title)\n)\n\nconst ns = useNamespace('dialog')\nconst dialogRef = ref<HTMLElement>()\nconst headerRef = ref<HTMLElement>()\nconst dialogContentRef = ref()\n\nconst {\n  visible,\n  titleId,\n  bodyId,\n  style,\n  overlayDialogStyle,\n  rendered,\n  transitionConfig,\n  zIndex,\n  _draggable,\n  _alignCenter,\n  _overflow,\n  handleClose,\n  onModalClick,\n  onOpenAutoFocus,\n  onCloseAutoFocus,\n  onCloseRequested,\n  onFocusoutPrevented,\n} = useDialog(props, dialogRef)\n\nprovide(dialogInjectionKey, {\n  dialogRef,\n  headerRef,\n  bodyId,\n  ns,\n  rendered,\n  style,\n})\n\nconst overlayEvent = useSameTarget(onModalClick)\n\nconst penetrable = computed(\n  () => props.modalPenetrable && !props.modal && !props.fullscreen\n)\n\nconst resetPosition = () => {\n  dialogContentRef.value?.resetPosition()\n}\n\ndefineExpose({\n  /** @description whether the dialog is visible */\n  visible,\n  dialogContentRef,\n  resetPosition,\n  handleClose,\n})\n</script>\n"],"names":["_openBlock","_createBlock","_unref"],"mappings":";;;;;;;;;;;;;mCAyFc,CAAA;AAAA,EACZ,IAAM,EAAA,UAAA;AAAA,EACN,YAAc,EAAA,KAAA;AAChB,CAAA,CAAA,CAAA;;;;;;;AAIA,IAAA,MAAM,QAAQ,QAAS,EAAA,CAAA;AAEvB,IAAA,aAAA,CAAA;AAAA,MACE,KAAA,EAAA,WAAA;AAAA,MAAA,IACS,EAAA,gBAAA;AAAA,MAAA,WACD,EAAA,iBAAA;AAAA,MAAA,OACO,EAAA,OAAA;AAAA,MAAA,GACJ,EAAA,4DAAA;AAAA,KAAA,EAAA,QACJ,CAAA,MAAA,CAAA,CAAA,KAAA,CAAA,KAAA,CAAA,CAAA,CAAA;AAAA,IACP,MAAA,EAAA,GAAA,YAAA,CAAA,QAAA,CAAA,CAAA;AAAA,IAAA,MACS,SAAA,GAAO;AAAY,IAC9B,MAAA,SAAA,GAAA,GAAA,EAAA,CAAA;AAEA,IAAM,MAAA,mBAA0B,GAAA,EAAA,CAAA;AAChC,IAAA,MAAM;AACN,MAAA;AACA,MAAA;AAEA,MAAM,MAAA;AAAA,MACJ,KAAA;AAAA,MACA,kBAAA;AAAA,MACA,QAAA;AAAA,MACA,gBAAA;AAAA,MACA,MAAA;AAAA,MACA,UAAA;AAAA,MACA,YAAA;AAAA,MACA,SAAA;AAAA,MACA,WAAA;AAAA,MACA,YAAA;AAAA,MACA,eAAA;AAAA,MACA,gBAAA;AAAA,MACA,gBAAA;AAAA,MACA,mBAAA;AAAA,KACA,GAAA,SAAA,CAAA,KAAA,EAAA,SAAA,CAAA,CAAA;AAAA,IACA,OAAA,CAAA,kBAAA,EAAA;AAAA,MACA,SAAA;AAAA,MACF,SAAc;AAEd,MAAA,MAAQ;AAAoB,MAC1B,EAAA;AAAA,MACA,QAAA;AAAA,MACA,KAAA;AAAA,KACA,CAAA,CAAA;AAAA,IACA,MAAA,YAAA,GAAA,aAAA,CAAA,YAAA,CAAA,CAAA;AAAA,IACA,MAAA,UAAA,GAAA,QAAA,CAAA,MAAA,KAAA,CAAA,eAAA,IAAA,CAAA,KAAA,CAAA,KAAA,IAAA,CAAA,KAAA,CAAA,UAAA,CAAA,CAAA;AAAA,IACF,MAAC,aAAA,GAAA,MAAA;AAED,MAAM,IAAA,EAAA,CAAA;AAEN,MAAA,CAAA,EAAA,GAAmB,gBAAA,CAAA,KAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,aAAA,EAAA,CAAA;AAAA,KAAA,CACjB;AAAsD,IACxD,MAAA,CAAA;AAEA,MAAA;AACE,MAAA,gBAAA;AAAsC,MACxC,aAAA;AAEA,MAAa,WAAA;AAAA,KAAA,CAAA,CAAA;AAAA,IAEX,OAAA,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MACA,OAAAA,SAAA,EAAA,EAAAC,WAAA,CAAAC,KAAA,CAAA,UAAA,CAAA,EAAA;AAAA,QACA,EAAA,EAAA,IAAA,CAAA,QAAA;AAAA,QACA,QAAA,EAAA,IAAA,CAAA,QAAA,KAAA,MAAA,GAAA,KAAA,GAAA,CAAA,IAAA,CAAA,YAAA;AAAA,OACD,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/drawer/src/drawer.mjs

@@ -1,4 +1,4 @@
-import { dialogProps, dialogEmits } from '../../dialog/src/dialog2.mjs';
+import { dialogProps, dialogEmits } from '../../dialog/src/dialog.mjs';
 import { buildProps } from '../../../utils/vue/props/runtime.mjs';
 
 const drawerProps = buildProps({

package/es/components/dropdown/src/dropdown-item-impl.mjs

@@ -3,7 +3,7 @@ import { ElIcon } from '../../icon/index.mjs';
 import { dropdownItemProps } from './dropdown.mjs';
 import { DROPDOWN_INJECTION_KEY } from './tokens.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY as COLLECTION_ITEM_INJECTION_KEY } from '../../roving-focus-group/src/roving-focus-group2.mjs';
+import { ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY as COLLECTION_ITEM_INJECTION_KEY } from '../../roving-focus-group/src/roving-focus-group.mjs';
 import { ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY } from '../../roving-focus-group/src/tokens.mjs';
 import { COLLECTION_ITEM_SIGN } from '../../collection/src/collection.mjs';
 import { useNamespace } from '../../../hooks/use-namespace/index.mjs';

package/es/components/dropdown/src/dropdown-menu.mjs

@@ -4,7 +4,7 @@ import { dropdownMenuProps } from './dropdown.mjs';
 import { useDropdown } from './useDropdown.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 import { ROVING_FOCUS_GROUP_INJECTION_KEY } from '../../roving-focus-group/src/tokens.mjs';
-import { ROVING_FOCUS_COLLECTION_INJECTION_KEY as COLLECTION_INJECTION_KEY } from '../../roving-focus-group/src/roving-focus-group2.mjs';
+import { ROVING_FOCUS_COLLECTION_INJECTION_KEY as COLLECTION_INJECTION_KEY } from '../../roving-focus-group/src/roving-focus-group.mjs';
 import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 import { composeRefs } from '../../../utils/vue/refs.mjs';
 import { composeEventHandlers, getEventCode } from '../../../utils/dom/event.mjs';

package/es/components/dropdown/src/dropdown2.mjs

@@ -3,7 +3,7 @@ import { ElButton } from '../../button/index.mjs';
 import { ElTooltip } from '../../tooltip/index.mjs';
 import { ElScrollbar } from '../../scrollbar/index.mjs';
 import { ElIcon } from '../../icon/index.mjs';
-import ElRovingFocusGroup from '../../roving-focus-group/src/roving-focus-group.mjs';
+import ElRovingFocusGroup from '../../roving-focus-group/src/roving-focus-group2.mjs';
 import { ArrowDown } from '@element-plus/icons-vue';
 import { dropdownProps } from './dropdown.mjs';
 import { DROPDOWN_INJECTION_KEY, DROPDOWN_INSTANCE_INJECTION_KEY } from './tokens.mjs';

package/es/components/index.mjs

@@ -87,12 +87,12 @@ export { default as FixedSizeGrid } from './virtual-list/src/components/fixed-si
 export { default as DynamicSizeGrid } from './virtual-list/src/components/dynamic-size-grid.mjs';
 export { default as ElLoadingDirective, default as vLoading } from './loading/src/directive.mjs';
 export { default as ElLoadingService } from './loading/src/service.mjs';
-export { affixEmits, affixProps } from './affix/src/affix2.mjs';
+export { affixEmits, affixProps } from './affix/src/affix.mjs';
 export { alertEffects, alertEmits, alertProps } from './alert/src/alert.mjs';
 export { autocompleteEmits, autocompleteProps } from './autocomplete/src/autocomplete.mjs';
 export { avatarEmits, avatarProps } from './avatar/src/avatar.mjs';
 export { backtopEmits, backtopProps } from './backtop/src/backtop.mjs';
-export { badgeProps } from './badge/src/badge2.mjs';
+export { badgeProps } from './badge/src/badge.mjs';
 export { breadcrumbProps } from './breadcrumb/src/breadcrumb.mjs';
 export { breadcrumbItemProps } from './breadcrumb/src/breadcrumb-item.mjs';
 export { breadcrumbKey } from './breadcrumb/src/constants.mjs';
@@ -108,7 +108,7 @@ export { CASCADER_PANEL_INJECTION_KEY } from './cascader-panel/src/types.mjs';
 export { CommonProps, DefaultProps, cascaderPanelEmits, cascaderPanelProps, useCascaderConfig } from './cascader-panel/src/config.mjs';
 export { checkTagEmits, checkTagProps } from './check-tag/src/check-tag.mjs';
 export { checkboxDefaultProps, checkboxGroupEmits, checkboxGroupProps } from './checkbox/src/checkbox-group.mjs';
-export { checkboxEmits, checkboxProps } from './checkbox/src/checkbox.mjs';
+export { checkboxEmits, checkboxProps } from './checkbox/src/checkbox2.mjs';
 export { checkboxGroupContextKey } from './checkbox/src/constants.mjs';
 export { colProps } from './col/src/col.mjs';
 export { collapseEmits, collapseProps, emitChangeFn } from './collapse/src/collapse.mjs';
@@ -127,7 +127,7 @@ export { datePickerPanelProps } from './date-picker-panel/src/props/date-picker-
 export { descriptionProps } from './descriptions/src/description.mjs';
 export { descriptionItemProps } from './descriptions/src/description-item.mjs';
 export { useDialog } from './dialog/src/use-dialog.mjs';
-export { dialogContextKey, dialogEmits, dialogProps } from './dialog/src/dialog2.mjs';
+export { dialogContextKey, dialogEmits, dialogProps } from './dialog/src/dialog.mjs';
 export { DEFAULT_DIALOG_TRANSITION, dialogInjectionKey } from './dialog/src/constants.mjs';
 export { dividerProps } from './divider/src/divider.mjs';
 export { drawerEmits, drawerProps } from './drawer/src/drawer.mjs';
@@ -152,21 +152,21 @@ export { menuItemGroupProps } from './menu/src/menu-item-group.mjs';
 export { subMenuProps } from './menu/src/sub-menu.mjs';
 export { MENU_INJECTION_KEY, SUB_MENU_INJECTION_KEY } from './menu/src/tokens.mjs';
 export { overlayEmits, overlayProps } from './overlay/src/overlay.mjs';
-export { pageHeaderEmits, pageHeaderProps } from './page-header/src/page-header.mjs';
+export { pageHeaderEmits, pageHeaderProps } from './page-header/src/page-header2.mjs';
 export { paginationEmits, paginationProps } from './pagination/src/pagination.mjs';
 export { elPaginationKey } from './pagination/src/constants.mjs';
 export { popconfirmEmits, popconfirmProps } from './popconfirm/src/popconfirm.mjs';
 export { Effect, popperProps, roleTypes, usePopperProps } from './popper/src/popper.mjs';
 export { popperTriggerProps, usePopperTriggerProps } from './popper/src/trigger.mjs';
-export { popperContentEmits, popperContentProps, popperCoreConfigProps, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './popper/src/content.mjs';
+export { popperContentEmits, popperContentProps, popperCoreConfigProps, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './popper/src/content2.mjs';
 export { popperArrowProps, usePopperArrowProps } from './popper/src/arrow.mjs';
 export { POPPER_CONTENT_INJECTION_KEY, POPPER_INJECTION_KEY } from './popper/src/constants.mjs';
 export { default as ElPopperArrow } from './popper/src/arrow2.mjs';
 export { default as ElPopperTrigger } from './popper/src/trigger2.mjs';
-export { default as ElPopperContent } from './popper/src/content2.mjs';
+export { default as ElPopperContent } from './popper/src/content.mjs';
 export { progressProps } from './progress/src/progress.mjs';
 export { radioEmits, radioProps, radioPropsBase } from './radio/src/radio.mjs';
-export { radioDefaultProps, radioGroupEmits, radioGroupProps } from './radio/src/radio-group.mjs';
+export { radioDefaultProps, radioGroupEmits, radioGroupProps } from './radio/src/radio-group2.mjs';
 export { radioButtonProps } from './radio/src/radio-button.mjs';
 export { radioGroupKey } from './radio/src/constants.mjs';
 export { rateEmits, rateProps } from './rate/src/rate.mjs';
@@ -201,10 +201,10 @@ export { tableV2RowProps } from './table-v2/src/row.mjs';
 export { tabsEmits, tabsProps } from './tabs/src/tabs.mjs';
 export { tabBarProps } from './tabs/src/tab-bar.mjs';
 export { tabNavEmits, tabNavProps } from './tabs/src/tab-nav.mjs';
-export { tabPaneProps } from './tabs/src/tab-pane.mjs';
+export { tabPaneProps } from './tabs/src/tab-pane2.mjs';
 export { tabsRootContextKey } from './tabs/src/constants.mjs';
 export { tagEmits, tagProps } from './tag/src/tag.mjs';
-export { textProps } from './text/src/text.mjs';
+export { textProps } from './text/src/text2.mjs';
 export { buildTimeList, dateEquals, dayOrDaysToDate, extractDateFormat, extractTimeFormat, formatter, makeList, parseDate, rangeArr, valueEquals } from './time-picker/src/utils.mjs';
 export { DEFAULT_FORMATS_DATE, DEFAULT_FORMATS_DATEPICKER, DEFAULT_FORMATS_TIME, PICKER_BASE_INJECTION_KEY, PICKER_POPPER_OPTIONS_INJECTION_KEY, ROOT_COMMON_PICKER_INJECTION_KEY, timeUnits } from './time-picker/src/constants.mjs';
 export { timePickerDefaultProps, timePickerRangeTriggerProps, timePickerRngeTriggerProps } from './time-picker/src/common/props.mjs';
@@ -228,11 +228,11 @@ export { uploadContextKey } from './upload/src/constants.mjs';
 export { default as FixedSizeList } from './virtual-list/src/components/fixed-size-list.mjs';
 export { default as DynamicSizeList } from './virtual-list/src/components/dynamic-size-list.mjs';
 export { virtualizedGridProps, virtualizedListProps, virtualizedProps, virtualizedScrollbarProps } from './virtual-list/src/props.mjs';
-export { watermarkProps } from './watermark/src/watermark.mjs';
-export { tourEmits, tourProps } from './tour/src/tour.mjs';
-export { tourStepEmits, tourStepProps } from './tour/src/step2.mjs';
-export { tourContentEmits, tourContentProps, tourPlacements, tourStrategies } from './tour/src/content2.mjs';
-export { anchorEmits, anchorProps } from './anchor/src/anchor.mjs';
+export { watermarkProps } from './watermark/src/watermark2.mjs';
+export { tourEmits, tourProps } from './tour/src/tour2.mjs';
+export { tourStepEmits, tourStepProps } from './tour/src/step.mjs';
+export { tourContentEmits, tourContentProps, tourPlacements, tourStrategies } from './tour/src/content.mjs';
+export { anchorEmits, anchorProps } from './anchor/src/anchor2.mjs';
 export { defaultProps, segmentedEmits, segmentedProps } from './segmented/src/segmented.mjs';
 export { mentionDefaultProps, mentionEmits, mentionProps } from './mention/src/mention.mjs';
 export { splitterProps } from './splitter/src/splitter.mjs';

package/es/components/page-header/index.mjs

@@ -1,5 +1,5 @@
-import PageHeader from './src/page-header2.mjs';
-export { pageHeaderEmits, pageHeaderProps } from './src/page-header.mjs';
+import PageHeader from './src/page-header.mjs';
+export { pageHeaderEmits, pageHeaderProps } from './src/page-header2.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';
 
 const ElPageHeader = withInstall(PageHeader);

package/es/components/page-header/src/page-header.mjs

@@ -1,21 +1,102 @@
-import { Back } from '@element-plus/icons-vue';
-import { buildProps } from '../../../utils/vue/props/runtime.mjs';
-import { iconPropType } from '../../../utils/vue/icon.mjs';
+import { defineComponent, openBlock, createElementBlock, normalizeClass, unref, renderSlot, createCommentVNode, createElementVNode, createBlock, withCtx, resolveDynamicComponent, createTextVNode, toDisplayString, createVNode } from 'vue';
+import { ElIcon } from '../../icon/index.mjs';
+import { ElDivider } from '../../divider/index.mjs';
+import { pageHeaderProps, pageHeaderEmits } from './page-header2.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';
 
-const pageHeaderProps = buildProps({
-  icon: {
-    type: iconPropType,
-    default: () => Back
-  },
-  title: String,
-  content: {
-    type: String,
-    default: ""
+const __default__ = defineComponent({
+  name: "ElPageHeader"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: pageHeaderProps,
+  emits: pageHeaderEmits,
+  setup(__props, { emit }) {
+    const { t } = useLocale();
+    const ns = useNamespace("page-header");
+    function handleClick() {
+      emit("back");
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass([
+          unref(ns).b(),
+          unref(ns).is("contentful", !!_ctx.$slots.default),
+          {
+            [unref(ns).m("has-breadcrumb")]: !!_ctx.$slots.breadcrumb,
+            [unref(ns).m("has-extra")]: !!_ctx.$slots.extra
+          }
+        ])
+      }, [
+        _ctx.$slots.breadcrumb ? (openBlock(), createElementBlock("div", {
+          key: 0,
+          class: normalizeClass(unref(ns).e("breadcrumb"))
+        }, [
+          renderSlot(_ctx.$slots, "breadcrumb")
+        ], 2)) : createCommentVNode("v-if", true),
+        createElementVNode("div", {
+          class: normalizeClass(unref(ns).e("header"))
+        }, [
+          createElementVNode("div", {
+            class: normalizeClass(unref(ns).e("left"))
+          }, [
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("back")),
+              role: "button",
+              tabindex: "0",
+              onClick: handleClick
+            }, [
+              _ctx.icon || _ctx.$slots.icon ? (openBlock(), createElementBlock("div", {
+                key: 0,
+                "aria-label": _ctx.title || unref(t)("el.pageHeader.title"),
+                class: normalizeClass(unref(ns).e("icon"))
+              }, [
+                renderSlot(_ctx.$slots, "icon", {}, () => [
+                  _ctx.icon ? (openBlock(), createBlock(unref(ElIcon), { key: 0 }, {
+                    default: withCtx(() => [
+                      (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon)))
+                    ]),
+                    _: 1
+                  })) : createCommentVNode("v-if", true)
+                ])
+              ], 10, ["aria-label"])) : createCommentVNode("v-if", true),
+              createElementVNode("div", {
+                class: normalizeClass(unref(ns).e("title"))
+              }, [
+                renderSlot(_ctx.$slots, "title", {}, () => [
+                  createTextVNode(toDisplayString(_ctx.title || unref(t)("el.pageHeader.title")), 1)
+                ])
+              ], 2)
+            ], 2),
+            createVNode(unref(ElDivider), { direction: "vertical" }),
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("content"))
+            }, [
+              renderSlot(_ctx.$slots, "content", {}, () => [
+                createTextVNode(toDisplayString(_ctx.content), 1)
+              ])
+            ], 2)
+          ], 2),
+          _ctx.$slots.extra ? (openBlock(), createElementBlock("div", {
+            key: 0,
+            class: normalizeClass(unref(ns).e("extra"))
+          }, [
+            renderSlot(_ctx.$slots, "extra")
+          ], 2)) : createCommentVNode("v-if", true)
+        ], 2),
+        _ctx.$slots.default ? (openBlock(), createElementBlock("div", {
+          key: 1,
+          class: normalizeClass(unref(ns).e("main"))
+        }, [
+          renderSlot(_ctx.$slots, "default")
+        ], 2)) : createCommentVNode("v-if", true)
+      ], 2);
+    };
   }
 });
-const pageHeaderEmits = {
-  back: () => true
-};
+var PageHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "page-header.vue"]]);
 
-export { pageHeaderEmits, pageHeaderProps };
+export { PageHeader as default };
 //# sourceMappingURL=page-header.mjs.map

package/es/components/page-header/src/page-header.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"page-header.mjs","sources":["../../../../../../packages/components/page-header/src/page-header.ts"],"sourcesContent":["import { buildProps, iconPropType } from '@element-plus/utils'\nimport { Back } from '@element-plus/icons-vue'\n\nimport type { ExtractPropTypes, __ExtractPublicPropTypes } from 'vue'\nimport type PageHeader from './page-header.vue'\n\nexport const pageHeaderProps = buildProps({\n  /**\n   * @description icon component of page header\n   */\n  icon: {\n    type: iconPropType,\n    default: () => Back,\n  },\n  /**\n   * @description main title of page header\n   */\n  title: String,\n  /**\n   * @description content of page header\n   */\n  content: {\n    type: String,\n    default: '',\n  },\n} as const)\nexport type PageHeaderProps = ExtractPropTypes<typeof pageHeaderProps>\nexport type PageHeaderPropsPublic = __ExtractPublicPropTypes<\n  typeof pageHeaderProps\n>\n\nexport const pageHeaderEmits = {\n  back: () => true,\n}\nexport type PageHeaderEmits = typeof pageHeaderEmits\n\nexport type PageHeaderInstance = InstanceType<typeof PageHeader> & unknown\n"],"names":[],"mappings":";;;;AAEY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,IAAI,OAAO,EAAE,MAAM,IAAI;AACvB,GAAG;AACH,EAAE,KAAK,EAAE,MAAM;AACf,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,CAAC,EAAE;AACS,MAAC,eAAe,GAAG;AAC/B,EAAE,IAAI,EAAE,MAAM,IAAI;AAClB;;;;"}
+{"version":3,"file":"page-header.mjs","sources":["../../../../../../packages/components/page-header/src/page-header.vue"],"sourcesContent":["<template>\n  <div\n    :class=\"[\n      ns.b(),\n      ns.is('contentful', !!$slots.default),\n      {\n        [ns.m('has-breadcrumb')]: !!$slots.breadcrumb,\n        [ns.m('has-extra')]: !!$slots.extra,\n      },\n    ]\"\n  >\n    <div v-if=\"$slots.breadcrumb\" :class=\"ns.e('breadcrumb')\">\n      <slot name=\"breadcrumb\" />\n    </div>\n    <div :class=\"ns.e('header')\">\n      <div :class=\"ns.e('left')\">\n        <div\n          :class=\"ns.e('back')\"\n          role=\"button\"\n          tabindex=\"0\"\n          @click=\"handleClick\"\n        >\n          <div\n            v-if=\"icon || $slots.icon\"\n            :aria-label=\"title || t('el.pageHeader.title')\"\n            :class=\"ns.e('icon')\"\n          >\n            <slot name=\"icon\">\n              <el-icon v-if=\"icon\">\n                <component :is=\"icon\" />\n              </el-icon>\n            </slot>\n          </div>\n          <div :class=\"ns.e('title')\">\n            <slot name=\"title\">{{ title || t('el.pageHeader.title') }}</slot>\n          </div>\n        </div>\n        <el-divider direction=\"vertical\" />\n        <div :class=\"ns.e('content')\">\n          <slot name=\"content\">{{ content }}</slot>\n        </div>\n      </div>\n\n      <div v-if=\"$slots.extra\" :class=\"ns.e('extra')\">\n        <slot name=\"extra\" />\n      </div>\n    </div>\n\n    <div v-if=\"$slots.default\" :class=\"ns.e('main')\">\n      <slot />\n    </div>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { ElIcon } from '@element-plus/components/icon'\nimport { ElDivider } from '@element-plus/components/divider'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport { pageHeaderEmits, pageHeaderProps } from './page-header'\n\ndefineOptions({\n  name: 'ElPageHeader',\n})\n\ndefineProps(pageHeaderProps)\nconst emit = defineEmits(pageHeaderEmits)\n\nconst { t } = useLocale()\nconst ns = useNamespace('page-header')\n\nfunction handleClick() {\n  emit('back')\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;mCA4Dc,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,aAAa,CAAA,CAAA;AAErC,IAAA,SAAS,WAAc,GAAA;AACrB,MAAA,IAAA,CAAK,MAAM,CAAA,CAAA;AAAA,KACb;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}