From 528e39aa6ecefc51b289f57dcbfe95ac39588a77 Mon Sep 17 00:00:00 2001
From: Jeremias Peier <jeremias.peier@sbb.ch>
Date: Wed, 11 Dec 2024 09:32:30 +0100
Subject: [PATCH] fix: fix merge

---
 package.json                                   |  4 ++--
 .../autocomplete-grid.spec.ts                  |  1 -
 .../autocomplete/autocomplete-base-element.ts  | 15 +++------------
 yarn.lock                                      | 18 +++++++++---------
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index a1c86205485..e1b3caa0abd 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "madge": "8.0.0",
     "npm-run-all2": "7.0.1",
     "octokit": "4.0.2",
-    "playwright": "1.49.0",
+    "playwright": "1.49.1",
     "postcss": "8.4.49",
     "prettier": "3.4.2",
     "react": "18.3.1",
@@ -153,7 +153,7 @@
     "@web/dev-server-core": "0.7.1",
     "jackspeak": "2.1.1",
     "lit": "3.2.1",
-    "playwright": "1.49.0",
+    "playwright": "1.49.1",
     "prettier": "3.4.2"
   },
   "prettier": {
diff --git a/src/elements/autocomplete-grid/autocomplete-grid/autocomplete-grid.spec.ts b/src/elements/autocomplete-grid/autocomplete-grid/autocomplete-grid.spec.ts
index f33312989c2..15984653626 100644
--- a/src/elements/autocomplete-grid/autocomplete-grid/autocomplete-grid.spec.ts
+++ b/src/elements/autocomplete-grid/autocomplete-grid/autocomplete-grid.spec.ts
@@ -57,7 +57,6 @@ describe(`sbb-autocomplete-grid`, () => {
     `);
     input = formField.querySelector<HTMLInputElement>('input')!;
     element = formField.querySelector<SbbAutocompleteGridElement>('sbb-autocomplete-grid')!;
-    element = formField.querySelector<SbbAutocompleteGridElement>('sbb-autocomplete-grid')!;
   });
 
   describeIf(isSafari, 'Safari', async () => {
diff --git a/src/elements/autocomplete/autocomplete-base-element.ts b/src/elements/autocomplete/autocomplete-base-element.ts
index 646d482fa11..07f456bb370 100644
--- a/src/elements/autocomplete/autocomplete-base-element.ts
+++ b/src/elements/autocomplete/autocomplete-base-element.ts
@@ -293,18 +293,9 @@ export abstract class SbbAutocompleteBaseElement extends SbbNegativeMixin(
     this.triggerElement?.addEventListener('focus', () => this.open(), {
       signal: this._triggerEventsController.signal,
     });
-    this.triggerElement?.addEventListener(
-      'click',
-      (e) => {
-        // Avoid bubbling click to form field, where it would trigger this click again
-        e.stopPropagation();
-
-        this.open();
-      },
-      {
-        signal: this._triggerEventsController.signal,
-      },
-    );
+    this.triggerElement?.addEventListener('click', () => this.open(), {
+      signal: this._triggerEventsController.signal,
+    });
     this.triggerElement?.addEventListener(
       'input',
       (event) => {
diff --git a/yarn.lock b/yarn.lock
index 30823f3645a..ca3218b86fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7080,17 +7080,17 @@ pkg-types@^1.2.1:
     mlly "^1.7.2"
     pathe "^1.1.2"
 
-playwright-core@1.49.0:
-  version "1.49.0"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.49.0.tgz#8e69ffed3f41855b854982f3632f2922c890afcb"
-  integrity sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==
+playwright-core@1.49.1:
+  version "1.49.1"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.49.1.tgz#32c62f046e950f586ff9e35ed490a424f2248015"
+  integrity sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==
 
-playwright@1.49.0, playwright@^1.22.2:
-  version "1.49.0"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.49.0.tgz#df6b9e05423377a99658202844a294a8afb95d0a"
-  integrity sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==
+playwright@1.49.1, playwright@^1.22.2:
+  version "1.49.1"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.49.1.tgz#830266dbca3008022afa7b4783565db9944ded7c"
+  integrity sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==
   dependencies:
-    playwright-core "1.49.0"
+    playwright-core "1.49.1"
   optionalDependencies:
     fsevents "2.3.2"