flexlayout-react 0.6.6 → 0.6.9

package/src/model/TabSetNode.ts

@@ -274,7 +274,10 @@ export class TabSetNode extends Node implements IDraggable, IDropTarget {
             const outlineRect = this._tabHeaderRect;
             dropInfo = new DropInfo(this, outlineRect!, dockLocation, -1, CLASSES.FLEXLAYOUT__OUTLINE_RECT);
         } else if (this._contentRect!.contains(x, y)) {
-            const dockLocation = DockLocation.getLocation(this._contentRect!, x, y);
+            let dockLocation = DockLocation.CENTER;
+            if (this._model.getMaximizedTabset() === undefined) {
+                dockLocation = DockLocation.getLocation(this._contentRect!, x, y);
+            }
             const outlineRect = dockLocation.getDockRect(this._rect);
             dropInfo = new DropInfo(this, outlineRect, dockLocation, -1, CLASSES.FLEXLAYOUT__OUTLINE_RECT);
         } else if (this._tabHeaderRect != null && this._tabHeaderRect.contains(x, y)) {

package/src/view/BorderTabSet.tsx

@@ -97,6 +97,10 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
                 icons={icons}
             />
         );
+        tabs.push(
+            <div key={"divider" + i} className={cm(CLASSES.FLEXLAYOUT__BORDER_TAB_DIVIDER)}></div>
+        );
+
     };
 
     for (let i = 0; i < border.getChildren().length; i++) {

package/src/view/Layout.tsx

@@ -39,6 +39,7 @@ export type ShowOverflowMenuCallback = (
     items: { index: number; node: TabNode }[],
     onSelect: (item: { index: number; node: TabNode }) => void,
 ) => void;
+export type TabSetPlaceHolderCallback = (node: TabSetNode) => React.ReactNode;
 
 export interface ILayoutProps {
     model: Model;
@@ -83,6 +84,7 @@ export interface ILayoutProps {
     onContextMenu?: NodeMouseEvent;
     onAuxMouseClick?: NodeMouseEvent;
     onShowOverflowMenu?: ShowOverflowMenuCallback;
+    onTabSetPlaceHolder?: TabSetPlaceHolderCallback;
 }
 export interface IFontValues {
     size?: string;
@@ -93,6 +95,7 @@ export interface IFontValues {
 
 export interface ITabSetRenderValues {
     headerContent?: React.ReactNode;
+    centerContent?: React.ReactNode;
     stickyButtons: React.ReactNode[];
     buttons: React.ReactNode[];
     headerButtons: React.ReactNode[];
@@ -187,6 +190,7 @@ export interface ILayoutCallbacks {
     showPortal: (portal: React.ReactNode, portalDiv: HTMLDivElement) => void;
     hidePortal: () => void;
     getShowOverflowMenu(): ShowOverflowMenuCallback | undefined;
+    getTabSetPlaceHolderCallback() : TabSetPlaceHolderCallback | undefined;
 }
 
 // Popout windows work in latest browsers based on webkit (Chrome, Opera, Safari, latest Edge) and Firefox. They do
@@ -829,7 +833,7 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
         onClick?: (event: Event) => void,
         onDoubleClick?: (event: Event) => void
     ) => {
-        if (this.props.model.getMaximizedTabset() !== undefined || !allowDrag) {
+        if (!allowDrag) {
             DragDrop.instance.startDrag(event, undefined, undefined, undefined, undefined, onClick, onDoubleClick, this.currentDocument, this.selfRef.current!);
         } else {
             this.dragNode = node;
@@ -907,7 +911,9 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
             rootdiv.appendChild(this.dragDiv);
         }
         // add edge indicators
-        this.showEdges(rootdiv);
+        if (this.props.model.getMaximizedTabset() === undefined) {
+            this.showEdges(rootdiv);
+        }
 
         if (this.dragNode !== undefined && this.dragNode instanceof TabNode && this.dragNode.getTabRect() !== undefined) {
             this.dragNode.getTabRect()!.positionElement(this.outlineDiv);
@@ -1235,6 +1241,11 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
     getShowOverflowMenu() {
         return this.props.onShowOverflowMenu;
     }
+
+    /** @internal */
+    getTabSetPlaceHolderCallback() {
+        return this.props.onTabSetPlaceHolder;
+    }
     /** @internal */
     showContextMenu(node: TabNode | TabSetNode | BorderNode, event: React.MouseEvent<HTMLElement, MouseEvent>) {
         if (this.props.onContextMenu) {

package/src/view/TabSet.tsx

@@ -67,7 +67,11 @@ export const TabSet = (props: ITabSetProps) => {
             layout.doAction(Actions.setActiveTabset(node.getId()));
             if (!layout.getEditingTab()) {
                 const message = layout.i18nName(I18nLabel.Move_Tabset, name);
-                layout.dragStart(event, message, node, node.isEnableDrag(), (event2: Event) => undefined, onDoubleClick);
+                if (node.getModel().getMaximizedTabset() !== undefined) {
+                    layout.dragStart(event, message, node, false, (event2: Event) => undefined, onDoubleClick);
+                } else {
+                    layout.dragStart(event, message, node, node.isEnableDrag(), (event2: Event) => undefined, onDoubleClick);
+                }
             }
         }
     };
@@ -141,8 +145,10 @@ export const TabSet = (props: ITabSetProps) => {
                     iconFactory={iconFactory}
                     titleFactory={titleFactory}
                     icons={icons}
-                />
-            );
+                />);
+                tabs.push(
+                    <div  key={"divider" + i} className={cm(CLASSES.FLEXLAYOUT__TABSET_TAB_DIVIDER)}></div>
+                );
         }
     }
 
@@ -327,12 +333,6 @@ export const TabSet = (props: ITabSetProps) => {
     }
 
     const tabStripStyle: { [key: string]: string } = { height: node.getTabStripHeight() + "px" };
-    if (node.getTabLocation() === "top") {
-        const top = showHeader ? node.getHeaderHeight() + "px" : "0px";
-        tabStripStyle["top"] = top;
-    } else {
-        tabStripStyle["bottom"] = "0px";
-    }
     tabStrip = (
         <div className={tabStripClasses} style={tabStripStyle}
             data-layout-path={path + "/tabstrip"}
@@ -355,6 +355,25 @@ export const TabSet = (props: ITabSetProps) => {
 
     style = layout.styleFont(style);
 
+    var placeHolder: React.ReactNode = undefined;
+    if (node.getChildren().length === 0) {
+        const placeHolderCallback = layout.getTabSetPlaceHolderCallback();
+        if (placeHolderCallback) {
+            placeHolder = placeHolderCallback(node);
+        }
+    }
+
+    const center = <div className={cm(CLASSES.FLEXLAYOUT__TABSET_CONTENT)}>
+        {placeHolder}
+    </div>
+
+    var content;
+    if (node.getTabLocation() === "top") {
+        content = <>{header}{tabStrip}{center}</>;
+    } else {
+        content = <>{header}{center}{tabStrip}</>;
+    }
+
     return (
         <div ref={selfRef}
             dir="ltr"
@@ -362,8 +381,7 @@ export const TabSet = (props: ITabSetProps) => {
             style={style}
             className={cm(CLASSES.FLEXLAYOUT__TABSET)}
             onWheel={onMouseWheel}>
-            {header}
-            {tabStrip}
+            {content}
         </div>
     );
 };

package/style/_base.scss

@@ -8,32 +8,17 @@
 
 .flexlayout {
     &__layout {
-        --color-text: #{$color_text};
-        --color-background: #{$color_background};
-        --color-base: #{$color_base};
-        --color-1: #{$color_1};
-        --color-2: #{$color_2};
-        --color-3: #{$color_3};
-        --color-4: #{$color_4};
-        --color-5: #{$color_5};
-        --color-6: #{$color_6};
-        --color-drag1: #{$color_drag1};
-        --color-drag2: #{$color_drag2};
-        --color-drag1-background: #{$color_drag1_background};
-        --color-drag2-background: #{$color_drag2_background};
-        
-        --font-size: #{$font-size};
-        --font-family: #{$font-family};
-
         @include absoluteFill;
         overflow: hidden;
     }
 
     &__splitter {
+        background-color: var(--color-splitter);
         @include splitter_mixin;
 
         @media (hover: hover) {
             &:hover {
+                background-color: var(--color-splitter-hover);
                 transition: background-color ease-in .1s;
                 transition-delay: 0.05s;
                 @include splitter_hover_mixin;
@@ -45,6 +30,7 @@
         }
         &_drag {
             z-index: 1000;
+            background-color: var(--color-splitter-drag);
             @include splitter_drag_mixin;
         }
         &_extra {
@@ -75,17 +61,17 @@
         position: absolute;
         z-index: 1000;
         box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-        background-color: gray;
+        background-color: var(--color-edge-marker);
         pointer-events: none;
     }
 
     &__drag_rect {
         position: absolute;
         cursor: move;
-        color: var(--color-text);
-        background-color: var(--color-1);
-        border: 2px solid var(--color-4);
-        box-shadow: inset 0 0 60px rgba(0, 0, 0, 0.3);
+        color: var(--color-drag-rect);
+        background-color: var(--color-drag-rect-background);
+        border: 2px solid var(--color-drag-rect-border);
+        // box-shadow: inset 0 0 60px rgba(0, 0, 0, 0.3);
         border-radius: 5px;
         z-index: 1000;
         box-sizing: border-box;
@@ -96,31 +82,43 @@
         justify-content: center;
         flex-direction: column;
         overflow: hidden;
-        padding: 0.5em 1em;
+        padding: 0.3em 1em;
         word-wrap: break-word;
         font-size: var(--font-size);
         font-family: var(--font-family);
     }
 
     &__tabset {
+        display: flex;
+        flex-direction: column;
         overflow: hidden;
-        background-color: var(--color-1);
+        background-color: var(--color-tabset-background);
         box-sizing: border-box;
         font-size: var(--font-size);
         font-family: var(--font-family);
         @include tabset_mixin;
 
+        &_tab_divider {
+            width: 4px;
+            @include tabset_tab_divider_mixin;
+        }
+
+        &_content {
+            display: flex;
+            flex-grow: 1;
+            align-items: center;
+            justify-content: center;
+        }
+
         &_header {
             // tabset header bar
-            position: absolute;
             display: flex;
             align-items: center;
-            left: 0;
-            right: 0;
             padding: 3px 3px 3px 5px;
             box-sizing: border-box;
-            border-bottom: 1px solid var(--color-3);
-            color: var(--color-text);
+            border-bottom: 1px solid var(--color-tabset-divider-line);
+            color: var(--color-tabset-header);
+            background-color: var(--color-tabset-header-background);
             @include tabset_header_mixin;
 
             &_content {
@@ -132,21 +130,18 @@
             &_outer {
                 // tabset tabbar outer
                 box-sizing: border-box;
-                background-color: var(--color-1);
-                position: absolute;
-                left: 0;
-                right: 0;
+                background-color: var(--color-tabset-background);
                 overflow: hidden;
                 display: flex;
                 @include tabset_tabbar_mixin;
             }
 
             &_outer_top {
-                border-bottom: 1px solid var(--color-3);
+                border-bottom: 1px solid var(--color-tabset-divider-line);
             }
 
             &_outer_bottom {
-                border-top: 1px solid var(--color-3);
+                border-top: 1px solid var(--color-tabset-divider-line);
             }
 
             &_inner {
@@ -159,7 +154,6 @@
 
                 &_tab_container {
                     display: flex;
-                    gap: 4px;
                     padding-left: 4px;
                     padding-right: 4px;
                     box-sizing: border-box;
@@ -179,10 +173,12 @@
         }
 
         &-selected {
+            background-color: var(--color-tabset-background-selected);
             @include tabset_selected_mixin;
         }
 
         &-maximized {
+            background-color: var(--color-tabset-background-maximized);
             @include tabset_maximized_mixin;
         }
     }
@@ -199,8 +195,8 @@
         overflow: auto;
         position: absolute;
         box-sizing: border-box;
-        color: var(--color-text);
         background-color: var(--color-background);
+        color: var(--color-text);
 
         &_button {
             display: flex;
@@ -213,15 +209,21 @@
             @include tab_button_mixin;
 
             &--selected {
+                background-color:var(--color-tab-selected-background);
+                color:var(--color-tab-selected);
                 @include tab_button_selected_mixin;
             }
             @media (hover: hover) {
                 &:hover {
+                    background-color:var(--color-tab-selected-background);
+                    color:var(--color-tab-selected);
                     @include tab_button_hovered_mixin;
                 }
             }
 
             &--unselected {
+                background-color:var(--color-tab-unselected-background);
+                color:var(--color-tab-unselected);
                 @include tab_button_unselected_mixin;
             }
 
@@ -245,8 +247,8 @@
                 border: none;
                 font-family: var(--font-family);
                 font-size: var(--font-size);
-                color: var(--color-text);
-                background-color: var(--color-5);
+                color: var(--color-tab-textbox);
+                background-color: var(--color-tab-textbox-background);
                 border: 1px inset var(--color-1);
                 border-radius: 3px;
                 width: 10em;
@@ -282,7 +284,7 @@
                 display: flex;
                 align-items: center;
                 border: none;
-                color: gray;
+                color: var(--color-overflow);
                 font-size: inherit;
                 background-color: transparent;
             }
@@ -365,26 +367,28 @@
         display: flex;
         font-size: var(--font-size);
         font-family: var(--font-family);
+        color: var(--color-border);
+        background-color: var(--color-border-background);
         @include border_mixin;
 
         &_top {
-            border-bottom: 1px solid var(--color-3);
+            border-bottom: 1px solid var(--color-border-divider-line);
             align-items: center;
         }
 
         &_bottom {
-            border-top: 1px solid var(--color-3);
+            border-top: 1px solid var(--color-border-divider-line);
             align-items: center;
         }
 
         &_left {
-            border-right: 1px solid var(--color-3);
+            border-right: 1px solid var(--color-border-divider-line);
             align-content: center;
             flex-direction: column;
         }
 
         &_right {
-            border-left: 1px solid var(--color-3);
+            border-left: 1px solid var(--color-border-divider-line);
             align-content: center;
             flex-direction: column;
         }
@@ -399,7 +403,6 @@
             &_tab_container {
                 white-space: nowrap;
                 display: flex;
-                gap: 4px;
                 padding-left: 2px;
                 padding-right: 2px;
                 box-sizing: border-box;
@@ -420,6 +423,11 @@
             }
         }
 
+        &_tab_divider {
+            width: 4px;
+            @include border_tab_divider_mixin;
+            }
+
         &_button {
             display: flex;
             gap: 0.3em;
@@ -432,15 +440,21 @@
             @include border_button_mixin;
 
             &--selected {
+                background-color: var(--color-border-tab-selected-background);
+                color: var(--color-border-tab-selected);
                 @include border_button_selected_mixin;
             }
             @media (hover: hover) {
                 &:hover {
+                    background-color: var(--color-border-tab-selected-background);
+                    color: var(--color-border-tab-selected);
                     @include border_button_hovered_mixin;
                 }
             }
 
             &--unselected {
+                background-color: var(--color-border-tab-unselected-background);
+                color: var(--color-border-tab-unselected);
                 @include border_button_unselected_mixin;
             }
 
@@ -513,7 +527,7 @@
                     display: flex;
                     align-items: center;
                     border: none;
-                    color: gray;
+                    color: var(--color-overflow);
                     font-size: inherit;
                     background-color: transparent;
                 }
@@ -548,9 +562,9 @@
 
         &_container {
             box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.15);
-            border: 1px solid var(--color-6);
-            color: var(--color-text);
-            background: var(--color-background);
+            border: 1px solid var(--color-popup-border);
+            color: var(--color-popup-unselected);
+            background: var(--color-popup-unselected-background);
             border-radius: 3px;
             position: absolute;
             z-index: 1000;