chore: tracking events for app tabs header (#7778)

fix AF-1194
This commit is contained in:
pengx17 2024-08-08 09:14:46 +00:00
parent 6ef5675be1
commit b71945c29f
No known key found for this signature in database
GPG Key ID: 23F23D9E8B3971ED
4 changed files with 137 additions and 3 deletions

View File

@ -18,6 +18,7 @@ type NavigationEvents =
| 'openInSplitView'
| 'switchTab'
| 'switchSplitView'
| 'tabAction'
| 'navigate'
| 'goBack'
| 'goForward'
@ -229,6 +230,9 @@ const PageEvents = {
storage: ['viewPlans'],
aiAction: ['viewPlans'],
},
appTabsHeader: {
$: ['tabAction'],
},
header: {
actions: [
'createDoc',
@ -319,6 +323,24 @@ type PaymentEventArgs = {
recurring: string;
};
type TabActionControlType =
| 'click'
| 'dnd'
| 'midClick'
| 'xButton'
| 'contextMenu';
type TabActionType =
| 'pin'
| 'unpin'
| 'close'
| 'refresh'
| 'moveTab'
| 'openInSplitView'
| 'openInNewTab'
| 'switchSplitView'
| 'switchTab'
| 'separateTabs';
export type EventArgs = {
createWorkspace: { flavour: string };
oauth: { provider: string };
@ -342,6 +364,11 @@ export type EventArgs = {
orderOrganizeItem: OrganizeItemArgs;
openInNewTab: { type: OrganizeItemType };
openInSplitView: { type: OrganizeItemType };
tabAction: {
type?: OrganizeItemType;
control: TabActionControlType;
action: TabActionType;
};
toggleFavorite: OrganizeItemArgs & { on: boolean };
createDoc: { mode?: 'edgeless' | 'page' };
switchPageMode: { mode: 'edgeless' | 'page' };

View File

@ -14,6 +14,7 @@ import { appSidebarWidthAtom } from '@affine/core/components/app-sidebar/index.j
import { WindowsAppControls } from '@affine/core/components/pure/header/windows-app-controls';
import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';
import { useCatchEventCallback } from '@affine/core/hooks/use-catch-event-hook';
import { track } from '@affine/core/mixpanel';
import type { AffineDNDData } from '@affine/core/types/dnd';
import { apis, events } from '@affine/electron-api';
import { useI18n } from '@affine/i18n';
@ -82,20 +83,78 @@ const WorkbenchTab = ({
const activeViewIndex = workbench.activeViewIndex ?? 0;
const onContextMenu = useAsyncCallback(
async (viewIdx: number) => {
await tabsHeaderService.showContextMenu?.(workbench.id, viewIdx);
const action = await tabsHeaderService.showContextMenu?.(
workbench.id,
viewIdx
);
switch (action?.type) {
case 'open-in-split-view': {
track.$.appTabsHeader.$.tabAction({
control: 'contextMenu',
action: 'openInSplitView',
});
break;
}
case 'separate-view': {
track.$.appTabsHeader.$.tabAction({
control: 'contextMenu',
action: 'separateTabs',
});
break;
}
case 'pin-tab': {
if (action.payload.shouldPin) {
track.$.appTabsHeader.$.tabAction({
control: 'contextMenu',
action: 'pin',
});
} else {
track.$.appTabsHeader.$.tabAction({
control: 'contextMenu',
action: 'unpin',
});
}
break;
}
// fixme: when close tab the view may already be gc'ed
case 'close-tab': {
track.$.appTabsHeader.$.tabAction({
control: 'contextMenu',
action: 'close',
});
break;
}
default:
break;
}
},
[tabsHeaderService, workbench.id]
);
const onActivateView = useAsyncCallback(
async (viewIdx: number) => {
await tabsHeaderService.activateView?.(workbench.id, viewIdx);
if (tabActive) {
track.$.appTabsHeader.$.tabAction({
control: 'click',
action: 'switchSplitView',
});
} else {
track.$.appTabsHeader.$.tabAction({
control: 'click',
action: 'switchTab',
});
}
},
[tabsHeaderService, workbench.id]
[tabActive, tabsHeaderService, workbench.id]
);
const handleAuxClick: MouseEventHandler = useCatchEventCallback(
async e => {
if (e.button === 1) {
await tabsHeaderService.closeTab?.(workbench.id);
track.$.appTabsHeader.$.tabAction({
control: 'midClick',
action: 'close',
});
}
},
[tabsHeaderService, workbench.id]
@ -103,6 +162,10 @@ const WorkbenchTab = ({
const handleCloseTab = useCatchEventCallback(async () => {
await tabsHeaderService.closeTab?.(workbench.id);
track.$.appTabsHeader.$.tabAction({
control: 'xButton',
action: 'close',
});
}, [tabsHeaderService, workbench.id]);
const { dropTargetRef, closestEdge } = useDropTarget<AffineDNDData>(
@ -243,6 +306,10 @@ export const AppTabsHeader = ({
const onAddTab = useAsyncCallback(async () => {
await tabsHeaderService.onAddTab?.();
track.$.appTabsHeader.$.tabAction({
control: 'click',
action: 'openInNewTab',
});
}, [tabsHeaderService]);
const onToggleRightSidebar = useAsyncCallback(async () => {
@ -268,6 +335,10 @@ export const AppTabsHeader = ({
if (targetId === data.source.data.from.tabId) {
return;
}
track.$.appTabsHeader.$.tabAction({
control: 'dnd',
action: 'moveTab',
});
return await tabsHeaderService.moveTab?.(
data.source.data.from.tabId,
targetId,
@ -276,6 +347,11 @@ export const AppTabsHeader = ({
}
if (data.source.data.entity?.type === 'doc') {
track.$.appTabsHeader.$.tabAction({
control: 'dnd',
action: 'openInNewTab',
type: 'doc',
});
return await tabsHeaderService.onAddDocTab?.(
data.source.data.entity.id,
targetId,
@ -284,6 +360,11 @@ export const AppTabsHeader = ({
}
if (data.source.data.entity?.type === 'tag') {
track.$.appTabsHeader.$.tabAction({
type: 'tag',
control: 'dnd',
action: 'openInNewTab',
});
return await tabsHeaderService.onAddTagTab?.(
data.source.data.entity.id,
targetId,
@ -292,6 +373,11 @@ export const AppTabsHeader = ({
}
if (data.source.data.entity?.type === 'collection') {
track.$.appTabsHeader.$.tabAction({
type: 'collection',
control: 'dnd',
action: 'openInNewTab',
});
return await tabsHeaderService.onAddCollectionTab?.(
data.source.data.entity.id,
targetId,

View File

@ -5,6 +5,7 @@ import {
addTab,
closeTab,
reloadView,
type TabAction,
WebContentViewsManager,
} from './tab-views';
@ -15,6 +16,8 @@ export const showTabContextMenu = async (tabId: string, viewIndex: number) => {
return;
}
const { resolve, promise } = Promise.withResolvers<TabAction | null>();
const template: Parameters<typeof Menu.buildFromTemplate>[0] = [
tabMeta.pinned
? {
@ -90,4 +93,22 @@ export const showTabContextMenu = async (tabId: string, viewIndex: number) => {
];
const menu = Menu.buildFromTemplate(template);
menu.popup();
// eslint-disable-next-line prefer-const
let unsub: (() => void) | undefined;
const subscription = WebContentViewsManager.instance.tabAction$.subscribe(
action => {
resolve(action);
unsub?.();
}
);
menu.on('menu-will-close', () => {
setTimeout(() => {
resolve(null);
unsub?.();
});
});
unsub = () => {
subscription.unsubscribe();
};
return promise;
};

View File

@ -108,7 +108,7 @@ type OpenInSplitViewAction = {
};
};
type TabAction =
export type TabAction =
| AddTabAction
| CloseTabAction
| PinTabAction