Skip to content

[FileInput] Fix uploading the same file twice by drag&drop #2865

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.

Sign up for GitHub

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
vnbaaij merged 8 commits into from
Oct 28, 2024
Merged

[FileInput] Fix uploading the same file twice by drag&drop #2865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4572a7f
Fix #2849 by making the component more robust
vnbaaij Oct 25, 2024
79cd81b
Fix tests
vnbaaij Oct 25, 2024
dde8204
Merge branch 'dev' into fix-issue-#2849
vnbaaij Oct 25, 2024
2556b74
Fix z-index for content part
vnbaaij Oct 25, 2024
c03be80
Merge branch 'dev' into fix-issue-#2849
vnbaaij Oct 28, 2024
06ead8c
Fix tests, remove superfluous space
vnbaaij Oct 28, 2024
0af22ff
Merge branch 'fix-issue-#2849' of https://github.com/microsoft/fluent…
vnbaaij Oct 28, 2024
a118861
Disable paste functionality for now
vnbaaij Oct 28, 2024
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
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@vnbaaij
vnbaaij committed Oct 25, 2024
commit 79cd81b05a42b6b195d9f4eaee1afb56f82151e5
9 changes: 0 additions & 9 deletions examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4867,15 +4867,6 @@
Gets the variant of the icon: Filled, Regular.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentInputFile2.LibraryConfiguration">
<summary />
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentInputFile2.JSRuntime">
<summary />
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentInputFile2.Module">
<summary />
</member>
<member name="T:Microsoft.FluentUI.AspNetCore.Components.FluentInputFile">
<summary />
</member>
Expand Down
2 changes: 1 addition & 1 deletion tests/Core/InputFile/FluentInputFileTests.FluentInputFile_Default.verified.razor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<div class="fluent-inputfile-container" blazor:ondragenter="1" blazor:ondragenter:stoppropagation="" blazor:ondragover="2" blazor:ondragover:stoppropagation="" blazor:ondragleave="3" blazor:ondragleave:stoppropagation="" blazor:ondragend="4" b-72uj7bp8pi="">
<div class="inputfile-content" style="z-index: 999" b-72uj7bp8pi="">
<div class="inputfile-content" b-72uj7bp8pi="">
Sample description
<div class="inputfile-progress" style="visibility: hidden;" b-72uj7bp8pi="">
<fluent-progress min="0" max="100" value="0" blazor:elementreference="xxx"></fluent-progress>
Expand Down
2 changes: 1 addition & 1 deletion tests/Core/InputFile/FluentInputFileTests.FluentInputFile_Disabled.verified.razor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<div class="fluent-inputfile-container" disabled="" blazor:ondragenter="1" blazor:ondragenter:stoppropagation="" blazor:ondragover="2" blazor:ondragover:stoppropagation="" blazor:ondragleave="3" blazor:ondragleave:stoppropagation="" blazor:ondragend="4" b-72uj7bp8pi="">
<div class="inputfile-content" style="z-index: 999" b-72uj7bp8pi="">
<div class="inputfile-content" b-72uj7bp8pi="">
Sample description
<div class="inputfile-progress" style="visibility: hidden;" b-72uj7bp8pi="">
<fluent-progress min="0" max="100" value="0" blazor:elementreference="xxx"></fluent-progress>
Expand Down
4 changes: 2 additions & 2 deletions .../Core/InputFile/FluentInputFileTests.FluentInputFile_ProgressTemplate.verified.razor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

<div class="fluent-inputfile-container" blazor:ondragenter="1" blazor:ondragenter:stoppropagation="" blazor:ondragover="2" blazor:ondragover:stoppropagation="" blazor:ondragleave="3" blazor:ondragleave:stoppropagation="" blazor:ondragend="4" b-72uj7bp8pi="">
<div class="inputfile-content" style="z-index: 999" b-72uj7bp8pi="">Sample description
<div class="inputfile-content" b-72uj7bp8pi="">Sample description
<div class="inputfile-progress" style="" b-72uj7bp8pi="">ProgressFileDetails { Index = 0, Name = , Percentage = 0 }</div>
</div>
<div style="grid-column: 1; grid-row: 1; " b-72uj7bp8pi="">
<input id="xxx" accept="" type="file" blazor:elementreference="xxx">
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions ...s/Core/InputFile/FluentInputFileTests.FluentInputFile_UploadCompleted.verified.razor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

<div class="fluent-inputfile-container" blazor:ondragenter="1" blazor:ondragenter:stoppropagation="" blazor:ondragover="2" blazor:ondragover:stoppropagation="" blazor:ondragleave="3" blazor:ondragleave:stoppropagation="" blazor:ondragend="4" b-72uj7bp8pi="">
<div class="inputfile-content" style="z-index: 999" b-72uj7bp8pi="">Sample description
<div class="inputfile-content" b-72uj7bp8pi="">Sample description
<div class="inputfile-progress" style="visibility: visible;" b-72uj7bp8pi="">
<fluent-progress min="0" max="100" value="100" blazor:elementreference=""></fluent-progress>
<br b-72uj7bp8pi="">Completed</div>
</div>
<div style="grid-column: 1; grid-row: 1; " b-72uj7bp8pi="">
<input id="xxx" multiple="" accept="image/*" type="file" blazor:elementreference="">
</div>
</div>
</div>
1 change: 1 addition & 0 deletions tests/Core/InputFile/FluentInputFileTests.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{
public FluentInputFileTests()
{
JSInterop.Mode = JSRuntimeMode.Loose;
Services.AddSingleton(LibraryConfiguration.ForUnitTests);
}

Expand Down