mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-03-06 05:51:36 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat: switch to page and hide wiki browserView

Browse source
This commit is contained in:
lin onetwo 2023-07-08 17:39:26 +08:00
parent 5ef24b10c8
commit aefd9dcd88
9 changed files with 79 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/workspaces/getWorkspaceMenuTemplate.ts
View file

@ -4,6 +4,7 @@ import type { IAuthenticationService } from '@services/auth/interface';
import { IContextService } from '@services/context/interface';
import { IGitService } from '@services/git/interface';
import type { INativeService } from '@services/native/interface';
import { IPagesService, PageType } from '@services/pages/interface';
import { SupportedStorageServices } from '@services/types';
import type { IViewService } from '@services/view/interface';
import type { IWikiService } from '@services/wiki/interface';
@ -20,6 +21,7 @@ interface IWorkspaceMenuRequiredServices {
context: Pick<IContextService, 'isOnline'>;
git: Pick<IGitService, 'commitAndSync'>;
native: Pick<INativeService, 'open' | 'openInEditor' | 'openInGitGuiApp' | 'getLocalHostUrlWithActualInfo'>;
pages: Pick<IPagesService, 'setActivePage' | 'getActivePage'>;
view: Pick<IViewService, 'reloadViewsWebContents' | 'getViewCurrentUrl'>;
wiki: Pick<IWikiService, 'wikiOperation' | 'requestWikiSendActionMessage'>;
wikiGitWorkspace: Pick<IWikiGitWorkspaceService, 'removeWorkspace'>;
@ -38,6 +40,9 @@ interface IWorkspaceMenuRequiredServices {
export async function openWorkspaceTagTiddler(workspace: IWorkspace, service: IWorkspaceMenuRequiredServices): Promise<void> {
const { id: idToActive, isSubWiki, tagName, mainWikiID } = workspace;
// switch to workspace page
const oldActivePage = await service.pages.getActivePage();
await service.pages.setActivePage(PageType.wiki, oldActivePage?.id);
const oldActiveWorkspace = await service.workspace.getActiveWorkspace();
// if is a new main workspace, active its browser view first
if (!isSubWiki && idToActive !== null && idToActive !== undefined && oldActiveWorkspace?.id !== idToActive) {