linear-react-components-ui 0.4.75-rc.0 → 0.4.76-beta.10

package/lib/internals/withTooltip.js

@@ -73,10 +73,11 @@ var withTooltip = function withTooltip(WrappedComponent) {
         tooltipDimensions = _useState8[0],
         setTooltipDimensions = _useState8[1];
 
-    var targetElement = (0, _react.useRef)();
+    var targetElement = (0, _react.useRef)(null);
+    var tooltipElement = (0, _react.useRef)(null);
 
     var onMouseOver = function onMouseOver(e) {
-      if (targetElement.current.contains(e.target)) {
+      if (targetElement && targetElement.current && targetElement.current.contains(e.target)) {
         setShowTooltip(true);
       } else setShowTooltip(false);
     };
@@ -116,9 +117,10 @@ var withTooltip = function withTooltip(WrappedComponent) {
             height = tooltipDimensions.height;
         var targetDimensions = targetElement.current.getBoundingClientRect();
         var targetVerticalCenter = (targetDimensions.top + targetDimensions.bottom) / 2;
-        var style = "width: ".concat(width, "px");
-        var left = targetDimensions.left + targetDimensions.width / 2 - width / 2;
-        left = Math.min(left, document.body.clientWidth - width - space);
+        var tooltipClientWidth = tooltipElement.current && tooltipElement.current.clientWidth;
+        var style = "width: ".concat(typeof width === 'string' ? width : "".concat(width, "px"));
+        var left = targetDimensions.left + targetDimensions.width / 2 - tooltipClientWidth / 2;
+        left = Math.min(left, document.body.clientWidth - tooltipClientWidth - space);
         style += "; left: ".concat(Math.max(space, left), "px");
 
         switch (tooltipPosition) {
@@ -141,17 +143,17 @@ var withTooltip = function withTooltip(WrappedComponent) {
             break;
 
           case 'left':
-            if (targetDimensions.left < width) {
+            if (targetDimensions.left < tooltipClientWidth) {
               setTooltipPosition('right');
             } else {
               style += "; top: ".concat(targetVerticalCenter + window.scrollY - height / 2, "px");
-              style += "; left: ".concat(targetDimensions.left - width - 6, "px");
+              style += "; left: ".concat(targetDimensions.left - tooltipClientWidth - 6, "px");
             }
 
             break;
 
           case 'right':
-            if (window.innerWidth - targetDimensions.right < width) {
+            if (window.innerWidth - targetDimensions.right < tooltipClientWidth) {
               setTooltipPosition('left');
             } else {
               style += "; top: ".concat(targetVerticalCenter + window.scrollY - height / 2, "px");
@@ -166,7 +168,7 @@ var withTooltip = function withTooltip(WrappedComponent) {
 
         setTooltipStyle(style);
       }
-    }, [tooltipDimensions, targetElement.current, tooltipPosition]);
+    }, [tooltipDimensions, tooltipElement.current, targetElement.current, tooltipPosition]);
     (0, _react.useEffect)(function () {
       setTooltipPosition(props.tooltipPosition);
     }, [window.scrollY, window.scrollX, window.innerWidth]);
@@ -175,6 +177,7 @@ var withTooltip = function withTooltip(WrappedComponent) {
       if (tooltip) {
         return /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
           text: tooltip,
+          tooltipRef: tooltipElement,
           style: tooltipStyle,
           className: tooltipPosition,
           tooltipDimensions: tooltipDimensions,

package/lib/tabs/index.js

@@ -96,18 +96,75 @@ var Tabs = function Tabs(props) {
       tabsContentWidth = _useState14[0],
       setTabsContentWidth = _useState14[1];
 
-  var componentRef = (0, _react.useRef)();
+  var _useState15 = (0, _react.useState)(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      hasMenuAttributes = _useState16[0],
+      setHasMenuAttributes = _useState16[1];
 
-  var _menuRef = (0, _react.useRef)();
+  var _useState17 = (0, _react.useState)(0),
+      _useState18 = _slicedToArray(_useState17, 2),
+      dropdownWidth = _useState18[0],
+      setDropdownWidth = _useState18[1];
 
-  var _toolBarRef = (0, _react.useRef)();
+  var componentRef = (0, _react.useRef)(null);
+
+  var _menuRef = (0, _react.useRef)(null);
+
+  var _toolBarRef = (0, _react.useRef)(null);
+
+  var getTabListWidth = function getTabListWidth() {
+    var tabMenu = _menuRef.current.children[0];
+
+    var tabList = _toConsumableArray(tabMenu.children);
+
+    var tabsListWidth = tabList.reduce(function (total, tab) {
+      return total + tab.clientWidth;
+    }, 0);
+    return tabsListWidth;
+  };
+
+  var getMenuAttributes = function getMenuAttributes() {
+    var menuSize = _menuRef.current.clientWidth;
+    var toolbarSize = toolbar && _toolBarRef ? _toolBarRef.current.clientWidth : 0;
+    var contentWidth = (toolbar ? menuSize - toolbarSize : menuSize) - dropdownWidth;
+    setTabsContentWidth(contentWidth);
+  };
+
+  var getTabsList = function getTabsList() {
+    var tabsListWidth = getTabListWidth();
+
+    var newDropdownPanels = _toConsumableArray(dropdownPanels);
+
+    var newCurrentPanels = _toConsumableArray(panels);
+
+    if (newDropdownPanels.length) {
+      var newDropdownPanelsIds = newDropdownPanels.map(function (dd) {
+        return dd.props.id;
+      });
+      newCurrentPanels = newCurrentPanels.filter(function (tab) {
+        return !newDropdownPanelsIds.includes(tab.props.id);
+      });
+    }
+
+    if (tabsListWidth > tabsContentWidth) {
+      var lastPanel = newCurrentPanels[newCurrentPanels.length - 1];
+      newDropdownPanels.push(lastPanel);
+      newCurrentPanels.pop();
+    } else if (tabsListWidth + 110 < tabsContentWidth && newDropdownPanels.length) {
+      newCurrentPanels.push(newDropdownPanels[0]);
+      newDropdownPanels.shift();
+    }
+
+    setCurrentPanels(newCurrentPanels);
+    setDropdownPanels(newDropdownPanels);
+  };
 
   var onMenuClick = function onMenuClick(tabId) {
     var includedInDropdown = dropdownPanels.filter(function (item) {
       return item.props.id === tabId;
     });
 
-    if (includedInDropdown.length > 0) {
+    if (includedInDropdown.length > 0 && getTabListWidth() > 0) {
       var newDropdownPanels = dropdownPanels.filter(function (item) {
         return item.props.id !== tabId;
       });
@@ -148,53 +205,14 @@ var Tabs = function Tabs(props) {
     if (handlerCloseTab) handlerCloseTab(closedPanelId, newSelectedTabId);
   };
 
-  var getMenuAttributes = function getMenuAttributes() {
-    var menuSize = _menuRef.current.clientWidth;
-    var dropdownWidth = dropdownPanels.length > 0 ? _menuRef.current.children[1].clientWidth : 0;
-    var toolbarSize = toolbar && _toolBarRef ? _toolBarRef.current.clientWidth : 0;
-    var contentWidth = (toolbar ? menuSize - toolbarSize : menuSize) - dropdownWidth;
-    setTabsContentWidth(contentWidth);
-  };
-
-  var getTabsList = function getTabsList() {
-    var tabMenu = _menuRef.current.children[0];
-
-    var tabList = _toConsumableArray(tabMenu.children);
-
-    var tabsListWidth = tabList.reduce(function (total, tab) {
-      return total + tab.clientWidth;
-    }, 0);
-
-    var dropdownTabs = _toConsumableArray(dropdownPanels);
-
-    var currentTabs = _toConsumableArray(panels);
-
-    if (dropdownTabs.length) {
-      var dropDownTabsIds = dropdownTabs.map(function (dd) {
-        return dd.props.id;
-      });
-      currentTabs = currentTabs.filter(function (tab) {
-        return !dropDownTabsIds.includes(tab.props.id);
-      });
-    }
-
-    if (tabsListWidth > tabsContentWidth) {
-      var lastPanel = currentTabs[currentTabs.length - 1];
-      dropdownTabs.push(lastPanel);
-      currentTabs.pop();
-    } else if (tabsListWidth + 110 < tabsContentWidth && dropdownTabs.length) {
-      currentTabs.push(dropdownTabs[0]);
-      dropdownTabs.shift();
-    }
-
-    setCurrentPanels(currentTabs);
-    setDropdownPanels(dropdownTabs);
-  };
-
   var onResize = function onResize() {
     if (componentRef.current && _menuRef.current) {
       setContentHeight(componentRef.current.offsetHeight - _menuRef.current.offsetHeight);
-      getMenuAttributes();
+
+      if (!hasMenuAttributes && _menuRef.current && _menuRef.current.clientWidth > 0 && dropdownWidth) {
+        getMenuAttributes();
+        setHasMenuAttributes(true);
+      }
     }
   };
 
@@ -231,14 +249,18 @@ var Tabs = function Tabs(props) {
     return function () {
       return window.removeEventListener('resize', onResize);
     };
-  }, []);
+  }, [_menuRef.current, dropdownWidth]);
   (0, _react.useEffect)(function () {
     if (selectedTab) setSelectedTabId(selectedTab);
     if (children) setPanels((0, _tabHelpers.buildPanels)(children));
   }, [selectedTab, children]);
   (0, _react.useEffect)(function () {
     getTabsList();
-  }, [panels.length, currentPanels.length]);
+  }, [panels.length, currentPanels.length, tabsContentWidth]);
+  (0, _react.useEffect)(function () {
+    var currentDropdownWidth = dropdownPanels.length > 0 ? _menuRef.current.children[1].clientWidth : 0;
+    setDropdownWidth(currentDropdownWidth);
+  }, [dropdownPanels.length]);
 
   var getContextValues = function getContextValues() {
     return {

package/lib/tabs/tabs.spec.js

@@ -135,7 +135,7 @@ describe('Tabs', function () {
           container = _render10.container;
 
       expect(container.querySelector('.tabs-component')).toHaveClass('menu-bottom');
-      expect(container.querySelector('.tabs-component').lastChild).toHaveClass('menu');
+      expect(container.querySelector('.tabs-component').lastChild).toHaveClass('menucontainer');
     });
     it('should apply tabMenuAlign', function () {
       var _render11 = (0, _react2.render)(tabsMockRender({
@@ -328,7 +328,8 @@ describe('Tabs', function () {
       })),
           container = _render23.container;
 
-      expect(container.querySelector('ul.menu li.menuitem button')).not.toHaveAttribute('disabled');
+      var noPermissionComponent = container.querySelector('.no-permission-component');
+      expect(noPermissionComponent).toBeFalsy();
     });
     it('should check permission and be unavailable', function () {
       Object.defineProperty(window, 'sessionStorage', {
@@ -336,11 +337,13 @@ describe('Tabs', function () {
       });
 
       var _render24 = (0, _react2.render)(tabsMockRender({}, {
-        permissionAttr: (0, _storageMock.permissionAttrMockUnauthorized)('disabled')
+        permissionAttr: (0, _storageMock.permissionAttrMockUnauthorized)('hideContent')
       })),
-          container = _render24.container;
+          container = _render24.container; // debug();
 
-      expect(container.querySelector('ul.menu li.menuitem button')).toHaveAttribute('disabled');
+
+      var noPermissionComponent = container.querySelector('.no-permission-component');
+      expect(noPermissionComponent).toBeTruthy();
     });
   });
 });

package/lib/tooltip/index.js

@@ -28,7 +28,8 @@ var Tooltip = function Tooltip(props) {
       tooltipDimensions = props.tooltipDimensions,
       handlerSetDimensions = props.handlerSetDimensions,
       style = props.style,
-      text = props.text;
+      text = props.text,
+      tooltipRef = props.tooltipRef;
   var tooltipComponent = (0, _react.useRef)(document.createElement('div'));
   tooltipComponent.current.id = "tooltip-".concat(_uuid["default"].v1());
   tooltipComponent.current.className = "tooltip-component ".concat(className, " ");
@@ -42,7 +43,7 @@ var Tooltip = function Tooltip(props) {
     var tooltipEl = document.querySelector("div#".concat(tooltipComponent.current.id));
     var width = tooltipEl.offsetWidth;
 
-    if (tooltipDimensions.width) {
+    if (tooltipDimensions.width && tooltipDimensions.width !== 'auto') {
       width = tooltipDimensions.width;
     }
 
@@ -51,6 +52,7 @@ var Tooltip = function Tooltip(props) {
       width: width,
       height: height
     });
+    if (tooltipRef) tooltipRef.current = tooltipEl;
     return function () {
       return document.body.removeChild(tooltipComponent.current);
     };
@@ -75,13 +77,15 @@ Tooltip.propTypes = {
   text: _propTypes["default"].string,
   style: _propTypes["default"].string,
   className: _propTypes["default"].string,
-  handlerSetDimensions: _propTypes["default"].func
+  handlerSetDimensions: _propTypes["default"].func,
+  tooltipRef: _propTypes["default"].object
 };
 Tooltip.defaultProps = {
   text: undefined,
   className: 'bottom',
   style: '',
-  handlerSetDimensions: undefined
+  handlerSetDimensions: undefined,
+  tooltipRef: null
 };
 var _default = Tooltip;
 exports["default"] = _default;