@iobroker/adapter-react-v5 2.1.6 → 2.1.10

package/Components/ObjectBrowser.js

@@ -1,10 +1,36 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof3 = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -13,10 +39,6 @@ var _copyToClipboard = _interopRequireDefault(require("./copy-to-clipboard"));
 
 var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
 
-var _styles = require("@mui/material/styles");
-
-var _useMediaQuery = _interopRequireDefault(require("@mui/material/useMediaQuery"));
-
 var _reactInlinesvg = _interopRequireDefault(require("react-inlinesvg"));
 
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
@@ -161,82 +183,20 @@ var _TabContent = _interopRequireDefault(require("./TabContent"));
 
 var _TabHeader = _interopRequireDefault(require("./TabHeader"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _withWidth = _interopRequireDefault(require("./withWidth"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function useWidth() {
-  var theme = (0, _styles.useTheme)();
-
-  var keys = _toConsumableArray(theme.breakpoints.keys).reverse();
-
-  return keys.reduce(function (output, key) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    var matches = (0, _useMediaQuery["default"])(theme.breakpoints.up(key));
-    return !output && matches ? key : output;
-  }, null) || 'xs';
-} // FIXME checkout https://mui.com/components/use-media-query/#migrating-from-withwidth
-
-
-var withWidth = function withWidth() {
-  return function (WrappedComponent) {
-    return function (props) {
-      var width = useWidth();
-      return /*#__PURE__*/_react["default"].createElement(WrappedComponent, _extends({}, props, {
-        width: width
-      }));
-    };
-  };
-};
-
 var ICON_SIZE = 24;
 var ROW_HEIGHT = 32;
 var ITEM_LEVEL = 16;
@@ -345,7 +305,7 @@ var styles = function styles(theme) {
       paddingTop: 0,
       //theme.spacing(1),
       paddingLeft: 0,
-      width: "calc(100% - ".concat(theme.spacing(1), "px)"),
+      width: "calc(100% - ".concat(theme.spacing(1), ")"),
       height: "calc(100% - 38px)",
       overflow: 'auto'
     },
@@ -625,6 +585,7 @@ var styles = function styles(theme) {
         opacity: 1
       },
       paddingTop: 0,
+      paddingLeft: 0,
       marginTop: -2
     },
     cellButtonsEmptyButton: {
@@ -658,7 +619,7 @@ var styles = function styles(theme) {
       cursor: 'pointer'
     },
     cellButtonsValueButtonEdit: {
-      right: SMALL_BUTTON_SIZE / 2 + theme.spacing(2)
+      right: SMALL_BUTTON_SIZE / 2 + parseInt(theme.spacing(2), 10)
     },
     filteredOut: {
       opacity: 0.5
@@ -864,7 +825,8 @@ function binarySearch(list, find, _start, _end) {
   }
 }
 
-function applyFilter(item, filters, lang, objects, context, counter, customFilter, selectedTypes) {
+function applyFilter(item, filters, lang, objects, context, counter, customFilter, selectedTypes, _depth) {
+  _depth = _depth || 0;
   var filteredOut = false;
 
   if (!context) {
@@ -980,9 +942,9 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
   data.visible = !filteredOut;
   data.hasVisibleChildren = false;
 
-  if (item.children) {
+  if (item.children && _depth < 20) {
     item.children.forEach(function (_item) {
-      var visible = applyFilter(_item, filters, lang, objects, context, counter, customFilter, selectedTypes);
+      var visible = applyFilter(_item, filters, lang, objects, context, counter, customFilter, selectedTypes, _depth + 1);
 
       if (visible) {
         data.hasVisibleChildren = true;
@@ -1318,7 +1280,7 @@ function findNode(root, id, _parts, _path, _level) {
 }
 
 function getName(name, lang) {
-  if (name && _typeof(name) === 'object') {
+  if (name && (0, _typeof2["default"])(name) === 'object') {
     return (name[lang] || name.en || '').toString();
   } else {
     return (name || '').toString();
@@ -1457,49 +1419,18 @@ function formatValue(id, state, obj, texts, dateFormat, isFloatComma) {
   var isCommon = obj.common;
   var valText = {};
   var v = isCommon && isCommon.type === 'file' ? '[file]' : !state || state.val === null ? '(null)' : state.val === undefined ? '[undef]' : state.val;
-
-  var type = _typeof(v);
+  var type = (0, _typeof2["default"])(v);
 
   if (isCommon && isCommon.role && typeof isCommon.role === 'string' && isCommon.role.match(/^value\.time|^date/)) {
     if (v && typeof v === 'string') {
       if (v.length === 13) {
         // (length of "1647597254924") warning, this solution only works till Nov 20 2286 18:46:39CET
         v = new Date(parseInt(v, 10)).toString();
-      } else if (v.length === 10) {
-        // YYYY.MM.DD
-        var parts = v.split(/[-.]/);
-
-        if (parts.length === 3) {
-          if (parts[0].length === 4) {
-            // YYYY.MM.DD
-            v = new Date(parseInt(parts[0], 10), parseInt(parts[1], 10) + 1, parseInt(parts[2], 10));
-          } else if (parts[0].length === 4) {
-            // DD.MM.YYYY
-            v = new Date(parseInt(parts[2], 10), parseInt(parts[1], 10) + 1, parseInt(parts[0], 10));
-          }
-        } else {
-          v = new Date(v).toString(); // Let the browser convert it somehow
-        }
-      } else if (v.length === 8) {
-        // YY.MM.DD
-        var _parts2 = v.split(/[-.]/);
-
-        if (_parts2.length === 3) {
-          v = new Date(parseInt(_parts2[0], 10), parseInt(_parts2[1], 10) + 1, parseInt(_parts2[2], 10));
-        } else {
-          v = new Date(v).toString(); // Let the browser convert it somehow
-        }
-      } else {
-        v = new Date(v).toString(); // Let the browser convert it somehow
+      } else {// we don't know what is that, so leave it as it is
       }
     } else {
-      if (v === null || v === 'null') {
-        v = 'null';
-      } else if (v === undefined) {
-        v = 'undefined';
-      } else {
-        v = v ? new Date(v).toString() : v;
-      }
+      // null and undefined could not be here. See `let v = (isCommon && isCommon.type === 'file') ....` above
+      v = v ? new Date(v).toString() : v;
     }
   } else {
     if (type === 'number') {
@@ -1517,11 +1448,12 @@ function formatValue(id, state, obj, texts, dateFormat, isFloatComma) {
     if (typeof v !== 'string') {
       v = v.toString();
     }
-  }
+  } // try to replace number with "common.states"
+
 
   if (states && states[v] !== undefined) {
     valText.s = v;
-    v = states[valText.s];
+    v = states[v];
   }
 
   var valFull;
@@ -1536,7 +1468,7 @@ function formatValue(id, state, obj, texts, dateFormat, isFloatComma) {
   }];
 
   if (state) {
-    if (state.ack !== undefined) {
+    if (state.ack !== undefined && state.ack !== null) {
       valFull.push({
         t: texts.ack,
         v: state.ack.toString()
@@ -1868,7 +1800,7 @@ var objectsAlreadyLoaded = false;
  */
 
 var ObjectBrowser = /*#__PURE__*/function (_Component) {
-  _inherits(ObjectBrowser, _Component);
+  (0, _inherits2["default"])(ObjectBrowser, _Component);
 
   var _super = _createSuper(ObjectBrowser);
 
@@ -1878,11 +1810,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   function ObjectBrowser(props) {
     var _this;
 
-    _classCallCheck(this, ObjectBrowser);
-
+    (0, _classCallCheck2["default"])(this, ObjectBrowser);
     _this = _super.call(this, props);
-
-    _defineProperty(_assertThisInitialized(_this), "onStateChange", function (id, state) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onStateChange", function (id, state) {
       console.log('> stateChange ' + id);
 
       if (_this.states[id]) {
@@ -1910,8 +1840,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }
     });
-
-    _defineProperty(_assertThisInitialized(_this), "onObjectChange", function (id, obj, oldObj) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onObjectChange", function (id, obj, oldObj) {
       var newState;
 
       if (Array.isArray(id)) {
@@ -1954,8 +1883,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           return;
         }
 
-        ;
-
         if (id.startsWith('system.adapter.') && obj && obj.type === 'adapter') {
           var columnsForAdmin = JSON.parse(JSON.stringify(_this.state.columnsForAdmin));
 
@@ -2000,8 +1927,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }, 500);
       }
     });
-
-    _defineProperty(_assertThisInitialized(_this), "getEnumsForId", function (id) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getEnumsForId", function (id) {
       var result = [];
 
       _this.info.enums.forEach(function (_id) {
@@ -2027,12 +1953,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
       return result.length ? result : undefined;
     });
-
-    _defineProperty(_assertThisInitialized(_this), "_createAllEnums", /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(enums, objId) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "_createAllEnums", /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(enums, objId) {
         var e, _enObj$common, _enObj$common$members, id, _enObj, enObj;
 
-        return regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
@@ -2047,7 +1972,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                 id = enums[e];
                 _enObj = void 0;
 
-                if (_typeof(id) === 'object') {
+                if ((0, _typeof2["default"])(id) === 'object') {
                   _enObj = id;
                   id = id._id;
                 }
@@ -2107,11 +2032,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return _ref.apply(this, arguments);
       };
     }());
-
-    _defineProperty(_assertThisInitialized(_this), "loadObjects", /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(objs) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "loadObjects", /*#__PURE__*/function () {
+      var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(objs) {
         var id, obj, enums, state;
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
@@ -2120,7 +2044,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                   break;
                 }
 
-                _context2.t0 = regeneratorRuntime.keys(objs);
+                _context2.t0 = _regenerator["default"].keys(objs);
 
               case 2:
                 if ((_context2.t1 = _context2.t0()).done) {
@@ -2228,17 +2152,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return _ref2.apply(this, arguments);
       };
     }());
-
-    _defineProperty(_assertThisInitialized(_this), "handleJsonUpload", function (evt) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleJsonUpload", function (evt) {
       var f = evt.target.files[0];
 
       if (f) {
         var r = new FileReader();
 
         r.onload = /*#__PURE__*/function () {
-          var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(e) {
+          var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(e) {
             var contents, json, len, id, enums, state;
-            return regeneratorRuntime.wrap(function _callee3$(_context3) {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) {
                 switch (_context3.prev = _context3.next) {
                   case 0:
@@ -2346,8 +2269,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         window.alert(_this.props.t('ra_Failed to open JSON File'));
       }
     });
-
-    _defineProperty(_assertThisInitialized(_this), "toolTipObjectCreating", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toolTipObjectCreating", function () {
       var _this$objects$id2;
 
       var t = _this.props.t;
@@ -2380,7 +2302,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var id = _this.state.selected[0] || _this.state.selectedNonObject;
 
         if (id.split('.').length < 2 || _this.objects[id] && ((_this$objects$id = _this.objects[id]) === null || _this$objects$id === void 0 ? void 0 : _this$objects$id.type) === 'state') {} else {
-          if (_this.props.expertMode) {
+          if (_this.state.filter.expertMode) {
             switch ((_this$objects$id2 = _this.objects[id]) === null || _this$objects$id2 === void 0 ? void 0 : _this$objects$id2.type) {
               case 'device':
                 value = [/*#__PURE__*/_react["default"].createElement("div", {
@@ -2427,8 +2349,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
       return value.length ? value : t('ra_Add new child object to selected parent');
     });
-
-    _defineProperty(_assertThisInitialized(_this), "renderTooltipAccessControl", function (acl) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "renderTooltipAccessControl", function (acl) {
       // acl ={object,state,owner,ownerGroup}
       if (!acl) {
         return null;
@@ -2499,25 +2420,22 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return el;
       })) : '';
     });
-
-    _defineProperty(_assertThisInitialized(_this), "extendObject", function (id, data) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "extendObject", function (id, data) {
       return _this.props.socket.extendObject(id, data)["catch"](function (error) {
         return window.alert(error);
       });
     });
-
-    _defineProperty(_assertThisInitialized(_this), "setObject", function (id, data) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setObject", function (id, data) {
       return _this.props.socket.setObject(id, data)["catch"](function (error) {
         return window.alert(error);
       });
     });
-
     _this.lastSelectedItems = window.localStorage.getItem("".concat(props.dialogName || 'App', ".objectSelected")) || '[]';
 
     try {
       _this.lastSelectedItems = JSON.parse(_this.lastSelectedItems);
 
-      if (_typeof(_this.lastSelectedItems) !== 'object') {
+      if ((0, _typeof2["default"])(_this.lastSelectedItems) !== 'object') {
         _this.lastSelectedItems = [_this.lastSelectedItems];
       }
 
@@ -2581,7 +2499,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
     var selected = props.selected || '';
 
-    if (_typeof(selected) !== 'object') {
+    if ((0, _typeof2["default"])(selected) !== 'object') {
       selected = [selected];
     }
 
@@ -2707,7 +2625,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     return _this;
   }
 
-  _createClass(ObjectBrowser, [{
+  (0, _createClass2["default"])(ObjectBrowser, [{
     key: "loadAllObjects",
     value: function loadAllObjects(update) {
       var _this2 = this;
@@ -2740,17 +2658,15 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
         if (typeof props.filterFunc === 'function') {
           _this2.objects = {};
-          var keys = Object.keys(objects);
-
-          for (var k = 0; k < keys.length; k++) {
+          Object.keys(objects).forEach(function (id) {
             try {
-              if (props.filterFunc(objects[keys[k]])) {
-                _this2.objects[keys[k]] = objects[keys[k]];
+              if (props.filterFunc(objects[id])) {
+                _this2.objects[id] = objects[id];
               }
             } catch (e) {
-              console.log("Error by filtering of \"".concat(keys[k], "\": ").concat(e));
+              console.log("Error by filtering of \"".concat(id, "\": ").concat(e));
             }
-          }
+          });
         } else if (props.types) {
           _this2.objects = {};
           Object.keys(objects).forEach(function (id) {
@@ -2829,8 +2745,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "expandAllSelected",
     value: function expandAllSelected(cb) {
-      var expanded = _toConsumableArray(this.state.expanded);
-
+      var expanded = (0, _toConsumableArray2["default"])(this.state.expanded);
       var changed = false;
       this.state.selected.forEach(function (id) {
         var parts = id.split('.');
@@ -2866,7 +2781,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function onAfterSelect(isDouble) {
       var _this3 = this;
 
-      this.lastSelectedItems = _toConsumableArray(this.state.selected);
+      this.lastSelectedItems = (0, _toConsumableArray2["default"])(this.state.selected);
 
       if (this.state.selected && this.state.selected.length) {
         window.localStorage.setItem("".concat(this.props.dialogName || 'App', ".objectSelected"), JSON.stringify(this.lastSelectedItems));
@@ -3003,7 +2918,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     key: "showError",
     value: function showError(error) {
       this.setState({
-        error: _typeof(error) === 'object' ? error && typeof error.toString === 'function' ? error.toString() : JSON.stringify(error) : error
+        error: (0, _typeof2["default"])(error) === 'object' ? error && typeof error.toString === 'function' ? error.toString() : JSON.stringify(error) : error
       });
     }
     /**
@@ -3043,9 +2958,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       } else {
         if (this.objects[toggleItem] && (!this.props.types || this.props.types.includes(this.objects[toggleItem].type))) {
           window.localStorage.removeItem("".concat(this.props.dialogName || 'App', ".selectedNonObject"));
-
-          var selected = _toConsumableArray(this.state.selected);
-
+          var selected = (0, _toConsumableArray2["default"])(this.state.selected);
           var pos = selected.indexOf(toggleItem);
 
           if (pos === -1) {
@@ -3074,8 +2987,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function _renderDefinedList(isLast) {
       var _this9 = this;
 
-      var cols = _toConsumableArray(this.possibleCols);
-
+      var cols = (0, _toConsumableArray2["default"])(this.possibleCols);
       cols.unshift('id');
 
       if (this.props.columns && !this.props.columns.includes('buttons')) {
@@ -3089,11 +3001,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       return cols.filter(function (id) {
         return isLast && (id === 'val' || id === 'buttons') || !isLast && id !== 'val' && id !== 'buttons';
       }).map(function (id) {
-        return /*#__PURE__*/_react["default"].createElement(_ListItem["default"], {
-          button: true,
+        return /*#__PURE__*/_react["default"].createElement(ListItemButton, {
           onClick: function onClick() {
             if (!_this9.state.columnsAuto && id !== 'id') {
-              var columns = _toConsumableArray(_this9.state.columns || []);
+              var columns = (0, _toConsumableArray2["default"])(_this9.state.columns || []);
 
               var _pos = columns.indexOf(id);
 
@@ -3192,11 +3103,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                 });
               } else {
                 if (!_this10.state.columns) {
-                  _this10.calculateColumnsVisibility(false, _toConsumableArray(_this10.visibleCols));
+                  _this10.calculateColumnsVisibility(false, (0, _toConsumableArray2["default"])(_this10.visibleCols));
 
                   _this10.setState({
                     columnsAuto: false,
-                    columns: _toConsumableArray(_this10.visibleCols)
+                    columns: (0, _toConsumableArray2["default"])(_this10.visibleCols)
                   });
                 } else {
                   _this10.calculateColumnsVisibility(false);
@@ -3254,12 +3165,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           }
         }), /*#__PURE__*/_react["default"].createElement(_List["default"], null, this._renderDefinedList(false), this.state.columnsForAdmin && Object.keys(this.state.columnsForAdmin).sort().map(function (adapter) {
           return _this10.state.columnsForAdmin[adapter].map(function (column) {
-            return /*#__PURE__*/_react["default"].createElement(_ListItem["default"], {
-              button: true,
+            return /*#__PURE__*/_react["default"].createElement(ListItemButton, {
               onClick: function onClick() {
                 if (!_this10.state.columnsAuto) {
-                  var columns = _toConsumableArray(_this10.state.columns || []);
-
+                  var columns = (0, _toConsumableArray2["default"])(_this10.state.columns || []);
                   var id = '_' + adapter + '_' + column.path;
                   var pos = columns.indexOf(id);
 
@@ -3420,12 +3329,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (obj.common && obj.common.adminColumns && obj.common.name) {
         var columns = obj.common.adminColumns;
 
-        if (_typeof(columns) !== 'object') {
+        if ((0, _typeof2["default"])(columns) !== 'object') {
           columns = [columns];
         }
 
         columns = columns.map(function (item) {
-          if (_typeof(item) !== 'object') {
+          if ((0, _typeof2["default"])(item) !== 'object') {
             return {
               path: item,
               name: item.split('.').pop()
@@ -3433,7 +3342,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           } // string => array
 
 
-          if (item.objTypes && _typeof(item.objTypes) !== 'object') {
+          if (item.objTypes && (0, _typeof2["default"])(item.objTypes) !== 'object') {
             item.objTypes = [item.objTypes];
           } else if (!item.objTypes) {
             item.objTypes = null;
@@ -3450,7 +3359,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             };
           }
 
-          if (_typeof(item.name) !== 'object' && item.path) {
+          if ((0, _typeof2["default"])(item.name) !== 'object' && item.path) {
             return {
               path: item.path,
               name: item.name,
@@ -3735,7 +3644,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var name;
         var icon;
 
-        if (_typeof(item) === 'object') {
+        if ((0, _typeof2["default"])(item) === 'object') {
           id = item.value;
           name = item.name;
           icon = item.icon;
@@ -3962,9 +3871,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function onExpandVisible() {
       if (this.state.depth < 9) {
         var depth = this.state.depth + 1;
-
-        var expanded = _toConsumableArray(this.state.expanded);
-
+        var expanded = (0, _toConsumableArray2["default"])(this.state.expanded);
         this.expandDepth(this.root, depth, expanded);
         window.localStorage.setItem((this.props.dialogName || 'App') + '.objectExpanded', JSON.stringify(expanded));
         this.setState({
@@ -4085,9 +3992,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             });
           }
         }, this.props.t('ra_All objects')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+          color: "primary",
           variant: "contained",
           autoFocus: true,
-          color: "primary",
           onClick: function onClick() {
             return _this25.setState({
               showExportDialog: false
@@ -4095,7 +4002,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               return _this25._exportObjects(false);
             });
           }
-        }, this.props.t('Only selected')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+        }, this.props.t('ra_Only selected')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
           color: "grey",
           variant: "contained",
           onClick: function onClick() {
@@ -4130,7 +4037,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (id.split('.').length < 2 || this.objects[id] && this.objects[id].type === 'state') {
           allowObjectCreation = false;
         } else {
-          if (this.props.expertMode) {
+          if (this.state.filter.expertMode) {
             allowObjectCreation = true;
           } else if (id.startsWith('alias.0') || id.startsWith('0_userdata')) {
             allowObjectCreation = true;
@@ -4361,7 +4268,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (!item.data.obj) {
         return this.props.onObjectDelete || this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement("div", {
           className: classes.buttonDiv
-        }, this.props.expertMode && this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
+        }, this.state.filter.expertMode && this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
           className: _Utils["default"].clsx(classes.cellButtonsButton, classes.cellButtonsEmptyButton, classes.cellButtonMinWidth),
           onClick: function onClick() {
             return _this27.setState({
@@ -4387,7 +4294,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       item.data.aclTooltip = item.data.aclTooltip || this.renderTooltipAccessControl(item.data.obj.acl);
       var acl = item.data.obj.acl ? item.data.obj.type === 'state' ? item.data.obj.acl.state : item.data.obj.acl.object : 0;
       var aclSystemConfig = item.data.obj.acl && (item.data.obj.type === 'state' ? this.systemConfig.common.defaultNewAcl.state : this.systemConfig.common.defaultNewAcl.object);
-      return [this.props.expertMode && this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+      return [this.state.filter.expertMode && this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
         key: "acl",
         title: item.data.aclTooltip
       }, /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
@@ -4591,13 +4498,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         info.val = copyText;
         info.valText = [/*#__PURE__*/_react["default"].createElement("span", {
           className: classes.newValue || classes.newValue,
-          key: "".concat(info.valText.v.toString(), "valText")
+          key: "valText"
         }, info.valText.v.toString()), info.valText.u ? /*#__PURE__*/_react["default"].createElement("span", {
           className: _Utils["default"].clsx(classes.cellValueTextUnit, classes.newValue),
-          key: "".concat(info.valText.v.toString(), "unit")
+          key: "unit"
         }, info.valText.u) : null, info.valText.s !== undefined ? /*#__PURE__*/_react["default"].createElement("span", {
           className: _Utils["default"].clsx(classes.cellValueTextState, classes.newValue),
-          key: "".concat(info.valText.v.toString(), "states")
+          key: "states"
         }, "(", info.valText.s, ")") : null, /*#__PURE__*/_react["default"].createElement(_IconCopy["default"], {
           className: _Utils["default"].clsx(classes.cellButtonsValueButton, 'copyButton', classes.cellButtonsValueButtonCopy),
           onClick: function onClick(e) {
@@ -4610,7 +4517,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
       var val = info.valText;
 
-      if (!this.props.expertMode && item.data.button) {
+      if (!this.state.filter.expertMode && item.data.button) {
         val = /*#__PURE__*/_react["default"].createElement(_RoomService["default"], {
           className: _Utils["default"].clsx(this.props.classes.cellValueButton, !this.states[id] || !this.states[id].val ? this.props.classes.cellValueButtonFalse : '')
         });
@@ -4703,8 +4610,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function syncEnum(id, enumName, newArray) {
       var _this31 = this;
 
-      var toCheck = _toConsumableArray(this.info[enumName === 'func' ? 'funcEnums' : 'roomEnums']);
-
+      var toCheck = (0, _toConsumableArray2["default"])(this.info[enumName === 'func' ? 'funcEnums' : 'roomEnums']);
       return new Promise(function (resolve) {
         return _this31._syncEnum(id, toCheck, newArray, function (error) {
           error && _this31.showError(error); // force update of object
@@ -4780,7 +4686,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           var name;
           var icon;
 
-          if (_typeof(item) === 'object') {
+          if ((0, _typeof2["default"])(item) === 'object') {
             id = item.value;
             name = item.name;
             icon = item.icon;
@@ -4913,7 +4819,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (!this.customColumnDialog) {
           var value = this.getCustomValue(this.state.columnsEditCustomDialog.obj, this.state.columnsEditCustomDialog.it);
           this.customColumnDialog = {
-            type: this.state.columnsEditCustomDialog.it.type || _typeof(value),
+            type: this.state.columnsEditCustomDialog.it.type || (0, _typeof2["default"])(value),
             initValue: (value === null || value === undefined ? '' : value).toString(),
             value: (value === null || value === undefined ? '' : value).toString()
           };
@@ -5002,18 +4908,18 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var p = it.path;
         var value;
 
-        if (obj[p[0]] && _typeof(obj[p[0]]) === 'object') {
+        if (obj[p[0]] && (0, _typeof2["default"])(obj[p[0]]) === 'object') {
           if (p.length === 2) {
             // most common case
             value = obj[p[0]][p[1]];
           } else if (p.length === 3) {
-            value = obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' ? obj[p[0]][p[1]][p[2]] : null;
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' ? obj[p[0]][p[1]][p[2]] : null;
           } else if (p.length === 4) {
-            value = obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] ? obj[p[0]][p[1]][p[2]][p[3]] : null;
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] ? obj[p[0]][p[1]][p[2]][p[3]] : null;
           } else if (p.length === 5) {
-            value = obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]] : null;
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]] : null;
           } else if (p.length === 6) {
-            value = obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] && obj[p[0]][p[1]][p[2]][p[3]][p[4]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] : null;
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] && obj[p[0]][p[1]][p[2]][p[3]][p[4]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] : null;
           }
 
           if (value === undefined || value === null) {
@@ -5039,28 +4945,28 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (obj && obj._id && obj._id.startsWith(it.adapter + '.') && it.path.length > 1) {
         var p = it.path;
 
-        if (obj[p[0]] && _typeof(obj[p[0]]) === 'object') {
+        if (obj[p[0]] && (0, _typeof2["default"])(obj[p[0]]) === 'object') {
           if (p.length === 2) {
             // most common case
             obj[p[0]][p[1]] = value;
             return true;
           } else if (p.length === 3) {
-            if (obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object') {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object') {
               obj[p[0]][p[1]][p[2]] = value;
               return true;
             }
           } else if (p.length === 4) {
-            if (obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && _typeof(obj[p[0]][p[1]][p[2]]) === 'object') {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object') {
               obj[p[0]][p[1]][p[2]][p[3]] = value;
               return true;
             }
           } else if (p.length === 5) {
-            if (obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && _typeof(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && _typeof(obj[p[0]][p[1]][p[2]][p[3]]) === 'object') {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]]) === 'object') {
               obj[p[0]][p[1]][p[2]][p[3]][p[4]] = value;
               return true;
             }
           } else if (p.length === 6) {
-            if (obj[p[0]][p[1]] && _typeof(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && _typeof(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && _typeof(obj[p[0]][p[1]][p[2]][p[3]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]][p[4]] && _typeof(obj[p[0]][p[1]][p[2]][p[3]][p[4]]) === 'object') {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]][p[4]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]][p[4]]) === 'object') {
               obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] = value;
               return true;
             }
@@ -5121,15 +5027,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderLeaf",
     value: function renderLeaf(item, isExpanded, classes, counter) {
-      var _item$data$obj,
-          _this37 = this,
+      var _this37 = this,
           _common$alias,
           _common$alias2,
-          _item$data,
-          _item$data$common,
           _this$states$id2,
+          _item$data,
           _item$data2,
-          _item$data3,
           _this$states$id3,
           _this$states$id4,
           _this$states$id5;
@@ -5139,7 +5042,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       isExpanded = isExpanded === undefined ? this.state.expanded.includes(id) : isExpanded; // icon
 
       var iconFolder;
-      var itemType = (_item$data$obj = item.data.obj) === null || _item$data$obj === void 0 ? void 0 : _item$data$obj.type;
+      var obj = item.data.obj;
+      var itemType = obj === null || obj === void 0 ? void 0 : obj.type;
 
       if (item.children || itemType === 'folder' || itemType === 'device' || itemType === 'channel' || itemType === 'meta') {
         iconFolder = isExpanded ? /*#__PURE__*/_react["default"].createElement(_IconOpen["default"], {
@@ -5179,7 +5083,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }
 
-      var obj = item.data.obj;
       var common = obj === null || obj === void 0 ? void 0 : obj.common;
 
       var typeImg = obj && obj.type && ITEM_IMAGES[obj.type] || /*#__PURE__*/_react["default"].createElement("div", {
@@ -5209,13 +5112,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         className: classes.checkBox,
         checked: this.state.selected.includes(id)
       }) : null;
-      var valueEditable = !this.props.notEditable && itemType === 'state' && (this.props.expertMode || (common === null || common === void 0 ? void 0 : common.write) !== false);
+      var valueEditable = !this.props.notEditable && itemType === 'state' && (this.state.filter.expertMode || (common === null || common === void 0 ? void 0 : common.write) !== false);
 
       if (this.props.objectBrowserViewFile && (common === null || common === void 0 ? void 0 : common.type) === 'file') {
         valueEditable = true;
       }
 
-      var enumEditable = !this.props.notEditable && this.objects[id] && (this.props.expertMode || itemType === 'state' || itemType === 'channel' || itemType === 'device');
+      var enumEditable = !this.props.notEditable && this.objects[id] && (this.state.filter.expertMode || itemType === 'state' || itemType === 'channel' || itemType === 'device');
       var checkVisibleObjectType = this.state.statesView && (itemType === 'state' || itemType === 'channel' || itemType === 'device');
       var newValue = '';
       var newValueTitle = [];
@@ -5245,53 +5148,53 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         obj.ts && newValueTitle.push(this.texts.objectChangedByUser + ' ' + _Utils["default"].formatDate(new Date(obj.ts), this.props.dateFormat));
       }
 
-      var readWriteAlias = _typeof(common === null || common === void 0 ? void 0 : (_common$alias = common.alias) === null || _common$alias === void 0 ? void 0 : _common$alias.id) === 'object';
+      var readWriteAlias = (0, _typeof2["default"])(common === null || common === void 0 ? void 0 : (_common$alias = common.alias) === null || _common$alias === void 0 ? void 0 : _common$alias.id) === 'object';
       var alias = id.startsWith('alias.') && common !== null && common !== void 0 && (_common$alias2 = common.alias) !== null && _common$alias2 !== void 0 && _common$alias2.id ? readWriteAlias ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.cellIdAliasReadWriteDiv
-      }, obj.common.alias.id.read ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, common.alias.id.read ? /*#__PURE__*/_react["default"].createElement("div", {
         onClick: function onClick(e) {
           e.stopPropagation();
           e.preventDefault();
 
-          _this37.onSelect(obj.common.alias.id.read);
+          _this37.onSelect(common.alias.id.read);
 
           setTimeout(function () {
             _this37.expandAllSelected(function () {
-              return _this37.scrollToItem(obj.common.alias.id.read);
+              return _this37.scrollToItem(common.alias.id.read);
             });
           }, 100);
         },
         className: _Utils["default"].clsx(classes.cellIdAlias, classes.cellIdAliasReadWrite)
-      }, "\u2190", obj.common.alias.id.read) : null, obj.common.alias.id.write ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, "\u2190", common.alias.id.read) : null, common.alias.id.write ? /*#__PURE__*/_react["default"].createElement("div", {
         onClick: function onClick(e) {
           e.stopPropagation();
           e.preventDefault();
 
-          _this37.onSelect(obj.common.alias.id.write);
+          _this37.onSelect(common.alias.id.write);
 
           setTimeout(function () {
             _this37.expandAllSelected(function () {
-              return _this37.scrollToItem(obj.common.alias.id.write);
+              return _this37.scrollToItem(common.alias.id.write);
             });
           }, 100);
         },
         className: _Utils["default"].clsx(classes.cellIdAlias, classes.cellIdAliasReadWrite)
-      }, "\u2192", obj.common.alias.id.write) : null) : /*#__PURE__*/_react["default"].createElement("div", {
+      }, "\u2192", common.alias.id.write) : null) : /*#__PURE__*/_react["default"].createElement("div", {
         onClick: function onClick(e) {
           e.stopPropagation();
           e.preventDefault();
 
-          _this37.onSelect(obj.common.alias.id);
+          _this37.onSelect(common.alias.id);
 
           setTimeout(function () {
             _this37.expandAllSelected(function () {
-              return _this37.scrollToItem(obj.common.alias.id);
+              return _this37.scrollToItem(common.alias.id);
             });
           }, 100);
         },
         className: _Utils["default"].clsx(classes.cellIdAlias, classes.cellIdAliasAlone)
-      }, "\u2192", obj.common.alias.id) : null;
-      var checkColor = (_item$data = item.data) === null || _item$data === void 0 ? void 0 : (_item$data$common = _item$data.common) === null || _item$data$common === void 0 ? void 0 : _item$data$common.color;
+      }, "\u2192", common.alias.id) : null;
+      var checkColor = common === null || common === void 0 ? void 0 : common.color;
       var invertBackground = 'none';
 
       if (checkColor && !this.state.selected.includes(id)) {
@@ -5474,7 +5377,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         style: {
           width: this.columnsVisibility.name
         }
-      }, ((_item$data2 = item.data) === null || _item$data2 === void 0 ? void 0 : _item$data2.title) || '', (_item$data3 = item.data) !== null && _item$data3 !== void 0 && _item$data3.title ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, ((_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data.title) || '', (_item$data2 = item.data) !== null && _item$data2 !== void 0 && _item$data2.title ? /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           color: checkColor
         }
@@ -5492,14 +5395,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         className: classes.cellRole,
         style: {
           width: this.columnsVisibility.role,
-          cursor: this.props.expertMode && enumEditable && this.props.objectBrowserEditRole ? 'text' : 'default'
+          cursor: this.state.filter.expertMode && enumEditable && this.props.objectBrowserEditRole ? 'text' : 'default'
         },
-        onClick: this.props.expertMode && enumEditable && this.props.objectBrowserEditRole ? function () {
+        onClick: this.state.filter.expertMode && enumEditable && this.props.objectBrowserEditRole ? function () {
           return _this37.setState({
             roleDialog: item.data.id
           });
         } : undefined
-      }, obj && obj.common && obj.common.role) : null, this.columnsVisibility.room ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, common === null || common === void 0 ? void 0 : common.role) : null, this.columnsVisibility.room ? /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(classes.cellRoom, " ").concat(item.data.per ? classes.cellEnumParent : ''),
         style: {
           width: this.columnsVisibility.room,
@@ -5584,7 +5487,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           } // in non-expert mode control button directly
 
 
-          if (!_this37.props.expertMode && item.data.button) {
+          if (!_this37.state.filter.expertMode && item.data.button) {
             return _this37.props.socket.setState(id, true)["catch"](function (e) {
               return window.alert("Cannot write state \"".concat(id, "\": ").concat(e));
             });
@@ -6042,7 +5945,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var ObjectCustomDialog = this.props.objectCustomDialog;
         return /*#__PURE__*/_react["default"].createElement(ObjectCustomDialog, {
           reportChangedIds: function reportChangedIds(changedIds) {
-            return _this43.changedIds = _toConsumableArray(changedIds);
+            return _this43.changedIds = (0, _toConsumableArray2["default"])(changedIds);
           },
           objectIDs: this.state.customDialog,
           expertMode: this.state.filter.expertMode,
@@ -6190,7 +6093,17 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return null;
       }
 
-      var type = (_this$objects$this$ed = this.objects[this.edit.id].common) !== null && _this$objects$this$ed !== void 0 && _this$objects$this$ed.type ? this.objects[this.edit.id].common.type : _typeof(this.edit.val);
+      if (!this.edit.id) {
+        console.error('Invalid ID for edit: ' + JSON.stringify(this.edit));
+        return null;
+      }
+
+      if (!this.objects[this.edit.id]) {
+        console.error("Something went wrong. Possibly the object ".concat(this.edit.id, " was deleted."));
+        return null;
+      }
+
+      var type = (_this$objects$this$ed = this.objects[this.edit.id].common) !== null && _this$objects$this$ed !== void 0 && _this$objects$this$ed.type ? this.objects[this.edit.id].common.type : (0, _typeof2["default"])(this.edit.val);
       var ObjectBrowserValue = this.props.objectBrowserValue;
       return /*#__PURE__*/_react["default"].createElement(ObjectBrowserValue, {
         t: this.props.t,
@@ -6287,7 +6200,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       return changed ? newState : null;
     }
   }]);
-
   return ObjectBrowser;
 }(_react.Component);
 
@@ -6367,7 +6279,7 @@ ObjectBrowser.propTypes = {
 };
 /** @type {typeof ObjectBrowser} */
 
-var _export = withWidth()((0, _withStyles["default"])(styles)(ObjectBrowser));
+var _export = (0, _withWidth["default"])()((0, _withStyles["default"])(styles)(ObjectBrowser));
 
 var _default = _export;
 exports["default"] = _default;