@element-plus/nightly 0.0.20250308 → 0.0.20250310

package/es/components/avatar/src/avatar.mjs

@@ -1,37 +1,71 @@
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { componentSizes } from '../../../constants/size.mjs';
+import { defineComponent, ref, computed, watch, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle, createBlock, withCtx, resolveDynamicComponent, renderSlot } from 'vue';
+import { ElIcon } from '../../icon/index.mjs';
+import { avatarProps, avatarEmits } from './avatar2.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { isString } from '@vue/shared';
 import { isNumber } from '../../../utils/types.mjs';
-import { iconPropType } from '../../../utils/vue/icon.mjs';
+import { addUnit } from '../../../utils/dom/style.mjs';
 
-const avatarProps = buildProps({
-  size: {
-    type: [Number, String],
-    values: componentSizes,
-    default: "",
-    validator: (val) => isNumber(val)
-  },
-  shape: {
-    type: String,
-    values: ["circle", "square"],
-    default: "circle"
-  },
-  icon: {
-    type: iconPropType
-  },
-  src: {
-    type: String,
-    default: ""
-  },
-  alt: String,
-  srcSet: String,
-  fit: {
-    type: definePropType(String),
-    default: "cover"
+const __default__ = defineComponent({
+  name: "ElAvatar"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: avatarProps,
+  emits: avatarEmits,
+  setup(__props, { emit }) {
+    const props = __props;
+    const ns = useNamespace("avatar");
+    const hasLoadError = ref(false);
+    const avatarClass = computed(() => {
+      const { size, icon, shape } = props;
+      const classList = [ns.b()];
+      if (isString(size))
+        classList.push(ns.m(size));
+      if (icon)
+        classList.push(ns.m("icon"));
+      if (shape)
+        classList.push(ns.m(shape));
+      return classList;
+    });
+    const sizeStyle = computed(() => {
+      const { size } = props;
+      return isNumber(size) ? ns.cssVarBlock({
+        size: addUnit(size) || ""
+      }) : void 0;
+    });
+    const fitStyle = computed(() => ({
+      objectFit: props.fit
+    }));
+    watch(() => props.src, () => hasLoadError.value = false);
+    function handleError(e) {
+      hasLoadError.value = true;
+      emit("error", e);
+    }
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("span", {
+        class: normalizeClass(unref(avatarClass)),
+        style: normalizeStyle(unref(sizeStyle))
+      }, [
+        (_ctx.src || _ctx.srcSet) && !hasLoadError.value ? (openBlock(), createElementBlock("img", {
+          key: 0,
+          src: _ctx.src,
+          alt: _ctx.alt,
+          srcset: _ctx.srcSet,
+          style: normalizeStyle(unref(fitStyle)),
+          onError: handleError
+        }, null, 44, ["src", "alt", "srcset"])) : _ctx.icon ? (openBlock(), createBlock(unref(ElIcon), { key: 1 }, {
+          default: withCtx(() => [
+            (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon)))
+          ]),
+          _: 1
+        })) : renderSlot(_ctx.$slots, "default", { key: 2 })
+      ], 6);
+    };
   }
 });
-const avatarEmits = {
-  error: (evt) => evt instanceof Event
-};
+var Avatar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "avatar.vue"]]);
 
-export { avatarEmits, avatarProps };
+export { Avatar as default };
 //# sourceMappingURL=avatar.mjs.map

package/es/components/avatar/src/avatar.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"avatar.mjs","sources":["../../../../../../packages/components/avatar/src/avatar.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  iconPropType,\n  isNumber,\n} from '@element-plus/utils'\nimport { componentSizes } from '@element-plus/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type { ObjectFitProperty } from 'csstype'\n\nexport const avatarProps = buildProps({\n  /**\n   * @description avatar size.\n   */\n  size: {\n    type: [Number, String],\n    values: componentSizes,\n    default: '',\n    validator: (val: unknown): val is number => isNumber(val),\n  },\n  /**\n   * @description avatar shape.\n   */\n  shape: {\n    type: String,\n    values: ['circle', 'square'],\n    default: 'circle',\n  },\n  /**\n   * @description representation type to icon, more info on icon component.\n   */\n  icon: {\n    type: iconPropType,\n  },\n  /**\n   * @description the source of the image for an image avatar.\n   */\n  src: {\n    type: String,\n    default: '',\n  },\n  /**\n   * @description native attribute `alt` of image avatar.\n   */\n  alt: String,\n  /**\n   * @description native attribute srcset of image avatar.\n   */\n  srcSet: String,\n  /**\n   * @description set how the image fit its container for an image avatar.\n   */\n  fit: {\n    type: definePropType<ObjectFitProperty>(String),\n    default: 'cover',\n  },\n} as const)\nexport type AvatarProps = ExtractPropTypes<typeof avatarProps>\n\nexport const avatarEmits = {\n  error: (evt: Event) => evt instanceof Event,\n}\nexport type AvatarEmits = typeof avatarEmits\n"],"names":[],"mappings":";;;;;AAOY,MAAC,WAAW,GAAG,UAAU,CAAC;AACtC,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,MAAM,EAAE,cAAc;AAC1B,IAAI,OAAO,EAAE,EAAE;AACf,IAAI,SAAS,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC;AACrC,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;AAChC,IAAI,OAAO,EAAE,QAAQ;AACrB,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,MAAM,EAAE,MAAM;AAChB,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,IAAI,OAAO,EAAE,OAAO;AACpB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,WAAW,GAAG;AAC3B,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,GAAG,YAAY,KAAK;AACtC;;;;"}
+{"version":3,"file":"avatar.mjs","sources":["../../../../../../packages/components/avatar/src/avatar.vue"],"sourcesContent":["<template>\n  <span :class=\"avatarClass\" :style=\"sizeStyle\">\n    <img\n      v-if=\"(src || srcSet) && !hasLoadError\"\n      :src=\"src\"\n      :alt=\"alt\"\n      :srcset=\"srcSet\"\n      :style=\"fitStyle\"\n      @error=\"handleError\"\n    />\n    <el-icon v-else-if=\"icon\">\n      <component :is=\"icon\" />\n    </el-icon>\n    <slot v-else />\n  </span>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref, watch } from 'vue'\nimport { ElIcon } from '@element-plus/components/icon'\nimport { useNamespace } from '@element-plus/hooks'\nimport { addUnit, isNumber, isString } from '@element-plus/utils'\nimport { avatarEmits, avatarProps } from './avatar'\n\nimport type { CSSProperties } from 'vue'\n\ndefineOptions({\n  name: 'ElAvatar',\n})\n\nconst props = defineProps(avatarProps)\nconst emit = defineEmits(avatarEmits)\n\nconst ns = useNamespace('avatar')\n\nconst hasLoadError = ref(false)\n\nconst avatarClass = computed(() => {\n  const { size, icon, shape } = props\n  const classList = [ns.b()]\n  if (isString(size)) classList.push(ns.m(size))\n  if (icon) classList.push(ns.m('icon'))\n  if (shape) classList.push(ns.m(shape))\n  return classList\n})\n\nconst sizeStyle = computed(() => {\n  const { size } = props\n  return isNumber(size)\n    ? (ns.cssVarBlock({\n        size: addUnit(size) || '',\n      }) as CSSProperties)\n    : undefined\n})\n\nconst fitStyle = computed<CSSProperties>(() => ({\n  objectFit: props.fit,\n}))\n\n// need reset hasLoadError to false if src changed\nwatch(\n  () => props.src,\n  () => (hasLoadError.value = false)\n)\n\nfunction handleError(e: Event) {\n  hasLoadError.value = true\n  emit('error', e)\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;;mCA0Bc,CAAA;AAAA,EACZ,IAAM,EAAA,UAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAKA,IAAM,MAAA,EAAA,GAAK,aAAa,QAAQ,CAAA,CAAA;AAEhC,IAAM,MAAA,YAAA,GAAe,IAAI,KAAK,CAAA,CAAA;AAE9B,IAAM,MAAA,WAAA,GAAc,SAAS,MAAM;AACjC,MAAA,MAAM,EAAE,IAAA,EAAM,IAAM,EAAA,KAAA,EAAU,GAAA,KAAA,CAAA;AAC9B,MAAA,MAAM,SAAY,GAAA,CAAC,EAAG,CAAA,CAAA,EAAG,CAAA,CAAA;AACzB,MAAI,IAAA,QAAA,CAAS,IAAI,CAAG;AACpB,QAAA,SAAoB,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,IAAQ,CAAA,CAAA,CAAA;AAC5B,MAAA,IAAI;AACJ,QAAO,SAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,MAAA,CAAA,CAAA,CAAA;AAAA,MACR,IAAA,KAAA;AAED,QAAM,SAAA,CAAA,IAAY,WAAe,CAAA,CAAA,CAAA;AAC/B,MAAM,OAAA,SAAW,CAAA;AACjB,KAAA,CAAA,CAAA;AACoB,IACd,MAAA,SAAc,GAAA,QAAS,CAAA,MAAA;AAAA,MACzB,MACA,EAAA,IAAA,EAAA,GAAA,KAAA,CAAA;AAAA,MACL,OAAA,QAAA,CAAA,IAAA,CAAA,GAAA,EAAA,CAAA,WAAA,CAAA;AAED,QAAM,IAAA,EAAA,OAAW,UAA+B,EAAA;AAAA,iBACnC,CAAM;AAAA,KACjB,CAAA,CAAA;AAGF,IAAA,MAAA,QAAA,GAAA,QAAA,CAAA,OAAA;AAAA,MACE,SAAY,EAAA,KAAA,CAAA,GAAA;AAAA,KACZ,CAAA,CAAA,CAAA;AAA4B,IAC9B,KAAA,CAAA,MAAA,KAAA,CAAA,GAAA,EAAA,MAAA,YAAA,CAAA,KAAA,GAAA,KAAA,CAAA,CAAA;AAEA,IAAA,SAAS,YAAY,CAAU,EAAA;AAC7B,MAAA,YAAA,CAAa,KAAQ,GAAA,IAAA,CAAA;AACrB,MAAA,IAAA,CAAK,SAAS,CAAC,CAAA,CAAA;AAAA,KACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/avatar/src/avatar2.mjs

@@ -1,71 +1,37 @@
-import { defineComponent, ref, computed, watch, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle, createBlock, withCtx, resolveDynamicComponent, renderSlot } from 'vue';
-import { ElIcon } from '../../icon/index.mjs';
-import { avatarProps, avatarEmits } from './avatar.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
-import { isString } from '@vue/shared';
+import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import { componentSizes } from '../../../constants/size.mjs';
 import { isNumber } from '../../../utils/types.mjs';
-import { addUnit } from '../../../utils/dom/style.mjs';
+import { iconPropType } from '../../../utils/vue/icon.mjs';
 
-const __default__ = defineComponent({
-  name: "ElAvatar"
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: avatarProps,
-  emits: avatarEmits,
-  setup(__props, { emit }) {
-    const props = __props;
-    const ns = useNamespace("avatar");
-    const hasLoadError = ref(false);
-    const avatarClass = computed(() => {
-      const { size, icon, shape } = props;
-      const classList = [ns.b()];
-      if (isString(size))
-        classList.push(ns.m(size));
-      if (icon)
-        classList.push(ns.m("icon"));
-      if (shape)
-        classList.push(ns.m(shape));
-      return classList;
-    });
-    const sizeStyle = computed(() => {
-      const { size } = props;
-      return isNumber(size) ? ns.cssVarBlock({
-        size: addUnit(size) || ""
-      }) : void 0;
-    });
-    const fitStyle = computed(() => ({
-      objectFit: props.fit
-    }));
-    watch(() => props.src, () => hasLoadError.value = false);
-    function handleError(e) {
-      hasLoadError.value = true;
-      emit("error", e);
-    }
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("span", {
-        class: normalizeClass(unref(avatarClass)),
-        style: normalizeStyle(unref(sizeStyle))
-      }, [
-        (_ctx.src || _ctx.srcSet) && !hasLoadError.value ? (openBlock(), createElementBlock("img", {
-          key: 0,
-          src: _ctx.src,
-          alt: _ctx.alt,
-          srcset: _ctx.srcSet,
-          style: normalizeStyle(unref(fitStyle)),
-          onError: handleError
-        }, null, 44, ["src", "alt", "srcset"])) : _ctx.icon ? (openBlock(), createBlock(unref(ElIcon), { key: 1 }, {
-          default: withCtx(() => [
-            (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon)))
-          ]),
-          _: 1
-        })) : renderSlot(_ctx.$slots, "default", { key: 2 })
-      ], 6);
-    };
+const avatarProps = buildProps({
+  size: {
+    type: [Number, String],
+    values: componentSizes,
+    default: "",
+    validator: (val) => isNumber(val)
+  },
+  shape: {
+    type: String,
+    values: ["circle", "square"],
+    default: "circle"
+  },
+  icon: {
+    type: iconPropType
+  },
+  src: {
+    type: String,
+    default: ""
+  },
+  alt: String,
+  srcSet: String,
+  fit: {
+    type: definePropType(String),
+    default: "cover"
   }
 });
-var Avatar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "avatar.vue"]]);
+const avatarEmits = {
+  error: (evt) => evt instanceof Event
+};
 
-export { Avatar as default };
+export { avatarEmits, avatarProps };
 //# sourceMappingURL=avatar2.mjs.map

package/es/components/avatar/src/avatar2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"avatar2.mjs","sources":["../../../../../../packages/components/avatar/src/avatar.vue"],"sourcesContent":["<template>\n  <span :class=\"avatarClass\" :style=\"sizeStyle\">\n    <img\n      v-if=\"(src || srcSet) && !hasLoadError\"\n      :src=\"src\"\n      :alt=\"alt\"\n      :srcset=\"srcSet\"\n      :style=\"fitStyle\"\n      @error=\"handleError\"\n    />\n    <el-icon v-else-if=\"icon\">\n      <component :is=\"icon\" />\n    </el-icon>\n    <slot v-else />\n  </span>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref, watch } from 'vue'\nimport { ElIcon } from '@element-plus/components/icon'\nimport { useNamespace } from '@element-plus/hooks'\nimport { addUnit, isNumber, isString } from '@element-plus/utils'\nimport { avatarEmits, avatarProps } from './avatar'\n\nimport type { CSSProperties } from 'vue'\n\ndefineOptions({\n  name: 'ElAvatar',\n})\n\nconst props = defineProps(avatarProps)\nconst emit = defineEmits(avatarEmits)\n\nconst ns = useNamespace('avatar')\n\nconst hasLoadError = ref(false)\n\nconst avatarClass = computed(() => {\n  const { size, icon, shape } = props\n  const classList = [ns.b()]\n  if (isString(size)) classList.push(ns.m(size))\n  if (icon) classList.push(ns.m('icon'))\n  if (shape) classList.push(ns.m(shape))\n  return classList\n})\n\nconst sizeStyle = computed(() => {\n  const { size } = props\n  return isNumber(size)\n    ? (ns.cssVarBlock({\n        size: addUnit(size) || '',\n      }) as CSSProperties)\n    : undefined\n})\n\nconst fitStyle = computed<CSSProperties>(() => ({\n  objectFit: props.fit,\n}))\n\n// need reset hasLoadError to false if src changed\nwatch(\n  () => props.src,\n  () => (hasLoadError.value = false)\n)\n\nfunction handleError(e: Event) {\n  hasLoadError.value = true\n  emit('error', e)\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;;mCA0Bc,CAAA;AAAA,EACZ,IAAM,EAAA,UAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAKA,IAAM,MAAA,EAAA,GAAK,aAAa,QAAQ,CAAA,CAAA;AAEhC,IAAM,MAAA,YAAA,GAAe,IAAI,KAAK,CAAA,CAAA;AAE9B,IAAM,MAAA,WAAA,GAAc,SAAS,MAAM;AACjC,MAAA,MAAM,EAAE,IAAA,EAAM,IAAM,EAAA,KAAA,EAAU,GAAA,KAAA,CAAA;AAC9B,MAAA,MAAM,SAAY,GAAA,CAAC,EAAG,CAAA,CAAA,EAAG,CAAA,CAAA;AACzB,MAAI,IAAA,QAAA,CAAS,IAAI,CAAG;AACpB,QAAA,SAAoB,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,IAAQ,CAAA,CAAA,CAAA;AAC5B,MAAA,IAAI;AACJ,QAAO,SAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA,CAAA,MAAA,CAAA,CAAA,CAAA;AAAA,MACR,IAAA,KAAA;AAED,QAAM,SAAA,CAAA,IAAY,WAAe,CAAA,CAAA,CAAA;AAC/B,MAAM,OAAA,SAAW,CAAA;AACjB,KAAA,CAAA,CAAA;AACoB,IACd,MAAA,SAAc,GAAA,QAAS,CAAA,MAAA;AAAA,MACzB,MACA,EAAA,IAAA,EAAA,GAAA,KAAA,CAAA;AAAA,MACL,OAAA,QAAA,CAAA,IAAA,CAAA,GAAA,EAAA,CAAA,WAAA,CAAA;AAED,QAAM,IAAA,EAAA,OAAW,UAA+B,EAAA;AAAA,iBACnC,CAAM;AAAA,KACjB,CAAA,CAAA;AAGF,IAAA,MAAA,QAAA,GAAA,QAAA,CAAA,OAAA;AAAA,MACE,SAAY,EAAA,KAAA,CAAA,GAAA;AAAA,KACZ,CAAA,CAAA,CAAA;AAA4B,IAC9B,KAAA,CAAA,MAAA,KAAA,CAAA,GAAA,EAAA,MAAA,YAAA,CAAA,KAAA,GAAA,KAAA,CAAA,CAAA;AAEA,IAAA,SAAS,YAAY,CAAU,EAAA;AAC7B,MAAA,YAAA,CAAa,KAAQ,GAAA,IAAA,CAAA;AACrB,MAAA,IAAA,CAAK,SAAS,CAAC,CAAA,CAAA;AAAA,KACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"avatar2.mjs","sources":["../../../../../../packages/components/avatar/src/avatar.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  iconPropType,\n  isNumber,\n} from '@element-plus/utils'\nimport { componentSizes } from '@element-plus/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type { ObjectFitProperty } from 'csstype'\n\nexport const avatarProps = buildProps({\n  /**\n   * @description avatar size.\n   */\n  size: {\n    type: [Number, String],\n    values: componentSizes,\n    default: '',\n    validator: (val: unknown): val is number => isNumber(val),\n  },\n  /**\n   * @description avatar shape.\n   */\n  shape: {\n    type: String,\n    values: ['circle', 'square'],\n    default: 'circle',\n  },\n  /**\n   * @description representation type to icon, more info on icon component.\n   */\n  icon: {\n    type: iconPropType,\n  },\n  /**\n   * @description the source of the image for an image avatar.\n   */\n  src: {\n    type: String,\n    default: '',\n  },\n  /**\n   * @description native attribute `alt` of image avatar.\n   */\n  alt: String,\n  /**\n   * @description native attribute srcset of image avatar.\n   */\n  srcSet: String,\n  /**\n   * @description set how the image fit its container for an image avatar.\n   */\n  fit: {\n    type: definePropType<ObjectFitProperty>(String),\n    default: 'cover',\n  },\n} as const)\nexport type AvatarProps = ExtractPropTypes<typeof avatarProps>\n\nexport const avatarEmits = {\n  error: (evt: Event) => evt instanceof Event,\n}\nexport type AvatarEmits = typeof avatarEmits\n"],"names":[],"mappings":";;;;;AAOY,MAAC,WAAW,GAAG,UAAU,CAAC;AACtC,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,MAAM,EAAE,cAAc;AAC1B,IAAI,OAAO,EAAE,EAAE;AACf,IAAI,SAAS,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC;AACrC,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;AAChC,IAAI,OAAO,EAAE,QAAQ;AACrB,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,EAAE;AACf,GAAG;AACH,EAAE,GAAG,EAAE,MAAM;AACb,EAAE,MAAM,EAAE,MAAM;AAChB,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,IAAI,OAAO,EAAE,OAAO;AACpB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,WAAW,GAAG;AAC3B,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,GAAG,YAAY,KAAK;AACtC;;;;"}

package/es/components/button/index.mjs

@@ -1,5 +1,5 @@
 import Button from './src/button2.mjs';
-import ButtonGroup from './src/button-group2.mjs';
+import ButtonGroup from './src/button-group.mjs';
 export { buttonEmits, buttonNativeTypes, buttonProps, buttonTypes } from './src/button.mjs';
 export { buttonGroupContextKey } from './src/constants.mjs';
 import { withInstall, withNoopInstall } from '../../utils/vue/install.mjs';

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

@@ -1,9 +1,32 @@
-import { buttonProps } from './button.mjs';
+import { defineComponent, provide, reactive, toRef, openBlock, createElementBlock, normalizeClass, unref, renderSlot } from 'vue';
+import { buttonGroupProps } from './button-group2.mjs';
+import { buttonGroupContextKey } from './constants.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
 
-const buttonGroupProps = {
-  size: buttonProps.size,
-  type: buttonProps.type
-};
+const __default__ = defineComponent({
+  name: "ElButtonGroup"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: buttonGroupProps,
+  setup(__props) {
+    const props = __props;
+    provide(buttonGroupContextKey, reactive({
+      size: toRef(props, "size"),
+      type: toRef(props, "type")
+    }));
+    const ns = useNamespace("button");
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(unref(ns).b("group"))
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 2);
+    };
+  }
+});
+var ButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "button-group.vue"]]);
 
-export { buttonGroupProps };
+export { ButtonGroup as default };
 //# sourceMappingURL=button-group.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"button-group.mjs","sources":["../../../../../../packages/components/button/src/button-group.ts"],"sourcesContent":["import { buttonProps } from './button'\n\nimport type { ExtractPropTypes } from 'vue'\n\nexport const buttonGroupProps = {\n  /**\n   * @description control the size of buttons in this button-group\n   */\n  size: buttonProps.size,\n  /**\n   * @description control the type of buttons in this button-group\n   */\n  type: buttonProps.type,\n} as const\nexport type ButtonGroupProps = ExtractPropTypes<typeof buttonGroupProps>\n"],"names":[],"mappings":";;AACY,MAAC,gBAAgB,GAAG;AAChC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI;AACxB,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI;AACxB;;;;"}
+{"version":3,"file":"button-group.mjs","sources":["../../../../../../packages/components/button/src/button-group.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b('group')\">\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { provide, reactive, toRef } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { buttonGroupProps } from './button-group'\nimport { buttonGroupContextKey } from './constants'\n\ndefineOptions({\n  name: 'ElButtonGroup',\n})\nconst props = defineProps(buttonGroupProps)\nprovide(\n  buttonGroupContextKey,\n  reactive({\n    size: toRef(props, 'size'),\n    type: toRef(props, 'type'),\n  })\n)\nconst ns = useNamespace('button')\n</script>\n"],"names":["_openBlock","_createElementBlock","_normalizeClass","_unref"],"mappings":";;;;;;mCAYc,CAAA;AAAA,EACZ,IAAM,EAAA,eAAA;AACR,CAAA,CAAA,CAAA;;;;;;AAEA,IAAA,OAAA,CAAA,qBAAA,EAAA,QAAA,CAAA;AAAA,MACE,IAAA,EAAA,KAAA,CAAA,KAAA,EAAA,MAAA,CAAA;AAAA,MACA,IAAS,EAAA,KAAA,CAAA,KAAA,EAAA,MAAA,CAAA;AAAA,KACP,CAAA,CAAA,CAAA;AAAyB,IACzB,MAAA,EAAA,GAAY,YAAO,CAAM,QAAA,CAAA,CAAA;AAAA,IAAA,OAC1B,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MACH,OAAAA,SAAA,EAAA,EAAAC,kBAAA,CAAA,KAAA,EAAA;AACA,QAAM,KAAA,EAAKC,cAAqB,CAAAC,KAAA,CAAA,EAAA,CAAA,CAAA,CAAA,CAAA,OAAA,CAAA,CAAA;;;;;;;;;;;"}

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

@@ -1,32 +1,9 @@
-import { defineComponent, provide, reactive, toRef, openBlock, createElementBlock, normalizeClass, unref, renderSlot } from 'vue';
-import { buttonGroupProps } from './button-group.mjs';
-import { buttonGroupContextKey } from './constants.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { buttonProps } from './button.mjs';
 
-const __default__ = defineComponent({
-  name: "ElButtonGroup"
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: buttonGroupProps,
-  setup(__props) {
-    const props = __props;
-    provide(buttonGroupContextKey, reactive({
-      size: toRef(props, "size"),
-      type: toRef(props, "type")
-    }));
-    const ns = useNamespace("button");
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        class: normalizeClass(unref(ns).b("group"))
-      }, [
-        renderSlot(_ctx.$slots, "default")
-      ], 2);
-    };
-  }
-});
-var ButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "button-group.vue"]]);
+const buttonGroupProps = {
+  size: buttonProps.size,
+  type: buttonProps.type
+};
 
-export { ButtonGroup as default };
+export { buttonGroupProps };
 //# sourceMappingURL=button-group2.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"button-group2.mjs","sources":["../../../../../../packages/components/button/src/button-group.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b('group')\">\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { provide, reactive, toRef } from 'vue'\nimport { useNamespace } from '@element-plus/hooks'\nimport { buttonGroupProps } from './button-group'\nimport { buttonGroupContextKey } from './constants'\n\ndefineOptions({\n  name: 'ElButtonGroup',\n})\nconst props = defineProps(buttonGroupProps)\nprovide(\n  buttonGroupContextKey,\n  reactive({\n    size: toRef(props, 'size'),\n    type: toRef(props, 'type'),\n  })\n)\nconst ns = useNamespace('button')\n</script>\n"],"names":["_openBlock","_createElementBlock","_normalizeClass","_unref"],"mappings":";;;;;;mCAYc,CAAA;AAAA,EACZ,IAAM,EAAA,eAAA;AACR,CAAA,CAAA,CAAA;;;;;;AAEA,IAAA,OAAA,CAAA,qBAAA,EAAA,QAAA,CAAA;AAAA,MACE,IAAA,EAAA,KAAA,CAAA,KAAA,EAAA,MAAA,CAAA;AAAA,MACA,IAAS,EAAA,KAAA,CAAA,KAAA,EAAA,MAAA,CAAA;AAAA,KACP,CAAA,CAAA,CAAA;AAAyB,IACzB,MAAA,EAAA,GAAY,YAAO,CAAM,QAAA,CAAA,CAAA;AAAA,IAAA,OAC1B,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MACH,OAAAA,SAAA,EAAA,EAAAC,kBAAA,CAAA,KAAA,EAAA;AACA,QAAM,KAAA,EAAKC,cAAqB,CAAAC,KAAA,CAAA,EAAA,CAAA,CAAA,CAAA,CAAA,OAAA,CAAA,CAAA;;;;;;;;;;;"}
+{"version":3,"file":"button-group2.mjs","sources":["../../../../../../packages/components/button/src/button-group.ts"],"sourcesContent":["import { buttonProps } from './button'\n\nimport type { ExtractPropTypes } from 'vue'\n\nexport const buttonGroupProps = {\n  /**\n   * @description control the size of buttons in this button-group\n   */\n  size: buttonProps.size,\n  /**\n   * @description control the type of buttons in this button-group\n   */\n  type: buttonProps.type,\n} as const\nexport type ButtonGroupProps = ExtractPropTypes<typeof buttonGroupProps>\n"],"names":[],"mappings":";;AACY,MAAC,gBAAgB,GAAG;AAChC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI;AACxB,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI;AACxB;;;;"}

package/es/components/calendar/index.mjs

@@ -1,5 +1,5 @@
-import Calendar from './src/calendar2.mjs';
-export { calendarEmits, calendarProps } from './src/calendar.mjs';
+import Calendar from './src/calendar.mjs';
+export { calendarEmits, calendarProps } from './src/calendar2.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';
 
 const ElCalendar = withInstall(Calendar);

package/es/components/calendar/src/calendar.mjs

@@ -1,21 +1,139 @@
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { isArray, isDate } from '@vue/shared';
-import { UPDATE_MODEL_EVENT, INPUT_EVENT } from '../../../constants/event.mjs';
+import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, renderSlot, toDisplayString, createVNode, withCtx, createTextVNode, createCommentVNode, createSlots, normalizeProps, guardReactiveProps, Fragment, renderList, createBlock } from 'vue';
+import { ElButtonGroup, ElButton } from '../../button/index.mjs';
+import DateTable from './date-table2.mjs';
+import { useCalendar } from './use-calendar.mjs';
+import { calendarProps, calendarEmits } from './calendar2.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { useLocale } from '../../../hooks/use-locale/index.mjs';
 
-const isValidRange = (range) => isArray(range) && range.length === 2 && range.every((item) => isDate(item));
-const calendarProps = buildProps({
-  modelValue: {
-    type: Date
-  },
-  range: {
-    type: definePropType(Array),
-    validator: isValidRange
+const COMPONENT_NAME = "ElCalendar";
+const __default__ = defineComponent({
+  name: COMPONENT_NAME
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: calendarProps,
+  emits: calendarEmits,
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const ns = useNamespace("calendar");
+    const {
+      calculateValidatedDateRange,
+      date,
+      pickDay,
+      realSelectedDay,
+      selectDate,
+      validatedRange
+    } = useCalendar(props, emit, COMPONENT_NAME);
+    const { t } = useLocale();
+    const i18nDate = computed(() => {
+      const pickedMonth = `el.datepicker.month${date.value.format("M")}`;
+      return `${date.value.year()} ${t("el.datepicker.year")} ${t(pickedMonth)}`;
+    });
+    expose({
+      selectedDay: realSelectedDay,
+      pickDay,
+      selectDate,
+      calculateValidatedDateRange
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(unref(ns).b())
+      }, [
+        createElementVNode("div", {
+          class: normalizeClass(unref(ns).e("header"))
+        }, [
+          renderSlot(_ctx.$slots, "header", { date: unref(i18nDate) }, () => [
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("title"))
+            }, toDisplayString(unref(i18nDate)), 3),
+            unref(validatedRange).length === 0 ? (openBlock(), createElementBlock("div", {
+              key: 0,
+              class: normalizeClass(unref(ns).e("button-group"))
+            }, [
+              createVNode(unref(ElButtonGroup), null, {
+                default: withCtx(() => [
+                  createVNode(unref(ElButton), {
+                    size: "small",
+                    onClick: ($event) => unref(selectDate)("prev-month")
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(toDisplayString(unref(t)("el.datepicker.prevMonth")), 1)
+                    ]),
+                    _: 1
+                  }, 8, ["onClick"]),
+                  createVNode(unref(ElButton), {
+                    size: "small",
+                    onClick: ($event) => unref(selectDate)("today")
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(toDisplayString(unref(t)("el.datepicker.today")), 1)
+                    ]),
+                    _: 1
+                  }, 8, ["onClick"]),
+                  createVNode(unref(ElButton), {
+                    size: "small",
+                    onClick: ($event) => unref(selectDate)("next-month")
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(toDisplayString(unref(t)("el.datepicker.nextMonth")), 1)
+                    ]),
+                    _: 1
+                  }, 8, ["onClick"])
+                ]),
+                _: 1
+              })
+            ], 2)) : createCommentVNode("v-if", true)
+          ])
+        ], 2),
+        unref(validatedRange).length === 0 ? (openBlock(), createElementBlock("div", {
+          key: 0,
+          class: normalizeClass(unref(ns).e("body"))
+        }, [
+          createVNode(DateTable, {
+            date: unref(date),
+            "selected-day": unref(realSelectedDay),
+            onPick: unref(pickDay)
+          }, createSlots({
+            _: 2
+          }, [
+            _ctx.$slots["date-cell"] ? {
+              name: "date-cell",
+              fn: withCtx((data) => [
+                renderSlot(_ctx.$slots, "date-cell", normalizeProps(guardReactiveProps(data)))
+              ])
+            } : void 0
+          ]), 1032, ["date", "selected-day", "onPick"])
+        ], 2)) : (openBlock(), createElementBlock("div", {
+          key: 1,
+          class: normalizeClass(unref(ns).e("body"))
+        }, [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(validatedRange), (range_, index) => {
+            return openBlock(), createBlock(DateTable, {
+              key: index,
+              date: range_[0],
+              "selected-day": unref(realSelectedDay),
+              range: range_,
+              "hide-header": index !== 0,
+              onPick: unref(pickDay)
+            }, createSlots({
+              _: 2
+            }, [
+              _ctx.$slots["date-cell"] ? {
+                name: "date-cell",
+                fn: withCtx((data) => [
+                  renderSlot(_ctx.$slots, "date-cell", normalizeProps(guardReactiveProps(data)))
+                ])
+              } : void 0
+            ]), 1032, ["date", "selected-day", "range", "hide-header", "onPick"]);
+          }), 128))
+        ], 2))
+      ], 2);
+    };
   }
 });
-const calendarEmits = {
-  [UPDATE_MODEL_EVENT]: (value) => isDate(value),
-  [INPUT_EVENT]: (value) => isDate(value)
-};
+var Calendar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "calendar.vue"]]);
 
-export { calendarEmits, calendarProps };
+export { Calendar as default };
 //# sourceMappingURL=calendar.mjs.map

package/es/components/calendar/src/calendar.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"calendar.mjs","sources":["../../../../../../packages/components/calendar/src/calendar.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  isArray,\n  isDate,\n} from '@element-plus/utils'\nimport { INPUT_EVENT, UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport type { ExtractPropTypes } from 'vue'\n\nexport type CalendarDateType =\n  | 'prev-month'\n  | 'next-month'\n  | 'prev-year'\n  | 'next-year'\n  | 'today'\n\nconst isValidRange = (range: unknown): range is [Date, Date] =>\n  isArray(range) && range.length === 2 && range.every((item) => isDate(item))\n\nexport const calendarProps = buildProps({\n  /**\n   * @description binding value\n   */\n  modelValue: {\n    type: Date,\n  },\n  /**\n   * @description time range, including start time and end time.\n   *   Start time must be start day of week, end time must be end day of week, the time span cannot exceed two months.\n   */\n  range: {\n    type: definePropType<[Date, Date]>(Array),\n    validator: isValidRange,\n  },\n} as const)\nexport type CalendarProps = ExtractPropTypes<typeof calendarProps>\n\nexport const calendarEmits = {\n  [UPDATE_MODEL_EVENT]: (value: Date) => isDate(value),\n  [INPUT_EVENT]: (value: Date) => isDate(value),\n}\nexport type CalendarEmits = typeof calendarEmits\n"],"names":[],"mappings":";;;;AAOA,MAAM,YAAY,GAAG,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAChG,MAAC,aAAa,GAAG,UAAU,CAAC;AACxC,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,IAAI;AACd,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,SAAS,EAAE,YAAY;AAC3B,GAAG;AACH,CAAC,EAAE;AACS,MAAC,aAAa,GAAG;AAC7B,EAAE,CAAC,kBAAkB,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC;AAChD,EAAE,CAAC,WAAW,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC;AACzC;;;;"}
+{"version":3,"file":"calendar.mjs","sources":["../../../../../../packages/components/calendar/src/calendar.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b()\">\n    <div :class=\"ns.e('header')\">\n      <slot name=\"header\" :date=\"i18nDate\">\n        <div :class=\"ns.e('title')\">{{ i18nDate }}</div>\n        <div v-if=\"validatedRange.length === 0\" :class=\"ns.e('button-group')\">\n          <el-button-group>\n            <el-button size=\"small\" @click=\"selectDate('prev-month')\">\n              {{ t('el.datepicker.prevMonth') }}\n            </el-button>\n            <el-button size=\"small\" @click=\"selectDate('today')\">\n              {{ t('el.datepicker.today') }}\n            </el-button>\n            <el-button size=\"small\" @click=\"selectDate('next-month')\">\n              {{ t('el.datepicker.nextMonth') }}\n            </el-button>\n          </el-button-group>\n        </div>\n      </slot>\n    </div>\n    <div v-if=\"validatedRange.length === 0\" :class=\"ns.e('body')\">\n      <date-table :date=\"date\" :selected-day=\"realSelectedDay\" @pick=\"pickDay\">\n        <template v-if=\"$slots['date-cell']\" #date-cell=\"data\">\n          <slot name=\"date-cell\" v-bind=\"data\" />\n        </template>\n      </date-table>\n    </div>\n    <div v-else :class=\"ns.e('body')\">\n      <date-table\n        v-for=\"(range_, index) in validatedRange\"\n        :key=\"index\"\n        :date=\"range_[0]\"\n        :selected-day=\"realSelectedDay\"\n        :range=\"range_\"\n        :hide-header=\"index !== 0\"\n        @pick=\"pickDay\"\n      >\n        <template v-if=\"$slots['date-cell']\" #date-cell=\"data\">\n          <slot name=\"date-cell\" v-bind=\"data\" />\n        </template>\n      </date-table>\n    </div>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed } from 'vue'\nimport { ElButton, ElButtonGroup } from '@element-plus/components/button'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\n\nimport DateTable from './date-table.vue'\nimport { useCalendar } from './use-calendar'\nimport { calendarEmits, calendarProps } from './calendar'\n\nconst ns = useNamespace('calendar')\n\nconst COMPONENT_NAME = 'ElCalendar'\ndefineOptions({\n  name: COMPONENT_NAME,\n})\n\nconst props = defineProps(calendarProps)\nconst emit = defineEmits(calendarEmits)\n\nconst {\n  calculateValidatedDateRange,\n  date,\n  pickDay,\n  realSelectedDay,\n  selectDate,\n  validatedRange,\n} = useCalendar(props, emit, COMPONENT_NAME)\n\nconst { t } = useLocale()\n\nconst i18nDate = computed(() => {\n  const pickedMonth = `el.datepicker.month${date.value.format('M')}`\n  return `${date.value.year()} ${t('el.datepicker.year')} ${t(pickedMonth)}`\n})\n\ndefineExpose({\n  /** @description currently selected date */\n  selectedDay: realSelectedDay,\n  /** @description select a specific date */\n  pickDay,\n  /** @description select date */\n  selectDate,\n  /** @description Calculate the validate date range according to the start and end dates */\n  calculateValidatedDateRange,\n})\n</script>\n"],"names":["_openBlock","_createElementBlock","_normalizeClass","_unref"],"mappings":";;;;;;;;;;mCAyDc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AACR;;;;;;;AALA,IAAM,MAAA,EAAA,GAAK,aAAa,UAAU,CAAA,CAAA;AAUlC,IAAM,MAAA;AAAA,MACJ,2BAAA;AAAA,MACA,IAAA;AAAA,MACA,OAAA;AAAA,MACA,eAAA;AAAA,MACA,UAAA;AAAA,MACA,cAAA;AAAA,KACE,GAAA,WAAA,CAAY,KAAO,EAAA,IAAA,EAAM,cAAc,CAAA,CAAA;AAE3C,IAAM,MAAA,EAAE,CAAE,EAAA,GAAI,SAAU,EAAA,CAAA;AAExB,IAAM,MAAA,QAAA,GAAW,SAAS,MAAM;AAC9B,MAAA,MAAM,cAAc,CAAsB,mBAAA,EAAA,IAAA,CAAK,KAAM,CAAA,MAAA,CAAO,GAAG,CAAC,CAAA,CAAA,CAAA;AAChE,MAAA,OAAO,CAAG,EAAA,IAAA,CAAK,KAAM,CAAA,IAAA,EAAM,CAAA,CAAA,EAAI,CAAE,CAAA,oBAAoB,CAAC,CAAA,CAAA,EAAI,CAAE,CAAA,WAAW,CAAC,CAAA,CAAA,CAAA;AAAA,KACzE,CAAA,CAAA;AAED,IAAa,MAAA,CAAA;AAAA,MAAA,WAAA,EAAA,eAAA;AAAA,MAEX,OAAa;AAAA,MAAA,UAAA;AAAA,MAEb,2BAAA;AAAA,KAAA,CAAA,CAAA;AAAA,IAEA,OAAA,CAAA,IAAA,EAAA,MAAA,KAAA;AAAA,MAAA,OAAAA,SAAA,EAAA,EAAAC,kBAAA,CAAA,KAAA,EAAA;AAAA,QAEA,KAAA,EAAAC,cAAA,CAAAC,KAAA,CAAA,EAAA,CAAA,CAAA,CAAA,EAAA,CAAA;AAAA,OACD,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}