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 @@ -521,7 +521,7 @@ private static EventCallback<ChangeEventArgs> CreateBinderCore<T>(
{
Action<ChangeEventArgs> callback = e =>
{
T value = default;
T? value = default;
var converted = false;
try
{
Expand Down Expand Up @@ -565,7 +565,7 @@ private static EventCallback<ChangeEventArgs> CreateBinderCore<T>(
{
Action<ChangeEventArgs> callback = e =>
{
T value = default;
T? value = default;
var converted = false;
try
{
Expand Down
9 changes: 9 additions & 0 deletions src/Components/Web/src/Forms/InputCheckbox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ namespace Microsoft.AspNetCore.Components.Forms
/// </summary>
public class InputCheckbox : InputBase<bool>
{
/// <summary>
/// Gets or sets the associated <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull] public ElementReference? Element { get; protected set; }

/// <inheritdoc />
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
Expand All @@ -30,6 +38,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(3, "class", CssClass);
builder.AddAttribute(4, "checked", BindConverter.FormatValue(CurrentValue));
builder.AddAttribute(5, "onchange", EventCallback.Factory.CreateBinder<bool>(this, __value => CurrentValue = __value, CurrentValue));
builder.AddElementReferenceCapture(6, __inputReference => Element = __inputReference);
builder.CloseElement();
}

Expand Down
9 changes: 9 additions & 0 deletions src/Components/Web/src/Forms/InputDate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ public class InputDate<TValue> : InputBase<TValue>
/// </summary>
[Parameter] public string ParsingErrorMessage { get; set; } = "The {0} field must be a date.";

/// <summary>
/// Gets or sets the associated <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull] public ElementReference? Element { get; protected set; }

/// <inheritdoc />
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
Expand All @@ -31,6 +39,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(3, "class", CssClass);
builder.AddAttribute(4, "value", BindConverter.FormatValue(CurrentValueAsString));
builder.AddAttribute(5, "onchange", EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString));
builder.AddElementReferenceCapture(6, __inputReference => Element = __inputReference);
builder.CloseElement();
}

Expand Down
14 changes: 14 additions & 0 deletions src/Components/Web/src/Forms/InputFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -41,6 +42,19 @@ public class InputFile : ComponentBase, IInputFileJsCallbacks, IDisposable
[Parameter(CaptureUnmatchedValues = true)]
public IDictionary<string, object>? AdditionalAttributes { get; set; }

/// <summary>
/// Gets or sets the associated <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull]
public ElementReference? Element
{
get => _inputFileElement;
protected set => _inputFileElement = value!.Value;
}

/// <inheritdoc/>
protected override void OnInitialized()
{
Expand Down
9 changes: 9 additions & 0 deletions src/Components/Web/src/Forms/InputNumber.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ static InputNumber()
/// </summary>
[Parameter] public string ParsingErrorMessage { get; set; } = "The {0} field must be a number.";

/// <summary>
/// Gets or sets the associated <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull] public ElementReference? Element { get; protected set; }

/// <inheritdoc />
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
Expand All @@ -51,6 +59,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(4, "class", CssClass);
builder.AddAttribute(5, "value", BindConverter.FormatValue(CurrentValueAsString));
builder.AddAttribute(6, "onchange", EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString));
builder.AddElementReferenceCapture(7, __inputReference => Element = __inputReference);
builder.CloseElement();
}

Expand Down
1 change: 0 additions & 1 deletion src/Components/Web/src/Forms/InputRadio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using Microsoft.AspNetCore.Components.Rendering;

Expand Down
11 changes: 10 additions & 1 deletion src/Components/Web/src/Forms/InputSelect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ public class InputSelect<TValue> : InputBase<TValue>
/// </summary>
[Parameter] public RenderFragment? ChildContent { get; set; }

/// <summary>
/// Gets or sets the <c>select</c> <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull] public ElementReference? Element { get; protected set; }

/// <inheritdoc />
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
Expand All @@ -24,7 +32,8 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(2, "class", CssClass);
builder.AddAttribute(3, "value", BindConverter.FormatValue(CurrentValueAsString));
builder.AddAttribute(4, "onchange", EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString));
builder.AddContent(5, ChildContent);
builder.AddElementReferenceCapture(5, __selectReference => Element = __selectReference);
builder.AddContent(6, ChildContent);
builder.CloseElement();
}

Expand Down
9 changes: 9 additions & 0 deletions src/Components/Web/src/Forms/InputText.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ namespace Microsoft.AspNetCore.Components.Forms
/// </summary>
public class InputText : InputBase<string?>
{
/// <summary>
/// Gets or sets the associated <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull] public ElementReference? Element { get; protected set; }

/// <inheritdoc />
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
Expand All @@ -28,6 +36,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(2, "class", CssClass);
builder.AddAttribute(3, "value", BindConverter.FormatValue(CurrentValue));
builder.AddAttribute(4, "onchange", EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString));
builder.AddElementReferenceCapture(5, __inputReference => Element = __inputReference);
builder.CloseElement();
}

Expand Down
9 changes: 9 additions & 0 deletions src/Components/Web/src/Forms/InputTextArea.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ namespace Microsoft.AspNetCore.Components.Forms
/// </summary>
public class InputTextArea : InputBase<string?>
{
/// <summary>
/// Gets or sets the associated <see cref="ElementReference"/>.
/// <para>
/// May be <see langword="null"/> if accessed before the component is rendered.
/// </para>
/// </summary>
[DisallowNull] public ElementReference? Element { get; protected set; }

/// <inheritdoc />
protected override void BuildRenderTree(RenderTreeBuilder builder)
{
Expand All @@ -28,6 +36,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddAttribute(2, "class", CssClass);
builder.AddAttribute(3, "value", BindConverter.FormatValue(CurrentValue));
builder.AddAttribute(4, "onchange", EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString));
builder.AddElementReferenceCapture(5, __inputReference => Element = __inputReference);
builder.CloseElement();
}

Expand Down
14 changes: 14 additions & 0 deletions src/Components/Web/src/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
#nullable enable
Microsoft.AspNetCore.Components.Forms.InputCheckbox.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputCheckbox.Element.set -> void
Microsoft.AspNetCore.Components.Forms.InputDate<TValue>.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputDate<TValue>.Element.set -> void
Microsoft.AspNetCore.Components.Forms.InputFile.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputFile.Element.set -> void
Microsoft.AspNetCore.Components.Forms.InputNumber<TValue>.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputNumber<TValue>.Element.set -> void
Microsoft.AspNetCore.Components.Forms.InputSelect<TValue>.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputSelect<TValue>.Element.set -> void
Microsoft.AspNetCore.Components.Forms.InputText.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputText.Element.set -> void
Microsoft.AspNetCore.Components.Forms.InputTextArea.Element.get -> Microsoft.AspNetCore.Components.ElementReference?
Microsoft.AspNetCore.Components.Forms.InputTextArea.Element.set -> void
18 changes: 18 additions & 0 deletions src/Components/Web/test/Forms/InputDateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@ public async Task ValidationErrorUsesDisplayAttributeName()
Assert.Contains("The Date property field must be a date.", validationMessages);
}

[Fact]
public async Task InputElementIsAssignedSuccessfully()
{
// Arrange
var model = new TestModel();
var rootComponent = new TestInputHostComponent<DateTime, TestInputDateComponent>
{
EditContext = new EditContext(model),
ValueExpression = () => model.DateProperty,
};

// Act
var inputSelectComponent = await InputRenderer.RenderAndGetComponent(rootComponent);

// Assert
Assert.NotNull(inputSelectComponent.Element);
}

private class TestModel
{
public DateTime DateProperty { get; set; }
Expand Down
18 changes: 18 additions & 0 deletions src/Components/Web/test/Forms/InputNumberTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ public async Task ValidationErrorUsesDisplayAttributeName()
Assert.Contains("The Some number field must be a number.", validationMessages);
}

[Fact]
public async Task InputElementIsAssignedSuccessfully()
{
// Arrange
var model = new TestModel();
var rootComponent = new TestInputHostComponent<int, TestInputNumberComponent>
{
EditContext = new EditContext(model),
ValueExpression = () => model.SomeNumber,
};

// Act
var inputSelectComponent = await InputRenderer.RenderAndGetComponent(rootComponent);

// Assert
Assert.NotNull(inputSelectComponent.Element);
}

private class TestModel
{
public int SomeNumber { get; set; }
Expand Down
19 changes: 19 additions & 0 deletions src/Components/Web/test/Forms/InputSelectTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,25 @@ public async Task ValidationErrorUsesDisplayAttributeName()
Assert.Contains("The Some number field is not valid.", validationMessages);
}

[Fact]
public async Task InputElementIsAssignedSuccessfully()
{
// Arrange
var model = new TestModel();
var rootComponent = new TestInputHostComponent<int, TestInputSelect<int>>
{
EditContext = new EditContext(model),
ValueExpression = () => model.NotNullableInt,
};

// Act
var inputSelectComponent = await InputRenderer.RenderAndGetComponent(rootComponent);
var exception = Record.Exception(() => inputSelectComponent.Element);

// Assert
Assert.NotNull(inputSelectComponent.Element);
}

enum TestEnum
{
One,
Expand Down
34 changes: 34 additions & 0 deletions src/Components/Web/test/Forms/InputTextAreaTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Threading.Tasks;
using Xunit;

namespace Microsoft.AspNetCore.Components.Forms
{
public class InputTextAreaTest
{
[Fact]
public async Task InputElementIsAssignedSuccessfully()
{
// Arrange
var model = new TestModel();
var rootComponent = new TestInputHostComponent<string, InputTextArea>
{
EditContext = new EditContext(model),
ValueExpression = () => model.StringProperty,
};

// Act
var inputSelectComponent = await InputRenderer.RenderAndGetComponent(rootComponent);

// Assert
Assert.NotNull(inputSelectComponent.Element);
}

private class TestModel
{
public string StringProperty { get; set; }
}
}
}
34 changes: 34 additions & 0 deletions src/Components/Web/test/Forms/InputTextTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Threading.Tasks;
using Xunit;

namespace Microsoft.AspNetCore.Components.Forms
{
public class InputTextTest
{
[Fact]
public async Task InputElementIsAssignedSuccessfully()
{
// Arrange
var model = new TestModel();
var rootComponent = new TestInputHostComponent<string, InputText>
{
EditContext = new EditContext(model),
ValueExpression = () => model.StringProperty,
};

// Act
var inputSelectComponent = await InputRenderer.RenderAndGetComponent(rootComponent);

// Assert
Assert.NotNull(inputSelectComponent.Element);
}

private class TestModel
{
public string StringProperty { get; set; }
}
}
}
Loading