Chore: Refactor state types

memgraph · Mar 14, 2024 · 1022aa9 · 1022aa9
1 parent f94769a
commit 1022aa9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/src/models/edge.ts b/src/models/edge.ts
@@ -422,25 +422,27 @@ abstract class Edge<N extends INodeBase, E extends IEdgeBase> extends Subject im
 
     if (isNumber(result)) {
       this._state = result;
-    } else if (isPlainObject(result) && result.options) {
+    } else if (isPlainObject(result)) {
       const options = result.options;
 
       this._state = this._handleState(result.state, options);
 
-      this.notifyListeners({
-        id: this.id,
-        type: 'edge',
-        options: options,
-      });
+      if (options) {
+        this.notifyListeners({
+          id: this.id,
+          type: 'edge',
+          options: options,
+        });
 
-      return;
+        return;
+      }
     }
 
     this.notifyListeners();
   }
 
-  private _handleState(state: number, options: IGraphObjectStateOptions): number {
-    if (options.isToggle && this._state === state) {
+  private _handleState(state: number, options?: Partial<IGraphObjectStateOptions>): number {
+    if (options?.isToggle && this._state === state) {
       return GraphObjectState.NONE;
     } else {
       return state;

diff --git a/src/models/node.ts b/src/models/node.ts
@@ -548,18 +548,20 @@ export class Node<N extends INodeBase, E extends IEdgeBase> extends Subject impl
 
     if (isNumber(result)) {
       this._state = result;
-    } else if (isPlainObject(result) && result.options) {
+    } else if (isPlainObject(result)) {
       const options = result.options;
 
       this._state = this._handleState(result.state, options);
 
-      this.notifyListeners({
-        id: this.id,
-        type: 'node',
-        options: options,
-      });
+      if (options) {
+        this.notifyListeners({
+          id: this.id,
+          type: 'node',
+          options: options,
+        });
 
-      return;
+        return;
+      }
     }
 
     this.notifyListeners();
@@ -569,8 +571,8 @@ export class Node<N extends INodeBase, E extends IEdgeBase> extends Subject impl
     return isPointInRectangle(this.getBoundingBox(), point);
   }
 
-  private _handleState(state: number, options: IGraphObjectStateOptions): number {
-    if (options.isToggle && this._state === state) {
+  private _handleState(state: number, options?: Partial<IGraphObjectStateOptions>): number {
+    if (options?.isToggle && this._state === state) {
       return GraphObjectState.NONE;
     } else {
       return state;

diff --git a/src/models/state.ts b/src/models/state.ts
@@ -8,17 +8,17 @@ export const GraphObjectState = {
 };
 
 export interface IGraphObjectStateOptions {
-  isToggle?: boolean;
-  isSingle?: boolean;
+  isToggle: boolean;
+  isSingle: boolean;
 }
 
 export interface IGraphObjectStateParameters {
   state: number;
-  options: IGraphObjectStateOptions;
+  options?: Partial<IGraphObjectStateOptions>;
 }
 
 export interface ISetStateDataPayload {
   id: any;
   type: GraphObject;
-  options: IGraphObjectStateOptions;
+  options: Partial<IGraphObjectStateOptions>;
 }