feat: persist active space selection in app.json

Author: antonreshetov

src/main/store/module/app.ts

@@ -3,6 +3,7 @@ import type {
   CodeState,
   NotesEditorMode,
   NotesState,
+  SpaceId,
   SpaceLayoutMode,
 } from '../types'
 import Store from 'electron-store'
@@ -42,6 +43,7 @@ const APP_STORE_DEFAULTS: AppStore = {
   notifications: {
     lastNotifiedUpdateVersion: '',
   },
+  activeSpaceId: 'code',
 }
 
 function sanitizeCodeState(value: unknown): CodeState {
@@ -216,6 +218,12 @@ function sanitizeAppStore(value: unknown): AppStore {
         readOptionalNumber(notificationsSource, 'nextDonateAt')
         ?? readOptionalNumber(source, 'nextDonateNotification'),
     },
+    activeSpaceId: readEnum(
+      source,
+      'activeSpaceId',
+      ['code', 'tools', 'math', 'notes'] as const,
+      APP_STORE_DEFAULTS.activeSpaceId,
+    ) as SpaceId,
   }
 }
 

src/main/store/types/index.ts

@@ -16,6 +16,8 @@ export interface NotesState {
   libraryFilter?: string
 }
 
+export type SpaceId = 'code' | 'tools' | 'math' | 'notes'
+
 export interface AppStore {
   window: {
     bounds: object
@@ -46,6 +48,7 @@ export interface AppStore {
     nextDonateAt?: number
     lastNotifiedUpdateVersion: string
   }
+  activeSpaceId: SpaceId
 }
 
 export interface EditorSettings {

src/renderer/App.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import * as Tooltip from '@/components/ui/shadcn/tooltip'
 import { useApp, useTheme } from '@/composables'
-import { i18n, ipc } from '@/electron'
-import { RouterName } from '@/router'
-import { isSpaceRouteName } from '@/spaceDefinitions'
+import { i18n, ipc, store } from '@/electron'
+import { router, RouterName } from '@/router'
+import { getSpaceDefinitions, isSpaceRouteName } from '@/spaceDefinitions'
 import { isMac } from '@/utils'
 import { LoaderCircle } from 'lucide-vue-next'
 import { loadWASM } from 'onigasm'
@@ -51,9 +51,20 @@ watch(
 
 useTheme()
 
+function restoreSavedSpace() {
+  const savedSpaceId = store.app.get<string>('activeSpaceId')
+  if (savedSpaceId && savedSpaceId !== 'code') {
+    const space = getSpaceDefinitions().find(s => s.id === savedSpaceId)
+    if (space) {
+      router.replace(space.to)
+    }
+  }
+}
+
 async function init() {
   registerIPCListeners()
   ipc.send('system:renderer-ready', null, () => {})
+  restoreSavedSpace()
   loadWASM(onigasmFile)
   await loadGrammars()
   notifications()

src/renderer/components/space-rail/SpaceRail.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import * as Tooltip from '@/components/ui/shadcn/tooltip'
 import { useApp, useTheme } from '@/composables'
-import { i18n, ipc } from '@/electron'
+import { i18n, ipc, store } from '@/electron'
 import { RouterName } from '@/router'
 import { getSpaceDefinitions } from '@/spaceDefinitions'
 import { isMac } from '@/utils'
@@ -23,6 +23,15 @@ const spaces = computed(() => {
     active: space.isActive(route.name),
   }))
 })
+
+watch(
+  () => spaces.value.find(s => s.active)?.id,
+  (spaceId) => {
+    if (spaceId) {
+      store.app.set('activeSpaceId', spaceId)
+    }
+  },
+)
 </script>
 
 <template>

src/renderer/views/Preferences.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import type { Component } from 'vue'
 import { preferencesKeys } from '@/components/preferences/keys'
-import { i18n } from '@/electron'
+import { i18n, store } from '@/electron'
 import { router, RouterName } from '@/router'
+import { getSpaceDefinitions } from '@/spaceDefinitions'
 import { isMac } from '@/utils'
 import {
   Calculator,
@@ -70,7 +71,14 @@ provide(preferencesKeys, {
   <LayoutTwoColumn
     :title="i18n.t('preferences:label')"
     :top-space="isMac ? 16 : 6"
-    @back="() => router.push({ name: RouterName.main })"
+    @back="
+      () => {
+        const savedSpace = getSpaceDefinitions().find(
+          (s) => s.id === store.app.get('activeSpaceId'),
+        );
+        router.push(savedSpace?.to ?? { name: RouterName.main });
+      }
+    "
   >
     <template #left>
       <div class="scrollbar h-full min-h-0 overflow-y-auto px-2">