@element-plus/nightly 0.0.20260103 → 0.0.20260105

package/lib/components/upload/src/upload.vue.d.ts

@@ -136,6 +136,7 @@ declare const __VLS_base: import("vue").DefineComponent<{
     })[], unknown, unknown, import("./upload").UploadRequestHandler, boolean>;
     readonly disabled: import("@element-plus/nightly/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     readonly limit: NumberConstructor;
+    readonly directory: BooleanConstructor;
 }, {
     /** @description cancel upload request */
     abort: (file: import("./upload").UploadFile) => void;
@@ -261,6 +262,7 @@ declare const __VLS_base: import("vue").DefineComponent<{
     })[], unknown, unknown, import("./upload").UploadRequestHandler, boolean>;
     readonly disabled: import("@element-plus/nightly/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
     readonly limit: NumberConstructor;
+    readonly directory: BooleanConstructor;
 }>>, {
     readonly data: import("@element-plus/nightly/es/utils").EpPropMergeType<(new (...args: any[]) => import("@element-plus/nightly/es/utils").Mutable<Record<string, any>> | Promise<import("@element-plus/nightly/es/utils").Mutable<Record<string, any>>> | ((rawFile: import("./upload").UploadRawFile) => import("@element-plus/nightly/es/utils").Awaitable<import("./upload").UploadData>)) | (() => import("@element-plus/nightly/es/utils").Awaitable<import("@element-plus/nightly/es/utils").Mutable<Record<string, any>>> | ((rawFile: import("./upload").UploadRawFile) => import("@element-plus/nightly/es/utils").Awaitable<import("./upload").UploadData>)) | ((new (...args: any[]) => import("@element-plus/nightly/es/utils").Mutable<Record<string, any>> | Promise<import("@element-plus/nightly/es/utils").Mutable<Record<string, any>>> | ((rawFile: import("./upload").UploadRawFile) => import("@element-plus/nightly/es/utils").Awaitable<import("./upload").UploadData>)) | (() => import("@element-plus/nightly/es/utils").Awaitable<import("@element-plus/nightly/es/utils").Mutable<Record<string, any>>> | ((rawFile: import("./upload").UploadRawFile) => import("@element-plus/nightly/es/utils").Awaitable<import("./upload").UploadData>)))[], unknown, unknown>;
     readonly disabled: import("@element-plus/nightly/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -279,6 +281,7 @@ declare const __VLS_base: import("vue").DefineComponent<{
     readonly autoUpload: import("@element-plus/nightly/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     readonly listType: import("@element-plus/nightly/es/utils").EpPropMergeType<StringConstructor, "picture" | "text" | "picture-card", unknown>;
     readonly httpRequest: import("./upload").UploadRequestHandler;
+    readonly directory: boolean;
     readonly beforeUpload: (rawFile: import("./upload").UploadRawFile) => import("@element-plus/nightly/es/utils").Awaitable<void | undefined | null | boolean | File | Blob>;
     readonly onRemove: (uploadFile: import("./upload").UploadFile, uploadFiles: import("./upload").UploadFiles) => void;
     readonly onPreview: (uploadFile: import("./upload").UploadFile) => void;

package/lib/components/upload/src/upload2.js

@@ -2,112 +2,146 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var ajax = require('./ajax.js');
-var runtime = require('../../../utils/vue/props/runtime.js');
-var shared = require('@vue/shared');
-var typescript = require('../../../utils/typescript.js');
+var vue = require('vue');
+var constants = require('./constants.js');
+var uploadList = require('./upload-list2.js');
+var uploadContent = require('./upload-content2.js');
+var useHandlers = require('./use-handlers.js');
+var upload = require('./upload.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var useFormCommonProps = require('../../form/src/hooks/use-form-common-props.js');
 
-const uploadListTypes = ["text", "picture", "picture-card"];
-let fileId = 1;
-const genFileId = () => Date.now() + fileId++;
-const uploadBaseProps = runtime.buildProps({
-  action: {
-    type: String,
-    default: "#"
-  },
-  headers: {
-    type: runtime.definePropType(Object)
-  },
-  method: {
-    type: String,
-    default: "post"
-  },
-  data: {
-    type: runtime.definePropType([Object, Function, Promise]),
-    default: () => typescript.mutable({})
-  },
-  multiple: Boolean,
-  name: {
-    type: String,
-    default: "file"
-  },
-  drag: Boolean,
-  withCredentials: Boolean,
-  showFileList: {
-    type: Boolean,
-    default: true
-  },
-  accept: {
-    type: String,
-    default: ""
-  },
-  fileList: {
-    type: runtime.definePropType(Array),
-    default: () => typescript.mutable([])
-  },
-  autoUpload: {
-    type: Boolean,
-    default: true
-  },
-  listType: {
-    type: String,
-    values: uploadListTypes,
-    default: "text"
-  },
-  httpRequest: {
-    type: runtime.definePropType(Function),
-    default: ajax.ajaxUpload
-  },
-  disabled: {
-    type: Boolean,
-    default: void 0
-  },
-  limit: Number
-});
-const uploadProps = runtime.buildProps({
-  ...uploadBaseProps,
-  beforeUpload: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  beforeRemove: {
-    type: runtime.definePropType(Function)
-  },
-  onRemove: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onChange: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onPreview: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onSuccess: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onProgress: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onError: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  onExceed: {
-    type: runtime.definePropType(Function),
-    default: shared.NOOP
-  },
-  crossorigin: {
-    type: runtime.definePropType(String)
+const _sfc_main = vue.defineComponent({
+  ...{
+    name: "ElUpload"
+  },
+  __name: "upload",
+  props: upload.uploadProps,
+  setup(__props, { expose: __expose }) {
+    const props = __props;
+    const disabled = useFormCommonProps.useFormDisabled();
+    const uploadRef = vue.shallowRef();
+    const {
+      abort,
+      submit,
+      clearFiles,
+      uploadFiles,
+      handleStart,
+      handleError,
+      handleRemove,
+      handleSuccess,
+      handleProgress,
+      revokeFileObjectURL
+    } = useHandlers.useHandlers(props, uploadRef);
+    const isPictureCard = vue.computed(() => props.listType === "picture-card");
+    const uploadContentProps = vue.computed(() => ({
+      ...props,
+      fileList: uploadFiles.value,
+      onStart: handleStart,
+      onProgress: handleProgress,
+      onSuccess: handleSuccess,
+      onError: handleError,
+      onRemove: handleRemove
+    }));
+    vue.onBeforeUnmount(() => {
+      uploadFiles.value.forEach(revokeFileObjectURL);
+    });
+    vue.provide(constants.uploadContextKey, {
+      accept: vue.toRef(props, "accept")
+    });
+    __expose({
+      abort,
+      submit,
+      clearFiles,
+      handleStart,
+      handleRemove
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", null, [
+        isPictureCard.value && _ctx.showFileList ? (vue.openBlock(), vue.createBlock(uploadList["default"], {
+          key: 0,
+          disabled: vue.unref(disabled),
+          "list-type": _ctx.listType,
+          files: vue.unref(uploadFiles),
+          crossorigin: _ctx.crossorigin,
+          "handle-preview": _ctx.onPreview,
+          onRemove: vue.unref(handleRemove)
+        }, vue.createSlots({
+          append: vue.withCtx(() => [
+            vue.createVNode(
+              uploadContent["default"],
+              vue.mergeProps({
+                ref_key: "uploadRef",
+                ref: uploadRef
+              }, uploadContentProps.value),
+              {
+                default: vue.withCtx(() => [
+                  _ctx.$slots.trigger ? vue.renderSlot(_ctx.$slots, "trigger", { key: 0 }) : vue.createCommentVNode("v-if", true),
+                  !_ctx.$slots.trigger && _ctx.$slots.default ? vue.renderSlot(_ctx.$slots, "default", { key: 1 }) : vue.createCommentVNode("v-if", true)
+                ]),
+                _: 3
+              },
+              16
+            )
+          ]),
+          _: 2
+        }, [
+          _ctx.$slots.file ? {
+            name: "default",
+            fn: vue.withCtx(({ file, index }) => [
+              vue.renderSlot(_ctx.$slots, "file", {
+                file,
+                index
+              })
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1032, ["disabled", "list-type", "files", "crossorigin", "handle-preview", "onRemove"])) : vue.createCommentVNode("v-if", true),
+        !isPictureCard.value || isPictureCard.value && !_ctx.showFileList ? (vue.openBlock(), vue.createBlock(
+          uploadContent["default"],
+          vue.mergeProps({
+            key: 1,
+            ref_key: "uploadRef",
+            ref: uploadRef
+          }, uploadContentProps.value),
+          {
+            default: vue.withCtx(() => [
+              _ctx.$slots.trigger ? vue.renderSlot(_ctx.$slots, "trigger", { key: 0 }) : vue.createCommentVNode("v-if", true),
+              !_ctx.$slots.trigger && _ctx.$slots.default ? vue.renderSlot(_ctx.$slots, "default", { key: 1 }) : vue.createCommentVNode("v-if", true)
+            ]),
+            _: 3
+          },
+          16
+        )) : vue.createCommentVNode("v-if", true),
+        _ctx.$slots.trigger ? vue.renderSlot(_ctx.$slots, "default", { key: 2 }) : vue.createCommentVNode("v-if", true),
+        vue.renderSlot(_ctx.$slots, "tip"),
+        !isPictureCard.value && _ctx.showFileList ? (vue.openBlock(), vue.createBlock(uploadList["default"], {
+          key: 3,
+          disabled: vue.unref(disabled),
+          "list-type": _ctx.listType,
+          files: vue.unref(uploadFiles),
+          crossorigin: _ctx.crossorigin,
+          "handle-preview": _ctx.onPreview,
+          onRemove: vue.unref(handleRemove)
+        }, vue.createSlots({
+          _: 2
+        }, [
+          _ctx.$slots.file ? {
+            name: "default",
+            fn: vue.withCtx(({ file, index }) => [
+              vue.renderSlot(_ctx.$slots, "file", {
+                file,
+                index
+              })
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1032, ["disabled", "list-type", "files", "crossorigin", "handle-preview", "onRemove"])) : vue.createCommentVNode("v-if", true)
+      ]);
+    };
   }
 });
+var Upload = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/upload/src/upload.vue"]]);
 
-exports.genFileId = genFileId;
-exports.uploadBaseProps = uploadBaseProps;
-exports.uploadListTypes = uploadListTypes;
-exports.uploadProps = uploadProps;
+exports["default"] = Upload;
 //# sourceMappingURL=upload2.js.map

package/lib/components/upload/src/upload2.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload2.js","sources":["../../../../../../packages/components/upload/src/upload.ts"],"sourcesContent":["import { NOOP, buildProps, definePropType, mutable } from '@element-plus/utils'\nimport { ajaxUpload } from './ajax'\n\nimport type { Awaitable, Mutable } from '@element-plus/utils'\nimport type { UploadAjaxError } from './ajax'\nimport type { ExtractPropTypes, ExtractPublicPropTypes } from 'vue'\nimport type Upload from './upload.vue'\n\nexport const uploadListTypes = ['text', 'picture', 'picture-card'] as const\n\nlet fileId = 1\nexport const genFileId = () => Date.now() + fileId++\n\nexport type UploadStatus = 'ready' | 'uploading' | 'success' | 'fail'\nexport interface UploadProgressEvent extends ProgressEvent {\n  percent: number\n}\n\nexport interface UploadRequestOptions {\n  action: string\n  method: string\n  data: Record<string, string | Blob | [Blob, string]>\n  filename: string\n  file: UploadRawFile\n  headers: Headers | Record<string, string | number | null | undefined>\n  onError: (evt: UploadAjaxError) => void\n  onProgress: (evt: UploadProgressEvent) => void\n  onSuccess: (response: any) => void\n  withCredentials: boolean\n}\nexport interface UploadFile {\n  name: string\n  percentage?: number\n  status: UploadStatus\n  size?: number\n  response?: unknown\n  uid: number\n  url?: string\n  raw?: UploadRawFile\n}\nexport type UploadUserFile = Omit<UploadFile, 'status' | 'uid'> &\n  Partial<Pick<UploadFile, 'status' | 'uid'>>\n\nexport type UploadFiles = UploadFile[]\nexport interface UploadRawFile extends File {\n  uid: number\n  isDirectory?: boolean\n}\nexport type UploadRequestHandler = (\n  options: UploadRequestOptions\n) => XMLHttpRequest | Promise<unknown>\nexport interface UploadHooks {\n  beforeUpload: (\n    rawFile: UploadRawFile\n  ) => Awaitable<void | undefined | null | boolean | File | Blob>\n  beforeRemove: (\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => Awaitable<boolean>\n  onRemove: (uploadFile: UploadFile, uploadFiles: UploadFiles) => void\n  onChange: (uploadFile: UploadFile, uploadFiles: UploadFiles) => void\n  onPreview: (uploadFile: UploadFile) => void\n  onSuccess: (\n    response: any,\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => void\n  onProgress: (\n    evt: UploadProgressEvent,\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => void\n  onError: (\n    error: Error,\n    uploadFile: UploadFile,\n    uploadFiles: UploadFiles\n  ) => void\n  onExceed: (files: File[], uploadFiles: UploadUserFile[]) => void\n}\n\nexport type UploadData = Mutable<Record<string, any>>\n\nexport const uploadBaseProps = buildProps({\n  /**\n   * @description request URL\n   */\n  action: {\n    type: String,\n    default: '#',\n  },\n  /**\n   * @description request headers\n   */\n  headers: {\n    type: definePropType<Headers | Record<string, any>>(Object),\n  },\n  /**\n   * @description set upload request method\n   */\n  method: {\n    type: String,\n    default: 'post',\n  },\n  /**\n   * @description additions options of request\n   */\n  data: {\n    type: definePropType<\n      | Awaitable<UploadData>\n      | ((rawFile: UploadRawFile) => Awaitable<UploadData>)\n    >([Object, Function, Promise]),\n    default: () => mutable({} as const),\n  },\n  /**\n   * @description whether uploading multiple files is permitted\n   */\n  multiple: Boolean,\n  /**\n   * @description key name for uploaded file\n   */\n  name: {\n    type: String,\n    default: 'file',\n  },\n  /**\n   * @description whether to activate drag and drop mode\n   */\n  drag: Boolean,\n  /**\n   * @description whether cookies are sent\n   */\n  withCredentials: Boolean,\n  /**\n   * @description whether to show the uploaded file list\n   */\n  showFileList: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description accepted [file types](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attr-accept), will not work when `thumbnail-mode === true`\n   */\n  accept: {\n    type: String,\n    default: '',\n  },\n  /**\n   * @description default uploaded files\n   */\n  fileList: {\n    type: definePropType<UploadUserFile[]>(Array),\n    default: () => mutable([] as const),\n  },\n  /**\n   * @description whether to auto upload file\n   */\n  autoUpload: {\n    type: Boolean,\n    default: true,\n  },\n  /**\n   * @description type of file list\n   */\n  listType: {\n    type: String,\n    values: uploadListTypes,\n    default: 'text',\n  },\n  /**\n   * @description override default xhr behavior, allowing you to implement your own upload-file's request\n   */\n  httpRequest: {\n    type: definePropType<UploadRequestHandler>(Function),\n    default: ajaxUpload,\n  },\n  /**\n   * @description whether to disable upload\n   */\n  disabled: {\n    type: Boolean,\n    default: undefined,\n  },\n  /**\n   * @description maximum number of uploads allowed\n   */\n  limit: Number,\n} as const)\n\nexport const uploadProps = buildProps({\n  ...uploadBaseProps,\n  /**\n   * @description hook function before uploading with the file to be uploaded as its parameter. If `false` is returned or a `Promise` is returned and then is rejected, uploading will be aborted\n   */\n  beforeUpload: {\n    type: definePropType<UploadHooks['beforeUpload']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function before removing a file with the file and file list as its parameters. If `false` is returned or a `Promise` is returned and then is rejected, removing will be aborted\n   */\n  beforeRemove: {\n    type: definePropType<UploadHooks['beforeRemove']>(Function),\n  },\n  /**\n   * @description hook function when files are removed\n   */\n  onRemove: {\n    type: definePropType<UploadHooks['onRemove']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when select file or upload file success or upload file fail\n   */\n  onChange: {\n    type: definePropType<UploadHooks['onChange']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when clicking the uploaded files\n   */\n  onPreview: {\n    type: definePropType<UploadHooks['onPreview']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when uploaded successfully\n   */\n  onSuccess: {\n    type: definePropType<UploadHooks['onSuccess']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when some progress occurs\n   */\n  onProgress: {\n    type: definePropType<UploadHooks['onProgress']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when some errors occurs\n   */\n  onError: {\n    type: definePropType<UploadHooks['onError']>(Function),\n    default: NOOP,\n  },\n  /**\n   * @description hook function when limit is exceeded\n   */\n  onExceed: {\n    type: definePropType<UploadHooks['onExceed']>(Function),\n    default: NOOP,\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 UploadProps = ExtractPropTypes<typeof uploadProps>\nexport type UploadPropsPublic = ExtractPublicPropTypes<typeof uploadProps>\n\nexport type UploadInstance = InstanceType<typeof Upload> & unknown\n"],"names":["buildProps","definePropType","mutable","ajaxUpload","NOOP"],"mappings":"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"}
+{"version":3,"file":"upload2.js","sources":["../../../../../../packages/components/upload/src/upload.vue"],"sourcesContent":["<template>\n  <div>\n    <upload-list\n      v-if=\"isPictureCard && showFileList\"\n      :disabled=\"disabled\"\n      :list-type=\"listType\"\n      :files=\"uploadFiles\"\n      :crossorigin=\"crossorigin\"\n      :handle-preview=\"onPreview\"\n      @remove=\"handleRemove\"\n    >\n      <template v-if=\"$slots.file\" #default=\"{ file, index }\">\n        <slot name=\"file\" :file=\"file\" :index=\"index\" />\n      </template>\n      <template #append>\n        <upload-content ref=\"uploadRef\" v-bind=\"uploadContentProps\">\n          <slot v-if=\"$slots.trigger\" name=\"trigger\" />\n          <slot v-if=\"!$slots.trigger && $slots.default\" />\n        </upload-content>\n      </template>\n    </upload-list>\n\n    <upload-content\n      v-if=\"!isPictureCard || (isPictureCard && !showFileList)\"\n      ref=\"uploadRef\"\n      v-bind=\"uploadContentProps\"\n    >\n      <slot v-if=\"$slots.trigger\" name=\"trigger\" />\n      <slot v-if=\"!$slots.trigger && $slots.default\" />\n    </upload-content>\n\n    <slot v-if=\"$slots.trigger\" />\n    <slot name=\"tip\" />\n    <upload-list\n      v-if=\"!isPictureCard && showFileList\"\n      :disabled=\"disabled\"\n      :list-type=\"listType\"\n      :files=\"uploadFiles\"\n      :crossorigin=\"crossorigin\"\n      :handle-preview=\"onPreview\"\n      @remove=\"handleRemove\"\n    >\n      <template v-if=\"$slots.file\" #default=\"{ file, index }\">\n        <slot name=\"file\" :file=\"file\" :index=\"index\" />\n      </template>\n    </upload-list>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, onBeforeUnmount, provide, shallowRef, toRef } from 'vue'\nimport { useFormDisabled } from '@element-plus/components/form'\nimport { uploadContextKey } from './constants'\nimport UploadList from './upload-list.vue'\nimport UploadContent from './upload-content.vue'\nimport { useHandlers } from './use-handlers'\nimport { uploadProps } from './upload'\n\nimport type {\n  UploadContentInstance,\n  UploadContentProps,\n} from './upload-content'\n\ndefineOptions({\n  name: 'ElUpload',\n})\n\nconst props = defineProps(uploadProps)\n\nconst disabled = useFormDisabled()\n\nconst uploadRef = shallowRef<UploadContentInstance>()\nconst {\n  abort,\n  submit,\n  clearFiles,\n  uploadFiles,\n  handleStart,\n  handleError,\n  handleRemove,\n  handleSuccess,\n  handleProgress,\n  revokeFileObjectURL,\n} = useHandlers(props, uploadRef)\n\nconst isPictureCard = computed(() => props.listType === 'picture-card')\n\nconst uploadContentProps = computed<UploadContentProps>(() => ({\n  ...props,\n  fileList: uploadFiles.value,\n  onStart: handleStart,\n  onProgress: handleProgress,\n  onSuccess: handleSuccess,\n  onError: handleError,\n  onRemove: handleRemove,\n}))\n\nonBeforeUnmount(() => {\n  uploadFiles.value.forEach(revokeFileObjectURL)\n})\n\nprovide(uploadContextKey, {\n  accept: toRef(props, 'accept'),\n})\n\ndefineExpose({\n  /** @description cancel upload request */\n  abort,\n  /** @description upload the file list manually */\n  submit,\n  /** @description clear the file list  */\n  clearFiles,\n  /** @description select the file manually */\n  handleStart,\n  /** @description remove the file manually */\n  handleRemove,\n})\n</script>\n"],"names":["useFormDisabled","shallowRef","useHandlers","computed","onBeforeUnmount","provide","uploadContextKey","toRef","_createElementBlock","showFileList","_createBlock","UploadList","_unref","listType","crossorigin","onPreview","_createSlots","_withCtx","_createVNode","UploadContent","_mergeProps","$slots","_renderSlot","_createCommentVNode","_openBlock"],"mappings":";;;;;;;;;;;;;;;;;;;;AAmEA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AAEd,IAAA,MAAM,WAAWA,kCAAgB,EAAA,CAAA;AAEjC,IAAA,MAAM,YAAYC,cAAkC,EAAA,CAAA;AAC9C,IAAA,MAAA;AAAA,MACJ,KAAA;AAAA,MACA,MAAA;AAAA,MACA,UAAA;AAAA,MACA,WAAA;AAAA,MACA,WAAA;AAAA,MACA,WAAA;AAAA,MACA,YAAA;AAAA,MACA,aAAA;AAAA,MACA,cAAA;AAAA,MACA,mBAAA;AAAA,KACF,GAAIC,uBAAY,CAAA,KAAA,EAAO,SAAS,CAAA,CAAA;AAEhC,IAAA,MAAM,aAAgB,GAAAC,YAAA,CAAS,MAAM,KAAA,CAAM,aAAa,cAAc,CAAA,CAAA;AAEhE,IAAA,MAAA,kBAAA,GAAqBA,aAA6B,OAAO;AAAA,MAC7D,GAAG,KAAA;AAAA,MACH,UAAU,WAAY,CAAA,KAAA;AAAA,MACtB,OAAS,EAAA,WAAA;AAAA,MACT,UAAY,EAAA,cAAA;AAAA,MACZ,SAAW,EAAA,aAAA;AAAA,MACX,OAAS,EAAA,WAAA;AAAA,MACT,QAAU,EAAA,YAAA;AAAA,KACV,CAAA,CAAA,CAAA;AAEF,IAAAC,mBAAA,CAAgB,MAAM;AACR,MAAA,WAAA,CAAA,KAAA,CAAM,QAAQ,mBAAmB,CAAA,CAAA;AAAA,KAC9C,CAAA,CAAA;AAED,IAAAC,WAAA,CAAQC,0BAAkB,EAAA;AAAA,MACxB,MAAA,EAAQC,SAAM,CAAA,KAAA,EAAO,QAAQ,CAAA;AAAA,KAC9B,CAAA,CAAA;AAEY,IAAA,QAAA,CAAA;AAAA,MAEX,KAAA;AAAA,MAEA,MAAA;AAAA,MAEA,UAAA;AAAA,MAEA,WAAA;AAAA,MAEA,YAAA;AAAA,KACD,CAAA,CAAA;;8BAnHCC,sBA6CM,CAAA,KAAA,EAAA,IAAA,EAAA;AAAA,QA3CI,cAAA,KAAiBC,IAAAA,IAAAA,kCADzBC,gBAkBcC,qBAAA,EAAA;AAAA,UAAA,GAAA,EAAA,CAAA;AAAA,UAhBX,QAAA,EAAUC,UAAA,QAAA,CAAA;AAAA,UACV,aAAWC,IAAAA,CAAAA,QAAAA;AAAAA,UACX,KAAA,EAAOD,UAAA,WAAA,CAAA;AAAA,UACP,aAAaE,IAAAA,CAAAA,WAAAA;AAAAA,UACb,kBAAgBC,IAAAA,CAAAA,SAAAA;AAAAA,UAChB,QAAA,EAAQH,UAAA,YAAA,CAAA;AAAA,WAAAI,eAAA,CAAA;AAAA,UAKE,MAAA,EAAMC,YACf,MAGiB;AAAA,YAHjBC,eAAA;AAAA,cAGiBC,wBAAA;AAAA,cAHjBC,cAGiB,CAAA;AAAA,gBAHG,OAAA,EAAA,WAAA;AAAA,gBAAJ,GAAI,EAAA,SAAA;AAAA,eAAA,EAAoB,mBAAkB,KAAA,CAAA;AAAA,cAAA;AAAA,gBAAA,OAAA,EAAAH,YACxD,MAA6C;AAAA,kBAAjCI,IAAAA,CAAAA,MAAAA,CAAO,OAAnB,GAAAC,cAAA,CAA6C,KAAA,MAAA,EAAA,SAAA,EAAA,EAAA,GAAA,EAAA,CAAA,EAAA,CAAA,GAAAC,sBAAA,CAAA,QAAA,IAAA,CAAA;AAAA,mBAChCF,IAAO,CAAA,MAAA,CAAA,WAAWA,IAAO,CAAA,MAAA,CAAA,UAAtCC,cAAiD,CAAA,IAAA,CAAA,MAAA,EAAA,SAAA,EAAA,EAAA,GAAA,EAAA,CAAA,EAAA,CAAA,GAAAC,sBAAA,CAAA,QAAA,IAAA,CAAA;AAAA;;;;;;;;UANrCF,IAAAA,CAAO,OAAA,IAAA,GAAA;AAAA,YAAO,IAAA,EAAA,SAAA;AAAA,YAC5B,IAAAJ,WAAA,CAAA,CAAgD,EADT,IAAA,EAAM,OAAK,KAAA;AAAA,cAClDK,cAAA,CAAgD,IAAA,CAAA,MAAA,EAAA,MAAA,EAAA;AAAA,gBAA7B,IAAA;AAAA,gBAAa,KAAA;AAAA,eAAA,CAAA;AAAA;;;;SAW3B,cAAkB,KAAA,IAAA,aAAA,CAAA,SAAa,CAAKb,IAAAA,CAD7C,YAAA,IAAAe,aAAA,EAAA,EAAAd,eAAA;AAAA,UAOiBS,wBAAA;AAAA,UAPjBC,cAOiB,CAAA;AAAA,YAAA,GAAA,EAAA,CAAA;AAAA,YALX,OAAA,EAAA,WAAA;AAAA,YAAJ,GAAI,EAAA,SAAA;AAAA,WAAA,EACI,mBAAkB,KAAA,CAAA;AAAA,UAAA;AAAA,YAAA,OAAA,EAAAH,YAE1B,MAA6C;AAAA,cAAjCI,IAAAA,CAAAA,MAAAA,CAAO,OAAnB,GAAAC,cAAA,CAA6C,KAAA,MAAA,EAAA,SAAA,EAAA,EAAA,GAAA,EAAA,CAAA,EAAA,CAAA,GAAAC,sBAAA,CAAA,QAAA,IAAA,CAAA;AAAA,eAChCF,IAAO,CAAA,MAAA,CAAA,WAAWA,IAAO,CAAA,MAAA,CAAA,UAAtCC,cAAiD,CAAA,IAAA,CAAA,MAAA,EAAA,SAAA,EAAA,EAAA,GAAA,EAAA,CAAA,EAAA,CAAA,GAAAC,sBAAA,CAAA,QAAA,IAAA,CAAA;AAAA;;;;;QAGvCF,IAAAA,CAAAA,MAAAA,CAAO,OAAnB,GAAAC,cAAA,CAA8B,KAAA,MAAA,EAAA,SAAA,EAAA,EAAA,GAAA,EAAA,CAAA,EAAA,CAAA,GAAAC,sBAAA,CAAA,QAAA,IAAA,CAAA;AAAA,QAC9BD,cAAA,CAAmB,IAAA,CAAA,MAAA,EAAA,KAAA,CAAA;AAAA,QAEV,CAAA,cAAA,KAAiBb,IAAAA,IAAAA,kCAD1BC,gBAYcC,qBAAA,EAAA;AAAA,UAAA,GAAA,EAAA,CAAA;AAAA,UAVX,QAAA,EAAUC,UAAA,QAAA,CAAA;AAAA,UACV,aAAWC,IAAAA,CAAAA,QAAAA;AAAAA,UACX,KAAA,EAAOD,UAAA,WAAA,CAAA;AAAA,UACP,aAAaE,IAAAA,CAAAA,WAAAA;AAAAA,UACb,kBAAgBC,IAAAA,CAAAA,SAAAA;AAAAA,UAChB,QAAA,EAAQH,UAAA,YAAA,CAAA;AAAA,WAAAI,eAAA,CAAA;AAAA;;UAEOK,IAAAA,CAAO,OAAA,IAAA,GAAA;AAAA,YAAO,IAAA,EAAA,SAAA;AAAA,YAC5B,IAAAJ,WAAA,CAAA,CAAgD,EADT,IAAA,EAAM,OAAK,KAAA;AAAA,cAClDK,cAAA,CAAgD,IAAA,CAAA,MAAA,EAAA,MAAA,EAAA;AAAA,gBAA7B,IAAA;AAAA,gBAAa,KAAA;AAAA,eAAA,CAAA;AAAA;;;;;;;;;;;;"}

package/lib/components/upload/src/use-handlers.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var lodashUnified = require('lodash-unified');
 var core = require('@vueuse/core');
-var upload = require('./upload2.js');
+var upload = require('./upload.js');
 var error = require('../../../utils/error.js');
 
 const SCOPE = "ElUpload";

package/lib/components/virtual-list/src/hooks/use-grid-wheel.js

@@ -9,9 +9,9 @@ const useGridWheel = ({ atXEndEdge, atXStartEdge, atYEndEdge, atYStartEdge }, on
   let xOffset = 0;
   let yOffset = 0;
   const hasReachedEdge = (x, y) => {
-    const xEdgeReached = x <= 0 && atXStartEdge.value || x >= 0 && atXEndEdge.value;
-    const yEdgeReached = y <= 0 && atYStartEdge.value || y >= 0 && atYEndEdge.value;
-    return xEdgeReached && yEdgeReached;
+    const xEdgeReached = x < 0 && atXStartEdge.value || x > 0 && atXEndEdge.value;
+    const yEdgeReached = y < 0 && atYStartEdge.value || y > 0 && atYEndEdge.value;
+    return xEdgeReached || yEdgeReached;
   };
   const onWheel = (e) => {
     raf.cAF(frameHandle);
@@ -26,7 +26,7 @@ const useGridWheel = ({ atXEndEdge, atXStartEdge, atYEndEdge, atYStartEdge }, on
       x = y;
       y = 0;
     }
-    if (hasReachedEdge(xOffset, yOffset) && hasReachedEdge(xOffset + x, yOffset + y))
+    if (hasReachedEdge(x, y))
       return;
     xOffset += x;
     yOffset += y;

package/lib/components/virtual-list/src/hooks/use-grid-wheel.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-grid-wheel.js","sources":["../../../../../../../packages/components/virtual-list/src/hooks/use-grid-wheel.ts"],"sourcesContent":["import { cAF, rAF } from '@element-plus/utils'\n\nimport type { ComputedRef } from 'vue'\n\ninterface GridWheelState {\n  atXStartEdge: ComputedRef<boolean>\n  atXEndEdge: ComputedRef<boolean>\n  atYStartEdge: ComputedRef<boolean>\n  atYEndEdge: ComputedRef<boolean>\n}\n\ntype GridWheelHandler = (x: number, y: number) => void\n\nexport const useGridWheel = (\n  { atXEndEdge, atXStartEdge, atYEndEdge, atYStartEdge }: GridWheelState,\n  onWheelDelta: GridWheelHandler\n) => {\n  let frameHandle: number | null = null\n  let xOffset = 0\n  let yOffset = 0\n\n  const hasReachedEdge = (x: number, y: number) => {\n    const xEdgeReached =\n      (x <= 0 && atXStartEdge.value) || (x >= 0 && atXEndEdge.value)\n    const yEdgeReached =\n      (y <= 0 && atYStartEdge.value) || (y >= 0 && atYEndEdge.value)\n    return xEdgeReached && yEdgeReached\n  }\n\n  const onWheel = (e: WheelEvent) => {\n    cAF(frameHandle!)\n\n    let x = e.deltaX\n    let y = e.deltaY\n    // Simulate native behavior when using touch pad/track pad for wheeling.\n    if (Math.abs(x) > Math.abs(y)) {\n      y = 0\n    } else {\n      x = 0\n    }\n\n    // Special case for windows machine with shift key + wheel scrolling\n    if (e.shiftKey && y !== 0) {\n      x = y\n      y = 0\n    }\n\n    if (\n      hasReachedEdge(xOffset, yOffset) &&\n      hasReachedEdge(xOffset + x, yOffset + y)\n    )\n      return\n\n    xOffset += x\n    yOffset += y\n\n    e.preventDefault()\n\n    frameHandle = rAF(() => {\n      onWheelDelta(xOffset, yOffset)\n      xOffset = 0\n      yOffset = 0\n    })\n  }\n\n  return {\n    hasReachedEdge,\n    onWheel,\n  }\n}\n"],"names":["cAF","rAF"],"mappings":";;;;;;AAaa,MAAA,YAAA,GAAe,CAC1B,EAAE,UAAA,EAAY,cAAc,UAAY,EAAA,YAAA,IACxC,YACG,KAAA;AACH,EAAA,IAAI,WAA6B,GAAA,IAAA,CAAA;AACjC,EAAA,IAAI,OAAU,GAAA,CAAA,CAAA;AACd,EAAA,IAAI,OAAU,GAAA,CAAA,CAAA;AAEd,EAAM,MAAA,cAAA,GAAiB,CAAC,CAAA,EAAW,CAAc,KAAA;AAC/C,IAAA,MAAM,eACH,CAAK,IAAA,CAAA,IAAK,aAAa,KAAW,IAAA,CAAA,IAAK,KAAK,UAAW,CAAA,KAAA,CAAA;AAC1D,IAAA,MAAM,eACH,CAAK,IAAA,CAAA,IAAK,aAAa,KAAW,IAAA,CAAA,IAAK,KAAK,UAAW,CAAA,KAAA,CAAA;AAC1D,IAAA,OAAO,YAAgB,IAAA,YAAA,CAAA;AAAA,GACzB,CAAA;AAEA,EAAM,MAAA,OAAA,GAAU,CAAC,CAAkB,KAAA;AACjC,IAAAA,OAAA,CAAI,WAAY,CAAA,CAAA;AAEhB,IAAA,IAAI,IAAI,CAAE,CAAA,MAAA,CAAA;AACV,IAAA,IAAI,IAAI,CAAE,CAAA,MAAA,CAAA;AAEV,IAAA,IAAI,KAAK,GAAI,CAAA,CAAC,IAAI,IAAK,CAAA,GAAA,CAAI,CAAC,CAAG,EAAA;AAC7B,MAAI,CAAA,GAAA,CAAA,CAAA;AAAA,KACC,MAAA;AACL,MAAI,CAAA,GAAA,CAAA,CAAA;AAAA,KACN;AAGA,IAAI,IAAA,CAAA,CAAE,QAAY,IAAA,CAAA,KAAM,CAAG,EAAA;AACzB,MAAI,CAAA,GAAA,CAAA,CAAA;AACJ,MAAI,CAAA,GAAA,CAAA,CAAA;AAAA,KACN;AAEA,IACE,IAAA,cAAA,CAAe,SAAS,OAAO,CAAA,IAC/B,eAAe,OAAU,GAAA,CAAA,EAAG,UAAU,CAAC,CAAA;AAEvC,MAAA,OAAA;AAEF,IAAW,OAAA,IAAA,CAAA,CAAA;AACX,IAAW,OAAA,IAAA,CAAA,CAAA;AAEX,IAAA,CAAA,CAAE,cAAe,EAAA,CAAA;AAEjB,IAAA,WAAA,GAAcC,QAAI,MAAM;AACtB,MAAA,YAAA,CAAa,SAAS,OAAO,CAAA,CAAA;AAC7B,MAAU,OAAA,GAAA,CAAA,CAAA;AACV,MAAU,OAAA,GAAA,CAAA,CAAA;AAAA,KACX,CAAA,CAAA;AAAA,GACH,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,cAAA;AAAA,IACA,OAAA;AAAA,GACF,CAAA;AACF;;;;"}
+{"version":3,"file":"use-grid-wheel.js","sources":["../../../../../../../packages/components/virtual-list/src/hooks/use-grid-wheel.ts"],"sourcesContent":["import { cAF, rAF } from '@element-plus/utils'\n\nimport type { ComputedRef } from 'vue'\n\ninterface GridWheelState {\n  atXStartEdge: ComputedRef<boolean>\n  atXEndEdge: ComputedRef<boolean>\n  atYStartEdge: ComputedRef<boolean>\n  atYEndEdge: ComputedRef<boolean>\n}\n\ntype GridWheelHandler = (x: number, y: number) => void\n\nexport const useGridWheel = (\n  { atXEndEdge, atXStartEdge, atYEndEdge, atYStartEdge }: GridWheelState,\n  onWheelDelta: GridWheelHandler\n) => {\n  let frameHandle: number | null = null\n  let xOffset = 0\n  let yOffset = 0\n\n  const hasReachedEdge = (x: number, y: number) => {\n    const xEdgeReached =\n      (x < 0 && atXStartEdge.value) || (x > 0 && atXEndEdge.value)\n    const yEdgeReached =\n      (y < 0 && atYStartEdge.value) || (y > 0 && atYEndEdge.value)\n    return xEdgeReached || yEdgeReached\n  }\n\n  const onWheel = (e: WheelEvent) => {\n    cAF(frameHandle!)\n\n    let x = e.deltaX\n    let y = e.deltaY\n    // Simulate native behavior when using touch pad/track pad for wheeling.\n    if (Math.abs(x) > Math.abs(y)) {\n      y = 0\n    } else {\n      x = 0\n    }\n\n    // Special case for windows machine with shift key + wheel scrolling\n    if (e.shiftKey && y !== 0) {\n      x = y\n      y = 0\n    }\n\n    if (hasReachedEdge(x, y)) return\n\n    xOffset += x\n    yOffset += y\n\n    e.preventDefault()\n\n    frameHandle = rAF(() => {\n      onWheelDelta(xOffset, yOffset)\n      xOffset = 0\n      yOffset = 0\n    })\n  }\n\n  return {\n    hasReachedEdge,\n    onWheel,\n  }\n}\n"],"names":["cAF","rAF"],"mappings":";;;;;;AAaa,MAAA,YAAA,GAAe,CAC1B,EAAE,UAAA,EAAY,cAAc,UAAY,EAAA,YAAA,IACxC,YACG,KAAA;AACH,EAAA,IAAI,WAA6B,GAAA,IAAA,CAAA;AACjC,EAAA,IAAI,OAAU,GAAA,CAAA,CAAA;AACd,EAAA,IAAI,OAAU,GAAA,CAAA,CAAA;AAEd,EAAM,MAAA,cAAA,GAAiB,CAAC,CAAA,EAAW,CAAc,KAAA;AAC/C,IAAA,MAAM,eACH,CAAI,GAAA,CAAA,IAAK,aAAa,KAAW,IAAA,CAAA,GAAI,KAAK,UAAW,CAAA,KAAA,CAAA;AACxD,IAAA,MAAM,eACH,CAAI,GAAA,CAAA,IAAK,aAAa,KAAW,IAAA,CAAA,GAAI,KAAK,UAAW,CAAA,KAAA,CAAA;AACxD,IAAA,OAAO,YAAgB,IAAA,YAAA,CAAA;AAAA,GACzB,CAAA;AAEA,EAAM,MAAA,OAAA,GAAU,CAAC,CAAkB,KAAA;AACjC,IAAAA,OAAA,CAAI,WAAY,CAAA,CAAA;AAEhB,IAAA,IAAI,IAAI,CAAE,CAAA,MAAA,CAAA;AACV,IAAA,IAAI,IAAI,CAAE,CAAA,MAAA,CAAA;AAEV,IAAA,IAAI,KAAK,GAAI,CAAA,CAAC,IAAI,IAAK,CAAA,GAAA,CAAI,CAAC,CAAG,EAAA;AAC7B,MAAI,CAAA,GAAA,CAAA,CAAA;AAAA,KACC,MAAA;AACL,MAAI,CAAA,GAAA,CAAA,CAAA;AAAA,KACN;AAGA,IAAI,IAAA,CAAA,CAAE,QAAY,IAAA,CAAA,KAAM,CAAG,EAAA;AACzB,MAAI,CAAA,GAAA,CAAA,CAAA;AACJ,MAAI,CAAA,GAAA,CAAA,CAAA;AAAA,KACN;AAEA,IAAI,IAAA,cAAA,CAAe,GAAG,CAAC,CAAA;AAAG,MAAA,OAAA;AAE1B,IAAW,OAAA,IAAA,CAAA,CAAA;AACX,IAAW,OAAA,IAAA,CAAA,CAAA;AAEX,IAAA,CAAA,CAAE,cAAe,EAAA,CAAA;AAEjB,IAAA,WAAA,GAAcC,QAAI,MAAM;AACtB,MAAA,YAAA,CAAa,SAAS,OAAO,CAAA,CAAA;AAC7B,MAAU,OAAA,GAAA,CAAA,CAAA;AACV,MAAU,OAAA,GAAA,CAAA,CAAA;AAAA,KACX,CAAA,CAAA;AAAA,GACH,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,cAAA;AAAA,IACA,OAAA;AAAA,GACF,CAAA;AACF;;;;"}

package/lib/components/virtual-list/src/hooks/use-wheel.js

@@ -21,7 +21,7 @@ const useWheel = ({ atEndEdge, atStartEdge, layout }, onWheelDelta) => {
       deltaY = 0;
     }
     const newOffset = layout.value === defaults.HORIZONTAL ? deltaX : deltaY;
-    if (hasReachedEdge(offset) && hasReachedEdge(offset + newOffset))
+    if (hasReachedEdge(newOffset))
       return;
     offset += newOffset;
     if (!browser.isFirefox() && newOffset !== 0) {

package/lib/components/virtual-list/src/hooks/use-wheel.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-wheel.js","sources":["../../../../../../../packages/components/virtual-list/src/hooks/use-wheel.ts"],"sourcesContent":["import { cAF, isFirefox, rAF } from '@element-plus/utils'\nimport { HORIZONTAL } from '../defaults'\n\nimport type { ComputedRef } from 'vue'\nimport type { LayoutDirection } from '../types'\n\ninterface ListWheelState {\n  atStartEdge: ComputedRef<boolean> // exclusive to reachEnd\n  atEndEdge: ComputedRef<boolean>\n  layout: ComputedRef<LayoutDirection>\n}\n\ntype ListWheelHandler = (offset: number) => void\n\nconst useWheel = (\n  { atEndEdge, atStartEdge, layout }: ListWheelState,\n  onWheelDelta: ListWheelHandler\n) => {\n  let frameHandle: number\n  let offset = 0\n\n  const hasReachedEdge = (offset: number) => {\n    const edgeReached =\n      (offset < 0 && atStartEdge.value) || (offset > 0 && atEndEdge.value)\n\n    return edgeReached\n  }\n\n  const onWheel = (e: WheelEvent) => {\n    cAF(frameHandle)\n\n    let { deltaX, deltaY } = e\n    // Special case for windows machine with shift key + wheel scrolling\n    if (e.shiftKey && deltaY !== 0) {\n      deltaX = deltaY\n      deltaY = 0\n    }\n\n    const newOffset = layout.value === HORIZONTAL ? deltaX : deltaY\n\n    if (hasReachedEdge(offset) && hasReachedEdge(offset + newOffset)) return\n\n    offset += newOffset\n\n    if (!isFirefox() && newOffset !== 0) {\n      e.preventDefault()\n    }\n\n    frameHandle = rAF(() => {\n      onWheelDelta(offset)\n      offset = 0\n    })\n  }\n\n  return {\n    hasReachedEdge,\n    onWheel,\n  }\n}\n\nexport default useWheel\n"],"names":["offset","cAF","HORIZONTAL","isFirefox","rAF"],"mappings":";;;;;;;;AAcA,MAAM,WAAW,CACf,EAAE,WAAW,WAAa,EAAA,MAAA,IAC1B,YACG,KAAA;AACH,EAAI,IAAA,WAAA,CAAA;AACJ,EAAA,IAAI,MAAS,GAAA,CAAA,CAAA;AAEb,EAAM,MAAA,cAAA,GAAiB,CAACA,OAAmB,KAAA;AACzC,IAAA,MAAM,cACHA,OAAS,GAAA,CAAA,IAAK,YAAY,KAAWA,IAAAA,OAAAA,GAAS,KAAK,SAAU,CAAA,KAAA,CAAA;AAEhE,IAAO,OAAA,WAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAM,MAAA,OAAA,GAAU,CAAC,CAAkB,KAAA;AACjC,IAAAC,OAAA,CAAI,WAAW,CAAA,CAAA;AAEf,IAAI,IAAA,EAAE,MAAQ,EAAA,MAAA,EAAW,GAAA,CAAA,CAAA;AAEzB,IAAI,IAAA,CAAA,CAAE,QAAY,IAAA,MAAA,KAAW,CAAG,EAAA;AAC9B,MAAS,MAAA,GAAA,MAAA,CAAA;AACT,MAAS,MAAA,GAAA,CAAA,CAAA;AAAA,KACX;AAEA,IAAA,MAAM,SAAY,GAAA,MAAA,CAAO,KAAU,KAAAC,mBAAA,GAAa,MAAS,GAAA,MAAA,CAAA;AAEzD,IAAA,IAAI,cAAe,CAAA,MAAM,CAAK,IAAA,cAAA,CAAe,SAAS,SAAS,CAAA;AAAG,MAAA,OAAA;AAElE,IAAU,MAAA,IAAA,SAAA,CAAA;AAEV,IAAA,IAAI,CAACC,iBAAA,EAAe,IAAA,SAAA,KAAc,CAAG,EAAA;AACnC,MAAA,CAAA,CAAE,cAAe,EAAA,CAAA;AAAA,KACnB;AAEA,IAAA,WAAA,GAAcC,QAAI,MAAM;AACtB,MAAA,YAAA,CAAa,MAAM,CAAA,CAAA;AACnB,MAAS,MAAA,GAAA,CAAA,CAAA;AAAA,KACV,CAAA,CAAA;AAAA,GACH,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,cAAA;AAAA,IACA,OAAA;AAAA,GACF,CAAA;AACF;;;;"}
+{"version":3,"file":"use-wheel.js","sources":["../../../../../../../packages/components/virtual-list/src/hooks/use-wheel.ts"],"sourcesContent":["import { cAF, isFirefox, rAF } from '@element-plus/utils'\nimport { HORIZONTAL } from '../defaults'\n\nimport type { ComputedRef } from 'vue'\nimport type { LayoutDirection } from '../types'\n\ninterface ListWheelState {\n  atStartEdge: ComputedRef<boolean> // exclusive to reachEnd\n  atEndEdge: ComputedRef<boolean>\n  layout: ComputedRef<LayoutDirection>\n}\n\ntype ListWheelHandler = (offset: number) => void\n\nconst useWheel = (\n  { atEndEdge, atStartEdge, layout }: ListWheelState,\n  onWheelDelta: ListWheelHandler\n) => {\n  let frameHandle: number\n  let offset = 0\n\n  const hasReachedEdge = (offset: number) => {\n    const edgeReached =\n      (offset < 0 && atStartEdge.value) || (offset > 0 && atEndEdge.value)\n\n    return edgeReached\n  }\n\n  const onWheel = (e: WheelEvent) => {\n    cAF(frameHandle)\n\n    let { deltaX, deltaY } = e\n    // Special case for windows machine with shift key + wheel scrolling\n    if (e.shiftKey && deltaY !== 0) {\n      deltaX = deltaY\n      deltaY = 0\n    }\n\n    const newOffset = layout.value === HORIZONTAL ? deltaX : deltaY\n\n    if (hasReachedEdge(newOffset)) return\n\n    offset += newOffset\n\n    if (!isFirefox() && newOffset !== 0) {\n      e.preventDefault()\n    }\n\n    frameHandle = rAF(() => {\n      onWheelDelta(offset)\n      offset = 0\n    })\n  }\n\n  return {\n    hasReachedEdge,\n    onWheel,\n  }\n}\n\nexport default useWheel\n"],"names":["offset","cAF","HORIZONTAL","isFirefox","rAF"],"mappings":";;;;;;;;AAcA,MAAM,WAAW,CACf,EAAE,WAAW,WAAa,EAAA,MAAA,IAC1B,YACG,KAAA;AACH,EAAI,IAAA,WAAA,CAAA;AACJ,EAAA,IAAI,MAAS,GAAA,CAAA,CAAA;AAEb,EAAM,MAAA,cAAA,GAAiB,CAACA,OAAmB,KAAA;AACzC,IAAA,MAAM,cACHA,OAAS,GAAA,CAAA,IAAK,YAAY,KAAWA,IAAAA,OAAAA,GAAS,KAAK,SAAU,CAAA,KAAA,CAAA;AAEhE,IAAO,OAAA,WAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAM,MAAA,OAAA,GAAU,CAAC,CAAkB,KAAA;AACjC,IAAAC,OAAA,CAAI,WAAW,CAAA,CAAA;AAEf,IAAI,IAAA,EAAE,MAAQ,EAAA,MAAA,EAAW,GAAA,CAAA,CAAA;AAEzB,IAAI,IAAA,CAAA,CAAE,QAAY,IAAA,MAAA,KAAW,CAAG,EAAA;AAC9B,MAAS,MAAA,GAAA,MAAA,CAAA;AACT,MAAS,MAAA,GAAA,CAAA,CAAA;AAAA,KACX;AAEA,IAAA,MAAM,SAAY,GAAA,MAAA,CAAO,KAAU,KAAAC,mBAAA,GAAa,MAAS,GAAA,MAAA,CAAA;AAEzD,IAAA,IAAI,eAAe,SAAS,CAAA;AAAG,MAAA,OAAA;AAE/B,IAAU,MAAA,IAAA,SAAA,CAAA;AAEV,IAAA,IAAI,CAACC,iBAAA,EAAe,IAAA,SAAA,KAAc,CAAG,EAAA;AACnC,MAAA,CAAA,CAAE,cAAe,EAAA,CAAA;AAAA,KACnB;AAEA,IAAA,WAAA,GAAcC,QAAI,MAAM;AACtB,MAAA,YAAA,CAAa,MAAM,CAAA,CAAA;AACnB,MAAS,MAAA,GAAA,CAAA,CAAA;AAAA,KACV,CAAA,CAAA;AAAA,GACH,CAAA;AAEA,EAAO,OAAA;AAAA,IACL,cAAA;AAAA,IACA,OAAA;AAAA,GACF,CAAA;AACF;;;;"}