-
Notifications
You must be signed in to change notification settings - Fork 1k
Ports DataMemberFieldEditor
to the Runtime
#12891
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
Merged
ricardobossan
merged 4 commits into
dotnet:main
from
ricardobossan:Issue_1115_Port_DataMemberFieldEditor
Feb 14, 2025
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DataMemberFieldEditor.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
#nullable enable | ||
|
||
using System.ComponentModel; | ||
using System.Drawing.Design; | ||
|
||
namespace System.Windows.Forms.Design; | ||
|
||
internal class DataMemberFieldEditor : UITypeEditor | ||
{ | ||
private DesignBindingPicker? _designBindingPicker; | ||
ricardobossan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
public override bool IsDropDownResizable => true; | ||
|
||
public override object? EditValue(ITypeDescriptorContext? context, IServiceProvider provider, object? value) | ||
{ | ||
if (provider is null || context is null || context?.Instance is not { } instance) | ||
{ | ||
return value; | ||
} | ||
|
||
if (TypeDescriptor.GetProperties(instance)[nameof(ComboBox.DataSource)] is not PropertyDescriptor property) | ||
{ | ||
return value; | ||
} | ||
|
||
object? dataSource = property.GetValue(instance); | ||
|
||
if (dataSource is null ) | ||
{ | ||
return value; | ||
} | ||
|
||
_designBindingPicker ??= new(); | ||
|
||
DesignBinding oldSelection = new DesignBinding(dataSource, (string?)value); | ||
DesignBinding? newSelection = _designBindingPicker.Pick( | ||
context, | ||
provider, | ||
showDataSources: false, | ||
showDataMembers: true, | ||
selectListMembers: false, | ||
rootDataSource: dataSource, | ||
rootDataMember: string.Empty, | ||
initialSelectedItem: oldSelection | ||
); | ||
|
||
if (newSelection is null) | ||
{ | ||
return value; | ||
} | ||
|
||
return newSelection.DataMember; | ||
} | ||
|
||
public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext? context) => UITypeEditorEditStyle.DropDown; | ||
ricardobossan marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
51 changes: 51 additions & 0 deletions
51
src/System.Windows.Forms.Design/tests/UnitTests/DataMemberFieldEditorTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
// Licensed to the .NET Foundation under one or more agreements. | ||
// The .NET Foundation licenses this file to you under the MIT license. | ||
|
||
#nullable enable | ||
|
||
using System.ComponentModel; | ||
using System.Drawing.Design; | ||
using Moq; | ||
|
||
namespace System.Windows.Forms.Design.Editors.Tests; | ||
|
||
public class DataMemberFieldEditorTests | ||
{ | ||
private readonly DataMemberFieldEditor _editor = new(); | ||
|
||
[Fact] | ||
public void Ctor_HasDefaultProperties() => _editor.IsDropDownResizable.Should().BeTrue(); | ||
|
||
[Fact] | ||
public void GetEditStyle_ContextIsNull_ReturnsDropDown() => _editor.GetEditStyle(null).Should().Be(UITypeEditorEditStyle.DropDown); | ||
|
||
public static IEnumerable<object[]> EditValueCases() | ||
{ | ||
string text = "Edited Text"; | ||
|
||
Mock<ITypeDescriptorContext>? contextMock = new(); | ||
contextMock.Setup(c => c.Instance).Returns(new ComboBox()); | ||
|
||
Mock<IServiceProvider> providerMock = new(); | ||
providerMock.Setup(p => p.GetService(typeof(IWindowsFormsEditorService))).Returns(new Mock<IWindowsFormsEditorService>().Object); | ||
|
||
yield return new object[] { null!, null!, null! }; | ||
yield return new object[] { null!, null!, text }; | ||
|
||
yield return new object[] | ||
{ | ||
contextMock.Object, | ||
providerMock.Object, | ||
text | ||
}; | ||
} | ||
|
||
[Theory] | ||
[MemberData(nameof(EditValueCases))] | ||
public void EditValue_WithValidInput_ReturnsValue(ITypeDescriptorContext? context, IServiceProvider provider, object? value) | ||
{ | ||
object? result = _editor.EditValue(context, provider, value); | ||
|
||
result.Should().Be(value); | ||
} | ||
} |
32 changes: 30 additions & 2 deletions
32
src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/ListBoxes.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.