From 30b07f29c87df3b4f48bc388aaed29aea340683e Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Fri, 21 Jun 2024 16:28:02 +0300
Subject: [PATCH 01/18] Add new example application

---
 Examples/Nodify.Shapes/App.xaml               | 226 +++++++++
 Examples/Nodify.Shapes/App.xaml.cs            |  17 +
 Examples/Nodify.Shapes/AppShellViewModel.cs   |   9 +
 Examples/Nodify.Shapes/AssemblyInfo.cs        |  10 +
 .../Canvas/CanvasToolbarViewModel.cs          |  54 ++
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml | 475 ++++++++++++++++++
 .../Nodify.Shapes/Canvas/CanvasView.xaml.cs   |  60 +++
 .../Nodify.Shapes/Canvas/CanvasViewModel.cs   | 204 ++++++++
 .../Canvas/ConnectionViewModel.cs             |  19 +
 .../Canvas/ConnectorViewModel.cs              |  21 +
 .../Canvas/Decorators/ICanvasDecorator.cs     |   9 +
 .../Decorators/ShapeToolbarViewModel.cs       |  69 +++
 .../Canvas/Decorators/UserCursorViewModel.cs  |  19 +
 .../Canvas/Shapes/EllipseViewModel.cs         |  13 +
 .../Canvas/Shapes/RectangleViewModel.cs       |  13 +
 .../Canvas/Shapes/ShapeViewModel.cs           |  66 +++
 .../Canvas/UndoRedo/MoveShapesAction.cs       |  37 ++
 .../Canvas/UndoRedo/SelectShapesAction.cs     |  41 ++
 Examples/Nodify.Shapes/MainWindow.xaml        |  35 ++
 Examples/Nodify.Shapes/MainWindow.xaml.cs     |  24 +
 Examples/Nodify.Shapes/Nodify.Shapes.csproj   |  21 +
 Examples/Nodify.Shapes/PropertyChangedBase.cs |  54 ++
 .../Nodify.Shapes/UndoRedo/ActionsHistory.cs  | 215 ++++++++
 .../Nodify.Shapes/UndoRedo/BatchAction.cs     |  37 ++
 .../Nodify.Shapes/UndoRedo/DelegateAction.cs  |  25 +
 .../Nodify.Shapes/UndoRedo/PropertyCache.cs   |  84 ++++
 Examples/Nodify.Shapes/UndoRedo/Undoable.cs   |  80 +++
 .../Nodify.Shared/Controls/Swatches.xaml.cs   |  48 ++
 .../ColorToSolidColorBrushConverter.cs        |  33 ++
 .../Converters/MultiValueEqualityConverter.cs |  38 ++
 Examples/Nodify.Shared/Themes/Generic.xaml    | 186 ++++---
 Nodify.sln                                    |   7 +
 32 files changed, 2187 insertions(+), 62 deletions(-)
 create mode 100644 Examples/Nodify.Shapes/App.xaml
 create mode 100644 Examples/Nodify.Shapes/App.xaml.cs
 create mode 100644 Examples/Nodify.Shapes/AppShellViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/AssemblyInfo.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/CanvasView.xaml
 create mode 100644 Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/ConnectionViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Decorators/ICanvasDecorator.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Shapes/EllipseViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Shapes/RectangleViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs
 create mode 100644 Examples/Nodify.Shapes/MainWindow.xaml
 create mode 100644 Examples/Nodify.Shapes/MainWindow.xaml.cs
 create mode 100644 Examples/Nodify.Shapes/Nodify.Shapes.csproj
 create mode 100644 Examples/Nodify.Shapes/PropertyChangedBase.cs
 create mode 100644 Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs
 create mode 100644 Examples/Nodify.Shapes/UndoRedo/BatchAction.cs
 create mode 100644 Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs
 create mode 100644 Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs
 create mode 100644 Examples/Nodify.Shapes/UndoRedo/Undoable.cs
 create mode 100644 Examples/Nodify.Shared/Controls/Swatches.xaml.cs
 create mode 100644 Examples/Nodify.Shared/Converters/ColorToSolidColorBrushConverter.cs
 create mode 100644 Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs

diff --git a/Examples/Nodify.Shapes/App.xaml b/Examples/Nodify.Shapes/App.xaml
new file mode 100644
index 00000000..01230f78
--- /dev/null
+++ b/Examples/Nodify.Shapes/App.xaml
@@ -0,0 +1,226 @@
+<Application x:Class="Nodify.Shapes.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <Style x:Key="IconButton"
+                   TargetType="Button"
+                   BasedOn="{StaticResource {x:Type Button}}">
+                <Setter Property="Background"
+                        Value="Transparent" />
+                <Setter Property="BorderBrush"
+                        Value="Transparent" />
+                <Setter Property="Padding"
+                        Value="2" />
+                <Setter Property="Cursor"
+                        Value="Hand" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border x:Name="PART_Border"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    Background="{TemplateBinding Background}"
+                                    Padding="{TemplateBinding Padding}"
+                                    CornerRadius="3"
+                                    SnapsToDevicePixels="True">
+                                <ContentPresenter x:Name="contentPresenter"
+                                                  Focusable="False"
+                                                  Margin="{TemplateBinding Padding}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+                <Style.Triggers>
+                    <Trigger Property="IsEnabled"
+                             Value="False">
+                        <Setter Property="Opacity"
+                                Value="0.4" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+
+            <!--ICONS-->
+
+            <Viewbox x:Key="MinusIcon"
+                     Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M5 12h14" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="PlusIcon"
+                     Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M12 5v14M5 12h14" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="MaximizeIcon"
+                     Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M4 8V6a2 2 0 0 1 2-2h2M4 16v2a2 2 0 0 0 2 2h2M16 4h2a2 2 0 0 1 2 2v2M16 20h2a2 2 0 0 0 2-2v-2" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="CursorIcon"
+                     Stretch="Fill"
+                     Margin="2">
+                <Path Stroke="White"
+                      StrokeThickness="1"
+                      StrokeLineJoin="Round"
+                      StrokeStartLineCap="Round"
+                      StrokeEndLineCap="Round"
+                      Data="M.256.255a.874.874 0 0 0-.18.974l4.753 17.114a.875.875 0 0 0 1.603-.012L10 10l8.334-3.57a.875.875 0 0 0 .01-1.601L1.23.075a.874.874 0 0 0-.974.18Z" />
+            </Viewbox>
+
+            <Viewbox x:Key="CircleIcon"
+                     Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M3 12a9 9 0 1 0 18 0 9 9 0 1 0-18 0" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="SquareIcon" Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M3 5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="TriangleIcon" Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M10.363 3.591 2.257 17.125a1.914 1.914 0 0 0 1.636 2.871h16.214a1.914 1.914 0 0 0 1.636-2.87L13.637 3.59a1.914 1.914 0 0 0-3.274 0z" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="ArrowBackIcon" Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="m9 14-4-4 4-4" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M5 10h11a4 4 0 1 1 0 8h-1" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="ArrowForwardIcon" Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="m15 14 4-4-4-4" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M19 10H8a4 4 0 1 0 0 8h1" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="LockIcon"
+                     Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-6z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M11 16a1 1 0 1 0 2 0 1 1 0 0 0-2 0M8 11V7a4 4 0 1 1 8 0v4" />
+                </Grid>
+            </Viewbox>
+
+            <Viewbox x:Key="LockOpenIcon"
+                     Stretch="Fill">
+                <Grid>
+                    <Path StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M0 0h24v24H0z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2z" />
+                    <Path Stroke="White"
+                          StrokeLineJoin="Round"
+                          StrokeStartLineCap="Round"
+                          StrokeEndLineCap="Round"
+                          Data="M11 16a1 1 0 1 0 2 0 1 1 0 1 0-2 0M8 11V6a4 4 0 0 1 8 0" />
+                </Grid>
+            </Viewbox>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/Examples/Nodify.Shapes/App.xaml.cs b/Examples/Nodify.Shapes/App.xaml.cs
new file mode 100644
index 00000000..9f4aff5d
--- /dev/null
+++ b/Examples/Nodify.Shapes/App.xaml.cs
@@ -0,0 +1,17 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace Nodify.Shapes
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        public App()
+        {
+            NodifyEditor.EnableDraggingContainersOptimizations = false;
+            EditorGestures.Mappings.Connection.Disconnect.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick, ModifierKeys.Alt), new MouseGesture(MouseAction.RightClick));
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/AppShellViewModel.cs b/Examples/Nodify.Shapes/AppShellViewModel.cs
new file mode 100644
index 00000000..c8d827dc
--- /dev/null
+++ b/Examples/Nodify.Shapes/AppShellViewModel.cs
@@ -0,0 +1,9 @@
+using Nodify.Shapes.Canvas;
+
+namespace Nodify.Shapes
+{
+    public class AppShellViewModel : ObservableObject
+    {
+        public CanvasViewModel Canvas { get; } = new CanvasViewModel();
+    }
+}
diff --git a/Examples/Nodify.Shapes/AssemblyInfo.cs b/Examples/Nodify.Shapes/AssemblyInfo.cs
new file mode 100644
index 00000000..b0ec8275
--- /dev/null
+++ b/Examples/Nodify.Shapes/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
+                                                //(used if a resource is not found in the page,
+                                                // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
+                                                //(used if a resource is not found in the page,
+                                                // app, or any theme specific resource dictionaries)
+)]
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
new file mode 100644
index 00000000..d3cb7dc1
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
@@ -0,0 +1,54 @@
+using System.Windows.Input;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class CanvasToolbarViewModel : PropertyChangedBase
+    {
+        private static readonly EditorGestures EditorGestures;
+
+        private bool _locked;
+        public bool Locked
+        {
+            get => _locked;
+            set
+            {
+                if (SetProperty(ref _locked, value))
+                {
+                    var newMappings = _locked ? UnboundGestureMappings.Instance : EditorGestures;
+                    EditorGestures.Mappings.Apply(newMappings);
+                }
+            }
+        }
+
+        public ICommand ToggleLockCommand { get; set; }
+
+        public CanvasViewModel Canvas { get; }
+
+        static CanvasToolbarViewModel()
+        {
+            EditorGestures = new EditorGestures();
+            // copy any user modifications
+            EditorGestures.Apply(EditorGestures.Mappings);
+        }
+
+        public CanvasToolbarViewModel(CanvasViewModel canvas)
+        {
+            ToggleLockCommand = new DelegateCommand(() => Locked = !Locked);
+            Canvas = canvas;
+        }
+    }
+
+    public class UnboundGestureMappings : EditorGestures
+    {
+        public static readonly UnboundGestureMappings Instance = new UnboundGestureMappings();
+
+        public UnboundGestureMappings()
+        {
+            Editor.Selection.Apply(SelectionGestures.None);
+            Editor.Pan.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick), new MouseGesture(MouseAction.RightClick), new MouseGesture(MouseAction.MiddleClick));
+            ItemContainer.Selection.Apply(SelectionGestures.None);
+            Connection.Disconnect.Value = MultiGesture.None;
+            Connector.Connect.Value = MultiGesture.None;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
new file mode 100644
index 00000000..e36c716c
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -0,0 +1,475 @@
+<UserControl x:Class="Nodify.Shapes.Canvas.CanvasView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:Nodify.Shapes.Canvas"
+             xmlns:nodify="https://miroiu.github.io/nodify"
+             xmlns:shared="clr-namespace:Nodify;assembly=Nodify.Shared"
+             xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+             mc:Ignorable="d"
+             Background="#0f172a"
+             Foreground="white"
+             d:DataContext="{d:DesignInstance Type=local:CanvasViewModel, IsDesignTimeCreatable=True}"
+             d:DesignHeight="450"
+             d:DesignWidth="800">
+    <Grid>
+        <Grid.Resources>
+            <shared:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+            <shared:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+            <VisualBrush x:Key="GridDrawingBrush"
+                         TileMode="Tile"
+                         Viewport="0 0 30 30"
+                         ViewportUnits="Absolute"
+                         Viewbox="0 0 30 30"
+                         ViewboxUnits="Absolute"
+                         o:Freeze="True"
+                         Transform="{Binding ViewportTransform, ElementName=Editor}">
+                <VisualBrush.Visual>
+                    <Rectangle Width="1"
+                               Height="1"
+                               Fill="White" />
+                </VisualBrush.Visual>
+            </VisualBrush>
+        </Grid.Resources>
+
+        <nodify:NodifyEditor ItemsSource="{Binding Shapes}"
+                             SelectedItems="{Binding SelectedShapes}"
+                             Connections="{Binding Connections}"
+                             Decorators="{Binding Decorators}"
+                             Background="{StaticResource GridDrawingBrush}"
+                             ConnectionCompletedCommand="{Binding CreateConnectionCommand}"
+                             ItemsDragStartedCommand="{Binding MoveShapesStartedCommand}"
+                             ItemsDragCompletedCommand="{Binding MoveShapesCompletedCommand}"
+                             ItemsSelectStartedCommand="{Binding SelectShapesStartedCommand}"
+                             ItemsSelectCompletedCommand="{Binding SelectShapesCompletedCommand}"
+                             RemoveConnectionCommand="{Binding RemoveConnectionCommand}"
+                             GridCellSize="10"
+                             x:Name="Editor">
+            <nodify:NodifyEditor.Resources>
+                <DataTemplate DataType="{x:Type local:EllipseViewModel}">
+                    <Ellipse Stretch="Fill"
+                             Fill="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                             Stroke="{Binding BorderColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                             StrokeThickness="2"
+                             Opacity="0.8" />
+                </DataTemplate>
+
+                <DataTemplate DataType="{x:Type local:RectangleViewModel}">
+                    <Rectangle Stretch="Fill"
+                               Fill="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                               Stroke="{Binding BorderColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                               StrokeThickness="2"
+                               Opacity="0.8" />
+                </DataTemplate>
+
+                <DataTemplate DataType="{x:Type local:ShapeToolbarViewModel}">
+                    <Canvas Visibility="{Binding Shape, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <shared:Swatches SelectedColor="{Binding Shape.Color}"
+                                         Colors="{x:Static local:ShapeViewModel.Colors}"
+                                         Canvas.Top="-70"
+                                         Panel.ZIndex="1">
+                            <shared:Swatches.Effect>
+                                <DropShadowEffect ShadowDepth="1" />
+                            </shared:Swatches.Effect>
+                        </shared:Swatches>
+                    </Canvas>
+                </DataTemplate>
+
+                <DataTemplate DataType="{x:Type local:UserCursorViewModel}">
+                    <StackPanel IsHitTestVisible="False">
+                        <Viewbox Width="24"
+                                 Height="24"
+                                 Margin="-10 0 0 5"
+                                 Stretch="Fill"
+                                 HorizontalAlignment="Left">
+                            <Path Fill="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                                  Stroke="White"
+                                  StrokeLineJoin="Round"
+                                  StrokeStartLineCap="Round"
+                                  StrokeEndLineCap="Round"
+                                  Data="M.256.255a.874.874 0 0 0-.18.974l4.753 17.114a.875.875 0 0 0 1.603-.012L10 10l8.334-3.57a.875.875 0 0 0 .01-1.601L1.23.075a.874.874 0 0 0-.974.18Z" />
+                        </Viewbox>
+                        <Border CornerRadius="3"
+                                Background="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}, ConverterParameter=0.7}"
+                                Padding="6 2">
+                            <TextBlock Text="{Binding Name}" />
+                        </Border>
+                    </StackPanel>
+                </DataTemplate>
+
+                <Style TargetType="{x:Type nodify:PendingConnection}"
+                       BasedOn="{StaticResource {x:Type nodify:PendingConnection}}">
+                    <Setter Property="Direction"
+                            Value="{Binding Source.Direction}" />
+                    <Setter Property="Stroke">
+                        <Setter.Value>
+                            <SolidColorBrush Color="White"
+                                             Opacity="0.7" />
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </nodify:NodifyEditor.Resources>
+
+            <nodify:NodifyEditor.ConnectionTemplate>
+                <DataTemplate DataType="{x:Type local:ConnectionViewModel}">
+                    <nodify:StepConnection Source="{Binding Source.Anchor}"
+                                           Target="{Binding Target.Anchor}"
+                                           SourcePosition="{Binding Source.Position}"
+                                           TargetPosition="{Binding Target.Position}"
+                                           Cursor="Hand"
+                                           Fill="Transparent"
+                                           StrokeThickness="3">
+                        <nodify:StepConnection.Stroke>
+                            <SolidColorBrush Color="White"
+                                             Opacity="0.7" />
+                        </nodify:StepConnection.Stroke>
+                    </nodify:StepConnection>
+                </DataTemplate>
+            </nodify:NodifyEditor.ConnectionTemplate>
+
+            <nodify:NodifyEditor.DecoratorContainerStyle>
+                <Style TargetType="{x:Type nodify:DecoratorContainer}"
+                       BasedOn="{StaticResource {x:Type nodify:DecoratorContainer}}">
+                    <Setter Property="Location"
+                            Value="{Binding Location}" />
+                </Style>
+            </nodify:NodifyEditor.DecoratorContainerStyle>
+
+            <nodify:NodifyEditor.ItemContainerStyle>
+                <Style TargetType="{x:Type nodify:ItemContainer}"
+                       BasedOn="{StaticResource {x:Type nodify:ItemContainer}}">
+                    <Style.Resources>
+                        <Style TargetType="{x:Type nodify:Connector}"
+                               BasedOn="{StaticResource {x:Type nodify:Connector}}">
+                            <Setter Property="BorderBrush"
+                                    Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=nodify:ItemContainer}}" />
+                            <Setter Property="Background"
+                                    Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=nodify:ItemContainer}}" />
+                            <Setter Property="HorizontalContentAlignment"
+                                    Value="Center" />
+                            <Setter Property="VerticalContentAlignment"
+                                    Value="Center" />
+                            <Setter Property="IsConnected"
+                                    Value="True" />
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate>
+                                        <Grid Background="Transparent">
+                                            <Ellipse x:Name="PART_Connector"
+                                                     Width="14"
+                                                     Height="14"
+                                                     Stroke="{TemplateBinding BorderBrush}"
+                                                     Fill="{TemplateBinding Background}"
+                                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                        </Grid>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </Style.Resources>
+                    <Setter Property="Location"
+                            Value="{Binding Location}" />
+                    <Setter Property="IsSelected"
+                            Value="{Binding IsSelected}" />
+                    <Setter Property="Padding"
+                            Value="3" />
+                    <Setter Property="SelectedBrush"
+                            Value="{Binding BorderColor, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                    <Setter Property="SelectedBorderThickness"
+                            Value="1" />
+                    <Setter Property="BorderBrush"
+                            Value="Transparent" />
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type nodify:ItemContainer}">
+                                <Border Background="{TemplateBinding Background}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        Padding="{TemplateBinding Padding}"
+                                        x:Name="Border"
+                                        CornerRadius="3">
+                                    <Grid Height="150"
+                                          Width="150">
+
+                                        <ContentPresenter Cursor="Hand" />
+
+                                        <shared:EditableTextBlock Text="{Binding Text}"
+                                                                  HorizontalAlignment="Center"
+                                                                  VerticalAlignment="Center"
+                                                                  HorizontalContentAlignment="Center"
+                                                                  FontSize="16"
+                                                                  ToolTip="Double click to edit" />
+
+                                        <DockPanel LastChildFill="False">
+                                            <nodify:Connector DataContext="{Binding LeftConnector}"
+                                                              Anchor="{Binding Anchor, Mode=OneWayToSource}"
+                                                              DockPanel.Dock="Left"
+                                                              HorizontalContentAlignment="Left"
+                                                              Margin="-11 0 0 0"
+                                                              Visibility="Hidden"
+                                                              Height="Auto"
+                                                              Width="25"
+                                                              x:Name="LeftConnector" />
+
+                                            <nodify:Connector DataContext="{Binding RightConnector}"
+                                                              Anchor="{Binding Anchor, Mode=OneWayToSource}"
+                                                              DockPanel.Dock="Right"
+                                                              HorizontalContentAlignment="Right"
+                                                              Margin="0 0 -11 0"
+                                                              Visibility="Hidden"
+                                                              Height="Auto"
+                                                              Width="25"
+                                                              x:Name="RightConnector" />
+
+                                            <nodify:Connector DataContext="{Binding TopConnector}"
+                                                              Anchor="{Binding Anchor, Mode=OneWayToSource}"
+                                                              DockPanel.Dock="Top"
+                                                              VerticalContentAlignment="Top"
+                                                              Margin="0 -11 0 0"
+                                                              Visibility="Hidden"
+                                                              Width="Auto"
+                                                              Height="25"
+                                                              x:Name="TopConnector" />
+
+                                            <nodify:Connector DataContext="{Binding BottomConnector}"
+                                                              Anchor="{Binding Anchor, Mode=OneWayToSource}"
+                                                              DockPanel.Dock="Bottom"
+                                                              VerticalContentAlignment="Bottom"
+                                                              Margin="0 0 0 -11"
+                                                              Visibility="Hidden"
+                                                              Width="Auto"
+                                                              Height="25"
+                                                              x:Name="BottomConnector" />
+                                        </DockPanel>
+                                    </Grid>
+                                </Border>
+
+                                <ControlTemplate.Triggers>
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsSelected"
+                                                       Value="True" />
+                                            <Condition Property="IsPreviewingSelection"
+                                                       Value="{x:Null}" />
+                                        </MultiTrigger.Conditions>
+                                        <MultiTrigger.Setters>
+                                            <Setter Property="Visibility"
+                                                    TargetName="LeftConnector"
+                                                    Value="Visible" />
+                                            <Setter Property="Visibility"
+                                                    TargetName="RightConnector"
+                                                    Value="Visible" />
+                                            <Setter Property="Visibility"
+                                                    TargetName="TopConnector"
+                                                    Value="Visible" />
+                                            <Setter Property="Visibility"
+                                                    TargetName="BottomConnector"
+                                                    Value="Visible" />
+                                        </MultiTrigger.Setters>
+                                    </MultiTrigger>
+                                    <Trigger Property="IsPreviewingSelection"
+                                             Value="True">
+                                        <Setter Property="Visibility"
+                                                TargetName="LeftConnector"
+                                                Value="Visible" />
+                                        <Setter Property="Visibility"
+                                                TargetName="RightConnector"
+                                                Value="Visible" />
+                                        <Setter Property="Visibility"
+                                                TargetName="TopConnector"
+                                                Value="Visible" />
+                                        <Setter Property="Visibility"
+                                                TargetName="BottomConnector"
+                                                Value="Visible" />
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                    <Style.Triggers>
+                        <Trigger Property="IsSelected"
+                                 Value="True">
+                            <Setter Property="Panel.ZIndex"
+                                    Value="1" />
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </nodify:NodifyEditor.ItemContainerStyle>
+        </nodify:NodifyEditor>
+
+        <!--TOOLBARS-->
+
+        <Border VerticalAlignment="Bottom"
+                HorizontalAlignment="Center"
+                Margin="0 0 0 50"
+                CornerRadius="3"
+                Background="#1e293b">
+            <Border.Effect>
+                <DropShadowEffect ShadowDepth="1" />
+            </Border.Effect>
+            <StackPanel Orientation="Horizontal">
+                <StackPanel.Resources>
+                    <Style TargetType="Button"
+                           BasedOn="{StaticResource IconButton}">
+                        <Setter Property="Margin"
+                                Value="2" />
+                        <Setter Property="Width"
+                                Value="32" />
+                        <Setter Property="Height"
+                                Value="32" />
+                    </Style>
+                </StackPanel.Resources>
+
+                <ListBox BorderThickness="0"
+                         Background="Transparent">
+                    <ListBox.ItemContainerStyle>
+                        <Style TargetType="ListBoxItem">
+                            <Setter Property="Margin"
+                                    Value="2" />
+                            <Setter Property="Width"
+                                    Value="32" />
+                            <Setter Property="Height"
+                                    Value="32" />
+                        </Style>
+                    </ListBox.ItemContainerStyle>
+                    <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <StackPanel Orientation="Horizontal"
+                                        IsItemsHost="True" />
+                        </ItemsPanelTemplate>
+                    </ListBox.ItemsPanel>
+                    <ListBoxItem Padding="0">
+                        <Border CornerRadius="3"
+                                Padding="5">
+                            <ContentPresenter Content="{StaticResource CursorIcon}" />
+                        </Border>
+                    </ListBoxItem>
+                    <ListBoxItem Padding="0">
+                        <Border CornerRadius="3"
+                                Padding="5">
+                            <ContentPresenter Content="{StaticResource CircleIcon}" />
+                        </Border>
+                    </ListBoxItem>
+                    <ListBoxItem Padding="0">
+                        <Border CornerRadius="3"
+                                Padding="5">
+                            <ContentPresenter Content="{StaticResource SquareIcon}" />
+                        </Border>
+                    </ListBoxItem>
+                    <ListBoxItem Padding="0">
+                        <Border CornerRadius="3"
+                                Padding="5">
+                            <ContentPresenter Content="{StaticResource TriangleIcon}" />
+                        </Border>
+                    </ListBoxItem>
+                </ListBox>
+
+                <Button Command="{Binding UndoCommand}"
+                        CommandTarget="{Binding ElementName=Editor}"
+                        Content="{StaticResource ArrowBackIcon}"
+                        Padding="1" />
+
+                <Button Command="{Binding RedoCommand}"
+                        CommandTarget="{Binding ElementName=Editor}"
+                        Content="{StaticResource ArrowForwardIcon}"
+                        Padding="1" />
+
+            </StackPanel>
+        </Border>
+
+        <Border VerticalAlignment="Bottom"
+                HorizontalAlignment="Left"
+                Margin="50 0 0 50"
+                CornerRadius="3"
+                Background="#1e293b">
+            <Border.Effect>
+                <DropShadowEffect ShadowDepth="1" />
+            </Border.Effect>
+
+            <StackPanel>
+                <StackPanel.Resources>
+                    <Style TargetType="Button"
+                           BasedOn="{StaticResource IconButton}">
+                        <Setter Property="Margin"
+                                Value="2" />
+                        <Setter Property="Width"
+                                Value="32" />
+                        <Setter Property="Height"
+                                Value="32" />
+                    </Style>
+                </StackPanel.Resources>
+
+                <Button Command="{x:Static nodify:EditorCommands.ZoomIn}"
+                        CommandTarget="{Binding ElementName=Editor}"
+                        Content="{StaticResource PlusIcon}" />
+
+                <Button Command="{x:Static nodify:EditorCommands.ZoomOut}"
+                        CommandTarget="{Binding ElementName=Editor}"
+                        Content="{StaticResource MinusIcon}" />
+
+                <Button Command="{x:Static nodify:EditorCommands.FitToScreen}"
+                        CommandTarget="{Binding ElementName=Editor}"
+                        Content="{StaticResource MaximizeIcon}" />
+
+                <Button Command="{Binding ToggleLockCommand}"
+                        DataContext="{Binding CanvasToolbar}">
+                    <Button.Style>
+                        <Style TargetType="Button"
+                               BasedOn="{StaticResource {x:Type Button}}">
+                            <Setter Property="Content"
+                                    Value="{StaticResource LockOpenIcon}" />
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Locked}"
+                                             Value="True">
+                                    <Setter Property="Content"
+                                            Value="{StaticResource LockIcon}" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
+            </StackPanel>
+        </Border>
+
+        <Border VerticalAlignment="Bottom"
+                HorizontalAlignment="Right"
+                Margin="0 0 50 50"
+                Height="38"
+                CornerRadius="3">
+            <Border.Effect>
+                <DropShadowEffect ShadowDepth="1" />
+            </Border.Effect>
+
+            <ItemsControl ItemsSource="{Binding Cursors}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate DataType="{x:Type local:UserCursorViewModel}">
+                        <Border CornerRadius="50"
+                                Height="28"
+                                Width="28"
+                                Margin="-3"
+                                Background="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                                Padding="6 2">
+                            <Button Command="{x:Static nodify:EditorCommands.BringIntoView}"
+                                    CommandParameter="{Binding Location}"
+                                    CommandTarget="{Binding ElementName=Editor}"
+                                    Style="{StaticResource IconButton}"
+                                    ToolTip="{Binding Name}"
+                                    Content="{Binding Name[0]}"
+                                    Foreground="White"
+                                    Margin="-6 -2"/>
+                        </Border>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
new file mode 100644
index 00000000..84af1394
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Threading;
+
+namespace Nodify.Shapes.Canvas
+{
+    public partial class CanvasView : UserControl
+    {
+        private readonly DispatcherTimer _moveToLocationTimer;
+        private readonly DispatcherTimer _generateLocationTimer;
+        private readonly Random _random = new Random();
+        private readonly Dictionary<UserCursorViewModel, Point> _moveToLocations = new Dictionary<UserCursorViewModel, Point>();
+
+        public CanvasView()
+        {
+            InitializeComponent();
+            _moveToLocationTimer = new DispatcherTimer(TimeSpan.FromSeconds(1d / 60d), DispatcherPriority.Background, OnMoveToLocationTick, Dispatcher);
+            _generateLocationTimer = new DispatcherTimer(TimeSpan.FromSeconds(3), DispatcherPriority.Background, OnGenerateNewLocation, Dispatcher);
+        }
+
+        public override void OnApplyTemplate()
+        {
+            _moveToLocationTimer.Start();
+            _generateLocationTimer.Start();
+
+            OnGenerateNewLocation(this, EventArgs.Empty);
+
+            base.OnApplyTemplate();
+        }
+
+        private void OnGenerateNewLocation(object? sender, EventArgs e)
+        {
+            var canvasVM = (CanvasViewModel)DataContext;
+
+            foreach (var cursor in canvasVM.Cursors)
+            {
+                _moveToLocations[cursor] = Editor.MouseLocation + new Vector(_random.Next(-1500, 1500), _random.Next(-1000, 1000));
+            }
+        }
+
+        private void OnMoveToLocationTick(object? sender, EventArgs e)
+        {
+            var canvasVM = (CanvasViewModel)DataContext;
+            double speed = 0.015d;
+
+            for (int i = 0; i < canvasVM.Cursors.Count; i++)
+            {
+                var user = canvasVM.Cursors[i];
+                var targetLocation = _moveToLocations[user];
+
+                Vector dir = targetLocation - user.Location;
+
+                var newLocation = user.Location + dir * speed;
+                user.Location = newLocation;
+            }
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
new file mode 100644
index 00000000..f26d382f
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -0,0 +1,204 @@
+using Nodify.Shapes.Canvas.UndoRedo;
+using Nodify.Shapes.UndoRedo;
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class CanvasViewModel : PropertyChangedBase
+    {
+        public NodifyObservableCollection<ShapeViewModel> Shapes { get; } = new NodifyObservableCollection<ShapeViewModel>();
+        public NodifyObservableCollection<ShapeViewModel> SelectedShapes { get; } = new NodifyObservableCollection<ShapeViewModel>();
+
+        public NodifyObservableCollection<ICanvasDecorator> Decorators { get; } = new NodifyObservableCollection<ICanvasDecorator>();
+        public NodifyObservableCollection<ConnectionViewModel> Connections { get; } = new NodifyObservableCollection<ConnectionViewModel>();
+
+        private ShapeToolbarViewModel ShapeToolbar { get; } = new ShapeToolbarViewModel();
+        public CanvasToolbarViewModel CanvasToolbar { get; }
+
+        public ICommand MoveShapesStartedCommand { get; }
+        public ICommand MoveShapesCompletedCommand { get; }
+        public ICommand SelectShapesStartedCommand { get; }
+        public ICommand SelectShapesCompletedCommand { get; }
+        public ICommand CreateConnectionCommand { get; }
+        public ICommand RemoveConnectionCommand { get; }
+        public ICommand DeleteSelectionCommand { get; }
+
+        public ICommand UndoCommand { get; }
+        public ICommand RedoCommand { get; }
+
+        public NodifyObservableCollection<UserCursorViewModel> Cursors { get; } = new NodifyObservableCollection<UserCursorViewModel>();
+        public IActionsHistory UndoRedo { get; } = ActionsHistory.Global;
+
+        private readonly Random _rand = new Random();
+
+        public CanvasViewModel()
+        {
+            CanvasToolbar = new CanvasToolbarViewModel(this);
+
+            UndoCommand = new RequeryCommand(UndoRedo.Undo, () => UndoRedo.CanUndo);
+            RedoCommand = new RequeryCommand(UndoRedo.Redo, () => UndoRedo.CanRedo);
+
+            MoveShapesStartedCommand = new DelegateCommand(MoveShapesStartedHandler);
+            MoveShapesCompletedCommand = new DelegateCommand(MoveShapesCompletedHandler);
+
+            SelectShapesStartedCommand = new DelegateCommand(SelectShapesStartedHandler);
+            SelectShapesCompletedCommand = new DelegateCommand(SelectShapesCompletedHandler);
+
+            DeleteSelectionCommand = new DelegateCommand(DeleteSelection);
+
+            CreateConnectionCommand = new DelegateCommand<(object Source, object Target)>(
+                ((object Source, object Target) pendingConnection) => AddConnection((ConnectorViewModel)pendingConnection.Source, (ConnectorViewModel)pendingConnection.Target),
+                ((object Source, object Target) pendingConnection) => CanConnect((ConnectorViewModel)pendingConnection.Source, (ConnectorViewModel)pendingConnection.Target));
+
+            RemoveConnectionCommand = new DelegateCommand<ConnectionViewModel>(RemoveConnection);
+
+            SelectedShapes.WhenAdded(shape =>
+            {
+                ShapeToolbar.Shape = SelectedShapes.Count == 1 ? shape : null;
+            });
+
+            SelectedShapes.WhenRemoved(shape =>
+            {
+                ShapeToolbar.Shape = SelectedShapes.Count == 1 ? SelectedShapes.Single() : null;
+            });
+
+            SelectedShapes.WhenCleared(shapes => ShapeToolbar.Shape = null);
+
+            FillCanvasWithShapes();
+        }
+
+        private void MoveShapesStartedHandler()
+        {
+            UndoRedo.ExecuteAction(new MoveShapesAction(this));
+            ShapeToolbar.Hide();
+        }
+
+        private void MoveShapesCompletedHandler()
+        {
+            if (UndoRedo.Current is MoveShapesAction movesShapes)
+            {
+                movesShapes.SaveLocations();
+            }
+
+            ShapeToolbar.Show();
+        }
+
+        // TODO: This does not fire for single selection (ItemContainer click), therefore I added IsSelected to ShapeViewModel.
+        private void SelectShapesStartedHandler()
+        {
+            // The workaround is to record all IsSelected changes into one history item using History.Pause and History.Resume
+            UndoRedo.Pause("Select shapes");
+            //UndoRedo.ExecuteAction(new SelectShapesAction(this));
+        }
+
+        private void SelectShapesCompletedHandler()
+        {
+            UndoRedo.Resume();
+            //if (UndoRedo.Current is SelectShapesAction selectShapes)
+            //{
+            //    selectShapes.SaveSelection();
+            //}
+        }
+
+        private void FillCanvasWithShapes()
+        {
+            // Disable undo redo to avoid recording object construction
+            UndoRedo.IsEnabled = false;
+
+            for (int i = 0; i < 5; i++)
+            {
+                var color = ShapeViewModel.Colors[_rand.Next(0, ShapeViewModel.Colors.Count)];
+                Cursors.Add(new UserCursorViewModel
+                {
+                    Name = $"User {i + 1}",
+                    Color = color,
+                    Location = new Point(_rand.Next(0, 1000), _rand.Next(0, 1000))
+                });
+            }
+
+            var ellipse = new EllipseViewModel
+            {
+                Location = new Point(100, 50)
+            };
+            Shapes.Add(ellipse);
+
+            var rectangle = new RectangleViewModel
+            {
+                Location = new Point(400, 100)
+            };
+            Shapes.Add(rectangle);
+
+            Connections.Add(new ConnectionViewModel(ellipse.RightConnector, rectangle.LeftConnector));
+
+            var ellipse2 = new EllipseViewModel
+            {
+                Location = new Point(100, 250)
+            };
+            Shapes.Add(ellipse2);
+
+            var rectangle2 = new RectangleViewModel
+            {
+                Location = new Point(450, 400)
+            };
+            Shapes.Add(rectangle2);
+
+            Connections.Add(new ConnectionViewModel(ellipse2.BottomConnector, rectangle2.TopConnector));
+
+            Connections.Add(new ConnectionViewModel(rectangle.RightConnector, rectangle2.RightConnector));
+
+            SelectedShapes.Add(rectangle);
+
+            Decorators.Add(ShapeToolbar);
+            Decorators.AddRange(Cursors);
+
+            // Re-enable undo redo
+            UndoRedo.IsEnabled = true;
+        }
+
+        private void AddConnection(ConnectorViewModel source, ConnectorViewModel target)
+        {
+            var connection = new ConnectionViewModel(source, target);
+            var action = new DelegateAction(() => Connections.Add(connection), () => Connections.Remove(connection), "Connect");
+            UndoRedo.ExecuteAction(action);
+        }
+
+        private void RemoveConnection(ConnectionViewModel connection)
+        {
+            var action = new DelegateAction(() => Connections.Remove(connection), () => Connections.Add(connection), "Disconnect");
+            UndoRedo.ExecuteAction(action);
+        }
+
+        private bool CanConnect(ConnectorViewModel? source, ConnectorViewModel? target)
+        {
+            return source != null
+                && target != null
+                && source != target
+                && !Connections.Contains(new ConnectionViewModel(source, target));
+        }
+
+        public void DeleteSelection()
+        {
+            using (UndoRedo.Batch("Delete selection"))
+            {
+                var selection = SelectedShapes.ToList();
+
+                var action = new DelegateAction(() => Shapes.RemoveRange(selection), () => Shapes.AddRange(selection), "Delete shapes");
+                UndoRedo.ExecuteAction(action);
+
+                foreach (var shape in selection)
+                {
+                    var connectors = new[] { shape.LeftConnector, shape.RightConnector, shape.TopConnector, shape.BottomConnector };
+                    var connectionsToRemove = Connections.Where(x => connectors.Contains(x.Source) || connectors.Contains(x.Target)).ToList();
+
+                    foreach (var connection in connectionsToRemove)
+                    {
+                        RemoveConnection(connection);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/ConnectionViewModel.cs b/Examples/Nodify.Shapes/Canvas/ConnectionViewModel.cs
new file mode 100644
index 00000000..fb1bcec7
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/ConnectionViewModel.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class ConnectionViewModel : IEquatable<ConnectionViewModel>
+    {
+        public ConnectionViewModel(ConnectorViewModel source, ConnectorViewModel target)
+        {
+            Source = source;
+            Target = target;
+        }
+
+        public ConnectorViewModel Source { get; }
+        public ConnectorViewModel Target { get; }
+
+        public bool Equals(ConnectionViewModel? other)
+            => other?.Source == Source && other.Target == Target;
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs b/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs
new file mode 100644
index 00000000..5b198af1
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs
@@ -0,0 +1,21 @@
+using System.Windows;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class ConnectorViewModel : PropertyChangedBase
+    {
+        public ConnectorViewModel(ConnectorPosition position)
+        {
+            Position = position;
+        }
+
+        private Point _anchor;
+        public Point Anchor
+        {
+            get => _anchor;
+            set => SetProperty(ref _anchor, value);
+        }
+
+        public ConnectorPosition Position { get; }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Decorators/ICanvasDecorator.cs b/Examples/Nodify.Shapes/Canvas/Decorators/ICanvasDecorator.cs
new file mode 100644
index 00000000..9420f585
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Decorators/ICanvasDecorator.cs
@@ -0,0 +1,9 @@
+using System.Windows;
+
+namespace Nodify.Shapes.Canvas
+{
+    public interface ICanvasDecorator
+    {
+        Point Location { get; set; }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs
new file mode 100644
index 00000000..ebd81f09
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs
@@ -0,0 +1,69 @@
+using System.ComponentModel;
+using System.Windows;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class ShapeToolbarViewModel : PropertyChangedBase, ICanvasDecorator
+    {
+        private ShapeViewModel? _shape;
+        public ShapeViewModel? Shape
+        {
+            get => _shape;
+            set
+            {
+                var prevShape = _shape;
+                if (SetProperty(ref _shape, value))
+                {
+                    _hiddenShape = null;
+                    HookLocationEvents(prevShape, value);
+                }
+            }
+        }
+
+        private ShapeViewModel? _hiddenShape;
+
+        private Point _location;
+        public Point Location
+        {
+            get => _location;
+            set => SetProperty(ref _location, value);
+        }
+
+        private void HookLocationEvents(ShapeViewModel? prevShape, ShapeViewModel? newShape)
+        {
+            if (prevShape != null)
+                prevShape.PropertyChanged -= OnLocationChanged;
+
+            if (newShape != null)
+            {
+                newShape.PropertyChanged += OnLocationChanged;
+                Location = newShape.Location;
+            }
+        }
+
+        private void OnLocationChanged(object? sender, PropertyChangedEventArgs args)
+        {
+            if (args.PropertyName == nameof(ShapeViewModel.Location))
+                Location = ((ShapeViewModel)sender!).Location;
+        }
+
+        public void Hide()
+        {
+            _hiddenShape = _shape;
+            _shape = null;
+
+            OnPropertyChanged(nameof(Shape));
+        }
+
+        public void Show()
+        {
+            if (_hiddenShape != null)
+            {
+                _shape = _hiddenShape;
+                _hiddenShape = null;
+
+                OnPropertyChanged(nameof(Shape));
+            }
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs b/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs
new file mode 100644
index 00000000..de90679e
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs
@@ -0,0 +1,19 @@
+using System.Windows;
+using System.Windows.Media;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class UserCursorViewModel : PropertyChangedBase, ICanvasDecorator
+    {
+        private Point _location;
+        public Point Location
+        {
+            get => _location;
+            set => SetProperty(ref _location, value);
+        }
+
+        public string? Name { get; set; }
+
+        public Color Color { get; set; }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/EllipseViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/EllipseViewModel.cs
new file mode 100644
index 00000000..843de185
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/EllipseViewModel.cs
@@ -0,0 +1,13 @@
+using System.Windows.Media;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class EllipseViewModel : ShapeViewModel
+    {
+        public EllipseViewModel()
+        {
+            Color = Color.FromRgb(67, 141, 87);
+            Text = "Ellipse";
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/RectangleViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/RectangleViewModel.cs
new file mode 100644
index 00000000..8e4ef3b1
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/RectangleViewModel.cs
@@ -0,0 +1,13 @@
+using System.Windows.Media;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class RectangleViewModel : ShapeViewModel
+    {
+        public RectangleViewModel()
+        {
+            Color = Color.FromRgb(63, 138, 226);
+            Text = "Rectangle";
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
new file mode 100644
index 00000000..ff558118
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
@@ -0,0 +1,66 @@
+using Nodify.Shapes.UndoRedo;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Nodify.Shapes.Canvas
+{
+    public abstract class ShapeViewModel : Undoable
+    {
+        public ShapeViewModel(IActionsHistory history) : base(history)
+        {
+            RecordProperty<ShapeViewModel>(x => x.IsSelected);
+            RecordProperty<ShapeViewModel>(x => x.Color);
+            RecordProperty<ShapeViewModel>(x => x.Text);
+        }
+
+        public ShapeViewModel() : this(ActionsHistory.Global)
+        {
+        }
+
+        public static readonly IReadOnlyList<Color> Colors = new Color[]
+        {
+            Color.FromRgb(207, 76, 44),
+            Color.FromRgb(234, 156, 65),
+            Color.FromRgb(235, 195, 71),
+            Color.FromRgb(67, 141, 87),
+            Color.FromRgb(63, 138, 226),
+            Color.FromRgb(128, 61, 236),
+        };
+
+        private Point _location;
+        public Point Location
+        {
+            get => _location;
+            set => SetProperty(ref _location, value);
+        }
+
+        private Color _color;
+        public Color Color
+        {
+            get => _color;
+            set => SetProperty(ref _color, value).Then(x => OnPropertyChanged(nameof(BorderColor)));
+        }
+
+        public Color BorderColor => Color * 1.5f;
+
+        private string? _text;
+        public string? Text
+        {
+            get => _text;
+            set => SetProperty(ref _text, value);
+        }
+
+        private bool _isSelected;
+        public bool IsSelected
+        {
+            get => _isSelected;
+            set => SetProperty(ref _isSelected, value);
+        }
+
+        public ConnectorViewModel LeftConnector { get; } = new ConnectorViewModel(ConnectorPosition.Left);
+        public ConnectorViewModel RightConnector { get; } = new ConnectorViewModel(ConnectorPosition.Right);
+        public ConnectorViewModel TopConnector { get; } = new ConnectorViewModel(ConnectorPosition.Top);
+        public ConnectorViewModel BottomConnector { get; } = new ConnectorViewModel(ConnectorPosition.Bottom);
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs b/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs
new file mode 100644
index 00000000..498b944b
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs
@@ -0,0 +1,37 @@
+using Nodify.Shapes.UndoRedo;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+
+namespace Nodify.Shapes.Canvas.UndoRedo
+{
+    public class MoveShapesAction : IAction
+    {
+        private readonly IReadOnlyCollection<ShapeViewModel> _movedShapes;
+        private readonly Dictionary<ShapeViewModel, Point> _initialLocations;
+        private Dictionary<ShapeViewModel, Point>? _finalLocations;
+
+        public MoveShapesAction(CanvasViewModel canvas)
+        {
+            _movedShapes = canvas.SelectedShapes;
+            _initialLocations = _movedShapes.ToDictionary(x => x, x => x.Location);
+        }
+
+        public string? Label => "Move shapes";
+
+        public void Execute()
+        {
+            _finalLocations?.ForEach(x => x.Key.Location = x.Value);
+        }
+
+        public void Undo()
+        {
+            _initialLocations.ForEach(x => x.Key.Location = x.Value);
+        }
+
+        public void SaveLocations()
+        {
+            _finalLocations = _movedShapes.ToDictionary(x => x, x => x.Location);
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs b/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs
new file mode 100644
index 00000000..43f6589f
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs
@@ -0,0 +1,41 @@
+using Nodify.Shapes.UndoRedo;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Nodify.Shapes.Canvas.UndoRedo
+{
+    public class SelectShapesAction : IAction
+    {
+        private readonly CanvasViewModel _canvas;
+        private readonly List<ShapeViewModel> _initialSelection;
+        private List<ShapeViewModel>? _finalSelection;
+
+        public SelectShapesAction(CanvasViewModel canvas)
+        {
+            _canvas = canvas;
+            _initialSelection = _canvas.SelectedShapes.ToList();
+        }
+
+        public string? Label => "Select shapes";
+
+        public void Execute()
+        {
+            if (_finalSelection != null)
+            {
+                _canvas.SelectedShapes.Clear();
+                _canvas.SelectedShapes.AddRange(_finalSelection);
+            }
+        }
+
+        public void Undo()
+        {
+            _canvas.SelectedShapes.Clear();
+            _canvas.SelectedShapes.AddRange(_initialSelection);
+        }
+
+        public void SaveSelection()
+        {
+            _finalSelection = _canvas.SelectedShapes.ToList();
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/MainWindow.xaml b/Examples/Nodify.Shapes/MainWindow.xaml
new file mode 100644
index 00000000..7a23ac34
--- /dev/null
+++ b/Examples/Nodify.Shapes/MainWindow.xaml
@@ -0,0 +1,35 @@
+<Window x:Class="Nodify.Shapes.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+        xmlns:local="clr-namespace:Nodify.Shapes"
+        xmlns:canvas="clr-namespace:Nodify.Shapes.Canvas"
+        mc:Ignorable="d"
+        xmlns:shared="clr-namespace:Nodify;assembly=Nodify.Shared"
+        Title="Canvas"
+        Height="650"
+        Width="1200">
+    <Window.InputBindings>
+        <KeyBinding Command="{Binding Canvas.RedoCommand}"
+                    Key="Y"
+                    Modifiers="Ctrl" />
+        <KeyBinding Command="{Binding Canvas.RedoCommand}"
+                    Key="Z"
+                    Modifiers="Ctrl+Shift" />
+        <KeyBinding Command="{Binding Canvas.UndoCommand}"
+                    Key="Z"
+                    Modifiers="Ctrl" />
+        <KeyBinding Command="{Binding Canvas.DeleteSelectionCommand}"
+                    Key="Delete" />
+    </Window.InputBindings>
+
+    <Window.DataContext>
+        <local:AppShellViewModel />
+    </Window.DataContext>
+
+    <Grid>
+        <canvas:CanvasView DataContext="{Binding Canvas}" />
+    </Grid>
+</Window>
diff --git a/Examples/Nodify.Shapes/MainWindow.xaml.cs b/Examples/Nodify.Shapes/MainWindow.xaml.cs
new file mode 100644
index 00000000..584f8534
--- /dev/null
+++ b/Examples/Nodify.Shapes/MainWindow.xaml.cs
@@ -0,0 +1,24 @@
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Nodify.Shapes
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Examples/Nodify.Shapes/Nodify.Shapes.csproj b/Examples/Nodify.Shapes/Nodify.Shapes.csproj
new file mode 100644
index 00000000..e3050b57
--- /dev/null
+++ b/Examples/Nodify.Shapes/Nodify.Shapes.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFrameworks>net8-windows;net6-windows;net5-windows;netcoreapp3.1;net48;net472</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net472' OR '$(TargetFramework)'=='net48'">
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="StringMath" Version="4.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Nodify\Nodify.csproj" />
+    <ProjectReference Include="..\Nodify.Shared\Nodify.Shared.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Examples/Nodify.Shapes/PropertyChangedBase.cs b/Examples/Nodify.Shapes/PropertyChangedBase.cs
new file mode 100644
index 00000000..345ae77e
--- /dev/null
+++ b/Examples/Nodify.Shapes/PropertyChangedBase.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows;
+
+namespace Nodify.Shapes
+{
+    /// <summary>
+    /// Base class for things which can raise PropertyChanged events
+    /// </summary>
+    public abstract class PropertyChangedBase : INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Gets or sets the dispatcher to use to dispatch PropertyChanged events. Defaults to UI thread.
+        /// </summary>
+        public virtual Action<Action> PropertyChangedDispatcher { get; set; } = action => Application.Current.Dispatcher.Invoke(action);
+
+        /// <summary>
+        /// Occurs when a property value changes
+        /// </summary>
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        /// <summary>
+        /// Fires the PropertyChanged notification.
+        /// </summary>
+        /// <remarks>Specially named so that Fody.PropertyChanged calls it</remarks>
+        /// <param name="propertyName">Name of the property to raise the notification for</param>
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChangedDispatcher(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
+        }
+
+        /// <summary>
+        /// Takes, by reference, a field, and its new value. If field != value, will set field = value and raise a PropertyChanged notification
+        /// </summary>
+        /// <typeparam name="T">Type of field being set and notified</typeparam>
+        /// <param name="field">Field to assign</param>
+        /// <param name="value">Value to assign to the field, if it differs</param>
+        /// <param name="propertyName">Name of the property to notify for. Defaults to the calling property</param>
+        /// <returns>True if field != value and a notification was raised; false otherwise</returns>
+        protected virtual bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
+        {
+            if (!EqualityComparer<T>.Default.Equals(field, value))
+            {
+                field = value;
+                OnPropertyChanged(propertyName);
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs b/Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs
new file mode 100644
index 00000000..504617b7
--- /dev/null
+++ b/Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs
@@ -0,0 +1,215 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace Nodify.Shapes.UndoRedo
+{
+    public interface IActionsHistory : INotifyPropertyChanged
+    {
+        int MaxSize { get; set; }
+        bool CanUndo { get; }
+        bool CanRedo { get; }
+        bool IsEnabled { get; set; }
+        IAction? Current { get; }
+
+        void Undo();
+        void Redo();
+
+        void Clear();
+
+        /// <summary>
+        /// All future modifications will be merged together to create a single history item until batch is disposed.
+        /// </summary>
+        IDisposable Batch(string? label = default);
+
+        void Record(IAction action);
+
+        /// <summary>
+        /// All future modifications will be merged together to create a single history item until history is resumed.
+        /// </summary>
+        void Pause(string? label = default);
+
+        /// <summary>Each future modifications will create a new history item.</summary>
+        void Resume();
+    }
+
+    public interface IAction
+    {
+        string? Label { get; }
+
+        void Execute();
+        void Undo();
+    }
+
+    public static class ActionsHistoryExtensions
+    {
+        public static void Record(this IActionsHistory history, Action execute, Action unexecute, string? label = default)
+            => history.Record(new DelegateAction(execute, unexecute, label));
+
+        public static void ExecuteAction(this IActionsHistory history, IAction action)
+        {
+            history.Record(action);
+            action.Execute();
+        }
+    }
+
+    public class ActionsHistory : IActionsHistory
+    {
+        private readonly List<IAction> _history = new List<IAction>();
+        private readonly List<IAction> _batchHistory = new List<IAction>();
+        private int _position = -1;
+        private bool _isApplyingOperation = false;
+        private string? _batchLabel;
+        private int _batchDepth;
+
+        private static readonly PropertyChangedEventArgs _canRedoArgs = new PropertyChangedEventArgs(nameof(CanRedo));
+        private static readonly PropertyChangedEventArgs _canUndoArgs = new PropertyChangedEventArgs(nameof(CanUndo));
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+        public static readonly ActionsHistory Global = new ActionsHistory();
+
+        public bool IsBatching { get; private set; }
+
+        public int MaxSize { get; set; } = 50;
+
+        public bool CanRedo => _history.Count > 0 && _position < _history.Count - 1;
+
+        public bool CanUndo => _position > -1;
+
+        public bool IsEnabled { get; set; } = true;
+
+        public IAction? Current => CanUndo ? _history[_position] : null;
+
+        public IDisposable Batch(string? label = default)
+            => new BatchOperation(label, this);
+
+        public void Record(IAction op)
+        {
+            // Prevent recording the undo or redo operation
+            if (_isApplyingOperation || !IsEnabled)
+            {
+                return;
+            }
+
+            if (IsBatching)
+            {
+                _batchHistory.Add(op);
+            }
+            else
+            {
+                AddToUndoStack(op);
+            }
+        }
+
+        private void AddToUndoStack(IAction op)
+        {
+            if (_position < _history.Count - 1)
+            {
+                _history.RemoveRange(_position + 1, _history.Count - _position - 1);
+            }
+
+            if (_history.Count >= MaxSize)
+            {
+                _history.RemoveAt(0);
+                _position--;
+            }
+
+            _history.Add(op);
+            _position++;
+
+            PropertyChanged?.Invoke(this, _canRedoArgs);
+            PropertyChanged?.Invoke(this, _canUndoArgs);
+        }
+
+        public void Undo()
+        {
+            if (IsBatching)
+            {
+                throw new InvalidOperationException($"{nameof(Undo)} is not allowed during a batch.");
+            }
+
+            if (CanUndo)
+            {
+                var op = _history[_position];
+                _isApplyingOperation = true;
+                op.Undo();
+                _isApplyingOperation = false;
+                _position--;
+            }
+        }
+
+        public void Redo()
+        {
+            if (IsBatching)
+            {
+                throw new InvalidOperationException($"{nameof(Redo)} is not allowed during a batch.");
+            }
+
+            if (CanRedo)
+            {
+                _position++;
+                var op = _history[_position];
+                _isApplyingOperation = true;
+                op.Execute();
+                _isApplyingOperation = false;
+            }
+        }
+
+        public void Clear()
+        {
+            _history.Clear();
+            _batchHistory.Clear();
+        }
+
+        public void Pause(string? label = default)
+        {
+            if (_batchDepth > 0)
+            {
+                return;
+            }
+
+            _batchLabel = label;
+            IsBatching = true;
+        }
+
+        public void Resume()
+        {
+            if (_batchDepth > 0)
+            {
+                return;
+            }
+
+            if (_batchHistory.Count > 0)
+            {
+                AddToUndoStack(new BatchAction(_batchLabel, _batchHistory));
+                _batchHistory.Clear();
+            }
+
+            _batchLabel = null;
+            IsBatching = false;
+        }
+
+        private class BatchOperation : IDisposable
+        {
+            private readonly ActionsHistory _history;
+            private bool _disposed;
+
+            public BatchOperation(string? label, ActionsHistory history)
+            {
+                _history = history;
+                _history.Pause(label);
+                _history._batchDepth++;
+            }
+
+            public void Dispose()
+            {
+                if (!_disposed)
+                {
+                    _disposed = true;
+                    _history._batchDepth--;
+                    _history.Resume();
+                }
+            }
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/UndoRedo/BatchAction.cs b/Examples/Nodify.Shapes/UndoRedo/BatchAction.cs
new file mode 100644
index 00000000..8f3b4f96
--- /dev/null
+++ b/Examples/Nodify.Shapes/UndoRedo/BatchAction.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Nodify.Shapes.UndoRedo
+{
+    public class BatchAction : IAction
+    {
+        public BatchAction(string? label, IEnumerable<IAction> history)
+        {
+            History = history.ToList();
+            Label = label;
+        }
+
+        public IReadOnlyList<IAction> History { get; }
+
+        public string? Label { get; }
+
+        public void Execute()
+        {
+            for (int i = 0; i < History.Count; i++)
+            {
+                History[i].Execute();
+            }
+        }
+
+        public void Undo()
+        {
+            for (int i = History.Count - 1; i >= 0; i--)
+            {
+                History[i].Undo();
+            }
+        }
+
+        public override string? ToString()
+            => Label;
+    }
+}
diff --git a/Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs b/Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs
new file mode 100644
index 00000000..2bc32196
--- /dev/null
+++ b/Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace Nodify.Shapes.UndoRedo
+{
+    public class DelegateAction : IAction
+    {
+        private readonly Action _execute;
+        private readonly Action _undo;
+
+        public string? Label { get; }
+
+        public DelegateAction(Action apply, Action unapply, string? label)
+        {
+            _execute = apply;
+            _undo = unapply;
+            Label = label;
+        }
+
+        public void Execute() => _execute();
+        public void Undo() => _undo();
+
+        public override string? ToString()
+            => Label;
+    }
+}
diff --git a/Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs b/Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs
new file mode 100644
index 00000000..cb5b788f
--- /dev/null
+++ b/Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Nodify.Shapes.UndoRedo
+{
+    public interface IPropertyAccessor
+    {
+        object? GetValue(object instance);
+        void SetValue(object instance, object? value);
+        bool CanRead { get; }
+        bool CanWrite { get; }
+    }
+
+    public sealed class PropertyAccessor<TInstanceType, TPropertyType> : IPropertyAccessor where TInstanceType : class
+    {
+        private readonly Func<TInstanceType, TPropertyType> _getter;
+        private readonly Action<TInstanceType, TPropertyType> _setter;
+
+        public bool CanRead { get; }
+        public bool CanWrite { get; }
+
+        public PropertyAccessor(Func<TInstanceType, TPropertyType> getter, Action<TInstanceType, TPropertyType> setter)
+        {
+            _getter = getter;
+            _setter = setter;
+
+            CanRead = getter != null;
+            CanWrite = setter != null;
+        }
+
+        public object? GetValue(object instance)
+            => _getter((TInstanceType)instance);
+
+        public void SetValue(object instance, object? value)
+            => _setter((TInstanceType)instance, (TPropertyType)value!);
+    }
+
+    public class PropertyCache
+    {
+        private static readonly Dictionary<string, IPropertyAccessor> _properties = new Dictionary<string, IPropertyAccessor>();
+
+        public static IPropertyAccessor Get(Type type, string name)
+        {
+            string propKey = $"{type.FullName}.{name}";
+            if (!_properties.TryGetValue(propKey, out var result))
+            {
+                var prop = type.GetProperty(name);
+                result = Create(type, prop!);
+
+                _properties.Add(propKey, result);
+            }
+
+            return result;
+        }
+
+        public static IPropertyAccessor Get<T>(string name)
+            => Get(typeof(T), name);
+
+        private static IPropertyAccessor Create(Type type, PropertyInfo property)
+        {
+            Delegate? getterInvocation = default;
+            Delegate? setterInvocation = default;
+
+            if (property.CanRead)
+            {
+                MethodInfo getMethod = property.GetGetMethod(true)!;
+                Type getterType = typeof(Func<,>).MakeGenericType(type, property.PropertyType);
+                getterInvocation = Delegate.CreateDelegate(getterType, getMethod);
+            }
+
+            if (property.CanWrite)
+            {
+                MethodInfo setMethod = property.GetSetMethod(true)!;
+                Type setterType = typeof(Action<,>).MakeGenericType(type, property.PropertyType);
+                setterInvocation = Delegate.CreateDelegate(setterType, setMethod);
+            }
+
+            Type adapterType = typeof(PropertyAccessor<,>).MakeGenericType(type, property.PropertyType);
+
+            return (IPropertyAccessor)Activator.CreateInstance(adapterType, getterInvocation, setterInvocation)!;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/UndoRedo/Undoable.cs b/Examples/Nodify.Shapes/UndoRedo/Undoable.cs
new file mode 100644
index 00000000..939c2bd9
--- /dev/null
+++ b/Examples/Nodify.Shapes/UndoRedo/Undoable.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Runtime.CompilerServices;
+using Expression = System.Linq.Expressions.Expression;
+
+namespace Nodify.Shapes.UndoRedo
+{
+    [Flags]
+    public enum PropertyFlags
+    {
+        Disable = 0,
+        Enable = 1
+    }
+
+    public abstract class Undoable : PropertyChangedBase
+    {
+        private readonly HashSet<string> _trackedProperties = new HashSet<string>();
+
+        public IActionsHistory History { get; }
+
+        private void RecordHistory<TPropType>(string propName, TPropType previous, TPropType current)
+        {
+            if (_trackedProperties.Contains(propName))
+            {
+                var prop = PropertyCache.Get(GetType(), propName);
+                History.Record(() => prop.SetValue(this, current), () => prop.SetValue(this, previous), propName);
+            }
+        }
+
+        protected void RecordProperty(string propName, PropertyFlags flags = PropertyFlags.Enable)
+        {
+            if (flags == PropertyFlags.Disable)
+            {
+                _trackedProperties.Remove(propName);
+            }
+            else if (flags.HasFlag(PropertyFlags.Enable))
+            {
+                _trackedProperties.Add(propName);
+            }
+        }
+
+        protected void RecordProperty<TType>(Expression<Func<TType, object?>> selector, PropertyFlags flags = PropertyFlags.Enable)
+        {
+            string name = GetPropertyName(selector);
+            RecordProperty(name, flags);
+        }
+
+        private static string GetPropertyName(Expression memberAccess)
+            => memberAccess switch
+            {
+                LambdaExpression lambda => GetPropertyName(lambda.Body),
+                MemberExpression mbr => mbr.Member.Name,
+                UnaryExpression unary => GetPropertyName(unary.Operand),
+                _ => throw new Exception($"Member name could not be extracted from {memberAccess}.")
+            };
+
+        protected override bool SetProperty<TPropType>(ref TPropType field, TPropType value, [CallerMemberName] string propertyName = "")
+        {
+            TPropType prev = field;
+            if (base.SetProperty(ref field, value, propertyName))
+            {
+                RecordHistory(propertyName, prev, value);
+                return true;
+            }
+
+            return false;
+        }
+
+        public Undoable()
+        {
+            History = ActionsHistory.Global;
+        }
+
+        public Undoable(IActionsHistory history)
+        {
+            History = history;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shared/Controls/Swatches.xaml.cs b/Examples/Nodify.Shared/Controls/Swatches.xaml.cs
new file mode 100644
index 00000000..d5dea604
--- /dev/null
+++ b/Examples/Nodify.Shared/Controls/Swatches.xaml.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using Nodify.Shared;
+
+namespace Nodify
+{
+    public partial class Swatches : Control
+    {
+        public static readonly DependencyProperty SelectedColorProperty
+            = DependencyProperty.Register(nameof(SelectedColor), typeof(Color), typeof(Swatches), new FrameworkPropertyMetadata(default(Color), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+
+        public static readonly DependencyProperty ColorsProperty
+            = DependencyProperty.Register(nameof(Colors), typeof(IEnumerable<Color>), typeof(Swatches), new PropertyMetadata(Array.Empty<Color>()));
+
+        public Color SelectedColor
+        {
+            get => (Color)GetValue(SelectedColorProperty);
+            set => SetValue(SelectedColorProperty, value);
+        }
+
+        public IEnumerable<Color> Colors
+        {
+            get => (IEnumerable<Color>)GetValue(ColorsProperty);
+            set => SetValue(ColorsProperty, value);
+        }
+
+        static Swatches()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Swatches), new FrameworkPropertyMetadata(typeof(Swatches)));
+            FocusableProperty.OverrideMetadata(typeof(Swatches), new FrameworkPropertyMetadata(BoxValue.True));
+        }
+
+        protected override void OnMouseDown(MouseButtonEventArgs e)
+        {
+            var color = e.OriginalSource is FrameworkElement fe && fe.DataContext is Color c ? c : (Color?)null;
+            if (color.HasValue)
+            {
+                SelectedColor = color.Value;
+            }
+
+            e.Handled = true;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shared/Converters/ColorToSolidColorBrushConverter.cs b/Examples/Nodify.Shared/Converters/ColorToSolidColorBrushConverter.cs
new file mode 100644
index 00000000..7316df3c
--- /dev/null
+++ b/Examples/Nodify.Shared/Converters/ColorToSolidColorBrushConverter.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Nodify
+{
+    public class ColorToSolidColorBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is Color color)
+            {
+                var brush = new SolidColorBrush(color);
+
+                if(double.TryParse(parameter?.ToString(), out double opacity))
+                    brush.Opacity = opacity;
+
+                return brush;
+            }
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is SolidColorBrush brush)
+                return brush.Color;
+
+            return value;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs b/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs
new file mode 100644
index 00000000..1065734a
--- /dev/null
+++ b/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Data;
+
+namespace Nodify
+{
+    public class MultiValueEqualityConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (values == null)
+            {
+                return false;
+            }
+
+            return AllElementsEqual(values) || AllElementsNull(values);
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        private static bool AllElementsEqual(IEnumerable<object> values)
+        {
+            object? firstElement = values.FirstOrDefault();
+            return values.All(o => o?.Equals(firstElement) == true);
+        }
+
+        private static bool AllElementsNull(IEnumerable<object> values)
+        {
+            return values.All(o => o == null);
+        }
+    }
+
+}
diff --git a/Examples/Nodify.Shared/Themes/Generic.xaml b/Examples/Nodify.Shared/Themes/Generic.xaml
index eb63d8a2..94bd154e 100644
--- a/Examples/Nodify.Shared/Themes/Generic.xaml
+++ b/Examples/Nodify.Shared/Themes/Generic.xaml
@@ -25,6 +25,8 @@
                 Value="Center" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Stretch" />
+        <Setter Property="Cursor"
+                Value="IBeam" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:EditableTextBlock}">
@@ -84,19 +86,19 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:TabControlEx}">
-                    <Grid KeyboardNavigation.TabNavigation="Local" 
+                    <Grid KeyboardNavigation.TabNavigation="Local"
                           SnapsToDevicePixels="true"
                           ClipToBounds="true">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                        <Grid Panel.ZIndex ="1"
+                        <Grid Panel.ZIndex="1"
                               Margin="2,2,2,0"
                               Background="{TemplateBinding Background}"
                               KeyboardNavigation.TabIndex="1">
-                            <ScrollViewer x:Name="PART_ScrollViewer" 
-                                          HorizontalScrollBarVisibility="Auto" 
+                            <ScrollViewer x:Name="PART_ScrollViewer"
+                                          HorizontalScrollBarVisibility="Auto"
                                           VerticalScrollBarVisibility="Auto">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
@@ -104,7 +106,7 @@
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
                                     <StackPanel Orientation="Horizontal"
-                                                IsItemsHost="True"/>
+                                                IsItemsHost="True" />
                                     <Button Style="{StaticResource IconButton}"
                                             Command="{TemplateBinding AddTabCommand}"
                                             Height="34"
@@ -112,34 +114,34 @@
                                             BorderBrush="{DynamicResource HighlightedBackgroundBrush}"
                                             Grid.Column="1"
                                             ToolTip="Add new tab">
-                                        <Path Width="25" 
+                                        <Path Width="25"
                                               Height="15"
                                               Data="{StaticResource AddGeometry}"
-                                              Fill="{TemplateBinding Foreground}" 
-                                              Stretch="Uniform"/>
+                                              Fill="{TemplateBinding Foreground}"
+                                              Stretch="Uniform" />
                                     </Button>
                                 </Grid>
                             </ScrollViewer>
                         </Grid>
                         <Border x:Name="ContentPanel"
-                                            Background="{TemplateBinding Background}"
-                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                            KeyboardNavigation.TabNavigation="Local"
-                                            KeyboardNavigation.DirectionalNavigation="Contained"
-                                            KeyboardNavigation.TabIndex="2"
-                                            Grid.Row="1">
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                KeyboardNavigation.TabNavigation="Local"
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                KeyboardNavigation.TabIndex="2"
+                                Grid.Row="1">
                             <ContentPresenter x:Name="PART_SelectedContentHost"
                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                               Margin="{TemplateBinding Padding}"
-                                              ContentSource="SelectedContent"/>
+                                              ContentSource="SelectedContent" />
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" 
+                        <Trigger Property="IsEnabled"
                                  Value="false">
-                            <Setter Property="Opacity" 
-                                    Value=".5"/>
+                            <Setter Property="Opacity"
+                                    Value=".5" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -148,73 +150,75 @@
     </Style>
 
     <Style TargetType="{x:Type local:TabItemEx}">
-        <Setter Property="Background" 
-                Value="{DynamicResource BackgroundBrush}"/>
+        <Setter Property="Background"
+                Value="{DynamicResource BackgroundBrush}" />
         <Setter Property="Foreground"
-                Value="{DynamicResource ForegroundBrush}"/>
+                Value="{DynamicResource ForegroundBrush}" />
         <Setter Property="RenderTransform">
             <Setter.Value>
-                <ScaleTransform ScaleY="0"/>
+                <ScaleTransform ScaleY="0" />
             </Setter.Value>
         </Setter>
-        <Setter Property="RenderTransformOrigin" 
-                Value="1 1"/>
-        <Setter Property="VerticalAlignment" 
-                Value="Bottom"/>
-        <Setter Property="VerticalContentAlignment" 
-                Value="Stretch"/>
-        <Setter Property="HorizontalContentAlignment" 
-                Value="Stretch"/>
-        <Setter Property="Padding" 
-                Value="7"/>
+        <Setter Property="RenderTransformOrigin"
+                Value="1 1" />
+        <Setter Property="VerticalAlignment"
+                Value="Bottom" />
+        <Setter Property="VerticalContentAlignment"
+                Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment"
+                Value="Stretch" />
+        <Setter Property="Padding"
+                Value="7" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:TabItemEx}">
                     <Border x:Name="mBorder"
-                            BorderThickness="1" 
+                            BorderThickness="1"
                             CornerRadius="5 5 0 0"
-                            Background="{TemplateBinding Background}"  
+                            Background="{TemplateBinding Background}"
                             Padding="{TemplateBinding Padding}">
                         <Grid>
                             <StackPanel Orientation="Horizontal">
                                 <local:EditableTextBlock Text="{TemplateBinding Header}"
-                                                         Foreground="{TemplateBinding Foreground}"/>
-                                <Button x:Name="mCloseBtn" 
-                                        Command="{TemplateBinding CloseTabCommand}" 
-                                        CommandParameter="{TemplateBinding CloseTabCommandParameter}" 
+                                                         Foreground="{TemplateBinding Foreground}" />
+                                <Button x:Name="mCloseBtn"
+                                        Command="{TemplateBinding CloseTabCommand}"
+                                        CommandParameter="{TemplateBinding CloseTabCommandParameter}"
                                         Visibility="Hidden"
-                                        Margin="5 0 0 0" 
+                                        Margin="5 0 0 0"
                                         Background="{DynamicResource HighlightedBackgroundBrush}"
                                         BorderBrush="{DynamicResource BackgroundBrush}"
                                         Style="{StaticResource IconButton}"
                                         ToolTip="Close Tab">
                                     <Path Width="16"
                                           Height="8"
-                                          Data="{StaticResource CloseGeometry}" 
-                                          Fill="{TemplateBinding Foreground}" 
-                                          Stretch="Uniform"/>
+                                          Data="{StaticResource CloseGeometry}"
+                                          Fill="{TemplateBinding Foreground}"
+                                          Stretch="Uniform" />
                                 </Button>
                             </StackPanel>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Visibility" 
-                                    Value="Visible" 
-                                    TargetName="mCloseBtn"/>
-                            <Setter Property="Background" 
-                                    Value="{DynamicResource HighlightedBackgroundBrush}"/>
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                            <Setter Property="Visibility"
+                                    Value="Visible"
+                                    TargetName="mCloseBtn" />
+                            <Setter Property="Background"
+                                    Value="{DynamicResource HighlightedBackgroundBrush}" />
                         </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="TextElement.FontWeight" 
-                                    Value="Bold"/>
-                            <Setter Property="Background" 
-                                    Value="{DynamicResource HighlightedBackgroundBrush}"/>
+                        <Trigger Property="IsSelected"
+                                 Value="True">
+                            <Setter Property="TextElement.FontWeight"
+                                    Value="Bold" />
+                            <Setter Property="Background"
+                                    Value="{DynamicResource HighlightedBackgroundBrush}" />
                             <Setter Property="Padding"
-                                    Value="8"/>
-                            <Setter Property="Visibility" 
-                                    Value="Visible" 
-                                    TargetName="mCloseBtn"/>
+                                    Value="8" />
+                            <Setter Property="Visibility"
+                                    Value="Visible"
+                                    TargetName="mCloseBtn" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -226,12 +230,12 @@
                     <Storyboard>
                         <DoubleAnimation Duration="0:0:.5"
                                          From="0"
-                                         To="1" 
+                                         To="1"
                                          Storyboard.TargetProperty="(RenderTransform).(ScaleTransform.ScaleY)">
                             <DoubleAnimation.EasingFunction>
                                 <ElasticEase Oscillations="1"
                                              Springiness="3"
-                                             EasingMode="EaseOut"/>
+                                             EasingMode="EaseOut" />
                             </DoubleAnimation.EasingFunction>
                         </DoubleAnimation>
                     </Storyboard>
@@ -239,4 +243,62 @@
             </EventTrigger>
         </Style.Triggers>
     </Style>
+
+    <Style TargetType="{x:Type local:Swatches}">
+        <Style.Resources>
+            <local:MultiValueEqualityConverter x:Key="MultiValueEqualityConverter" />
+            <local:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+        </Style.Resources>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:Swatches">
+                    <Border Background="#1e293b"
+                            CornerRadius="8"
+                            Padding="6"
+                            VerticalAlignment="Top">
+                        <ItemsControl ItemsSource="{TemplateBinding Colors}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <WrapPanel Orientation="Horizontal" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Border CornerRadius="50"
+                                            Padding="1"
+                                            Margin="3">
+                                        <Border.Style>
+                                            <Style TargetType="{x:Type Border}">
+                                                <Setter Property="Background"
+                                                        Value="Transparent" />
+                                                <Style.Triggers>
+                                                    <DataTrigger Value="True">
+                                                        <DataTrigger.Binding>
+                                                            <MultiBinding Converter="{StaticResource MultiValueEqualityConverter}">
+                                                                <Binding RelativeSource="{RelativeSource AncestorType=local:Swatches}"
+                                                                         Path="SelectedColor"
+                                                                         Mode="OneWay" />
+                                                                <Binding Mode="OneWay" />
+                                                            </MultiBinding>
+                                                        </DataTrigger.Binding>
+                                                        <Setter Property="Background"
+                                                                Value="White" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Border.Style>
+                                        <Ellipse Width="24"
+                                                 Height="24"
+                                                 Stroke="#1e293b"
+                                                 Fill="{Binding ., Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                                                 Cursor="Hand"/>
+                                    </Border>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Nodify.sln b/Nodify.sln
index 3947b565..457d495d 100644
--- a/Nodify.sln
+++ b/Nodify.sln
@@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CHANGELOG.md = CHANGELOG.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodify.Shapes", "Examples\Nodify.Shapes\Nodify.Shapes.csproj", "{BAD92DB9-BDCA-4BB7-8F24-B7D3FE470476}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,6 +48,10 @@ Global
 		{7ADD1DAF-B589-4742-8E72-872D2842E73D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7ADD1DAF-B589-4742-8E72-872D2842E73D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7ADD1DAF-B589-4742-8E72-872D2842E73D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAD92DB9-BDCA-4BB7-8F24-B7D3FE470476}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAD92DB9-BDCA-4BB7-8F24-B7D3FE470476}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAD92DB9-BDCA-4BB7-8F24-B7D3FE470476}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAD92DB9-BDCA-4BB7-8F24-B7D3FE470476}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -55,6 +61,7 @@ Global
 		{48569CA8-81C1-4B47-963B-0FC9358C5F01} = {E467F53A-3CCA-4EDB-BD33-FC89CA3C526B}
 		{499C8539-9973-4102-B976-57DB3F3C7DF3} = {E467F53A-3CCA-4EDB-BD33-FC89CA3C526B}
 		{7ADD1DAF-B589-4742-8E72-872D2842E73D} = {E467F53A-3CCA-4EDB-BD33-FC89CA3C526B}
+		{BAD92DB9-BDCA-4BB7-8F24-B7D3FE470476} = {E467F53A-3CCA-4EDB-BD33-FC89CA3C526B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B9E59DB6-FB93-48F3-A8E0-1E549009E043}

From 317cd5316a3cf4dbac670aff0af18636e4faee63 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Fri, 21 Jun 2024 21:08:52 +0300
Subject: [PATCH 02/18] Restrict selection deletion when canvas is locked

---
 Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index f26d382f..404570e2 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -47,7 +47,7 @@ public CanvasViewModel()
             SelectShapesStartedCommand = new DelegateCommand(SelectShapesStartedHandler);
             SelectShapesCompletedCommand = new DelegateCommand(SelectShapesCompletedHandler);
 
-            DeleteSelectionCommand = new DelegateCommand(DeleteSelection);
+            DeleteSelectionCommand = new DelegateCommand(DeleteSelection, () => !CanvasToolbar.Locked);
 
             CreateConnectionCommand = new DelegateCommand<(object Source, object Target)>(
                 ((object Source, object Target) pendingConnection) => AddConnection((ConnectorViewModel)pendingConnection.Source, (ConnectorViewModel)pendingConnection.Target),

From 3e40b5795d54bddb80536c470bb9f2bdc648f165 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Fri, 21 Jun 2024 23:03:17 +0300
Subject: [PATCH 03/18] Bind canvas selected tool

---
 .../Canvas/CanvasToolbarViewModel.cs          | 21 ++++-
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml | 90 +++++++++++++------
 2 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
index d3cb7dc1..7e482a8d 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
@@ -1,9 +1,21 @@
-using System.Windows.Input;
+using System;
+using System.Linq;
+using System.Windows.Input;
 
 namespace Nodify.Shapes.Canvas
 {
+    public enum CanvasTool
+    {
+        None,
+        Ellipse,
+        Rectangle,
+        Triangle
+    }
+
     public class CanvasToolbarViewModel : PropertyChangedBase
     {
+        public static readonly CanvasTool[] AvailableTools = Enum.GetValues(typeof(CanvasTool)).Cast<CanvasTool>().ToArray();
+
         private static readonly EditorGestures EditorGestures;
 
         private bool _locked;
@@ -22,6 +34,13 @@ public bool Locked
 
         public ICommand ToggleLockCommand { get; set; }
 
+        private CanvasTool _selectedTool = CanvasTool.None;
+        public CanvasTool SelectedTool
+        {
+            get => _selectedTool;
+            set => SetProperty(ref _selectedTool, value);
+        }
+
         public CanvasViewModel Canvas { get; }
 
         static CanvasToolbarViewModel()
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index e36c716c..a3500769 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -324,47 +324,85 @@
                 </StackPanel.Resources>
 
                 <ListBox BorderThickness="0"
-                         Background="Transparent">
+                         Background="Transparent"
+                         ItemsSource="{x:Static local:CanvasToolbarViewModel.AvailableTools}"
+                         SelectedValue="{Binding CanvasToolbar.SelectedTool}">
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
                             <Setter Property="Margin"
                                     Value="2" />
+                            <Setter Property="Padding"
+                                    Value="0" />
                             <Setter Property="Width"
                                     Value="32" />
                             <Setter Property="Height"
                                     Value="32" />
                         </Style>
                     </ListBox.ItemContainerStyle>
+
+                    <ListBox.Resources>
+                        <DataTemplate x:Key="Cursor">
+                            <Border CornerRadius="3"
+                                    Padding="5">
+                                <ContentPresenter Content="{StaticResource CursorIcon}" />
+                            </Border>
+                        </DataTemplate>
+                        <DataTemplate x:Key="Circle">
+                            <Border CornerRadius="3"
+                                    Padding="5">
+                                <ContentPresenter Content="{StaticResource CircleIcon}" />
+                            </Border>
+                        </DataTemplate>
+                        <DataTemplate x:Key="Square">
+                            <Border CornerRadius="3"
+                                    Padding="5">
+                                <ContentPresenter Content="{StaticResource SquareIcon}" />
+                            </Border>
+                        </DataTemplate>
+                        <DataTemplate x:Key="Triangle">
+                            <Border CornerRadius="3"
+                                    Padding="5">
+                                <ContentPresenter Content="{StaticResource TriangleIcon}" />
+                            </Border>
+                        </DataTemplate>
+                    </ListBox.Resources>
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <ContentControl Content="{Binding}">
+                                <ContentControl.Style>
+                                    <Style TargetType="ContentControl">
+                                        <Setter Property="ContentTemplate"
+                                                Value="{StaticResource Cursor}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding}"
+                                                         Value="{x:Static local:CanvasTool.Ellipse}">
+                                                <Setter Property="ContentTemplate"
+                                                        Value="{StaticResource Circle}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding}"
+                                                         Value="{x:Static local:CanvasTool.Rectangle}">
+                                                <Setter Property="ContentTemplate"
+                                                        Value="{StaticResource Square}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding}"
+                                                         Value="{x:Static local:CanvasTool.Triangle}">
+                                                <Setter Property="ContentTemplate"
+                                                        Value="{StaticResource Triangle}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ContentControl.Style>
+                            </ContentControl>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
                             <StackPanel Orientation="Horizontal"
                                         IsItemsHost="True" />
                         </ItemsPanelTemplate>
                     </ListBox.ItemsPanel>
-                    <ListBoxItem Padding="0">
-                        <Border CornerRadius="3"
-                                Padding="5">
-                            <ContentPresenter Content="{StaticResource CursorIcon}" />
-                        </Border>
-                    </ListBoxItem>
-                    <ListBoxItem Padding="0">
-                        <Border CornerRadius="3"
-                                Padding="5">
-                            <ContentPresenter Content="{StaticResource CircleIcon}" />
-                        </Border>
-                    </ListBoxItem>
-                    <ListBoxItem Padding="0">
-                        <Border CornerRadius="3"
-                                Padding="5">
-                            <ContentPresenter Content="{StaticResource SquareIcon}" />
-                        </Border>
-                    </ListBoxItem>
-                    <ListBoxItem Padding="0">
-                        <Border CornerRadius="3"
-                                Padding="5">
-                            <ContentPresenter Content="{StaticResource TriangleIcon}" />
-                        </Border>
-                    </ListBoxItem>
                 </ListBox>
 
                 <Button Command="{Binding UndoCommand}"
@@ -465,7 +503,7 @@
                                     ToolTip="{Binding Name}"
                                     Content="{Binding Name[0]}"
                                     Foreground="White"
-                                    Margin="-6 -2"/>
+                                    Margin="-6 -2" />
                         </Border>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>

From 2435a60cc729154023ebd8e2e909e77c9e034abb Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 16:52:42 +0300
Subject: [PATCH 04/18] Moved UndoRedo implementation to Nodify.Shared

---
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml         |  2 ++
 Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs      |  5 +++--
 .../Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs     |  2 +-
 .../Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs |  2 +-
 .../Canvas/UndoRedo/SelectShapesAction.cs             |  2 +-
 Examples/Nodify.Shapes/MainWindow.xaml.cs             | 11 +----------
 .../PropertyChangedBase.cs                            |  2 +-
 .../UndoRedo/ActionsHistory.cs                        |  2 +-
 .../UndoRedo/BatchAction.cs                           |  2 +-
 .../UndoRedo/DelegateAction.cs                        |  2 +-
 .../UndoRedo/PropertyCache.cs                         |  2 +-
 .../UndoRedo/Undoable.cs                              |  2 +-
 12 files changed, 15 insertions(+), 21 deletions(-)
 rename Examples/{Nodify.Shapes => Nodify.Shared}/PropertyChangedBase.cs (98%)
 rename Examples/{Nodify.Shapes => Nodify.Shared}/UndoRedo/ActionsHistory.cs (99%)
 rename Examples/{Nodify.Shapes => Nodify.Shared}/UndoRedo/BatchAction.cs (95%)
 rename Examples/{Nodify.Shapes => Nodify.Shared}/UndoRedo/DelegateAction.cs (94%)
 rename Examples/{Nodify.Shapes => Nodify.Shared}/UndoRedo/PropertyCache.cs (98%)
 rename Examples/{Nodify.Shapes => Nodify.Shared}/UndoRedo/Undoable.cs (98%)

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index a3500769..e381f1d0 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -408,11 +408,13 @@
                 <Button Command="{Binding UndoCommand}"
                         CommandTarget="{Binding ElementName=Editor}"
                         Content="{StaticResource ArrowBackIcon}"
+                        ToolTip="CTRL+Z"
                         Padding="1" />
 
                 <Button Command="{Binding RedoCommand}"
                         CommandTarget="{Binding ElementName=Editor}"
                         Content="{StaticResource ArrowForwardIcon}"
+                        ToolTip="CTRL+SHIFT+z"
                         Padding="1" />
 
             </StackPanel>
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index 404570e2..643a94a0 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -1,5 +1,5 @@
 using Nodify.Shapes.Canvas.UndoRedo;
-using Nodify.Shapes.UndoRedo;
+using Nodify.UndoRedo;
 using System;
 using System.Linq;
 using System.Windows;
@@ -108,7 +108,8 @@ private void FillCanvasWithShapes()
             // Disable undo redo to avoid recording object construction
             UndoRedo.IsEnabled = false;
 
-            for (int i = 0; i < 5; i++)
+            var cursorCount = _rand.Next(3, 6);
+            for (int i = 0; i < cursorCount; i++)
             {
                 var color = ShapeViewModel.Colors[_rand.Next(0, ShapeViewModel.Colors.Count)];
                 Cursors.Add(new UserCursorViewModel
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
index ff558118..875b9f81 100644
--- a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
@@ -1,4 +1,4 @@
-using Nodify.Shapes.UndoRedo;
+using Nodify.UndoRedo;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Media;
diff --git a/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs b/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs
index 498b944b..832696b4 100644
--- a/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs
+++ b/Examples/Nodify.Shapes/Canvas/UndoRedo/MoveShapesAction.cs
@@ -1,4 +1,4 @@
-using Nodify.Shapes.UndoRedo;
+using Nodify.UndoRedo;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
diff --git a/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs b/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs
index 43f6589f..150d337e 100644
--- a/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs
+++ b/Examples/Nodify.Shapes/Canvas/UndoRedo/SelectShapesAction.cs
@@ -1,4 +1,4 @@
-using Nodify.Shapes.UndoRedo;
+using Nodify.UndoRedo;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Examples/Nodify.Shapes/MainWindow.xaml.cs b/Examples/Nodify.Shapes/MainWindow.xaml.cs
index 584f8534..43014701 100644
--- a/Examples/Nodify.Shapes/MainWindow.xaml.cs
+++ b/Examples/Nodify.Shapes/MainWindow.xaml.cs
@@ -1,13 +1,4 @@
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace Nodify.Shapes
 {
diff --git a/Examples/Nodify.Shapes/PropertyChangedBase.cs b/Examples/Nodify.Shared/PropertyChangedBase.cs
similarity index 98%
rename from Examples/Nodify.Shapes/PropertyChangedBase.cs
rename to Examples/Nodify.Shared/PropertyChangedBase.cs
index 345ae77e..e1d852f6 100644
--- a/Examples/Nodify.Shapes/PropertyChangedBase.cs
+++ b/Examples/Nodify.Shared/PropertyChangedBase.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows;
 
-namespace Nodify.Shapes
+namespace Nodify
 {
     /// <summary>
     /// Base class for things which can raise PropertyChanged events
diff --git a/Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs b/Examples/Nodify.Shared/UndoRedo/ActionsHistory.cs
similarity index 99%
rename from Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs
rename to Examples/Nodify.Shared/UndoRedo/ActionsHistory.cs
index 504617b7..f199a94e 100644
--- a/Examples/Nodify.Shapes/UndoRedo/ActionsHistory.cs
+++ b/Examples/Nodify.Shared/UndoRedo/ActionsHistory.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace Nodify.Shapes.UndoRedo
+namespace Nodify.UndoRedo
 {
     public interface IActionsHistory : INotifyPropertyChanged
     {
diff --git a/Examples/Nodify.Shapes/UndoRedo/BatchAction.cs b/Examples/Nodify.Shared/UndoRedo/BatchAction.cs
similarity index 95%
rename from Examples/Nodify.Shapes/UndoRedo/BatchAction.cs
rename to Examples/Nodify.Shared/UndoRedo/BatchAction.cs
index 8f3b4f96..921e9844 100644
--- a/Examples/Nodify.Shapes/UndoRedo/BatchAction.cs
+++ b/Examples/Nodify.Shared/UndoRedo/BatchAction.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Nodify.Shapes.UndoRedo
+namespace Nodify.UndoRedo
 {
     public class BatchAction : IAction
     {
diff --git a/Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs b/Examples/Nodify.Shared/UndoRedo/DelegateAction.cs
similarity index 94%
rename from Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs
rename to Examples/Nodify.Shared/UndoRedo/DelegateAction.cs
index 2bc32196..22d47ba5 100644
--- a/Examples/Nodify.Shapes/UndoRedo/DelegateAction.cs
+++ b/Examples/Nodify.Shared/UndoRedo/DelegateAction.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Nodify.Shapes.UndoRedo
+namespace Nodify.UndoRedo
 {
     public class DelegateAction : IAction
     {
diff --git a/Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs b/Examples/Nodify.Shared/UndoRedo/PropertyCache.cs
similarity index 98%
rename from Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs
rename to Examples/Nodify.Shared/UndoRedo/PropertyCache.cs
index cb5b788f..4cdad3ab 100644
--- a/Examples/Nodify.Shapes/UndoRedo/PropertyCache.cs
+++ b/Examples/Nodify.Shared/UndoRedo/PropertyCache.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Nodify.Shapes.UndoRedo
+namespace Nodify.UndoRedo
 {
     public interface IPropertyAccessor
     {
diff --git a/Examples/Nodify.Shapes/UndoRedo/Undoable.cs b/Examples/Nodify.Shared/UndoRedo/Undoable.cs
similarity index 98%
rename from Examples/Nodify.Shapes/UndoRedo/Undoable.cs
rename to Examples/Nodify.Shared/UndoRedo/Undoable.cs
index 939c2bd9..fb5c790c 100644
--- a/Examples/Nodify.Shapes/UndoRedo/Undoable.cs
+++ b/Examples/Nodify.Shared/UndoRedo/Undoable.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using Expression = System.Linq.Expressions.Expression;
 
-namespace Nodify.Shapes.UndoRedo
+namespace Nodify.UndoRedo
 {
     [Flags]
     public enum PropertyFlags

From f7a7ac40a1c26e6a5e54f962b0baa0b0f4d083fb Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 17:11:26 +0300
Subject: [PATCH 05/18] Remove PropertyChangedBase

---
 .../Canvas/CanvasToolbarViewModel.cs          |  2 +-
 .../Nodify.Shapes/Canvas/CanvasViewModel.cs   |  2 +-
 .../Canvas/ConnectorViewModel.cs              |  2 +-
 .../Decorators/ShapeToolbarViewModel.cs       |  2 +-
 .../Canvas/Decorators/UserCursorViewModel.cs  |  2 +-
 Examples/Nodify.Shared/ObservableObject.cs    | 49 ++++++++++-------
 Examples/Nodify.Shared/PropertyChangedBase.cs | 54 -------------------
 Examples/Nodify.Shared/UndoRedo/Undoable.cs   |  2 +-
 8 files changed, 36 insertions(+), 79 deletions(-)
 delete mode 100644 Examples/Nodify.Shared/PropertyChangedBase.cs

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
index 7e482a8d..dfe63238 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
@@ -12,7 +12,7 @@ public enum CanvasTool
         Triangle
     }
 
-    public class CanvasToolbarViewModel : PropertyChangedBase
+    public class CanvasToolbarViewModel : ObservableObject
     {
         public static readonly CanvasTool[] AvailableTools = Enum.GetValues(typeof(CanvasTool)).Cast<CanvasTool>().ToArray();
 
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index 643a94a0..f95b29cc 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -7,7 +7,7 @@
 
 namespace Nodify.Shapes.Canvas
 {
-    public class CanvasViewModel : PropertyChangedBase
+    public class CanvasViewModel : ObservableObject
     {
         public NodifyObservableCollection<ShapeViewModel> Shapes { get; } = new NodifyObservableCollection<ShapeViewModel>();
         public NodifyObservableCollection<ShapeViewModel> SelectedShapes { get; } = new NodifyObservableCollection<ShapeViewModel>();
diff --git a/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs b/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs
index 5b198af1..09a5f957 100644
--- a/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/ConnectorViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Nodify.Shapes.Canvas
 {
-    public class ConnectorViewModel : PropertyChangedBase
+    public class ConnectorViewModel : ObservableObject
     {
         public ConnectorViewModel(ConnectorPosition position)
         {
diff --git a/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs
index ebd81f09..0540bcb9 100644
--- a/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/Decorators/ShapeToolbarViewModel.cs
@@ -3,7 +3,7 @@
 
 namespace Nodify.Shapes.Canvas
 {
-    public class ShapeToolbarViewModel : PropertyChangedBase, ICanvasDecorator
+    public class ShapeToolbarViewModel : ObservableObject, ICanvasDecorator
     {
         private ShapeViewModel? _shape;
         public ShapeViewModel? Shape
diff --git a/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs b/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs
index de90679e..328aa2bb 100644
--- a/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/Decorators/UserCursorViewModel.cs
@@ -3,7 +3,7 @@
 
 namespace Nodify.Shapes.Canvas
 {
-    public class UserCursorViewModel : PropertyChangedBase, ICanvasDecorator
+    public class UserCursorViewModel : ObservableObject, ICanvasDecorator
     {
         private Point _location;
         public Point Location
diff --git a/Examples/Nodify.Shared/ObservableObject.cs b/Examples/Nodify.Shared/ObservableObject.cs
index 3c9abe8e..a625dea5 100644
--- a/Examples/Nodify.Shared/ObservableObject.cs
+++ b/Examples/Nodify.Shared/ObservableObject.cs
@@ -1,40 +1,51 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using System.Windows;
 
 namespace Nodify
 {
     public class ObservableObject : INotifyPropertyChanged
     {
+        /// <summary>
+        /// Gets or sets the dispatcher to use to dispatch PropertyChanged events. Defaults to UI thread.
+        /// </summary>
+        public virtual Action<Action> PropertyChangedDispatcher { get; set; } = Application.Current.Dispatcher.Invoke;
+
+        /// <summary>
+        /// Occurs when a property value changes
+        /// </summary>
         public event PropertyChangedEventHandler? PropertyChanged;
 
-        private bool _isDirty;
-        public bool IsDirty
+        /// <summary>
+        /// Fires the PropertyChanged notification.
+        /// </summary>
+        /// <remarks>Specially named so that Fody.PropertyChanged calls it</remarks>
+        /// <param name="propertyName">Name of the property to raise the notification for</param>
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
         {
-            get => _isDirty;
-            protected set
-            {
-                if (_isDirty != value)
-                {
-                    _isDirty = value;
-                    OnPropertyChanged();
-                }
-            }
+            PropertyChangedDispatcher(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
         }
 
-        public bool SetProperty<T>(ref T reference, T value, [CallerMemberName] in string propertyName = default!)
+        /// <summary>
+        /// Takes, by reference, a field, and its new value. If field != value, will set field = value and raise a PropertyChanged notification
+        /// </summary>
+        /// <typeparam name="T">Type of field being set and notified</typeparam>
+        /// <param name="field">Field to assign</param>
+        /// <param name="value">Value to assign to the field, if it differs</param>
+        /// <param name="propertyName">Name of the property to notify for. Defaults to the calling property</param>
+        /// <returns>True if field != value and a notification was raised; false otherwise</returns>
+        protected virtual bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
         {
-            if (!Equals(reference, value))
+            if (!EqualityComparer<T>.Default.Equals(field, value))
             {
-                reference = value;
-                IsDirty = true;
+                field = value;
                 OnPropertyChanged(propertyName);
                 return true;
             }
 
             return false;
         }
-
-        protected void OnPropertyChanged([CallerMemberName] in string? propertyName = default)
-            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 }
diff --git a/Examples/Nodify.Shared/PropertyChangedBase.cs b/Examples/Nodify.Shared/PropertyChangedBase.cs
deleted file mode 100644
index e1d852f6..00000000
--- a/Examples/Nodify.Shared/PropertyChangedBase.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Windows;
-
-namespace Nodify
-{
-    /// <summary>
-    /// Base class for things which can raise PropertyChanged events
-    /// </summary>
-    public abstract class PropertyChangedBase : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Gets or sets the dispatcher to use to dispatch PropertyChanged events. Defaults to UI thread.
-        /// </summary>
-        public virtual Action<Action> PropertyChangedDispatcher { get; set; } = action => Application.Current.Dispatcher.Invoke(action);
-
-        /// <summary>
-        /// Occurs when a property value changes
-        /// </summary>
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        /// <summary>
-        /// Fires the PropertyChanged notification.
-        /// </summary>
-        /// <remarks>Specially named so that Fody.PropertyChanged calls it</remarks>
-        /// <param name="propertyName">Name of the property to raise the notification for</param>
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
-        {
-            PropertyChangedDispatcher(() => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)));
-        }
-
-        /// <summary>
-        /// Takes, by reference, a field, and its new value. If field != value, will set field = value and raise a PropertyChanged notification
-        /// </summary>
-        /// <typeparam name="T">Type of field being set and notified</typeparam>
-        /// <param name="field">Field to assign</param>
-        /// <param name="value">Value to assign to the field, if it differs</param>
-        /// <param name="propertyName">Name of the property to notify for. Defaults to the calling property</param>
-        /// <returns>True if field != value and a notification was raised; false otherwise</returns>
-        protected virtual bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
-        {
-            if (!EqualityComparer<T>.Default.Equals(field, value))
-            {
-                field = value;
-                OnPropertyChanged(propertyName);
-                return true;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/Examples/Nodify.Shared/UndoRedo/Undoable.cs b/Examples/Nodify.Shared/UndoRedo/Undoable.cs
index fb5c790c..15dda7cd 100644
--- a/Examples/Nodify.Shared/UndoRedo/Undoable.cs
+++ b/Examples/Nodify.Shared/UndoRedo/Undoable.cs
@@ -13,7 +13,7 @@ public enum PropertyFlags
         Enable = 1
     }
 
-    public abstract class Undoable : PropertyChangedBase
+    public abstract class Undoable : ObservableObject
     {
         private readonly HashSet<string> _trackedProperties = new HashSet<string>();
 

From 231790801ab8f00ca24b3c768dafd22a25074f7b Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 17:12:09 +0300
Subject: [PATCH 06/18] Fix nullability issues

---
 Examples/Nodify.Playground/PlaygroundViewModel.cs     | 2 +-
 Examples/Nodify.Shared/DelegateCommand.cs             | 8 ++++----
 Examples/Nodify.Shared/RequeryCommand.cs              | 8 ++++----
 Examples/Nodify.StateMachine/StateMachineViewModel.cs | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Examples/Nodify.Playground/PlaygroundViewModel.cs b/Examples/Nodify.Playground/PlaygroundViewModel.cs
index 24d452f3..da463337 100644
--- a/Examples/Nodify.Playground/PlaygroundViewModel.cs
+++ b/Examples/Nodify.Playground/PlaygroundViewModel.cs
@@ -23,7 +23,7 @@ public PlaygroundViewModel()
             Settings.PropertyChanged += OnSettingsChanged;
         }
 
-        private void OnSettingsChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private void OnSettingsChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(PlaygroundSettings.ShouldConnectNodes))
                 OnPropertyChanged(nameof(ConnectNodesText));
diff --git a/Examples/Nodify.Shared/DelegateCommand.cs b/Examples/Nodify.Shared/DelegateCommand.cs
index 7716d258..e4b43df3 100644
--- a/Examples/Nodify.Shared/DelegateCommand.cs
+++ b/Examples/Nodify.Shared/DelegateCommand.cs
@@ -21,10 +21,10 @@ public DelegateCommand(Action action, Func<bool>? executeCondition = default)
             _condition = executeCondition;
         }
 
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
             => _condition?.Invoke() ?? true;
 
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
             => _action();
 
         public void RaiseCanExecuteChanged()
@@ -44,7 +44,7 @@ public DelegateCommand(Action<T> action, Func<T, bool>? executeCondition = defau
             _condition = executeCondition;
         }
 
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
         {
             if (parameter is T value)
             {
@@ -54,7 +54,7 @@ public bool CanExecute(object parameter)
             return _condition?.Invoke(default!) ?? true;
         }
 
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
         {
             if (parameter is T value)
             {
diff --git a/Examples/Nodify.Shared/RequeryCommand.cs b/Examples/Nodify.Shared/RequeryCommand.cs
index 182132d2..344cec17 100644
--- a/Examples/Nodify.Shared/RequeryCommand.cs
+++ b/Examples/Nodify.Shared/RequeryCommand.cs
@@ -20,10 +20,10 @@ public RequeryCommand(Action action, Func<bool>? executeCondition = default)
             _condition = executeCondition;
         }
 
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
             => _condition?.Invoke() ?? true;
 
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
             => _action();
 
         public void RaiseCanExecuteChanged() { }
@@ -46,7 +46,7 @@ public RequeryCommand(Action<T> action, Func<T, bool>? executeCondition = defaul
             _condition = executeCondition;
         }
 
-        public bool CanExecute(object parameter)
+        public bool CanExecute(object? parameter)
         {
             if (parameter is T value)
             {
@@ -56,7 +56,7 @@ public bool CanExecute(object parameter)
             return _condition?.Invoke(default!) ?? true;
         }
 
-        public void Execute(object parameter)
+        public void Execute(object? parameter)
         {
             if (parameter is T value)
             {
diff --git a/Examples/Nodify.StateMachine/StateMachineViewModel.cs b/Examples/Nodify.StateMachine/StateMachineViewModel.cs
index 3dcb8333..8a54b36b 100644
--- a/Examples/Nodify.StateMachine/StateMachineViewModel.cs
+++ b/Examples/Nodify.StateMachine/StateMachineViewModel.cs
@@ -128,9 +128,9 @@ protected virtual void OnCreateDefaultNodes()
                 IsEditable = false
             });
 
-            var currentDelayKey = Blackboard.Keys.FirstOrDefault(k => k.Name == "Current Delay");
-            var originalDelayKey = Blackboard.Keys.FirstOrDefault(k => k.Name == "Original Delay");
-            var welcomeKey = Blackboard.Keys.FirstOrDefault(k => k.Name == "Welcome");
+            var currentDelayKey = Blackboard.Keys.First(k => k.Name == "Current Delay");
+            var originalDelayKey = Blackboard.Keys.First(k => k.Name == "Original Delay");
+            var welcomeKey = Blackboard.Keys.First(k => k.Name == "Welcome");
 
             States.Add(new StateViewModel
             {

From 42fc15537e9796f7a81a44908bc7f100775cfe79 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 17:15:36 +0300
Subject: [PATCH 07/18] Fix build warnings

---
 Nodify/Helpers/DraggingOptimized.cs | 2 +-
 Nodify/Helpers/SelectionHelper.cs   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Nodify/Helpers/DraggingOptimized.cs b/Nodify/Helpers/DraggingOptimized.cs
index 4493a9a5..b63ebd74 100644
--- a/Nodify/Helpers/DraggingOptimized.cs
+++ b/Nodify/Helpers/DraggingOptimized.cs
@@ -12,7 +12,7 @@ internal class DraggingOptimized : IDraggingStrategy
     {
         private readonly NodifyEditor _editor;
         private Vector _dragAccumulator;
-        private readonly IList<ItemContainer> _selectedContainers;
+        private readonly List<ItemContainer> _selectedContainers;
 
         public DraggingOptimized(NodifyEditor editor)
         {
diff --git a/Nodify/Helpers/SelectionHelper.cs b/Nodify/Helpers/SelectionHelper.cs
index f12f56bb..8efc9bf5 100644
--- a/Nodify/Helpers/SelectionHelper.cs
+++ b/Nodify/Helpers/SelectionHelper.cs
@@ -121,7 +121,7 @@ private void PreviewSelection(Rect area)
                     break;
 
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(SelectionType));
+                    throw new NotImplementedException(nameof(SelectionType));
             }
         }
 
@@ -166,7 +166,7 @@ private void PreviewUnselectArea(Rect area, bool fit = false)
             }
         }
 
-        private void PreviewSelectContainers(IReadOnlyList<ItemContainer> containers)
+        private static void PreviewSelectContainers(IReadOnlyList<ItemContainer> containers)
         {
             for (var i = 0; i < containers.Count; i++)
             {

From 8a83457840e387351df8511109544410c084948c Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 17:35:27 +0300
Subject: [PATCH 08/18] Add triangle shape

---
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml     | 15 ++++++++++++---
 Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs  |  9 +++++++--
 .../Canvas/Shapes/TriangleViewModel.cs            | 13 +++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 Examples/Nodify.Shapes/Canvas/Shapes/TriangleViewModel.cs

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index e381f1d0..49979cb8 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -64,6 +64,15 @@
                                Opacity="0.8" />
                 </DataTemplate>
 
+                <DataTemplate DataType="{x:Type local:TriangleViewModel}">
+                    <Polygon Points="0,100 50,0 100,100"
+                             Stretch="Fill"
+                             Fill="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                             Stroke="{Binding BorderColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
+                             StrokeThickness="2"
+                             Opacity="0.8" />
+                </DataTemplate>
+
                 <DataTemplate DataType="{x:Type local:ShapeToolbarViewModel}">
                     <Canvas Visibility="{Binding Shape, Converter={StaticResource BooleanToVisibilityConverter}}">
                         <shared:Swatches SelectedColor="{Binding Shape.Color}"
@@ -479,9 +488,6 @@
                 Margin="0 0 50 50"
                 Height="38"
                 CornerRadius="3">
-            <Border.Effect>
-                <DropShadowEffect ShadowDepth="1" />
-            </Border.Effect>
 
             <ItemsControl ItemsSource="{Binding Cursors}">
                 <ItemsControl.ItemsPanel>
@@ -498,6 +504,9 @@
                                 Margin="-3"
                                 Background="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}"
                                 Padding="6 2">
+                            <Border.Effect>
+                                <DropShadowEffect ShadowDepth="1" />
+                            </Border.Effect>
                             <Button Command="{x:Static nodify:EditorCommands.BringIntoView}"
                                     CommandParameter="{Binding Location}"
                                     CommandTarget="{Binding ElementName=Editor}"
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index f95b29cc..a6b09c07 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -146,11 +146,16 @@ private void FillCanvasWithShapes()
             };
             Shapes.Add(rectangle2);
 
-            Connections.Add(new ConnectionViewModel(ellipse2.BottomConnector, rectangle2.TopConnector));
+            var triangle = new TriangleViewModel
+            {
+                Location = new Point(800, 200)
+            };
+            Shapes.Add(triangle);
 
+            Connections.Add(new ConnectionViewModel(ellipse2.BottomConnector, rectangle2.TopConnector));
             Connections.Add(new ConnectionViewModel(rectangle.RightConnector, rectangle2.RightConnector));
 
-            SelectedShapes.Add(rectangle);
+            SelectedShapes.Add(triangle);
 
             Decorators.Add(ShapeToolbar);
             Decorators.AddRange(Cursors);
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/TriangleViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/TriangleViewModel.cs
new file mode 100644
index 00000000..021700c0
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/TriangleViewModel.cs
@@ -0,0 +1,13 @@
+using System.Windows.Media;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class TriangleViewModel : ShapeViewModel
+    {
+        public TriangleViewModel()
+        {
+            Color = Color.FromRgb(235, 195, 71);
+            Text = "Triangle";
+        }
+    }
+}

From 6d6a192ab65e36f5fdd661122937c05f4b6b7dad Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 18:10:23 +0300
Subject: [PATCH 09/18] Setup custom gestures for drawing and locked state

---
 .../Canvas/CanvasToolbarViewModel.cs          | 42 +++++++++++++++++--
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml | 23 ++++++++--
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
index dfe63238..12ba1a9f 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
@@ -16,7 +16,7 @@ public class CanvasToolbarViewModel : ObservableObject
     {
         public static readonly CanvasTool[] AvailableTools = Enum.GetValues(typeof(CanvasTool)).Cast<CanvasTool>().ToArray();
 
-        private static readonly EditorGestures EditorGestures;
+        internal static readonly EditorGestures EditorGestures;
 
         private bool _locked;
         public bool Locked
@@ -26,8 +26,14 @@ public bool Locked
             {
                 if (SetProperty(ref _locked, value))
                 {
-                    var newMappings = _locked ? UnboundGestureMappings.Instance : EditorGestures;
+                    var newMappings = _locked ? LockedGestureMappings.Instance : EditorGestures;
                     EditorGestures.Mappings.Apply(newMappings);
+
+                    if(_locked)
+                    {
+                        _selectedTool = CanvasTool.None;
+                        OnPropertyChanged(nameof(SelectedTool));
+                    }
                 }
             }
         }
@@ -38,7 +44,14 @@ public bool Locked
         public CanvasTool SelectedTool
         {
             get => _selectedTool;
-            set => SetProperty(ref _selectedTool, value);
+            set
+            {
+                if (SetProperty(ref _selectedTool, Locked ? CanvasTool.None : value))
+                {
+                    var newMappings = _selectedTool == CanvasTool.None ? EditorGestures : DrawingGesturesMappings.Instance;
+                    EditorGestures.Mappings.Apply(newMappings);
+                }
+            }
         }
 
         public CanvasViewModel Canvas { get; }
@@ -64,10 +77,31 @@ public class UnboundGestureMappings : EditorGestures
         public UnboundGestureMappings()
         {
             Editor.Selection.Apply(SelectionGestures.None);
-            Editor.Pan.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick), new MouseGesture(MouseAction.RightClick), new MouseGesture(MouseAction.MiddleClick));
             ItemContainer.Selection.Apply(SelectionGestures.None);
             Connection.Disconnect.Value = MultiGesture.None;
             Connector.Connect.Value = MultiGesture.None;
         }
     }
+
+    public class LockedGestureMappings : EditorGestures
+    {
+        public static readonly LockedGestureMappings Instance = new LockedGestureMappings();
+
+        public LockedGestureMappings()
+        {
+            Apply(UnboundGestureMappings.Instance);
+
+            Editor.Pan.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick), new MouseGesture(MouseAction.RightClick), new MouseGesture(MouseAction.MiddleClick));
+        }
+    }
+
+    public class DrawingGesturesMappings : EditorGestures
+    {
+        public static readonly DrawingGesturesMappings Instance = new DrawingGesturesMappings();
+
+        public DrawingGesturesMappings()
+        {
+            Apply(UnboundGestureMappings.Instance);
+        }
+    }
 }
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index 49979cb8..fedf38ab 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -8,7 +8,7 @@
              xmlns:shared="clr-namespace:Nodify;assembly=Nodify.Shared"
              xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
              mc:Ignorable="d"
-             Background="#0f172a"
+             Background="#0a172a"
              Foreground="white"
              d:DataContext="{d:DesignInstance Type=local:CanvasViewModel, IsDesignTimeCreatable=True}"
              d:DesignHeight="450"
@@ -47,6 +47,21 @@
                              RemoveConnectionCommand="{Binding RemoveConnectionCommand}"
                              GridCellSize="10"
                              x:Name="Editor">
+            <nodify:NodifyEditor.Style>
+                <Style TargetType="{x:Type nodify:NodifyEditor}"
+                       BasedOn="{StaticResource {x:Type nodify:NodifyEditor}}">
+                    <Setter Property="Cursor"
+                            Value="Cross" />
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding CanvasToolbar.SelectedTool}"
+                                     Value="{x:Static local:CanvasTool.None}">
+                            <Setter Property="Cursor"
+                                    Value="Arrow" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </nodify:NodifyEditor.Style>
+
             <nodify:NodifyEditor.Resources>
                 <DataTemplate DataType="{x:Type local:EllipseViewModel}">
                     <Ellipse Stretch="Fill"
@@ -313,7 +328,7 @@
 
         <Border VerticalAlignment="Bottom"
                 HorizontalAlignment="Center"
-                Margin="0 0 0 50"
+                Margin="0 0 0 20"
                 CornerRadius="3"
                 Background="#1e293b">
             <Border.Effect>
@@ -431,7 +446,7 @@
 
         <Border VerticalAlignment="Bottom"
                 HorizontalAlignment="Left"
-                Margin="50 0 0 50"
+                Margin="20 0 0 20"
                 CornerRadius="3"
                 Background="#1e293b">
             <Border.Effect>
@@ -485,7 +500,7 @@
 
         <Border VerticalAlignment="Bottom"
                 HorizontalAlignment="Right"
-                Margin="0 0 50 50"
+                Margin="0 0 20 20"
                 Height="38"
                 CornerRadius="3">
 

From ff92fb47143d3cf6febb2cb322fad90660c75918 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 18:25:24 +0300
Subject: [PATCH 10/18] Moved gestures into separated files

---
 .../Canvas/CanvasToolbarViewModel.cs          | 43 +------------------
 .../Gestures/DrawingGesturesMappings.cs       | 18 ++++++++
 .../Canvas/Gestures/LockedGestureMappings.cs  | 16 +++++++
 .../Canvas/Gestures/UnboundGestureMappings.cs | 15 +++++++
 4 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 Examples/Nodify.Shapes/Canvas/Gestures/DrawingGesturesMappings.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Gestures/LockedGestureMappings.cs
 create mode 100644 Examples/Nodify.Shapes/Canvas/Gestures/UnboundGestureMappings.cs

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
index 12ba1a9f..4a33a6e7 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
@@ -16,7 +16,7 @@ public class CanvasToolbarViewModel : ObservableObject
     {
         public static readonly CanvasTool[] AvailableTools = Enum.GetValues(typeof(CanvasTool)).Cast<CanvasTool>().ToArray();
 
-        internal static readonly EditorGestures EditorGestures;
+        internal static readonly EditorGestures EditorGestures = new EditorGestures();
 
         private bool _locked;
         public bool Locked
@@ -56,52 +56,13 @@ public CanvasTool SelectedTool
 
         public CanvasViewModel Canvas { get; }
 
-        static CanvasToolbarViewModel()
+        public CanvasToolbarViewModel(CanvasViewModel canvas)
         {
-            EditorGestures = new EditorGestures();
             // copy any user modifications
             EditorGestures.Apply(EditorGestures.Mappings);
-        }
 
-        public CanvasToolbarViewModel(CanvasViewModel canvas)
-        {
             ToggleLockCommand = new DelegateCommand(() => Locked = !Locked);
             Canvas = canvas;
         }
     }
-
-    public class UnboundGestureMappings : EditorGestures
-    {
-        public static readonly UnboundGestureMappings Instance = new UnboundGestureMappings();
-
-        public UnboundGestureMappings()
-        {
-            Editor.Selection.Apply(SelectionGestures.None);
-            ItemContainer.Selection.Apply(SelectionGestures.None);
-            Connection.Disconnect.Value = MultiGesture.None;
-            Connector.Connect.Value = MultiGesture.None;
-        }
-    }
-
-    public class LockedGestureMappings : EditorGestures
-    {
-        public static readonly LockedGestureMappings Instance = new LockedGestureMappings();
-
-        public LockedGestureMappings()
-        {
-            Apply(UnboundGestureMappings.Instance);
-
-            Editor.Pan.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick), new MouseGesture(MouseAction.RightClick), new MouseGesture(MouseAction.MiddleClick));
-        }
-    }
-
-    public class DrawingGesturesMappings : EditorGestures
-    {
-        public static readonly DrawingGesturesMappings Instance = new DrawingGesturesMappings();
-
-        public DrawingGesturesMappings()
-        {
-            Apply(UnboundGestureMappings.Instance);
-        }
-    }
 }
diff --git a/Examples/Nodify.Shapes/Canvas/Gestures/DrawingGesturesMappings.cs b/Examples/Nodify.Shapes/Canvas/Gestures/DrawingGesturesMappings.cs
new file mode 100644
index 00000000..00cea2ff
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Gestures/DrawingGesturesMappings.cs
@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class DrawingGesturesMappings : EditorGestures
+    {
+        public static readonly DrawingGesturesMappings Instance = new DrawingGesturesMappings();
+
+        public InputGestureRef Draw { get; }
+
+        public DrawingGesturesMappings()
+        {
+            Apply(UnboundGestureMappings.Instance);
+
+            Draw = new MouseGesture(MouseAction.LeftClick);
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Gestures/LockedGestureMappings.cs b/Examples/Nodify.Shapes/Canvas/Gestures/LockedGestureMappings.cs
new file mode 100644
index 00000000..2d08d29a
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Gestures/LockedGestureMappings.cs
@@ -0,0 +1,16 @@
+using System.Windows.Input;
+
+namespace Nodify.Shapes.Canvas
+{
+    public class LockedGestureMappings : EditorGestures
+    {
+        public static readonly LockedGestureMappings Instance = new LockedGestureMappings();
+
+        public LockedGestureMappings()
+        {
+            Apply(UnboundGestureMappings.Instance);
+
+            Editor.Pan.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick), new MouseGesture(MouseAction.RightClick), new MouseGesture(MouseAction.MiddleClick));
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Canvas/Gestures/UnboundGestureMappings.cs b/Examples/Nodify.Shapes/Canvas/Gestures/UnboundGestureMappings.cs
new file mode 100644
index 00000000..325e7751
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/Gestures/UnboundGestureMappings.cs
@@ -0,0 +1,15 @@
+namespace Nodify.Shapes.Canvas
+{
+    public class UnboundGestureMappings : EditorGestures
+    {
+        public static readonly UnboundGestureMappings Instance = new UnboundGestureMappings();
+
+        public UnboundGestureMappings()
+        {
+            Editor.Selection.Apply(SelectionGestures.None);
+            ItemContainer.Selection.Apply(SelectionGestures.None);
+            Connection.Disconnect.Value = MultiGesture.None;
+            Connector.Connect.Value = MultiGesture.None;
+        }
+    }
+}

From b2b4714dca0cbe6c276c7ee4b0302a837cda8bf9 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 19:08:32 +0300
Subject: [PATCH 11/18] Draw shapes by click and drag

---
 .../Canvas/CanvasToolbarViewModel.cs          | 27 +++++++++-
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml | 13 +++--
 .../Nodify.Shapes/Canvas/CanvasView.xaml.cs   | 50 +++++++++++++++++++
 .../Nodify.Shapes/Canvas/CanvasViewModel.cs   | 37 +++++++++-----
 .../Canvas/Shapes/ShapeViewModel.cs           |  7 +++
 5 files changed, 116 insertions(+), 18 deletions(-)

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
index 4a33a6e7..3dfe2faa 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasToolbarViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Windows;
 using System.Windows.Input;
 
 namespace Nodify.Shapes.Canvas
@@ -29,7 +30,7 @@ public bool Locked
                     var newMappings = _locked ? LockedGestureMappings.Instance : EditorGestures;
                     EditorGestures.Mappings.Apply(newMappings);
 
-                    if(_locked)
+                    if (_locked)
                     {
                         _selectedTool = CanvasTool.None;
                         OnPropertyChanged(nameof(SelectedTool));
@@ -64,5 +65,29 @@ public CanvasToolbarViewModel(CanvasViewModel canvas)
             ToggleLockCommand = new DelegateCommand(() => Locked = !Locked);
             Canvas = canvas;
         }
+
+        public ShapeViewModel CreateShapeAtLocation(Point location)
+        {
+            using (Canvas.UndoRedo.Batch("Create shape"))
+            {
+                ShapeViewModel shape = SelectedTool switch
+                {
+                    CanvasTool.Ellipse => new EllipseViewModel(),
+                    CanvasTool.Rectangle => new RectangleViewModel(),
+                    CanvasTool.Triangle => new TriangleViewModel(),
+                    CanvasTool.None => throw new InvalidOperationException("Cannot draw in this state"),
+                    _ => throw new NotImplementedException(nameof(CanvasTool)),
+                };
+
+                shape.Location = location;
+                shape.Text = "Double click to edit";
+
+                Canvas.AddShape(shape);
+                Canvas.SelectedShapes.Clear();
+                Canvas.SelectedShapes.Add(shape);
+
+                return shape;
+            }
+        }
     }
 }
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index fedf38ab..5f6ccc39 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -215,8 +215,8 @@
                                         Padding="{TemplateBinding Padding}"
                                         x:Name="Border"
                                         CornerRadius="3">
-                                    <Grid Height="150"
-                                          Width="150">
+                                    <Grid Height="{Binding Size.Height}"
+                                          Width="{Binding Size.Width}">
 
                                         <ContentPresenter Cursor="Hand" />
 
@@ -330,7 +330,8 @@
                 HorizontalAlignment="Center"
                 Margin="0 0 0 20"
                 CornerRadius="3"
-                Background="#1e293b">
+                Background="#1e293b"
+                MouseDown="Toolbar_MouseDown">
             <Border.Effect>
                 <DropShadowEffect ShadowDepth="1" />
             </Border.Effect>
@@ -448,7 +449,8 @@
                 HorizontalAlignment="Left"
                 Margin="20 0 0 20"
                 CornerRadius="3"
-                Background="#1e293b">
+                Background="#1e293b"
+                MouseDown="Toolbar_MouseDown">
             <Border.Effect>
                 <DropShadowEffect ShadowDepth="1" />
             </Border.Effect>
@@ -502,7 +504,8 @@
                 HorizontalAlignment="Right"
                 Margin="0 0 20 20"
                 Height="38"
-                CornerRadius="3">
+                CornerRadius="3"
+                MouseDown="Toolbar_MouseDown">
 
             <ItemsControl ItemsSource="{Binding Cursors}">
                 <ItemsControl.ItemsPanel>
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
index 84af1394..552d2e08 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Threading;
 
 namespace Nodify.Shapes.Canvas
@@ -56,5 +57,54 @@ private void OnMoveToLocationTick(object? sender, EventArgs e)
                 user.Location = newLocation;
             }
         }
+
+        #region Drawing shapes
+
+        private ShapeViewModel? _drawingShape;
+        private Point _initialLocation;
+
+        protected override void OnMouseDown(MouseButtonEventArgs e)
+        {
+            var toolbarVm = ((CanvasViewModel)DataContext).CanvasToolbar;
+            if (toolbarVm.SelectedTool != CanvasTool.None && DrawingGesturesMappings.Instance.Draw.Matches(this, e))
+            {
+                _initialLocation = Editor.MouseLocation;
+                _drawingShape = toolbarVm.CreateShapeAtLocation(Editor.MouseLocation);
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_drawingShape != null)
+            {
+                double width = Math.Abs(Editor.MouseLocation.X - _initialLocation.X);
+                double height = Math.Abs(Editor.MouseLocation.Y - _initialLocation.Y);
+
+                _drawingShape.Size = new Size(width, height);
+
+                if (Editor.MouseLocation.X < _initialLocation.X)
+                {
+                    _drawingShape.Location = new Point(Editor.MouseLocation.X, _drawingShape.Location.Y);
+                }
+
+                if (Editor.MouseLocation.Y < _initialLocation.Y)
+                {
+                    _drawingShape.Location = new Point(_drawingShape.Location.X, Editor.MouseLocation.Y);
+                }
+            }
+        }
+
+        protected override void OnMouseUp(MouseButtonEventArgs e)
+        {
+            _drawingShape = null;
+        }
+
+        private void Toolbar_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            // prevent creating shape by clicking on the toolbar
+            e.Handled = true;
+        }
+
+        #endregion
     }
 }
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index a6b09c07..12efc4ba 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -1,6 +1,7 @@
 using Nodify.Shapes.Canvas.UndoRedo;
 using Nodify.UndoRedo;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
@@ -9,7 +10,8 @@ namespace Nodify.Shapes.Canvas
 {
     public class CanvasViewModel : ObservableObject
     {
-        public NodifyObservableCollection<ShapeViewModel> Shapes { get; } = new NodifyObservableCollection<ShapeViewModel>();
+        private readonly NodifyObservableCollection<ShapeViewModel> _shapes = new NodifyObservableCollection<ShapeViewModel>();
+        public IReadOnlyCollection<ShapeViewModel> Shapes => _shapes;
         public NodifyObservableCollection<ShapeViewModel> SelectedShapes { get; } = new NodifyObservableCollection<ShapeViewModel>();
 
         public NodifyObservableCollection<ICanvasDecorator> Decorators { get; } = new NodifyObservableCollection<ICanvasDecorator>();
@@ -122,35 +124,40 @@ private void FillCanvasWithShapes()
 
             var ellipse = new EllipseViewModel
             {
-                Location = new Point(100, 50)
+                Location = new Point(100, 50),
+                Size = new Size(150, 150)
             };
-            Shapes.Add(ellipse);
+            _shapes.Add(ellipse);
 
             var rectangle = new RectangleViewModel
             {
-                Location = new Point(400, 100)
+                Location = new Point(400, 100),
+                Size = new Size(150, 150)
             };
-            Shapes.Add(rectangle);
+            _shapes.Add(rectangle);
 
             Connections.Add(new ConnectionViewModel(ellipse.RightConnector, rectangle.LeftConnector));
 
             var ellipse2 = new EllipseViewModel
             {
-                Location = new Point(100, 250)
+                Location = new Point(100, 250),
+                Size = new Size(150, 150)
             };
-            Shapes.Add(ellipse2);
+            _shapes.Add(ellipse2);
 
             var rectangle2 = new RectangleViewModel
             {
-                Location = new Point(450, 400)
+                Location = new Point(450, 400),
+                Size = new Size(150, 150)
             };
-            Shapes.Add(rectangle2);
+            _shapes.Add(rectangle2);
 
             var triangle = new TriangleViewModel
             {
-                Location = new Point(800, 200)
+                Location = new Point(800, 200),
+                Size = new Size(150, 150)
             };
-            Shapes.Add(triangle);
+            _shapes.Add(triangle);
 
             Connections.Add(new ConnectionViewModel(ellipse2.BottomConnector, rectangle2.TopConnector));
             Connections.Add(new ConnectionViewModel(rectangle.RightConnector, rectangle2.RightConnector));
@@ -164,6 +171,12 @@ private void FillCanvasWithShapes()
             UndoRedo.IsEnabled = true;
         }
 
+        public void AddShape(ShapeViewModel shape)
+        {
+            var action = new DelegateAction(() => _shapes.Add(shape), () => _shapes.Remove(shape), "Add shape");
+            UndoRedo.ExecuteAction(action);
+        }
+
         private void AddConnection(ConnectorViewModel source, ConnectorViewModel target)
         {
             var connection = new ConnectionViewModel(source, target);
@@ -191,7 +204,7 @@ public void DeleteSelection()
             {
                 var selection = SelectedShapes.ToList();
 
-                var action = new DelegateAction(() => Shapes.RemoveRange(selection), () => Shapes.AddRange(selection), "Delete shapes");
+                var action = new DelegateAction(() => _shapes.RemoveRange(selection), () => _shapes.AddRange(selection), "Delete shapes");
                 UndoRedo.ExecuteAction(action);
 
                 foreach (var shape in selection)
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
index 875b9f81..8956b7be 100644
--- a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
@@ -35,6 +35,13 @@ public Point Location
             set => SetProperty(ref _location, value);
         }
 
+        private Size _size;
+        public Size Size
+        {
+            get => _size;
+            set => SetProperty(ref _size, value);
+        }
+
         private Color _color;
         public Color Color
         {

From ab9577881cdbbdc1a94ee8ad02b86303838c7fe6 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 19:48:49 +0300
Subject: [PATCH 12/18] Fix deleting without selection pushing an action to the
 undo redo stack

---
 Examples/Nodify.Shapes/App.xaml.cs               | 1 -
 Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Examples/Nodify.Shapes/App.xaml.cs b/Examples/Nodify.Shapes/App.xaml.cs
index 9f4aff5d..b2632bab 100644
--- a/Examples/Nodify.Shapes/App.xaml.cs
+++ b/Examples/Nodify.Shapes/App.xaml.cs
@@ -10,7 +10,6 @@ public partial class App : Application
     {
         public App()
         {
-            NodifyEditor.EnableDraggingContainersOptimizations = false;
             EditorGestures.Mappings.Connection.Disconnect.Value = new AnyGesture(new MouseGesture(MouseAction.LeftClick, ModifierKeys.Alt), new MouseGesture(MouseAction.RightClick));
         }
     }
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index 12efc4ba..9406e37c 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -200,6 +200,9 @@ private bool CanConnect(ConnectorViewModel? source, ConnectorViewModel? target)
 
         public void DeleteSelection()
         {
+            if (SelectedShapes.Count == 0)
+                return;
+
             using (UndoRedo.Batch("Delete selection"))
             {
                 var selection = SelectedShapes.ToList();

From d5797576811f71be2a98bab2a215731fd56ed433 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Sat, 22 Jun 2024 19:56:47 +0300
Subject: [PATCH 13/18] Fix codefactor issue

---
 Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs b/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs
index 1065734a..7040e4ab 100644
--- a/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs
+++ b/Examples/Nodify.Shared/Converters/MultiValueEqualityConverter.cs
@@ -34,5 +34,4 @@ private static bool AllElementsNull(IEnumerable<object> values)
             return values.All(o => o == null);
         }
     }
-
 }

From 57984f0db1a207016ea54815d5e4635533524f16 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Tue, 25 Jun 2024 09:28:50 +0300
Subject: [PATCH 14/18] Address code review comments

---
 Examples/Nodify.Shapes/App.xaml               | 341 +++++++++---------
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml |  24 +-
 2 files changed, 189 insertions(+), 176 deletions(-)

diff --git a/Examples/Nodify.Shapes/App.xaml b/Examples/Nodify.Shapes/App.xaml
index 01230f78..655cab9d 100644
--- a/Examples/Nodify.Shapes/App.xaml
+++ b/Examples/Nodify.Shapes/App.xaml
@@ -45,182 +45,197 @@
 
             <!--ICONS-->
 
-            <Viewbox x:Key="MinusIcon"
-                     Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M5 12h14" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="MinusIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M5 12h14" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="PlusIcon"
-                     Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M12 5v14M5 12h14" />
-                </Grid>
-            </Viewbox>
-
-            <Viewbox x:Key="MaximizeIcon"
-                     Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M4 8V6a2 2 0 0 1 2-2h2M4 16v2a2 2 0 0 0 2 2h2M16 4h2a2 2 0 0 1 2 2v2M16 20h2a2 2 0 0 0 2-2v-2" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="PlusIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M12 5v14M5 12h14" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="CursorIcon"
-                     Stretch="Fill"
-                     Margin="2">
-                <Path Stroke="White"
-                      StrokeThickness="1"
-                      StrokeLineJoin="Round"
-                      StrokeStartLineCap="Round"
-                      StrokeEndLineCap="Round"
-                      Data="M.256.255a.874.874 0 0 0-.18.974l4.753 17.114a.875.875 0 0 0 1.603-.012L10 10l8.334-3.57a.875.875 0 0 0 .01-1.601L1.23.075a.874.874 0 0 0-.974.18Z" />
-            </Viewbox>
+            <DataTemplate x:Key="MaximizeIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M4 8V6a2 2 0 0 1 2-2h2M4 16v2a2 2 0 0 0 2 2h2M16 4h2a2 2 0 0 1 2 2v2M16 20h2a2 2 0 0 0 2-2v-2" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="CircleIcon"
-                     Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
+            <DataTemplate x:Key="CursorIcon">
+                <Viewbox Stretch="Fill"
+                         Margin="2">
                     <Path Stroke="White"
+                          StrokeThickness="1"
                           StrokeLineJoin="Round"
                           StrokeStartLineCap="Round"
                           StrokeEndLineCap="Round"
-                          Data="M3 12a9 9 0 1 0 18 0 9 9 0 1 0-18 0" />
-                </Grid>
-            </Viewbox>
+                          Data="M.256.255a.874.874 0 0 0-.18.974l4.753 17.114a.875.875 0 0 0 1.603-.012L10 10l8.334-3.57a.875.875 0 0 0 .01-1.601L1.23.075a.874.874 0 0 0-.974.18Z" />
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="SquareIcon" Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M3 5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate  x:Key="CircleIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M3 12a9 9 0 1 0 18 0 9 9 0 1 0-18 0" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="TriangleIcon" Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M10.363 3.591 2.257 17.125a1.914 1.914 0 0 0 1.636 2.871h16.214a1.914 1.914 0 0 0 1.636-2.87L13.637 3.59a1.914 1.914 0 0 0-3.274 0z" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="SquareIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M3 5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="ArrowBackIcon" Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="m9 14-4-4 4-4" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M5 10h11a4 4 0 1 1 0 8h-1" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="TriangleIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M10.363 3.591 2.257 17.125a1.914 1.914 0 0 0 1.636 2.871h16.214a1.914 1.914 0 0 0 1.636-2.87L13.637 3.59a1.914 1.914 0 0 0-3.274 0z" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="ArrowForwardIcon" Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="m15 14 4-4-4-4" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M19 10H8a4 4 0 1 0 0 8h1" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="ArrowBackIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="m9 14-4-4 4-4" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M5 10h11a4 4 0 1 1 0 8h-1" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="LockIcon"
-                     Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-6z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M11 16a1 1 0 1 0 2 0 1 1 0 0 0-2 0M8 11V7a4 4 0 1 1 8 0v4" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="ArrowForwardIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="m15 14 4-4-4-4" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M19 10H8a4 4 0 1 0 0 8h1" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
 
-            <Viewbox x:Key="LockOpenIcon"
-                     Stretch="Fill">
-                <Grid>
-                    <Path StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M0 0h24v24H0z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2z" />
-                    <Path Stroke="White"
-                          StrokeLineJoin="Round"
-                          StrokeStartLineCap="Round"
-                          StrokeEndLineCap="Round"
-                          Data="M11 16a1 1 0 1 0 2 0 1 1 0 1 0-2 0M8 11V6a4 4 0 0 1 8 0" />
-                </Grid>
-            </Viewbox>
+            <DataTemplate x:Key="LockIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-6z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M11 16a1 1 0 1 0 2 0 1 1 0 0 0-2 0M8 11V7a4 4 0 1 1 8 0v4" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
+
+            <DataTemplate x:Key="LockOpenIcon">
+                <Viewbox Stretch="Fill">
+                    <Grid>
+                        <Path StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M0 0h24v24H0z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M5 13a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2z" />
+                        <Path Stroke="White"
+                              StrokeLineJoin="Round"
+                              StrokeStartLineCap="Round"
+                              StrokeEndLineCap="Round"
+                              Data="M11 16a1 1 0 1 0 2 0 1 1 0 1 0-2 0M8 11V6a4 4 0 0 1 8 0" />
+                    </Grid>
+                </Viewbox>
+            </DataTemplate>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index 5f6ccc39..e11abd50 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -125,8 +125,6 @@
 
                 <Style TargetType="{x:Type nodify:PendingConnection}"
                        BasedOn="{StaticResource {x:Type nodify:PendingConnection}}">
-                    <Setter Property="Direction"
-                            Value="{Binding Source.Direction}" />
                     <Setter Property="Stroke">
                         <Setter.Value>
                             <SolidColorBrush Color="White"
@@ -369,25 +367,25 @@
                         <DataTemplate x:Key="Cursor">
                             <Border CornerRadius="3"
                                     Padding="5">
-                                <ContentPresenter Content="{StaticResource CursorIcon}" />
+                                <ContentPresenter ContentTemplate="{StaticResource CursorIcon}" />
                             </Border>
                         </DataTemplate>
                         <DataTemplate x:Key="Circle">
                             <Border CornerRadius="3"
                                     Padding="5">
-                                <ContentPresenter Content="{StaticResource CircleIcon}" />
+                                <ContentPresenter ContentTemplate="{StaticResource CircleIcon}" />
                             </Border>
                         </DataTemplate>
                         <DataTemplate x:Key="Square">
                             <Border CornerRadius="3"
                                     Padding="5">
-                                <ContentPresenter Content="{StaticResource SquareIcon}" />
+                                <ContentPresenter ContentTemplate="{StaticResource SquareIcon}" />
                             </Border>
                         </DataTemplate>
                         <DataTemplate x:Key="Triangle">
                             <Border CornerRadius="3"
                                     Padding="5">
-                                <ContentPresenter Content="{StaticResource TriangleIcon}" />
+                                <ContentPresenter ContentTemplate="{StaticResource TriangleIcon}" />
                             </Border>
                         </DataTemplate>
                     </ListBox.Resources>
@@ -432,13 +430,13 @@
 
                 <Button Command="{Binding UndoCommand}"
                         CommandTarget="{Binding ElementName=Editor}"
-                        Content="{StaticResource ArrowBackIcon}"
+                        ContentTemplate="{StaticResource ArrowBackIcon}"
                         ToolTip="CTRL+Z"
                         Padding="1" />
 
                 <Button Command="{Binding RedoCommand}"
                         CommandTarget="{Binding ElementName=Editor}"
-                        Content="{StaticResource ArrowForwardIcon}"
+                        ContentTemplate="{StaticResource ArrowForwardIcon}"
                         ToolTip="CTRL+SHIFT+z"
                         Padding="1" />
 
@@ -470,27 +468,27 @@
 
                 <Button Command="{x:Static nodify:EditorCommands.ZoomIn}"
                         CommandTarget="{Binding ElementName=Editor}"
-                        Content="{StaticResource PlusIcon}" />
+                        ContentTemplate="{StaticResource PlusIcon}" />
 
                 <Button Command="{x:Static nodify:EditorCommands.ZoomOut}"
                         CommandTarget="{Binding ElementName=Editor}"
-                        Content="{StaticResource MinusIcon}" />
+                        ContentTemplate="{StaticResource MinusIcon}" />
 
                 <Button Command="{x:Static nodify:EditorCommands.FitToScreen}"
                         CommandTarget="{Binding ElementName=Editor}"
-                        Content="{StaticResource MaximizeIcon}" />
+                        ContentTemplate="{StaticResource MaximizeIcon}" />
 
                 <Button Command="{Binding ToggleLockCommand}"
                         DataContext="{Binding CanvasToolbar}">
                     <Button.Style>
                         <Style TargetType="Button"
                                BasedOn="{StaticResource {x:Type Button}}">
-                            <Setter Property="Content"
+                            <Setter Property="ContentTemplate"
                                     Value="{StaticResource LockOpenIcon}" />
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Locked}"
                                              Value="True">
-                                    <Setter Property="Content"
+                                    <Setter Property="ContentTemplate"
                                             Value="{StaticResource LockIcon}" />
                                 </DataTrigger>
                             </Style.Triggers>

From c4d0878effcd6bc44cdd11f8560488c38165b6d0 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Tue, 25 Jun 2024 19:56:31 +0300
Subject: [PATCH 15/18] Add ResizablePanel to resize shapes Fix batch action
 history

---
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml |  40 ++--
 .../Nodify.Shapes/Canvas/CanvasView.xaml.cs   |   6 +-
 .../Nodify.Shapes/Canvas/CanvasViewModel.cs   |  33 ++-
 .../Canvas/Shapes/ShapeViewModel.cs           |  15 +-
 .../Canvas/UndoRedo/ResizeShapesAction.cs     |  56 +++++
 .../Controls/ResizableContainer.cs            |  31 +++
 .../Nodify.Shared/Controls/ResizablePanel.cs  | 196 ++++++++++++++++++
 .../ResizeDirectionToVisiblityConverter.cs    |  30 +++
 Examples/Nodify.Shared/Themes/Generic.xaml    | 153 +++++++++++++-
 .../Nodify.Shared/UndoRedo/BatchAction.cs     |   6 +-
 10 files changed, 532 insertions(+), 34 deletions(-)
 create mode 100644 Examples/Nodify.Shapes/Canvas/UndoRedo/ResizeShapesAction.cs
 create mode 100644 Examples/Nodify.Shapes/Controls/ResizableContainer.cs
 create mode 100644 Examples/Nodify.Shared/Controls/ResizablePanel.cs
 create mode 100644 Examples/Nodify.Shared/Converters/ResizeDirectionToVisiblityConverter.cs

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index e11abd50..a0ad43b1 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -6,6 +6,7 @@
              xmlns:local="clr-namespace:Nodify.Shapes.Canvas"
              xmlns:nodify="https://miroiu.github.io/nodify"
              xmlns:shared="clr-namespace:Nodify;assembly=Nodify.Shared"
+             xmlns:controls="clr-namespace:Nodify.Shapes.Controls"
              xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
              mc:Ignorable="d"
              Background="#0a172a"
@@ -45,7 +46,7 @@
                              ItemsSelectStartedCommand="{Binding SelectShapesStartedCommand}"
                              ItemsSelectCompletedCommand="{Binding SelectShapesCompletedCommand}"
                              RemoveConnectionCommand="{Binding RemoveConnectionCommand}"
-                             GridCellSize="10"
+                             GridCellSize="5"
                              x:Name="Editor">
             <nodify:NodifyEditor.Style>
                 <Style TargetType="{x:Type nodify:NodifyEditor}"
@@ -191,13 +192,30 @@
                                 </Setter.Value>
                             </Setter>
                         </Style>
+
+                        <Style TargetType="{x:Type shared:Resizer}"
+                               BasedOn="{StaticResource {x:Type shared:Resizer}}">
+                            <Setter Property="Background"
+                                    Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=nodify:ItemContainer}}" />
+                        </Style>
+
+                        <!--For some reason, the designer doesn't like having these bindings on the element itself but in a style-->
+                        <Style TargetType="{x:Type controls:ResizableContainer}"
+                               BasedOn="{StaticResource {x:Type shared:ResizablePanel}}">
+                            <Setter Property="BorderBrush"
+                                    Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=nodify:ItemContainer}}" />
+                            <Setter Property="Padding"
+                                    Value="3" />
+                            <Setter Property="ResizeStartedCommand"
+                                    Value="{Binding DataContext.ResizeShapeStartedCommand, ElementName=Editor}" />
+                            <Setter Property="ResizeCompletedCommand"
+                                    Value="{Binding DataContext.ResizeShapeCompletedCommand, ElementName=Editor}" />
+                        </Style>
                     </Style.Resources>
                     <Setter Property="Location"
                             Value="{Binding Location}" />
                     <Setter Property="IsSelected"
                             Value="{Binding IsSelected}" />
-                    <Setter Property="Padding"
-                            Value="3" />
                     <Setter Property="SelectedBrush"
                             Value="{Binding BorderColor, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
                     <Setter Property="SelectedBorderThickness"
@@ -207,15 +225,11 @@
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate TargetType="{x:Type nodify:ItemContainer}">
-                                <Border Background="{TemplateBinding Background}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        Padding="{TemplateBinding Padding}"
-                                        x:Name="Border"
-                                        CornerRadius="3">
-                                    <Grid Height="{Binding Size.Height}"
-                                          Width="{Binding Size.Width}">
-
+                                <controls:ResizableContainer Height="{Binding Height, Mode=TwoWay}"
+                                                             Width="{Binding Width, Mode=TwoWay}"
+                                                             Directions="Corners"
+                                                             GridCellSize="5">
+                                    <Grid>
                                         <ContentPresenter Cursor="Hand" />
 
                                         <shared:EditableTextBlock Text="{Binding Text}"
@@ -267,7 +281,7 @@
                                                               x:Name="BottomConnector" />
                                         </DockPanel>
                                     </Grid>
-                                </Border>
+                                </controls:ResizableContainer>
 
                                 <ControlTemplate.Triggers>
                                     <MultiTrigger>
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
index 552d2e08..09c39ecb 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml.cs
@@ -77,10 +77,8 @@ protected override void OnMouseMove(MouseEventArgs e)
         {
             if (_drawingShape != null)
             {
-                double width = Math.Abs(Editor.MouseLocation.X - _initialLocation.X);
-                double height = Math.Abs(Editor.MouseLocation.Y - _initialLocation.Y);
-
-                _drawingShape.Size = new Size(width, height);
+                _drawingShape.Width = Math.Abs(Editor.MouseLocation.X - _initialLocation.X);
+                _drawingShape.Height = Math.Abs(Editor.MouseLocation.Y - _initialLocation.Y);
 
                 if (Editor.MouseLocation.X < _initialLocation.X)
                 {
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index 9406e37c..99918c9c 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -24,6 +24,8 @@ public class CanvasViewModel : ObservableObject
         public ICommand MoveShapesCompletedCommand { get; }
         public ICommand SelectShapesStartedCommand { get; }
         public ICommand SelectShapesCompletedCommand { get; }
+        public ICommand ResizeShapeStartedCommand { get; }
+        public ICommand ResizeShapeCompletedCommand { get; }
         public ICommand CreateConnectionCommand { get; }
         public ICommand RemoveConnectionCommand { get; }
         public ICommand DeleteSelectionCommand { get; }
@@ -49,6 +51,9 @@ public CanvasViewModel()
             SelectShapesStartedCommand = new DelegateCommand(SelectShapesStartedHandler);
             SelectShapesCompletedCommand = new DelegateCommand(SelectShapesCompletedHandler);
 
+            ResizeShapeStartedCommand = new DelegateCommand(ResizeShapeStartedHandler);
+            ResizeShapeCompletedCommand = new DelegateCommand(ResizeShapeCompletedHandler);
+
             DeleteSelectionCommand = new DelegateCommand(DeleteSelection, () => !CanvasToolbar.Locked);
 
             CreateConnectionCommand = new DelegateCommand<(object Source, object Target)>(
@@ -105,6 +110,19 @@ private void SelectShapesCompletedHandler()
             //}
         }
 
+        private void ResizeShapeStartedHandler()
+        {
+            UndoRedo.ExecuteAction(new ResizeShapesAction(this));
+        }
+
+        private void ResizeShapeCompletedHandler()
+        {
+            if (UndoRedo.Current is ResizeShapesAction resizeShapes)
+            {
+                resizeShapes.SaveSizes();
+            }
+        }
+
         private void FillCanvasWithShapes()
         {
             // Disable undo redo to avoid recording object construction
@@ -125,14 +143,16 @@ private void FillCanvasWithShapes()
             var ellipse = new EllipseViewModel
             {
                 Location = new Point(100, 50),
-                Size = new Size(150, 150)
+                Width = 150,
+                Height = 150
             };
             _shapes.Add(ellipse);
 
             var rectangle = new RectangleViewModel
             {
                 Location = new Point(400, 100),
-                Size = new Size(150, 150)
+                Width = 150,
+                Height = 150
             };
             _shapes.Add(rectangle);
 
@@ -141,21 +161,24 @@ private void FillCanvasWithShapes()
             var ellipse2 = new EllipseViewModel
             {
                 Location = new Point(100, 250),
-                Size = new Size(150, 150)
+                Width = 150,
+                Height = 150
             };
             _shapes.Add(ellipse2);
 
             var rectangle2 = new RectangleViewModel
             {
                 Location = new Point(450, 400),
-                Size = new Size(150, 150)
+                Width = 150,
+                Height = 150
             };
             _shapes.Add(rectangle2);
 
             var triangle = new TriangleViewModel
             {
                 Location = new Point(800, 200),
-                Size = new Size(150, 150)
+                Width = 150,
+                Height = 150
             };
             _shapes.Add(triangle);
 
diff --git a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
index 8956b7be..8cc8d830 100644
--- a/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/Shapes/ShapeViewModel.cs
@@ -35,11 +35,18 @@ public Point Location
             set => SetProperty(ref _location, value);
         }
 
-        private Size _size;
-        public Size Size
+        private double _width;
+        public double Width
         {
-            get => _size;
-            set => SetProperty(ref _size, value);
+            get => _width;
+            set => SetProperty(ref _width, value);
+        }
+
+        private double _height;
+        public double Height
+        {
+            get => _height;
+            set => SetProperty(ref _height, value);
         }
 
         private Color _color;
diff --git a/Examples/Nodify.Shapes/Canvas/UndoRedo/ResizeShapesAction.cs b/Examples/Nodify.Shapes/Canvas/UndoRedo/ResizeShapesAction.cs
new file mode 100644
index 00000000..48731cd7
--- /dev/null
+++ b/Examples/Nodify.Shapes/Canvas/UndoRedo/ResizeShapesAction.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using Nodify.UndoRedo;
+
+namespace Nodify.Shapes.Canvas.UndoRedo
+{
+    public class ResizeShapesAction : IAction
+    {
+        private readonly IReadOnlyCollection<ShapeViewModel> _resizedShapes;
+        private readonly Dictionary<ShapeViewModel, Size> _initialSizes;
+        private Dictionary<ShapeViewModel, Size>? _finalSizes;
+
+        // Resizing could also move the shape
+        private readonly MoveShapesAction _moveShapesAction;
+
+        public ResizeShapesAction(CanvasViewModel canvas)
+        {
+            _resizedShapes = canvas.SelectedShapes;
+            _initialSizes = _resizedShapes.ToDictionary(x => x, x => new Size(x.Width, x.Height));
+
+            _moveShapesAction = new MoveShapesAction(canvas);
+        }
+
+        public string? Label => "Resize shapes";
+
+        public void Execute()
+        {
+            _moveShapesAction.Execute();
+
+            _finalSizes?.ForEach(x =>
+            {
+                x.Key.Width = x.Value.Width;
+                x.Key.Height = x.Value.Height;
+            });
+        }
+
+        public void Undo()
+        {
+            _initialSizes.ForEach(x =>
+            {
+                x.Key.Width = x.Value.Width;
+                x.Key.Height = x.Value.Height;
+            });
+
+            _moveShapesAction.Undo();
+        }
+
+        public void SaveSizes()
+        {
+            _moveShapesAction.SaveLocations();
+
+            _finalSizes = _resizedShapes.ToDictionary(x => x, x => new Size(x.Width, x.Height));
+        }
+    }
+}
diff --git a/Examples/Nodify.Shapes/Controls/ResizableContainer.cs b/Examples/Nodify.Shapes/Controls/ResizableContainer.cs
new file mode 100644
index 00000000..0e3ca4b5
--- /dev/null
+++ b/Examples/Nodify.Shapes/Controls/ResizableContainer.cs
@@ -0,0 +1,31 @@
+using System.Windows;
+
+namespace Nodify.Shapes.Controls
+{
+    internal class ResizableContainer : ResizablePanel
+    {
+        public static readonly DependencyProperty GridCellSizeProperty = NodifyEditor.GridCellSizeProperty.AddOwner(typeof(ResizableContainer));
+
+        public uint GridCellSize
+        {
+            get => (uint)GetValue(GridCellSizeProperty);
+            set => SetValue(GridCellSizeProperty, value);
+        }
+
+        protected override void OnMove(double x, double y)
+        {
+            // we can't use the default behavior because we are not inside a Canvas
+            if (TemplatedParent is ItemContainer item)
+            {
+                item.Location = new Point(item.Location.X + x, item.Location.Y + y);
+            }
+        }
+
+        protected override void OnProcessDelta(ref double dx, ref double dy)
+        {
+            // snap to grid
+            dx = (int)dx / GridCellSize * GridCellSize;
+            dy = (int)dy / GridCellSize * GridCellSize;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shared/Controls/ResizablePanel.cs b/Examples/Nodify.Shared/Controls/ResizablePanel.cs
new file mode 100644
index 00000000..93808c58
--- /dev/null
+++ b/Examples/Nodify.Shared/Controls/ResizablePanel.cs
@@ -0,0 +1,196 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Nodify
+{
+    public class ResizablePanel : ContentControl
+    {
+        internal static readonly object BoxedResizeDirection = ResizeDirections.All;
+
+        public static readonly DependencyProperty DirectionsProperty
+            = DependencyProperty.Register(nameof(Directions), typeof(ResizeDirections), typeof(ResizablePanel), new FrameworkPropertyMetadata(BoxedResizeDirection));
+
+        public static readonly DependencyProperty ResizeStartedCommandProperty = DependencyProperty.Register(nameof(ResizeStartedCommand), typeof(ICommand), typeof(ResizablePanel));
+
+        public static readonly DependencyProperty ResizeCompletedCommandProperty = DependencyProperty.Register(nameof(ResizeCompletedCommand), typeof(ICommand), typeof(ResizablePanel));
+
+        public ResizeDirections Directions
+        {
+            get => (ResizeDirections)GetValue(DirectionsProperty);
+            set => SetValue(DirectionsProperty, value);
+        }
+
+        public ICommand? ResizeStartedCommand
+        {
+            get => (ICommand)GetValue(ResizeStartedCommandProperty);
+            set => SetValue(ResizeStartedCommandProperty, value);
+        }
+
+        public ICommand? ResizeCompletedCommand
+        {
+            get => (ICommand)GetValue(ResizeCompletedCommandProperty);
+            set => SetValue(ResizeCompletedCommandProperty, value);
+        }
+
+        static ResizablePanel()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ResizablePanel), new FrameworkPropertyMetadata(typeof(ResizablePanel)));
+        }
+
+        public ResizablePanel()
+        {
+            AddHandler(Thumb.DragDeltaEvent, new DragDeltaEventHandler(OnResize));
+            AddHandler(Thumb.DragStartedEvent, new DragStartedEventHandler(OnDragStarted));
+            AddHandler(Thumb.DragCompletedEvent, new DragCompletedEventHandler(OnDragCompleted));
+        }
+
+        private void OnDragStarted(object sender, DragStartedEventArgs e)
+        {
+            if (ResizeStartedCommand?.CanExecute(null) ?? false)
+            {
+                ResizeStartedCommand.Execute(null);
+            }
+        }
+
+        private void OnDragCompleted(object sender, DragCompletedEventArgs e)
+        {
+            if (ResizeCompletedCommand?.CanExecute(null) ?? false)
+            {
+                ResizeCompletedCommand.Execute(null);
+            }
+        }
+
+        private void OnResize(object sender, DragDeltaEventArgs e)
+        {
+            if (e.OriginalSource is Resizer resizer)
+            {
+                double resizeX = 0;
+                double resizeY = 0;
+
+                double moveX = 0;
+                double moveY = 0;
+
+                if (resizer.Direction.HasFlag(ResizeDirections.Top))
+                {
+                    moveY = resizeY = ResizeTop(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.Bottom))
+                {
+                    resizeY = ResizeBottom(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.Left))
+                {
+                    moveX = resizeX = ResizeLeft(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.Right))
+                {
+                    resizeX = ResizeRight(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.TopLeft))
+                {
+                    moveY = resizeY = ResizeTop(e);
+                    moveX = resizeX = ResizeLeft(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.TopRight))
+                {
+                    moveY = resizeY = ResizeTop(e);
+                    resizeX = ResizeRight(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.BottomLeft))
+                {
+                    resizeY = ResizeBottom(e);
+                    moveX = resizeX = ResizeLeft(e);
+                }
+
+                if (resizer.Direction.HasFlag(ResizeDirections.BottomRight))
+                {
+                    resizeY = ResizeBottom(e);
+                    resizeX = ResizeRight(e);
+                }
+
+                OnProcessDelta(ref resizeX, ref resizeY);
+                OnProcessDelta(ref moveX, ref moveY);
+
+                OnMove(moveX, moveY);
+
+                Width -= resizeX;
+                Height -= resizeY;
+
+                e.Handled = true;
+            }
+        }
+
+        private double ResizeBottom(DragDeltaEventArgs e)
+        {
+            return Math.Min(-e.VerticalChange, ActualHeight - MinHeight);
+        }
+
+        private double ResizeTop(DragDeltaEventArgs e)
+        {
+            return Math.Min(e.VerticalChange, ActualHeight - MinHeight);
+        }
+
+        private double ResizeRight(DragDeltaEventArgs e)
+        {
+            return Math.Min(-e.HorizontalChange, ActualWidth - MinWidth);
+        }
+
+        private double ResizeLeft(DragDeltaEventArgs e)
+        {
+            return Math.Min(e.HorizontalChange, ActualWidth - MinWidth);
+        }
+
+        protected virtual void OnMove(double x, double y)
+        {
+            Canvas.SetTop(this, Canvas.GetTop(this) + y);
+            Canvas.SetLeft(this, Canvas.GetLeft(this) + x);
+        }
+
+        protected virtual void OnProcessDelta(ref double dx, ref double dy)
+        {
+        }
+    }
+
+    public class Resizer : Thumb
+    {
+        public static readonly DependencyProperty DirectionProperty
+            = DependencyProperty.Register(nameof(Direction), typeof(ResizeDirections), typeof(Resizer), new FrameworkPropertyMetadata(ResizablePanel.BoxedResizeDirection));
+
+        public ResizeDirections Direction
+        {
+            get => (ResizeDirections)GetValue(DirectionProperty);
+            set => SetValue(DirectionProperty, value);
+        }
+
+        static Resizer()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Resizer), new FrameworkPropertyMetadata(typeof(Resizer)));
+        }
+    }
+
+    [Flags]
+    public enum ResizeDirections
+    {
+        Top = 1,
+        Left = 2,
+        Bottom = 4,
+        Right = 8,
+        TopLeft = 16,
+        TopRight = 32,
+        BottomLeft = 64,
+        BottomRight = 128,
+
+        Edges = Top | Left | Bottom | Right,
+        Corners = TopLeft | TopRight | BottomLeft | BottomRight,
+        All = Edges | Corners
+    }
+}
diff --git a/Examples/Nodify.Shared/Converters/ResizeDirectionToVisiblityConverter.cs b/Examples/Nodify.Shared/Converters/ResizeDirectionToVisiblityConverter.cs
new file mode 100644
index 00000000..21b1caea
--- /dev/null
+++ b/Examples/Nodify.Shared/Converters/ResizeDirectionToVisiblityConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Nodify
+{
+    internal class ResizeDirectionToVisiblityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(value is ResizeDirections resizeDirections))
+            {
+                return Visibility.Collapsed;
+            }
+
+            if (Enum.TryParse(parameter.ToString(), out ResizeDirections direction))
+            {
+                return resizeDirections.HasFlag(direction) ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Examples/Nodify.Shared/Themes/Generic.xaml b/Examples/Nodify.Shared/Themes/Generic.xaml
index 94bd154e..868cb124 100644
--- a/Examples/Nodify.Shared/Themes/Generic.xaml
+++ b/Examples/Nodify.Shared/Themes/Generic.xaml
@@ -7,6 +7,8 @@
         <ResourceDictionary Source="pack://application:,,,/Nodify.Shared;component/Themes/Icons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+    <local:ResizeDirectionToVisiblityConverter x:Key="ResizeDirectionToVisiblityConverter" />
+
     <Style x:Key="EditableTextBlockBaseStyle"
            TargetType="{x:Type local:EditableTextBlock}">
         <Setter Property="Background"
@@ -249,13 +251,18 @@
             <local:MultiValueEqualityConverter x:Key="MultiValueEqualityConverter" />
             <local:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
         </Style.Resources>
+        <Setter Property="Background"
+                Value="#1e293b" />
+        <Setter Property="Padding"
+                Value="6" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:Swatches">
-                    <Border Background="#1e293b"
-                            CornerRadius="8"
-                            Padding="6"
-                            VerticalAlignment="Top">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}"
+                            CornerRadius="8">
                         <ItemsControl ItemsSource="{TemplateBinding Colors}">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
@@ -291,7 +298,7 @@
                                                  Height="24"
                                                  Stroke="#1e293b"
                                                  Fill="{Binding ., Converter={StaticResource ColorToSolidColorBrushConverter}}"
-                                                 Cursor="Hand"/>
+                                                 Cursor="Hand" />
                                     </Border>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
@@ -301,4 +308,140 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <Style TargetType="{x:Type local:ResizablePanel}">
+        <Setter Property="BorderBrush"
+                Value="#1e293b" />
+        <Setter Property="BorderThickness"
+                Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:ResizablePanel">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <ContentPresenter Margin="{TemplateBinding Padding}" />
+
+                            <local:Resizer Direction="TopLeft"
+                                           HorizontalAlignment="Left"
+                                           VerticalAlignment="Top"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=TopLeft}" />
+
+                            <local:Resizer Direction="TopRight"
+                                           HorizontalAlignment="Right"
+                                           VerticalAlignment="Top"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=TopRight}" />
+
+                            <local:Resizer Direction="BottomLeft"
+                                           HorizontalAlignment="Left"
+                                           VerticalAlignment="Bottom"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=BottomLeft}" />
+
+                            <local:Resizer Direction="BottomRight"
+                                           HorizontalAlignment="Right"
+                                           VerticalAlignment="Bottom"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=BottomRight}" />
+
+                            <local:Resizer Direction="Left"
+                                           HorizontalAlignment="Left"
+                                           VerticalAlignment="Center"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=Left}" />
+
+                            <local:Resizer Direction="Right"
+                                           HorizontalAlignment="Right"
+                                           VerticalAlignment="Center"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=Right}" />
+
+                            <local:Resizer Direction="Top"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Top"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=Top}" />
+
+                            <local:Resizer Direction="Bottom"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Bottom"
+                                           Visibility="{TemplateBinding Directions, Converter={StaticResource ResizeDirectionToVisiblityConverter}, ConverterParameter=Bottom}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:Resizer}">
+        <Setter Property="Background"
+                Value="#1e293b" />
+        <Setter Property="Width"
+                Value="6" />
+        <Setter Property="Height"
+                Value="6" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:Resizer">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" />
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Direction"
+                                 Value="TopLeft">
+                            <Setter Property="Cursor"
+                                    Value="SizeNWSE" />
+                            <Setter Property="Margin"
+                                    Value="-4 -4 0 0" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="TopRight">
+                            <Setter Property="Cursor"
+                                    Value="SizeNESW" />
+                            <Setter Property="Margin"
+                                    Value="0 -4 -4 0" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="BottomLeft">
+                            <Setter Property="Cursor"
+                                    Value="SizeNESW" />
+                            <Setter Property="Margin"
+                                    Value="-4 0 0 -4" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="BottomRight">
+                            <Setter Property="Cursor"
+                                    Value="SizeNWSE" />
+                            <Setter Property="Margin"
+                                    Value="0 0 -4 -4" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="Left">
+                            <Setter Property="Cursor"
+                                    Value="SizeWE" />
+                            <Setter Property="Margin"
+                                    Value="-4 0 0 0" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="Right">
+                            <Setter Property="Cursor"
+                                    Value="SizeWE" />
+                            <Setter Property="Margin"
+                                    Value="0 0 -4 0" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="Top">
+                            <Setter Property="Cursor"
+                                    Value="SizeNS" />
+                            <Setter Property="Margin"
+                                    Value="0 -4 0 0" />
+                        </Trigger>
+                        <Trigger Property="Direction"
+                                 Value="Bottom">
+                            <Setter Property="Cursor"
+                                    Value="SizeNS" />
+                            <Setter Property="Margin"
+                                    Value="0 0 0 -4" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Examples/Nodify.Shared/UndoRedo/BatchAction.cs b/Examples/Nodify.Shared/UndoRedo/BatchAction.cs
index 921e9844..2c4f8ae9 100644
--- a/Examples/Nodify.Shared/UndoRedo/BatchAction.cs
+++ b/Examples/Nodify.Shared/UndoRedo/BatchAction.cs
@@ -7,7 +7,7 @@ public class BatchAction : IAction
     {
         public BatchAction(string? label, IEnumerable<IAction> history)
         {
-            History = history.ToList();
+            History = history.Reverse().ToList();
             Label = label;
         }
 
@@ -17,7 +17,7 @@ public BatchAction(string? label, IEnumerable<IAction> history)
 
         public void Execute()
         {
-            for (int i = 0; i < History.Count; i++)
+            for (int i = History.Count - 1; i >= 0; i--)
             {
                 History[i].Execute();
             }
@@ -25,7 +25,7 @@ public void Execute()
 
         public void Undo()
         {
-            for (int i = History.Count - 1; i >= 0; i--)
+            for (int i = 0; i < History.Count; i++)
             {
                 History[i].Undo();
             }

From 5e8ebdac1d84ecedb8b5c1e43fc8246e0d1be649 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Wed, 26 Jun 2024 19:14:36 +0300
Subject: [PATCH 16/18] Remove unnecessary package reference

---
 Examples/Nodify.Shapes/Nodify.Shapes.csproj | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Examples/Nodify.Shapes/Nodify.Shapes.csproj b/Examples/Nodify.Shapes/Nodify.Shapes.csproj
index e3050b57..906e10cf 100644
--- a/Examples/Nodify.Shapes/Nodify.Shapes.csproj
+++ b/Examples/Nodify.Shapes/Nodify.Shapes.csproj
@@ -6,12 +6,10 @@
     <UseWPF>true</UseWPF>
     <Nullable>enable</Nullable>
   </PropertyGroup>
+  
   <PropertyGroup Condition="'$(TargetFramework)'=='net472' OR '$(TargetFramework)'=='net48'">
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="StringMath" Version="4.1.2" />
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Nodify\Nodify.csproj" />

From 018fa92b9dfb31dec3ddc97c9356ab1a8e4a4e5d Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Wed, 26 Jun 2024 20:00:29 +0300
Subject: [PATCH 17/18] Disable editing controls when the canvas is locked

---
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml |  3 +++
 .../Nodify.Shapes/Canvas/CanvasViewModel.cs   |  4 +--
 .../Converters/InverseBooleanConverter.cs     | 25 +++++++++++++++++++
 Examples/Nodify.Shared/Themes/Generic.xaml    |  7 ++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 Examples/Nodify.Shared/Converters/InverseBooleanConverter.cs

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index a0ad43b1..d69a7225 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -17,6 +17,7 @@
     <Grid>
         <Grid.Resources>
             <shared:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+            <shared:InverseBooleanConverter x:Key="InverseBooleanConverter" />
             <shared:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
 
             <VisualBrush x:Key="GridDrawingBrush"
@@ -93,6 +94,7 @@
                     <Canvas Visibility="{Binding Shape, Converter={StaticResource BooleanToVisibilityConverter}}">
                         <shared:Swatches SelectedColor="{Binding Shape.Color}"
                                          Colors="{x:Static local:ShapeViewModel.Colors}"
+                                         IsEnabled="{Binding DataContext.CanvasToolbar.Locked, ElementName=Editor, Converter={StaticResource InverseBooleanConverter}}"
                                          Canvas.Top="-70"
                                          Panel.ZIndex="1">
                             <shared:Swatches.Effect>
@@ -233,6 +235,7 @@
                                         <ContentPresenter Cursor="Hand" />
 
                                         <shared:EditableTextBlock Text="{Binding Text}"
+                                                                  IsEnabled="{Binding DataContext.CanvasToolbar.Locked, ElementName=Editor, Converter={StaticResource InverseBooleanConverter}}"
                                                                   HorizontalAlignment="Center"
                                                                   VerticalAlignment="Center"
                                                                   HorizontalContentAlignment="Center"
diff --git a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
index 99918c9c..28942c4d 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
+++ b/Examples/Nodify.Shapes/Canvas/CanvasViewModel.cs
@@ -42,8 +42,8 @@ public CanvasViewModel()
         {
             CanvasToolbar = new CanvasToolbarViewModel(this);
 
-            UndoCommand = new RequeryCommand(UndoRedo.Undo, () => UndoRedo.CanUndo);
-            RedoCommand = new RequeryCommand(UndoRedo.Redo, () => UndoRedo.CanRedo);
+            UndoCommand = new RequeryCommand(UndoRedo.Undo, () => UndoRedo.CanUndo && !CanvasToolbar.Locked);
+            RedoCommand = new RequeryCommand(UndoRedo.Redo, () => UndoRedo.CanRedo && !CanvasToolbar.Locked);
 
             MoveShapesStartedCommand = new DelegateCommand(MoveShapesStartedHandler);
             MoveShapesCompletedCommand = new DelegateCommand(MoveShapesCompletedHandler);
diff --git a/Examples/Nodify.Shared/Converters/InverseBooleanConverter.cs b/Examples/Nodify.Shared/Converters/InverseBooleanConverter.cs
new file mode 100644
index 00000000..a263f914
--- /dev/null
+++ b/Examples/Nodify.Shared/Converters/InverseBooleanConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Nodify
+{
+    public class InverseBooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType != typeof(bool))
+                throw new InvalidOperationException("The value must be of type bool.");
+
+            return !(bool)value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType != typeof(bool))
+                throw new InvalidOperationException("The value must be of type bool.");
+
+            return !(bool)value;
+        }
+    }
+}
diff --git a/Examples/Nodify.Shared/Themes/Generic.xaml b/Examples/Nodify.Shared/Themes/Generic.xaml
index 868cb124..67e72139 100644
--- a/Examples/Nodify.Shared/Themes/Generic.xaml
+++ b/Examples/Nodify.Shared/Themes/Generic.xaml
@@ -307,6 +307,13 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+                <Setter Property="Opacity"
+                        Value="0.7" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="{x:Type local:ResizablePanel}">

From 74f795e9cd5589a37c37f1b0f0bce8793ec6e9d9 Mon Sep 17 00:00:00 2001
From: miroiu <miroiu.emanuel@gmail.com>
Date: Wed, 26 Jun 2024 20:46:50 +0300
Subject: [PATCH 18/18] Do not allow resizing when canvas is locked

---
 Examples/Nodify.Shapes/Canvas/CanvasView.xaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
index d69a7225..0e341593 100644
--- a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
+++ b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -199,6 +199,8 @@
                                BasedOn="{StaticResource {x:Type shared:Resizer}}">
                             <Setter Property="Background"
                                     Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=nodify:ItemContainer}}" />
+                            <Setter Property="IsEnabled"
+                                    Value="{Binding DataContext.CanvasToolbar.Locked, ElementName=Editor, Converter={StaticResource InverseBooleanConverter}}" />
                         </Style>
 
                         <!--For some reason, the designer doesn't like having these bindings on the element itself but in a style-->