flexlayout-react 0.8.4 → 0.8.6

package/lib/view/TabOverflowHook.js

@@ -1,14 +1,22 @@
 import * as React from "react";
 import { Orientation } from "../Orientation";
+import { startDrag } from "./Utils";
 /** @internal */
-export const useTabOverflow = (layout, node, orientation, tabStripRef, tabClassName) => {
+export const useTabOverflow = (layout, node, orientation, tabStripRef, miniScrollRef, tabClassName) => {
     const [hiddenTabs, setHiddenTabs] = React.useState([]);
     const [isTabOverflow, setTabOverflow] = React.useState(false);
     const selfRef = React.useRef(null);
     const userControlledPositionRef = React.useRef(false);
     const updateHiddenTabsTimerRef = React.useRef(undefined);
     const hiddenTabsRef = React.useRef([]);
+    const thumbInternalPos = React.useRef(0);
     hiddenTabsRef.current = hiddenTabs;
+    // if node changes (new model) then reset scroll to 0
+    React.useEffect(() => {
+        if (tabStripRef.current) {
+            setScrollPosition(0);
+        }
+    }, [node]);
     // if selected node or tabset/border rectangle change then unset usercontrolled (so selected tab will be kept in view)
     React.useEffect(() => {
         userControlledPositionRef.current = false;
@@ -22,7 +30,44 @@ export const useTabOverflow = (layout, node, orientation, tabStripRef, tabClassN
             }
         }
         updateHiddenTabs();
+        updateScrollMetrics();
     });
+    const updateScrollMetrics = () => {
+        if (tabStripRef.current && miniScrollRef.current) {
+            const t = tabStripRef.current;
+            const s = miniScrollRef.current;
+            const size = getSize(t);
+            const scrollSize = getScrollSize(t);
+            const position = getScrollPosition(t);
+            if (scrollSize > size && scrollSize > 0) {
+                let thumbSize = size * size / scrollSize;
+                let adjust = 0;
+                if (thumbSize < 20) {
+                    adjust = 20 - thumbSize;
+                    thumbSize = 20;
+                }
+                const thumbPos = position * (size - adjust) / scrollSize;
+                if (orientation === Orientation.HORZ) {
+                    s.style.width = thumbSize + "px";
+                    s.style.left = thumbPos + "px";
+                }
+                else {
+                    s.style.height = thumbSize + "px";
+                    s.style.top = thumbPos + "px";
+                }
+                s.style.display = "block";
+            }
+            else {
+                s.style.display = "none";
+            }
+            if (orientation === Orientation.HORZ) {
+                s.style.bottom = "0px";
+            }
+            else {
+                s.style.right = "0px";
+            }
+        }
+    };
     const updateHiddenTabs = () => {
         if (updateHiddenTabsTimerRef.current === undefined) {
             // throttle updates to prevent Maximum update depth exceeded error
@@ -50,9 +95,50 @@ export const useTabOverflow = (layout, node, orientation, tabStripRef, tabClassN
         }
     };
     const onScroll = () => {
+        userControlledPositionRef.current = true;
         updateTabRects();
+        updateScrollMetrics();
         updateHiddenTabs();
+    };
+    const onScrollPointerDown = (event) => {
+        var _a;
+        event.stopPropagation();
+        miniScrollRef.current.setPointerCapture(event.pointerId);
+        const r = (_a = miniScrollRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+        if (orientation === Orientation.HORZ) {
+            thumbInternalPos.current = event.clientX - r.x;
+        }
+        else {
+            thumbInternalPos.current = event.clientY - r.y;
+        }
         userControlledPositionRef.current = true;
+        startDrag(event.currentTarget.ownerDocument, event, onDragMove, onDragEnd, onDragCancel);
+    };
+    const onDragMove = (x, y) => {
+        if (tabStripRef.current && miniScrollRef.current) {
+            const t = tabStripRef.current;
+            const s = miniScrollRef.current;
+            const size = getSize(t);
+            const scrollSize = getScrollSize(t);
+            const thumbSize = getSize(s);
+            const r = t.getBoundingClientRect();
+            let thumb = 0;
+            if (orientation === Orientation.HORZ) {
+                thumb = x - r.x - thumbInternalPos.current;
+            }
+            else {
+                thumb = y - r.y - thumbInternalPos.current;
+            }
+            thumb = Math.max(0, Math.min(scrollSize - thumbSize, thumb));
+            if (size > 0) {
+                const scrollPos = thumb * scrollSize / size;
+                setScrollPosition(scrollPos);
+            }
+        }
+    };
+    const onDragEnd = () => {
+    };
+    const onDragCancel = () => {
     };
     const findSelectedTab = () => {
         let found = undefined;
@@ -103,24 +189,21 @@ export const useTabOverflow = (layout, node, orientation, tabStripRef, tabClassN
             if (node.getChildren().length === 0)
                 return;
             let delta = 0;
-            if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
-                delta = -event.deltaX;
-            }
-            else {
+            if (Math.abs(event.deltaY) > 0) {
                 delta = -event.deltaY;
+                if (event.deltaMode === 1) {
+                    // DOM_DELTA_LINE	0x01	The delta values are specified in lines.
+                    delta *= 40;
+                }
+                const newPos = getScrollPosition(tabStripRef.current) - delta;
+                const maxScroll = getScrollSize(tabStripRef.current) - getSize(tabStripRef.current);
+                const p = Math.max(0, Math.min(maxScroll, newPos));
+                setScrollPosition(p);
+                updateTabRects();
+                updateHiddenTabs();
+                userControlledPositionRef.current = true;
+                event.stopPropagation();
             }
-            if (event.deltaMode === 1) {
-                // DOM_DELTA_LINE	0x01	The delta values are specified in lines.
-                delta *= 40;
-            }
-            const newPos = getScrollPosition() - delta;
-            const maxScroll = getScrollSize(tabStripRef.current) - getSize(tabStripRef.current);
-            const p = Math.max(0, Math.min(maxScroll, newPos));
-            userControlledPositionRef.current = true;
-            setScrollPosition(p);
-            updateTabRects();
-            updateHiddenTabs();
-            event.stopPropagation();
         }
     };
     // orientation helpers:
@@ -164,15 +247,15 @@ export const useTabOverflow = (layout, node, orientation, tabStripRef, tabClassN
             tabStripRef.current.scrollTop = p;
         }
     };
-    const getScrollPosition = () => {
+    const getScrollPosition = (elm) => {
         if (orientation === Orientation.HORZ) {
-            return tabStripRef.current.scrollLeft;
+            return elm.scrollLeft;
         }
         else {
-            return tabStripRef.current.scrollTop;
+            return elm.scrollTop;
         }
     };
-    return { selfRef, userControlledPositionRef, onScroll, hiddenTabs, onMouseWheel, isTabOverflow };
+    return { selfRef, userControlledPositionRef, onScroll, onScrollPointerDown, hiddenTabs, onMouseWheel, isTabOverflow };
 };
 function arraysEqual(arr1, arr2) {
     return arr1.length === arr2.length && arr1.every((val, index) => val === arr2[index]);

package/lib/view/TabOverflowHook.js.map

@@ -1 +1 @@
-{"version":3,"file":"TabOverflowHook.js","sourceRoot":"","sources":["../../src/view/TabOverflowHook.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TabOverflowHook.js","sourceRoot":"","sources":["../../src/view/TabOverflowHook.tsx"],"names":[],"mappings":"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"}

package/lib/view/TabSet.js

@@ -13,6 +13,7 @@ import { Rect } from "../Rect";
 export const TabSet = (props) => {
     const { node, layout } = props;
     const tabStripRef = React.useRef(null);
+    const miniScrollRef = React.useRef(null);
     const tabStripInnerRef = React.useRef(null);
     const contentRef = React.useRef(null);
     const buttonBarRef = React.useRef(null);
@@ -34,7 +35,7 @@ export const TabSet = (props) => {
         }
     });
     // this must be after the useEffect, so the node rect is already set (else window popin will not position tabs correctly)
-    const { selfRef, userControlledPositionRef, onScroll, hiddenTabs, onMouseWheel, isTabOverflow } = useTabOverflow(layout, node, Orientation.HORZ, tabStripInnerRef, layout.getClassName(CLASSES.FLEXLAYOUT__TAB_BUTTON));
+    const { selfRef, userControlledPositionRef, onScroll, onScrollPointerDown, hiddenTabs, onMouseWheel, isTabOverflow } = useTabOverflow(layout, node, Orientation.HORZ, tabStripInnerRef, miniScrollRef, layout.getClassName(CLASSES.FLEXLAYOUT__TAB_BUTTON));
     const onOverflowClick = (event) => {
         const callback = layout.getShowOverflowMenu();
         const items = hiddenTabs.map(h => { return { index: h, node: node.getChildren()[h] }; });
@@ -43,7 +44,7 @@ export const TabSet = (props) => {
         }
         else {
             const element = overflowbuttonRef.current;
-            showPopup(element, items, onOverflowItemSelect, layout);
+            showPopup(element, node, items, onOverflowItemSelect, layout);
         }
         event.stopPropagation();
     };
@@ -209,10 +210,15 @@ export const TabSet = (props) => {
     }
     else {
         if (node.isEnableTabStrip()) {
-            const miniScrollbarClasses = cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR) + (node.isEnableTabScrollbar() ? "" : " " + cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR_HIDDEN));
+            let miniScrollbar = undefined;
+            if (node.isEnableTabScrollbar()) {
+                miniScrollbar = (React.createElement("div", { ref: miniScrollRef, className: cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR), onPointerDown: onScrollPointerDown }));
+            }
             tabStrip = (React.createElement("div", { className: tabStripClasses, ref: tabStripRef, "data-layout-path": path + "/tabstrip", onPointerDown: onPointerDown, onDoubleClick: onDoubleClick, onContextMenu: onContextMenu, onClick: onAuxMouseClick, onAuxClick: onAuxMouseClick, draggable: true, onWheel: onMouseWheel, onDragStart: onDragStart },
-                React.createElement("div", { ref: tabStripInnerRef, className: cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER) + " " + cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER_ + node.getTabLocation()) + " " + miniScrollbarClasses, style: { overflowX: 'auto', overflowY: "hidden" }, onScroll: onScroll },
-                    React.createElement("div", { style: { width: (isTabStretch ? "100%" : "none") }, className: cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER_TAB_CONTAINER) + " " + cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER_TAB_CONTAINER_ + node.getTabLocation()) }, tabs)),
+                React.createElement("div", { className: cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR_CONTAINER) },
+                    React.createElement("div", { ref: tabStripInnerRef, className: cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER) + " " + cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER_ + node.getTabLocation()), style: { overflowX: 'auto', overflowY: "hidden" }, onScroll: onScroll },
+                        React.createElement("div", { style: { width: (isTabStretch ? "100%" : "none") }, className: cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER_TAB_CONTAINER) + " " + cm(CLASSES.FLEXLAYOUT__TABSET_TABBAR_INNER_TAB_CONTAINER_ + node.getTabLocation()) }, tabs)),
+                    miniScrollbar),
                 buttonbar));
         }
     }

package/lib/view/TabSet.js.map

@@ -1 +1 @@
-{"version":3,"file":"TabSet.js","sourceRoot":"","sources":["../../src/view/TabSet.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAQ/B,gBAAgB;AAChB,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC1C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAE/B,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAC/D,MAAM,iBAAiB,GAAG,KAAK,CAAC,MAAM,CAA2B,IAAI,CAAC,CAAC;IACvE,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAEnE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAEhC,sIAAsI;IACtI,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAC,CAAC;QAE7D,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,qBAAqB,CAAC,WAAW,CAAC,OAAQ,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,OAAQ,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAG,CAAC,CAAC;QACjG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;YACpC,UAAU,CAAC,GAAE,EAAE;gBACX,MAAM,CAAC,cAAc,CAAC,sBAAsB,GAAG,cAAc,CAAC,CAAC;YACnE,CAAC,EAAC,CAAC,CAAC,CAAC;QACT,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,yHAAyH;IACzH,MAAM,EAAE,OAAO,EAAE,yBAAyB,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,GAC3F,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,gBAAgB,EAC3D,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAE7D,MAAM,eAAe,GAAG,CAAC,KAAgD,EAAE,EAAE;QACzE,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,GAAE,OAAO,EAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAa,EAAC,CAAC,CAAA,CAAC,CAAC,CAAC;QACjG,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACJ,MAAM,OAAO,GAAG,iBAAiB,CAAC,OAAQ,CAAC;YAC3C,SAAS,CACL,OAAO,EACP,KAAK,EACL,oBAAoB,EACpB,MAAM,CACT,CAAC;QACN,CAAC;QACD,KAAK,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,CAAC,IAAsC,EAAE,EAAE;QACpE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACtD,yBAAyB,CAAC,OAAO,GAAG,KAAK,CAAC;IAC9C,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,KAAmC,EAAE,EAAE;QACxD,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;gBACtB,KAAK,CAAC,eAAe,EAAE,CAAC;gBACxB,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,WAAW,EAAE,IAAkB,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACJ,KAAK,CAAC,cAAc,EAAE,CAAC;YAC3B,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,KAAK,CAAC,cAAc,EAAE,CAAC;QAC3B,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,KAAsC,EAAE,EAAE;QAC7D,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,KAAgD,EAAE,EAAE;QACzE,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,KAAgD,EAAE,EAAE;QACvE,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC,CAAC;IAEF,MAAM,sBAAsB,GAAG,CAAC,KAAyB,EAAE,EAAE;QACzD,KAAK,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,KAAgD,EAAE,EAAE;QAC1E,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,KAAK,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,KAAgD,EAAE,EAAE;QACjE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACpD,KAAK,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,KAAgD,EAAE,EAAE;QACpE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAClE,KAAK,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,KAAgD,EAAE,EAAE;QACrE,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC5D,uDAAuD;QAC3D,CAAC;QACD,KAAK,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,KAAgD,EAAE,EAAE;QACvE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC,CAAC;IAEF,eAAe;IAEf,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC;IAC/B,MAAM,eAAe,GAAY,IAAI,CAAC,eAAe,EAAa,CAAC;IACnE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAE5B,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAY,CAAC;YAC/C,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,CACL,oBAAC,SAAS,IACN,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,CAAC,EACtB,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,EAClB,QAAQ,EAAE,UAAU,GACtB,CAAC,CAAC;YACR,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CACL,6BAAK,GAAG,EAAE,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAQ,CACzF,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAED,IAAI,aAAa,GAAsB,EAAE,CAAC;IAC1C,IAAI,OAAO,GAAsB,EAAE,CAAC;IAEpC,qDAAqD;IACrD,MAAM,WAAW,GAAwB,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC;IACjG,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1C,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAC1C,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;IAE9B,MAAM,YAAY,GAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;IACxF,MAAM,SAAS,GAAG,CAAC,YAAY,IAAI,CAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAa,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;IAEjH,IAAI,WAAW,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC7C,WAAW,CAAC,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC;IACxD,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,IAAI,YAAY,CAAC,EAAE,CAAC;YAC7D,OAAO,GAAG,CAAC,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,6BACN,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAC,0BAA0B,EAC9B,aAAa,EAAE,sBAAsB,EACrC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAA,CAAC,CAAC,EAC1C,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,gDAAgD,CAAC,IAEtE,aAAa,CACZ,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QACzB,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;YACvE,IAAI,eAAe,CAAC;YACpB,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,GAAE,OAAO,EAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAa,EAAC,CAAC,CAAA,CAAC,CAAC,CAAC;gBACjG,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACJ,eAAe,GAAG,CAAC;oBACd,KAAK,CAAC,IAAI;oBACX,6BAAK,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,qCAAqC,CAAC,IAAG,UAAU,CAAC,MAAM,CAAO,CAC7F,CAAC,CAAC;YACT,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EACpE,gCACI,GAAG,EAAC,gBAAgB,sBACF,IAAI,GAAG,kBAAkB,EAE3C,GAAG,EAAE,iBAAiB,EACtB,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC,EACzG,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,EACxB,aAAa,EAAE,sBAAsB,IAEpC,eAAe,CACX,CACZ,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,eAAe,KAAK,SAAS;QAC7B,MAAM,CAAC,gBAAgB,EAAE;QACzB,eAAe,CAAC,cAAc,EAAE;QAChC,eAAe,CAAC,kBAAkB,EAAE,EAAG,CAAC;QAExC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CACR,gCACI,GAAG,EAAC,QAAQ,sBACM,IAAI,GAAG,gBAAgB,EACzC,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC,EAC9G,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,sBAAsB,IAEpC,CAAC,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAC/E,CACZ,CAAC;IACN,CAAC;IAED,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACrB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CACR,gCACI,GAAG,EAAC,KAAK,sBACS,IAAI,GAAG,aAAa,EACtC,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAC/C,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,+BAA+B,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAChJ,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,sBAAsB,IAEpC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACjB,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7E,CAAC,OAAO,KAAK,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAC7E,CACZ,CAAC;IACN,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,SAAS,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC5G,OAAO,CAAC,IAAI,CACR,gCACI,GAAG,EAAC,OAAO,sBACO,IAAI,GAAG,eAAe,EACxC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC,EAC9G,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAC5C,aAAa,EAAE,sBAAsB,IAEpC,CAAC,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CACnF,CACZ,CAAC;IACN,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;QAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CACR,6BACI,GAAG,EAAC,QAAQ,sBACM,IAAI,GAAG,gBAAgB,EACzC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,IAElD,CAAC,OAAO,KAAK,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CACzF,CACT,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,CACd,6BAAK,GAAG,EAAC,WAAW,EAAC,GAAG,EAAE,YAAY,EAClC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAC9C,aAAa,EAAE,sBAAsB,EACrC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,cAAc,EAAE,CAAA,CAAC,CAAC,IAEzC,OAAO,CACN,CACT,CAAC;IAEF,IAAI,QAAQ,CAAC;IAEb,IAAI,eAAe,GAAG,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IAClE,IAAI,IAAI,CAAC,oBAAoB,EAAE,KAAK,SAAS,EAAE,CAAC;QAC5C,eAAe,IAAI,GAAG,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACzD,CAAC;IACD,eAAe,IAAI,GAAG,GAAG,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IAE1F,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QAClB,eAAe,IAAI,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACrB,eAAe,IAAI,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAY,CAAC;QACjD,IAAI,OAAO,CAAC,kBAAkB,EAAE,KAAK,SAAS,EAAE,CAAC;YAC7C,eAAe,IAAI,GAAG,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC1D,CAAC;IACL,CAAC;IAED,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC1B,QAAQ,GAAG,CACP,6BAAK,SAAS,EAAE,eAAe,EAC3B,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAC,KAAK,EAAE,SAAS,EAAC,KAAK,EAAE,EACvD,GAAG,EAAE,WAAW,sBACE,IAAI,GAAG,WAAW,EACpC,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,WAAW;gBAEvB,IAAI;gBACL,6BAAK,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAI;gBAC9B,SAAS,CACR,CACT,CAAC;QACN,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC1B,MAAM,oBAAoB,GAAG,EAAE,CAAC,OAAO,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAA,CAAC,CAAA,EAAE,CAAA,CAAC,CAAA,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC,CAAC;YAC3J,QAAQ,GAAG,CACP,6BAAK,SAAS,EAAE,eAAe,EAC3B,GAAG,EAAE,WAAW,sBACE,IAAI,GAAG,WAAW,EACpC,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,IAAI,EACf,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,WAAW;gBAExB,6BAAK,GAAG,EAAE,gBAAgB,EACtB,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,gCAAgC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,GAAG,GAAG,GAAG,oBAAoB,EAChK,KAAK,EAAE,EAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAC,QAAQ,EAAC,EAC9C,QAAQ,EAAE,QAAQ;oBAClB,6BACI,KAAK,EAAE,EAAC,KAAK,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EACjD,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,6CAA6C,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,8CAA8C,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,IAE9J,IAAI,CACH,CACJ;gBACL,SAAS,CACR,CACT,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,WAA4B,CAAC;IACjC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,mBAAmB,GAAG,MAAM,CAAC,4BAA4B,EAAE,CAAC;QAClE,IAAI,mBAAmB,EAAE,CAAC;YACtB,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC;IAED,IAAI,OAAO,GAAG,6BAAK,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,0BAA0B,CAAC,IAChF,WAAW,CACV,CAAA;IAEN,IAAI,IAAI,CAAC,cAAc,EAAE,KAAK,KAAK,EAAE,CAAC;QAClC,OAAO,GAAG;YAAG,QAAQ;YAAE,OAAO,CAAI,CAAC;IACvC,CAAC;SAAM,CAAC;QACJ,OAAO,GAAG;YAAG,OAAO;YAAE,QAAQ,CAAI,CAAC;IACvC,CAAC;IAED,IAAI,KAAK,GAAwB;QAC7B,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC;QAC9C,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;QAC5B,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;QAC9B,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE;QAC5B,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;KACjC,CAAC;IAEF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QAChG,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,0FAA0F;IAC1F,+DAA+D;IAC/D,MAAM,MAAM,GAAG,CACX,6BAAK,GAAG,EAAE,OAAO,EACb,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,EACnD,KAAK,EAAE,KAAK;QAEZ,6BAAK,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,sBACxB,IAAI,IAErB,OAAO,CACN,CACJ,CACT,CAAC;IAEF,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACrB,IAAI,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1B,OAAO,YAAY,CACf,6BAAK,KAAK,EAAE;oBACR,QAAQ,EAAE,UAAU;oBACpB,OAAO,EAAE,MAAM;oBACf,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC;iBACvC,IACI,MAAM,CACL,EAAE,MAAM,CAAC,cAAc,EAAG,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACJ,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,MAAM,CAAC;IAClB,CAAC;AAEL,CAAC,CAAC"}
+{"version":3,"file":"TabSet.js","sourceRoot":"","sources":["../../src/view/TabSet.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flexlayout-react",
-    "version": "0.8.4",
+    "version": "0.8.6",
     "description": "A multi-tab docking layout manager",
     "main": "lib/index.js",
     "types": "./declarations/index.d.ts",
@@ -32,7 +32,7 @@
         "build:demo": "webpack",
         "lint:eslint": "eslint src/*",
         "doc": "typedoc --out typedoc --exclude \"**/examples/**/*.tsx\" --excludeInternal --disableSources --excludePrivate --excludeProtected --readme none ./src",
-        "css": "sass style/rounded.scss  style/rounded.css && sass style/underline.scss style/underline.css && sass style/gray.scss style/gray.css && sass style/light.scss style/light.css && sass style/light.scss test/style/light.css && sass style/dark.scss style/dark.css"
+        "css": "sass style/rounded.scss  style/rounded.css && sass style/underline.scss style/underline.css && sass style/gray.scss style/gray.css && sass style/light.scss style/light.css && sass style/light.scss test/style/light.css && sass style/dark.scss style/dark.css  && sass style/combined.scss style/combined.css"
     },
     "author": "Caplin Systems Ltd",
     "repository": "https://github.com/caplin/FlexLayout",

package/src/Types.ts

@@ -38,7 +38,6 @@ export enum CLASSES {
     FLEXLAYOUT__ERROR_BOUNDARY_CONTENT = "flexlayout__error_boundary_content",
 
     FLEXLAYOUT__FLOATING_WINDOW_CONTENT = "flexlayout__floating_window_content",
-    FLEXLAYOUT__FLOATING_WINDOW_TAB = "flexlayout__floating_window_tab",
 
     FLEXLAYOUT__LAYOUT = "flexlayout__layout",
     FLEXLAYOUT__LAYOUT_MOVEABLES = "flexlayout__layout_moveables",
@@ -69,16 +68,14 @@ export enum CLASSES {
     FLEXLAYOUT__TABSET = "flexlayout__tabset",
     FLEXLAYOUT__TABSET_CONTAINER = "flexlayout__tabset_container",
     FLEXLAYOUT__TABSET_HEADER = "flexlayout__tabset_header",
-    FLEXLAYOUT__TABSET_HEADER_SIZER = "flexlayout__tabset_header_sizer",
     FLEXLAYOUT__TABSET_HEADER_CONTENT = "flexlayout__tabset_header_content",
     FLEXLAYOUT__TABSET_MAXIMIZED = "flexlayout__tabset-maximized",
     FLEXLAYOUT__TABSET_SELECTED = "flexlayout__tabset-selected",
-    FLEXLAYOUT__TABSET_SIZER = "flexlayout__tabset_sizer",
     FLEXLAYOUT__TABSET_TAB_DIVIDER = "flexlayout__tabset_tab_divider",
-
     FLEXLAYOUT__TABSET_CONTENT = "flexlayout__tabset_content",
     FLEXLAYOUT__TABSET_TABBAR_INNER = "flexlayout__tabset_tabbar_inner",
     FLEXLAYOUT__TABSET_TABBAR_INNER_ = "flexlayout__tabset_tabbar_inner_",
+   
     FLEXLAYOUT__TABSET_TABBAR_INNER_TAB_CONTAINER = "flexlayout__tabset_tabbar_inner_tab_container",
     FLEXLAYOUT__TABSET_TABBAR_INNER_TAB_CONTAINER_ = "flexlayout__tabset_tabbar_inner_tab_container_",
 
@@ -97,9 +94,6 @@ export enum CLASSES {
     FLEXLAYOUT__TAB_BUTTON_TRAILING = "flexlayout__tab_button_trailing",
     FLEXLAYOUT__TAB_BUTTON_STAMP = "flexlayout__tab_button_stamp",
 
-    FLEXLAYOUT__TAB_FLOATING = "flexlayout__tab_floating",
-    FLEXLAYOUT__TAB_FLOATING_INNER = "flexlayout__tab_floating_inner",
-
     FLEXLAYOUT__TAB_TOOLBAR = "flexlayout__tab_toolbar",
     FLEXLAYOUT__TAB_TOOLBAR_BUTTON = "flexlayout__tab_toolbar_button",
     FLEXLAYOUT__TAB_TOOLBAR_ICON = "flexlayout__tab_toolbar_icon",
@@ -110,8 +104,9 @@ export enum CLASSES {
 
     FLEXLAYOUT__POPUP_MENU_CONTAINER = "flexlayout__popup_menu_container",
     FLEXLAYOUT__POPUP_MENU_ITEM = "flexlayout__popup_menu_item",
+    FLEXLAYOUT__POPUP_MENU_ITEM__SELECTED = "flexlayout__popup_menu_item--selected",
     FLEXLAYOUT__POPUP_MENU = "flexlayout__popup_menu",
 
     FLEXLAYOUT__MINI_SCROLLBAR = "flexlayout__mini_scrollbar",
-    FLEXLAYOUT__MINI_SCROLLBAR_HIDDEN = "flexlayout__mini_scrollbar_hidden",
+    FLEXLAYOUT__MINI_SCROLLBAR_CONTAINER = "flexlayout__mini_scrollbar_container",
 }

package/src/model/TabSetNode.ts

@@ -342,16 +342,20 @@ export class TabSetNode extends Node implements IDraggable, IDropTarget {
                         p = this.tabStripRect.x;
                     }
                     childCenter = r.x + r.width / 2;
-                    if (x >= p && x < childCenter && y > r.y && y < r.getBottom()) {
+                    if (p <= x && x < childCenter && r.y < y && y < r.getBottom()) {
                         const dockLocation = DockLocation.CENTER;
                         const outlineRect = new Rect(r.x - 2, r.y, 3, r.height);
-                        dropInfo = new DropInfo(this, outlineRect, dockLocation, i, CLASSES.FLEXLAYOUT__OUTLINE_RECT);
-                        break;
+                        if (this.rect.x < r.x && r.x < this.rect.getRight()) {
+                            dropInfo = new DropInfo(this, outlineRect, dockLocation, i, CLASSES.FLEXLAYOUT__OUTLINE_RECT);
+                            break;
+                        } else {
+                            return undefined;
+                        }
                     }
                     p = childCenter;
                 }
             }
-            if (dropInfo == null) {
+            if (dropInfo == null && r.getRight() < this.rect!.getRight()) {
                 const dockLocation = DockLocation.CENTER;
                 const outlineRect = new Rect(r.getRight() - 2, yy, 3, h);
                 dropInfo = new DropInfo(this, outlineRect, dockLocation, this.children.length, CLASSES.FLEXLAYOUT__OUTLINE_RECT);

package/src/view/BorderTabSet.tsx

@@ -25,6 +25,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
     const { border, layout, size } = props;
 
     const toolbarRef = React.useRef<HTMLDivElement | null>(null);
+    const miniScrollRef = React.useRef<HTMLDivElement | null>(null);
     const overflowbuttonRef = React.useRef<HTMLButtonElement | null>(null);
     const stickyButtonsRef = React.useRef<HTMLDivElement | null>(null);
     const tabStripInnerRef = React.useRef<HTMLDivElement | null>(null);
@@ -34,11 +35,11 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
     React.useLayoutEffect(() => {
         border.setTabHeaderRect(Rect.getBoundingClientRect(selfRef.current!).relativeTo(layout.getDomRect()!));
     });
-    
-    const { selfRef, userControlledPositionRef, onScroll, hiddenTabs, onMouseWheel, isTabOverflow } = 
-        useTabOverflow(layout, border, Orientation.flip(border.getOrientation()), tabStripInnerRef,
+
+    const { selfRef, userControlledPositionRef, onScroll, onScrollPointerDown, hiddenTabs, onMouseWheel, isTabOverflow } =
+        useTabOverflow(layout, border, Orientation.flip(border.getOrientation()), tabStripInnerRef, miniScrollRef,
             layout.getClassName(CLASSES.FLEXLAYOUT__BORDER_BUTTON)
-    );
+        );
 
     const onAuxMouseClick = (event: React.MouseEvent<HTMLElement, MouseEvent>) => {
         if (isAuxMouseEvent(event)) {
@@ -56,13 +57,15 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
 
     const onOverflowClick = (event: React.MouseEvent<HTMLElement, MouseEvent>) => {
         const callback = layout.getShowOverflowMenu();
-        const items = hiddenTabs.map(h=> {return {index: h, node: (border.getChildren()[h] as TabNode)};});
+        const items = hiddenTabs.map(h => { return { index: h, node: (border.getChildren()[h] as TabNode) }; });
         if (callback !== undefined) {
 
             callback(border, event, items, onOverflowItemSelect);
         } else {
             const element = overflowbuttonRef.current!;
-            showPopup(element,
+            showPopup(
+                element,
+                border,
                 items,
                 onOverflowItemSelect,
                 layout);
@@ -72,7 +75,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
 
     const onOverflowItemSelect = (item: { node: TabNode; index: number }) => {
         layout.doAction(Actions.selectTab(item.node.getId()));
-        userControlledPositionRef.current = false; 
+        userControlledPositionRef.current = false;
     };
 
     const onPopoutTab = (event: React.MouseEvent<HTMLElement, MouseEvent>) => {
@@ -149,7 +152,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
         const overflowTitle = layout.i18nName(I18nLabel.Overflow_Menu_Tooltip);
         let overflowContent;
         if (typeof icons.more === "function") {
-            const items = hiddenTabs.map(h=> {return {index: h, node: (border.getChildren()[h] as TabNode)};});
+            const items = hiddenTabs.map(h => { return { index: h, node: (border.getChildren()[h] as TabNode) }; });
 
             overflowContent = icons.more(border, items);
         } else {
@@ -200,17 +203,25 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
     let outerStyle = {};
     const borderHeight = size - 1;
     if (border.getLocation() === DockLocation.LEFT) {
-        innerStyle = { right: "100%", top:0 };
-        outerStyle = { width: borderHeight, overflowY: "auto"};
+        innerStyle = { right: "100%", top: 0 };
+        outerStyle = { width: borderHeight, overflowY: "auto" };
     } else if (border.getLocation() === DockLocation.RIGHT) {
-        innerStyle = { left: "100%", top:0};
+        innerStyle = { left: "100%", top: 0 };
         outerStyle = { width: borderHeight, overflowY: "auto" };
     } else {
-        innerStyle = {left:0 };
+        innerStyle = { left: 0 };
         outerStyle = { height: borderHeight, overflowX: "auto" };
     }
-    const miniScrollbarClasses = cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR) + (border.isEnableTabScrollbar()?"":" " + cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR_HIDDEN));
-    
+
+    let miniScrollbar = undefined;
+    if (border.isEnableTabScrollbar()) {
+        miniScrollbar = (
+            <div ref={miniScrollRef}
+                className={cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR)}
+                onPointerDown={onScrollPointerDown}
+            />
+        );
+    }
 
     return (
         <div
@@ -226,21 +237,24 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
             onContextMenu={onContextMenu}
             onWheel={onMouseWheel}
         >
-            <div
-                ref={tabStripInnerRef}
-                className={cm(CLASSES.FLEXLAYOUT__BORDER_INNER) + " " + cm(CLASSES.FLEXLAYOUT__BORDER_INNER_ + border.getLocation().getName()) + " " + miniScrollbarClasses}
-                style={outerStyle}
-                onScroll={onScroll}  
-                >
+            <div className={cm(CLASSES.FLEXLAYOUT__MINI_SCROLLBAR_CONTAINER)}>
                 <div
-                    style={innerStyle}
-                    className={cm(CLASSES.FLEXLAYOUT__BORDER_INNER_TAB_CONTAINER) + " " + cm(CLASSES.FLEXLAYOUT__BORDER_INNER_TAB_CONTAINER_ + border.getLocation().getName())}
+                    ref={tabStripInnerRef}
+                    className={cm(CLASSES.FLEXLAYOUT__BORDER_INNER) + " " + cm(CLASSES.FLEXLAYOUT__BORDER_INNER_ + border.getLocation().getName())}
+                    style={outerStyle}
+                    onScroll={onScroll}
                 >
-                    {tabButtons}
+                    <div
+                        style={innerStyle}
+                        className={cm(CLASSES.FLEXLAYOUT__BORDER_INNER_TAB_CONTAINER) + " " + cm(CLASSES.FLEXLAYOUT__BORDER_INNER_TAB_CONTAINER_ + border.getLocation().getName())}
+                    >
+                        {tabButtons}
+                    </div>
                 </div>
+                {miniScrollbar}
             </div>
             {toolbar}
-        </div>
+        </div >
     );
 
 };

package/src/view/Layout.tsx

@@ -35,6 +35,8 @@ export interface ILayoutProps {
     model: Model;
     /** factory function for creating the tab components */
     factory: (node: TabNode) => React.ReactNode;
+    /** sets a top level class name on popout windows */
+    popoutClassName?: string;
     /** object mapping keys among close, maximize, restore, more, popout to React nodes to use in place of the default icons, can alternatively return functions for creating the React nodes */
     icons?: IIcons;
     /** function called whenever the layout generates an action to update the model (allows for intercepting actions before they are dispatched to the model, for example, asking the user to confirm a tab close.) Returning undefined from the function will halt the action, otherwise return the action to continue */
@@ -388,8 +390,8 @@ export class LayoutInternal extends React.Component<ILayoutInternalProps, ILayou
                 {tabStamps}
                 {this.state.portal}
                 {floatingWindows}
-            </div>
-        );
+                </div>
+            );
     }
 
     renderBorders(
@@ -538,7 +540,9 @@ export class LayoutInternal extends React.Component<ILayoutInternalProps, ILayou
                             onSetWindow={this.onSetWindow}
                             onCloseWindow={this.onCloseWindow}
                         >
-                            <LayoutInternal {...this.props} windowId={windowId} mainLayout={this} />
+                            <div className={this.props.popoutClassName}>
+                                 <LayoutInternal {...this.props} windowId={windowId} mainLayout={this} />
+                            </div>
                         </PopoutWindow>
                     );
                     i++;
@@ -1022,7 +1026,7 @@ export class LayoutInternal extends React.Component<ILayoutInternalProps, ILayou
             }
             if (!rendered) {
                 if (isSafari()) { // safari doesnt render the offscreen tabstamps
-                    this.setDragComponent(event, <TabButtonStamp node={node as TabNode} layout={this}/>, x,y);
+                    this.setDragComponent(event, <TabButtonStamp node={node as TabNode} layout={this} />, x, y);
                 } else {
                     event.dataTransfer!.setDragImage((node as TabNode).getTabStamp()!, x, y);
                 }
@@ -1224,7 +1228,7 @@ export class LayoutInternal extends React.Component<ILayoutInternalProps, ILayou
     // *************************** End Drag Drop *************************************
 }
 
-export const FlexLayoutVersion = "0.8.4";
+export const FlexLayoutVersion = "0.8.6";
 
 export type DragRectRenderCallback = (
     content: React.ReactNode | undefined,