@lvce-editor/server 0.0.31 → 0.0.32

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/Editor/LayerCursor.js

@@ -38,7 +38,7 @@ const render$Cursor = ($Cursor, $Texts, cursor) => {
 
 const render$CursorsLess = ($Cursors, $Texts, cursors) => {
   for (let i = 0; i < $Cursors.children.length; i++) {
-    render$Cursor($Cursors.children[i], cursors[i])
+    render$Cursor($Cursors.children[i], $Texts, cursors[i])
   }
   const fragment = document.createDocumentFragment()
   for (let i = $Cursors.children.length; i < cursors.length; i++) {

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/Platform/Platform.js

@@ -55,9 +55,9 @@ export const state = {
   },
   getAssetDir() {
     // @ts-ignore
-    if (typeof '/0e4d46a' !== 'undefined') {
+    if (typeof '/37d2807' !== 'undefined') {
       // @ts-ignore
-      return '/0e4d46a'
+      return '/37d2807'
     }
     if (platform === 'electron') {
       return '../../../../..'

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/RendererWorker/RendererWorker.js

@@ -66,7 +66,14 @@ const handleMessageFromRendererWorker = async (event) => {
     Callback.resolve(message.id, message)
     return
   }
-  throw new JsonRpcError('unexpected message from renderer process')
+  if (message.method === 'get-port') {
+    const type = message.params[0]
+    const port = await getPort(type)
+    console.log({ port })
+    state.ipc.sendAndTransfer('port', [port])
+    return
+  }
+  throw new JsonRpcError('unexpected message from renderer worker')
 }
 
 const getIpc = async () => {
@@ -91,32 +98,39 @@ const getIpc = async () => {
   }
 }
 
+const getPort = (type) => {
+  return new Promise((resolve, reject) => {
+    const handleMessageFromWindow = (event) => {
+      const port = event.ports[0]
+      resolve(port)
+    }
+
+    // @ts-ignore
+    window.addEventListener('message', handleMessageFromWindow, {
+      once: true,
+    })
+    // @ts-ignore
+    window.myApi.ipcConnect(type)
+  })
+}
+
 export const hydrate = async (config) => {
   const ipc = await getIpc()
 
   // setup electron message port
   if (Platform.isElectron()) {
-    await new Promise((resolve, reject) => {
-      const handleIpcMessage = (event) => {
-        if (event.data !== 'get-port') {
-          reject(new Error('unexpected message from renderer worker'))
-          return
-        }
-        const handleMessageFromWindow = (event) => {
-          const port = event.ports[0]
-          ipc.sendAndTransfer('port', [port])
-          resolve()
-        }
-
-        // @ts-ignore
-        window.addEventListener('message', handleMessageFromWindow, {
-          once: true,
-        })
-        // @ts-ignore
-        window.myApi.ipcConnect()
+    const event = await new Promise((resolve, reject) => {
+      const handleIpcMessage = async (event) => {
+        resolve(event)
       }
       ipc.onmessage = handleIpcMessage
     })
+    if (event.data.method !== 'get-port') {
+      throw new Error('unexpected message from renderer worker')
+    }
+    const type = event.data.params[0]
+    const port = await getPort(type)
+    ipc.sendAndTransfer('port', [port])
   }
   ipc.onmessage = handleMessageFromRendererWorker
   state.ipc = ipc
@@ -179,7 +193,8 @@ export const invoke = async (method, ...params) => {
   if ('result' in responseMessage) {
     return responseMessage.result
   }
-  throw new JsonRpcError('unexpected message from renderer process')
+
+  throw new JsonRpcError('unexpected message from renderer worker')
 }
 
 export const sendAndTransfer = (message, transfer) => {

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/TestFrameWork/QuerySelector.js

@@ -43,6 +43,9 @@ export const querySelector = (selector) => {
   if (selector.startsWith('#')) {
     return querySelectorByCss(selector)
   }
+  if (selector.startsWith('[data')) {
+    return querySelectorByCss(selector)
+  }
   if (isElement(selector)) {
     return querySelectorByCss(selector)
   }
@@ -78,7 +81,9 @@ export const querySelectorWithOptions = (
     return element
   }
   if (nth === -1) {
-    throw new Error(`too many matching elements for ${selector}`)
+    throw new Error(
+      `too many matching elements for ${selector}, matching ${elements.length}`
+    )
   }
   const element = elements[nth]
   if (!element) {

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/TestFrameWork/TestFrameWork.js

@@ -16,6 +16,7 @@ const create$Overlay = () => {
   $TestOverlay.style.height = '20px'
   $TestOverlay.style.whiteSpace = 'nowrap'
   $TestOverlay.style.contain = 'strict'
+  $TestOverlay.style.userSelect = 'text'
   return $TestOverlay
 }
 

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/Viewlet/Viewlet.ipc.js

@@ -11,4 +11,7 @@ export const __initialize__ = () => {
   Command.register('Viewlet.load', Viewlet.load)
   Command.register('Viewlet.handleError', Viewlet.handleError)
   Command.register('Viewlet.sendMultiple', Viewlet.sendMultiple)
+  Command.register('Viewlet.loadModule', Viewlet.loadModule)
+  Command.register('Viewlet.show', Viewlet.show)
+  Command.register('Viewlet.executeCommands', Viewlet.executeCommands)
 }

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/Viewlet/Viewlet.js

@@ -80,6 +80,19 @@ export const load = async (id, ...args) => {
   }
 }
 
+export const create = (id) => {
+  const module = state.modules[id]
+  state.instances[id] = {
+    state: module.create(),
+    factory: module,
+  }
+}
+
+export const loadModule = async (id) => {
+  const module = await get(id)
+  state.modules[id] = module
+}
+
 export const invoke = (viewletId, method, ...args) => {
   const instance = state.instances[viewletId]
   if (!instance) {
@@ -224,3 +237,34 @@ export const appendViewlet = (parentId, childId, focus) => {
     childInstance.factory.focus(childInstance.state)
   }
 }
+
+export const executeCommands = (commands) => {
+  for (const [command, ...args] of commands) {
+    switch (command) {
+      case 'Viewlet.create':
+        create(...args)
+        break
+      case 'Viewlet.send':
+        invoke(...args)
+        break
+      case 'Viewlet.show':
+        show(...args)
+        break
+      case 'Viewlet.dispose':
+        dispose(...args)
+        break
+      default:
+        throw new Error(`unknown command ${command}`)
+    }
+  }
+}
+
+export const show = (id) => {
+  const instance = state.instances[id]
+  const $Viewlet = instance.state.$Viewlet
+  const $Workbench = document.getElementById('Workbench')
+  $Workbench.append($Viewlet)
+  if (instance.factory.focus) {
+    instance.factory.focus(instance.state)
+  }
+}

package/static/{0e4d46a → 37d2807}/packages/renderer-process/src/parts/ViewletExplorer/ViewletExplorer.js

@@ -141,11 +141,13 @@ const handleContextMenu = (event) => {
   const index = findIndex($Target)
   const x = event.clientX
   const y = event.clientY
+  const button = event.button
   RendererWorker.send(
     /* Explorer.handleContextMenu */ 'Explorer.handleContextMenu',
     /* x */ x,
     /* y */ y,
-    /* index */ index
+    /* index */ index,
+    /* button */ button
   )
 }