Skip to content

Commit

Permalink
merge from main and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@capdiem
capdiem committed Aug 5, 2024
2 parents 03793cc + 44e00f7 commit 3934844
Show file tree
Hide file tree
Showing 8 changed files with 255 additions and 251 deletions.
1 change: 0 additions & 1 deletion src/Masa.Blazor/Components/Checkbox/MCheckbox.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
</MIcon>

@GenInput("checkbox")
@GenRipple()
};

}
6 changes: 3 additions & 3 deletions src/Masa.Blazor/Components/OtpInput/MOtpInput.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
id="@Id"
@ref="Ref"
@attributes="@Attributes">
@for (var i = 0; i < @Length; i++)
@for (var i = 0; i < Length; i++)
{
var index = i;
@GenItem(index)
Expand All @@ -18,7 +18,7 @@

private RenderFragment GenItem(int index) => __builder =>
{
var value = Values[index];
var value = _otp[index];
<div class="@GetContentClass()">
<div class="@_inputBlock.Element("control")">
<div class="@GetClass(_inputBlock.Element("slot").Name, CssClassUtils.GetBackgroundColor(BackgroundColor))"
Expand All @@ -30,7 +30,7 @@
</legend>
</fieldset>
<div class="@_textFieldBlock.Element("slot")">
<input @ref="InputRefs[index]"
<input @ref="_inputRefs[index]"
type="@Type.ToString()"
readonly="@Readonly"
min="@(Type == OtpInputType.Number ? 0 : null)"
Expand Down
90 changes: 49 additions & 41 deletions src/Masa.Blazor/Components/OtpInput/MOtpInput.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,17 @@ public bool IsDark
private int _prevFocusIndex;
private string? _prevValue;

private List<ElementReference> InputRefs { get; } = new();
private List<ElementReference> _inputRefs = [];

private List<string> Values { get; set; } = new();
/// <summary>
/// Always keep the length of _otp equal to Length
/// </summary>
private List<string> _otp = [];

private string ComputedValue => string.Join("", Values);
/// <summary>
/// Get the latest value of otp
/// </summary>
private string ComputedValue => string.Join("", _otp);

protected override async Task OnParametersSetAsync()
{
Expand All @@ -88,48 +94,50 @@ protected override async Task OnParametersSetAsync()
#endif
if (_prevValue != Value)
{
Value ??= string.Empty;
var prevValueLength = _prevValue?.Length ?? 0;
var valueLength = Value.Length;
_prevValue = Value;

if (Value != null)
for (var i = 0; i < Math.Max(prevValueLength, valueLength); i++)
{
for (int i = 0; i < Value.Length; i++)
if (i >= _otp.Count)
{
if (Values.Count < i + 1)
{
Values.Add(Value[i].ToString());
}
else
{
Values[i] = Value[i].ToString();
}
continue;
}

_otp[i] = i < valueLength ? Value[i].ToString() : string.Empty;
}

if (Value != ComputedValue)
{
_prevValue = ComputedValue;
await ValueChanged.InvokeAsync(_prevValue);
}
}

if (_prevLength != Length)
{
_prevLength = Length;

if (Values.Count > Length)
if (_otp.Count > Length)
{
for (int i = Length; i < Values.Count; i++)
{
Values.RemoveAt(i);
}
_otp = _otp.Take(Length).ToList();

if (ValueChanged.HasDelegate)
{
await ValueChanged.InvokeAsync(ComputedValue);
_prevValue = ComputedValue;
await ValueChanged.InvokeAsync(_prevValue);
}
}
else
{
for (int i = 0; i < Length; i++)
for (var i = 0; i < Length; i++)
{
if (Values.Count() < (i + 1))
Values.Add(string.Empty);
if (InputRefs.Count() < (i + 1))
InputRefs.Add(new ElementReference());
if (_otp.Count < (i + 1))
_otp.Add(string.Empty);
if (_inputRefs.Count < (i + 1))
_inputRefs.Add(new ElementReference());
}
}
}
Expand All @@ -142,13 +150,13 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
if (firstRender)
{
_handle = DotNetObjectReference.Create(new Invoker<OtpJsResult>(GetResultFromJs));
await Js.InvokeVoidAsync(JsInteropConstants.RegisterOTPInputOnInputEvent, InputRefs, _handle);
await Js.InvokeVoidAsync(JsInteropConstants.RegisterOTPInputOnInputEvent, _inputRefs, _handle);

NextTick(() =>
{
if (AutoFocus && InputRefs.Count > 0)
if (AutoFocus && _inputRefs.Count > 0)
{
_ = InputRefs[0].FocusAsync();
_ = _inputRefs[0].FocusAsync();
}
});
}
Expand Down Expand Up @@ -200,7 +208,7 @@ private async Task GetResultFromJs(OtpJsResult result)
await OnInput.InvokeAsync(result.Value);
}

if (result.Index >= Length - 1 && !Values.Any(p => string.IsNullOrEmpty(p)) && OnFinish.HasDelegate)
if (result.Index >= Length - 1 && !_otp.Any(p => string.IsNullOrEmpty(p)) && OnFinish.HasDelegate)
{
await OnFinish.InvokeAsync(ComputedValue);
}
Expand Down Expand Up @@ -232,7 +240,7 @@ private async Task FocusAsync(int index)

if (containsActiveElement)
{
var item = InputRefs[index];
var item = _inputRefs[index];
await item.FocusAsync();
}
}
Expand All @@ -241,37 +249,37 @@ private async Task FocusAsync(int index)

private int GetFirstEmptyIndex()
{
for (int i = 0; i < Values.Count; i++)
for (int i = 0; i < _otp.Count; i++)
{
if (string.IsNullOrEmpty(Values[i]))
if (string.IsNullOrEmpty(_otp[i]))
{
return i;
}
}

return Values.Count - 1;
return _otp.Count - 1;
}

private async Task ApplyValues(int index, string value)
{
var temp = new List<string>(Values.ToArray());
var temp = new List<string>(_otp.ToArray());
temp[index] = value;
temp.RemoveAll(p => string.IsNullOrEmpty(p));

Values[index] = value;
_otp[index] = value;

await Task.Yield();
await InvokeAsync(StateHasChanged);

Values[index] = String.Empty;
_otp[index] = String.Empty;

Values = temp;
_otp = temp;

var count = temp.Count;

for (int i = 0; i < this.Length - count; i++)
{
Values.Add(String.Empty);
_otp.Add(String.Empty);
}

await InvokeAsync(StateHasChanged);
Expand All @@ -295,13 +303,13 @@ private async Task HandleOnPasteAsync(OtpInputEventArgs<PasteWithDataEventArgs>
if (changeIndex >= this.Length)
break;

Values[changeIndex] = clipboardData[i].ToString();
_otp[changeIndex] = clipboardData[i].ToString();
}

var newFocusIndex = Math.Min(events.Index + clipboardData.Length - 1, this.Length - 1);
await FocusAsync(newFocusIndex);

var hasEmptyValue = Values.Any(string.IsNullOrWhiteSpace);
var hasEmptyValue = _otp.Any(string.IsNullOrWhiteSpace);

if (!hasEmptyValue)
{
Expand All @@ -324,7 +332,7 @@ private async Task OnPasteWithDataAsync(PasteWithDataEventArgs args)

private async Task HandleOnInputSlotClick(int optIndex)
{
if (IsFocused || IsDisabled || InputRefs.ElementAtOrDefault(optIndex).Context is null)
if (IsFocused || IsDisabled || _inputRefs.ElementAtOrDefault(optIndex).Context is null)
{
return;
}
Expand All @@ -335,6 +343,6 @@ private async Task HandleOnInputSlotClick(int optIndex)
protected override async ValueTask DisposeAsyncCore()
{
_handle?.Dispose();
await Js.InvokeVoidAsync(JsInteropConstants.UnregisterOTPInputOnInputEvent, InputRefs);
await Js.InvokeVoidAsync(JsInteropConstants.UnregisterOTPInputOnInputEvent, _inputRefs);
}
}
42 changes: 29 additions & 13 deletions src/Masa.Blazor/Components/Switch/MSwitch.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,44 @@

@code {

private string? CurrentColor => IsLoading ? null : ValidationState;

private StyleBuilder GetStyleBuilder() => StyleBuilder.Create().AddTextColor(CurrentColor);

protected override RenderFragment GenDefaultSlot() => __builder =>
{
var trackStyle = GetStyleBuilder().AddBackgroundColor(ComputedTrackColor).Build();

<div class="@ControlBlock.Element("wrapper")">
<div class="@_trackModifierBuilder.AddTextColor(CurrentColor).AddBackgroundColor(ComputedTrackColor).AddTheme(IsDark, IndependentTheme)"
style="@trackStyle">
</div>

<div class="@ControlBlock.Element("input")" ripple>
@GenSelection()
</div>

<div class="@_block.Element("text")">
@GenText("left", LeftText, LeftIcon)
@GenText("right", RightText, RightIcon)
</div>
</div>

@GenLabel(true)
};

protected override RenderFragment? GenSelection() => __builder =>
{
var color = IsLoading ? null : ValidationState;
var styleBuilder = StyleBuilder.Create().AddTextColor(color);
var styleBuilder = GetStyleBuilder();
var thumbStyle = styleBuilder.Build();
var trackStyle = styleBuilder.AddBackgroundColor(ComputedTrackColor).Build();

@GenInput("checkbox")
@GenRipple()

<div class="@_trackModifierBuilder.AddTextColor(color).AddBackgroundColor(ComputedTrackColor).AddTheme(IsDark, IndependentTheme)"
style="@trackStyle">
</div>

<div class="@_thumbModifierBuilder.AddTextColor(color).AddTheme(IsDark, IndependentTheme)"
<div class="@_thumbModifierBuilder.AddTextColor(CurrentColor).AddTheme(IsDark, IndependentTheme)"
style="@thumbStyle">
@*TODO: FabTransition*@
@RenderFragments.GenProgressCircular(Loading, Color, 16, 2)
@RenderFragments.GenProgressCircular(Loading, CurrentColor, 16, 2)
</div>

@GenText("left", LeftText, LeftIcon)
@GenText("right", RightText, RightIcon)
};


Expand Down
10 changes: 1 addition & 9 deletions src/Masa.Blazor/Mixins/Selectable/MSelectable.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

protected override RenderFragment GenDefaultSlot() => __builder =>
{
<div class="@_block.Element("input")">
<div class="@ControlBlock.Element("input")" ripple>
@GenSelection()
</div>
@GenLabel(true)
Expand All @@ -34,12 +34,4 @@
@attributes="@Attributes"/>
};

protected RenderFragment GenRipple() => __builder =>
{
if (Ripple is true)
{
<div class="@GetClass(_block.Element("ripple").Name, CssClassUtils.GetTextColor(RippleState))" ripple></div>
}
};

}
7 changes: 2 additions & 5 deletions src/Masa.Blazor/Mixins/Selectable/MSelectable.razor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ public Task HandleOnKeyDown(KeyboardEventArgs args)
return Task.CompletedTask;
}

protected bool IndependentTheme =>
(IsDirtyParameter(nameof(Dark)) && Dark) || (IsDirtyParameter(nameof(Light)) && Light);

#if NET8_0_OR_GREATER
protected override void OnParametersSet()
{
Expand All @@ -111,10 +108,10 @@ protected override void OnParametersSet()
}
#endif

private static Block _block => new("m-input--selection-controls");
protected static Block ControlBlock => new("m-input--selection-controls");

protected override IEnumerable<string> BuildComponentClass()
{
return base.BuildComponentClass().Concat(new[] { _block.Name });
return base.BuildComponentClass().Concat(new[] { ControlBlock.Name });
}
}
Loading

0 comments on commit 3934844

Please sign in to comment.