Skip to content

Fix DataTransferItem returning wrong data for mismatched format #21114

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

Merged
MrJul merged 4 commits into from
Apr 9, 2026
+11 −1
Merged

Fix DataTransferItem returning wrong data for mismatched format #21114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfb0fc2
fix: check format key in DataTransferItem.FindAccessor single-item path
NathanDrake2406 Apr 9, 2026
e4355ff
chore: retrigger CI
NathanDrake2406 Apr 9, 2026
5969c2a
chore: retrigger CI
NathanDrake2406 Apr 9, 2026
269b1b4
Merge branch 'master' into fix/datatransferitem-format-check
MrJul Apr 9, 2026
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
2 changes: 1 addition & 1 deletion src/Avalonia.Base/Input/DataTransferItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ DataFormat[] ComputeFormats()
if (_accessorByFormat is not null)
return _accessorByFormat.TryGetValue(format, out var accessor) ? accessor : null;

if (_singleItem is { } singleItem)
if (_singleItem is { } singleItem && singleItem.Key.Equals(format))
return singleItem.Value;

return null;
Expand Down
10 changes: 10 additions & 0 deletions tests/Avalonia.Base.UnitTests/Input/DataFormatTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ public void InProcess_Format_Inequality_Different_Kind_Same_Identifier()
Assert.NotEqual<DataFormat>(inProcess, application);
}

[Fact]
public void TryGetRaw_With_Mismatched_Format_Returns_Null_For_Single_Format_Item()
{
var item = DataTransferItem.CreateText("hello");

var result = item.TryGetRaw(DataFormat.Bitmap);

Assert.Null(result);
}

[Fact]
public void InProcess_Format_Works_With_DataTransferItem_Set_And_Get()
{
Expand Down
Loading