igniteui-dockmanager 2.1.1 → 2.1.2

package/components/dockmanager/dockmanager-component.js

@@ -1989,7 +1989,7 @@ export default class IgcDockManagerComponent extends EventEmitterMixin(LitElemen
     }
     handlePaneContentPointerDown(pane) {
         requestAnimationFrame(() => {
-            const rootNode = this.shadowRoot ?? document;
+            const rootNode = this.getRootNode();
             if (this === rootNode.activeElement ||
                 !this.contains(rootNode.activeElement)) {
                 this.setFocus(pane);

package/components/dockmanager/dockmanager.service.d.ts

@@ -22,6 +22,7 @@ export declare class IgcDockManagerService {
     private isUpdatingLayout;
     private lastSwapCenter;
     private _splitterSize;
+    private _previousLocationMap;
     visibleDocuments: IgcContentPane[];
     visibleContentPanes: IgcContentPane[];
     documentHosts: IgcDocumentHost[];

package/components/dockmanager/dockmanager.service.js

@@ -11,6 +11,7 @@ export class IgcDockManagerService {
         this.contentPanesCache = [];
         this.isUpdatingLayout = false;
         this._splitterSize = null;
+        this._previousLocationMap = null;
         this.visibleDocuments = [];
         this.visibleContentPanes = [];
         this.documentHosts = [];
@@ -111,17 +112,22 @@ export class IgcDockManagerService {
         }
     }
     resolvePaneUnpinLocation(pane) {
-        let unpinnedLocation;
         if (pane.unpinnedLocation) {
-            unpinnedLocation = pane.unpinnedLocation;
+            return pane.unpinnedLocation;
         }
-        else {
-            const documentHost = this.findClosestDocumentHost(pane);
-            unpinnedLocation = documentHost
-                ? this.findPaneUnpinLocation(pane, documentHost)
-                : 'left';
+        const documentHost = this.findClosestDocumentHost(pane);
+        if (documentHost) {
+            const panePath = this.getPanePath(pane);
+            const docHostPath = this.getPanePath(documentHost);
+            if (panePath.length > 0 &&
+                docHostPath.length > 0 &&
+                panePath[0] === docHostPath[0]) {
+                return this.findPaneUnpinLocation(pane, documentHost);
+            }
         }
-        return unpinnedLocation;
+        const previousLocation = this._previousLocationMap?.get(pane.contentId) ??
+            this.unpinnedLocationMap.get(pane);
+        return previousLocation ?? 'left';
     }
     addContentPanePinLocation(pane) {
         if (pane.isPinned === false) {
@@ -654,6 +660,10 @@ export class IgcDockManagerService {
             .filter((pane) => pane && pane.id != null)
             .map((pane) => pane.id);
         this.paneParentMap = new Map();
+        this._previousLocationMap = new Map();
+        for (const [pane, location] of this.unpinnedLocationMap) {
+            this._previousLocationMap.set(pane.contentId, location);
+        }
         this.unpinnedLocationMap = new Map();
         this.clientContentPanesMap = new Map();
         this.documentHosts = [];
@@ -680,6 +690,7 @@ export class IgcDockManagerService {
                 }
             }
             this.populatePinLocations(layout.rootPane);
+            this._previousLocationMap = null;
             if (this.dockManager.flyoutPane &&
                 !this.unpinnedLocationMap.has(this.dockManager.flyoutPane)) {
                 this.setFlyoutPane(null, this.dockManager.flyoutPane);