flexlayout-react 0.5.17 → 0.5.21

package/src/view/FloatingWindow.tsx

@@ -16,7 +16,7 @@ export interface IFloatingWindowProps {
 interface IStyleSheet {
     href: string | null;
     type: string;
-    rules: string[];
+    rules: string[] | null;
 }
 
 /** @hidden @internal */
@@ -31,17 +31,23 @@ export const FloatingWindow = (props: React.PropsWithChildren<IFloatingWindowPro
         // the floating window. window.document.styleSheets is mutable and we can't guarantee
         // the styles will exist when 'popoutWindow.load' is called below.
         const styles = Array.from(window.document.styleSheets).reduce((result, styleSheet) => {
+            let rules: CSSRuleList | undefined = undefined;
+            try {
+                rules = styleSheet.cssRules;
+            } catch (e) {
+                // styleSheet.cssRules can throw security exception
+            }
+
             try {
                 return [
                     ...result,
                     {
                         href: styleSheet.href,
                         type: styleSheet.type,
-                        rules: Array.from(styleSheet.cssRules).map(rule => rule.cssText),
+                        rules: rules ? Array.from(rules).map(rule => rule.cssText) : null,
                     }
                 ];
             } catch (e) {
-                // styleSheet.cssRules can throw security exception
                 return result;
             }
         }, [] as IStyleSheet[]);
@@ -113,9 +119,11 @@ function copyStyles(doc: Document, styleSheets: IStyleSheet[]): Promise<boolean[
                 })
             );
         } else {
-            const style = doc.createElement("style");
-            styleSheet.rules.forEach(rule => style.appendChild(doc.createTextNode(rule)));
-            head.appendChild(style);
+            if (styleSheet.rules) {
+                const style = doc.createElement("style");
+                styleSheet.rules.forEach(rule => style.appendChild(doc.createTextNode(rule)));
+                head.appendChild(style);
+            }
         }
     });
     return Promise.all(promises);

package/src/view/Layout.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import * as ReactDOM from "react-dom";
 import DockLocation from "../DockLocation";
 import DragDrop from "../DragDrop";
 import DropInfo from "../DropInfo";
@@ -24,8 +25,12 @@ import { FloatingWindow } from "./FloatingWindow";
 import { FloatingWindowTab } from "./FloatingWindowTab";
 import { TabFloating } from "./TabFloating";
 import { IJsonTabNode } from "../model/IJsonModel";
+import { Orientation } from "..";
 
 export type CustomDragCallback = (dragging: TabNode | IJsonTabNode, over: TabNode, x: number, y: number, location: DockLocation) => void;
+export type DragRectRenderCallback = (text: String, node?: Node, json?: IJsonTabNode) => React.ReactElement | undefined;
+export type FloatingTabPlaceholderRenderCallback = (dockPopout: () => void, showPopout: () => void) => React.ReactElement | undefined;
+export type NodeMouseEvent = (node: TabNode | TabSetNode | BorderNode, event: React.MouseEvent<HTMLElement, MouseEvent>) => void;
 
 export interface ILayoutProps {
     model: Model;
@@ -39,17 +44,17 @@ export interface ILayoutProps {
     onAction?: (action: Action) => Action | undefined;
     onRenderTab?: (
         node: TabNode,
-        renderValues: ITabRenderValues,
+        renderValues: ITabRenderValues, // change the values in this object as required
     ) => void;
     onRenderTabSet?: (
         tabSetNode: TabSetNode | BorderNode,
-        renderValues: ITabSetRenderValues,
+        renderValues: ITabSetRenderValues, // change the values in this object as required
     ) => void;
     onModelChange?: (model: Model) => void;
     onExternalDrag?: (event: React.DragEvent<HTMLDivElement>) => undefined | {
-      dragText: string,
-      json: any,
-      onDrop?: (node?: Node, event?: Event) => void
+        dragText: string,
+        json: any,
+        onDrop?: (node?: Node, event?: Event) => void
     };
     classNameMapper?: (defaultClassName: string) => string;
     i18nMapper?: (id: I18nLabel, param?: string) => string | undefined;
@@ -66,6 +71,10 @@ export interface ILayoutProps {
         invalidated?: () => void,
         cursor?: string | undefined
     };
+    onRenderDragRect?: DragRectRenderCallback;
+    onRenderFloatingTabPlaceholder?: FloatingTabPlaceholderRenderCallback;
+    onContextMenu?: NodeMouseEvent;
+    onAuxMouseClick?: NodeMouseEvent;
 }
 export interface IFontValues {
     size?: string;
@@ -99,6 +108,7 @@ export interface ILayoutState {
     calculatedTabBarSize: number;
     calculatedBorderBarSize: number;
     editingTab?: TabNode;
+    showHiddenBorder: DockLocation;
 }
 
 export interface IIcons {
@@ -153,7 +163,9 @@ export interface ILayoutCallbacks {
     styleFont: (style: Record<string, string>) => Record<string, string>;
     setEditingTab(tabNode?: TabNode): void;
     getEditingTab(): TabNode | undefined;
-
+    getOnRenderFloatingTabPlaceholder(): FloatingTabPlaceholderRenderCallback | undefined;
+    showContextMenu(node: TabNode | TabSetNode | BorderNode, event: React.MouseEvent<HTMLElement, MouseEvent>): void;
+    auxMouseClick(node: TabNode | TabSetNode | BorderNode, event: React.MouseEvent<HTMLElement, MouseEvent>): void;
 }
 
 // Popout windows work in latest browsers based on webkit (Chrome, Opera, Safari, latest Edge) and Firefox. They do
@@ -171,6 +183,7 @@ const defaultSupportsPopout: boolean = isDesktop && !isIEorEdge;
  * A React component that hosts a multi-tabbed layout
  */
 export class Layout extends React.Component<ILayoutProps, ILayoutState> {
+
     /** @hidden @internal */
     private selfRef: React.RefObject<HTMLDivElement>;
     /** @hidden @internal */
@@ -200,6 +213,8 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
     /** @hidden @internal */
     private dragDiv?: HTMLDivElement;
     /** @hidden @internal */
+    private dragRectRendered: boolean = true;
+    /** @hidden @internal */
     private dragDivText: string = "";
     /** @hidden @internal */
     private dropInfo: DropInfo | undefined;
@@ -237,7 +252,7 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
     /** @hidden @internal */
     private firstRender: boolean;
     /** @hidden @internal */
-    private resizeObserver? : ResizeObserver;
+    private resizeObserver?: ResizeObserver;
 
     constructor(props: ILayoutProps) {
         super(props);
@@ -253,11 +268,13 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
         this.icons = props.closeIcon ? Object.assign({ close: props.closeIcon }, props.icons) : props.icons;
         this.firstRender = true;
 
-        this.state = { rect: new Rect(0, 0, 0, 0), 
-            calculatedHeaderBarSize: 25, 
-            calculatedTabBarSize: 26, 
+        this.state = {
+            rect: new Rect(0, 0, 0, 0),
+            calculatedHeaderBarSize: 25,
+            calculatedTabBarSize: 26,
             calculatedBorderBarSize: 30,
             editingTab: undefined,
+            showHiddenBorder: DockLocation.CENTER,
         };
 
         this.onDragEnter = this.onDragEnter.bind(this);
@@ -411,7 +428,7 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
 
     /** @hidden @internal */
     setEditingTab(tabNode?: TabNode) {
-        this.setState({editingTab:tabNode});
+        this.setState({ editingTab: tabNode });
     }
 
     /** @hidden @internal */
@@ -444,11 +461,12 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
             tabBarSize: this.state.calculatedTabBarSize,
             borderBarSize: this.state.calculatedBorderBarSize,
         };
+        this.props.model._setShowHiddenBorder(this.state.showHiddenBorder);
 
         this.centerRect = this.props.model._layout(this.state.rect, metrics);
 
         this.renderBorder(this.props.model.getBorderSet(), borderComponents, tabComponents, floatingWindows, splitterComponents);
-        this.renderChildren(this.props.model.getRoot(), tabSetComponents, tabComponents, floatingWindows, splitterComponents);
+        this.renderChildren("", this.props.model.getRoot(), tabSetComponents, tabComponents, floatingWindows, splitterComponents);
 
         if (this.edgesShown) {
             this.repositionEdges(this.state.rect)
@@ -526,10 +544,12 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
     /** @hidden @internal */
     renderBorder(borderSet: BorderSet, borderComponents: React.ReactNode[], tabComponents: Record<string, React.ReactNode>, floatingWindows: React.ReactNode[], splitterComponents: React.ReactNode[]) {
         for (const border of borderSet.getBorders()) {
+            const borderPath = `/border/${border.getLocation().getName()}`;
             if (border.isShowing()) {
                 borderComponents.push(
                     <BorderTabSet
-                        key={"border_" + border.getLocation().getName()}
+                        key={`border_${border.getLocation().getName()}`}
+                        path={borderPath}
                         border={border}
                         layout={this}
                         iconFactory={this.props.iconFactory}
@@ -539,10 +559,13 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
                 );
                 const drawChildren = border._getDrawChildren();
                 let i = 0;
+                let tabCount = 0;
                 for (const child of drawChildren) {
                     if (child instanceof SplitterNode) {
-                        splitterComponents.push(<Splitter key={child.getId()} layout={this} node={child} />);
+                        let path = borderPath + "/s";
+                        splitterComponents.push(<Splitter key={child.getId()} layout={this} node={child} path={path} />);
                     } else if (child instanceof TabNode) {
+                        let path = borderPath + "/t" + tabCount++;
                         if (this.supportsPopout && child.isFloating()) {
                             const rect = this._getScreenRect(child);
                             floatingWindows.push(
@@ -558,9 +581,19 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
                                     <FloatingWindowTab layout={this} node={child} factory={this.props.factory} />
                                 </FloatingWindow>
                             );
-                            tabComponents[child.getId()] = <TabFloating key={child.getId()} layout={this} node={child} selected={i === border.getSelected()} />;
+                            tabComponents[child.getId()] = <TabFloating key={child.getId()}
+                                layout={this}
+                                path={path}
+                                node={child}
+                                selected={i === border.getSelected()
+                                } />;
                         } else {
-                            tabComponents[child.getId()] = <Tab key={child.getId()} layout={this} node={child} selected={i === border.getSelected()} factory={this.props.factory} />;
+                            tabComponents[child.getId()] = <Tab key={child.getId()}
+                                layout={this}
+                                path={path}
+                                node={child}
+                                selected={i === border.getSelected()}
+                                factory={this.props.factory} />;
                         }
                     }
                     i++;
@@ -570,16 +603,22 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
     }
 
     /** @hidden @internal */
-    renderChildren(node: RowNode | TabSetNode, tabSetComponents: React.ReactNode[], tabComponents: Record<string, React.ReactNode>, floatingWindows: React.ReactNode[], splitterComponents: React.ReactNode[]) {
+    renderChildren(path: string, node: RowNode | TabSetNode, tabSetComponents: React.ReactNode[], tabComponents: Record<string, React.ReactNode>, floatingWindows: React.ReactNode[], splitterComponents: React.ReactNode[]) {
         const drawChildren = node._getDrawChildren();
+        let splitterCount = 0;
+        let tabCount = 0;
+        let rowCount = 0;
 
         for (const child of drawChildren!) {
             if (child instanceof SplitterNode) {
-                splitterComponents.push(<Splitter key={child.getId()} layout={this} node={child} />);
+                const newPath = path + "/s" + (splitterCount++);
+                splitterComponents.push(<Splitter key={child.getId()} layout={this} path={newPath} node={child} />);
             } else if (child instanceof TabSetNode) {
-                tabSetComponents.push(<TabSet key={child.getId()} layout={this} node={child} iconFactory={this.props.iconFactory} titleFactory={this.props.titleFactory} icons={this.icons} />);
-                this.renderChildren(child, tabSetComponents, tabComponents, floatingWindows, splitterComponents);
+                const newPath = path + "/ts" + (rowCount++);
+                tabSetComponents.push(<TabSet key={child.getId()} layout={this} path={newPath} node={child} iconFactory={this.props.iconFactory} titleFactory={this.props.titleFactory} icons={this.icons} />);
+                this.renderChildren(newPath, child, tabSetComponents, tabComponents, floatingWindows, splitterComponents);
             } else if (child instanceof TabNode) {
+                const newPath = path + "/t" + (tabCount++);
                 const selectedTab = child.getParent()!.getChildren()[(child.getParent() as TabSetNode).getSelected()];
                 if (selectedTab === undefined) {
                     // this should not happen!
@@ -600,13 +639,14 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
                             <FloatingWindowTab layout={this} node={child} factory={this.props.factory} />
                         </FloatingWindow>
                     );
-                    tabComponents[child.getId()] = <TabFloating key={child.getId()} layout={this} node={child} selected={child === selectedTab} />;
+                    tabComponents[child.getId()] = <TabFloating key={child.getId()} layout={this} path={newPath} node={child} selected={child === selectedTab} />;
                 } else {
-                    tabComponents[child.getId()] = <Tab key={child.getId()} layout={this} node={child} selected={child === selectedTab} factory={this.props.factory} />;
+                    tabComponents[child.getId()] = <Tab key={child.getId()} layout={this} path={newPath} node={child} selected={child === selectedTab} factory={this.props.factory} />;
                 }
             } else {
                 // is row
-                this.renderChildren(child as RowNode, tabSetComponents, tabComponents, floatingWindows, splitterComponents);
+                const newPath = path + ((child.getOrientation() === Orientation.HORZ) ? "/r" : "/c") + (rowCount++);
+                this.renderChildren(newPath, child as RowNode, tabSetComponents, tabComponents, floatingWindows, splitterComponents);
             }
         }
     }
@@ -649,7 +689,7 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
      * Adds a new tab by dragging a labeled panel to the drop location, dragging starts immediatelly
      * @param dragText the text to show on the drag panel
      * @param json the json for the new tab node
-     * @param onDrop a callback to call when the drag is complete
+     * @param onDrop a callback to call when the drag is complete (node and event will be undefined if the drag was cancelled)
      */
     addTabWithDragAndDrop(dragText: string, json: IJsonTabNode, onDrop?: (node?: Node, event?: Event) => void) {
         this.fnNewNodeDropped = onDrop;
@@ -663,9 +703,9 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
      *
      * @param dragText the text to show on the drag panel
      * @param json the json for the new tab node
-     * @param onDrop a callback to call when the drag is complete
+     * @param onDrop a callback to call when the drag is complete (node and event will be undefined if the drag was cancelled)
      */
-    addTabWithDragAndDropIndirect(dragText: string, json: IJsonTabNode, onDrop?: () => void) {
+    addTabWithDragAndDropIndirect(dragText: string, json: IJsonTabNode, onDrop?: (node?: Node, event?: Event) => void) {
         this.fnNewNodeDropped = onDrop;
         this.newTabJson = json;
 
@@ -673,15 +713,22 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
 
         this.dragDivText = dragText;
         this.dragDiv = this.currentDocument!.createElement("div");
-        this.dragDiv.className = this.getClassName("flexlayout__drag_rect");
-        this.dragDiv.innerHTML = this.dragDivText;
+        this.dragDiv.className = this.getClassName(CLASSES.FLEXLAYOUT__DRAG_RECT);
         this.dragDiv.addEventListener("mousedown", this.onDragDivMouseDown);
         this.dragDiv.addEventListener("touchstart", this.onDragDivMouseDown);
 
-        const r = new Rect(10, 10, 150, 50);
-        r.centerInRect(this.state.rect);
-        this.dragDiv.style.left = r.x + "px";
-        this.dragDiv.style.top = r.y + "px";
+        this.dragRectRender(this.dragDivText, undefined, this.newTabJson, () => {
+            if (this.dragDiv) {
+                // now it's been rendered into the dom it can be centered
+                this.dragDiv.style.visibility = "visible";
+                const domRect = this.dragDiv.getBoundingClientRect();
+                const r = new Rect(0, 0, domRect?.width, domRect?.height);
+                r.centerInRect(this.state.rect);
+                this.dragDiv.setAttribute("data-layout-path", "/drag-rectangle");
+                this.dragDiv.style.left = r.x + "px";
+                this.dragDiv.style.top = r.y + "px";
+            }
+        });
 
         const rootdiv = this.selfRef.current;
         rootdiv!.appendChild(this.dragDiv);
@@ -715,11 +762,11 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
 
             try {
                 rootdiv.removeChild(this.outlineDiv!);
-            } catch (e) {}
+            } catch (e) { }
 
             try {
                 rootdiv.removeChild(this.dragDiv!);
-            } catch (e) {}
+            } catch (e) { }
 
             this.dragDiv = undefined;
             this.hideEdges(rootdiv);
@@ -738,6 +785,8 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
             this.newTabJson = undefined;
             this.customDrop = undefined;
         }
+        this.setState({ showHiddenBorder: DockLocation.CENTER });
+
     };
 
     /** @hidden @internal */
@@ -764,6 +813,31 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
         }
     };
 
+    /** @hidden @internal */
+    dragRectRender = (text: String, node?: Node, json?: IJsonTabNode, onRendered?: () => void) => {
+        let content: React.ReactElement | undefined = <div style={{ whiteSpace: "pre" }}>{text.replace("<br>", "\n")}</div>;
+
+        if (this.props.onRenderDragRect !== undefined) {
+            const customContent = this.props.onRenderDragRect(text, node, json);
+            if (customContent !== undefined) {
+                content = customContent;
+            }
+        }
+
+        // hide div until the render is complete
+        this.dragDiv!.style.visibility = "hidden";
+        this.dragRectRendered = false;
+        ReactDOM.render(<DragRectRenderWrapper
+            // wait for it to be rendered
+            onRendered={() => {
+                this.dragRectRendered = true;
+                onRendered?.();
+            }}
+        >
+            {content}
+        </DragRectRenderWrapper>, this.dragDiv!);
+    };
+
     /** @hidden @internal */
     onDragStart = () => {
         this.dropInfo = undefined;
@@ -777,7 +851,9 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
         if (this.dragDiv == null) {
             this.dragDiv = this.currentDocument!.createElement("div");
             this.dragDiv.className = this.getClassName(CLASSES.FLEXLAYOUT__DRAG_RECT);
-            this.dragDiv.innerHTML = this.dragDivText;
+            this.dragDiv.setAttribute("data-layout-path", "/drag-rectangle");
+            this.dragRectRender(this.dragDivText, this.dragNode, this.newTabJson);
+
             rootdiv.appendChild(this.dragDiv);
         }
         // add edge indicators
@@ -804,67 +880,32 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
             y: event.clientY - clientRect.top,
         };
 
-        this.dragDiv!.style.left = pos.x - this.dragDiv!.getBoundingClientRect().width / 2 + "px";
+        this.checkForBorderToShow(pos.x, pos.y);
+
+        // keep it between left & right
+        const dragRect = this.dragDiv!.getBoundingClientRect();
+        let newLeft = pos.x - dragRect.width / 2;
+        if (newLeft + dragRect.width > clientRect.width) {
+            newLeft = clientRect.width - dragRect.width;
+        }
+        newLeft = Math.max(0, newLeft);
+
+        this.dragDiv!.style.left = newLeft + "px";
         this.dragDiv!.style.top = pos.y + 5 + "px";
+        if (this.dragRectRendered && this.dragDiv!.style.visibility === "hidden") {
+            // make visible once the drag rect has been rendered
+            this.dragDiv!.style.visibility = "visible";
+        }
 
         let dropInfo = this.props.model._findDropTargetNode(this.dragNode!, pos.x, pos.y);
         if (dropInfo) {
-            let invalidated = this.customDrop?.invalidated;
-            const currentCallback = this.customDrop?.callback;
-            this.customDrop = undefined;
-
-            const dragging = this.newTabJson || (this.dragNode instanceof TabNode ? this.dragNode : undefined);
-            if (dragging && (dropInfo.node instanceof TabSetNode || dropInfo.node instanceof BorderNode) && dropInfo.index === -1) {
-                const selected = dropInfo.node.getSelectedNode() as TabNode | undefined;
-                const tabRect = selected?.getRect()
-
-                if (selected && tabRect?.contains(pos.x, pos.y)) {
-                    let customDrop: ICustomDropDestination | undefined = undefined;
-
-                    try {
-                        const dest = this.onTabDrag(dragging, selected, pos.x - tabRect.x, pos.y - tabRect.y, dropInfo.location, () => this.onDragMove(event));
-
-                        if (dest) {
-                            customDrop = {
-                                rect: new Rect(dest.x + tabRect.x, dest.y + tabRect.y, dest.width, dest.height),
-                                callback: dest.callback,
-                                invalidated: dest.invalidated,
-                                dragging: dragging,
-                                over: selected,
-                                x: pos.x - tabRect.x,
-                                y: pos.y - tabRect.y,
-                                location: dropInfo.location,
-                                cursor: dest.cursor
-                            };
-                        }
-                    } catch (e) {
-                        console.error(e)
-                    }
-
-                    if (customDrop?.callback == currentCallback) {
-                        invalidated = undefined;
-                    }
-
-                    this.customDrop = customDrop;
-                }
-            }
-
-            this.dropInfo = dropInfo;
-            this.outlineDiv!.className = this.getClassName(this.customDrop ? "flexlayout__outline_rect" : dropInfo.className);
-
-            if (this.customDrop) {
-                this.customDrop.rect.positionElement(this.outlineDiv!);
+            if (this.props.onTabDrag) {
+                this.handleCustomTabDrag(dropInfo, pos, event);
             } else {
+                this.dropInfo = dropInfo;
+                this.outlineDiv!.className = this.getClassName(dropInfo.className);
                 dropInfo.rect.positionElement(this.outlineDiv!);
-            }
-
-            DragDrop.instance.setGlassCursorOverride(this.customDrop?.cursor);
-            this.outlineDiv!.style.visibility = "visible";
-
-            try {
-                invalidated?.();
-            } catch (e) {
-                console.error(e);
+                this.outlineDiv!.style.visibility = "visible";
             }
         }
     };
@@ -883,8 +924,12 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
                 this.newTabJson = undefined;
 
                 try {
-                    const {callback, dragging, over, x, y, location} = this.customDrop;
+                    const { callback, dragging, over, x, y, location } = this.customDrop;
                     callback(dragging, over, x, y, location);
+                    if (this.fnNewNodeDropped != null) {
+                        this.fnNewNodeDropped();
+                        this.fnNewNodeDropped = undefined;
+                    }
                 } catch (e) {
                     console.error(e)
                 }
@@ -900,8 +945,70 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
                 this.doAction(Actions.moveNode(this.dragNode.getId(), this.dropInfo.node.getId(), this.dropInfo.location, this.dropInfo.index));
             }
         }
+        this.setState({ showHiddenBorder: DockLocation.CENTER });
     };
 
+    /** @hidden @internal */
+    private handleCustomTabDrag(dropInfo: DropInfo, pos: { x: number; y: number; }, event: React.MouseEvent<Element, MouseEvent>) {
+        let invalidated = this.customDrop?.invalidated;
+        const currentCallback = this.customDrop?.callback;
+        this.customDrop = undefined;
+
+        const dragging = this.newTabJson || (this.dragNode instanceof TabNode ? this.dragNode : undefined);
+        if (dragging && (dropInfo.node instanceof TabSetNode || dropInfo.node instanceof BorderNode) && dropInfo.index === -1) {
+            const selected = dropInfo.node.getSelectedNode() as TabNode | undefined;
+            const tabRect = selected?.getRect();
+
+            if (selected && tabRect?.contains(pos.x, pos.y)) {
+                let customDrop: ICustomDropDestination | undefined = undefined;
+
+                try {
+                    const dest = this.onTabDrag(dragging, selected, pos.x - tabRect.x, pos.y - tabRect.y, dropInfo.location, () => this.onDragMove(event));
+
+                    if (dest) {
+                        customDrop = {
+                            rect: new Rect(dest.x + tabRect.x, dest.y + tabRect.y, dest.width, dest.height),
+                            callback: dest.callback,
+                            invalidated: dest.invalidated,
+                            dragging: dragging,
+                            over: selected,
+                            x: pos.x - tabRect.x,
+                            y: pos.y - tabRect.y,
+                            location: dropInfo.location,
+                            cursor: dest.cursor
+                        };
+                    }
+                } catch (e) {
+                    console.error(e);
+                }
+
+                if (customDrop?.callback === currentCallback) {
+                    invalidated = undefined;
+                }
+
+                this.customDrop = customDrop;
+            }
+        }
+
+        this.dropInfo = dropInfo;
+        this.outlineDiv!.className = this.getClassName(this.customDrop ? CLASSES.FLEXLAYOUT__OUTLINE_RECT : dropInfo.className);
+
+        if (this.customDrop) {
+            this.customDrop.rect.positionElement(this.outlineDiv!);
+        } else {
+            dropInfo.rect.positionElement(this.outlineDiv!);
+        }
+
+        DragDrop.instance.setGlassCursorOverride(this.customDrop?.cursor);
+        this.outlineDiv!.style.visibility = "visible";
+
+        try {
+            invalidated?.();
+        } catch (e) {
+            console.error(e);
+        }
+    }
+
     /** @hidden @internal */
     onDragEnter(event: React.DragEvent<HTMLDivElement>) {
         // DragDrop keeps track of number of dragenters minus the number of
@@ -917,6 +1024,40 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
         }
     }
 
+
+    /** @hidden @internal */
+    checkForBorderToShow(x: number, y: number) {
+        const r = this.props.model._getOuterInnerRects().outer;
+        const c = r.getCenter();
+        const margin = this.edgeRectWidth;
+        const offset = this.edgeRectLength / 2;
+
+        let overEdge = false;
+        if (this.props.model.isEnableEdgeDock() && this.state.showHiddenBorder === DockLocation.CENTER) {
+            if ((y > c.y - offset && y < c.y + offset) ||
+                (x > c.x - offset && x < c.x + offset)) {
+                overEdge = true;
+            }
+        }
+
+        let location = DockLocation.CENTER;
+        if (!overEdge) {
+            if (x <= r.x + margin) {
+                location = DockLocation.LEFT;
+            } else if (x >= r.getRight() - margin) {
+                location = DockLocation.RIGHT;
+            } else if (y <= r.y + margin) {
+                location = DockLocation.TOP;
+            } else if (y >= r.getBottom() - margin) {
+                location = DockLocation.BOTTOM;
+            }
+        }
+
+        if (location !== this.state.showHiddenBorder) {
+            this.setState({ showHiddenBorder: location });
+        }
+    }
+
     /** @hidden @internal */
     showEdges(rootdiv: HTMLElement) {
         if (this.props.model.isEnableEdgeDock()) {
@@ -990,7 +1131,7 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
                 rootdiv.removeChild(this.edgeLeftDiv!);
                 rootdiv.removeChild(this.edgeBottomDiv!);
                 rootdiv.removeChild(this.edgeRightDiv!);
-            } catch (e) {}
+            } catch (e) { }
         }
 
         this.edgesShown = false;
@@ -1032,6 +1173,44 @@ export class Layout extends React.Component<ILayoutProps, ILayoutState> {
         }
         return message;
     }
+
+    /** @hidden @internal */
+    getOnRenderFloatingTabPlaceholder() {
+        return this.props.onRenderFloatingTabPlaceholder;
+    }
+
+    /** @hidden @internal */
+    showContextMenu(node: TabNode | TabSetNode | BorderNode, event: React.MouseEvent<HTMLElement, MouseEvent>) {
+        if (this.props.onContextMenu) {
+            this.props.onContextMenu(node, event);
+        }
+    }
+
+    /** @hidden @internal */
+    auxMouseClick(node: TabNode | TabSetNode | BorderNode, event: React.MouseEvent<HTMLElement, MouseEvent>) {
+        if (this.props.onAuxMouseClick) {
+            this.props.onAuxMouseClick(node, event);
+        }
+    }
 }
 
+// wrapper round the drag rect renderer that can call
+// a method once the rendering is written to the dom
+
+/** @hidden @internal */
+interface IDragRectRenderWrapper {
+    onRendered?: () => void;
+    children: React.ReactNode;
+}
+
+/** @hidden @internal */
+const DragRectRenderWrapper = (props: IDragRectRenderWrapper) => {
+    React.useEffect(() => {
+        props.onRendered?.();
+    }, [props]);
+
+    return (<React.Fragment>
+        {props.children}
+    </React.Fragment>)
+}
 export default Layout;