Merge pull request #389 from Mangepange/bugfix_381_isreadonly_editing

#381 End current edit when IsReadOnly is set to false

Author: w-ahmad

src/Columns/TableViewColumn.cs

@@ -508,8 +508,6 @@ private static void OnPropertyChanged(DependencyObject d, DependencyPropertyChan
                 column.OwningCollection.HandleColumnPropertyChanged(column, nameof(MaxWidth));
             else if (e.Property == ActualWidthProperty)
                 column.OwningCollection.HandleColumnPropertyChanged(column, nameof(ActualWidth));
-            else if (e.Property == IsReadOnlyProperty)
-                column.OwningCollection.HandleColumnPropertyChanged(column, nameof(IsReadOnly));
             else if (e.Property == VisibilityProperty)
                 column.OwningCollection.HandleColumnPropertyChanged(column, nameof(Visibility));
             else if (e.Property == OrderProperty)
@@ -528,6 +526,27 @@ private static void OnColumnAutoWidthModeChanged(DependencyObject d, DependencyP
         }
     }
 
+    /// <summary>
+    /// Handles changes to the IsReadOnly property.
+    /// </summary>
+    private static void OnIsReadOnlyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is TableViewColumn column)
+        {
+            if (column.TableView is TableView tableView &&
+                tableView.IsReadOnly &&
+                tableView.IsEditing &&
+                tableView.CurrentCellSlot is not null &&
+                tableView.GetCellFromSlot(tableView.CurrentCellSlot.Value) is { } currentCell &&
+                tableView.EndCellEditing(TableViewEditAction.Cancel, currentCell))
+            {
+                tableView.SetIsEditing(false);
+            }
+
+            column.OwningCollection?.HandleColumnPropertyChanged(column, nameof(IsReadOnly));
+        }
+    }
+
     /// <summary>
     /// Handles changes to the CanFilter property.
     /// </summary>
@@ -612,7 +631,7 @@ public string? SortMemberPath
     /// <summary>
     /// Identifies the IsReadOnly dependency property.
     /// </summary>
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(TableViewColumn), new PropertyMetadata(false, OnPropertyChanged));
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(nameof(IsReadOnly), typeof(bool), typeof(TableViewColumn), new PropertyMetadata(false, OnIsReadOnlyChanged));
 
     /// <summary>
     /// Identifies the Visibility dependency property.

src/TableView.Properties.cs

@@ -957,9 +957,18 @@ private static void OnIsReadOnlyChanged(DependencyObject d, DependencyPropertyCh
         {
             tableView.OnIsReadOnlyChanged(e);
 
-            if ((tableView.SelectionMode is ListViewSelectionMode.None
+            if (!tableView.IsReadOnly) return;
+
+            if (tableView.IsEditing &&
+                tableView.CurrentCellSlot is not null &&
+                tableView.GetCellFromSlot(tableView.CurrentCellSlot.Value) is { } currentCell &&
+                tableView.EndCellEditing(TableViewEditAction.Cancel, currentCell))
+            {
+                tableView.SetIsEditing(false);
+            }
+
+            if (tableView.SelectionMode is ListViewSelectionMode.None
                 || tableView.SelectionUnit is TableViewSelectionUnit.Row)
-                && tableView.IsReadOnly)
             {
                 tableView.CurrentCellSlot = null;
             }