@vitrosoftware/common-ui-ts 1.1.172 → 1.1.173

package/dist/index.js

@@ -480,24 +480,34 @@ var ScrollBar = function ScrollBar(props) {
   var _useState = React.useState(null),
     element = _useState[0],
     setElement = _useState[1];
-  var _useState2 = React.useState(null),
-    parent = _useState2[0],
-    setParent = _useState2[1];
   var ref = React.useRef(null);
-  var resizeObserver = new window.ResizeObserver(function (entries) {
-    for (var _iterator = _createForOfIteratorHelperLoose(entries), _step; !(_step = _iterator()).done;) {
-      var entry = _step.value;
-      if (parent && entry.target === parent) {
-        if (parent.offsetHeight && parent.offsetWidth && ref.current) {
-          ref.current.scrollTop = 1;
-          ref.current.scrollLeft = 1;
+  React.useEffect(function () {
+    var checkRendered = function checkRendered() {
+      var _ref$current$children, _ref$current$children2;
+      if (ref.current && ((_ref$current$children = ref.current.children[0]) === null || _ref$current$children === void 0 ? void 0 : (_ref$current$children2 = _ref$current$children.children) === null || _ref$current$children2 === void 0 ? void 0 : _ref$current$children2.length) > 1) {
+        ref.current.scrollTop = 3;
+        ref.current.scrollLeft = 3;
+        if (ref.current.scrollTop || ref.current.scrollLeft) {
           ref.current.scrollTop = 0;
           ref.current.scrollLeft = 0;
-          resizeObserver.disconnect();
+          observer.disconnect();
         }
       }
+    };
+    checkRendered();
+    var observer = new MutationObserver(checkRendered);
+    if (ref.current && ref.current.children[0]) {
+      observer.observe(ref.current.children[0], {
+        childList: true,
+        subtree: true
+      });
     }
-  });
+    return function () {
+      if (ref.current) {
+        observer.disconnect();
+      }
+    };
+  }, []);
   React.useEffect(function () {
     if (ref.current) {
       ref.current.addEventListener('ps-scroll-y', onScrollY);
@@ -512,11 +522,6 @@ var ScrollBar = function ScrollBar(props) {
       }
     };
   }, []);
-  React.useEffect(function () {
-    if (parent) {
-      resizeObserver.observe(parent);
-    }
-  }, [parent]);
   var init = function init() {
     if (w.PerfectScrollbar) {
       var scrollElement = new w.PerfectScrollbar(ref.current, {
@@ -533,15 +538,12 @@ var ScrollBar = function ScrollBar(props) {
       }
       if (props.isFocusOnScroll && ref.current) {
         ref.current.addEventListener('ps-scroll-y', function () {
-          return ref.current.click();
+          var _ref$current;
+          return (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.click();
         });
       }
-      updateParent(ref.current);
     }
   };
-  var updateParent = function updateParent(element) {
-    setParent(element.parentElement);
-  };
   var onWheel = function onWheel(e) {
     e.stopPropagation();
   };
@@ -20790,9 +20792,6 @@ var TreeView = function TreeView(props) {
   var _useState2 = React.useState(null),
     jsTreeTreeView = _useState2[0],
     setJsTreeTreeView = _useState2[1];
-  var _useState3 = React.useState(null),
-    scrollableElement = _useState3[0],
-    setScrollableElement = _useState3[1];
   var jsTreeRef = React.useRef(null);
   var jsTreeView;
   React.useEffect(function () {
@@ -20839,11 +20838,6 @@ var TreeView = function TreeView(props) {
       });
     }
   }, [jsTreeTreeView]);
-  React.useEffect(function () {
-    if (scrollableElement && scrollableElement.scrollTop === 0) {
-      scrollableElement.scrollTop = 1;
-    }
-  });
   var onHoverNode = function onHoverNode(treeView, e, obj) {
     var _obj$node$original;
     if ((_obj$node$original = obj.node.original) !== null && _obj$node$original !== void 0 && _obj$node$original.imageHoverUrl) {
@@ -20920,8 +20914,7 @@ var TreeView = function TreeView(props) {
     }
   };
   return React__default.createElement(ScrollBar, {
-    className: styles$3['vitro-scrollbar'] + (props.className ? CTRL.SPACE + props.className : CTRL.EMPTY),
-    onInit: setScrollableElement
+    className: styles$3['vitro-scrollbar'] + (props.className ? CTRL.SPACE + props.className : CTRL.EMPTY)
   }, React__default.createElement("div", {
     ref: jsTreeRef,
     id: props.id,
@@ -63552,7 +63545,7 @@ var Viewer = function Viewer(props) {
 };
 
 var name = "@vitrosoftware/common-ui-ts";
-var version$1 = "1.1.172";
+var version$1 = "1.1.173";
 var description = "vitro software common ui ts";
 var author = "";
 var license = "MIT";
@@ -67364,8 +67357,8 @@ var Item$3 = function Item(props) {
       props.onChange(val, componentProps.name);
     }
   };
-  var onControlChange = function onControlChange(val, name) {
-    value.valueList = Array.isArray(val) ? val : [val];
+  var onControlChange = function onControlChange(val) {
+    value.valueList = val !== null && val !== undefined ? Array.isArray(val) ? val : [val] : [];
     onChange(value);
   };
   return React__default.createElement(FlexBox, {