Merge pull request #18 from nord-/claude/busy-allen-jucw81

nord- · web-flow · commit 81d4af7b178c · 2026-06-10T08:22:29.000+02:00
Åtgärda fynd från kodgranskningen i #17
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -25,12 +25,18 @@ No test project exists currently.
 
 ### Control Hierarchy
 
-`LabelBase` is the base control — a Grid containing a Label, required indicator (`*`), a Border wrapping a generic View, and error message labels. Each concrete control inherits from `LabelBase` and composes a native MAUI control inside the Border:
+`LabelBase` is the base control — a Grid containing a label (with required indicator `*`) floating over a `NotchedBorder`, plus example and error message labels below. The label sits over the top edge of the border; `LabelBase` computes the notch coordinates so the stroke leaves a gap behind the label text. Each concrete control inherits from `LabelBase` and composes a native MAUI control inside the border:
 
 - **LabeledEntry** → wraps `EntryBase` (platform-specific Entry)
-- **LabeledPicker** → wraps `Picker`
-- **LabeledDatePicker** → wraps `DatePicker`
-- **LabeledTimePicker** → wraps `TimePicker`
+- **LabeledPicker** → wraps `PickerBase`
+- **LabeledDatePicker** → wraps `DatePickerBase`
+- **LabeledTimePicker** → wraps `TimePickerBase`
+
+`LabeledAutoCompleteEntry` is a separate `ContentView` that composes a `LabeledEntry` plus a suggestion dropdown (`CollectionView` in a `Border`), forwarding a subset of `LabeledEntry`'s properties.
+
+### Drawing
+
+`Drawing/NotchedBorder` is an internal-by-convention control (public but `[EditorBrowsable(Never)]`) that renders the outlined border via `Microsoft.Maui.Graphics` (`GraphicsView` + `IDrawable`). The pure path geometry lives in `Drawing/NotchedBorderDrawing.BuildPath`.
 
 ### Key Pattern: BindableProperty Proxying
 
@@ -43,9 +49,9 @@ Each control proxies BindableProperties from the inner MAUI control to the outer
 
 ### Platform-Specific Code
 
-`EntryBase` uses conditional compilation (`#if ANDROID` / `#if IOS`) to select `EntryBaseNative`, which applies platform-specific styling through MAUI handler mappers:
+`EntryBase` uses conditional compilation (`#if ANDROID` / `#if IOS`) to select `EntryBaseNative`; `PickerBase`/`DatePickerBase`/`TimePickerBase` use inline `#if` blocks. All apply platform-specific styling through MAUI handler mappers, filtered on the NiceEntry view type so consumer controls are unaffected:
 - **Android**: Transparent background on the underlying `AppCompatEditText`
-- **iOS**: No border style on the underlying `UITextField`
+- **iOS**: No border style on the underlying `UITextField`; the picker-style controls also override `MeasureOverride` to match the height of a borderless `UITextField` at the current font size (shared cache in `Base/NativeEntryHeight`)
 
 ### Validation
 
diff --git a/NiceEntry/Base/DatePickerBase.cs b/NiceEntry/Base/DatePickerBase.cs
@@ -12,34 +12,26 @@ internal class DatePickerBase : DatePicker
 #if ANDROID
     static DatePickerBase()
     {
-        DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, _) =>
+        DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, view) =>
         {
-            handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
+            if (view is DatePickerBase)
+                handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
         });
     }
 #elif IOS
-    private static nfloat? _entryHeight;
-
     static DatePickerBase()
     {
-        DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, _) =>
+        DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, view) =>
         {
-            handler.PlatformView.BorderStyle = UITextBorderStyle.None;
+            if (view is DatePickerBase)
+                handler.PlatformView.BorderStyle = UITextBorderStyle.None;
         });
     }
 
     protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
     {
         var size = base.MeasureOverride(widthConstraint, heightConstraint);
-
-        if (_entryHeight is null)
-        {
-            using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };
-            var refSize = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));
-            _entryHeight = refSize.Height;
-        }
-
-        return new Size(size.Width, (double)_entryHeight.Value);
+        return new Size(size.Width, NativeEntryHeight.For(FontSize));
     }
 #endif
 }
diff --git a/NiceEntry/Base/LabelBase.xaml.cs b/NiceEntry/Base/LabelBase.xaml.cs
@@ -51,7 +51,7 @@ public LabelBase()
     }
 
     // Existing properties
-    public static readonly BindableProperty ViewProperty = BindableProperty.Create("View",
+    public static readonly BindableProperty ViewProperty = BindableProperty.Create(nameof(View),
         typeof(View), typeof(LabelBase), defaultValue: null, defaultBindingMode: BindingMode.OneWay,
         propertyChanged: ElementChanged);
 
@@ -132,6 +132,7 @@ private void UpdateElementView()
         _contentGrid.Insert(0, View);
         Grid.SetColumn((BindableObject)View, 0);
         BorderLabel.Content = _contentGrid;
+        UpdateSemanticDescription();
         UpdateIsRequiredView();
     }
 
@@ -154,9 +155,20 @@ private void UpdateLabelView()
     {
         LabelLabel.Text = Label;
         LabelLabel.IsVisible = !string.IsNullOrEmpty(Label);
+        UpdateSemanticDescription();
         UpdateNotchBounds();
     }
 
+    // Forward the label text to the inner control so screen readers announce
+    // what the input is for; the visual label is a sibling element and is not
+    // associated with the input by the platform.
+    private void UpdateSemanticDescription()
+    {
+        if (View is null) return;
+
+        SemanticProperties.SetDescription(View, Label);
+    }
+
     private void UpdateNotchBounds()
     {
         if (LabelContainer.Width <= 0 || !LabelLabel.IsVisible)
@@ -175,8 +187,12 @@ private void UpdateNotchBounds()
     private void UpdateErrorView()
     {
         var count = Error?.Count ?? 0;
-        ErrorLabel.Text = count > 0 ? string.Join(',', Error!) : string.Empty;
+        ErrorLabel.Text = count > 0 ? string.Join(", ", Error!) : string.Empty;
         ErrorLabel.IsVisible = count > 0;
+
+        if (count > 0)
+            SemanticScreenReader.Announce(ErrorLabel.Text);
+
         ChangeBorderColor();
     }
 
diff --git a/NiceEntry/Base/NativeEntryHeight.cs b/NiceEntry/Base/NativeEntryHeight.cs
@@ -0,0 +1,29 @@
+#if IOS
+using UIKit;
+
+namespace NiceEntry;
+
+/// <summary>
+/// Measures the height of a borderless <see cref="UITextField"/> so the
+/// picker-style inputs match the height of <c>EntryBase</c> at the same
+/// font size. Results are cached per font size.
+/// </summary>
+internal static class NativeEntryHeight
+{
+    private static readonly Dictionary<double, double> Cache = new();
+
+    public static double For(double fontSize)
+    {
+        var key = fontSize > 0 ? fontSize : 0;
+        if (Cache.TryGetValue(key, out var height)) return height;
+
+        using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };
+        if (key > 0)
+            reference.Font = UIFont.SystemFontOfSize((nfloat)key);
+
+        var size = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));
+        Cache[key] = size.Height;
+        return size.Height;
+    }
+}
+#endif
diff --git a/NiceEntry/Base/PickerBase.cs b/NiceEntry/Base/PickerBase.cs
@@ -12,34 +12,26 @@ internal class PickerBase : Picker
 #if ANDROID
     static PickerBase()
     {
-        PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, _) =>
+        PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, view) =>
         {
-            handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
+            if (view is PickerBase)
+                handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
         });
     }
 #elif IOS
-    private static nfloat? _entryHeight;
-
     static PickerBase()
     {
-        PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, _) =>
+        PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, view) =>
         {
-            handler.PlatformView.BorderStyle = UITextBorderStyle.None;
+            if (view is PickerBase)
+                handler.PlatformView.BorderStyle = UITextBorderStyle.None;
         });
     }
 
     protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
     {
         var size = base.MeasureOverride(widthConstraint, heightConstraint);
-
-        if (_entryHeight is null)
-        {
-            using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };
-            var refSize = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));
-            _entryHeight = refSize.Height;
-        }
-
-        return new Size(size.Width, (double)_entryHeight.Value);
+        return new Size(size.Width, NativeEntryHeight.For(FontSize));
     }
 #endif
 }
diff --git a/NiceEntry/Base/TimePickerBase.cs b/NiceEntry/Base/TimePickerBase.cs
@@ -12,34 +12,26 @@ internal class TimePickerBase : TimePicker
 #if ANDROID
     static TimePickerBase()
     {
-        TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, _) =>
+        TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, view) =>
         {
-            handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
+            if (view is TimePickerBase)
+                handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
         });
     }
 #elif IOS
-    private static nfloat? _entryHeight;
-
     static TimePickerBase()
     {
-        TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, _) =>
+        TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, view) =>
         {
-            handler.PlatformView.BorderStyle = UITextBorderStyle.None;
+            if (view is TimePickerBase)
+                handler.PlatformView.BorderStyle = UITextBorderStyle.None;
         });
     }
 
     protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
     {
         var size = base.MeasureOverride(widthConstraint, heightConstraint);
-
-        if (_entryHeight is null)
-        {
-            using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };
-            var refSize = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));
-            _entryHeight = refSize.Height;
-        }
-
-        return new Size(size.Width, (double)_entryHeight.Value);
+        return new Size(size.Width, NativeEntryHeight.For(FontSize));
     }
 #endif
 }
diff --git a/NiceEntry/LabeledAutoCompleteEntry.xaml.cs b/NiceEntry/LabeledAutoCompleteEntry.xaml.cs
@@ -29,6 +29,16 @@ public LabeledAutoCompleteEntry()
         Entry.Element.Focused += OnEntryFocused;
         Entry.Element.Unfocused += OnEntryUnfocused;
 
+        // Detach the CollectionChanged subscription while unloaded so a
+        // long-lived Suggestions collection doesn't keep this control (and
+        // its page) alive after navigation.
+        Loaded += (_, _) =>
+        {
+            AttachObservedSuggestions();
+            RebuildVisibleSuggestions();
+        };
+        Unloaded += (_, _) => DetachObservedSuggestions();
+
         SuggestionsView.ItemTemplate = DefaultSuggestionTemplate;
     }
 
@@ -67,7 +77,7 @@ public LabeledAutoCompleteEntry()
         propertyChanged: (b, _, n) => ((LabeledAutoCompleteEntry)b).Entry.Keyboard = (Keyboard)n);
 
     public static readonly BindableProperty MaxLengthProperty = BindableProperty.Create(
-        nameof(MaxLength), typeof(int), typeof(LabeledAutoCompleteEntry), defaultValue: -1,
+        nameof(MaxLength), typeof(int), typeof(LabeledAutoCompleteEntry), defaultValue: int.MaxValue,
         propertyChanged: (b, _, n) => ((LabeledAutoCompleteEntry)b).Entry.MaxLength = (int)n);
 
     public static readonly BindableProperty HorizontalTextAlignmentProperty = BindableProperty.Create(
@@ -121,19 +131,27 @@ private static void SuggestionsChanged(BindableObject bindable, object oldValue,
     {
         var self = (LabeledAutoCompleteEntry)bindable;
 
-        if (self._observedSuggestions is not null)
-        {
-            self._observedSuggestions.CollectionChanged -= self.OnSuggestionsCollectionChanged;
-            self._observedSuggestions = null;
-        }
+        self.DetachObservedSuggestions();
+        self.AttachObservedSuggestions();
+        self.RebuildVisibleSuggestions();
+    }
 
-        if (newValue is INotifyCollectionChanged notify)
-        {
-            self._observedSuggestions = notify;
-            notify.CollectionChanged += self.OnSuggestionsCollectionChanged;
-        }
+    private void AttachObservedSuggestions()
+    {
+        if (_observedSuggestions is not null) return;
+        if (!IsLoaded) return;
+        if (Suggestions is not INotifyCollectionChanged notify) return;
 
-        self.RebuildVisibleSuggestions();
+        _observedSuggestions = notify;
+        notify.CollectionChanged += OnSuggestionsCollectionChanged;
+    }
+
+    private void DetachObservedSuggestions()
+    {
+        if (_observedSuggestions is null) return;
+
+        _observedSuggestions.CollectionChanged -= OnSuggestionsCollectionChanged;
+        _observedSuggestions = null;
     }
 
     private void OnSuggestionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
diff --git a/NiceEntry/LabeledDatePicker.xaml.cs b/NiceEntry/LabeledDatePicker.xaml.cs
@@ -13,7 +13,7 @@ public LabeledDatePicker()
         UpdateFontSizeView();
 	}
     
-    public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime), typeof(LabeledDatePicker), propertyChanged: DateChanged, defaultBindingMode: BindingMode.TwoWay);
+    public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime), typeof(LabeledDatePicker), propertyChanged: DateChanged, defaultBindingMode: BindingMode.TwoWay, defaultValueCreator: static _ => DateTime.Today);
     public static readonly BindableProperty MinimumDateProperty = BindableProperty.Create(nameof(MinimumDate), typeof(DateTime), typeof(LabeledDatePicker), DateTime.MinValue, propertyChanged: MinimumDateChanged);
     public static readonly BindableProperty MaximumDateProperty = BindableProperty.Create(nameof(MaximumDate), typeof(DateTime), typeof(LabeledDatePicker), DateTime.MaxValue, propertyChanged: MaximumDateChanged);
     public static readonly BindableProperty FontSizeProperty = BindableProperty.Create(nameof(FontSize), typeof(double), typeof(LabeledDatePicker), LabelBase.DefaultFontSize, propertyChanged: FontSizeChanged);
diff --git a/NiceEntry/LabeledEntry.xaml.cs b/NiceEntry/LabeledEntry.xaml.cs
@@ -12,11 +12,7 @@ public LabeledEntry()
         Element.SetBinding(Entry.TextProperty, nameof(Text), BindingMode.TwoWay);
         Element.BindingContext = this;
 
-        Element.Focused += (_, _) =>
-        {
-            Element.CursorPosition = 0;
-            Element.SelectionLength = Element.Text?.Length ?? 0;
-        };
+        Element.Focused += OnElementFocused;
 
         UpdateFontSizeView();
         UpdatePlaceholderColorView();
@@ -25,14 +21,15 @@ public LabeledEntry()
     public static readonly BindableProperty TextProperty = BindableProperty.Create(nameof(Text), typeof(string), typeof(LabeledEntry), propertyChanged: TextChanged, defaultBindingMode: BindingMode.TwoWay);
     public static readonly BindableProperty PlaceholderProperty = BindableProperty.Create(nameof(Placeholder), typeof(string), typeof(LabeledEntry), propertyChanged: PlaceholderChanged);
     public static readonly BindableProperty PlaceholderColorProperty = BindableProperty.Create(nameof(PlaceholderColor), typeof(Color), typeof(LabeledEntry), Color.FromArgb("#808080"), propertyChanged: PlaceholderColorChanged);
-    public static readonly BindableProperty MaxLengthProperty = BindableProperty.Create(nameof(MaxLength), typeof(int), typeof(int), int.MaxValue, propertyChanged: MaxLengthChanged);
+    public static readonly BindableProperty MaxLengthProperty = BindableProperty.Create(nameof(MaxLength), typeof(int), typeof(LabeledEntry), int.MaxValue, propertyChanged: MaxLengthChanged);
     public static readonly BindableProperty ReturnTypeProperty = BindableProperty.Create(nameof(ReturnType), typeof(ReturnType), typeof(LabeledEntry), propertyChanged: ReturnTypeChanged);
     public static readonly BindableProperty KeyboardProperty = BindableProperty.Create(nameof(Keyboard), typeof(Keyboard), typeof(LabeledEntry), propertyChanged: KeyboardChanged);
     public static readonly BindableProperty IsPasswordProperty = BindableProperty.Create(nameof(IsPassword), typeof(bool), typeof(LabeledEntry), false, propertyChanged: IsPasswordChanged);
     public static readonly BindableProperty IsReadOnlyProperty = BindableProperty.Create(nameof(IsReadOnly), typeof(bool), typeof(LabeledEntry), false, propertyChanged: IsReadOnlyChanged);
     public static readonly BindableProperty ReturnCommandProperty = BindableProperty.Create(nameof(ReturnCommand), typeof(ICommand), typeof(LabeledEntry), propertyChanged: ReturnCommandChanged);
     public static readonly BindableProperty HorizontalTextAlignmentProperty = BindableProperty.Create(nameof(HorizontalTextAlignment), typeof(TextAlignment), typeof(LabeledEntry), TextAlignment.Start, propertyChanged: HorizontalTextAlignmentChanged);
     public static readonly BindableProperty FontSizeProperty = BindableProperty.Create(nameof(FontSize), typeof(double), typeof(LabeledEntry), LabelBase.DefaultFontSize, propertyChanged: FontSizeChanged);
+    public static readonly BindableProperty SelectAllOnFocusProperty = BindableProperty.Create(nameof(SelectAllOnFocus), typeof(bool), typeof(LabeledEntry), true);
 
     public string Text
     {
@@ -99,7 +96,21 @@ public double FontSize
         get => (double)GetValue(FontSizeProperty);
         set => SetValue(FontSizeProperty, value);
     }
-   
+
+    public bool SelectAllOnFocus
+    {
+        get => (bool)GetValue(SelectAllOnFocusProperty);
+        set => SetValue(SelectAllOnFocusProperty, value);
+    }
+
+    private void OnElementFocused(object? sender, FocusEventArgs e)
+    {
+        if (!SelectAllOnFocus) return;
+
+        Element.CursorPosition = 0;
+        Element.SelectionLength = Element.Text?.Length ?? 0;
+    }
+
     private static void TextChanged(BindableObject bindable, object oldValue, object newValue) => ((LabeledEntry)bindable).UpdateTextView();
     private static void PlaceholderChanged(BindableObject bindable, object oldValue, object newValue) => ((LabeledEntry)bindable).UpdatePlaceholderView();
     private static void PlaceholderColorChanged(BindableObject bindable, object oldValue, object newValue) => ((LabeledEntry)bindable).UpdatePlaceholderColorView();
diff --git a/NiceEntry/LabeledPicker.xaml.cs b/NiceEntry/LabeledPicker.xaml.cs
@@ -19,7 +19,7 @@ public LabeledPicker()
     }
     
     public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create(nameof(ItemsSource), typeof(IList), typeof(LabeledPicker), propertyChanged: ItemSourceChanged, defaultBindingMode: BindingMode.TwoWay);
-    public static readonly BindableProperty SelectedIndexProperty = BindableProperty.Create(nameof(SelectedIndex), typeof(int), typeof(LabeledPicker), propertyChanged: SelectedIndexChanged, defaultBindingMode: BindingMode.TwoWay);
+    public static readonly BindableProperty SelectedIndexProperty = BindableProperty.Create(nameof(SelectedIndex), typeof(int), typeof(LabeledPicker), -1, propertyChanged: SelectedIndexChanged, defaultBindingMode: BindingMode.TwoWay);
     public static readonly BindableProperty SelectedItemProperty = BindableProperty.Create(nameof(SelectedItem), typeof(object), typeof(LabeledPicker), propertyChanged: SelectedItemChanged, defaultBindingMode: BindingMode.TwoWay);
     public static readonly BindableProperty PlaceholderProperty = BindableProperty.Create(nameof(Placeholder), typeof(string), typeof(LabeledPicker), propertyChanged: PlaceholderChanged);
     public static readonly BindableProperty TitleColorProperty = BindableProperty.Create(nameof(TitleColor), typeof(Color), typeof(LabeledPicker), Color.FromArgb("#808080"), propertyChanged: TitleColorChanged);
diff --git a/NiceEntry/Platforms/Android/EntryBaseNative.cs b/NiceEntry/Platforms/Android/EntryBaseNative.cs
@@ -6,9 +6,10 @@ internal class EntryBaseNative : Entry
 {
     static EntryBaseNative()
     {
-        EntryHandler.Mapper.AppendToMapping("EntryBase", (handler, _) =>
+        EntryHandler.Mapper.AppendToMapping("EntryBase", (handler, view) =>
         {
-            handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
+            if (view is EntryBaseNative)
+                handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);
         });
     }
 }
diff --git a/NiceEntry/Platforms/iOS/EntryBaseNative.cs b/NiceEntry/Platforms/iOS/EntryBaseNative.cs
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -12,34 +12,26 @@ internal class DatePickerBase : DatePicker`
`12`	`12`	`#if ANDROID`
`13`	`13`	`static DatePickerBase()`
`14`	`14`	`{`
`15`		`- DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, _) =>`
	`15`	`+ DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, view) =>`
`16`	`16`	`{`
`17`		`- handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);`
	`17`	`+ if (view is DatePickerBase)`
	`18`	`+ handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);`
`18`	`19`	`});`
`19`	`20`	`}`
`20`	`21`	`#elif IOS`
`21`		`- private static nfloat? _entryHeight;`
`22`		`-`
`23`	`22`	`static DatePickerBase()`
`24`	`23`	`{`
`25`		`- DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, _) =>`
	`24`	`+ DatePickerHandler.Mapper.AppendToMapping("NiceEntryDatePicker", (handler, view) =>`
`26`	`25`	`{`
`27`		`- handler.PlatformView.BorderStyle = UITextBorderStyle.None;`
	`26`	`+ if (view is DatePickerBase)`
	`27`	`+ handler.PlatformView.BorderStyle = UITextBorderStyle.None;`
`28`	`28`	`});`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`protected override Size MeasureOverride(double widthConstraint, double heightConstraint)`
`32`	`32`	`{`
`33`	`33`	`var size = base.MeasureOverride(widthConstraint, heightConstraint);`
`34`		`-`
`35`		`- if (_entryHeight is null)`
`36`		`- {`
`37`		`- using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };`
`38`		`- var refSize = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));`
`39`		`- _entryHeight = refSize.Height;`
`40`		`- }`
`41`		`-`
`42`		`- return new Size(size.Width, (double)_entryHeight.Value);`
	`34`	`+ return new Size(size.Width, NativeEntryHeight.For(FontSize));`
`43`	`35`	`}`
`44`	`36`	`#endif`
`45`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,34 +12,26 @@ internal class PickerBase : Picker`
`12`	`12`	`#if ANDROID`
`13`	`13`	`static PickerBase()`
`14`	`14`	`{`
`15`		`- PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, _) =>`
	`15`	`+ PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, view) =>`
`16`	`16`	`{`
`17`		`- handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);`
	`17`	`+ if (view is PickerBase)`
	`18`	`+ handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);`
`18`	`19`	`});`
`19`	`20`	`}`
`20`	`21`	`#elif IOS`
`21`		`- private static nfloat? _entryHeight;`
`22`		`-`
`23`	`22`	`static PickerBase()`
`24`	`23`	`{`
`25`		`- PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, _) =>`
	`24`	`+ PickerHandler.Mapper.AppendToMapping("NiceEntryPicker", (handler, view) =>`
`26`	`25`	`{`
`27`		`- handler.PlatformView.BorderStyle = UITextBorderStyle.None;`
	`26`	`+ if (view is PickerBase)`
	`27`	`+ handler.PlatformView.BorderStyle = UITextBorderStyle.None;`
`28`	`28`	`});`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`protected override Size MeasureOverride(double widthConstraint, double heightConstraint)`
`32`	`32`	`{`
`33`	`33`	`var size = base.MeasureOverride(widthConstraint, heightConstraint);`
`34`		`-`
`35`		`- if (_entryHeight is null)`
`36`		`- {`
`37`		`- using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };`
`38`		`- var refSize = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));`
`39`		`- _entryHeight = refSize.Height;`
`40`		`- }`
`41`		`-`
`42`		`- return new Size(size.Width, (double)_entryHeight.Value);`
	`34`	`+ return new Size(size.Width, NativeEntryHeight.For(FontSize));`
`43`	`35`	`}`
`44`	`36`	`#endif`
`45`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,34 +12,26 @@ internal class TimePickerBase : TimePicker`
`12`	`12`	`#if ANDROID`
`13`	`13`	`static TimePickerBase()`
`14`	`14`	`{`
`15`		`- TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, _) =>`
	`15`	`+ TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, view) =>`
`16`	`16`	`{`
`17`		`- handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);`
	`17`	`+ if (view is TimePickerBase)`
	`18`	`+ handler.PlatformView.SetBackgroundColor(global::Android.Graphics.Color.Transparent);`
`18`	`19`	`});`
`19`	`20`	`}`
`20`	`21`	`#elif IOS`
`21`		`- private static nfloat? _entryHeight;`
`22`		`-`
`23`	`22`	`static TimePickerBase()`
`24`	`23`	`{`
`25`		`- TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, _) =>`
	`24`	`+ TimePickerHandler.Mapper.AppendToMapping("NiceEntryTimePicker", (handler, view) =>`
`26`	`25`	`{`
`27`		`- handler.PlatformView.BorderStyle = UITextBorderStyle.None;`
	`26`	`+ if (view is TimePickerBase)`
	`27`	`+ handler.PlatformView.BorderStyle = UITextBorderStyle.None;`
`28`	`28`	`});`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`protected override Size MeasureOverride(double widthConstraint, double heightConstraint)`
`32`	`32`	`{`
`33`	`33`	`var size = base.MeasureOverride(widthConstraint, heightConstraint);`
`34`		`-`
`35`		`- if (_entryHeight is null)`
`36`		`- {`
`37`		`- using var reference = new UITextField { BorderStyle = UITextBorderStyle.None };`
`38`		`- var refSize = reference.SizeThatFits(new CoreGraphics.CGSize(nfloat.MaxValue, nfloat.MaxValue));`
`39`		`- _entryHeight = refSize.Height;`
`40`		`- }`
`41`		`-`
`42`		`- return new Size(size.Width, (double)_entryHeight.Value);`
	`34`	`+ return new Size(size.Width, NativeEntryHeight.For(FontSize));`
`43`	`35`	`}`
`44`	`36`	`#endif`
`45`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public LabeledDatePicker()`
`13`	`13`	`UpdateFontSizeView();`
`14`	`14`	`}`
`15`	`15`
`16`		`- public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime), typeof(LabeledDatePicker), propertyChanged: DateChanged, defaultBindingMode: BindingMode.TwoWay);`
	`16`	`+ public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime), typeof(LabeledDatePicker), propertyChanged: DateChanged, defaultBindingMode: BindingMode.TwoWay, defaultValueCreator: static _ => DateTime.Today);`
`17`	`17`	`public static readonly BindableProperty MinimumDateProperty = BindableProperty.Create(nameof(MinimumDate), typeof(DateTime), typeof(LabeledDatePicker), DateTime.MinValue, propertyChanged: MinimumDateChanged);`
`18`	`18`	`public static readonly BindableProperty MaximumDateProperty = BindableProperty.Create(nameof(MaximumDate), typeof(DateTime), typeof(LabeledDatePicker), DateTime.MaxValue, propertyChanged: MaximumDateChanged);`
`19`	`19`	`public static readonly BindableProperty FontSizeProperty = BindableProperty.Create(nameof(FontSize), typeof(double), typeof(LabeledDatePicker), LabelBase.DefaultFontSize, propertyChanged: FontSizeChanged);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public LabeledPicker()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create(nameof(ItemsSource), typeof(IList), typeof(LabeledPicker), propertyChanged: ItemSourceChanged, defaultBindingMode: BindingMode.TwoWay);`
`22`		`- public static readonly BindableProperty SelectedIndexProperty = BindableProperty.Create(nameof(SelectedIndex), typeof(int), typeof(LabeledPicker), propertyChanged: SelectedIndexChanged, defaultBindingMode: BindingMode.TwoWay);`
	`22`	`+ public static readonly BindableProperty SelectedIndexProperty = BindableProperty.Create(nameof(SelectedIndex), typeof(int), typeof(LabeledPicker), -1, propertyChanged: SelectedIndexChanged, defaultBindingMode: BindingMode.TwoWay);`
`23`	`23`	`public static readonly BindableProperty SelectedItemProperty = BindableProperty.Create(nameof(SelectedItem), typeof(object), typeof(LabeledPicker), propertyChanged: SelectedItemChanged, defaultBindingMode: BindingMode.TwoWay);`
`24`	`24`	`public static readonly BindableProperty PlaceholderProperty = BindableProperty.Create(nameof(Placeholder), typeof(string), typeof(LabeledPicker), propertyChanged: PlaceholderChanged);`
`25`	`25`	`public static readonly BindableProperty TitleColorProperty = BindableProperty.Create(nameof(TitleColor), typeof(Color), typeof(LabeledPicker), Color.FromArgb("#808080"), propertyChanged: TitleColorChanged);`