@ringcentral/juno 2.31.0-hotfix.4 → 2.31.0-hotfix.6

package/es6/components/Tabs/Tabs/MoreMenuTabs/utils/MoreMenuTabsUtils.js

@@ -1,87 +0,0 @@
-export var DEFAULT_SIZE = {
-    width: 0,
-    height: 0,
-};
-export var computeChildBySize = function (labelArray, fixLabel, limitSize) {
-    var plainArr = [];
-    var groupArr = [];
-    var sumSize = 0;
-    var groupFlag = false;
-    labelArray.forEach(function (_label) {
-        var label = _label.key, size = _label.size;
-        if (groupFlag === false && sumSize + size < limitSize) {
-            sumSize += size;
-            plainArr.push(label);
-        }
-        else {
-            groupFlag = true;
-            groupArr.push(label);
-        }
-    });
-    if (fixLabel && groupArr.includes(fixLabel)) {
-        plainArr = [];
-        groupArr = [];
-        var fixLabelSize_1 = 0;
-        labelArray.forEach(function (_label) {
-            var label = _label.key, size = _label.size;
-            if (label === fixLabel) {
-                fixLabelSize_1 = size;
-            }
-        });
-        var sumFixSize_1 = 0;
-        var groupFlag_1 = false;
-        labelArray.forEach(function (_label) {
-            var label = _label.key, size = _label.size;
-            if (label === fixLabel) {
-                return;
-            }
-            if (groupFlag_1 === false && sumFixSize_1 + size < limitSize - fixLabelSize_1) {
-                sumFixSize_1 += size;
-                plainArr.push(label);
-            }
-            else {
-                groupFlag_1 = true;
-                groupArr.push(label);
-            }
-        });
-        plainArr.push(fixLabel);
-    }
-    return {
-        plainArr: plainArr,
-        groupArr: groupArr,
-    };
-};
-export var getDomBoundingClientSize = function (dom) {
-    if (!dom || dom.nodeType !== 1) {
-        return DEFAULT_SIZE;
-    }
-    var _a = dom.getBoundingClientRect(), width = _a.width, height = _a.height;
-    return {
-        width: width,
-        height: height,
-    };
-};
-/**
- *
- * @param keyProp React.key
- * @param idx string
- * @example
- * getKey('tab_0', 0) => childIdx_0_propKey_tab_0
- * getKey(undefined, 1) => childIdx_1
- */
-export var getKey = function (keyProp, idx) {
-    return "childIdx_" + idx + (keyProp ? "_propKey_" + keyProp : '');
-};
-/**
- *
- * @example
- * parseKey(childIdx_1) => { index: 1 }
- * parseKey(childIdx_1_propKey_tab_1) => { index: 1, key: tab_1 }
- */
-export var parseKey = function (key) {
-    var match = /^(?:childIdx_)(\d+)(?:_propKey_)?(.*)/gi.exec(key);
-    return {
-        index: match === null || match === void 0 ? void 0 : match[1],
-        key: match === null || match === void 0 ? void 0 : match[2].replace(/^\.\$/i, ''),
-    };
-};

package/es6/components/Tabs/Tabs/MoreMenuTabs/utils/index.js

@@ -1 +0,0 @@
-export * from './MoreMenuTabsUtils';

package/es6/foundation/hooks/useOnReRender/useOnReRender.js

@@ -1,12 +1,15 @@
-import { useLayoutEffect, useRef } from 'react';
+import { useLayoutEffect, useRef, useEffect } from 'react';
 import { useEventCallback } from '../useEventCallback';
 /**
  * only trigger when re-render, not trigger on component first render
  */
-export var useOnReRender = function (cb, deps) {
+export var useOnReRender = function (cb, deps, isLayout) {
+    if (isLayout === void 0) { isLayout = true; }
     var count = useRef(0);
     var method = useEventCallback(cb);
-    useLayoutEffect(function () {
+    var isLayoutRef = useRef(isLayout);
+    var useTargetEffect = isLayoutRef.current ? useLayoutEffect : useEffect;
+    useTargetEffect(function () {
         if (count.current === 0) {
             count.current = 1;
             return function () { };

package/foundation/hooks/useOnReRender/useOnReRender.d.ts

@@ -2,4 +2,4 @@ import { DependencyList } from 'react';
 /**
  * only trigger when re-render, not trigger on component first render
  */
-export declare const useOnReRender: (cb: () => any, deps?: DependencyList | undefined) => void;
+export declare const useOnReRender: (cb: () => any, deps?: DependencyList | undefined, isLayout?: boolean) => void;

package/foundation/hooks/useOnReRender/useOnReRender.js

@@ -5,10 +5,13 @@ var useEventCallback_1 = require("../useEventCallback");
 /**
  * only trigger when re-render, not trigger on component first render
  */
-exports.useOnReRender = function (cb, deps) {
+exports.useOnReRender = function (cb, deps, isLayout) {
+    if (isLayout === void 0) { isLayout = true; }
     var count = react_1.useRef(0);
     var method = useEventCallback_1.useEventCallback(cb);
-    react_1.useLayoutEffect(function () {
+    var isLayoutRef = react_1.useRef(isLayout);
+    var useTargetEffect = isLayoutRef.current ? react_1.useLayoutEffect : react_1.useEffect;
+    useTargetEffect(function () {
         if (count.current === 0) {
             count.current = 1;
             return function () { };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ringcentral/juno",
-  "version": "2.31.0-hotfix.4",
+  "version": "2.31.0-hotfix.6",
   "author": "RingCentral",
   "license": "MIT",
   "main": "./index.js",