Merge pull request #106 from dev-family/ADM-183

ADM-183: Fix FilePictureInput disable list
dev-family · Nov 20, 2023 · 51dd0c6 · 51dd0c6
2 parents fe694f9 + 7cab813
commit 51dd0c6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/admiral/form/fields/FilePictureInput.tsx b/admiral/form/fields/FilePictureInput.tsx
@@ -25,7 +25,6 @@ export const FilePictureInput: InputComponentWithName<React.FC<FilePictureInputP
 }) => {
     const { values, errors, setValues, locale: formLocale } = useForm()
     const locale = formLocale.fields.upload
-
     let value = values[name]
 
     const isArrayValue = Array.isArray(value)
@@ -55,6 +54,7 @@ export const FilePictureInput: InputComponentWithName<React.FC<FilePictureInputP
                 fileList={normalizedValue}
                 onChange={onChange}
                 maxCount={maxCount}
+                disabled={disabled}
             >
                 <Button type="button" disabled={disabled} iconLeft={<FiUpload />}>
                     {children || 'Upload'}

diff --git a/admiral/ui/Upload/Upload.tsx b/admiral/ui/Upload/Upload.tsx
@@ -43,7 +43,6 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (pr
         value: fileList,
         postState: (list) => list ?? [],
     })
-
     const upload = React.useRef<any>()
 
     // Control mode will auto fill file uid if not provided
@@ -79,7 +78,7 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (pr
     }
 
     const mergedBeforeUpload = async (file: RcFile, fileListArgs: RcFile[]) => {
-        onInternalChange(file, fileListArgs)
+        !disabled && onInternalChange(file, fileListArgs)
         return false
     }
 
@@ -191,6 +190,7 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (pr
                     <RcUpload
                         {...rcUploadProps}
                         ref={upload}
+                        disabled={disabled}
                         className={cn({
                             [`${prefixCls}-btn`]: buttonType === 'drag',
                             [styles.item]: buttonType === 'picture-card',

diff --git a/lib/admiral.es.js b/lib/admiral.es.js
@@ -93945,7 +93945,7 @@ const InternalUpload = (props, ref) => {
     onChange2 == null ? void 0 : onChange2(changeInfo);
   };
   const mergedBeforeUpload = async (file2, fileListArgs) => {
-    onInternalChange(file2, fileListArgs);
+    !disabled2 && onInternalChange(file2, fileListArgs);
     return false;
   };
   const handleRemove = (file2) => {
@@ -94028,6 +94028,7 @@ const InternalUpload = (props, ref) => {
         })
       }, /* @__PURE__ */ React__default.createElement(Upload$2, __spreadProps(__spreadValues({}, rcUploadProps), {
         ref: upload2,
+        disabled: disabled2,
         className: cn$1({
           [`${prefixCls2}-btn`]: buttonType2 === "drag",
           [styles$8.item]: buttonType2 === "picture-card"
@@ -95001,7 +95002,8 @@ const FilePictureInput = (_S) => {
     locale: locale2,
     fileList: normalizedValue,
     onChange: onChange2,
-    maxCount
+    maxCount,
+    disabled: disabled2
   }), /* @__PURE__ */ React__default.createElement(Button$1, {
     type: "button",
     disabled: disabled2,

diff --git a/lib/admiral.umd.js b/lib/admiral.umd.js