@hoci/core 0.7.0 → 0.7.1

package/dist/index.cjs

@@ -567,15 +567,8 @@ const useFileUpload = shared.defineHookComponent({
   setup(props, { emit }) {
     const fileInputRef = shared.elementRef();
     const files = vue.ref([]);
-    vue.watch(props.modelValue, (value) => {
-      if (value instanceof File) {
-        files.value.push(value);
-      } else if (Array.isArray(value)) {
-        files.value.push(...value);
-      }
-      if (props.multiple) {
-        files.value.splice(1, files.value.length - 1);
-      }
+    vue.watch(() => shared.toArray(props.modelValue), (value) => {
+      files.value = value;
     }, {
       immediate: true,
       deep: true
@@ -583,18 +576,25 @@ const useFileUpload = shared.defineHookComponent({
     const openFileInput = () => {
       fileInputRef.value?.click();
     };
+    const toModelValue = (files2) => {
+      if (props.multiple) {
+        return files2;
+      }
+      if (files2.length) {
+        return files2[files2.length - 1];
+      }
+      return null;
+    };
     useEventListener(fileInputRef, "change", (event) => {
-      const newFiles = event.target.files;
-      let value = [];
-      if (newFiles) {
+      const newFiles = Array.from(event.target.files ?? []);
+      if (newFiles?.length) {
         if (props.multiple) {
-          value = Array.from(newFiles);
-          files.value.push(...value);
+          files.value.push(...newFiles);
         } else {
-          value = Array.from(newFiles)[0];
-          files.value = value ? [value] : [];
+          files.value = newFiles.slice(newFiles.length - 1);
         }
       }
+      const value = toModelValue(files.value);
       emit("update:modelValue", value);
       emit("change", value);
     });

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { defineHookProps, defineHookEmits, defineHookComponent, elementRef, toReactive, useElement, throttleByRaf, isWindow, useSharedConfig, valuePropType, labelPropType, classPropType, getFirstChilld } from '@hoci/shared';
+import { defineHookProps, defineHookEmits, defineHookComponent, elementRef, toReactive, useElement, throttleByRaf, isWindow, toArray, useSharedConfig, valuePropType, labelPropType, classPropType, getFirstChilld } from '@hoci/shared';
 export * from '@hoci/shared';
 import { getCurrentInstance, onMounted, nextTick, getCurrentScope, onScopeDispose, unref, watch, ref, computed, inject, watchPostEffect, provide, reactive, renderSlot } from 'vue';
 import { px, createUnitFormat, cls } from 'tslx';
@@ -566,15 +566,8 @@ const useFileUpload = defineHookComponent({
   setup(props, { emit }) {
     const fileInputRef = elementRef();
     const files = ref([]);
-    watch(props.modelValue, (value) => {
-      if (value instanceof File) {
-        files.value.push(value);
-      } else if (Array.isArray(value)) {
-        files.value.push(...value);
-      }
-      if (props.multiple) {
-        files.value.splice(1, files.value.length - 1);
-      }
+    watch(() => toArray(props.modelValue), (value) => {
+      files.value = value;
     }, {
       immediate: true,
       deep: true
@@ -582,18 +575,25 @@ const useFileUpload = defineHookComponent({
     const openFileInput = () => {
       fileInputRef.value?.click();
     };
+    const toModelValue = (files2) => {
+      if (props.multiple) {
+        return files2;
+      }
+      if (files2.length) {
+        return files2[files2.length - 1];
+      }
+      return null;
+    };
     useEventListener(fileInputRef, "change", (event) => {
-      const newFiles = event.target.files;
-      let value = [];
-      if (newFiles) {
+      const newFiles = Array.from(event.target.files ?? []);
+      if (newFiles?.length) {
         if (props.multiple) {
-          value = Array.from(newFiles);
-          files.value.push(...value);
+          files.value.push(...newFiles);
         } else {
-          value = Array.from(newFiles)[0];
-          files.value = value ? [value] : [];
+          files.value = newFiles.slice(newFiles.length - 1);
         }
       }
+      const value = toModelValue(files.value);
       emit("update:modelValue", value);
       emit("change", value);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoci/core",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "",
   "author": "Chizuki <chizukicn@outlook.com>",
   "license": "MIT",
@@ -29,7 +29,7 @@
   "dependencies": {
     "maybe-types": "^0.2.0",
     "tslx": "^0.1.1",
-    "@hoci/shared": "0.7.0"
+    "@hoci/shared": "0.7.1"
   },
   "scripts": {
     "build": "unbuild",