Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ios] fix memory leak in Slider #18681

Merged
merged 1 commit into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ void SetupBuilder()
handlers.AddHandler<IndicatorView, IndicatorViewHandler>();
handlers.AddHandler<RefreshView, RefreshViewHandler>();
handlers.AddHandler<IScrollView, ScrollViewHandler>();
handlers.AddHandler<Slider, SliderHandler>();
handlers.AddHandler<Stepper, StepperHandler>();
handlers.AddHandler<SwipeView, SwipeViewHandler>();
handlers.AddHandler<TimePicker, TimePickerHandler>();
Expand Down Expand Up @@ -69,6 +70,7 @@ void SetupBuilder()
[InlineData(typeof(Polyline))]
[InlineData(typeof(RefreshView))]
[InlineData(typeof(ScrollView))]
[InlineData(typeof(Slider))]
[InlineData(typeof(Stepper))]
[InlineData(typeof(SwipeView))]
[InlineData(typeof(TimePicker))]
Expand Down
62 changes: 39 additions & 23 deletions src/Core/src/Handlers/Slider/SliderHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ namespace Microsoft.Maui.Handlers
{
public partial class SliderHandler : ViewHandler<ISlider, UISlider>
{
readonly SliderProxy _proxy = new();

protected override UISlider CreatePlatformView()
{
var platformSlider = new UISlider { Continuous = true };
Expand All @@ -19,19 +21,13 @@ protected override UISlider CreatePlatformView()
protected override void ConnectHandler(UISlider platformView)
{
base.ConnectHandler(platformView);

platformView.ValueChanged += OnControlValueChanged;
platformView.AddTarget(OnTouchDownControlEvent, UIControlEvent.TouchDown);
platformView.AddTarget(OnTouchUpControlEvent, UIControlEvent.TouchUpInside | UIControlEvent.TouchUpOutside);
_proxy.Connect(VirtualView, platformView);
}

protected override void DisconnectHandler(UISlider platformView)
{
base.DisconnectHandler(platformView);

platformView.ValueChanged -= OnControlValueChanged;
platformView.RemoveTarget(OnTouchDownControlEvent, UIControlEvent.TouchDown);
platformView.RemoveTarget(OnTouchUpControlEvent, UIControlEvent.TouchUpInside | UIControlEvent.TouchUpOutside);
_proxy.Disconnect(platformView);
}

public static void MapMinimum(ISliderHandler handler, ISlider slider)
Expand Down Expand Up @@ -72,22 +68,42 @@ public static void MapThumbImageSource(ISliderHandler handler, ISlider slider)
.FireAndForget(handler);
}

void OnControlValueChanged(object? sender, EventArgs eventArgs)
{
if (PlatformView == null || VirtualView == null)
return;

VirtualView.Value = PlatformView.Value;
}

void OnTouchDownControlEvent(object? sender, EventArgs e)
{
VirtualView?.DragStarted();
}

void OnTouchUpControlEvent(object? sender, EventArgs e)
class SliderProxy
{
VirtualView?.DragCompleted();
WeakReference<ISlider>? _virtualView;

ISlider? VirtualView => _virtualView is not null && _virtualView.TryGetTarget(out var v) ? v : null;

public void Connect(ISlider virtualView, UISlider platformView)
{
_virtualView = new(virtualView);
platformView.ValueChanged += OnControlValueChanged;
platformView.AddTarget(OnTouchDownControlEvent, UIControlEvent.TouchDown);
platformView.AddTarget(OnTouchUpControlEvent, UIControlEvent.TouchUpInside | UIControlEvent.TouchUpOutside);
}

public void Disconnect(UISlider platformView)
{
platformView.ValueChanged -= OnControlValueChanged;
platformView.RemoveTarget(OnTouchDownControlEvent, UIControlEvent.TouchDown);
platformView.RemoveTarget(OnTouchUpControlEvent, UIControlEvent.TouchUpInside | UIControlEvent.TouchUpOutside);
}

void OnControlValueChanged(object? sender, EventArgs eventArgs)
{
if (VirtualView is ISlider virtualView && sender is UISlider platformView)
virtualView.Value = platformView.Value;
}

void OnTouchDownControlEvent(object? sender, EventArgs e)
{
VirtualView?.DragStarted();
}

void OnTouchUpControlEvent(object? sender, EventArgs e)
{
VirtualView?.DragCompleted();
}
}
}
}