development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rendering when chat is hidden (#191830)

Browse source 
Fixes https://github.com/microsoft/vscode/issues/191704
This commit is contained in:
Tyler James Leonhardt 2023-08-30 11:13:13 -07:00 committed by GitHub
parent a33cf1b751
commit da5492061c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/contrib/chat/browser/chatQuick.ts
View file

@ -92,10 +92,13 @@ export class QuickChatService extends Disposable implements IQuickChatService {
// show needs to come after the quickpick is shown
this._currentChat.render(this._container);
} else {
this._currentChat.show();
}
disposableStore.add(this._input.onDidHide(() => {
disposableStore.dispose();
this._currentChat!.hide();
this._input = undefined;
this._onDidClose.fire();
}));
@ -163,6 +166,14 @@ class QuickChat extends Disposable {
}
}
hide(): void {
this.widget.setVisible(false);
}
show(): void {
this.widget.setVisible(true);
}
render(parent: HTMLElement): void {
if (this.widget) {
throw new Error('Cannot render quick chat twice');

19
src/vs/workbench/contrib/chat/browser/chatWidget.ts
View file

@ -213,7 +213,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
this._onDidClear.fire();
}
private onDidChangeItems() {
private onDidChangeItems(skipDynamicLayout?: boolean) {
if (this.tree && this.visible) {
const treeItems = (this.viewModel?.getItems() ?? [])
.map(item => {
@ -239,7 +239,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
}
});
if (this._dynamicMessageLayoutData) {
if (!skipDynamicLayout && this._dynamicMessageLayoutData) {
this.layoutDynamicChatTreeItemMode();
}
@ -270,7 +270,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
// Progressive rendering paused while hidden, so start it up again.
// Do it after a timeout because the container is not visible yet (it should be but offsetHeight returns 0 here)
if (this.visible) {
this.onDidChangeItems();
this.onDidChangeItems(true);
}
}, 0));
}
@ -540,6 +540,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
const mutableDisposable = this._register(new MutableDisposable());
this._register(this.tree.onDidScroll((e) => {
// TODO@TylerLeonhardt this should probably just be disposed when this is disabled
// and then set up again when it is enabled again
if (!this._dynamicMessageLayoutData?.enabled) {
return;
}
mutableDisposable.value = dom.scheduleAtNextAnimationFrame(() => {
if (!e.scrollTopChanged || e.heightChanged || e.scrollHeightChanged) {
return;
@ -593,7 +598,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
if (!this.viewModel || !this._dynamicMessageLayoutData?.enabled) {
return;
}
const inputHeight = this.inputPart.layout(this._dynamicMessageLayoutData!.maxHeight, this.container.offsetWidth);
const width = this.bodyDimension?.width ?? this.container.offsetWidth;
const inputHeight = this.inputPart.layout(this._dynamicMessageLayoutData!.maxHeight, width);
const totalMessages = this.viewModel.getItems();
// grab the last N messages
@ -610,10 +617,10 @@ export class ChatWidget extends Disposable implements IChatWidget {
inputHeight + listHeight + (totalMessages.length > 2 ? 18 : 0),
this._dynamicMessageLayoutData!.maxHeight
),
this.container.offsetWidth
width
);
if (needsRerender) {
if (needsRerender || !listHeight) {
// TODO: figure out a better place to reveal the last element
revealLastElement(this.tree);
}