Skip to content

Commit b98e27f

Browse files
author
Loïc Mangeonjean
committed
fix: fix shadow dom event handler
1 parent a41a186 commit b98e27f

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

vscode-patches/0064-feat-support-shadow-dom.patch

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Subject: [PATCH] feat: support shadow dom
66
---
77
src/vs/base/browser/dom.ts | 23 ++++++++++++-------
88
src/vs/base/browser/domStylesheets.ts | 21 +++++++++++++----
9+
src/vs/base/browser/keyboardEvent.ts | 3 ++-
910
src/vs/base/browser/ui/dialog/dialog.ts | 6 ++---
1011
src/vs/base/browser/ui/dnd/dnd.ts | 4 ++--
1112
src/vs/base/browser/ui/findinput/findInput.ts | 3 ++-
@@ -38,7 +39,7 @@ Subject: [PATCH] feat: support shadow dom
3839
.../browser/gettingStarted.ts | 4 ++--
3940
.../browser/walkThroughPart.ts | 6 ++---
4041
.../themes/browser/workbenchThemeService.ts | 2 +-
41-
34 files changed, 101 insertions(+), 67 deletions(-)
42+
35 files changed, 103 insertions(+), 68 deletions(-)
4243

4344
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
4445
index 1c7c66f76aa..f414f2b07fd 100644
@@ -170,6 +171,20 @@ index 76a71c5402d..e07bd22315c 100644
170171
disposables.add(toDisposable(() => clone.remove()));
171172

172173
for (const rule of getDynamicStyleSheetRules(globalStylesheet)) {
174+
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
175+
index 4e98a3b12d8..ae9a72f97c6 100644
176+
--- a/src/vs/base/browser/keyboardEvent.ts
177+
+++ b/src/vs/base/browser/keyboardEvent.ts
178+
@@ -136,7 +136,8 @@ export class StandardKeyboardEvent implements IKeyboardEvent {
179+
const e = source;
180+
181+
this.browserEvent = e;
182+
- this.target = <HTMLElement>e.target;
183+
+ // composedPath allows to access the real target, even inside a shadow root
184+
+ this.target = <HTMLElement>e.composedPath()[0] ?? e.target;
185+
186+
this.ctrlKey = e.ctrlKey;
187+
this.shiftKey = e.shiftKey;
173188
diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
174189
index b569359a06c..ba8f9063610 100644
175190
--- a/src/vs/base/browser/ui/dialog/dialog.ts

0 commit comments

Comments
 (0)