bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-05 03:03:26 +00:00
Code Issues Releases Wiki Activity

Alternative change for PM-24720 without changing index check

Browse Source
This commit is contained in:
Jeffrey Holland
2025-09-08 11:49:58 +02:00
parent 66f5700a75
commit c5f6772893
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/browser/src/autofill/services/autofill-overlay-content.service.ts
View File

@@ -75,6 +75,7 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
private focusedFieldData: FocusedFieldData;
private closeInlineMenuOnRedirectTimeout: number | NodeJS.Timeout;
private focusInlineMenuListTimeout: number | NodeJS.Timeout;
private blurFieldTimeout: number | NodeJS.Timeout;
private eventHandlersMemo: { [key: string]: EventListener } = {};
private readonly extensionMessageHandlers: AutofillOverlayContentExtensionMessageHandlers = {
addNewVaultItemFromOverlay: ({ message }) => this.addNewVaultItem(message),
@@ -687,11 +688,27 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
/**
* Form Field blur event handler. Updates the value identifying whether
* the field is focused and sends a message to check if the inline menu itself
* is currently focused.
* is currently focused. Uses a timeout to allow checking if another form field
* is being focused to avoid premature overlay closure during field transitions.
*/
private handleFormFieldBlurEvent = () => {
void this.updateIsFieldCurrentlyFocused(false);
void this.sendExtensionMessage("checkAutofillInlineMenuFocused");
if (this.blurFieldTimeout) {
clearTimeout(this.blurFieldTimeout);
}
this.blurFieldTimeout = globalThis.setTimeout(() => {
const activeElement = this.getRootNodeActiveElement(this.mostRecentlyFocusedField);
const isFormFieldFocused =
activeElement &&
this.formFieldElements.has(activeElement as ElementWithOpId<FormFieldElement>);
if (!isFormFieldFocused) {
void this.updateIsFieldCurrentlyFocused(false);
void this.sendExtensionMessage("checkAutofillInlineMenuFocused");
}
this.blurFieldTimeout = null;
}, 100);
};
/**
@@ -913,6 +930,8 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
* @param formFieldElement - The form field element that triggered the focus event.
*/
private async triggerFormFieldFocusedAction(formFieldElement: ElementWithOpId<FormFieldElement>) {
this.clearBlurFieldTimeout();
if (await this.isFieldCurrentlyFilling()) {
return;
}
@@ -1787,6 +1806,16 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
}
}
/**
* Clears the timeout that handles blur event transitions between fields.
*/
private clearBlurFieldTimeout() {
if (this.blurFieldTimeout) {
globalThis.clearTimeout(this.blurFieldTimeout);
this.blurFieldTimeout = null;
}
}
/**
* Destroys the autofill overlay content service. This method will
* disconnect the mutation observers and remove all event listeners.
@@ -1794,6 +1823,7 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
destroy() {
this.clearFocusInlineMenuListTimeout();
this.clearCloseInlineMenuOnRedirectTimeout();
this.clearBlurFieldTimeout();
this.formFieldElements.forEach((_autofillField, formFieldElement) => {
this.removeCachedFormFieldEventListeners(formFieldElement);
formFieldElement.removeEventListener(EVENTS.BLUR, this.handleFormFieldBlurEvent);