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

src/Artemis.Core/Services/NodeService.cs

@@ -84,9 +84,6 @@ namespace Artemis.Core.Services
                 }
             }
             
-            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 virtual T GetViewModel()
-        public T CustomViewModel => (T) BaseCustomViewModel!;
+        {
+            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 abstract ICustomNodeViewModel GetCustomViewModel();
-        public object? BaseCustomViewModel { get; set; }
     }
 }

src/Artemis.VisualScripting/Editor/Controls/VisualScriptNodePresenter.cs

@@ -3,6 +3,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using Artemis.Core;
 using Artemis.VisualScripting.Editor.Controls.Wrapper;
 
 namespace Artemis.VisualScripting.Editor.Controls
@@ -21,20 +22,29 @@ namespace Artemis.VisualScripting.Editor.Controls
         #region Dependency Properties
 
         public static readonly DependencyProperty NodeProperty = DependencyProperty.Register(
-            "Node", typeof(VisualScriptNode), typeof(VisualScriptNodePresenter), new PropertyMetadata(default(VisualScriptNode)));
+            "Node", typeof(VisualScriptNode), typeof(VisualScriptNodePresenter), new PropertyMetadata(default(VisualScriptNode), NodePropertyChangedCallback));
 
         public VisualScriptNode Node
         {
-            get => (VisualScriptNode)GetValue(NodeProperty);
+            get => (VisualScriptNode) GetValue(NodeProperty);
             set => SetValue(NodeProperty, value);
         }
 
+        public static readonly DependencyProperty CustomViewModelProperty = DependencyProperty.Register(
+            "CustomViewModel", typeof(ICustomNodeViewModel), typeof(VisualScriptNodePresenter), new PropertyMetadata(null));
+
+        public ICustomNodeViewModel CustomViewModel
+        {
+            get => (ICustomNodeViewModel) GetValue(CustomViewModelProperty);
+            set => SetValue(CustomViewModelProperty, value);
+        }
+
         public static readonly DependencyProperty TitleBrushProperty = DependencyProperty.Register(
             "TitleBrush", typeof(Brush), typeof(VisualScriptNodePresenter), new PropertyMetadata(default(Brush)));
 
         public Brush TitleBrush
         {
-            get => (Brush)GetValue(TitleBrushProperty);
+            get => (Brush) GetValue(TitleBrushProperty);
             set => SetValue(TitleBrushProperty, value);
         }
 
@@ -56,8 +66,8 @@ namespace Artemis.VisualScripting.Editor.Controls
             }
 
             Size neededSize = base.MeasureOverride(constraint);
-            int width = (int)Math.Ceiling(neededSize.Width);
+            int width = (int) Math.Ceiling(neededSize.Width);
-            int height = (int)Math.Ceiling(neededSize.Height);
+            int height = (int) Math.Ceiling(neededSize.Height);
 
             return new Size(SnapToGridSize(width), SnapToGridSize(height));
         }
@@ -132,6 +142,20 @@ namespace Artemis.VisualScripting.Editor.Controls
             args.Handled = true;
         }
 
+        private void GetCustomViewModel()
+        {
+            if (Node?.Node is CustomViewModelNode customViewModelNode)
+                CustomViewModel = customViewModelNode.GetCustomViewModel();
+            else
+                CustomViewModel = null;
+        }
+
+        private static void NodePropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is VisualScriptNodePresenter presenter)
+                presenter.GetCustomViewModel();
+        }
+
         #endregion
     }
 }

src/Artemis.VisualScripting/Editor/Styles/VisualScriptNodePresenter.xaml

@@ -208,17 +208,7 @@
                         </Border>
 
                         <Border x:Name="BrdCustomView" Grid.Column="1">
-                            <Border.Resources>
+                            <ContentControl s:View.Model="{TemplateBinding CustomViewModel}"/>
-                                <DataTemplate DataType="{x:Type core:CustomViewModelNode}">
-                                    <ContentControl s:View.Model="{Binding BaseCustomViewModel}"/>
-                                </DataTemplate>
-
-                                <DataTemplate DataType="{x:Type core:Node}">
-                                    <Border />
-                                </DataTemplate>
-                            </Border.Resources>
-
-                            <ContentControl Content="{Binding Node}" />
                         </Border>
 
                         <Border x:Name="BrdOutputPins" Grid.Column="2">