Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,13 @@ static Func<object, TResult> CompileMemberEvaluator<TResult>(MemberExpression me
var parameterExpression = Expression.Parameter(typeof(object));
var convertExpression = Expression.Convert(parameterExpression, memberExpression.Member.DeclaringType!);
var replacedMemberExpression = memberExpression.Update(convertExpression);
var replacedExpression = Expression.Lambda<Func<object, TResult>>(replacedMemberExpression, parameterExpression);
Expression valueExpression = replacedMemberExpression;
if (valueExpression.Type.IsValueType && valueExpression.Type != typeof(TResult))
{
valueExpression = Expression.Convert(valueExpression, typeof(TResult));
}

var replacedExpression = Expression.Lambda<Func<object, TResult>>(valueExpression, parameterExpression);
return replacedExpression.Compile();
}
}
Expand Down
38 changes: 38 additions & 0 deletions src/Components/Web/test/Forms/InputTextTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,44 @@ public async Task RendersIdAttribute_WhenShouldUseFieldIdentifiersIsFalse_Intera
Assert.Equal("model_StringProperty", idAttribute.AttributeValue);
}

[Fact]
public async Task RendersIdAttribute_ForCapturedLongDictionaryKey()
{
var values = new Dictionary<long, string> { [1L] = "Test" };
long key = 1;
var rootComponent = new TestInputHostComponent<string, InputText>
{
EditContext = new EditContext(values),
Value = values[key],
ValueExpression = () => values[key],
};

var componentId = await RenderAndGetInputTextComponentIdAsync(rootComponent);
var frames = _testRenderer.GetCurrentRenderTreeFrames(componentId);

var idAttribute = frames.Array.Single(f => f.FrameType == RenderTreeFrameType.Attribute && f.AttributeName == "id");
Assert.Equal("values[1]", idAttribute.AttributeValue);
}

[Fact]
public async Task RendersIdAttribute_ForCapturedGuidDictionaryKey()
{
var key = new Guid("00112233-4455-6677-8899-aabbccddeeff");
var values = new Dictionary<Guid, string> { [key] = "Test" };
var rootComponent = new TestInputHostComponent<string, InputText>
{
EditContext = new EditContext(values),
Value = values[key],
ValueExpression = () => values[key],
};

var componentId = await RenderAndGetInputTextComponentIdAsync(rootComponent);
var frames = _testRenderer.GetCurrentRenderTreeFrames(componentId);

var idAttribute = frames.Array.Single(f => f.FrameType == RenderTreeFrameType.Attribute && f.AttributeName == "id");
Assert.Equal("values[00112233-4455-6677-8899-aabbccddeeff]", idAttribute.AttributeValue);
}

private async Task<int> RenderAndGetInputTextComponentIdAsync(TestInputHostComponent<string, InputText> hostComponent)
{
var hostComponentId = _testRenderer.AssignRootComponentId(hostComponent);
Expand Down
Loading