Merge pull request #13 from mathuo/remove-circuluar-deps

feat: remove circular dependencies

packages/dockview/src/dnd/dataTransfer.ts

@@ -1,6 +1,31 @@
 import { PanelOptions } from '../dockview/options';
 import { tryParseJSON } from '../json';
-import { PanelTransfer, PaneTransfer } from './droptarget';
+
+class TransferObject {
+  constructor() {
+      //
+  }
+}
+
+export class PanelTransfer extends TransferObject {
+    constructor(
+        public readonly viewId: string,
+        public readonly groupId: string,
+        public readonly panelId: string
+    ) {
+        super();
+    }
+}
+
+export class PaneTransfer extends TransferObject {
+    constructor(
+        public readonly viewId: string,
+        public readonly paneId: string
+    ) {
+        super();
+    }
+}
+
 
 export const DATA_KEY = 'splitview/transfer';
 

packages/dockview/src/dnd/droptarget.ts

@@ -8,31 +8,6 @@ export interface DroptargetEvent {
     event: DragEvent;
 }
 
-class TransferObject {
-    constructor() {
-        //
-    }
-}
-
-export class PanelTransfer extends TransferObject {
-    constructor(
-        public readonly viewId: string,
-        public readonly groupId: string,
-        public readonly panelId: string
-    ) {
-        super();
-    }
-}
-
-export class PaneTransfer extends TransferObject {
-    constructor(
-        public readonly viewId: string,
-        public readonly paneId: string
-    ) {
-        super();
-    }
-}
-
 export enum Position {
     Top = 'Top',
     Left = 'Left',

packages/dockview/src/groupview/dnd.ts

@@ -0,0 +1,5 @@
+export enum DockviewDropTargets {
+    Tab,
+    Panel,
+    TabContainer,
+}

packages/dockview/src/groupview/groupview.ts

@@ -18,6 +18,7 @@ import { ITabsContainer, TabsContainer } from './titlebar/tabsContainer';
 import { IWatermarkRenderer } from './types';
 import { GroupviewPanel } from './groupviewPanel';
 import { focusedElement } from '../focusedElement';
+import { DockviewDropTargets } from './dnd';
 
 export enum GroupChangeKind {
     GROUP_ACTIVE = 'GROUP_ACTIVE',
@@ -86,12 +87,6 @@ export interface GroupPanelViewState {
     id: string;
 }
 
-export enum DockviewDropTargets {
-    Tab,
-    Panel,
-    TabContainer,
-}
-
 export interface IGroupview extends IDisposable, IGridPanelView {
     readonly isActive: boolean;
     readonly size: number;

packages/dockview/src/groupview/tab.ts

@@ -7,8 +7,9 @@ import { ITabRenderer } from './types';
 import { focusedElement } from '../focusedElement';
 import { IGroupPanel } from './groupPanel';
 import { GroupviewPanel } from './groupviewPanel';
-import { DroptargetEvent, Droptarget, PanelTransfer } from '../dnd/droptarget';
-import { DockviewDropTargets } from './groupview';
+import { DroptargetEvent, Droptarget } from '../dnd/droptarget';
+import { PanelTransfer } from '../dnd/dataTransfer';
+import { DockviewDropTargets } from './dnd';
 
 export enum MouseEventKind {
     CLICK = 'CLICK',

packages/dockview/src/groupview/titlebar/tabsContainer.ts

@@ -11,7 +11,7 @@ import { IDockviewComponent } from '../../dockview/dockviewComponent';
 import { getPanelData } from '../../dnd/dataTransfer';
 import { GroupviewPanel } from '../groupviewPanel';
 import { Droptarget } from '../../dnd/droptarget';
-import { DockviewDropTargets } from '../groupview';
+import { DockviewDropTargets } from '../dnd';
 
 export interface TabDropIndexEvent {
     event: DragEvent;

packages/dockview/src/paneview/draggablePaneviewPanel.ts

@@ -1,11 +1,7 @@
 import { DragHandler } from '../dnd/abstractDragHandler';
 import { getPaneData, LocalSelectionTransfer } from '../dnd/dataTransfer';
-import {
-    Droptarget,
-    DroptargetEvent,
-    PaneTransfer,
-    Position,
-} from '../dnd/droptarget';
+import { Droptarget, DroptargetEvent, Position } from '../dnd/droptarget';
+import { PaneTransfer } from '../dnd/dataTransfer';
 import { Emitter, Event } from '../events';
 import { IDisposable } from '../lifecycle';
 import { Orientation } from '../splitview/core/splitview';

packages/dockview/src/paneview/paneview.ts

@@ -141,8 +141,8 @@ export class Paneview extends CompositeDisposable implements IDisposable {
     }
 
     public removePane(index: number) {
-        this.splitview.removeView(index);
         const paneItem = this.paneItems.splice(index, 1)[0];
+        this.splitview.removeView(index);
         paneItem.disposable.dispose();
         return paneItem;
     }