mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-12 23:56:36 +08:00
fix(core): no pop-ups if user click discard menu item (#10317)
Fix issue [BS-2628](https://linear.app/affine-design/issue/BS-2628).
This commit is contained in:
@@ -85,10 +85,6 @@ export class AffineAIPanelWidget extends WidgetComponent {
|
||||
|
||||
private _answer: string | null = null;
|
||||
|
||||
private readonly _cancelCallback = () => {
|
||||
this.focus();
|
||||
};
|
||||
|
||||
private readonly _clearDiscardModal = () => {
|
||||
if (this._discardModalAbort) {
|
||||
this._discardModalAbort.abort();
|
||||
@@ -97,25 +93,7 @@ export class AffineAIPanelWidget extends WidgetComponent {
|
||||
};
|
||||
|
||||
private readonly _clickOutside = () => {
|
||||
switch (this.state) {
|
||||
case 'hidden':
|
||||
return;
|
||||
case 'error':
|
||||
case 'finished':
|
||||
if (!this._answer) {
|
||||
this.hide();
|
||||
} else {
|
||||
this.discard();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
this.discard();
|
||||
}
|
||||
};
|
||||
|
||||
private readonly _discardCallback = () => {
|
||||
this.hide();
|
||||
this.config?.discardCallback?.();
|
||||
this._discardWithConfirmation();
|
||||
};
|
||||
|
||||
private _discardModalAbort: AbortController | null = null;
|
||||
@@ -171,27 +149,27 @@ export class AffineAIPanelWidget extends WidgetComponent {
|
||||
|
||||
ctx: unknown = null;
|
||||
|
||||
discard = () => {
|
||||
if ((this.state === 'finished' || this.state === 'error') && !this.answer) {
|
||||
this._discardCallback();
|
||||
private readonly _discardWithConfirmation = () => {
|
||||
if (this.state === 'hidden') {
|
||||
return;
|
||||
}
|
||||
if (this.state === 'input') {
|
||||
if (this.state === 'input' || !this.answer) {
|
||||
this.hide();
|
||||
return;
|
||||
}
|
||||
this.showDiscardModal()
|
||||
.then(discard => {
|
||||
if (discard) {
|
||||
this._discardCallback();
|
||||
} else {
|
||||
this._cancelCallback();
|
||||
}
|
||||
this.restoreSelection();
|
||||
discard && this.discard();
|
||||
})
|
||||
.catch(console.error);
|
||||
};
|
||||
|
||||
discard = () => {
|
||||
this.hide();
|
||||
this.restoreSelection();
|
||||
this.config?.discardCallback?.();
|
||||
};
|
||||
|
||||
/**
|
||||
* You can evaluate this method multiple times to regenerate the answer.
|
||||
*/
|
||||
@@ -472,7 +450,7 @@ export class AffineAIPanelWidget extends WidgetComponent {
|
||||
'input',
|
||||
() =>
|
||||
html`<ai-panel-input
|
||||
.onBlur=${this.discard}
|
||||
.onBlur=${this._discardWithConfirmation}
|
||||
.onFinish=${this._inputFinish}
|
||||
.onInput=${this.onInput}
|
||||
.networkSearchConfig=${config.networkSearchConfig}
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ export class AskAIToolbarButton extends WithDisposable(LitElement) {
|
||||
({ finish, input }) => {
|
||||
finish('success');
|
||||
const aiPanel = getAIPanelWidget(this.host);
|
||||
aiPanel.discard();
|
||||
aiPanel.hide();
|
||||
extractSelectedContent(this.host)
|
||||
.then(context => {
|
||||
AIProvider.slots.requestSendWithChat.emit({
|
||||
|
||||
@@ -47,7 +47,7 @@ export function setupEdgelessElementToolbarAIEntry(
|
||||
if (aiPanel.config) {
|
||||
aiPanel.config.generateAnswer = ({ finish, input }) => {
|
||||
finish('success');
|
||||
aiPanel.discard();
|
||||
aiPanel.hide();
|
||||
extractSelectedContent(edgeless.host)
|
||||
.then(context => {
|
||||
AIProvider.slots.requestSendWithChat.emit({
|
||||
|
||||
@@ -436,7 +436,7 @@ test.describe('chat panel', () => {
|
||||
expect(editorContent).toBe(content);
|
||||
});
|
||||
|
||||
test('can be retry or discard chat in page mode', async ({ page }) => {
|
||||
test('can regenerate chat in page mode', async ({ page }) => {
|
||||
await page.reload();
|
||||
await clickSideBarAllPageButton(page);
|
||||
await page.waitForTimeout(200);
|
||||
@@ -467,13 +467,53 @@ test.describe('chat panel', () => {
|
||||
).innerText()
|
||||
).not.toBe(content);
|
||||
}
|
||||
});
|
||||
|
||||
// discard
|
||||
test('can discard chat in page mode', async ({ page }) => {
|
||||
await page.reload();
|
||||
await clickSideBarAllPageButton(page);
|
||||
await page.waitForTimeout(200);
|
||||
await createLocalWorkspace({ name: 'test' }, page);
|
||||
await clickNewPageButton(page);
|
||||
await focusToEditor(page);
|
||||
await page.keyboard.type('/');
|
||||
await page.getByTestId('sub-menu-0').getByText('Ask AI').click();
|
||||
const input = await page.waitForSelector('ai-panel-input textarea');
|
||||
await input.fill('hello');
|
||||
await input.press('Enter');
|
||||
|
||||
// discard without confirm modal
|
||||
{
|
||||
const resp = await page.waitForSelector(
|
||||
'ai-panel-answer .response-list-container:last-child'
|
||||
);
|
||||
await (await resp.waitForSelector('.ai-item-discard')).click();
|
||||
const editorContent = await getEditorContent(page);
|
||||
expect(editorContent).toBe('');
|
||||
}
|
||||
});
|
||||
|
||||
test('can discard chat with confirm modal in edgeless mode', async ({
|
||||
page,
|
||||
}) => {
|
||||
await page.reload();
|
||||
await clickSideBarAllPageButton(page);
|
||||
await page.waitForTimeout(200);
|
||||
await createLocalWorkspace({ name: 'test' }, page);
|
||||
await clickNewPageButton(page);
|
||||
await focusToEditor(page);
|
||||
await page.keyboard.type('/');
|
||||
await page.getByTestId('sub-menu-0').getByText('Ask AI').click();
|
||||
const input = await page.waitForSelector('ai-panel-input textarea');
|
||||
await input.fill('hello');
|
||||
await input.press('Enter');
|
||||
|
||||
// discard with confirm modal
|
||||
{
|
||||
await page.waitForSelector(
|
||||
'ai-panel-answer .response-list-container:last-child'
|
||||
);
|
||||
await page.mouse.click(100, 100);
|
||||
await page.getByTestId('confirm-modal-confirm').click();
|
||||
const editorContent = await getEditorContent(page);
|
||||
expect(editorContent).toBe('');
|
||||
|
||||
Reference in New Issue
Block a user