Skip to content

Commit 2a557e7

Browse files
committed
fix tab order for hidden status element when a message shows
fixes microsoft/vscode-internalbacklog#4039
1 parent 726b7f5 commit 2a557e7

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@
106106
margin-left: auto;
107107
}
108108

109+
.monaco-editor .interactive-editor .status .label.hidden {
110+
display: none;
111+
}
112+
109113
.monaco-editor .interactive-editor .markdownMessage {
110114
padding-top: 10px;
111115
}

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ export class InteractiveEditorController implements IEditorContribution {
569569
this._messageReply = reply.message.value;
570570
this._requestPrompt = request.prompt;
571571
const renderedMarkdown = renderMarkdown(reply.message, { inline: true });
572+
this._zone.widget.updateStatus('');
572573
this._zone.widget.updateMarkdownMessage(renderedMarkdown.element);
573574
this._currentSession.addResponse(reply);
574575
continue;

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class InteractiveEditorWidget {
120120
h('div.previewCreate.hidden@previewCreate'),
121121
h('div.status@status', [
122122
h('div.actions.hidden@statusToolbar'),
123-
h('div.label@statusLabel')
123+
h('div.label.hidden@statusLabel')
124124
]),
125125
h('div.markdownMessage.hidden@markdownMessage', [
126126
h('div.message@message'),
@@ -377,7 +377,6 @@ class InteractiveEditorWidget {
377377

378378
updateMarkdownMessage(message: Node) {
379379
reset(this._elements.message, message);
380-
this._elements.statusLabel.innerText = '';
381380
this._elements.markdownMessage.classList.toggle('hidden', false);
382381
this._onDidChangeHeight.fire();
383382
}
@@ -393,9 +392,9 @@ class InteractiveEditorWidget {
393392
} else if (!isTempMessage && !ops.keepMessage) {
394393
this._elements.markdownMessage.classList.toggle('hidden', true);
395394
}
396-
this._elements.status.classList.toggle('hidden', false);
397395
reset(this._elements.statusLabel, message);
398396
this._elements.statusLabel.className = `label ${(ops.classes ?? []).join(' ')}`;
397+
this._elements.statusLabel.classList.toggle('hidden', !message);
399398
if (isTempMessage) {
400399
this._elements.statusLabel.dataset['state'] = 'temp';
401400
} else {
@@ -407,6 +406,7 @@ class InteractiveEditorWidget {
407406
reset() {
408407
this._ctxInputEmpty.reset();
409408
reset(this._elements.statusLabel);
409+
this._elements.statusLabel.classList.toggle('hidden', true);
410410
this._elements.statusToolbar.classList.add('hidden');
411411
this.hideCreatePreview();
412412
this.hideEditsPreview();

0 commit comments

Comments
 (0)