Upgrade file-selector becasue of react-dropzone/react-dropzone#1397 (…

…comment) and #2926
ioBroker · Jan 26, 2025 · 9d3c0e3 · 9d3c0e3
1 parent 4b5e322
commit 9d3c0e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/packages/adapter-react-v5/package.json b/packages/adapter-react-v5/package.json
@@ -65,6 +65,7 @@
         "@mui/material": "^6.4.1",
         "@sentry/browser": "^8.51.0",
         "cronstrue": "^2.53.0",
+        "file-selector": "^2.1.2",
         "react-color": "^2.19.3",
         "react-colorful": "^5.6.1",
         "react-cropper": "^2.3.3",

diff --git a/packages/adapter-react-v5/src/Components/FileBrowser.tsx b/packages/adapter-react-v5/src/Components/FileBrowser.tsx
@@ -27,6 +27,8 @@ import {
     Input,
     Breadcrumbs,
     Box,
+    Checkbox,
+    FormControlLabel,
 } from '@mui/material';
 
 // MUI Icons
@@ -559,6 +561,7 @@ interface FileBrowserState {
     addFolder: boolean;
     uploadFile: boolean | 'dragging';
     deleteItem: string;
+    suppressDeleteConfirm: boolean;
     viewer: string;
     formatEditFile: string | null;
     path: string;
@@ -715,6 +718,7 @@ export class FileBrowserClass extends Component<FileBrowserProps, FileBrowserSta
             showTypesMenu: null,
             restrictToFolder: props.restrictToFolder || '',
             pathFocus: false,
+            suppressDeleteConfirm: false,
         };
 
         this.imagePrefix = this.props.imagePrefix || './files/';
@@ -2283,8 +2287,11 @@ export class FileBrowserClass extends Component<FileBrowserProps, FileBrowserSta
 
     deleteItem(deleteItem: string): void {
         deleteItem = deleteItem || this.state.deleteItem;
+        if (this.state.suppressDeleteConfirm) {
+            this.suppressDeleteConfirm = Date.now() + 60000 * 5;
+        }
 
-        this.setState({ deleteItem: '' }, () =>
+        this.setState({ deleteItem: '', suppressDeleteConfirm: false }, () =>
             this.deleteRecursive(deleteItem).then(() => {
                 const newState: Partial<FileBrowserState> = {};
                 const pos = this.state.expanded.indexOf(deleteItem);
@@ -2341,18 +2348,19 @@ export class FileBrowserClass extends Component<FileBrowserProps, FileBrowserSta
                     </DialogTitle>
                     <DialogContent>
                         <DialogContentText>{this.props.t('ra_Are you sure?')}</DialogContentText>
+                        <FormControlLabel
+                            control={
+                                <Checkbox
+                                    checked={this.state.suppressDeleteConfirm}
+                                    onChange={() => {
+                                        this.setState({ suppressDeleteConfirm: !this.state.suppressDeleteConfirm });
+                                    }}
+                                />
+                            }
+                            label={this.props.t('ra_no confirm for 5 mins')}
+                        />
                     </DialogContent>
                     <DialogActions>
-                        <Button
-                            color="grey"
-                            variant="contained"
-                            onClick={() => {
-                                this.suppressDeleteConfirm = Date.now() + 60000 * 5;
-                                this.deleteItem('');
-                            }}
-                        >
-                            {this.props.t('ra_Delete (no confirm for 5 mins)')}
-                        </Button>
                         <Button
                             variant="contained"
                             onClick={() => this.deleteItem('')}