1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00

[PM-5189] Refactoring implementation

This commit is contained in:
Cesar Gonzalez
2024-06-11 09:31:08 -05:00
parent 87cccdb52a
commit d43b5359c9
4 changed files with 28 additions and 28 deletions

View File

@@ -418,7 +418,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).not.toHaveBeenCalledWith( expect(tabsSendMessageSpy).not.toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "appendInlineMenuElementsToDom", command: "appendAutofillInlineMenuToDom",
overlayElement: AutofillOverlayElement.Button, overlayElement: AutofillOverlayElement.Button,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -426,7 +426,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).not.toHaveBeenCalledWith( expect(tabsSendMessageSpy).not.toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "appendInlineMenuElementsToDom", command: "appendAutofillInlineMenuToDom",
overlayElement: AutofillOverlayElement.List, overlayElement: AutofillOverlayElement.List,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -440,7 +440,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "appendInlineMenuElementsToDom", command: "appendAutofillInlineMenuToDom",
overlayElement: AutofillOverlayElement.Button, overlayElement: AutofillOverlayElement.Button,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -448,7 +448,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "appendInlineMenuElementsToDom", command: "appendAutofillInlineMenuToDom",
overlayElement: AutofillOverlayElement.List, overlayElement: AutofillOverlayElement.List,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -470,7 +470,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "appendInlineMenuElementsToDom", command: "appendAutofillInlineMenuToDom",
overlayElement: AutofillOverlayElement.Button, overlayElement: AutofillOverlayElement.Button,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -478,7 +478,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).not.toHaveBeenCalledWith( expect(tabsSendMessageSpy).not.toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "appendInlineMenuElementsToDom", command: "appendAutofillInlineMenuToDom",
overlayElement: AutofillOverlayElement.List, overlayElement: AutofillOverlayElement.List,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -882,7 +882,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "closeInlineMenu", command: "closeAutofillInlineMenu",
overlayElement: AutofillOverlayElement.Button, overlayElement: AutofillOverlayElement.Button,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -922,7 +922,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "closeInlineMenu", command: "closeAutofillInlineMenu",
overlayElement: AutofillOverlayElement.List, overlayElement: AutofillOverlayElement.List,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -930,7 +930,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).not.toHaveBeenCalledWith( expect(tabsSendMessageSpy).not.toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "closeInlineMenu", command: "closeAutofillInlineMenu",
overlayElement: AutofillOverlayElement.Button, overlayElement: AutofillOverlayElement.Button,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -944,7 +944,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ {
command: "closeInlineMenu", command: "closeAutofillInlineMenu",
overlayElement: undefined, overlayElement: undefined,
}, },
{ frameId: 0 }, { frameId: 0 },
@@ -1188,7 +1188,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ command: "checkIsInlineMenuButtonVisible" }, { command: "checkIsAutofillInlineMenuButtonVisible" },
{ frameId: 0 }, { frameId: 0 },
); );
}); });
@@ -1202,7 +1202,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ command: "checkIsInlineMenuListVisible" }, { command: "checkIsAutofillInlineMenuListVisible" },
{ frameId: 0 }, { frameId: 0 },
); );
}); });
@@ -1449,7 +1449,7 @@ describe("OverlayBackground", () => {
expect(tabsSendMessageSpy).toHaveBeenCalledWith( expect(tabsSendMessageSpy).toHaveBeenCalledWith(
sender.tab, sender.tab,
{ command: "closeInlineMenu", overlayElement: undefined }, { command: "closeAutofillInlineMenu", overlayElement: undefined },
{ frameId: 0 }, { frameId: 0 },
); );
expect(tabSendMessageDataSpy).toBeCalledWith( expect(tabSendMessageDataSpy).toBeCalledWith(

View File

@@ -483,7 +483,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
sender: chrome.runtime.MessageSender, sender: chrome.runtime.MessageSender,
{ forceCloseAutofillInlineMenu, overlayElement }: CloseInlineMenuMessage = {}, { forceCloseAutofillInlineMenu, overlayElement }: CloseInlineMenuMessage = {},
) { ) {
const command = "closeInlineMenu"; const command = "closeAutofillInlineMenu";
const sendOptions = { frameId: 0 }; const sendOptions = { frameId: 0 };
if (forceCloseAutofillInlineMenu) { if (forceCloseAutofillInlineMenu) {
void BrowserApi.tabSendMessage(sender.tab, { command, overlayElement }, sendOptions); void BrowserApi.tabSendMessage(sender.tab, { command, overlayElement }, sendOptions);
@@ -568,7 +568,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
await BrowserApi.tabSendMessage( await BrowserApi.tabSendMessage(
sender.tab, sender.tab,
{ command: "appendInlineMenuElementsToDom", overlayElement }, { command: "appendAutofillInlineMenuToDom", overlayElement },
{ frameId: 0 }, { frameId: 0 },
); );
@@ -703,7 +703,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
void BrowserApi.tabSendMessage( void BrowserApi.tabSendMessage(
sender.tab, sender.tab,
{ command: "toggleInlineMenuHidden", isInlineMenuHidden: isAutofillInlineMenuHidden }, { command: "toggleAutofillInlineMenuHidden", isInlineMenuHidden: isAutofillInlineMenuHidden },
{ frameId: 0 }, { frameId: 0 },
); );
@@ -988,7 +988,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
): Promise<boolean> { ): Promise<boolean> {
return await BrowserApi.tabSendMessage( return await BrowserApi.tabSendMessage(
sender.tab, sender.tab,
{ command: "checkIsInlineMenuButtonVisible" }, { command: "checkIsAutofillInlineMenuButtonVisible" },
{ frameId: 0 }, { frameId: 0 },
); );
} }
@@ -1003,7 +1003,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
): Promise<boolean> { ): Promise<boolean> {
return await BrowserApi.tabSendMessage( return await BrowserApi.tabSendMessage(
sender.tab, sender.tab,
{ command: "checkIsInlineMenuListVisible" }, { command: "checkIsAutofillInlineMenuListVisible" },
{ frameId: 0 }, { frameId: 0 },
); );
} }

View File

@@ -2,11 +2,11 @@ import { AutofillExtensionMessageParam } from "../../../content/abstractions/aut
export type InlineMenuExtensionMessageHandlers = { export type InlineMenuExtensionMessageHandlers = {
[key: string]: CallableFunction; [key: string]: CallableFunction;
closeInlineMenu: ({ message }: AutofillExtensionMessageParam) => void; closeAutofillInlineMenu: ({ message }: AutofillExtensionMessageParam) => void;
appendInlineMenuElementsToDom: ({ message }: AutofillExtensionMessageParam) => Promise<void>; appendAutofillInlineMenuToDom: ({ message }: AutofillExtensionMessageParam) => Promise<void>;
toggleInlineMenuHidden: ({ message }: AutofillExtensionMessageParam) => void; toggleAutofillInlineMenuHidden: ({ message }: AutofillExtensionMessageParam) => void;
checkIsInlineMenuButtonVisible: () => boolean; checkIsAutofillInlineMenuButtonVisible: () => boolean;
checkIsInlineMenuListVisible: () => boolean; checkIsAutofillInlineMenuListVisible: () => boolean;
}; };
export interface AutofillInlineMenuContentService { export interface AutofillInlineMenuContentService {

View File

@@ -35,12 +35,12 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
zIndex: "2147483647", zIndex: "2147483647",
}; };
private readonly _extensionMessageHandlers: InlineMenuExtensionMessageHandlers = { private readonly _extensionMessageHandlers: InlineMenuExtensionMessageHandlers = {
closeInlineMenu: ({ message }) => this.removeInlineMenu(message), closeAutofillInlineMenu: ({ message }) => this.removeInlineMenu(message),
appendInlineMenuElementsToDom: ({ message }) => this.appendInlineMenuElements(message), appendAutofillInlineMenuToDom: ({ message }) => this.appendInlineMenuElements(message),
toggleInlineMenuHidden: ({ message }) => toggleAutofillInlineMenuHidden: ({ message }) =>
this.toggleInlineMenuHidden(message.isInlineMenuHidden), this.toggleInlineMenuHidden(message.isInlineMenuHidden),
checkIsInlineMenuButtonVisible: () => this.isInlineMenuButtonVisible(), checkIsAutofillInlineMenuButtonVisible: () => this.isInlineMenuButtonVisible(),
checkIsInlineMenuListVisible: () => this.isInlineMenuListVisible(), checkIsAutofillInlineMenuListVisible: () => this.isInlineMenuListVisible(),
}; };
constructor() { constructor() {