Skip to content
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

🐛 fix(FileInput): failed to click and select files #2015

Merged
merged 1 commit into from
Jul 2, 2024
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
6 changes: 4 additions & 2 deletions src/Masa.Blazor.JS/src/interop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,11 @@ export function getParentClientWidthOrWindowInnerWidth(element: HTMLElement) {
return element.parentElement ? element.parentElement.clientWidth : window.innerWidth;
}

export function triggerEvent(elOrString, eventType, stopPropagation) {
export function triggerEvent(elOrString, eventName: string, eventType: string, stopPropagation: boolean) {
var dom = getDom(elOrString);
var evt = new Event(eventType);
var evt = document.createEvent(eventName);
evt.initEvent(eventType);

if (stopPropagation) {
evt.stopPropagation();
}
Expand Down
9 changes: 2 additions & 7 deletions src/Masa.Blazor/Components/FileInput/MFileInput.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public override async Task HandleOnPrependClickAsync(MouseEventArgs args)
if (InputFile?.Element is null) return;

await base.HandleOnPrependClickAsync(args);
await Js.DispatchEventAsync(InputFile.Element.Value, "click", true);
await Js.DispatchEventAsync(InputFile.Element.Value, "MouseEvent", "click", true);
}

public override Task HandleOnInputAsync(ChangeEventArgs args) => Task.CompletedTask;
Expand Down Expand Up @@ -246,19 +246,14 @@ public async Task HandleOnFileChange(InputFileChangeEventArgs args)

public override async Task HandleOnClickAsync(ExMouseEventArgs args)
{
if (IsFocused || IsDisabled)
{
return;
}

if (OnClick.HasDelegate)
{
await OnClick.InvokeAsync();
}

if (InputFile?.Element is null) return;

await Js.DispatchEventAsync(InputFile.Element.Value, "click", true);
await Js.DispatchEventAsync(InputFile.Element.Value, "MouseEvent", "click", true);
}

public override async Task HandleOnClearClickAsync(MouseEventArgs args)
Expand Down
2 changes: 1 addition & 1 deletion src/Masa.Blazor/Components/Input/MInput.razor
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}
else if (!string.IsNullOrWhiteSpace(PrependIcon))
{
content = GenIcon(InputIconType.PrependOuter, PrependIcon, OnPrependClick.HasDelegate ? HandleOnPrependClickAsync : null);
content = GenIcon(InputIconType.PrependOuter, PrependIcon, HasPrependClick ? HandleOnPrependClickAsync : null);
}

if (content != null)
Expand Down
2 changes: 0 additions & 2 deletions src/Masa.Blazor/Components/Input/MInput.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ public virtual List<string> MessagesToDisplay

public virtual bool HasPrependClick => OnPrependClick.HasDelegate;

public virtual bool HasAppendClick => OnAppendClick.HasDelegate;

public virtual async Task HandleOnPrependClickAsync(MouseEventArgs args)
{
if (OnPrependClick.HasDelegate)
Expand Down
5 changes: 0 additions & 5 deletions src/Masa.Blazor/Components/TextField/MTextField.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -530,11 +530,6 @@ public override async Task HandleOnClickAsync(ExMouseEventArgs args)
return;
}

if (OnClick.HasDelegate)
{
await OnClick.InvokeAsync(args);
}

await InputElement.FocusAsync();
}

Expand Down
13 changes: 11 additions & 2 deletions src/Masa.Blazor/Extensions/JsRuntimeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,19 @@ public static ValueTask<BoundingClientRect> GetBoundingClientRectAsync(this IJSR
attach);
}

public static ValueTask DispatchEventAsync(this IJSRuntime jsRuntime, ElementReference el, string type,
/// <summary>
/// Dispatch an event on the element
/// </summary>
/// <param name="jsRuntime"></param>
/// <param name="el"></param>
/// <param name="eventName">The name of the event, e.g. MouseEvent, KeyboardEvent, etc.</param>
/// <param name="eventType">The type of the event, e.g. click, keydown, etc.</param>
/// <param name="stopPropagation">Whether to stop propagation</param>
/// <returns></returns>
public static ValueTask DispatchEventAsync(this IJSRuntime jsRuntime, ElementReference el, string eventName, string eventType,
bool stopPropagation)
{
return jsRuntime.InvokeVoidAsync(JsInteropConstants.TriggerEvent, el, type, stopPropagation);
return jsRuntime.InvokeVoidAsync(JsInteropConstants.TriggerEvent, el, eventName, eventType, stopPropagation);
}

public static ValueTask SetPropertyAsync(this IJSRuntime jsRuntime, ElementReference el, string key, object value)
Expand Down
2 changes: 1 addition & 1 deletion src/Masa.Blazor/wwwroot/js/masa-blazor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Masa.Blazor/wwwroot/js/masa-blazor.js.map

Large diffs are not rendered by default.

Loading