[PM-8833] Merging changes from autofill settings branch
This commit is contained in:
commit
1363abb979
|
@ -1,5 +1,4 @@
|
|||
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
|
||||
import { InlineMenuVisibilitySetting } from "@bitwarden/common/autofill/types";
|
||||
import { CipherType } from "@bitwarden/common/vault/enums";
|
||||
|
||||
import { AutofillOverlayElementType } from "../../enums/autofill-overlay.enum";
|
||||
|
@ -25,8 +24,6 @@ export type AutofillExtensionMessage = {
|
|||
data?: {
|
||||
direction?: "previous" | "next" | "current";
|
||||
forceCloseInlineMenu?: boolean;
|
||||
settingType?: CipherType;
|
||||
newSettingValue?: InlineMenuVisibilitySetting | boolean;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -3080,10 +3080,12 @@ export default class AutofillService implements AutofillServiceInterface {
|
|||
return;
|
||||
}
|
||||
|
||||
const isInlineMenuVisibilitySubSetting =
|
||||
typeof oldSettingValue === "boolean" || typeof newSettingValue === "boolean";
|
||||
const inlineMenuPreviouslyDisabled = oldSettingValue === AutofillOverlayVisibility.Off;
|
||||
const inlineMenuCurrentlyDisabled = newSettingValue === AutofillOverlayVisibility.Off;
|
||||
if (
|
||||
typeof newSettingValue !== "boolean" &&
|
||||
!isInlineMenuVisibilitySubSetting &&
|
||||
!inlineMenuPreviouslyDisabled &&
|
||||
!inlineMenuCurrentlyDisabled
|
||||
) {
|
||||
|
|
Loading…
Reference in New Issue