Chore: Move some simulator settings to layout

Author: AlexIchenskiy

src/models/graph.ts

@@ -97,17 +97,7 @@ export class Graph<N extends INodeBase, E extends IEdgeBase> extends Subject imp
 
   setLayout(layout: ILayout<N, E>): void {
     this._layout = layout;
-    this.resetLayout();
-  }
-
-  resetLayout(): void {
-    if (!this._layout) {
-      return;
-    }
-
-    const positions = this._layout.getPositions(this.getNodes());
-    this.setNodePositions(positions);
-    this.notifyListeners();
+    this._resetLayout();
   }
 
   /**
@@ -292,10 +282,7 @@ export class Graph<N extends INodeBase, E extends IEdgeBase> extends Subject imp
 
     this._applyEdgeOffsets();
     this._applyStyle();
-
-    if (this._layout) {
-      this.setNodePositions(this._layout.getPositions(this.getNodes()));
-    }
+    this._resetLayout();
 
     this._settings?.onMergeData?.(data);
   }
@@ -309,10 +296,7 @@ export class Graph<N extends INodeBase, E extends IEdgeBase> extends Subject imp
 
     this._applyEdgeOffsets();
     this._applyStyle();
-
-    if (this._layout) {
-      this.setNodePositions(this._layout.getPositions(this.getNodes()));
-    }
+    this._resetLayout();
 
     if (this._settings && this._settings.onRemoveData) {
       const removedData: IGraphObjectsIds = {
@@ -629,6 +613,16 @@ export class Graph<N extends INodeBase, E extends IEdgeBase> extends Subject imp
     return { nodeIds: [], edgeIds: removedEdgeIds };
   }
 
+  private _resetLayout(): void {
+    if (!this._layout) {
+      return;
+    }
+
+    const positions = this._layout.getPositions(this.getNodes());
+    this.setNodePositions(positions);
+    this.notifyListeners();
+  }
+
   private _applyEdgeOffsets() {
     const graphEdges = this.getEdges();
     const edgeOffsets = getEdgeOffsets<N, E>(graphEdges);

src/simulator/layout/layout.ts

@@ -1,14 +1,15 @@
 import { IEdgeBase } from '../../models/edge';
 import { INode, INodeBase, INodePosition } from '../../models/node';
 import { CircularLayout, ICircularLayoutOptions } from './layouts/circular';
+import { IForceLayoutOptions } from './layouts/force';
 import { GridLayout, IGridLayoutOptions } from './layouts/grid';
 import { HierarchicalLayout, IHierarchicalLayoutOptions } from './layouts/hierarchical';
 
 export type LayoutType = 'circular' | 'force' | 'grid' | 'hierarchical';
 
 export type LayoutSettingsMap = {
   circular: ICircularLayoutOptions;
-  force: Record<string, never>;
+  force: IForceLayoutOptions;
   grid: IGridLayoutOptions;
   hierarchical: IHierarchicalLayoutOptions;
 };

src/simulator/layout/layouts/force.ts

@@ -0,0 +1,11 @@
+export interface IForceLayoutOptions {
+  centerX?: number;
+  centerY?: number;
+  nodeDistance?: number;
+}
+
+export const DEFAULT_FORCE_LAYOUT_OPTIONS: IForceLayoutOptions = {
+  centerX: 0,
+  centerY: 0,
+  nodeDistance: 50,
+};

src/views/orb-view.ts

@@ -13,7 +13,12 @@ import { INode, INodeBase, isNode } from '../models/node';
 import { IEdge, IEdgeBase, isEdge } from '../models/edge';
 import { IOrbView } from './shared';
 import { DefaultEventStrategy, IEventStrategy, IEventStrategySettings } from '../models/strategy';
-import { ID3SimulatorEngineSettings } from '../simulator/engine/d3-simulator-engine';
+import {
+  DEFAULT_SETTINGS,
+  ID3SimulatorEngineSettings,
+  ID3SimulatorEngineSettingsCentering,
+  ID3SimulatorEngineSettingsLinks,
+} from '../simulator/engine/d3-simulator-engine';
 import { copyObject } from '../utils/object.utils';
 import { OrbEmitter, OrbEventType } from '../events';
 import { IRenderer, RenderEventType, IRendererSettingsInit, IRendererSettings } from '../renderer/shared';
@@ -23,6 +28,7 @@ import { getDefaultGraphStyle } from '../models/style';
 import { isBoolean } from '../utils/type.utils';
 import { IObserver, IObserverDataPayload } from '../utils/observer.utils';
 import { ILayoutSettings, LayoutFactory } from '../simulator/layout/layout';
+import { DEFAULT_FORCE_LAYOUT_OPTIONS, IForceLayoutOptions } from '../simulator/layout/layouts/force';
 
 export interface IGraphInteractionSettings {
   isDragEnabled: boolean;
@@ -187,6 +193,25 @@ export class OrbView<N extends INodeBase, E extends IEdgeBase> implements IOrbVi
         this._settings.simulation = data.settings;
       });
 
+      if (this._settings.layout.options) {
+        const _options = {
+          ...DEFAULT_FORCE_LAYOUT_OPTIONS,
+          ...this._settings.layout.options,
+        } as Required<IForceLayoutOptions>;
+
+        this._settings.simulation.centering = {
+          ...(DEFAULT_SETTINGS.centering as Required<ID3SimulatorEngineSettingsCentering>),
+          ...this._settings.simulation.centering,
+          x: _options.centerX,
+          y: _options.centerY,
+        };
+
+        this._settings.simulation.links = {
+          ...(DEFAULT_SETTINGS.links as Required<ID3SimulatorEngineSettingsLinks>),
+          ...this._settings.simulation.links,
+          distance: _options.nodeDistance,
+        };
+      }
       this._simulator.setSettings(this._settings.simulation);
     }