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
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,7 @@ public override async Task ToggleMessage(IReadOnlyCollection<ValidationResult> r
? [AddId]
: Files.Select(i => i.ValidateId).ToList();
var invalidItems = _results.GetInvalidItems(IsInValidOnAddItem, AddId);
var addId = IsInValidOnAddItem ? null : AddId;
await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, addId);
await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, AddId);
}

private bool IsInValidOnAddItem => Files.Count == 0 && _results.Count > 0;
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Upload/CardUpload.razor
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,6 @@
@code {
RenderFragment RenderAdd =>
@<div id="@AddId" class="@CardItemClass">
<i class="@AddIcon"></i>
<i class="@AddIcon"></i>
</div>;
}
3 changes: 1 addition & 2 deletions src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ public override async Task ToggleMessage(IReadOnlyCollection<ValidationResult> r
? [AddId]
: Files.Select(i => i.ValidateId).ToList();
var invalidItems = _results.GetInvalidItems(IsInValidOnAddItem, AddId);
var addId = IsInValidOnAddItem ? null : AddId;
await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, addId);
await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, AddId);
}

private bool IsInValidOnAddItem => Files.Count == 0 && _results.Count > 0;
Expand Down
36 changes: 29 additions & 7 deletions src/BootstrapBlazor/wwwroot/modules/validate.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
export function execute(id, title) {
import Data from "./data.js"

export function execute(id, title) {
const el = document.getElementById(id);

if (el) {
const tip = bootstrap.Tooltip.getOrCreateInstance(el, { customClass: 'is-invalid', title })
const tip = bootstrap.Tooltip.getOrCreateInstance(el, { customClass: 'is-invalid', title });
if (!tip._isShown()) {
if (title !== tip._config.title) {
tip._config.title = title;
Expand All @@ -28,8 +30,7 @@ const showResult = el => {
}

export function dispose(id) {
const el = document.getElementById(id)

const el = document.getElementById(id);
if (el) {
const tip = bootstrap.Tooltip.getInstance(el)
if (tip) {
Expand All @@ -48,20 +49,41 @@ export function executeUpload(items, invalidItems, addId) {
execute(id, errorMessage);
el.classList.remove('is-valid');
el.classList.add('is-invalid');

if (id === addId) {
const tip = bootstrap.Tooltip.getInstance(el);
if (tip) {
Data.set(addId, tip);
addId = null;
}
}
}
else {
dispose(id);
el.classList.remove('is-invalid');
el.classList.add('is-valid');

disposeTip(addId);
addId = null;
}
}
});

if (addId) {
const el = document.getElementById(addId);
disposeTip(addId);
}
}

const disposeTip = id => {
const tip = Data.get(id);
Data.remove(id);

if (tip) {
tip.dispose();

const el = document.getElementById(id);
if (el) {
el.classList.remove('is-valid', 'is-invalid');
dispose(addId);
el.classList.remove('is-invalid');
}
}
}
Expand Down
Loading