@iobroker/adapter-react-v5 6.0.15 → 6.0.17

package/Components/ObjectBrowser.d.ts

@@ -355,12 +355,11 @@ export declare class ObjectBrowserClass extends Component<ObjectBrowserProps, Ob
     #private;
     private info;
     private localStorage;
-    private lastSelectedItems;
     private lastAppliedFilter;
     private readonly tableRef;
     private readonly filterRefs;
     private pausedSubscribes;
-    private selectedFound;
+    private selectFirst;
     private root;
     private readonly states;
     private subscribes;

package/Components/ObjectBrowser.js

@@ -2187,18 +2187,18 @@ class ObjectBrowserClass extends react_1.Component {
             this.localStorage.removeItem(`${this.props.dialogName || 'App'}.table`);
             this.forceUpdate();
         };
-        const lastSelectedItems = this.localStorage.getItem(`${props.dialogName || 'App'}.objectSelected`) || '[]';
-        try {
-            this.lastSelectedItems = JSON.parse(lastSelectedItems);
-            if (typeof this.lastSelectedItems !== 'object') {
-                this.lastSelectedItems = [this.lastSelectedItems];
+        const lastSelectedItemStr = this.localStorage.getItem(`${props.dialogName || 'App'}.objectSelected`) || '';
+        if (lastSelectedItemStr.startsWith('[')) {
+            try {
+                const lastSelectedItems = JSON.parse(lastSelectedItemStr);
+                this.selectFirst = lastSelectedItems[0] || '';
+            }
+            catch (e) {
+                // ignore
             }
-            // remove empty items
-            this.lastSelectedItems = this.lastSelectedItems.filter((id) => id);
         }
-        catch (e) {
-            // ignore
-            this.lastSelectedItems = [];
+        else {
+            this.selectFirst = lastSelectedItemStr;
         }
         let expanded;
         const expandedStr = this.localStorage.getItem(`${props.dialogName || 'App'}.objectExpanded`) || '[]';
@@ -2256,7 +2256,7 @@ class ObjectBrowserClass extends react_1.Component {
             selected = props.selected;
         }
         selected = selected.map(id => id.replace(/["']/g, '')).filter(id => id);
-        this.selectedFound = !selected.length && !this.lastSelectedItems.length;
+        this.selectFirst = selected.length && selected[0] ? selected[0] : this.selectFirst;
         const columnsStr = this.localStorage.getItem(`${props.dialogName || 'App'}.columns`);
         let columns;
         try {
@@ -2587,18 +2587,20 @@ class ObjectBrowserClass extends react_1.Component {
      * @param isDouble is double click
      */
     onAfterSelect(isDouble) {
-        this.lastSelectedItems = [...this.state.selected];
-        if (this.state.selected && this.state.selected.length) {
-            this.localStorage.setItem(`${this.props.dialogName || 'App'}.objectSelected`, JSON.stringify(this.lastSelectedItems));
-            if (this.lastSelectedItems.length === 1 && this.objects[this.lastSelectedItems[0]]) {
-                const name = this.lastSelectedItems.length === 1
-                    ? Utils_1.default.getObjectName(this.objects, this.lastSelectedItems[0], null, { language: this.props.lang })
-                    : '';
-                this.props.onSelect && this.props.onSelect(this.lastSelectedItems, name, isDouble);
+        var _b;
+        if (((_b = this.state.selected) === null || _b === void 0 ? void 0 : _b.length) && this.state.selected[0]) {
+            this.localStorage.setItem(`${this.props.dialogName || 'App'}.objectSelected`, this.state.selected[0]);
+            // remove a task to select the pre-selected item if now we want to see another object
+            if (this.selectFirst && this.selectFirst !== this.state.selected[0]) {
+                this.selectFirst = '';
+            }
+            if (this.state.selected.length === 1 && this.objects[this.state.selected[0]]) {
+                const name = Utils_1.default.getObjectName(this.objects, this.state.selected[0], null, { language: this.props.lang });
+                this.props.onSelect && this.props.onSelect(this.state.selected, name, isDouble);
             }
         }
         else {
-            this.localStorage.setItem(`${this.props.dialogName || 'App'}.objectSelected`, '');
+            this.localStorage.removeItem(`${this.props.dialogName || 'App'}.objectSelected`);
             if (this.state.selected.length) {
                 this.setState({ selected: [] }, () => this.props.onSelect && this.props.onSelect([], ''));
             }
@@ -5038,19 +5040,18 @@ class ObjectBrowserClass extends react_1.Component {
      * Called when component is updated.
      */
     componentDidUpdate() {
-        var _b, _c, _d, _e;
         if (this.tableRef.current) {
             const scrollBarWidth = this.tableRef.current.offsetWidth - this.tableRef.current.clientWidth;
             if (this.state.scrollBarWidth !== scrollBarWidth) {
                 setTimeout(() => this.setState({ scrollBarWidth }), 100);
             }
-            else if (!this.selectedFound &&
-                (((_b = this.state.selected) === null || _b === void 0 ? void 0 : _b[0]) || ((_c = this.lastSelectedItems) === null || _c === void 0 ? void 0 : _c[0]))) {
-                this.scrollToItem(((_d = this.state.selected) === null || _d === void 0 ? void 0 : _d[0]) || ((_e = this.lastSelectedItems) === null || _e === void 0 ? void 0 : _e[0]));
+            else if (this.selectFirst) {
+                this.scrollToItem(this.selectFirst);
             }
         }
     }
     scrollToItem(id) {
+        this.selectFirst = '';
         const node = window.document.getElementById(id);
         node &&
             node.scrollIntoView({
@@ -5058,7 +5059,6 @@ class ObjectBrowserClass extends react_1.Component {
                 block: 'center',
                 inline: 'center',
             });
-        this.selectedFound = true;
     }
     renderCustomDialog() {
         if (this.state.customDialog && this.props.objectCustomDialog) {

package/README.md

@@ -781,7 +781,7 @@ The best practice is to replace `padding` with `p` and `margin` with `m`, so you
 -->
 
 ## Changelog
-### 6.0.15 (2024-07-13)
+### 6.0.17 (2024-07-14)
 * (bluefox) Allowed playing mp3 files in the file browser
 * (bluefox) Corrected jump by object selection
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/adapter-react-v5",
-  "version": "6.0.15",
+  "version": "6.0.17",
   "description": "React classes to develop admin interfaces for ioBroker with react.",
   "author": {
     "name": "Denis Haev (bluefox)",