Merge pull request #122 from w-ahmad/uno-platform

added uno support

Author: w-ahmad

src/Columns/TableViewColumn.cs

@@ -3,11 +3,12 @@
 
 namespace WinUI.TableView;
 
+/// <summary>
 /// Represents a column in a TableView.
 /// </summary>
 [StyleTypedProperty(Property = nameof(HeaderStyle), StyleTargetType = typeof(TableViewColumnHeader))]
 [StyleTypedProperty(Property = nameof(CellStyle), StyleTargetType = typeof(TableViewCell))]
-public abstract class TableViewColumn : DependencyObject
+public abstract partial class TableViewColumn : DependencyObject
 {
     private TableViewColumnHeader? _headerControl;
     private double _desiredWidth;
@@ -393,7 +394,7 @@ private static void OnCellStyleChanged(DependencyObject d, DependencyPropertyCha
     /// <summary>
     /// Identifies the CellStyle dependency property.
     /// </summary>
-    public static readonly DependencyProperty CellStyleProperty = DependencyProperty.Register(nameof(CellStyle), typeof(Style), typeof(TableView), new PropertyMetadata(null, OnCellStyleChanged));
+    public static readonly DependencyProperty CellStyleProperty = DependencyProperty.Register(nameof(CellStyle), typeof(Style), typeof(TableViewColumn), new PropertyMetadata(null, OnCellStyleChanged));
 
     /// <summary>
     /// Identifies the Header dependency property.

src/Columns/TableViewDateColumn.cs

@@ -2,7 +2,6 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
 using System;
-using Windows.Globalization.DateTimeFormatting;
 using WinUI.TableView.Controls;
 using WinUI.TableView.Extensions;
 using WinUI.TableView.Helpers;
@@ -17,14 +16,6 @@ namespace WinUI.TableView;
 [StyleTypedProperty(Property = nameof(EditingElementStyle), StyleTargetType = typeof(TableViewDatePicker))]
 public partial class TableViewDateColumn : TableViewBoundColumn
 {
-    /// <summary>
-    /// Initializes a new instance of the TableViewDateColumn class.
-    /// </summary>
-    public TableViewDateColumn()
-    {
-        DateFormat = DateTimeFormatter.ShortDate.Patterns[0];
-    }
-
     /// <summary>
     /// Generates a TextBlock element for the cell.
     /// </summary>
@@ -230,5 +221,5 @@ public DayOfWeek FirstDayOfWeek
     /// <summary>
     /// Identifies the DateFormat dependency property.
     /// </summary>
-    public static readonly DependencyProperty DateFormatProperty = DependencyProperty.Register(nameof(DateFormat), typeof(string), typeof(TableViewDateColumn), new PropertyMetadata(default));
+    public static readonly DependencyProperty DateFormatProperty = DependencyProperty.Register(nameof(DateFormat), typeof(string), typeof(TableViewDateColumn), new PropertyMetadata("shortdate"));
 }

src/Columns/TableViewTimeColumn.cs

@@ -21,7 +21,7 @@ public partial class TableViewTimeColumn : TableViewBoundColumn
     /// </summary>
     public TableViewTimeColumn()
     {
-        ClockIdentifier = DateTimeFormatter.ShortTime.Clock;
+        ClockIdentifier = DateTimeFormatter.LongTime.Clock;
     }
 
     /// <summary>

src/Controls/TableViewTimePicker.cs

@@ -110,7 +110,7 @@ private void UpdateTimeText()
     {
         if (_timeText is null) return;
 
-        var formatter = ClockIdentifier is "24HourClock" ? DateTimeFormatHelper._24HourClockFormatter : DateTimeFormatHelper._12HourClockFormatter;
+        var formatter = DateTimeFormatHelper.GetDateTimeFormatter("shortime", ClockIdentifier);
 
         _timeText.Text = SelectedTime switch
         {

src/Extensions/DateTimeExtensions.cs

@@ -3,7 +3,7 @@
 namespace WinUI.TableView.Extensions;
 
 /// <summary>
-/// Provides extension methods for Date&Time types.
+/// Provides extension methods for Date and Time types.
 /// </summary>
 internal static class DateTimeExtensions
 {

src/Helpers/DateTimeFormatHelper.cs

@@ -1,44 +1,23 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using Windows.Globalization.DateTimeFormatting;
 using Windows.System.UserProfile;
 using WinUI.TableView.Extensions;
 
 namespace WinUI.TableView.Helpers;
 
 /// <summary>
-/// Provides helper methods for formatting Date&Time values.
+/// Provides helper methods for formatting Date and Time values.
 /// </summary>
 internal static class DateTimeFormatHelper
 {
     private const string _12HourClock = "12HourClock";
     private const string _24HourClock = "24HourClock";
-
-    /// <summary>
-    /// Gets the DateTimeFormatter for 12-hour clock format.
-    /// </summary>
-    internal static DateTimeFormatter _12HourClockFormatter { get; } = GetClockFormatter(_12HourClock);
-
-    /// <summary>
-    /// Gets the DateTimeFormatter for 24-hour clock format.
-    /// </summary>
-    internal static DateTimeFormatter _24HourClockFormatter { get; } = GetClockFormatter(_24HourClock);
-
-    /// <summary>
-    /// Gets a DateTimeFormatter for the specified clock format.
-    /// </summary>
-    /// <param name="clock">The clock format ("12HourClock" or "24HourClock").</param>
-    /// <returns>A DateTimeFormatter for the specified clock format.</returns>
-    private static DateTimeFormatter GetClockFormatter(string clock)
-    {
-        var languages = GlobalizationPreferences.Languages;
-        var geographicRegion = GlobalizationPreferences.HomeGeographicRegion;
-        var calendar = GlobalizationPreferences.Calendars[0];
-
-        return new DateTimeFormatter("shorttime", languages, geographicRegion, calendar, clock);
-    }
+    private static readonly Dictionary<(string Format, string? Clock), DateTimeFormatter> _formatters = [];
 
     /// <summary>
     /// Sets the formatted text for a TextBlock based on its value and format.
@@ -53,7 +32,7 @@ private static void SetFormattedText(TextBlock textBlock)
         {
             if (value is not null && format is _12HourClock or _24HourClock)
             {
-                var formatter = format is _24HourClock ? _24HourClockFormatter : _12HourClockFormatter;
+                var formatter = GetDateTimeFormatter("shorttime", format);
                 var dateTimeOffset = value switch
                 {
                     TimeSpan timeSpan => timeSpan.ToDateTimeOffset(),
@@ -67,7 +46,8 @@ private static void SetFormattedText(TextBlock textBlock)
             }
             else if (value is not null)
             {
-                var formatter = new DateTimeFormatter(format);
+                var formatter = GetDateTimeFormatter(format);
+
                 var dateTimeOffset = value switch
                 {
                     DateOnly dateOnly => dateOnly.ToDateTimeOffset(),
@@ -90,6 +70,29 @@ private static void SetFormattedText(TextBlock textBlock)
         }
     }
 
+    /// <summary>
+    /// Gets a DateTimeFormatter for the specified format and clock.
+    /// </summary>
+    internal static DateTimeFormatter GetDateTimeFormatter(string strFormat, string? strClock = null)
+    {
+        if (_formatters.TryGetValue((strFormat, strClock), out var cacheFormatter))
+        {
+            return cacheFormatter;
+        }
+
+        var formatter = new DateTimeFormatter(strFormat);
+        var result = new DateTimeFormatter(
+             strFormat,
+             formatter.Languages,
+             formatter.GeographicRegion,
+             formatter.Calendar,
+             strClock ?? formatter.Clock);
+
+        _formatters[(strFormat, strClock)] = result;
+
+        return result;
+    }
+
     /// <summary>
     /// Handles changes to the Value attached property.
     /// </summary>

src/TableView.Properties.cs

@@ -125,6 +125,7 @@ public partial class TableView
     /// </summary>
     public static readonly DependencyProperty VerticalGridLinesStrokeProperty = DependencyProperty.Register(nameof(VerticalGridLinesStroke), typeof(Brush), typeof(TableView), new PropertyMetadata(default, OnGridLinesPropertyChanged));
 
+#if WINDOWS
     /// <summary>
     /// Identifies the AlternateRowForeground dependency property.
     /// </summary>
@@ -144,7 +145,7 @@ public partial class TableView
     /// Identifies the CellContextFlyout dependency property.
     /// </summary>
     public static readonly DependencyProperty CellContextFlyoutProperty = DependencyProperty.Register(nameof(CellContextFlyout), typeof(FlyoutBase), typeof(TableView), new PropertyMetadata(null));
-
+#endif
     /// <summary>
     /// Identifies the ColumnHeaderStyle dependency property.
     /// </summary>
@@ -430,6 +431,7 @@ public Brush HorizontalGridLinesStroke
         set => SetValue(HorizontalGridLinesStrokeProperty, value);
     }
 
+#if WINDOWS
     /// <summary>
     /// Gets or sets the background brush for alternate rows.
     /// </summary>
@@ -465,6 +467,7 @@ public FlyoutBase? CellContextFlyout
         get => (FlyoutBase?)GetValue(CellContextFlyoutProperty);
         set => SetValue(CellContextFlyoutProperty, value);
     }
+#endif
 
     /// <summary>
     /// Gets or sets the style applied to all column headers.
@@ -491,7 +494,7 @@ private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyC
     {
         if (d is TableView tableView)
         {
-            tableView.OnItemsSourceChanged(e);
+            tableView.ItemsSourceChanged(e);
             tableView.SelectedCellRanges.Clear();
             tableView.OnCellSelectionChanged();
         }