@lvce-editor/server 0.7.1 → 0.7.2

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

@@ -33,6 +33,9 @@ const getStateToSave = () => {
 }
 
 export const handleVisibilityChange = async (visibilityState) => {
+  if (Workspace.isTest()) {
+    return
+  }
   if (visibilityState === 'hidden') {
     const stateToSave = getStateToSave()
     await Promise.all([
@@ -53,3 +56,10 @@ export const hydrate = async () => {
   }
   await RendererProcess.invoke('Window.onVisibilityChange')
 }
+
+export const getSavedState = () => {
+  if (Workspace.isTest()) {
+    return undefined
+  }
+  return LocalStorage.getJson('stateToSave')
+}

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

@@ -0,0 +1,9 @@
+import * as ViewletExtensionDetail from './ViewletExtensionDetail.js'
+import * as Viewlet from '../Viewlet/Viewlet.js'
+
+// prettier-ignore
+export const Commands = {
+  'ExtensionDetail.handleIconError':  Viewlet.wrapViewletCommand('ExtensionDetail', ViewletExtensionDetail.handleIconError)
+}
+
+export * from './ViewletExtensionDetail.js'

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

@@ -1,3 +1,4 @@
+import * as ExtensionDisplay from '../ExtensionDisplay/ExtensionDisplay.js'
 import * as ExtensionManagement from '../ExtensionManagement/ExtensionManagement.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as MarkDown from '../Markdown/Markdown.js'
@@ -26,7 +27,7 @@ const DEFAULT_ICON_THEME = '/icons/theme-icon.png'
 // TODO duplicate code with viewletExtensions
 const getIconSrc = (extension) => {
   if (extension.icon) {
-    return extension.icon
+    return ExtensionDisplay.getIcon(extension)
   }
   if (extension.name && extension.name.startsWith('Language Basics')) {
     return DEFAULT_ICON_LANGUAGE_BASICS
@@ -37,16 +38,6 @@ const getIconSrc = (extension) => {
   return DEFAULT_ICON_SRC
 }
 
-const getName = (extension) => {
-  if (extension.name && typeof extension.name === 'string') {
-    return extension.name
-  }
-  if (extension.id && typeof extension.id === 'string') {
-    return extension.id
-  }
-  return '<unknown>'
-}
-
 // TODO when there are multiple extension with the same id,
 // probably need to pass extension location from extensions viewlet
 export const loadContent = async (state) => {
@@ -57,7 +48,7 @@ export const loadContent = async (state) => {
   const readmeHtml = MarkDown.toHtml(readmeContent)
   const sanitizedReadmeHtml = await SanitizeHtml.sanitizeHtml(readmeHtml)
   const iconSrc = getIconSrc(extension)
-  const name = getName(extension)
+  const name = ExtensionDisplay.getName(extension)
   return {
     ...state,
     sanitizedReadmeHtml,
@@ -66,6 +57,17 @@ export const loadContent = async (state) => {
   }
 }
 
+export const handleIconError = (state) => {
+  const { iconSrc } = state
+  if (iconSrc === DEFAULT_ICON_SRC) {
+    return state
+  }
+  return {
+    ...state,
+    iconSrc: DEFAULT_ICON_SRC,
+  }
+}
+
 export const hasFunctionalRender = true
 
 const renderName = {

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

@@ -1,9 +1,10 @@
+import * as Assert from '../Assert/Assert.js'
 import * as Command from '../Command/Command.js'
 import * as ErrorHandling from '../ErrorHandling/ErrorHandling.js'
+import * as ExtensionDisplay from '../ExtensionDisplay/ExtensionDisplay.js'
 import * as ExtensionManagement from '../ExtensionManagement/ExtensionManagement.js' // TODO use Command.execute instead
 import * as ExtensionsMarketplace from '../ExtensionMarketplace/ExtensionMarketplace.js'
-import * as Platform from '../Platform/Platform.js'
-import * as Assert from '../Assert/Assert.js'
+import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import {
   getListHeight,
@@ -11,7 +12,6 @@ import {
   ITEM_HEIGHT,
   MINIMUM_SLIDER_SIZE,
 } from './ViewletExtensionsShared.js'
-import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 
 const SUGGESTIONS = [
   '@builtin',
@@ -107,77 +107,17 @@ export const contentLoaded = async (state) => {
   // )
 }
 
-const RE_PUBLISHER = /^[a-z\d\-]+/
-
-// TODO handle case when extension is of type number|array|null|string
-const getPublisher = (extension) => {
-  if (!extension || !extension.id) {
-    return 'n/a'
-  }
-  // TODO handle case when id is not of type string -> should not crash application
-  const match = extension.id.match(RE_PUBLISHER)
-  if (!match) {
-    return 'n/a'
-  }
-  return match[0]
-}
-
-// TODO all icon related logic should be here, not in renderer process
-const getIcon = (extension) => {
-  if (!extension || !extension.path || !extension.icon) {
-    return ''
-  }
-  if (Platform.platform === 'remote') {
-    return `/remote/${extension.path}/${extension.icon}` // TODO support windows paths
-  }
-  if (Platform.platform === 'electron') {
-    return `/remote/${extension.path}/${extension.icon}` // TODO support windows paths
-  }
-  return ''
-}
-
-const getName = (extension) => {
-  if (extension && extension.name) {
-    return extension.name
-  }
-  if (extension && extension.id) {
-    return extension.id
-  }
-  return 'n/a'
-}
-
-const getVersion = (extension) => {
-  if (!extension || !extension.version) {
-    return 'n/a'
-  }
-  return extension.version
-}
-
-const getDescription = (extension) => {
-  if (!extension || !extension.description) {
-    return 'n/a'
-  }
-  return extension.description
-}
-
-const getId = (extension) => {
-  if (!extension || !extension.id) {
-    return 'n/a'
-  }
-  return extension.id
-}
-
 const toInstalledViewObject = (extension) => {
   return {
-    name: getName(extension),
-    publisher: getPublisher(extension),
-    version: getVersion(extension),
-    description: getDescription(extension),
+    name: ExtensionDisplay.getName(extension),
+    publisher: ExtensionDisplay.getPublisher(extension),
+    version: ExtensionDisplay.getVersion(extension),
+    description: ExtensionDisplay.getDescription(extension),
     // TODO type field: builtin|marketplace|external
     // TODO should be status
     state: 'installed',
-    id: getId(extension),
-    icon: getIcon(extension),
+    id: ExtensionDisplay.getId(extension),
+    icon: ExtensionDisplay.getIcon(extension),
   }
 }
 

package/static/{ee13b7c → 18087fa}/packages/renderer-worker/src/parts/ViewletExtensions/ViewletExtensionsHandleClick.js

@@ -2,9 +2,10 @@ import { focusIndex } from './ViewletExtensionsFocusIndex.js'
 import * as Command from '../Command/Command.js'
 
 export const handleClick = async (state, index) => {
-  const { filteredExtensions } = state
-  const extension = filteredExtensions[index]
+  const { filteredExtensions, minLineY } = state
+  const actualIndex = index + minLineY
+  const extension = filteredExtensions[actualIndex]
   const uri = `extension-detail://${extension.id}`
   await Command.execute('Main.openUri', uri)
-  return focusIndex(state, index)
+  return focusIndex(state, actualIndex)
 }

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

@@ -5,7 +5,6 @@
 import * as FilterKeyBindings from '../FilterKeyBindings/FilterKeyBindings.js'
 import * as KeyBindingsInitial from '../KeyBindingsInitial/KeyBindingsInitial.js'
 import * as ParseKeyBindings from '../ParseKeyBindings/ParseKeyBindings.js'
-import * as VirtualDomElements from '../VirtualDomElements/VirtualDomElements.js'
 
 export const name = 'KeyBindings'
 
@@ -22,18 +21,51 @@ export const create = (id, uri, left, top, width, height) => {
     left,
     width,
     height,
+    value: '',
   }
 }
 
-export const loadContent = async (state) => {
+export const saveState = (state) => {
+  const { value } = state
+  return {
+    value,
+  }
+}
+
+const getSavedValue = (savedState) => {
+  if (savedState && savedState.value) {
+    return savedState.value
+  }
+  return ''
+}
+
+const getMaxVisibleItems = (
+  height,
+  searchHeaderHeight,
+  tableHeaderHeight,
+  rowHeight
+) => {
+  return Math.floor(
+    (height - searchHeaderHeight - tableHeaderHeight) / rowHeight
+  )
+}
+
+export const loadContent = async (state, savedState) => {
   const { height, rowHeight } = state
   const keyBindings = await KeyBindingsInitial.getKeyBindings()
   const parsedKeyBindings = ParseKeyBindings.parseKeyBindings(keyBindings)
-  const filteredKeyBindings = parsedKeyBindings
   const searchHeaderHeight = 50
   const tableHeaderHeight = 24
-  const maxVisibleItems = Math.floor(
-    (height - searchHeaderHeight - tableHeaderHeight) / rowHeight
+  const maxVisibleItems = getMaxVisibleItems(
+    height,
+    searchHeaderHeight,
+    tableHeaderHeight,
+    rowHeight
+  )
+  const savedValue = getSavedValue(savedState)
+  const filteredKeyBindings = FilterKeyBindings.getFilteredKeyBindings(
+    parsedKeyBindings,
+    savedValue
   )
   const maxLineY = Math.min(filteredKeyBindings.length, maxVisibleItems)
   return {
@@ -42,6 +74,7 @@ export const loadContent = async (state) => {
     filteredKeyBindings,
     maxLineY,
     maxVisibleItems,
+    value: savedValue,
   }
 }