fundon
2024-06-25 15:56:44 +00:00
parent cffaf815e1
commit a92515b5aa
9 changed files with 114 additions and 65 deletions

View File

@@ -401,8 +401,7 @@ const OthersAIGroup: AIItemGroupConfig = {
icon: CommentIcon, icon: CommentIcon,
handler: host => { handler: host => {
const panel = getAIPanel(host); const panel = getAIPanel(host);
AIProvider.slots.requestOpenWithChat.emit(); AIProvider.slots.requestOpenWithChat.emit({ host, autoSelect: true });
AIProvider.slots.requestContinueWithAIInChat.emit({ host });
panel.hide(); panel.hide();
}, },
}, },
@@ -411,11 +410,7 @@ const OthersAIGroup: AIItemGroupConfig = {
icon: ChatWithAIIcon, icon: ChatWithAIIcon,
handler: host => { handler: host => {
const panel = getAIPanel(host); const panel = getAIPanel(host);
AIProvider.slots.requestOpenWithChat.emit(); AIProvider.slots.requestOpenWithChat.emit({ host });
AIProvider.slots.requestContinueInChat.emit({
host: host,
show: true,
});
panel.hide(); panel.hide();
}, },
}, },

View File

@@ -463,11 +463,7 @@ export function actionToResponse<T extends keyof BlockSuitePresets.AIActions>(
handler: () => { handler: () => {
reportResponse('result:continue-in-chat'); reportResponse('result:continue-in-chat');
const panel = getAIPanel(host); const panel = getAIPanel(host);
AIProvider.slots.requestOpenWithChat.emit(); AIProvider.slots.requestOpenWithChat.emit({ host });
AIProvider.slots.requestContinueInChat.emit({
host: host,
show: true,
});
panel.hide(); panel.hide();
}, },
}, },

View File

@@ -233,11 +233,7 @@ export function buildTextResponseConfig<
icon: ChatWithAIIcon, icon: ChatWithAIIcon,
handler: () => { handler: () => {
reportResponse('result:continue-in-chat'); reportResponse('result:continue-in-chat');
AIProvider.slots.requestOpenWithChat.emit(); AIProvider.slots.requestOpenWithChat.emit({ host });
AIProvider.slots.requestContinueInChat.emit({
host: panel.host,
show: true,
});
panel.hide(); panel.hide();
}, },
}, },

View File

@@ -2,7 +2,6 @@ import type { EditorHost } from '@blocksuite/block-std';
import { WithDisposable } from '@blocksuite/block-std'; import { WithDisposable } from '@blocksuite/block-std';
import { import {
type ImageBlockModel, type ImageBlockModel,
isInsidePageEditor,
type NoteBlockModel, type NoteBlockModel,
NoteDisplayMode, NoteDisplayMode,
} from '@blocksuite/blocks'; } from '@blocksuite/blocks';
@@ -24,7 +23,7 @@ import {
DocIcon, DocIcon,
SmallImageIcon, SmallImageIcon,
} from '../_common/icons'; } from '../_common/icons';
import { AIProvider } from '../provider'; import { type AIChatParams, AIProvider } from '../provider';
import { import {
getSelectedImagesAsBlobs, getSelectedImagesAsBlobs,
getSelectedTextContent, getSelectedTextContent,
@@ -112,6 +111,9 @@ export class ChatCards extends WithDisposable(LitElement) {
@property({ attribute: false }) @property({ attribute: false })
accessor updateContext!: (context: Partial<ChatContextValue>) => void; accessor updateContext!: (context: Partial<ChatContextValue>) => void;
@property({ attribute: false })
accessor temporaryParams: AIChatParams | null = null;
@state() @state()
accessor cards: Card[] = []; accessor cards: Card[] = [];
@@ -421,7 +423,36 @@ export class ChatCards extends WithDisposable(LitElement) {
}; };
} }
protected override async updated(changedProperties: PropertyValues) { private readonly _appendCardWithParams = async ({
// host: _,
mode,
autoSelect,
}: AIChatParams) => {
if (mode === 'edgeless') {
await this._extractOnEdgeless();
} else {
await this._extract();
}
if (!autoSelect) {
return;
}
if (this.cards.length > 0) {
const card = this.cards[0];
if (card.type === CardType.Doc) return;
await this._selectCard(card);
}
};
protected override async willUpdate(changedProperties: PropertyValues) {
if (changedProperties.has('temporaryParams') && this.temporaryParams) {
const params = this.temporaryParams;
await this._appendCardWithParams(params);
this.temporaryParams = null;
}
if (changedProperties.has('host')) { if (changedProperties.has('host')) {
if (this._currentDocId === this.host.doc.id) return; if (this._currentDocId === this.host.doc.id) return;
this._currentDocId = this.host.doc.id; this._currentDocId = this.host.doc.id;
@@ -443,40 +474,19 @@ export class ChatCards extends WithDisposable(LitElement) {
if (hasImages) { if (hasImages) {
card.images = images; card.images = images;
} }
this._updateCards(card);
this.cards.push(card);
this.requestUpdate();
} }
} }
} }
override async connectedCallback() { override connectedCallback() {
super.connectedCallback(); super.connectedCallback();
this._disposables.add( this._disposables.add(
AIProvider.slots.requestContinueWithAIInChat.on(async ({ mode }) => { AIProvider.slots.requestOpenWithChat.on(async params => {
if (mode === 'edgeless') { await this._appendCardWithParams(params);
await this._extractOnEdgeless();
} else {
await this._extract();
}
if (this.cards.length > 0) {
const card = this.cards[0];
if (card.type === CardType.Doc) return;
await this._selectCard(card);
}
})
);
this._disposables.add(
AIProvider.slots.requestContinueInChat.on(async ({ host, show }) => {
if (show) {
if (isInsidePageEditor(host)) {
await this._extract();
} else {
await this._extractOnEdgeless();
}
}
}) })
); );

View File

@@ -105,10 +105,10 @@ const othersGroup: AIItemGroupConfig = {
showWhen: () => true, showWhen: () => true,
handler: host => { handler: host => {
const panel = getAIPanel(host); const panel = getAIPanel(host);
AIProvider.slots.requestOpenWithChat.emit(); AIProvider.slots.requestOpenWithChat.emit({
AIProvider.slots.requestContinueWithAIInChat.emit({
host, host,
mode: 'edgeless', mode: 'edgeless',
autoSelect: true,
}); });
panel.hide(); panel.hide();
}, },
@@ -119,11 +119,7 @@ const othersGroup: AIItemGroupConfig = {
showWhen: () => true, showWhen: () => true,
handler: host => { handler: host => {
const panel = getAIPanel(host); const panel = getAIPanel(host);
AIProvider.slots.requestOpenWithChat.emit(); AIProvider.slots.requestOpenWithChat.emit({ host, mode: 'edgeless' });
AIProvider.slots.requestContinueInChat.emit({
host: host,
show: true,
});
panel.hide(); panel.hide();
}, },
}, },

View File

@@ -2,6 +2,8 @@ import type { EditorHost } from '@blocksuite/block-std';
import { PaymentRequiredError, UnauthorizedError } from '@blocksuite/blocks'; import { PaymentRequiredError, UnauthorizedError } from '@blocksuite/blocks';
import { Slot } from '@blocksuite/store'; import { Slot } from '@blocksuite/store';
import type { ChatCards } from './chat-panel/chat-cards';
export interface AIUserInfo { export interface AIUserInfo {
id: string; id: string;
email: string; email: string;
@@ -9,6 +11,17 @@ export interface AIUserInfo {
avatarUrl: string | null; avatarUrl: string | null;
} }
export interface AIChatParams {
host: EditorHost;
mode?: 'page' | 'edgeless';
// Auto select and append selection to input via `Continue with AI` action.
autoSelect?: boolean;
}
type RequestChatCardsElement = (
chatPanel: HTMLElement
) => Promise<ChatCards | null>;
export type ActionEventType = export type ActionEventType =
| 'started' | 'started'
| 'finished' | 'finished'
@@ -63,6 +76,10 @@ export class AIProvider {
return AIProvider.instance.toggleGeneralAIOnboarding; return AIProvider.instance.toggleGeneralAIOnboarding;
} }
static get requestChatCardsElement() {
return AIProvider.instance.requestChatCardsElement;
}
private static readonly instance = new AIProvider(); private static readonly instance = new AIProvider();
static LAST_ACTION_SESSIONID = ''; static LAST_ACTION_SESSIONID = '';
@@ -77,15 +94,18 @@ export class AIProvider {
private toggleGeneralAIOnboarding: ((value: boolean) => void) | null = null; private toggleGeneralAIOnboarding: ((value: boolean) => void) | null = null;
private readonly requestChatCardsElement: RequestChatCardsElement = (
chatPanel: HTMLElement
) => {
return new Promise(resolve => {
resolve(chatPanel.querySelector<ChatCards>('chat-cards'));
});
};
private readonly slots = { private readonly slots = {
// use case: when user selects "continue in chat" in an ask ai result panel // use case: when user selects "continue in chat" in an ask ai result panel
// do we need to pass the context to the chat panel? // do we need to pass the context to the chat panel?
requestOpenWithChat: new Slot(), requestOpenWithChat: new Slot<AIChatParams>(),
requestContinueInChat: new Slot<{ host: EditorHost; show: boolean }>(),
requestContinueWithAIInChat: new Slot<{
host: EditorHost;
mode?: 'page' | 'edgeless';
}>(),
requestLogin: new Slot<{ host: EditorHost }>(), requestLogin: new Slot<{ host: EditorHost }>(),
requestUpgradePlan: new Slot<{ host: EditorHost }>(), requestUpgradePlan: new Slot<{ host: EditorHost }>(),
// when an action is requested to run in edgeless mode (show a toast in affine) // when an action is requested to run in edgeless mode (show a toast in affine)

View File

@@ -4,6 +4,7 @@ export type SidebarTabName = 'outline' | 'frame' | 'chat' | 'journal';
export interface SidebarTabProps { export interface SidebarTabProps {
editor: AffineEditorContainer | null; editor: AffineEditorContainer | null;
onLoad: ((component: HTMLElement) => void) | null;
} }
export interface SidebarTab { export interface SidebarTab {

View File

@@ -7,7 +7,7 @@ import type { SidebarTab, SidebarTabProps } from '../sidebar-tab';
import * as styles from './chat.css'; import * as styles from './chat.css';
// A wrapper for CopilotPanel // A wrapper for CopilotPanel
const EditorChatPanel = ({ editor }: SidebarTabProps) => { const EditorChatPanel = ({ editor, onLoad }: SidebarTabProps) => {
const chatPanelRef = useRef<ChatPanel | null>(null); const chatPanelRef = useRef<ChatPanel | null>(null);
const onRefChange = useCallback((container: HTMLDivElement | null) => { const onRefChange = useCallback((container: HTMLDivElement | null) => {
@@ -17,6 +17,16 @@ const EditorChatPanel = ({ editor }: SidebarTabProps) => {
} }
}, []); }, []);
useEffect(() => {
if (onLoad && chatPanelRef.current) {
(chatPanelRef.current as ChatPanel).updateComplete
.then(() => {
onLoad(chatPanelRef.current as HTMLElement);
})
.catch(console.error);
}
}, [onLoad]);
useEffect(() => { useEffect(() => {
if (!editor) return; if (!editor) return;
const pageService = editor.host.spec.getService('affine:page'); const pageService = editor.host.spec.getService('affine:page');

View File

@@ -76,6 +76,9 @@ const DetailPageImpl = memo(function DetailPageImpl() {
const docCollection = workspace.docCollection; const docCollection = workspace.docCollection;
const mode = useLiveData(doc.mode$); const mode = useLiveData(doc.mode$);
const { appSettings } = useAppSettingHelper(); const { appSettings } = useAppSettingHelper();
const [tabOnLoad, setTabOnLoad] = useState<
((component: HTMLElement) => void) | null
>(null);
const isActiveView = useIsActiveView(); const isActiveView = useIsActiveView();
// TODO(@eyhn): remove jotai here // TODO(@eyhn): remove jotai here
@@ -94,13 +97,34 @@ const DetailPageImpl = memo(function DetailPageImpl() {
}, [editor, isActiveView, setActiveBlockSuiteEditor]); }, [editor, isActiveView, setActiveBlockSuiteEditor]);
useEffect(() => { useEffect(() => {
AIProvider.slots.requestOpenWithChat.on(() => { AIProvider.slots.requestOpenWithChat.on(params => {
rightSidebar.open(); const opened = rightSidebar.isOpen$.value;
if (activeTabName !== 'chat') { const actived = activeTabName === 'chat';
if (!opened) {
rightSidebar.open();
}
if (!actived) {
setActiveTabName('chat'); setActiveTabName('chat');
} }
// Save chat parameters:
// * The right sidebar is not open
// * Chat panel is not activated
if (!opened || !actived) {
const callback = async (chatPanel: HTMLElement) => {
const chatCards = await AIProvider.requestChatCardsElement(chatPanel);
if (!chatCards) return;
if (chatCards.temporaryParams) return;
chatCards.temporaryParams = params;
};
setTabOnLoad(() => callback);
} else {
setTabOnLoad(null);
}
}); });
}, [activeTabName, rightSidebar, setActiveTabName]); }, [activeTabName, rightSidebar, setActiveTabName, setTabOnLoad]);
useEffect(() => { useEffect(() => {
if (isActiveView) { if (isActiveView) {
@@ -274,6 +298,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
sidebarTabs.find(ext => ext.name === activeTabName) ?? sidebarTabs.find(ext => ext.name === activeTabName) ??
sidebarTabs[0] sidebarTabs[0]
} }
onLoad={tabOnLoad}
> >
{/* Show switcher in body for windows desktop */} {/* Show switcher in body for windows desktop */}
{isWindowsDesktop && ( {isWindowsDesktop && (