Using factory, fix filling props

Author: Yadro

src/base/TreeModelHelper.ts

@@ -1,12 +1,13 @@
 import { ITreeItem, ITreeItemWithParent } from '../types/ITreeItem';
 import { TaskModelProxy } from '../modules/tasks/models/TaskModelProxy';
 import TaskModel from '../modules/tasks/models/TaskModel';
+import TaskFactory from '../modules/tasks/TaskFactory';
 
 const TreeModelHelper = {
-  getPathToNode<T extends ITreeItemWithParent>(node: T) {
+  getPathToNode<T extends ITreeItemWithParent = ITreeItemWithParent>(node: T) {
     const result: string[] = [];
 
-    let ptrNode = node;
+    let ptrNode: T | undefined = node;
     while (ptrNode) {
       result.unshift(ptrNode.key);
       // @ts-ignore
@@ -26,14 +27,10 @@ const TreeModelHelper = {
 
     if (keysToTask.length === 1) {
       const source = sourceChildren.find((node) => node.key === keysToTask[0]);
-      destChildren.push(
-        // @ts-ignore
-        new TaskModelProxy({
-          ...source,
-          children: [],
-        })
-      );
-      return true;
+      if (source) {
+        destChildren.push(TaskFactory.createTaskModelProxy(source));
+      }
+      return !!source;
     }
 
     do {
@@ -83,12 +80,7 @@ const TreeModelHelper = {
     }
 
     while (true) {
-      // @ts-ignore
-      let copy = new TaskModelProxy({
-        ...source,
-        children: [],
-      });
-
+      const copy = TaskFactory.createTaskModelProxy(source);
       dest.push(copy);
 
       keyIdx++;

src/modules/tasks/TaskFactory.ts

@@ -16,8 +16,8 @@ export default class TaskFactory extends AbstractFactory {
     return newData;
   }
 
-  createTaskProxy(taskModel: TaskModel): TaskModelProxy {
-    const target = new TaskModelProxy(taskModel);
+  static createTaskModelProxy(taskModel: TaskModel): TaskModelProxy {
+    const target = new TaskModelProxy(taskModel, []);
 
     return new Proxy<TaskModelProxy>(target, taskModelProxyHandler);
   }

src/modules/tasks/models/TaskModelProxy.ts

@@ -3,6 +3,12 @@ import TaskModel from './TaskModel';
 export class TaskModelProxy extends TaskModel {
   origin: TaskModel | null = null;
   children: TaskModelProxy[] = [];
+
+  constructor(originTaskModel: TaskModel, children: TaskModelProxy[]) {
+    super(originTaskModel);
+    this.origin = originTaskModel;
+    this.children = children;
+  }
 }
 
 export const taskModelProxyHandler: ProxyHandler<TaskModelProxy> = {
@@ -19,8 +25,11 @@ export const taskModelProxyHandler: ProxyHandler<TaskModelProxy> = {
     }
     // @ts-ignore
     target[prop] = value;
-    // @ts-ignore
-    target.origin[prop] = value;
+
+    if (prop !== 'expanded') {
+      // @ts-ignore
+      target.origin[prop] = value;
+    }
 
     return true;
   },