Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

[WIP] Revert ClearButton Visibility Regressions on iOS #14893

Merged
merged 3 commits into from
Nov 16, 2021
Merged

[WIP] Revert ClearButton Visibility Regressions on iOS #14893

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2f38c
Revert "Fix hangs and NREs with Entry Observer (#14859)"
jfversluis Nov 16, 2021
1816bdf
Revert "Refactor observer lifecycle (#14828)"
jfversluis Nov 16, 2021
782318a
Revert "Fix crashing on iOS < 14 if ClearButtonVisibility = WhileEdit…
jfversluis Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 16 additions & 30 deletions Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using UIKit;
using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
using Specifics = Xamarin.Forms.PlatformConfiguration.iOSSpecific.Entry;
using RectangleF = CoreGraphics.CGRect;

namespace Xamarin.Forms.Platform.iOS
{
Expand Down Expand Up @@ -39,7 +40,6 @@ public abstract class EntryRendererBase<TControl> : ViewRenderer<Entry, TControl
bool _useLegacyColorManagement;

bool _disposed;
bool _observedSublayers;
IDisposable _selectedTextRangeObserver;
bool _nativeSelectionIsUpdating;

Expand All @@ -51,8 +51,6 @@ public abstract class EntryRendererBase<TControl> : ViewRenderer<Entry, TControl

UIImage _defaultClearImage;

UIButton ClearButton => Control?.ValueForKey(new NSString("clearButton")) as UIButton;

public EntryRendererBase()
{
}
Expand Down Expand Up @@ -93,12 +91,6 @@ protected override void Dispose(bool disposing)
Control.EditingDidEnd -= OnEditingEnded;
Control.ShouldChangeCharacters -= ShouldChangeCharacters;
_selectedTextRangeObserver?.Dispose();

if (_observedSublayers)
{
ClearButton?.Layer?.RemoveObserver(this, new NSString("sublayers"));
_observedSublayers = false;
}
}
}

Expand Down Expand Up @@ -132,9 +124,6 @@ protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
textField.EditingDidEnd += OnEditingEnded;
textField.ShouldChangeCharacters += ShouldChangeCharacters;
_selectedTextRangeObserver = textField.AddObserver("selectedTextRange", NSKeyValueObservingOptions.New, UpdateCursorFromControl);

ClearButton?.Layer.AddObserver(this, new NSString("sublayers"), NSKeyValueObservingOptions.New, IntPtr.Zero);
_observedSublayers = true;
}

// When we set the control text, it triggers the UpdateCursorFromControl event, which updates CursorPosition and SelectionLength;
Expand Down Expand Up @@ -166,12 +155,6 @@ protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
UpdateClearButtonVisibility();
}

public override void ObserveValue(NSString keyPath, NSObject ofObject, NSDictionary change, IntPtr context)
{
if (keyPath == new NSString("sublayers") && _defaultClearImage == null)
UpdateClearButtonVisibility();
}

protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == Entry.PlaceholderProperty.PropertyName || e.PropertyName == Entry.PlaceholderColorProperty.PropertyName)
Expand Down Expand Up @@ -582,33 +565,36 @@ void UpdateClearButtonVisibility()

void UpdateClearButtonColor()
{
if (ClearButton != null)
if (Control.ValueForKey(new NSString("clearButton")) is UIButton clearButton)
{
ClearButton.TintColor = Element.TextColor.ToUIColor();

if(_defaultClearImage == null)
_defaultClearImage = ClearButton.ImageForState(UIControlState.Highlighted);
clearButton.TintColor = Element.TextColor.ToUIColor();

if (_defaultClearImage == null)
return;
if(_defaultClearImage == null)
_defaultClearImage = clearButton.ImageForState(UIControlState.Highlighted);

if(Element.TextColor == Color.Default)
if (Element.TextColor == Color.Default)
{
ClearButton.SetImage(_defaultClearImage, UIControlState.Normal);
ClearButton.SetImage(_defaultClearImage, UIControlState.Highlighted);
clearButton.SetImage(_defaultClearImage, UIControlState.Normal);
clearButton.SetImage(_defaultClearImage, UIControlState.Highlighted);
}
else
{
var tintedClearImage = GetClearButtonTintImage(_defaultClearImage, Element.TextColor.ToUIColor());

ClearButton.SetImage(tintedClearImage, UIControlState.Normal);
ClearButton.SetImage(tintedClearImage, UIControlState.Highlighted);
if (tintedClearImage != null)
{
clearButton.SetImage(tintedClearImage, UIControlState.Normal);
clearButton.SetImage(tintedClearImage, UIControlState.Highlighted);
}
}
}
}

UIImage GetClearButtonTintImage(UIImage image, UIColor color)
{
if (image == null)
return null;

var size = image.Size;

UIGraphics.BeginImageContextWithOptions(size, false, UIScreen.MainScreen.Scale);
Expand Down