Nodes - When usting custom VMs, create a VM for each presenter

src/Artemis.Core/Services/NodeService.cs

@@ -83,10 +83,7 @@ namespace Artemis.Core.Services
                     // ignored
                 }
             }
-
-            if (node is CustomViewModelNode customViewModelNode)
-                customViewModelNode.BaseCustomViewModel = _kernel.Get(customViewModelNode.CustomViewModelType, new ConstructorArgument("node", node));
-
+            
             node.Initialize(script);
             return node;
         }

src/Artemis.Core/VisualScripting/Node.cs

@@ -1,6 +1,8 @@
-using System;
+using Ninject;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Ninject.Parameters;
 
 namespace Artemis.Core
 {
@@ -149,14 +151,24 @@ namespace Artemis.Core
 
     public abstract class Node<T> : CustomViewModelNode where T : ICustomNodeViewModel
     {
+        [Inject]
+        internal IKernel Kernel { get; set; } = null!;
+
         protected Node()
         { }
 
         protected Node(string name, string description) : base(name, description)
         { }
 
-        public override Type CustomViewModelType => typeof(T);
-        public T CustomViewModel => (T) BaseCustomViewModel!;
+        public virtual T GetViewModel()
+        {
+            return Kernel.Get<T>(new ConstructorArgument("node", this));
+        }
+
+        public override ICustomNodeViewModel GetCustomViewModel()
+        {
+            return GetViewModel();
+        }
     }
 
     public abstract class CustomViewModelNode : Node
@@ -169,7 +181,6 @@ namespace Artemis.Core
         protected CustomViewModelNode(string name, string description) : base(name, description)
         { }
 
-        public abstract Type CustomViewModelType { get; }
-        public object? BaseCustomViewModel { get; set; }
+        public abstract ICustomNodeViewModel GetCustomViewModel();
     }
 }