Fixes #4621. Replace TimeField/DateField with new TimeEditor/DateEditor based on TextValidateField

.tg-docs/INDEX.md

@@ -82,7 +82,7 @@ Instead of embedding descriptions, it points to actual source files that agents
 |Views/SpinnerView:{SpinnerStyle.cs,SpinnerView.cs}
 |Views/TableView:{CellActivatedEventArgs.cs,CellColorGetterArgs.cs,CellToggledEventArgs.cs,CheckBoxTableSourceWrapper.cs,CheckBoxTableSourceWrapperByIndex.cs,CheckBoxTableSourceWrapperByObject.cs,ColumnStyle.cs,DataTableSource.cs,EnumerableTableSource.cs,IEnumerableTableSource.cs,ITableSource.cs,ListColumnStyle.cs,ListTableSource.cs,RowColorGetterArgs.cs,SelectedCellChangedEventArgs.cs,TableSelection.cs,TableStyle.cs,TableView.CellMapping.cs,TableView.cs,TableView.Drawing.cs,TableView.Mouse.cs,TableView.Navigation.cs,TableView.Selection.cs,TreeTableSource.cs}
 |Views/TabView:{Tab.cs,TabChangedEventArgs.cs,TabMouseEventArgs.cs,TabRow.cs,TabStyle.cs,TabView.cs}
-|Views/TextInput:{ContentsChangedEventArgs.cs,DateField.cs,HistoryText.cs,HistoryTextItemEventArgs.cs,ITextValidateProvider.cs,NetMaskedTextProvider.cs,TextEditingLineStatus.cs,TextModel.cs,TextRegexProvider.cs,TextValidateField.cs,TimeField.cs}
+|Views/TextInput:{ContentsChangedEventArgs.cs,DateEditor.cs,DateTextProvider.cs,HistoryText.cs,HistoryTextItemEventArgs.cs,ITextValidateProvider.cs,NetMaskedTextProvider.cs,TextEditingLineStatus.cs,TextModel.cs,TextRegexProvider.cs,TextValidateField.cs,TimeEditor.cs,TimeTextProvider.cs}
 |Views/TextInput/TextField:{TextField.Commands.cs,TextField.cs,TextField.Drawing.cs,TextField.History.cs,TextField.Keyboard.cs,TextField.Mouse.cs,TextField.Selection.cs,TextField.Text.cs,TextFieldAutocomplete.cs}
 |Views/TextInput/TextView:{TextView.Commands.cs,TextView.cs,TextView.Drawing.cs,TextView.Files.cs,TextView.Find.cs,TextView.History.cs,TextView.Keyboard.cs,TextView.Mouse.cs,TextView.Movement.cs,TextView.Scrolling.cs,TextView.Selection.cs,TextView.Text.cs,TextView.WordWrap.cs,TextViewAutocomplete.cs,WordWrapManager.cs}
 |Views/TreeView:{AspectGetterDelegate.cs,Branch.cs,DelegateTreeBuilder.cs,DrawTreeViewLineEventArgs.cs,ITreeBuilder.cs,ITreeViewFilter.cs,ObjectActivatedEventArgs.cs,SelectionChangedEventArgs.cs,TreeBuilder.cs,TreeNode.cs,TreeNodeBuilder.cs,TreeStyle.cs,TreeView.cs,TreeViewCollectionNavigatorMatcher.cs,TreeViewTextFilter.cs}

AGENTS.md

@@ -249,7 +249,7 @@ See `.claude/cookbook/` for common UI patterns:
 |Views/SpinnerView:{SpinnerStyle.cs,SpinnerView.cs}
 |Views/TableView:{CellActivatedEventArgs.cs,CellColorGetterArgs.cs,CellToggledEventArgs.cs,CheckBoxTableSourceWrapper.cs,CheckBoxTableSourceWrapperByIndex.cs,CheckBoxTableSourceWrapperByObject.cs,ColumnStyle.cs,DataTableSource.cs,EnumerableTableSource.cs,IEnumerableTableSource.cs,ITableSource.cs,ListColumnStyle.cs,ListTableSource.cs,RowColorGetterArgs.cs,SelectedCellChangedEventArgs.cs,TableSelection.cs,TableStyle.cs,TableView.CellMapping.cs,TableView.cs,TableView.Drawing.cs,TableView.Mouse.cs,TableView.Navigation.cs,TableView.Selection.cs,TreeTableSource.cs}
 |Views/TabView:{Tab.cs,TabChangedEventArgs.cs,TabMouseEventArgs.cs,TabRow.cs,TabStyle.cs,TabView.cs}
-|Views/TextInput:{ContentsChangedEventArgs.cs,DateField.cs,HistoryText.cs,HistoryTextItemEventArgs.cs,ITextValidateProvider.cs,NetMaskedTextProvider.cs,TextEditingLineStatus.cs,TextModel.cs,TextRegexProvider.cs,TextValidateField.cs,TimeField.cs}
+|Views/TextInput:{ContentsChangedEventArgs.cs,DateEditor.cs,DateTextProvider.cs,HistoryText.cs,HistoryTextItemEventArgs.cs,ITextValidateProvider.cs,NetMaskedTextProvider.cs,TextEditingLineStatus.cs,TextModel.cs,TextRegexProvider.cs,TextValidateField.cs,TimeEditor.cs,TimeTextProvider.cs}
 |Views/TextInput/TextField:{TextField.Commands.cs,TextField.cs,TextField.Drawing.cs,TextField.History.cs,TextField.Keyboard.cs,TextField.Mouse.cs,TextField.Selection.cs,TextField.Text.cs,TextFieldAutocomplete.cs}
 |Views/TextInput/TextView:{TextView.Commands.cs,TextView.cs,TextView.Drawing.cs,TextView.Files.cs,TextView.Find.cs,TextView.History.cs,TextView.Keyboard.cs,TextView.Mouse.cs,TextView.Movement.cs,TextView.Scrolling.cs,TextView.Selection.cs,TextView.Text.cs,TextView.WordWrap.cs,TextViewAutocomplete.cs,WordWrapManager.cs}
 |Views/TreeView:{AspectGetterDelegate.cs,Branch.cs,DelegateTreeBuilder.cs,DrawTreeViewLineEventArgs.cs,ITreeBuilder.cs,ITreeViewFilter.cs,ObjectActivatedEventArgs.cs,SelectionChangedEventArgs.cs,TreeBuilder.cs,TreeNode.cs,TreeNodeBuilder.cs,TreeStyle.cs,TreeView.cs,TreeViewCollectionNavigatorMatcher.cs,TreeViewTextFilter.cs}

Examples/UICatalog/Scenarios/TextInputControls.cs

@@ -13,8 +13,8 @@ namespace UICatalog.Scenarios;
 [ScenarioCategory ("DateTime")]
 public class TextInputControls : Scenario
 {
-    private Label? _labelMirroringTimeField;
-    private TimeField? _timeField;
+    private Label? _labelMirroringTimeEditor;
+    private TimeEditor? _timeEditor;
 
     public override void Main ()
     {
@@ -115,10 +115,7 @@ void TextViewDrawContent (object? sender, DrawEventArgs e) =>
 
         CheckBox chxReadOnly = new ()
         {
-            X = Pos.Left (textView),
-            Y = Pos.Bottom (textView),
-            Value = textView.ReadOnly ? CheckState.Checked : CheckState.UnChecked,
-            Text = "Read_Only"
+            X = Pos.Left (textView), Y = Pos.Bottom (textView), Value = textView.ReadOnly ? CheckState.Checked : CheckState.UnChecked, Text = "Read_Only"
         };
         chxReadOnly.ValueChanging += (_, args) => textView.ReadOnly = args.NewValue == CheckState.Checked;
         win.Add (chxReadOnly);
@@ -155,39 +152,39 @@ void TextViewDrawContent (object? sender, DrawEventArgs e) =>
         };
 
         chxMultiline.ValueChanging += (_, e) =>
-                                             {
-                                                 textView.Multiline = e.NewValue == CheckState.Checked;
+                                      {
+                                          textView.Multiline = e.NewValue == CheckState.Checked;
 
-                                                 if (!textView.Multiline && chxWordWrap.Value == CheckState.Checked)
-                                                 {
-                                                     chxWordWrap.Value = CheckState.UnChecked;
-                                                 }
+                                          if (!textView.Multiline && chxWordWrap.Value == CheckState.Checked)
+                                          {
+                                              chxWordWrap.Value = CheckState.UnChecked;
+                                          }
 
-                                                 if (!textView.Multiline && chxCaptureTabs.Value == CheckState.Checked)
-                                                 {
-                                                     chxCaptureTabs.Value = CheckState.UnChecked;
-                                                 }
-                                             };
+                                          if (!textView.Multiline && chxCaptureTabs.Value == CheckState.Checked)
+                                          {
+                                              chxCaptureTabs.Value = CheckState.UnChecked;
+                                          }
+                                      };
 
         Key? keyTab = textView.KeyBindings.GetFirstFromCommands (Command.NextTabStop);
         Key? keyBackTab = textView.KeyBindings.GetFirstFromCommands (Command.PreviousTabStop);
 
         chxCaptureTabs.ValueChanging += (_, e) =>
-                                               {
-                                                   textView.TabKeyAddsTab = e.NewValue == CheckState.Checked;
-
-                                                   // TODO: This should be in TextView.TabKeyAddsTab_set
-                                                   if (e.NewValue == CheckState.Checked)
-                                                   {
-                                                       textView.KeyBindings.Add (keyTab!, Command.NextTabStop);
-                                                       textView.KeyBindings.Add (keyBackTab!, Command.PreviousTabStop);
-                                                   }
-                                                   else
-                                                   {
-                                                       textView.KeyBindings.Remove (keyTab!);
-                                                       textView.KeyBindings.Remove (keyBackTab!);
-                                                   }
-                                               };
+                                        {
+                                            textView.TabKeyAddsTab = e.NewValue == CheckState.Checked;
+
+                                            // TODO: This should be in TextView.TabKeyAddsTab_set
+                                            if (e.NewValue == CheckState.Checked)
+                                            {
+                                                textView.KeyBindings.Add (keyTab!, Command.NextTabStop);
+                                                textView.KeyBindings.Add (keyBackTab!, Command.PreviousTabStop);
+                                            }
+                                            else
+                                            {
+                                                textView.KeyBindings.Remove (keyTab!);
+                                                textView.KeyBindings.Remove (keyBackTab!);
+                                            }
+                                        };
         win.Add (chxCaptureTabs);
 
         CheckBox scrollBars = new ()
@@ -227,56 +224,48 @@ void TextViewDrawContent (object? sender, DrawEventArgs e) =>
                             };
         win.Add (labelMirroringHexEditor);
 
-        // DateField
-        label = new Label { Text = " _DateField:", Y = Pos.Bottom (hexEditor) + 1 };
+        // DateEditor
+        label = new Label { Text = "_DateEditor:", Y = Pos.Bottom (hexEditor) + 1 };
         win.Add (label);
 
-        DateField dateField = new (DateTime.Now) { X = Pos.Right (label) + 1, Y = Pos.Bottom (hexEditor) + 1, Width = 20 };
-        win.Add (dateField);
+        DateEditor dateEditor = new () { X = Pos.Right (label) + 1, Y = Pos.Bottom (hexEditor) + 1, Value = DateTime.Today };
+        win.Add (dateEditor);
 
-        Label labelMirroringDateField = new ()
+        Label labelMirroringDateEditor = new ()
         {
-            X = Pos.Right (dateField) + 1,
-            Y = Pos.Top (dateField),
-            Width = Dim.Width (dateField),
-            Height = Dim.Height (dateField),
-            Text = dateField.Text
+            X = Pos.Right (dateEditor) + 1,
+            Y = Pos.Top (dateEditor),
+            Width = Dim.Width (dateEditor),
+            Height = Dim.Height (dateEditor),
+            Text = dateEditor.Text
         };
-        win.Add (labelMirroringDateField);
+        win.Add (labelMirroringDateEditor);
 
-        dateField.TextChanged += (_, _) => { labelMirroringDateField.Text = dateField.Text; };
+        dateEditor.ValueChanged += (_, _) => { labelMirroringDateEditor.Text = dateEditor.Text; };
 
-        // TimeField
-        label = new Label { Text = "T_imeField:", Y = Pos.Top (dateField), X = Pos.Right (labelMirroringDateField) + 5 };
+        // TimeEditor
+        label = new Label { Text = "T_imeEditor:", Y = Pos.Top (dateEditor), X = Pos.Right (labelMirroringDateEditor) + 5 };
         win.Add (label);
 
-        _timeField = new TimeField
-        {
-            X = Pos.Right (label) + 1,
-            Y = Pos.Top (dateField),
-            Width = 20,
-            IsShortFormat = false,
-            Value = DateTime.Now.TimeOfDay
-        };
-        win.Add (_timeField);
+        _timeEditor = new TimeEditor { X = Pos.Right (label) + 1, Y = Pos.Top (dateEditor), Value = DateTime.Now.TimeOfDay };
+        win.Add (_timeEditor);
 
-        _labelMirroringTimeField = new Label
+        _labelMirroringTimeEditor = new Label
         {
-            X = Pos.Right (_timeField) + 1,
-            Y = Pos.Top (_timeField),
-            Width = Dim.Width (_timeField),
-            Height = Dim.Height (_timeField),
-            Text = _timeField.Text
+            X = Pos.Right (_timeEditor) + 1,
+            Y = Pos.Top (_timeEditor),
+            Width = Dim.Width (_timeEditor),
+            Height = Dim.Height (_timeEditor),
+            Text = _timeEditor.Text
         };
-        win.Add (_labelMirroringTimeField);
+        win.Add (_labelMirroringTimeEditor);
 
-        _timeField.ValueChanged += TimeChanged;
+        _timeEditor.ValueChanged += TimeChanged;
 
         // MaskedTextProvider - uses .NET MaskedTextProvider
-        Label netProviderLabel = new () { X = Pos.Left (dateField), Y = Pos.Bottom (dateField) + 1, Text = "_NetMaskedTextProvider [ +99 (000) 000-0000 ]:" };
-        win.Add (netProviderLabel);
-
         NetMaskedTextProvider netProvider = new ("+99 (000) 000-0000");
+        Label netProviderLabel = new () { X = Pos.Left (dateEditor), Y = Pos.Bottom (dateEditor) + 1, Text = $"_NetMaskedTextProvider ({netProvider.Mask}):" };
+        win.Add (netProviderLabel);
 
         TextValidateField netProviderField = new () { X = Pos.Right (netProviderLabel) + 1, Y = Pos.Y (netProviderLabel), Provider = netProvider };
         win.Add (netProviderField);
@@ -294,14 +283,14 @@ void TextViewDrawContent (object? sender, DrawEventArgs e) =>
         netProviderField.Provider.TextChanged += (_, _) => { labelMirroringNetProviderField.Text = netProviderField.Text; };
 
         // TextRegexProvider - Regex provider implemented by Terminal.Gui
+        TextRegexProvider provider2 = new ("^([0-9]?[0-9]?[0-9]|1000)$") { ValidateOnInput = false };
+
         Label regexProviderLabel = new ()
         {
-            X = Pos.Left (netProviderLabel), Y = Pos.Bottom (netProviderLabel) + 1, Text = "Text_RegexProvider [ ^([0-9]?[0-9]?[0-9]|1000)$ ]:"
+            X = Pos.Left (netProviderLabel), Y = Pos.Bottom (netProviderLabel) + 1, Text = $"Text_RegexProvider ({provider2.Pattern}):"
         };
         win.Add (regexProviderLabel);
 
-        TextRegexProvider provider2 = new ("^([0-9]?[0-9]?[0-9]|1000)$") { ValidateOnInput = false };
-
         TextValidateField regexProviderField = new ()
         {
             X = Pos.Right (regexProviderLabel) + 1,
@@ -475,9 +464,9 @@ void WinOnAccept (object? sender, CommandEventArgs e)
 
     private void TimeChanged (object? sender, ValueChangedEventArgs<TimeSpan> e)
     {
-        if (_labelMirroringTimeField is { } && _timeField is { })
+        if (_labelMirroringTimeEditor is { } && _timeEditor is { })
         {
-            _labelMirroringTimeField.Text = _timeField.Text;
+            _labelMirroringTimeEditor.Text = _timeEditor.Text;
         }
     }
 }