Merge branch 'main' into ps/extension-refresh

2026-02-13 06:54:07 +00:00 · 2024-10-30 09:25:48 -04:00
parent 146e209830 7ce26f7aea
commit 38d43e4cd1
10 changed files with 34 additions and 10 deletions
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -35,6 +35,10 @@
      "matchPackageNames": ["@types/jest", "jest", "ts-jest", "jest-preset-angular"],
      "matchUpdateTypes": "major"
    },
+    {
+      "groupName": "macOS/iOS bindings",
+      "matchPackageNames": ["core-foundation", "security-framework", "security-framework-sys"]
+    },
    {
      "matchPackageNames": [
        "@ngtools/webpack",
--- a/apps/browser/src/autofill/content/bootstrap-autofill-overlay-menu.ts
+++ b/apps/browser/src/autofill/content/bootstrap-autofill-overlay-menu.ts
@@ -21,6 +21,7 @@ import AutofillInit from "./autofill-init";
      domQueryService,
      domElementVisibilityService,
      inlineMenuFieldQualificationService,
+      inlineMenuContentService,
    );

    windowContext.bitwardenAutofillInit = new AutofillInit(
--- a/apps/browser/src/autofill/content/bootstrap-autofill-overlay.ts
+++ b/apps/browser/src/autofill/content/bootstrap-autofill-overlay.ts
@@ -24,6 +24,7 @@ import AutofillInit from "./autofill-init";
      domQueryService,
      domElementVisibilityService,
      inlineMenuFieldQualificationService,
+      inlineMenuContentService,
    );

    windowContext.bitwardenAutofillInit = new AutofillInit(
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts
@@ -1,4 +1,4 @@
-import { mock } from "jest-mock-extended";
+import { mock, MockProxy } from "jest-mock-extended";

 import { EVENTS } from "@bitwarden/common/autofill/constants";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -13,6 +13,7 @@ import {
 import AutofillField from "../models/autofill-field";
 import AutofillForm from "../models/autofill-form";
 import AutofillPageDetails from "../models/autofill-page-details";
+import { AutofillInlineMenuContentService } from "../overlay/inline-menu/abstractions/autofill-inline-menu-content.service";
 import { createAutofillFieldMock } from "../spec/autofill-mocks";
 import {
  flushPromises,
@@ -35,6 +36,7 @@ describe("AutofillOverlayContentService", () => {
  let domElementVisibilityService: DomElementVisibilityService;
  let autofillInit: AutofillInit;
  let inlineMenuFieldQualificationService: InlineMenuFieldQualificationService;
+  let inlineMenuContentService: MockProxy<AutofillInlineMenuContentService>;
  let autofillOverlayContentService: AutofillOverlayContentService;
  let sendExtensionMessageSpy: jest.SpyInstance;
  const sendResponseSpy = jest.fn();
@@ -44,10 +46,12 @@ describe("AutofillOverlayContentService", () => {
    inlineMenuFieldQualificationService = new InlineMenuFieldQualificationService();
    domQueryService = new DomQueryService();
    domElementVisibilityService = new DomElementVisibilityService();
+    inlineMenuContentService = mock<AutofillInlineMenuContentService>();
    autofillOverlayContentService = new AutofillOverlayContentService(
      domQueryService,
      domElementVisibilityService,
      inlineMenuFieldQualificationService,
+      inlineMenuContentService,
    );
    autofillInit = new AutofillInit(
      domQueryService,
--- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
+++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts
@@ -28,6 +28,7 @@ import {
 } from "../enums/autofill-overlay.enum";
 import AutofillField from "../models/autofill-field";
 import AutofillPageDetails from "../models/autofill-page-details";
+import { AutofillInlineMenuContentService } from "../overlay/inline-menu/abstractions/autofill-inline-menu-content.service";
 import { ElementWithOpId, FillableFormFieldElement, FormFieldElement } from "../types";
 import {
  currentlyInSandboxedIframe,
@@ -155,6 +156,7 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
    private domQueryService: DomQueryService,
    private domElementVisibilityService: DomElementVisibilityService,
    private inlineMenuFieldQualificationService: InlineMenuFieldQualificationService,
+    private inlineMenuContentService?: AutofillInlineMenuContentService,
  ) {}

  /**
@@ -1580,7 +1582,8 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ
      if (activeElement) {
        return (
          activeElement === this.mostRecentlyFocusedField ||
-          activeElement.contains(this.mostRecentlyFocusedField)
+          activeElement.contains(this.mostRecentlyFocusedField) ||
+          this.inlineMenuContentService?.isElementInlineMenu(activeElement as HTMLElement)
        );
      }

--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -710,9 +710,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
 "futures-channel",
 "futures-core",
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -30,7 +30,7 @@ arboard = { version = "=3.4.1", default-features = false, features = [
 base64 = "=0.22.1"
 cbc = { version = "=0.1.2", features = ["alloc"] }
 dirs = "=5.0.1"
-futures = "=0.3.30"
+futures = "=0.3.31"
 interprocess = { version = "=2.2.1", features = ["tokio"] }
 libc = "=0.2.159"
 log = "=0.4.22"
--- a/apps/desktop/resources/com.bitwarden.desktop.desktop
+++ b/apps/desktop/resources/com.bitwarden.desktop.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Bitwarden
+Exec=bitwarden %u
+Terminal=false
+Type=Application
+Icon=com.bitwarden.desktop
+StartupWMClass=Bitwarden
+GenericName=Password Manager
+Comment=A secure and free password manager for all of your devices.
+MimeType=x-scheme-handler/bitwarden;
+Categories=System;Security;
--- a/package-lock.json
+++ b/package-lock.json
@@ -101,7 +101,7 @@
        "@types/firefox-webext-browser": "120.0.4",
        "@types/inquirer": "8.2.10",
        "@types/jest": "29.5.12",
-        "@types/jquery": "3.5.30",
+        "@types/jquery": "3.5.32",
        "@types/jsdom": "21.1.7",
        "@types/koa": "2.15.0",
        "@types/koa__multer": "2.0.7",
@@ -9467,9 +9467,9 @@
      "license": "MIT"
    },
    "node_modules/@types/jquery": {
-      "version": "3.5.30",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz",
-      "integrity": "sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==",
+      "version": "3.5.32",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
+      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
    "@types/firefox-webext-browser": "120.0.4",
    "@types/inquirer": "8.2.10",
    "@types/jest": "29.5.12",
-    "@types/jquery": "3.5.30",
+    "@types/jquery": "3.5.32",
    "@types/jsdom": "21.1.7",
    "@types/koa": "2.15.0",
    "@types/koa__multer": "2.0.7",