Skip to content

Commit 32515a0

Browse files
nzaytsevnzaytsev
committed
Improvements
1 parent fc8895e commit 32515a0

File tree

6 files changed

+85
-62
lines changed

6 files changed

+85
-62
lines changed

‎package.json‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7413,6 +7413,11 @@
74137413
"title": "Open Worktree",
74147414
"icon": "$(browser)"
74157415
},
7416+
{
7417+
"command": "gitlens.home.openWorktreeInNewWindow",
7418+
"title": "Open Worktree in New Window",
7419+
"icon": "$(empty-window)"
7420+
},
74167421
{
74177422
"command": "gitlens.home.fetch",
74187423
"title": "Fetch",
@@ -11095,6 +11100,10 @@
1109511100
"command": "gitlens.home.openWorktree",
1109611101
"when": "false"
1109711102
},
11103+
{
11104+
"command": "gitlens.home.openWorktreeInNewWindow",
11105+
"when": "false"
11106+
},
1109811107
{
1109911108
"command": "gitlens.home.switchToBranch",
1110011109
"when": "false"
@@ -16243,42 +16252,47 @@
1624316252
{
1624416253
"command": "gitlens.home.openPullRequestChanges",
1624516254
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.openPullRequestChanges\\b)/",
16246-
"group": "1_gitlens_action@1"
16255+
"group": "10_gitlens_action@1"
1624716256
},
1624816257
{
1624916258
"command": "gitlens.home.openPullRequestOnRemote",
1625016259
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.openPullRequestOnRemote\\b)/",
16251-
"group": "1_gitlens_action@2"
16260+
"group": "20_gitlens_action@1"
1625216261
},
1625316262
{
1625416263
"command": "gitlens.home.createPullRequest",
1625516264
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.createPullRequest\\b)/",
16256-
"group": "1_gitlens_action@3"
16265+
"group": "30_gitlens_action@1"
1625716266
},
1625816267
{
1625916268
"command": "gitlens.home.openWorktree",
1626016269
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.openWorktree\\b)/",
16261-
"group": "1_gitlens_action@4"
16270+
"group": "40_gitlens_action@1"
16271+
},
16272+
{
16273+
"command": "gitlens.home.openWorktreeInNewWindow",
16274+
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.openWorktreeInNewWindow\\b)/",
16275+
"group": "40_gitlens_action@2"
1626216276
},
1626316277
{
1626416278
"command": "gitlens.home.switchToBranch",
1626516279
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.switchToBranch\\b)/",
16266-
"group": "1_gitlens_action@5"
16280+
"group": "50_gitlens_action@1"
1626716281
},
1626816282
{
1626916283
"command": "gitlens.home.fetch",
1627016284
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.fetch\\b)/",
16271-
"group": "1_gitlens_action@6"
16285+
"group": "60_gitlens_action@1"
1627216286
},
1627316287
{
1627416288
"command": "gitlens.home.pull",
1627516289
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.pull\\b)/",
16276-
"group": "1_gitlens_action@6"
16290+
"group": "60_gitlens_action@2"
1627716291
},
1627816292
{
1627916293
"command": "gitlens.home.openInGraph",
1628016294
"when": "webviewItem =~ /gitlens:home\\b(?=.*?\\b\\+.*gitlens\\.home\\.openInGraph\\b)/",
16281-
"group": "1_gitlens_action@7"
16295+
"group": "80_gitlens_action@1"
1628216296
},
1628316297
{
1628416298
"command": "gitlens.graph.openWorktree",

‎src/webviews/apps/plus/home/components/active-work.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { GitTrackingState } from '../../../../../git/models/branch';
88
import { createWebviewCommandLink } from '../../../../../system/webview';
99
import type { GetOverviewBranch, OpenInGraphParams, State } from '../../../../home/protocol';
1010
import { stateContext } from '../../../home/context';
11-
import type { ActionItemProps } from '../../../shared/components/actions/action-list';
11+
import type { ActionList } from '../../../shared/components/actions/action-list';
1212
import { ipcContext } from '../../../shared/context';
1313
import type { HostIpc } from '../../../shared/ipc';
1414
import { linkStyles } from '../../shared/components/vscode.css';
@@ -216,7 +216,7 @@ export class GlActiveWork extends SignalWatcher(LitElement) {
216216
repoPath: repo,
217217
branchId: branch.id,
218218
};
219-
const actions: ActionItemProps[] = [];
219+
const actions: (typeof ActionList.ItemProps)[] = [];
220220
if (branch.pr) {
221221
actions.push(
222222
{
@@ -242,15 +242,14 @@ export class GlActiveWork extends SignalWatcher(LitElement) {
242242
return nothing;
243243
}
244244
return html`<action-list
245-
@open-actions-menu=${(e: CustomEvent<{ items: ActionItemProps[] }>) => {
245+
@open-actions-menu=${(e: typeof ActionList.OpenContextMenuEvent) => {
246246
this.prevAttr = JSON.parse(document.body.getAttribute('data-vscode-context') ?? '{}');
247247
let context = 'gitlens:home';
248248
e.detail.items.forEach(x => {
249249
if (x.href) {
250250
context += `+${x.href}`;
251251
}
252252
});
253-
console.log({ context: context });
254253
document.body.setAttribute(
255254
'data-vscode-context',
256255
JSON.stringify({

‎src/webviews/apps/plus/home/components/branch-section.ts‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { when } from 'lit/directives/when.js';
44
import type { Commands } from '../../../../../constants.commands';
55
import type { GitTrackingState } from '../../../../../git/models/branch';
66
import type { BranchRef, GetOverviewBranch, OpenInGraphParams } from '../../../../home/protocol';
7-
import type { ActionItemProps } from '../../../shared/components/actions/action-list';
7+
import type { ActionList } from '../../../shared/components/actions/action-list';
88
import { srOnlyStyles } from '../../../shared/components/styles/lit/a11y.css';
99
import { linkStyles } from '../../shared/components/vscode.css';
1010
import '../../../shared/components/code-icon';
@@ -81,6 +81,10 @@ export class GlSection extends LitElement {
8181

8282
@customElement('gl-branch-section')
8383
export class GlBranchSection extends LitElement {
84+
static get OpenContextMenuEvent(): CustomEvent<{ items: (typeof ActionList.ItemProps)[]; branchRefs: BranchRef }> {
85+
throw new Error('type field OpenContextMenuEvent cannot be used as a value');
86+
}
87+
8488
@property({ type: String }) label!: string;
8589
@property() repo!: string;
8690
@property({ type: Array }) branches!: GetOverviewBranch[];
@@ -105,28 +109,21 @@ export class GlBranchSection extends LitElement {
105109
this.branches.map(
106110
branch =>
107111
html`<gl-branch-card
108-
@open-actions-menu=${(
109-
e: CustomEvent<{ branchRefs: BranchRef; items: ActionItemProps[] }>,
110-
) => {
111-
const evt = new CustomEvent<{
112-
branchRefs: BranchRef;
113-
items: ActionItemProps[];
114-
}>('branch-context-opened', {
112+
@open-actions-menu=${(e: typeof GlBranchCard.OpenContextMenuEvent) => {
113+
const evt = new CustomEvent('branch-context-opened', {
115114
detail: {
116115
branchRefs: e.detail.branchRefs,
117116
items: e.detail.items,
118117
},
119-
});
118+
}) satisfies typeof GlBranchSection.OpenContextMenuEvent;
120119
this.dispatchEvent(evt);
121120
}}
122-
@close-actions-menu=${(e: CustomEvent<{ items: ActionItemProps[] }>) => {
121+
@close-actions-menu=${(e: CustomEvent) => {
123122
const evt = new CustomEvent<{
124123
branch: GetOverviewBranch;
125-
// items: ActionItemProps[];
126124
}>('branch-context-closed', {
127125
detail: {
128126
branch: branch,
129-
// items: e.detail.items,
130127
},
131128
});
132129
this.dispatchEvent(evt);
@@ -242,6 +239,10 @@ export const branchCardStyles = css`
242239
export class GlBranchCard extends LitElement {
243240
static override styles = [linkStyles, branchCardStyles];
244241

242+
static get OpenContextMenuEvent(): CustomEvent<{ items: (typeof ActionList.ItemProps)[]; branchRefs: BranchRef }> {
243+
throw new Error('type field OpenContextMenuEvent cannot be used as a value');
244+
}
245+
245246
@property()
246247
repo!: string;
247248

@@ -378,7 +379,7 @@ export class GlBranchCard extends LitElement {
378379
}
379380

380381
private renderActions() {
381-
const actions: ActionItemProps[] = [];
382+
const actions: (typeof ActionList.ItemProps)[] = [];
382383
if (this.branch.pr) {
383384
actions.push(
384385
{
@@ -404,6 +405,14 @@ export class GlBranchCard extends LitElement {
404405
label: 'Open Worktree',
405406
icon: 'browser',
406407
href: this.createCommandLink('gitlens.home.openWorktree'),
408+
modifiers: [
409+
{
410+
key: 'alt',
411+
label: 'Open Worktree in New Window',
412+
href: this.createCommandLink('gitlens.home.openWorktreeInNewWindow'),
413+
icon: 'empty-window',
414+
},
415+
],
407416
});
408417
} else {
409418
actions.push({
@@ -419,7 +428,7 @@ export class GlBranchCard extends LitElement {
419428
label: 'Fetch',
420429
icon: 'gl-repo-fetch',
421430
href: this.createCommandLink('gitlens.home.fetch'),
422-
modifiers: [
431+
modifiers: this.branch.upstream && [
423432
{
424433
key: 'alt',
425434
label: 'Pull',
@@ -444,17 +453,14 @@ export class GlBranchCard extends LitElement {
444453
return html`<action-list
445454
limit=${3}
446455
class="branch-item__actions"
447-
@open-actions-menu=${(e: CustomEvent<{ items: ActionItemProps[] }>) => {
448-
const ev = new CustomEvent<{ items: ActionItemProps[]; branchRefs: BranchRef }>('open-actions-menu', {
456+
@open-actions-menu=${(e: typeof ActionList.OpenContextMenuEvent) => {
457+
const ev = new CustomEvent('open-actions-menu', {
449458
detail: { items: e.detail.items, branchRefs: this.branchRefs },
450-
});
459+
}) satisfies typeof GlBranchCard.OpenContextMenuEvent;
451460
this.dispatchEvent(ev);
452461
}}
453462
@close-actions-menu=${() => {
454-
const ev = new CustomEvent<{ items: ActionItemProps[]; branchRefs: BranchRef }>(
455-
'close-actions-menu',
456-
{},
457-
);
463+
const ev = new CustomEvent('close-actions-menu');
458464
this.dispatchEvent(ev);
459465
}}
460466
.items=${actions}

‎src/webviews/apps/plus/home/components/overview.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { SignalWatcher } from '@lit-labs/signals';
33
import { css, html, LitElement, nothing } from 'lit';
44
import { customElement, state } from 'lit/decorators.js';
55
import { when } from 'lit/directives/when.js';
6-
import type { BranchRef, GetOverviewResponse, OverviewRecentThreshold, State } from '../../../../home/protocol';
6+
import type { GetOverviewResponse, OverviewRecentThreshold, State } from '../../../../home/protocol';
77
import { SetOverviewFilter } from '../../../../home/protocol';
88
import { stateContext } from '../../../home/context';
9-
import type { ActionItemProps } from '../../../shared/components/actions/action-list';
109
import { ipcContext } from '../../../shared/context';
1110
import type { HostIpc } from '../../../shared/ipc';
1211
import { linkStyles } from '../../shared/components/vscode.css';
12+
import type { GlBranchSection } from './branch-section';
1313
import type { OverviewState } from './overviewState';
1414
import { overviewStateContext } from './overviewState';
1515
import '../../../shared/components/skeleton-loader';
@@ -103,20 +103,14 @@ export class GlOverview extends SignalWatcher(LitElement) {
103103
.isFetching=${isFetching}
104104
.repo=${repository.path}
105105
.branches=${repository.branches.recent}
106-
@branch-context-opened=${(
107-
e: CustomEvent<{
108-
branchRefs: BranchRef;
109-
items: ActionItemProps[];
110-
}>,
111-
) => {
106+
@branch-context-opened=${(e: typeof GlBranchSection.OpenContextMenuEvent) => {
112107
this.prevAttr = JSON.parse(document.body.getAttribute('data-vscode-context') ?? '{}');
113108
let context = 'gitlens:home';
114109
e.detail.items.forEach(x => {
115110
if (x.href) {
116111
context += `+${x.href}`;
117112
}
118113
});
119-
console.log({ context: context });
120114
document.body.setAttribute(
121115
'data-vscode-context',
122116
JSON.stringify({

‎src/webviews/apps/shared/components/actions/action-list.ts‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { when } from 'lit/directives/when.js';
66
import './action-item';
77
import './action-nav';
88

9-
export interface ActionItemProps {
9+
interface ActionItemProps {
1010
icon: string;
1111
label: string;
1212
href?: string;
@@ -15,10 +15,13 @@ export interface ActionItemProps {
1515

1616
@customElement('action-list')
1717
export class ActionList extends LitElement {
18-
// static override styles = css``;
19-
18+
static get ItemProps(): ActionItemProps {
19+
throw new Error('type field ItemProps cannot be used as a value');
20+
}
21+
static get OpenContextMenuEvent(): CustomEvent<{ items: ActionItemProps[] }> {
22+
throw new Error('type field OpenContextMenuEvent cannot be used as a value');
23+
}
2024
private _slotSubscriptionsDisposer?: () => void;
21-
2225
@property({ type: Array })
2326
private items: Array<ActionItemProps> = [];
2427

@@ -31,14 +34,11 @@ export class ActionList extends LitElement {
3134
override connectedCallback(): void {
3235
const handleKeydown = this.handleKeydown.bind(this);
3336
const handleKeyup = this.handleKeyup.bind(this);
34-
const handleOpenMore = this.handleOpenMore.bind(this);
3537
window.addEventListener('keydown', handleKeydown, false);
3638
window.addEventListener('keyup', handleKeyup, false);
37-
this.addEventListener('open-actions-menu', handleOpenMore);
3839
this._slotSubscriptionsDisposer = () => {
3940
window.removeEventListener('keydown', handleKeydown, false);
4041
window.removeEventListener('keyup', handleKeyup, false);
41-
this.removeEventListener('open-actions-menu', handleOpenMore);
4242
};
4343
super.connectedCallback();
4444
}
@@ -59,11 +59,14 @@ export class ActionList extends LitElement {
5959

6060
this.open = true;
6161

62-
const event = new CustomEvent<{ items: ActionItemProps[] }>('open-actions-menu', {
62+
const event = new CustomEvent('open-actions-menu', {
6363
detail: {
64-
items: this.items.slice(from),
64+
items: this.items
65+
.slice(from)
66+
.map((item): ActionItemProps[] => [item, ...(item.modifiers ?? [])])
67+
.flat(),
6568
},
66-
});
69+
}) satisfies typeof ActionList.OpenContextMenuEvent;
6770
this.dispatchEvent(event);
6871

6972
const contextMenuEvent = new PointerEvent('contextmenu', {
@@ -77,7 +80,7 @@ export class ActionList extends LitElement {
7780
clientY: this.getBoundingClientRect().bottom,
7881
});
7982
this.dispatchEvent(contextMenuEvent);
80-
83+
this.modifier = undefined;
8184
const handleClick = () => {
8285
const ev = new CustomEvent('close-actions-menu');
8386
this.dispatchEvent(ev);
@@ -104,7 +107,7 @@ export class ActionList extends LitElement {
104107
label="More actions..."
105108
href="#"
106109
@mousedown=${this.handleMoreActions.bind(this, from)}
107-
@click=${this.handleMoreActions}
110+
@click=${this.handleMoreActions.bind(this, from)}
108111
>
109112
</action-item>
110113
`;
@@ -117,17 +120,23 @@ export class ActionList extends LitElement {
117120
<action-nav>
118121
${this.items.slice(0, splitValue).map(({ modifiers, ...originalProps }) => {
119122
const { icon, label, href } = modifiers?.find(x => this.modifier === x.key) ?? originalProps;
120-
return html`<action-item icon=${icon} label=${label} href=${ifDefined(href)}></action-item>`;
123+
return html`<action-item
124+
icon=${icon}
125+
@click=${() => {
126+
// finish event handling and clear modifier in next macrotask
127+
setTimeout(() => {
128+
this.modifier = undefined;
129+
});
130+
}}
131+
label=${label}
132+
href=${ifDefined(href)}
133+
></action-item>`;
121134
})}
122135
${when(hasMore, this.renderMoreOptions.bind(this, splitValue))}
123136
</action-nav>
124137
`;
125138
}
126139

127-
private handleOpenMore() {
128-
// this.open = !this.open;
129-
}
130-
131140
private handleKeydown(e: KeyboardEvent) {
132141
if (this.modifier) {
133142
return;

0 commit comments

Comments
 (0)