Skip to content

refactor(AutoComplete): redesign blur logic #5499

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
merged 3 commits into from
Mar 3, 2025
Merged

refactor(AutoComplete): redesign blur logic #5499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ff8822
refactor: 重构销毁方法位置
ArgoZhang Mar 3, 2025
8519e4c
refactor: 增加 triggerBlur 方法
ArgoZhang Mar 3, 2025
5a24f5e
refactor: 增加 menu 点击事件
ArgoZhang Mar 3, 2025
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
30 changes: 19 additions & 11 deletions src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ export function init(id, invoke) {
})
}

EventHandler.on(input, 'blur', e => {
ac.triggerBlur = () => {
el.classList.remove('show');
const triggerBlur = input.getAttribute('data-bb-blur') === 'true';
if (triggerBlur) {
invoke.invokeMethodAsync('TriggerBlur');
}
}

EventHandler.on(menu, 'click', '.dropdown-item', e => {
ac.triggerBlur();
});

EventHandler.on(input, 'focus', e => {
Expand Down Expand Up @@ -81,7 +85,11 @@ export function init(id, invoke) {

const el = a.querySelector('[data-bs-toggle="bb.dropdown"]');
if (el === null) {
a.classList.remove('show');
const id = a.getAttribute('id');
const d = Data.get(id);
if (d) {
d.triggerBlur();
}
}
});
}
Expand All @@ -99,7 +107,7 @@ const handlerKeyup = (ac, e) => {
const current = menu.querySelector('.active');
if (current !== null) {
current.click();
input.blur();
ac.triggerBlur();
}
invoke.invokeMethodAsync('EnterCallback', input.value);
}
Expand All @@ -108,7 +116,7 @@ const handlerKeyup = (ac, e) => {
const skipEsc = el.getAttribute('data-bb-skip-esc') === 'true';
if (skipEsc === false) {
invoke.invokeMethodAsync('EscCallback');
input.blur();
ac.triggerBlur();
}
}
else if (key === 'ArrowUp' || key === 'ArrowDown') {
Expand Down Expand Up @@ -149,7 +157,7 @@ export function dispose(id) {
Data.remove(id)

if (ac) {
const { popover, input } = ac;
const { popover, input, menu } = ac;
if (popover) {
Popover.dispose(popover)
if (input) {
Expand All @@ -158,14 +166,14 @@ export function dispose(id) {
}
EventHandler.off(input, 'change');
EventHandler.off(input, 'keyup');
EventHandler.off(input, 'blur');
EventHandler.off(menu, 'click');
Input.dispose(input);
}

const { AutoComplete } = window.BootstrapBlazor;
AutoComplete.dispose(id, () => {
EventHandler.off(document, 'click', ac.closePopover);
});
const { AutoComplete } = window.BootstrapBlazor;
AutoComplete.dispose(id, () => {
EventHandler.off(document, 'click', ac.closePopover);
});
}
}

const scrollIntoView = (el, item) => {
Expand Down