@lvce-editor/server 0.10.2 → 0.10.4

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/Platform/Platform.js

@@ -127,9 +127,9 @@ export const platform = 'remote'
 
 export const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/16e597c' !== 'undefined') {
+  if (typeof '/a06e404' !== 'undefined') {
     // @ts-ignore
-    return '/16e597c'
+    return '/a06e404'
   }
   if (platform === PlatformType.Electron) {
     return '../../../../..'

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/SashType/SashType.js

@@ -1,2 +1,3 @@
 export const Panel = 'Panel'
 export const SideBar = 'SideBar'
+export const None = ''

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/SaveState/SaveState.js

@@ -42,7 +42,7 @@ export const handleVisibilityChange = async (visibilityState) => {
       LocalStorage.setJson('stateToSave', stateToSave),
       SessionStorage.setJson('workspace', stateToSave.workspace),
     ])
-    console.log('[renderer worker] state was saved')
+    // console.log('[renderer worker] state was saved')
   }
 }
 

package/static/a06e404/packages/renderer-worker/src/parts/SideBarLocationType/SideBarLocationType.js

@@ -0,0 +1,2 @@
+export const Left = 1
+export const Right = 2

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/TestFrameWorkComponent/TestFrameWorkComponentSideBar.js

@@ -1,5 +1,5 @@
 import * as Command from '../Command/Command.js'
 
 export const open = async (id) => {
-  await Command.execute('SideBar.showOrHideViewlet', id)
+  await Command.execute('SideBar.openViewlet', id)
 }

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/Viewlet/Viewlet.ipc.js

@@ -2,6 +2,7 @@ import * as Viewlet from './Viewlet.js'
 
 export const Commands = {
   'Viewlet.closeWidget': Viewlet.closeWidget,
+  'Viewlet.focus': Viewlet.focus,
   'Viewlet.getAllStates': Viewlet.getAllStates,
   'Viewlet.openWidget': Viewlet.openWidget,
   2133: Viewlet.send,

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/Viewlet/Viewlet.js

@@ -8,15 +8,31 @@ import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as ViewletElectron from './ViewletElectron.js'
 
-/**
- * @deprecated
- */
-export const focus = (id) => {
-  // if(state.instances[id]){
-  // }
-  // console.log('focus', { id })
-  // // TODO open if it is not already open
-  // RendererProcess.send([/* viewletFocus */ 3027, /* id */ id])
+export const focus = async (id) => {
+  const instance = ViewletStates.getInstance(id)
+  if (!instance) {
+    return
+  }
+  const commands = []
+  if (instance && instance.factory.focus) {
+    const oldState = instance.state
+    const newState = instance.factory.focus(oldState)
+    commands.push(
+      ...ViewletManager.render(instance.factory, oldState, newState)
+    )
+  }
+  const oldInstance = ViewletStates.getFocusedInstance()
+  if (oldInstance) {
+    if (oldInstance && oldInstance.factory.handleBlur) {
+      const oldState = oldInstance.state
+      const newState = oldInstance.factory.handleBlur(oldState)
+      commands.push(
+        ...ViewletManager.render(oldInstance.factory, oldState, newState)
+      )
+    }
+  }
+  ViewletStates.setFocusedInstance(instance)
+  await RendererProcess.invoke('Viewlet.sendMultiple', commands)
 }
 // export const createOrFocus = async id=>{
 //   const instance = state.instances[id] || await create(id)
@@ -114,6 +130,33 @@ export const dispose = async (id) => {
   await GlobalEventBus.emitEvent(`Viewlet.dispose.${id}`)
 }
 
+export const disposeFunctional = (id) => {
+  try {
+    if (!id) {
+      console.warn('no instance to dispose')
+      return []
+    }
+    const instance = ViewletStates.getInstance(id)
+    if (!instance) {
+      console.info('instance may already be disposed')
+      return []
+    }
+    // TODO status should have enum
+    instance.status = 'disposing'
+    if (!instance.factory) {
+      throw new Error(`${id} is missing a factory function`)
+    }
+    instance.factory.dispose(instance.state)
+    instance.status = 'disposed'
+    ViewletStates.remove(id)
+    return [[/* Viewlet.dispose */ 'Viewlet.dispose', /* id */ id]]
+  } catch (error) {
+    console.error(error)
+    // TODO use Error.cause once proper stack traces are supported by chrome
+    throw new Error(`Failed to dispose viewlet ${id}: ${error}`)
+  }
+}
+
 /**
  * @deprecated
  */
@@ -176,7 +219,7 @@ export const getAllStates = () => {
 export const openWidget = async (id, ...args) => {
   const hasInstance = ViewletStates.hasInstance(id)
   const type = args[0]
-  if (ElectronBrowserView.isOpen() && id === 'QuickPick') {
+  if (ElectronBrowserView.isOpen() && id === ViewletModuleId.QuickPick) {
     // TODO recycle quickpick instance
     if (hasInstance) {
       await ViewletElectron.closeWidgetElectronQuickPick()
@@ -199,6 +242,8 @@ export const openWidget = async (id, ...args) => {
   if (hasInstance) {
     commands.unshift(['Viewlet.dispose', id])
   }
+  commands.push(['Viewlet.append', 'Layout', id])
+  commands.push(['Viewlet.focus', id])
   await RendererProcess.invoke('Viewlet.executeCommands', commands)
   // TODO commands should be like this
   // viewlet.create quickpick

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/Viewlet/ViewletElectron.js

@@ -4,11 +4,11 @@ import * as ElectronWindow from '../ElectronWindow/ElectronWindow.js'
 import * as IpcParent from '../IpcParent/IpcParent.js'
 import * as IpcParentType from '../IpcParentType/IpcParentType.js'
 import * as KeyBindings from '../KeyBindings/KeyBindings.js'
-import * as Layout from '../Layout/Layout.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as ViewletModule from '../ViewletModule/ViewletModule.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
 const isQuickPickKeyBinding = (keyBinding) => {
   return keyBinding.when === 'focus.quickPickInput'
@@ -22,7 +22,9 @@ export const openElectronQuickPick = async (...args) => {
   const id = 'QuickPick'
   const width = 600
   const height = 300
-  const left = Math.round((Layout.state.windowWidth - width) / 2)
+  const viewletLayout = ViewletStates.getState(ViewletModuleId.Layout)
+  const windowWidth = viewletLayout.points[0]
+  const left = Math.round((windowWidth - width) / 2)
   const top = 50
   const keyBindings = await KeyBindings.getKeyBindings()
   const quickPickKeyBindings = getQuickPickKeyBindings(keyBindings)

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBar.ipc.js

@@ -20,6 +20,7 @@ export const Commands = {
   'ActivityBar.focusNext': LazyCommand.create(ViewletActivityBar.name, Imports.FocusNext, 'focusNext'),
   'ActivityBar.focusPrevious': LazyCommand.create(ViewletActivityBar.name, Imports.FocusPrevious, 'focusPrevious'),
   'ActivityBar.getHiddenItems': ViewletActivityBar.getHiddenItems,
+  'ActivityBar.handleBlur':  ViewletActivityBar.handleBlur,
   'ActivityBar.handleClick': LazyCommand.create(ViewletActivityBar.name, Imports.HandleClick, 'handleClick'),
   'ActivityBar.handleContextMenu':  ViewletActivityBar.handleContextMenu,
   'ActivityBar.handleSideBarHidden': ViewletActivityBar.handleSideBarHidden,

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBar.js

@@ -2,10 +2,10 @@ import * as ActivityBarItemFlags from '../ActivityBarItemFlags/ActvityBarItemFla
 import * as Command from '../Command/Command.js'
 import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 import * as I18nString from '../I18NString/I18NString.js'
-import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 import * as Icon from '../Icon/Icon.js'
+import { focusIndex } from './ViewletActivityBarFocusIndex.js'
 
 /**
  * @enum {string}
@@ -81,6 +81,7 @@ export const create = (id, uri, left, top, width, height) => {
     activityBarItems: [],
     focusedIndex: -1,
     selectedIndex: -1,
+    focused: false,
     left,
     top,
     width,
@@ -192,29 +193,20 @@ const findIndex = (activityBarItems, id) => {
   return -1
 }
 
-export const handleSideBarViewletChange = async (state, id, ...args) => {
+export const handleSideBarViewletChange = (state, id, ...args) => {
   const index = findIndex(state.activityBarItems, id)
-  const oldIndex = state.selectedIndex
-  state.selectedIndex = index
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'selectIndex',
-    /* oldIndex */ oldIndex,
-    /* newIndex */ index
-  )
+  return {
+    ...state,
+    selectedIndex: index,
+  }
 }
 
-export const handleSideBarHidden = async (state) => {
-  const oldIndex = state.focusedIndex
-  state.focusedIndex = -1
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'selectIndex',
-    /* oldIndex */ oldIndex,
-    /* newIndex */ -1
-  )
+export const handleSideBarHidden = (state) => {
+  return {
+    ...state,
+    focusedIndex: -1,
+    selectedIndex: -1,
+  }
 }
 
 export const updateSourceControlCount = async (state, count) => {
@@ -227,13 +219,10 @@ export const updateSourceControlCount = async (state, count) => {
   if (index === -1) {
     return
   }
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'setBadgeCount',
-    /* index */ index,
-    /* count */ count
-  )
+  return {
+    ...state,
+    badgeCount: count,
+  }
 
   // TODO send count to renderer process (if activity bar is visible)
 }
@@ -251,13 +240,10 @@ export const toggleActivityBarItem = async (state, item) => {
     (activityBarItem) => activityBarItem.id === item.label
   )
   activityBarItem.enabled = !activityBarItem.enabled
-  await RendererProcess.invoke(
-    /* Viewlet.invoke */ 'Viewlet.send',
-    /* id */ 'ActivityBar',
-    /* method */ 'setItems',
-    /* items */ state.activityBarItems.filter(isEnabled),
-    /* index */ state.selectedIndex
-  )
+  return {
+    ...state,
+    items: state.activityBarItems.filter(isEnabled),
+  }
 }
 
 export const handleContextMenu = async (state, x, y) => {
@@ -270,6 +256,19 @@ export const handleContextMenu = async (state, x, y) => {
   return state
 }
 
+export const handleBlur = (state) => {
+  return {
+    ...state,
+    focused: false,
+  }
+}
+
+export const focus = (state) => {
+  const { focusedIndex } = state
+  const indexToFocus = focusedIndex === -1 ? 0 : focusedIndex
+  return focusIndex(state, indexToFocus)
+}
+
 export const hasFunctionalResize = true
 
 export const resize = (state, dimensions) => {
@@ -299,7 +298,10 @@ const renderActivityBarItems = {
 
 const renderFocusedIndex = {
   isEqual(oldState, newState) {
-    return oldState.focusedIndex === newState.focusedIndex
+    return (
+      oldState.focusedIndex === newState.focusedIndex &&
+      oldState.focused === newState.focused
+    )
   },
   apply(oldState, newState) {
     return [
@@ -308,10 +310,30 @@ const renderFocusedIndex = {
       /* method */ 'setFocusedIndex',
       /* unFocusIndex */ oldState.focusedIndex,
       /* focusIndex */ newState.focusedIndex,
+      /* focused */ newState.focused,
+    ]
+  },
+}
+
+const renderSelectedIndex = {
+  isEqual(oldState, newState) {
+    return oldState.selectedIndex === newState.selectedIndex
+  },
+  apply(oldState, newState) {
+    return [
+      /* Viewlet.send */ 'Viewlet.send',
+      /* id */ 'ActivityBar',
+      /* method */ 'setSelectedIndex',
+      /* oldIndex */ oldState.selectedIndex,
+      /* newIndex */ newState.selectedIndex,
     ]
   },
 }
 
-export const render = [renderActivityBarItems, renderFocusedIndex]
+export const render = [
+  renderActivityBarItems,
+  renderFocusedIndex,
+  renderSelectedIndex,
+]
 
 export const hasFunctionalRender = true

package/static/{16e597c → a06e404}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBarFocusIndex.js

@@ -2,5 +2,6 @@ export const focusIndex = (state, index) => {
   return {
     ...state,
     focusedIndex: index,
+    focused: true,
   }
 }