@element-plus/nightly 0.0.20241003 → 0.0.20241004

package/es/components/tour/src/tour2.mjs

@@ -1,164 +1,75 @@
-import { defineComponent, ref, computed, toRef, watch, useSlots, provide, openBlock, createElementBlock, Fragment, createVNode, unref, withCtx, createElementVNode, mergeProps, normalizeStyle, createBlock, renderSlot, createCommentVNode } from 'vue';
-import { useVModel } from '@vueuse/core';
-import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import { ElTeleport } from '../../teleport/index.mjs';
-import ElTourMask from './mask2.mjs';
-import ElTourContent from './content2.mjs';
-import ElTourSteps from './steps.mjs';
-import { tourProps, tourEmits } from './tour.mjs';
-import { useTarget, tourKey } from './helper.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
-import { isBoolean } from '../../../utils/types.mjs';
-import { useZIndex } from '../../../hooks/use-z-index/index.mjs';
+import '../../../constants/index.mjs';
+import { tourContentProps } from './content.mjs';
+import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import { iconPropType } from '../../../utils/vue/icon.mjs';
+import { UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
+import { isBoolean, isNumber } from '../../../utils/types.mjs';
 
-const __default__ = defineComponent({
-  name: "ElTour"
-});
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: tourProps,
-  emits: tourEmits,
-  setup(__props, { emit }) {
-    const props = __props;
-    const ns = useNamespace("tour");
-    const total = ref(0);
-    const currentStep = ref();
-    const current = useVModel(props, "current", emit, {
-      passive: true
-    });
-    const currentTarget = computed(() => {
-      var _a;
-      return (_a = currentStep.value) == null ? void 0 : _a.target;
-    });
-    const kls = computed(() => [
-      ns.b(),
-      mergedType.value === "primary" ? ns.m("primary") : ""
-    ]);
-    const mergedPlacement = computed(() => {
-      var _a;
-      return ((_a = currentStep.value) == null ? void 0 : _a.placement) || props.placement;
-    });
-    const mergedContentStyle = computed(() => {
-      var _a, _b;
-      return (_b = (_a = currentStep.value) == null ? void 0 : _a.contentStyle) != null ? _b : props.contentStyle;
-    });
-    const mergedMask = computed(() => {
-      var _a, _b;
-      return (_b = (_a = currentStep.value) == null ? void 0 : _a.mask) != null ? _b : props.mask;
-    });
-    const mergedShowMask = computed(() => !!mergedMask.value && props.modelValue);
-    const mergedMaskStyle = computed(() => isBoolean(mergedMask.value) ? void 0 : mergedMask.value);
-    const mergedShowArrow = computed(() => {
-      var _a, _b;
-      return !!currentTarget.value && ((_b = (_a = currentStep.value) == null ? void 0 : _a.showArrow) != null ? _b : props.showArrow);
-    });
-    const mergedScrollIntoViewOptions = computed(() => {
-      var _a, _b;
-      return (_b = (_a = currentStep.value) == null ? void 0 : _a.scrollIntoViewOptions) != null ? _b : props.scrollIntoViewOptions;
-    });
-    const mergedType = computed(() => {
-      var _a, _b;
-      return (_b = (_a = currentStep.value) == null ? void 0 : _a.type) != null ? _b : props.type;
-    });
-    const { nextZIndex } = useZIndex();
-    const nowZIndex = nextZIndex();
-    const mergedZIndex = computed(() => {
-      var _a;
-      return (_a = props.zIndex) != null ? _a : nowZIndex;
-    });
-    const { mergedPosInfo: pos, triggerTarget } = useTarget(currentTarget, toRef(props, "modelValue"), toRef(props, "gap"), mergedMask, mergedScrollIntoViewOptions);
-    watch(() => props.modelValue, (val) => {
-      if (!val) {
-        current.value = 0;
-      }
-    });
-    const onEscClose = () => {
-      if (props.closeOnPressEscape) {
-        emit("update:modelValue", false);
-        emit("close", current.value);
-      }
-    };
-    const onUpdateTotal = (val) => {
-      total.value = val;
-    };
-    const slots = useSlots();
-    provide(tourKey, {
-      currentStep,
-      current,
-      total,
-      showClose: toRef(props, "showClose"),
-      closeIcon: toRef(props, "closeIcon"),
-      mergedType,
-      ns,
-      slots,
-      updateModelValue(modelValue) {
-        emit("update:modelValue", modelValue);
-      },
-      onClose() {
-        emit("close", current.value);
-      },
-      onFinish() {
-        emit("finish");
-      },
-      onChange() {
-        emit("change", current.value);
-      }
-    });
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(Fragment, null, [
-        createVNode(unref(ElTeleport), { to: _ctx.appendTo }, {
-          default: withCtx(() => {
-            var _a, _b;
-            return [
-              createElementVNode("div", mergeProps({ class: unref(kls) }, _ctx.$attrs), [
-                createVNode(ElTourMask, {
-                  visible: unref(mergedShowMask),
-                  fill: (_a = unref(mergedMaskStyle)) == null ? void 0 : _a.color,
-                  style: normalizeStyle((_b = unref(mergedMaskStyle)) == null ? void 0 : _b.style),
-                  pos: unref(pos),
-                  "z-index": unref(mergedZIndex),
-                  "target-area-clickable": _ctx.targetAreaClickable
-                }, null, 8, ["visible", "fill", "style", "pos", "z-index", "target-area-clickable"]),
-                _ctx.modelValue ? (openBlock(), createBlock(ElTourContent, {
-                  key: unref(current),
-                  reference: unref(triggerTarget),
-                  placement: unref(mergedPlacement),
-                  "show-arrow": unref(mergedShowArrow),
-                  "z-index": unref(mergedZIndex),
-                  style: normalizeStyle(unref(mergedContentStyle)),
-                  onClose: onEscClose
-                }, {
-                  default: withCtx(() => [
-                    createVNode(unref(ElTourSteps), {
-                      current: unref(current),
-                      onUpdateTotal
-                    }, {
-                      default: withCtx(() => [
-                        renderSlot(_ctx.$slots, "default")
-                      ]),
-                      _: 3
-                    }, 8, ["current"])
-                  ]),
-                  _: 3
-                }, 8, ["reference", "placement", "show-arrow", "z-index", "style"])) : createCommentVNode("v-if", true)
-              ], 16)
-            ];
-          }),
-          _: 3
-        }, 8, ["to"]),
-        createCommentVNode(" just for IDE "),
-        false ? renderSlot(_ctx.$slots, "indicators", {
-          key: 0,
-          current: unref(current) + 1,
-          total: total.value
-        }) : createCommentVNode("v-if", true)
-      ], 64);
-    };
+const tourProps = buildProps({
+  modelValue: Boolean,
+  current: {
+    type: Number,
+    default: 0
+  },
+  showArrow: {
+    type: Boolean,
+    default: true
+  },
+  showClose: {
+    type: Boolean,
+    default: true
+  },
+  closeIcon: {
+    type: iconPropType
+  },
+  placement: tourContentProps.placement,
+  contentStyle: {
+    type: definePropType([Object])
+  },
+  mask: {
+    type: definePropType([Boolean, Object]),
+    default: true
+  },
+  gap: {
+    type: definePropType(Object),
+    default: () => ({
+      offset: 6,
+      radius: 2
+    })
+  },
+  zIndex: {
+    type: Number
+  },
+  scrollIntoViewOptions: {
+    type: definePropType([Boolean, Object]),
+    default: () => ({
+      block: "center"
+    })
+  },
+  type: {
+    type: definePropType(String)
+  },
+  appendTo: {
+    type: definePropType([String, Object]),
+    default: "body"
+  },
+  closeOnPressEscape: {
+    type: Boolean,
+    default: true
+  },
+  targetAreaClickable: {
+    type: Boolean,
+    default: true
   }
 });
-var Tour = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "tour.vue"]]);
+const tourEmits = {
+  [UPDATE_MODEL_EVENT]: (value) => isBoolean(value),
+  ["update:current"]: (current) => isNumber(current),
+  close: (current) => isNumber(current),
+  finish: () => true,
+  change: (current) => isNumber(current)
+};
 
-export { Tour as default };
+export { tourEmits, tourProps };
 //# sourceMappingURL=tour2.mjs.map

package/es/components/tour/src/tour2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tour2.mjs","sources":["../../../../../../packages/components/tour/src/tour.vue"],"sourcesContent":["<template>\n  <el-teleport :to=\"appendTo\">\n    <div :class=\"kls\" v-bind=\"$attrs\">\n      <el-tour-mask\n        :visible=\"mergedShowMask\"\n        :fill=\"mergedMaskStyle?.color\"\n        :style=\"mergedMaskStyle?.style\"\n        :pos=\"pos\"\n        :z-index=\"mergedZIndex\"\n        :target-area-clickable=\"targetAreaClickable\"\n      />\n      <el-tour-content\n        v-if=\"modelValue\"\n        :key=\"current\"\n        :reference=\"triggerTarget\"\n        :placement=\"mergedPlacement\"\n        :show-arrow=\"mergedShowArrow\"\n        :z-index=\"mergedZIndex\"\n        :style=\"mergedContentStyle\"\n        @close=\"onEscClose\"\n      >\n        <el-tour-steps :current=\"current\" @update-total=\"onUpdateTotal\">\n          <slot />\n        </el-tour-steps>\n      </el-tour-content>\n    </div>\n  </el-teleport>\n  <!-- just for IDE -->\n  <slot v-if=\"false\" name=\"indicators\" :current=\"current + 1\" :total=\"total\" />\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, provide, ref, toRef, useSlots, watch } from 'vue'\nimport { useVModel } from '@vueuse/core'\nimport { useNamespace, useZIndex } from '@element-plus/hooks'\nimport { isBoolean } from '@element-plus/utils'\nimport ElTeleport from '@element-plus/components/teleport'\nimport ElTourMask from './mask.vue'\nimport ElTourContent from './content.vue'\nimport ElTourSteps from './steps'\nimport { tourEmits, tourProps } from './tour'\nimport { tourKey, useTarget } from './helper'\nimport type { TourStepProps } from './step'\n\ndefineOptions({\n  name: 'ElTour',\n})\n\nconst props = defineProps(tourProps)\nconst emit = defineEmits(tourEmits)\n\nconst ns = useNamespace('tour')\nconst total = ref(0)\nconst currentStep = ref<TourStepProps>()\n\nconst current = useVModel(props, 'current', emit, {\n  passive: true,\n})\n\nconst currentTarget = computed(() => currentStep.value?.target)\n\nconst kls = computed(() => [\n  ns.b(),\n  mergedType.value === 'primary' ? ns.m('primary') : '',\n])\n\nconst mergedPlacement = computed(\n  () => currentStep.value?.placement || props.placement\n)\n\nconst mergedContentStyle = computed(\n  () => currentStep.value?.contentStyle ?? props.contentStyle\n)\n\nconst mergedMask = computed(() => currentStep.value?.mask ?? props.mask)\nconst mergedShowMask = computed(() => !!mergedMask.value && props.modelValue)\nconst mergedMaskStyle = computed(() =>\n  isBoolean(mergedMask.value) ? undefined : mergedMask.value\n)\n\nconst mergedShowArrow = computed(\n  () =>\n    !!currentTarget.value && (currentStep.value?.showArrow ?? props.showArrow)\n)\n\nconst mergedScrollIntoViewOptions = computed(\n  () => currentStep.value?.scrollIntoViewOptions ?? props.scrollIntoViewOptions\n)\nconst mergedType = computed(() => currentStep.value?.type ?? props.type)\n\nconst { nextZIndex } = useZIndex()\nconst nowZIndex = nextZIndex()\nconst mergedZIndex = computed(() => props.zIndex ?? nowZIndex)\n\nconst { mergedPosInfo: pos, triggerTarget } = useTarget(\n  currentTarget,\n  toRef(props, 'modelValue'),\n  toRef(props, 'gap'),\n  mergedMask,\n  mergedScrollIntoViewOptions\n)\n\nwatch(\n  () => props.modelValue,\n  (val) => {\n    if (!val) {\n      current.value = 0\n    }\n  }\n)\n\nconst onEscClose = () => {\n  if (props.closeOnPressEscape) {\n    emit('update:modelValue', false)\n    emit('close', current.value)\n  }\n}\n\nconst onUpdateTotal = (val: number) => {\n  total.value = val\n}\n\nconst slots = useSlots()\n\nprovide(tourKey, {\n  currentStep,\n  current,\n  total,\n  showClose: toRef(props, 'showClose'),\n  closeIcon: toRef(props, 'closeIcon') as any,\n  mergedType: mergedType as any,\n  ns,\n  slots,\n  updateModelValue(modelValue) {\n    emit('update:modelValue', modelValue)\n  },\n  onClose() {\n    emit('close', current.value)\n  },\n  onFinish() {\n    emit('finish')\n  },\n  onChange() {\n    emit('change', current.value)\n  },\n})\n</script>\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"tour2.mjs","sources":["../../../../../../packages/components/tour/src/tour.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  iconPropType,\n  isBoolean,\n  isNumber,\n} from '@element-plus/utils'\nimport { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { tourContentProps } from './content'\nimport type { CSSProperties, ExtractPropTypes } from 'vue'\nimport type Tour from './tour.vue'\nimport type { TourGap, TourMask } from './types'\n\nexport const tourProps = buildProps({\n  /**\n   * @description open tour\n   */\n  modelValue: Boolean,\n  /**\n   * @description what is the current step\n   */\n  current: {\n    type: Number,\n    default: 0,\n  },\n  /**\n   * @description whether to show the arrow\n   */\n  showArrow: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description whether to show a close button\n   */\n  showClose: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description custom close icon\n   */\n  closeIcon: {\n    type: iconPropType,\n  },\n  /**\n   * @description position of the guide card relative to the target element\n   */\n  placement: tourContentProps.placement,\n  /**\n   * @description custom style for content\n   */\n  contentStyle: {\n    type: definePropType<CSSProperties>([Object]),\n  },\n  /**\n   * @description whether to enable masking, change mask style and fill color by pass custom props\n   */\n  mask: {\n    type: definePropType<TourMask>([Boolean, Object]),\n    default: true,\n  },\n  /**\n   * @description transparent gap between mask and target\n   */\n  gap: {\n    type: definePropType<TourGap>(Object),\n    default: () => ({\n      offset: 6,\n      radius: 2,\n    }),\n  },\n  /**\n   * @description tour's zIndex\n   */\n  zIndex: {\n    type: Number,\n  },\n  /**\n   * @description support pass custom scrollIntoView options\n   */\n  scrollIntoViewOptions: {\n    type: definePropType<boolean | ScrollIntoViewOptions>([Boolean, Object]),\n    default: () => ({\n      block: 'center',\n    }),\n  },\n  /**\n   * @description type, affects the background color and text color\n   */\n  type: {\n    type: definePropType<'default' | 'primary'>(String),\n  },\n  /**\n   * @description which element the TourContent appends to\n   */\n  appendTo: {\n    type: definePropType<string | HTMLElement>([String, Object]),\n    default: 'body',\n  },\n  /**\n   * @description whether the Tour can be closed by pressing ESC\n   */\n  closeOnPressEscape: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description whether the target element can be clickable, when using mask\n   */\n  targetAreaClickable: {\n    type: Boolean,\n    default: true,\n  },\n})\n\nexport type TourProps = ExtractPropTypes<typeof tourProps>\nexport type TourInstance = InstanceType<typeof Tour>\n\nexport const tourEmits = {\n  [UPDATE_MODEL_EVENT]: (value: boolean) => isBoolean(value),\n  ['update:current']: (current: number) => isNumber(current),\n  close: (current: number) => isNumber(current),\n  finish: () => true,\n  change: (current: number) => isNumber(current),\n}\nexport type TourEmits = typeof tourEmits\n"],"names":[],"mappings":";;;;;;;;AASY,MAAC,SAAS,GAAG,UAAU,CAAC;AACpC,EAAE,UAAU,EAAE,OAAO;AACrB,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,YAAY;AACtB,GAAG;AACH,EAAE,SAAS,EAAE,gBAAgB,CAAC,SAAS;AACvC,EAAE,YAAY,EAAE;AAChB,IAAI,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAClC,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,cAAc,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC3C,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,IAAI,OAAO,EAAE,OAAO;AACpB,MAAM,MAAM,EAAE,CAAC;AACf,MAAM,MAAM,EAAE,CAAC;AACf,KAAK,CAAC;AACN,GAAG;AACH,EAAE,MAAM,EAAE;AACV,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,qBAAqB,EAAE;AACzB,IAAI,IAAI,EAAE,cAAc,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC3C,IAAI,OAAO,EAAE,OAAO;AACpB,MAAM,KAAK,EAAE,QAAQ;AACrB,KAAK,CAAC;AACN,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1C,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,kBAAkB,EAAE;AACtB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,mBAAmB,EAAE;AACvB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,SAAS,GAAG;AACzB,EAAE,CAAC,kBAAkB,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC;AACnD,EAAE,CAAC,gBAAgB,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC;AACpD,EAAE,KAAK,EAAE,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC;AACvC,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,MAAM,EAAE,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC;AACxC;;;;"}

package/es/components/upload/index.mjs

@@ -2,7 +2,7 @@ import '../../utils/index.mjs';
 import Upload from './src/upload2.mjs';
 export { genFileId, uploadBaseProps, uploadListTypes, uploadProps } from './src/upload.mjs';
 export { uploadContentProps } from './src/upload-content.mjs';
-export { uploadListEmits, uploadListProps } from './src/upload-list.mjs';
+export { uploadListEmits, uploadListProps } from './src/upload-list2.mjs';
 export { uploadDraggerEmits, uploadDraggerProps } from './src/upload-dragger.mjs';
 export { uploadContextKey } from './src/constants.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';

package/es/components/upload/src/upload-list.mjs

@@ -1,34 +1,180 @@
-import '../../../utils/index.mjs';
-import { uploadListTypes } from './upload.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { mutable } from '../../../utils/typescript.mjs';
-import { NOOP } from '@vue/shared';
+import { defineComponent, ref, computed, openBlock, createBlock, TransitionGroup, normalizeClass, unref, withCtx, createElementBlock, Fragment, renderList, withKeys, renderSlot, createCommentVNode, createElementVNode, withModifiers, createVNode, toDisplayString, normalizeStyle } from 'vue';
+import { ElIcon } from '../../icon/index.mjs';
+import { Document, CircleCheck, Check, Close, ZoomIn, Delete } from '@element-plus/icons-vue';
+import '../../../hooks/index.mjs';
+import { ElProgress } from '../../progress/index.mjs';
+import '../../form/index.mjs';
+import { uploadListProps, uploadListEmits } from './upload-list2.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 { useFormDisabled } from '../../form/src/hooks/use-form-common-props.mjs';
 
-const uploadListProps = buildProps({
-  files: {
-    type: definePropType(Array),
-    default: () => mutable([])
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  handlePreview: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  listType: {
-    type: String,
-    values: uploadListTypes,
-    default: "text"
-  },
-  crossorigin: {
-    type: definePropType(String)
+const __default__ = defineComponent({
+  name: "ElUploadList"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: uploadListProps,
+  emits: uploadListEmits,
+  setup(__props, { emit }) {
+    const props = __props;
+    const { t } = useLocale();
+    const nsUpload = useNamespace("upload");
+    const nsIcon = useNamespace("icon");
+    const nsList = useNamespace("list");
+    const disabled = useFormDisabled();
+    const focusing = ref(false);
+    const containerKls = computed(() => [
+      nsUpload.b("list"),
+      nsUpload.bm("list", props.listType),
+      nsUpload.is("disabled", props.disabled)
+    ]);
+    const handleRemove = (file) => {
+      emit("remove", file);
+    };
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(TransitionGroup, {
+        tag: "ul",
+        class: normalizeClass(unref(containerKls)),
+        name: unref(nsList).b()
+      }, {
+        default: withCtx(() => [
+          (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.files, (file, index) => {
+            return openBlock(), createElementBlock("li", {
+              key: file.uid || file.name,
+              class: normalizeClass([
+                unref(nsUpload).be("list", "item"),
+                unref(nsUpload).is(file.status),
+                { focusing: focusing.value }
+              ]),
+              tabindex: "0",
+              onKeydown: withKeys(($event) => !unref(disabled) && handleRemove(file), ["delete"]),
+              onFocus: ($event) => focusing.value = true,
+              onBlur: ($event) => focusing.value = false,
+              onClick: ($event) => focusing.value = false
+            }, [
+              renderSlot(_ctx.$slots, "default", {
+                file,
+                index
+              }, () => [
+                _ctx.listType === "picture" || file.status !== "uploading" && _ctx.listType === "picture-card" ? (openBlock(), createElementBlock("img", {
+                  key: 0,
+                  class: normalizeClass(unref(nsUpload).be("list", "item-thumbnail")),
+                  src: file.url,
+                  crossorigin: _ctx.crossorigin,
+                  alt: ""
+                }, null, 10, ["src", "crossorigin"])) : createCommentVNode("v-if", true),
+                file.status === "uploading" || _ctx.listType !== "picture-card" ? (openBlock(), createElementBlock("div", {
+                  key: 1,
+                  class: normalizeClass(unref(nsUpload).be("list", "item-info"))
+                }, [
+                  createElementVNode("a", {
+                    class: normalizeClass(unref(nsUpload).be("list", "item-name")),
+                    onClick: withModifiers(($event) => _ctx.handlePreview(file), ["prevent"])
+                  }, [
+                    createVNode(unref(ElIcon), {
+                      class: normalizeClass(unref(nsIcon).m("document"))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(Document))
+                      ]),
+                      _: 1
+                    }, 8, ["class"]),
+                    createElementVNode("span", {
+                      class: normalizeClass(unref(nsUpload).be("list", "item-file-name")),
+                      title: file.name
+                    }, toDisplayString(file.name), 11, ["title"])
+                  ], 10, ["onClick"]),
+                  file.status === "uploading" ? (openBlock(), createBlock(unref(ElProgress), {
+                    key: 0,
+                    type: _ctx.listType === "picture-card" ? "circle" : "line",
+                    "stroke-width": _ctx.listType === "picture-card" ? 6 : 2,
+                    percentage: Number(file.percentage),
+                    style: normalizeStyle(_ctx.listType === "picture-card" ? "" : "margin-top: 0.5rem")
+                  }, null, 8, ["type", "stroke-width", "percentage", "style"])) : createCommentVNode("v-if", true)
+                ], 2)) : createCommentVNode("v-if", true),
+                createElementVNode("label", {
+                  class: normalizeClass(unref(nsUpload).be("list", "item-status-label"))
+                }, [
+                  _ctx.listType === "text" ? (openBlock(), createBlock(unref(ElIcon), {
+                    key: 0,
+                    class: normalizeClass([unref(nsIcon).m("upload-success"), unref(nsIcon).m("circle-check")])
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(CircleCheck))
+                    ]),
+                    _: 1
+                  }, 8, ["class"])) : ["picture-card", "picture"].includes(_ctx.listType) ? (openBlock(), createBlock(unref(ElIcon), {
+                    key: 1,
+                    class: normalizeClass([unref(nsIcon).m("upload-success"), unref(nsIcon).m("check")])
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Check))
+                    ]),
+                    _: 1
+                  }, 8, ["class"])) : createCommentVNode("v-if", true)
+                ], 2),
+                !unref(disabled) ? (openBlock(), createBlock(unref(ElIcon), {
+                  key: 2,
+                  class: normalizeClass(unref(nsIcon).m("close")),
+                  onClick: ($event) => handleRemove(file)
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(Close))
+                  ]),
+                  _: 2
+                }, 1032, ["class", "onClick"])) : createCommentVNode("v-if", true),
+                createCommentVNode(" Due to close btn only appears when li gets focused disappears after li gets blurred, thus keyboard navigation can never reach close btn"),
+                createCommentVNode(" This is a bug which needs to be fixed "),
+                createCommentVNode(" TODO: Fix the incorrect navigation interaction "),
+                !unref(disabled) ? (openBlock(), createElementBlock("i", {
+                  key: 3,
+                  class: normalizeClass(unref(nsIcon).m("close-tip"))
+                }, toDisplayString(unref(t)("el.upload.deleteTip")), 3)) : createCommentVNode("v-if", true),
+                _ctx.listType === "picture-card" ? (openBlock(), createElementBlock("span", {
+                  key: 4,
+                  class: normalizeClass(unref(nsUpload).be("list", "item-actions"))
+                }, [
+                  createElementVNode("span", {
+                    class: normalizeClass(unref(nsUpload).be("list", "item-preview")),
+                    onClick: ($event) => _ctx.handlePreview(file)
+                  }, [
+                    createVNode(unref(ElIcon), {
+                      class: normalizeClass(unref(nsIcon).m("zoom-in"))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(ZoomIn))
+                      ]),
+                      _: 1
+                    }, 8, ["class"])
+                  ], 10, ["onClick"]),
+                  !unref(disabled) ? (openBlock(), createElementBlock("span", {
+                    key: 0,
+                    class: normalizeClass(unref(nsUpload).be("list", "item-delete")),
+                    onClick: ($event) => handleRemove(file)
+                  }, [
+                    createVNode(unref(ElIcon), {
+                      class: normalizeClass(unref(nsIcon).m("delete"))
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(unref(Delete))
+                      ]),
+                      _: 1
+                    }, 8, ["class"])
+                  ], 10, ["onClick"])) : createCommentVNode("v-if", true)
+                ], 2)) : createCommentVNode("v-if", true)
+              ])
+            ], 42, ["onKeydown", "onFocus", "onBlur", "onClick"]);
+          }), 128)),
+          renderSlot(_ctx.$slots, "append")
+        ]),
+        _: 3
+      }, 8, ["class", "name"]);
+    };
   }
 });
-const uploadListEmits = {
-  remove: (file) => !!file
-};
+var UploadList = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "upload-list.vue"]]);
 
-export { uploadListEmits, uploadListProps };
+export { UploadList as default };
 //# sourceMappingURL=upload-list.mjs.map

package/es/components/upload/src/upload-list.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"upload-list.mjs","sources":["../../../../../../packages/components/upload/src/upload-list.ts"],"sourcesContent":["import { NOOP, buildProps, definePropType, mutable } from '@element-plus/utils'\nimport { uploadListTypes } from './upload'\nimport type { ExtractPropTypes } from 'vue'\nimport type { UploadFile, UploadFiles, UploadHooks } from './upload'\nimport type UploadList from './upload-list.vue'\n\nexport const uploadListProps = buildProps({\n  files: {\n    type: definePropType<UploadFiles>(Array),\n    default: () => mutable([]),\n  },\n  disabled: {\n    type: Boolean,\n    default: false,\n  },\n  handlePreview: {\n    type: definePropType<UploadHooks['onPreview']>(Function),\n    default: NOOP,\n  },\n  listType: {\n    type: String,\n    values: uploadListTypes,\n    default: 'text',\n  },\n  /**\n   * @description set HTML attribute: crossorigin.\n   */\n  crossorigin: {\n    type: definePropType<'anonymous' | 'use-credentials' | ''>(String),\n  },\n} as const)\n\nexport type UploadListProps = ExtractPropTypes<typeof uploadListProps>\nexport const uploadListEmits = {\n  remove: (file: UploadFile) => !!file,\n}\nexport type UploadListEmits = typeof uploadListEmits\nexport type UploadListInstance = InstanceType<typeof UploadList>\n"],"names":[],"mappings":";;;;;;AAEY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,OAAO,EAAE,MAAM,OAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,aAAa,EAAE;AACjB,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,eAAe;AAC3B,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAChC,GAAG;AACH,CAAC,EAAE;AACS,MAAC,eAAe,GAAG;AAC/B,EAAE,MAAM,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;AAC1B;;;;"}
+{"version":3,"file":"upload-list.mjs","sources":["../../../../../../packages/components/upload/src/upload-list.vue"],"sourcesContent":["<template>\n  <transition-group tag=\"ul\" :class=\"containerKls\" :name=\"nsList.b()\">\n    <li\n      v-for=\"(file, index) in files\"\n      :key=\"file.uid || file.name\"\n      :class=\"[\n        nsUpload.be('list', 'item'),\n        nsUpload.is(file.status),\n        { focusing },\n      ]\"\n      tabindex=\"0\"\n      @keydown.delete=\"!disabled && handleRemove(file)\"\n      @focus=\"focusing = true\"\n      @blur=\"focusing = false\"\n      @click=\"focusing = false\"\n    >\n      <slot :file=\"file\" :index=\"index\">\n        <img\n          v-if=\"\n            listType === 'picture' ||\n            (file.status !== 'uploading' && listType === 'picture-card')\n          \"\n          :class=\"nsUpload.be('list', 'item-thumbnail')\"\n          :src=\"file.url\"\n          :crossorigin=\"crossorigin\"\n          alt=\"\"\n        />\n        <div\n          v-if=\"file.status === 'uploading' || listType !== 'picture-card'\"\n          :class=\"nsUpload.be('list', 'item-info')\"\n        >\n          <a\n            :class=\"nsUpload.be('list', 'item-name')\"\n            @click.prevent=\"handlePreview(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('document')\">\n              <Document />\n            </el-icon>\n            <span\n              :class=\"nsUpload.be('list', 'item-file-name')\"\n              :title=\"file.name\"\n            >\n              {{ file.name }}\n            </span>\n          </a>\n          <el-progress\n            v-if=\"file.status === 'uploading'\"\n            :type=\"listType === 'picture-card' ? 'circle' : 'line'\"\n            :stroke-width=\"listType === 'picture-card' ? 6 : 2\"\n            :percentage=\"Number(file.percentage)\"\n            :style=\"listType === 'picture-card' ? '' : 'margin-top: 0.5rem'\"\n          />\n        </div>\n\n        <label :class=\"nsUpload.be('list', 'item-status-label')\">\n          <el-icon\n            v-if=\"listType === 'text'\"\n            :class=\"[nsIcon.m('upload-success'), nsIcon.m('circle-check')]\"\n          >\n            <circle-check />\n          </el-icon>\n          <el-icon\n            v-else-if=\"['picture-card', 'picture'].includes(listType)\"\n            :class=\"[nsIcon.m('upload-success'), nsIcon.m('check')]\"\n          >\n            <Check />\n          </el-icon>\n        </label>\n        <el-icon\n          v-if=\"!disabled\"\n          :class=\"nsIcon.m('close')\"\n          @click=\"handleRemove(file)\"\n        >\n          <Close />\n        </el-icon>\n        <!-- Due to close btn only appears when li gets focused disappears after li gets blurred, thus keyboard navigation can never reach close btn-->\n        <!-- This is a bug which needs to be fixed -->\n        <!-- TODO: Fix the incorrect navigation interaction -->\n        <i v-if=\"!disabled\" :class=\"nsIcon.m('close-tip')\">{{\n          t('el.upload.deleteTip')\n        }}</i>\n        <span\n          v-if=\"listType === 'picture-card'\"\n          :class=\"nsUpload.be('list', 'item-actions')\"\n        >\n          <span\n            :class=\"nsUpload.be('list', 'item-preview')\"\n            @click=\"handlePreview(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('zoom-in')\"><zoom-in /></el-icon>\n          </span>\n          <span\n            v-if=\"!disabled\"\n            :class=\"nsUpload.be('list', 'item-delete')\"\n            @click=\"handleRemove(file)\"\n          >\n            <el-icon :class=\"nsIcon.m('delete')\">\n              <Delete />\n            </el-icon>\n          </span>\n        </span>\n      </slot>\n    </li>\n    <slot name=\"append\" />\n  </transition-group>\n</template>\n<script lang=\"ts\" setup>\nimport { computed, ref } from 'vue'\nimport { ElIcon } from '@element-plus/components/icon'\nimport {\n  Check,\n  CircleCheck,\n  Close,\n  Delete,\n  Document,\n  ZoomIn,\n} from '@element-plus/icons-vue'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport ElProgress from '@element-plus/components/progress'\nimport { useFormDisabled } from '@element-plus/components/form'\n\nimport { uploadListEmits, uploadListProps } from './upload-list'\nimport type { UploadFile } from './upload'\n\ndefineOptions({\n  name: 'ElUploadList',\n})\n\nconst props = defineProps(uploadListProps)\nconst emit = defineEmits(uploadListEmits)\n\nconst { t } = useLocale()\nconst nsUpload = useNamespace('upload')\nconst nsIcon = useNamespace('icon')\nconst nsList = useNamespace('list')\nconst disabled = useFormDisabled()\n\nconst focusing = ref(false)\n\nconst containerKls = computed(() => [\n  nsUpload.b('list'),\n  nsUpload.bm('list', props.listType),\n  nsUpload.is('disabled', props.disabled),\n])\n\nconst handleRemove = (file: UploadFile) => {\n  emit('remove', file)\n}\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;mCA4Hc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAI,SAAU,EAAA,CAAA;AACxB,IAAM,MAAA,QAAA,GAAW,aAAa,QAAQ,CAAA,CAAA;AACtC,IAAM,MAAA,MAAA,GAAS,aAAa,MAAM,CAAA,CAAA;AAClC,IAAM,MAAA,MAAA,GAAS,aAAa,MAAM,CAAA,CAAA;AAClC,IAAA,MAAM,WAAW,eAAgB,EAAA,CAAA;AAEjC,IAAM,MAAA,QAAA,GAAW,IAAI,KAAK,CAAA,CAAA;AAE1B,IAAM,MAAA,YAAA,GAAe,SAAS,MAAM;AAAA,MAClC,QAAA,CAAS,EAAE,MAAM,CAAA;AAAA,MACjB,QAAS,CAAA,EAAA,CAAG,MAAQ,EAAA,KAAA,CAAM,QAAQ,CAAA;AAAA,MAClC,QAAS,CAAA,EAAA,CAAG,UAAY,EAAA,KAAA,CAAM,QAAQ,CAAA;AAAA,KACvC,CAAA,CAAA;AAED,IAAM,MAAA,YAAA,GAAe,CAAC,IAAqB,KAAA;AACzC,MAAA,IAAA,CAAK,UAAU,IAAI,CAAA,CAAA;AAAA,KACrB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}