BUG Schema duplicating UI when changed

Author: Daniel Burgess

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/SubGraph/SubGraphGUIUtility.cs

@@ -23,7 +23,13 @@ public SubGraphGUIUtility(SubGraph subGraph)
 
         public SubGraph SubGraph => _subgraph;
         public SubGraphOptionsGUIUtility OptionsGUIUtil => new(SubGraph);
-        public SubGraphSchemaGUIUtility SchemaGUIUtil => SubGraph.Schema ? new(SubGraph.Schema) : null;
+        private SubGraphSchemaGUIUtility _schemaGUIUtil;
+        public SubGraphSchemaGUIUtility SchemaGUIUtil =>
+            PropertyUtils.LazyLoad(
+                ref _schemaGUIUtil,
+                () => SubGraph.Schema ? new(SubGraph.Schema) : null,
+                (x) => x == null || SubGraph.Schema != x.Schema
+            );
 
         public SerializedObject SubGraphObject =>
             PropertyUtils.LazyLoad(

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/SubGraph/SubGraphView.cs

@@ -1,3 +1,4 @@
+using GraphProcessor.Utils;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
@@ -6,7 +7,7 @@
 namespace GraphProcessor
 {
     [CustomEditor(typeof(SubGraph), true)]
-    public partial class SubGraphView : GraphInspector
+    public class SubGraphView : GraphInspector
     {
         protected SubGraph SubGraph => target as SubGraph;
         protected SubGraphPortSchema Schema => SubGraph.Schema;
@@ -40,19 +41,22 @@ private VisualElement DrawSchemaControlGUI()
             schemaField.RegisterCallback<ChangeEvent<Object>>((e) =>
             {
                 SubGraphPortSchema prevSchemaValue = e.previousValue as SubGraphPortSchema;
-                // We check visibility due to this callback sometimes being called twice.
-                if (schemaControls.visible && Schema == null)
+                SubGraphPortSchema newSchemaValue = e.newValue as SubGraphPortSchema;
+
+                if (prevSchemaValue == newSchemaValue) return;
+                if (prevSchemaValue) prevSchemaValue.OnPortsUpdated -= SubGraph.NotifyPortsChanged;
+
+                schemaControls.Clear();
+
+                if (!newSchemaValue)
                 {
-                    if (prevSchemaValue != null)
-                        prevSchemaValue.OnPortsUpdated -= SubGraph.NotifyPortsChanged;
-                    schemaControls.visible = false;
-                    schemaControls.Clear();
+                    schemaControls.Hide();
                 }
-                else if (!schemaControls.visible && Schema != null)
+                else
                 {
-                    Schema.OnPortsUpdated += SubGraph.NotifyPortsChanged;
+                    newSchemaValue.OnPortsUpdated += SubGraph.NotifyPortsChanged;
                     schemaControls.Add(SubGraphSerializer.SchemaGUIUtil.DrawSchemaPortControlGUI());
-                    schemaControls.visible = true;
+                    schemaControls.Show();
                 }
             });