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.

Sign up for GitHub

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

Fix iOS/MacCat cell tap for selection #16

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Fix iOS/MacCat cell tap for selection #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebfd614
Fix usage of weakref for cell tap callback
Redth Dec 5, 2023
1c49355
Merge branch 'main' into fix-ios-tap-item
Redth Dec 5, 2023
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
23 changes: 20 additions & 3 deletions VirtualListView/Apple/CvCell.ios.maccatalyst.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ public CvCell(CGRect frame) : base(frame)
this.ContentView.AddGestureRecognizer(new UITapGestureRecognizer(() => InvokeTap()));
}

public WeakReference<Action<CvCell>> TapHandler { get; set; }
private TapHandlerCallback TapHandler;

public void SetTapHandlerCallback(Action<CvCell> callback)
{
TapHandler = new TapHandlerCallback(callback);
}

WeakReference<UIKeyCommand[]> keyCommands;

Expand Down Expand Up @@ -57,8 +62,7 @@ void InvokeTap()
{
if (PositionInfo.Kind == PositionKind.Item)
{
if (TapHandler?.TryGetTarget(out var handler) ?? false)
handler?.Invoke(this);
TapHandler.Invoke(this);
}
}

Expand Down Expand Up @@ -142,4 +146,17 @@ public void UpdatePosition(PositionInfo positionInfo)
viewPositionInfo.Update(positionInfo);
}
}

class TapHandlerCallback
{
public TapHandlerCallback(Action<CvCell> callback)
{
Callback = callback;
}

public readonly Action<CvCell> Callback;

public void Invoke(CvCell cell)
=> Callback?.Invoke(cell);
}
}
4 changes: 2 additions & 2 deletions VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public override UICollectionViewCell GetCell(UICollectionView collectionView, NS
_ => "UNKNOWN",
};

var cell = collectionView.DequeueReusableCell(nativeReuseId, indexPath) as CvCell;
cell.TapHandler = new WeakReference<Action<CvCell>>(TapCellHandler);
var cell = (collectionView.DequeueReusableCell(nativeReuseId, indexPath) as CvCell)!;
cell.SetTapHandlerCallback(TapCellHandler);
cell.Handler = Handler;
cell.IndexPath = new WeakReference<NSIndexPath>(indexPath);

Expand Down
Loading