Merge pull request #92 from Jcparkyn/dev

Dev

Author: Jcparkyn

Nodexr.Tests/FakeNodeOutput.cs

@@ -19,7 +19,7 @@ class FakeNodeOutput : INodeOutput
 
         public string CssColor => throw new NotImplementedException();
 
-        public NodeResult CachedOutput => new NodeResult(output, this);
+        public NodeResult CachedOutput => new NodeResult(output, null);
 
         public FakeNodeOutput(string output) => this.output = output;
     }

Nodexr/Nodexr.xml

@@ -9,8 +9,8 @@
 <h3 style="margin:6px 10px 7px 7px; display:inline-block;">Output:</h3>
 
 <div class="output-regex-container">
-    <div class="output-regex">@foreach (var segment in @NodeHandler.CachedOutput)
-        {<OutputDisplaySegment Segment="segment" />@*This must not be surrounded by whitespace*@}</div>
+    <div class="output-regex">@foreach (var segment in @NodeHandler.CachedOutput.Contents)
+        {<OutputDisplaySegment Segment="segment" @key="segment"/>@*This must not be surrounded by whitespace*@}</div>
 
     <button title="Copy to clipboard" class="output-regex output-regex-button" @onclick="CopyTextToClipboard"><i class="far fa-clipboard"></i></button>
     <button title="Edit" class="output-regex output-regex-button" @onclick="OnEditButtonClick"><i class="fas fa-pencil-alt"></i></button>

Nodexr/Shared/Components/OutputDisplay.razor

@@ -1,10 +1,29 @@
-@inject INodeHandler NodeHandler
+@implements IDisposable
+@inject INodeHandler NodeHandler
 
-<span class="output-segment"
+<span class="output-segment @(NodeHandler.IsNodeSelected(Segment.Node) ? "output-segment-selected" : "")"
       style="color:@(Segment.Node?.CssColor ?? "inherit")"
-       @onmouseover="@(() => NodeHandler.SelectNode(Segment.Node as INode))"
+       @onmouseover="@(() => NodeHandler.SelectNode(Segment.Node))"
+      title="@Segment.Node.Title"
       >@Segment.Expression</span>
 
 @code {
     [Parameter] public RegexSegment Segment { get; set; }
+
+    protected override void OnInitialized()
+    {
+        Segment.Node.Selected += Refresh;
+        Segment.Node.Deselected += Refresh;
+    }
+
+    private void Refresh(object sender, EventArgs e)
+    {
+        StateHasChanged();
+    }
+
+    public void Dispose()
+    {
+        Segment.Node.Selected -= Refresh;
+        Segment.Node.Deselected -= Refresh;
+    }
 }

Nodexr/Shared/Components/OutputDisplaySegment.razor

@@ -70,7 +70,8 @@ protected override NodeResultBuilder GetValue()
                 InputMax.GetValue());
 
             var builder = new NodeResultBuilder();
-            builder.Append(result + suffix, this);
+            builder.Append(result, this);
+            builder.Append(suffix, this);
             return builder;
         }
     }

Nodexr/Shared/NodeTypes/CharSetNode.cs

@@ -75,7 +75,9 @@ protected override NodeResultBuilder GetValue()
                 InputMin.GetValue(),
                 InputMax.GetValue());
 
-            return new NodeResultBuilder(ValueString() + suffix, this);
+            var builder = new NodeResultBuilder(ValueString(), this);
+            builder.Append(suffix, this);
+            return builder;
         }
 
         private string ValueString()

Nodexr/Shared/NodeTypes/WhitespaceNode.cs

@@ -127,7 +127,10 @@ protected override NodeResultBuilder GetValue()
                 (WildcardType.Custom, _) => GetContentsCustom(invert),
                 _ => ".",
             };
-            return new NodeResultBuilder(contents + suffix, this);
+
+            var builder = new NodeResultBuilder(contents, this);
+            builder.Append(suffix, this);
+            return builder;
         }
 
         private string GetContentsCustom(bool invert)

Nodexr/Shared/NodeTypes/WildcardNode.cs

@@ -38,16 +38,14 @@ public interface INode : IPositionable, INodeOutput
         /// Get the height of the node, in pixels. Disabled inputs do not contribute to the height.
         /// </summary>
         int GetHeight();
-
-        /// <summary>
-        /// Get all of the inputs to the node, including the 'previous' input and the sub-inputs of any InputCollections.
-        /// InputCollections themselves are not returned.
-        /// </summary>
-        IEnumerable<NodeInput> GetAllInputs();
+        
         void OnLayoutChanged(object sender, EventArgs e);
-        bool IsDependentOn(INodeInput childInput);
+        void OnSelected(EventArgs e);
+        void OnDeselected(EventArgs e);
 
         event EventHandler LayoutChanged;
+        event EventHandler Selected;
+        event EventHandler Deselected;
     }
 
     public abstract class Node : INode
@@ -84,30 +82,32 @@ public INodeOutput PreviousNode
 
         public event EventHandler OutputChanged;
         public event EventHandler LayoutChanged;
+        public event EventHandler Selected;
+        public event EventHandler Deselected;
 
-        protected virtual void OnOutputChanged(EventArgs e)
-        {
-            OutputChanged?.Invoke(this, e);
-        }
+        protected virtual void OnOutputChanged(EventArgs e) => OutputChanged?.Invoke(this, e);
 
         public void OnLayoutChanged(object sender, EventArgs e)
         {
             CalculateInputsPos();
-            foreach(var input in GetAllInputs().OfType<InputProcedural>())
+            foreach(var input in this.GetAllInputs().OfType<InputProcedural>())
             {
                 input.Refresh();
             }
             LayoutChanged?.Invoke(this, e);
         }
 
+        public void OnSelected(EventArgs e) => Selected?.Invoke(this, e);
+
+        public void OnDeselected(EventArgs e) => Deselected?.Invoke(this, e);
+
         protected void OnInputsChanged(object sender, EventArgs e)
         {
-            var newOutput = GetOutput();
-            CachedOutput = newOutput;
+            CachedOutput = GetOutput();
             OnOutputChanged(EventArgs.Empty);
         }
 
-        public Node()
+        protected Node()
         {
             var inputProperties = GetType()
                 .GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
@@ -184,43 +184,7 @@ public void CalculateInputsPos()
             }
         }
 
-        /// <inheritdoc/>
-        public IEnumerable<NodeInput> GetAllInputs()
-        {
-            yield return Previous;
-            foreach(var input in NodeInputs)
-            {
-                if(input is InputCollection coll)
-                {
-                    foreach (var subInput in coll.Inputs)
-                        yield return subInput;
-                }
-                else
-                {
-                    yield return input;
-                }
-            }
-        }
-
-        public bool IsDependentOn(INodeInput childInput)
-        {
-            return GetAllProceduralInputsRecursive(this).Any(input => input == childInput);
-
-            static IEnumerable<InputProcedural> GetAllProceduralInputsRecursive(INode parent)
-            {
-                foreach(var input in parent.GetAllInputs().OfType<InputProcedural>())
-                {
-                    yield return input;
-
-                    if (input.ConnectedNode is INode childNode)
-                    {
-                        foreach (var input2 in GetAllProceduralInputsRecursive(childNode))
-                            yield return input2;
-                    }
-                }
-            }
-        }
-
+        
         public int GetHeight()
         {
             const int baseHeight = 28;

Nodexr/Shared/Nodes/Node.cs

@@ -0,0 +1,54 @@
+using System.Linq;
+using System.Collections.Generic;
+using Nodexr.Shared.NodeInputs;
+
+namespace Nodexr.Shared.Nodes
+{
+    public static class NodeExtensionMethods
+    {
+        /// <summary>
+        /// Get all of the inputs to the node, including the 'previous' input and the sub-inputs of any InputCollections.
+        /// InputCollections themselves are not returned.
+        /// </summary>
+        public static IEnumerable<NodeInput> GetAllInputs(this INode that)
+        {
+            yield return that.Previous;
+            foreach (var input in that.NodeInputs)
+            {
+                if (input is InputCollection coll)
+                {
+                    foreach (var subInput in coll.Inputs)
+                        yield return subInput;
+                }
+                else
+                {
+                    yield return input;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Checks whether the output of the node is dependent on the value of the given input.
+        /// Used for finding cyclic dependencies.
+        /// </summary>
+        /// <returns>True if there is a dependency, false otherwise</returns>
+        public static bool IsDependentOn(this INode that, INodeInput childInput)
+        {
+            return GetAllProceduralInputsRecursive(that).Any(input => input == childInput);
+
+            static IEnumerable<InputProcedural> GetAllProceduralInputsRecursive(INode parent)
+            {
+                foreach (var input in parent.GetAllInputs().OfType<InputProcedural>())
+                {
+                    yield return input;
+
+                    if (input.ConnectedNode is INode childNode)
+                    {
+                        foreach (var input2 in GetAllProceduralInputsRecursive(childNode))
+                            yield return input2;
+                    }
+                }
+            }
+        }
+    }
+}