Merge pull request #108 from dev-family/ADM-185

(ADM-185: (Fix) SelectInput disable drag&drop with disable prop
dev-family · Dec 11, 2023 · e998872 · e998872
2 parents 4a36f8d + acdee6a
commit e998872
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/admiral/ui/Upload/Upload.tsx b/admiral/ui/Upload/Upload.tsx
@@ -133,7 +133,7 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (pr
                     onRemove={handleRemove}
                     onPreview={onPreview}
                     onDownload={onDownload}
-                    onDragEnd={isDraggable ? onDragEnd : undefined}
+                    onDragEnd={isDraggable && !disabled ? onDragEnd : undefined}
                     showRemoveIcon={!disabled && showRemoveIcon}
                     showPreviewIcon={!!onPreview}
                     showDownloadIcon={showDownloadIcon}

diff --git a/lib/admiral.es.js b/lib/admiral.es.js
@@ -93989,7 +93989,7 @@ const InternalUpload = (props, ref) => {
       onRemove: handleRemove,
       onPreview,
       onDownload,
-      onDragEnd: isDraggable ? onDragEnd3 : void 0,
+      onDragEnd: isDraggable && !disabled2 ? onDragEnd3 : void 0,
       showRemoveIcon: !disabled2 && showRemoveIcon,
       showPreviewIcon: !!onPreview,
       showDownloadIcon,

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