@lvce-editor/server 0.7.0 → 0.7.2

package/static/{bda65b1 → 18087fa}/packages/renderer-worker/src/parts/ViewletSearch/ViewletSearch.js

@@ -47,7 +47,18 @@ export const create = (id, uri, left, top, width, height) => {
   }
 }
 
-export const loadContent = async (state) => {
+const getSavedValue = (savedState) => {
+  if (savedState && savedState.value) {
+    return savedState.value
+  }
+  return ''
+}
+
+export const loadContent = async (state, savedState) => {
+  const savedValue = getSavedValue(savedState)
+  if (savedValue) {
+    return setValue(state, savedValue)
+  }
   return state
 }
 
@@ -289,4 +300,18 @@ const renderMessage = {
   },
 }
 
-export const render = [renderItems, renderMessage]
+const renderValue = {
+  isEqual(oldState, newState) {
+    return oldState.value === newState.value
+  },
+  apply(oldState, newState) {
+    return [
+      /* viewletSend */ 'Viewlet.send',
+      /* id */ 'Search',
+      /* method */ 'setValue',
+      /* value */ newState.value,
+    ]
+  },
+}
+
+export const render = [renderItems, renderMessage, renderValue]

package/static/{bda65b1 → 18087fa}/packages/renderer-worker/src/parts/ViewletSideBar/ViewletSideBar.js

@@ -7,6 +7,7 @@ import * as Assert from '../Assert/Assert.js'
 import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as ViewletModule from '../ViewletModule/ViewletModule.js'
+import * as LocalStorage from '../LocalStorage/LocalStorage.js'
 
 export const create = (id, uri, left, top, width, height) => {
   return {
@@ -18,11 +19,18 @@ export const create = (id, uri, left, top, width, height) => {
   }
 }
 
-export const loadContent = async (state) => {
-  const currentViewletId = await getSideBarViewlet()
+const getSavedViewletId = (savedState) => {
+  if (savedState && savedState.currentViewletId) {
+    return savedState.currentViewletId
+  }
+  return 'Explorer'
+}
+
+export const loadContent = async (state, savedState) => {
+  const savedViewletId = getSavedViewletId(savedState)
   return {
     ...state,
-    currentViewletId,
+    currentViewletId: savedViewletId,
   }
 }
 
@@ -31,6 +39,15 @@ export const loadContentEffects = () => {
   GlobalEventBus.addListener('Layout.hideSideBar', handleSideBarClose)
 }
 
+// TODO
+export const loadChildren = () => {
+  return [
+    {
+      id: 'Explorer',
+    },
+  ]
+}
+
 export const contentLoaded = async (state) => {
   if (state.currentViewletId) {
     await openViewlet(state, state.currentViewletId)
@@ -126,7 +143,7 @@ export const openViewlet = async (state, id, focus = false) => {
   // await Viewlet.refresh(id)
   // TODO add keybinding to title
   // @ts-ignore
-  await ViewletManager.load(viewlet, focus)
+  await ViewletManager.load(viewlet, focus, /* restore */ true)
 }
 
 const handleSideBarClose = (state) => {

package/static/{bda65b1 → 18087fa}/packages/renderer-worker/src/parts/ViewletSourceControl/ViewletSourceControl.js

@@ -33,11 +33,7 @@ export const acceptInput = async (state, text) => {
 }
 
 const getChangedFiles = async () => {
-  console.info('get changed files')
   const changedFiles = await ExtensionHostSourceControl.getChangedFiles()
-
-  console.log({ changedFiles })
-
   return {
     index: [],
     merge: [],
@@ -59,15 +55,7 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {
-  // TODO
-  // await RendererProcess.invoke(
-  //   /* Viewlet.send */ 'Viewlet.send',
-  //   /* id */ 'Source Control',
-  //   /* method */ 'setChangedFiles',
-  //   /* changedFiles */ state.changedFiles
-  // )
-}
+export const contentLoaded = async (state) => {}
 
 export const handleClick = async (state, index) => {
   const item = state.workingTree[index]
@@ -108,4 +96,18 @@ const renderValue = {
   },
 }
 
-export const render = [renderValue]
+const renderChangeFiles = {
+  isEqual(oldState, newState) {
+    return oldState.workingTree === newState.workingTree
+  },
+  apply(oldState, newState) {
+    return [
+      /* Viewlet.send */ 'Viewlet.send',
+      /* id */ 'Source Control',
+      /* method */ 'setChangedFiles',
+      /* changedFiles */ newState.workingTree,
+    ]
+  },
+}
+
+export const render = [renderValue, renderChangeFiles]

package/static/18087fa/packages/renderer-worker/src/parts/ViewletTitleBar/ViewletTitleBar.ipc.js

@@ -0,0 +1,11 @@
+import * as ViewletTitleBar from './ViewletTitleBar.js'
+import * as Viewlet from '../Viewlet/Viewlet.js'
+
+// prettier-ignore
+export const Commands = {
+  'TitleBar.handleTitleBarButtonClickMinimize': Viewlet.wrapViewletCommand('TitleBar', ViewletTitleBar.handleTitleBarClickMinimize),
+  'TitleBar.handleTitleBarButtonClickToggleMaximize': Viewlet.wrapViewletCommand('TitleBar', ViewletTitleBar.handleTitleBarClickToggleMaximize),
+  'TitleBar.handleTitleBarButtonClickClose': Viewlet.wrapViewletCommand('TitleBar', ViewletTitleBar.handleTitleBarClickClose),
+}
+
+export * from './ViewletTitleBar.js'

package/static/{bda65b1 → 18087fa}/packages/renderer-worker/src/parts/ViewletTitleBar/ViewletTitleBar.js

@@ -32,7 +32,7 @@ const getTitleBarButtonsElectron = () => {
   if (Preferences.get('window.titleBarStyle') === 'custom') {
     return [
       { label: 'Minimize', icon: 'Minimize', id: 'Minimize' },
-      { label: 'Maximize', icon: 'Maximize', id: 'Maximize' },
+      { label: 'Maximize', icon: 'Maximize', id: 'ToggleMaximize' },
       { label: 'Close', icon: 'Close', id: 'Close' },
     ]
   }
@@ -66,34 +66,22 @@ export const focus = async () => {
   await TitleBarMenuBar.focus()
 }
 
-const handleTitleBarClickMinimize = async (state) => {
+export const handleTitleBarClickMinimize = async (state) => {
   await Command.execute('ElectronWindow.minimize')
   return state
 }
 
-const handleTitleBarClickClose = async (state) => {
+export const handleTitleBarClickClose = async (state) => {
   await Command.execute('ElectronWindow.close')
   return state
 }
 
-const handleTitleBarClickToggleMaximize = async (state) => {
+export const handleTitleBarClickToggleMaximize = async (state) => {
   // TODO need command for toggleMaximize
   await Command.execute('ElectronWindow.maximize')
   return state
 }
 
-export const handleTitleBarButtonsClick = (state, x, y) => {
-  const { width, left } = state
-  const offsetRight = width + left - x
-  if (offsetRight >= TITLE_BAR_BUTTON_WIDTH * 2) {
-    return handleTitleBarClickMinimize(state)
-  }
-  if (offsetRight > TITLE_BAR_BUTTON_WIDTH * 1) {
-    return handleTitleBarClickToggleMaximize(state)
-  }
-  return handleTitleBarClickClose(state)
-}
-
 export const dispose = (state) => {
   return {
     ...state,

package/static/{bda65b1 → 18087fa}/packages/renderer-worker/src/parts/Workbench/Workbench.js

@@ -33,6 +33,13 @@ export const startup = async (config) => {
 
   const initData = await InitData.getInitData()
 
+  if (initData.Location.href.includes('?replayId')) {
+    const url = new URL(initData.Location.href)
+    const replayId = url.searchParams.get('replayId')
+    await SessionReplay.replaySession(replayId)
+    return
+  }
+
   Performance.mark('code/willLoadPreferences')
   await Preferences.hydrate()
   Performance.mark('code/didLoadPreferences')
@@ -76,16 +83,16 @@ export const startup = async (config) => {
 
   LifeCycle.mark(LifeCycle.Phase.Seven)
 
+  Performance.mark('code/willLoadLanguages')
+  await Languages.hydrate()
+  Performance.mark('code/didLoadLanguages')
+
   Performance.mark('code/willLoadSideBar')
   if (Layout.state.sideBarVisible) {
     await Layout.showSideBar()
   }
   Performance.mark('code/didLoadSideBar')
 
-  Performance.mark('code/willLoadLanguages')
-  await Languages.hydrate()
-  Performance.mark('code/didLoadLanguages')
-
   LifeCycle.mark(LifeCycle.Phase.Eight)
 
   Performance.mark('code/willLoadPanel')

package/static/{bda65b1 → 18087fa}/packages/renderer-worker/src/parts/Workspace/Workspace.js

@@ -75,14 +75,6 @@ export const isTest = () => {
 
 const getResolvedRootFromRendererProcess = async (href) => {
   const url = new URL(href)
-  if (url.searchParams.has('replayId')) {
-    const replayId = url.searchParams.get('replayId')
-    await Command.execute(
-      'SessionReplay.replaySession',
-      /* sessionId */ replayId
-    )
-    return undefined
-  }
   if (href.includes('tests/')) {
     state.isTest = true
     return {