diff --git a/package.json b/package.json index 7b09627..1930292 100644 --- a/package.json +++ b/package.json @@ -14699,7 +14699,7 @@ }, "dependencies": { "@gitkraken/gitkraken-components": "10.1.9", - "@gitkraken/shared-web-components": "^0.1.1-rc.1", + "@gitkraken/shared-web-components": "^0.1.1-rc.2", "@microsoft/fast-element": "1.12.0", "@microsoft/fast-react-wrapper": "0.3.18", "@octokit/core": "4.2.4", diff --git a/src/webviews/apps/plus/focus/components/focus-app.ts b/src/webviews/apps/plus/focus/components/focus-app.ts index d5d7f7b..13fb6d8 100644 --- a/src/webviews/apps/plus/focus/components/focus-app.ts +++ b/src/webviews/apps/plus/focus/components/focus-app.ts @@ -302,10 +302,14 @@ export class GlFocusApp extends LitElement { )} - ${this.mineFilterMenuLabel} ${this.mineFilterMenuLabel} + - + ${map( this.mineFilterOptions, ({ label, value }, i) => html` @@ -374,10 +378,9 @@ export class GlFocusApp extends LitElement { } onSelectMineFilter(e: CustomEvent<{ target: MenuItem }>) { - // console.log(e); - // console.log(e.detail?.target?.dataset?.value); if (e.detail?.target?.dataset?.value != null) { this.selectedMineFilter = e.detail.target.dataset.value; + this.onHideMenu(); } } diff --git a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts index f86ea15..8c0517a 100644 --- a/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts +++ b/src/webviews/apps/plus/focus/components/gk-pull-request-row.ts @@ -235,7 +235,7 @@ export class GkPullRequestRow extends LitElement { item => html``, )} `, diff --git a/src/webviews/apps/plus/focus/focus.scss b/src/webviews/apps/plus/focus/focus.scss index 9d9048c..f00107b 100644 --- a/src/webviews/apps/plus/focus/focus.scss +++ b/src/webviews/apps/plus/focus/focus.scss @@ -27,6 +27,11 @@ body { --gk-input-color: var(--vscode-input-foreground); --gk-text-secondary-color: var(--color-foreground--65); --gk-button-ghost-color: var(--color-foreground--50); + + --gk-menu-border-color: var(--vscode-menu-border); + --gk-menu-background-color: var(--vscode-menu-background); + --gk-menu-item-background-color-hover: var(--vscode-menu-selectionBackground); + --gk-menu-item-background-color-active: var(--vscode-menu-background); } .vscode-high-contrast, @@ -207,6 +212,7 @@ h3 { flex-direction: column; gap: 1.6rem; padding-top: 1.2rem; + z-index: 1; &-group { display: flex; @@ -242,3 +248,7 @@ h3 { .mine-menu { width: max-content; } + +gk-tooltip gk-menu { + z-index: 10; +} diff --git a/yarn.lock b/yarn.lock index 76eccf7..20822fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -235,10 +235,10 @@ react-dom "16.8.4" react-dragula "1.1.17" -"@gitkraken/shared-web-components@^0.1.1-rc.1": - version "0.1.1-rc.1" - resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.1.tgz#8fa4de221f770c9a40778d1062f2707d1172922b" - integrity sha512-9CWf4ZuNv5F9ZOrONsBCM8F//KCZnDSkyMsFue51munqfTOT0bjjSM+KnL1hL79P+URDkrhHKiI59XT3QN5qcQ== +"@gitkraken/shared-web-components@^0.1.1-rc.2": + version "0.1.1-rc.2" + resolved "https://registry.npmjs.org/@gitkraken/shared-web-components/-/shared-web-components-0.1.1-rc.2.tgz#315f4ea8267112f3e45ae4be612d682f3ef2523f" + integrity sha512-Rdzokl9j+gT+OUWmBMbVQtPXJU29k8J5528+WFZtGf857kj0sEvW/lcOr4an3D2342Zug3K0DvKy775W7p+g7g== dependencies: "@floating-ui/dom" "^1.4.2" typescript "^4.9.5"