@iobroker/adapter-react-v5 5.0.0 → 5.0.1

package/Components/FileBrowser.js

@@ -1496,7 +1496,6 @@ class FileBrowser extends react_1.Component {
                     }
                 });
                 newState.folders = folders;
-                // @ts-expect-error fix later
                 this.setState(newState, () => setTimeout(() => {
                     this.browseFolders([...this.state.expanded], folders)
                         .then(_folders => this.setState({ folders: _folders }));

package/Components/FileViewer.js

@@ -176,7 +176,6 @@ class FileViewer extends react_1.Component {
                         newState.editingValue = fileData;
                     }
                 }
-                // @ts-expect-error I don't know how to fix it
                 this.setState(newState);
             })
                 .catch(e => window.alert(`Cannot read file: ${e}`));
@@ -221,7 +220,6 @@ class FileViewer extends react_1.Component {
                 return react_1.default.createElement(IconNoIcon_1.default, { className: Utils_1.default.clsx(this.props.classes.img, this.props.getClassBackgroundImage()) });
             }
             return react_1.default.createElement(Icon_1.default, { onError: e => {
-                    // @ts-ignore-error to check
                     e.target.onerror = null;
                     this.setState({ imgError: true });
                 }, className: Utils_1.default.clsx(this.props.classes.img, this.props.getClassBackgroundImage()), src: `${this.props.href}?ts=${this.state.forceUpdate}`, alt: this.props.href });

package/Components/Logo.js

@@ -21,7 +21,7 @@ class Logo extends react_1.default.Component {
             if (f) {
                 const r = new window.FileReader();
                 r.onload = () => {
-                    // @ts-ignore
+                    // @ts-expect-error I don't know how to fix this
                     const contents = target.result;
                     try {
                         const json = JSON.parse(contents);

package/Components/ObjectBrowser.js

@@ -3963,8 +3963,11 @@ class ObjectBrowser extends react_1.Component {
         }
         if (this.state.roleDialog && this.props.objectBrowserEditRole) {
             const ObjectBrowserEditRole = this.props.objectBrowserEditRole;
-            // @ts-expect-error How to solve it?
-            return react_1.default.createElement(ObjectBrowserEditRole, { key: "objectBrowserEditRole", id: this.state.roleDialog, socket: this.props.socket, t: this.props.t, roles: this.info.roles, onClose: (obj) => {
+            return react_1.default.createElement(ObjectBrowserEditRole
+            // dummy, just to make compiler happy
+            , { 
+                // dummy, just to make compiler happy
+                classes: {}, key: "objectBrowserEditRole", id: this.state.roleDialog, socket: this.props.socket, t: this.props.t, roles: this.info.roles, onClose: (obj) => {
                     if (obj) {
                         this.info.objects[this.state.roleDialog] = obj;
                     }
@@ -4549,9 +4552,8 @@ class ObjectBrowser extends react_1.Component {
         counter = counter || { count: 0 };
         let leaf = this.renderLeaf(root, isExpanded, classes, counter);
         const DragWrapper = this.props.DragWrapper;
-        if (this.props.dragEnabled) {
+        if (this.props.dragEnabled && DragWrapper) {
             if (root.data.sumVisibility) {
-                // @ts-expect-error How to solve it?
                 leaf = react_1.default.createElement(DragWrapper, { key: root.data.id, item: root, className: classes.draggable }, leaf);
             }
             else {
@@ -4906,8 +4908,7 @@ class ObjectBrowser extends react_1.Component {
     renderCustomDialog() {
         if (this.state.customDialog && this.props.objectCustomDialog) {
             const ObjectCustomDialog = this.props.objectCustomDialog;
-            // @ts-expect-error How to solve it?
-            return react_1.default.createElement(ObjectCustomDialog, { reportChangedIds: (changedIds) => (this.changedIds = [...changedIds]), objectIDs: this.state.customDialog, allVisibleObjects: this.state.customDialogAll, expertMode: this.state.filter.expertMode, isFloatComma: this.props.isFloatComma, t: this.props.t, lang: this.props.lang, socket: this.props.socket, themeName: this.props.themeName, themeType: this.props.themeType, theme: this.props.theme, objects: this.objects, customsInstances: this.info.customs, onClose: () => {
+            return react_1.default.createElement(ObjectCustomDialog, { reportChangedIds: (changedIds) => (this.changedIds = [...changedIds]), objectIDs: this.state.customDialog, allVisibleObjects: !!this.state.customDialogAll, expertMode: this.state.filter.expertMode, isFloatComma: this.props.isFloatComma === undefined ? this.systemConfig.common.isFloatComma : this.props.isFloatComma, t: this.props.t, lang: this.props.lang, socket: this.props.socket, themeName: this.props.themeName, themeType: this.props.themeType, theme: this.props.theme, objects: this.objects, customsInstances: this.info.customs, onClose: () => {
                     var _b;
                     this.pauseSubscribe(false);
                     this.setState({ customDialog: null });
@@ -4917,7 +4918,9 @@ class ObjectBrowser extends react_1.Component {
                         this.forceUpdate();
                     }
                     (_b = this.props.router) === null || _b === void 0 ? void 0 : _b.doNavigate('tab-objects');
-                }, systemConfig: this.systemConfig });
+                }, systemConfig: this.systemConfig, 
+                // dummy, just to make compiler happy
+                classes: {} });
         }
         return null;
     }
@@ -4936,8 +4939,11 @@ class ObjectBrowser extends react_1.Component {
             return null;
         }
         const ObjectBrowserEditObject = this.props.objectBrowserEditObject;
-        // @ts-expect-error How to solve it?
-        return react_1.default.createElement(ObjectBrowserEditObject, { key: this.state.editObjectDialog, obj: this.objects[this.state.editObjectDialog], roleArray: this.info.roles, objects: this.objects, dateFormat: this.props.dateFormat, isFloatComma: this.props.isFloatComma, themeType: this.props.themeType, socket: this.props.socket, dialogName: this.props.dialogName, aliasTab: this.state.editObjectAlias, t: this.props.t, expertMode: this.state.filter.expertMode, onNewObject: (obj) => this.props.socket
+        return react_1.default.createElement(ObjectBrowserEditObject
+        // dummy, just to make compiler happy
+        , { 
+            // dummy, just to make compiler happy
+            classes: {}, key: this.state.editObjectDialog, obj: this.objects[this.state.editObjectDialog], roleArray: this.info.roles, objects: this.objects, dateFormat: this.props.dateFormat || this.systemConfig.common.dateFormat, isFloatComma: this.props.isFloatComma === undefined ? this.systemConfig.common.isFloatComma : this.props.isFloatComma, themeType: this.props.themeType, socket: this.props.socket, dialogName: this.props.dialogName, aliasTab: this.state.editObjectAlias, t: this.props.t, expertMode: !!this.state.filter.expertMode, onNewObject: (obj) => this.props.socket
                 .setObject(obj._id, obj)
                 .then(() => this.setState({ editObjectDialog: obj._id, editObjectAlias: false }, () => this.onSelect(obj._id)))
                 .catch(e => this.showError(`Cannot write object: ${e}`)), onClose: (obj) => {
@@ -4968,16 +4974,14 @@ class ObjectBrowser extends react_1.Component {
             return null;
         }
         const ObjectBrowserViewFile = this.props.objectBrowserViewFile;
-        // @ts-expect-error How to solve it?
-        return react_1.default.createElement(ObjectBrowserViewFile, { key: "viewFile", obj: this.objects[this.state.viewFileDialog], themeType: this.props.themeType, socket: this.props.socket, dialogName: this.props.dialogName, t: this.props.t, expertMode: this.state.filter.expertMode, onClose: () => this.setState({ viewFileDialog: '' }) });
+        return react_1.default.createElement(ObjectBrowserViewFile, { key: "viewFile", obj: this.objects[this.state.viewFileDialog], socket: this.props.socket, t: this.props.t, onClose: () => this.setState({ viewFileDialog: '' }) });
     }
     renderAliasEditorDialog() {
         if (!this.props.objectBrowserAliasEditor || !this.state.showAliasEditor) {
             return null;
         }
         const ObjectBrowserAliasEditor = this.props.objectBrowserAliasEditor;
-        // @ts-expect-error How to solve it?
-        return react_1.default.createElement(ObjectBrowserAliasEditor, { key: "editAlias", obj: this.objects[this.state.showAliasEditor], objects: this.objects, themeType: this.props.themeType, socket: this.props.socket, dialogName: this.props.dialogName, t: this.props.t, expertMode: this.state.filter.expertMode, onClose: () => this.setState({ showAliasEditor: '' }), onRedirect: (id, timeout) => setTimeout(() => this.onSelect(id, false, () => this.expandAllSelected(() => {
+        return react_1.default.createElement(ObjectBrowserAliasEditor, { key: "editAlias", obj: this.objects[this.state.showAliasEditor], objects: this.objects, socket: this.props.socket, t: this.props.t, onClose: () => this.setState({ showAliasEditor: '' }), onRedirect: (id, timeout) => setTimeout(() => this.onSelect(id, false, () => this.expandAllSelected(() => {
                 this.scrollToItem(id);
                 setTimeout(() => this.setState({
                     editObjectDialog: id,
@@ -5325,11 +5329,12 @@ class ObjectBrowser extends react_1.Component {
             : typeof this.edit.val;
         const role = this.objects[this.edit.id].common.role;
         const ObjectBrowserValue = this.props.objectBrowserValue;
-        // @ts-expect-error How to solve it?
-        return react_1.default.createElement(ObjectBrowserValue, { t: this.props.t, lang: this.props.lang, type: type, role: role, states: Utils_1.default.getStates(this.objects[this.edit.id]), themeType: this.props.themeType, expertMode: this.state.filter.expertMode, value: this.edit.val, socket: this.props.socket, object: this.objects[this.edit.id], defaultHistory: this.defaultHistory, dateFormat: this.props.dateFormat, onClose: (res) => {
+        return react_1.default.createElement(ObjectBrowserValue, { t: this.props.t, lang: this.props.lang, type: type, role: role || '', states: Utils_1.default.getStates(this.objects[this.edit.id]), themeType: this.props.themeType, expertMode: !!this.state.filter.expertMode, value: this.edit.val, socket: this.props.socket, object: this.objects[this.edit.id], defaultHistory: this.defaultHistory, dateFormat: this.props.dateFormat || this.systemConfig.common.dateFormat, isFloatComma: this.props.isFloatComma === undefined ? this.systemConfig.common.isFloatComma : this.props.isFloatComma, onClose: (res) => {
                 this.setState({ updateOpened: false });
                 res && this.onUpdate(res);
-            } });
+            }, 
+            // dummy, just to make compiler happy
+            classes: {} });
     }
     /**
      * The rendering method of this component.

package/Components/Utils.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018-2023 Denis Haev <dogafox@gmail.com>
+ * Copyright 2018-2024 Denis Haev <dogafox@gmail.com>
  *
  * MIT License
  *
@@ -10,11 +10,13 @@ interface GetObjectNameOptions {
     name?: ioBroker.StringOrTranslated;
     language?: ioBroker.Languages;
 }
-type SmartName = null | (ioBroker.StringOrTranslated & {
+type SmartName = null | false | string | ({
+    [lang in ioBroker.Languages]?: string;
+} & {
     /** Which kind of device it is */
     smartType?: string | null;
     /** Which value to set when the ON command is issued */
-    byOn?: string | null;
+    byON?: string | null;
 });
 declare namespace clsx {
     type ClassValue = ClassArray | ClassDictionary | string | number | null | boolean | undefined;
@@ -262,10 +264,9 @@ declare class Utils {
     static generateFile(fileName: string, json: string): void;
     /**
      * Convert quality code into text
-     * @param {number} quality code
-     * @returns {array<string>} lines that decode quality
+     * @returns lines that decode quality
      */
-    static quality2text(quality: number): string[];
+    static quality2text(quality: ioBroker.STATE_QUALITY[keyof ioBroker.STATE_QUALITY]): string[];
     /**
      * Deep copy object
      */

package/Components/Utils.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
- * Copyright 2018-2023 Denis Haev <dogafox@gmail.com>
+ * Copyright 2018-2024 Denis Haev <dogafox@gmail.com>
  *
  * MIT License
  *
@@ -262,7 +262,6 @@ class Utils {
             }
         }
         if (common) {
-            // @ts-ignore todo: after new types released
             settings.color = settings.color || common.color;
             settings.icon = settings.icon || common.icon;
             settings.name = settings.name || common.name;
@@ -294,7 +293,6 @@ class Utils {
             const s = obj.common.custom[NAMESPACE][options.user || 'admin'];
             if (s.useCommon) {
                 if (s.color !== undefined) {
-                    // @ts-ignore todo: after new types released
                     obj.common.color = s.color;
                     delete s.color;
                 }
@@ -563,7 +561,7 @@ class Utils {
             const m = now.match(/(\d{1,4})[-./](\d{1,2})[-./](\d{1,4})/);
             if (m) {
                 const a = [parseInt(m[1], 10), parseInt(m[2], 10), parseInt(m[3], 10)];
-                // we now have 3 numbers. Let's try to detect where is year, where is day and where is month
+                // We now have 3 numbers. Let's try to detect where is year, where is day and where is month
                 const year = a.find(y => y > 31);
                 if (year !== undefined) {
                     a.splice(a.indexOf(year), 1);
@@ -651,18 +649,14 @@ class Utils {
         if (!id) {
             if (!noCommon) {
                 if (!states.common) {
-                    // @ts-ignore
                     return states.smartName;
                 }
                 if (states && !states.common) {
-                    // @ts-ignore
                     return states.smartName;
                 }
-                // @ts-ignore
                 return states.common.smartName;
             }
             if (states && !states.common) {
-                // @ts-ignore
                 return states.smartName;
             }
             const obj = states;
@@ -670,7 +664,6 @@ class Utils {
                 obj.common.custom[instanceId].smartName : undefined;
         }
         if (!noCommon) {
-            // @ts-ignore
             return states[id].common.smartName;
         }
         const obj = states[id];
@@ -684,18 +677,14 @@ class Utils {
         var _a;
         if (!noCommon) {
             if (!obj.common) {
-                // @ts-ignore
                 return obj.smartName;
             }
             if (obj && !obj.common) {
-                // @ts-ignore
                 return obj.smartName;
             }
-            // @ts-ignore
             return obj.common.smartName;
         }
         if (obj && !obj.common) {
-            // @ts-ignore
             return obj.smartName;
         }
         return ((_a = obj === null || obj === void 0 ? void 0 : obj.common) === null || _a === void 0 ? void 0 : _a.custom) && obj.common.custom[instanceId] ?
@@ -724,7 +713,6 @@ class Utils {
             }
         }
         else {
-            // @ts-ignore
             obj.common.smartName = null;
         }
     }
@@ -783,7 +771,6 @@ class Utils {
             }
             else {
                 obj.common.smartName = obj.common.smartName || {};
-                // @ts-ignore
                 obj.common.smartName.byON = byON;
             }
         }
@@ -832,7 +819,7 @@ class Utils {
                             delete obj.common.custom[instanceId].uk;
                             delete obj.common.custom[instanceId]['zh-cn'];
                         }
-                        // @ts-ignore
+                        // @ts-expect-error
                     }
                     else if (obj.common.smartName && obj.common.smartName.byON !== undefined) {
                         delete obj.common.smartName.en;
@@ -848,7 +835,6 @@ class Utils {
                         delete obj.common.smartName['zh-cn'];
                     }
                     else {
-                        // @ts-ignore
                         obj.common.smartName = null;
                     }
                 }
@@ -865,7 +851,6 @@ class Utils {
             obj.common.custom[instanceId].smartName = false;
         }
         else {
-            // @ts-ignore
             obj.common.smartName = false;
         }
     }
@@ -1418,13 +1403,11 @@ class Utils {
     }
     /**
      * Convert quality code into text
-     * @param {number} quality code
-     * @returns {array<string>} lines that decode quality
+     * @returns lines that decode quality
      */
     static quality2text(quality) {
         // eslint-disable-next-line no-bitwise
         const custom = quality & 0xFFFF0000;
-        // @ts-ignore
         const text = QUALITY_BITS[quality];
         let result;
         if (text) {
@@ -1523,7 +1506,6 @@ class Utils {
      */
     static detectMimeType(base64) {
         const signature = Object.keys(SIGNATURES).find(s => base64.startsWith(s));
-        // @ts-ignore
         return signature ? SIGNATURES[signature] : null;
     }
     /**

package/Dialogs/ComplexCron.js

@@ -57,15 +57,15 @@ class DialogComplexCron extends react_1.default.Component {
                 react_1.default.createElement(ComplexCron_1.default, { cronExpression: this.state.cron, onChange: cron => this.setState({ cron }), language: i18n_1.default.getLanguage() })),
             react_1.default.createElement(material_1.DialogActions, null,
                 !!this.props.clearButton && react_1.default.createElement(material_1.Button
-                // @ts-expect-error
+                // @ts-expect-error grey is valid color
                 , { 
-                    // @ts-expect-error
+                    // @ts-expect-error grey is valid color
                     color: "grey", variant: "contained", onClick: () => this.handleClear(), startIcon: react_1.default.createElement(icons_material_1.Delete, null) }, this.props.clear || i18n_1.default.t('ra_Clear')),
                 react_1.default.createElement(material_1.Button, { variant: "contained", onClick: () => this.handleOk(), color: "primary", startIcon: react_1.default.createElement(icons_material_1.Check, null) }, this.props.ok || i18n_1.default.t('ra_Ok')),
                 react_1.default.createElement(material_1.Button
-                // @ts-expect-error
+                // @ts-expect-error grey is valid color
                 , { 
-                    // @ts-expect-error
+                    // @ts-expect-error grey is valid color
                     color: "grey", variant: "contained", onClick: () => this.handleCancel(), startIcon: react_1.default.createElement(icons_material_1.Cancel, null) }, this.props.cancel || i18n_1.default.t('ra_Cancel'))));
     }
 }

package/Dialogs/Confirm.js

@@ -106,7 +106,7 @@ class DialogConfirm extends react_1.Component {
             react_1.default.createElement(material_1.DialogActions, null,
                 react_1.default.createElement(material_1.Button, { id: `ar_dialog_confirm_ok_${this.props.dialogName || ''}`, variant: "contained", onClick: () => this.handleOk(), color: "primary", autoFocus: true, startIcon: react_1.default.createElement(icons_material_1.Check, null) }, this.props.ok || i18n_1.default.t('ra_Ok')),
                 react_1.default.createElement(material_1.Button, { id: `ar_dialog_confirm_cancel_${this.props.dialogName || ''}`, variant: "contained", onClick: () => this.handleCancel(), 
-                    // @ts-expect-error
+                    // @ts-expect-error grey is valid color
                     color: "grey", startIcon: react_1.default.createElement(icons_material_1.Close, null) }, this.props.cancel || i18n_1.default.t('ra_Cancel'))));
     }
 }

package/Dialogs/Cron.js

@@ -99,7 +99,7 @@ class DialogCron extends react_1.default.Component {
             react_1.default.createElement(material_1.DialogActions, null,
                 react_1.default.createElement(material_1.Button, { variant: "contained", onClick: () => this.handleOk(), color: "primary", startIcon: react_1.default.createElement(icons_material_1.Check, null) }, this.props.ok || i18n_1.default.t('ra_Ok')),
                 react_1.default.createElement(material_1.Button, { variant: "contained", onClick: () => this.handleCancel(), 
-                    // @ts-expect-error grey is allowed color
+                    // @ts-expect-error grey is valid color
                     color: "grey", startIcon: react_1.default.createElement(icons_material_1.Cancel, null) }, this.props.cancel || i18n_1.default.t('ra_Cancel'))));
     }
 }

package/Dialogs/SelectFile.js

@@ -113,9 +113,9 @@ class DialogSelectFile extends react_1.default.Component {
             react_1.default.createElement(material_1.DialogActions, null,
                 react_1.default.createElement(material_1.Button, { variant: "contained", onClick: () => this.handleOk(), startIcon: react_1.default.createElement(icons_material_1.Check, null), disabled: !this.state.selected.length, color: "primary" }, this.props.ok || i18n_1.default.t('ra_Ok')),
                 react_1.default.createElement(material_1.Button
-                // @ts-expect-error grey is allowed color
+                // @ts-expect-error grey is valid color
                 , { 
-                    // @ts-expect-error grey is allowed color
+                    // @ts-expect-error grey is valid color
                     color: "grey", variant: "contained", onClick: () => this.handleCancel(), startIcon: react_1.default.createElement(icons_material_1.Cancel, null) }, this.props.cancel || i18n_1.default.t('ra_Cancel'))));
     }
 }

package/Dialogs/SelectID.js

@@ -146,7 +146,7 @@ class DialogSelectID extends react_1.Component {
             react_1.default.createElement(material_1.DialogActions, null,
                 react_1.default.createElement(material_1.Button, { id: `ar_dialog_selectid_ok_${this.props.dialogName || ''}`, variant: "contained", onClick: () => this.handleOk(), startIcon: react_1.default.createElement(icons_material_1.Check, null), disabled: !this.state.selected.length, color: "primary" }, this.props.ok || i18n_1.default.t('ra_Ok')),
                 react_1.default.createElement(material_1.Button, { id: `ar_dialog_selectid_cancel_${this.props.dialogName || ''}`, 
-                    // @ts-expect-error
+                    // @ts-expect-error grey is valid color
                     color: "grey", variant: "contained", onClick: () => this.handleCancel(), startIcon: react_1.default.createElement(icons_material_1.Cancel, null) }, this.props.cancel || i18n_1.default.t('ra_Cancel'))));
     }
 }

package/Dialogs/SimpleCron.js

@@ -54,7 +54,7 @@ class DialogSimpleCron extends react_1.default.Component {
             react_1.default.createElement(material_1.DialogActions, null,
                 react_1.default.createElement(material_1.Button, { variant: "contained", onClick: () => this.handleOk(), color: "primary", startIcon: react_1.default.createElement(icons_material_1.Check, null) }, this.props.ok || i18n_1.default.t('ra_Ok')),
                 react_1.default.createElement(material_1.Button, { variant: "contained", onClick: () => this.handleCancel(), 
-                    // @ts-expect-error grey is allowed color
+                    // @ts-expect-error grey is valid color
                     color: "grey", startIcon: react_1.default.createElement(icons_material_1.Cancel, null) }, this.props.cancel || i18n_1.default.t('ra_Cancel'))));
     }
 }

package/README.md

@@ -670,6 +670,9 @@ socket.getObjectViewCustom('custom', 'state', 'startKey', 'endKey')
 -->
 
 ## Changelog
+### 5.0.1 (2024-05-29)
+* (bluefox) Added better typing
+
 ### 5.0.0 (2024-05-29)
 * (bluefox) Types are now exported
 * (bluefox) Translator renamed to Translate

package/package.json

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