Skip to content

Commit

Permalink
fix: fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jeripeierSBB committed Dec 11, 2024
1 parent c42f79f commit 528e39a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 24 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
15 changes: 3 additions & 12 deletions src/elements/autocomplete/autocomplete-base-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7080,17 +7080,17 @@ pkg-types@^1.2.1:
mlly "^1.7.2"
pathe "^1.1.2"

[email protected].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==
[email protected].1:
version "1.49.1"
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.49.1.tgz#32c62f046e950f586ff9e35ed490a424f2248015"
integrity sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==

[email protected].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==
[email protected].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"

Expand Down

0 comments on commit 528e39a

Please sign in to comment.