@lvce-editor/renderer-process 30.12.2 → 30.12.4

package/dist/rendererProcessMain.js

@@ -122,7 +122,7 @@ const state$a = {
   styleSheets: Object.create(null),
   texts: Object.create(null)
 };
-const set$a = (id, sheet) => {
+const set$b = (id, sheet) => {
   state$a.styleSheets[id] = sheet;
 };
 const get$b = id => {
@@ -134,7 +134,7 @@ const setText$2 = (id, text) => {
 const getText = id => {
   return state$a.texts[id];
 };
-const remove$4 = id => {
+const remove$5 = id => {
   delete state$a.styleSheets[id];
   delete state$a.texts[id];
 };
@@ -147,7 +147,7 @@ const addCssStyleSheet = (id, text) => {
     return;
   }
   const sheet = new CSSStyleSheet({});
-  set$a(id, sheet);
+  set$b(id, sheet);
   setText$2(id, text);
   sheet.replaceSync(text);
   document.adoptedStyleSheets.push(sheet);
@@ -177,7 +177,7 @@ const removeCssStyleSheet = id => {
     return;
   }
   document.adoptedStyleSheets = document.adoptedStyleSheets.filter(candidate => candidate !== sheet);
-  remove$4(id);
+  remove$5(id);
 };
 const getSelectionText = () => {
   return document.getSelection()?.toString() || '';
@@ -430,6 +430,19 @@ const handleClipboardDataFiles = event => {
   }
   return files;
 };
+const getTargetName = event => {
+  const {
+    target
+  } = event;
+  if (target.name) {
+    return target.name;
+  }
+  const namedTarget = target.closest?.('[name]') || target.parentElement?.closest?.('[name]');
+  if (event.currentTarget?.contains && namedTarget !== event.currentTarget && !event.currentTarget.contains(namedTarget)) {
+    return '';
+  }
+  return namedTarget?.getAttribute?.('name') || namedTarget?.name || '';
+};
 const getEventListenerArg = (param, event) => {
   switch (param) {
     case 'event.altKey':
@@ -475,7 +488,7 @@ const getEventListenerArg = (param, event) => {
     case 'event.target.href':
       return event.target.href;
     case 'event.target.name':
-      return event.target.name || '';
+      return getTargetName(event);
     case 'event.target.nodeName':
       return event.target.nodeName;
     case 'event.target.scrollTop':
@@ -1248,7 +1261,7 @@ const instances = Object.create(null);
 const get$a = viewletId => {
   return instances[viewletId];
 };
-const set$9 = (viewletId, instance) => {
+const set$a = (viewletId, instance) => {
   instances[viewletId] = instance;
 };
 
@@ -1277,7 +1290,7 @@ const cache = new Map();
 const has$1 = listener => {
   return cache.has(listener);
 };
-const set$8 = (listener, value) => {
+const set$9 = (listener, value) => {
   cache.set(listener, value);
 };
 const get$9 = listener => {
@@ -1300,7 +1313,7 @@ const getWrappedListener = (listener, returnValue) => {
       ipc.send('Viewlet.executeViewletCommand', uid, ...result);
     };
     nameAnonymousFunction$1(wrapped, listener.name);
-    set$8(listener, wrapped);
+    set$9(listener, wrapped);
   }
   return get$9(listener);
 };
@@ -2807,7 +2820,7 @@ const callbacks = Object.create(null);
 const get$7 = id => {
   return callbacks[id];
 };
-const remove$3 = id => {
+const remove$4 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -3001,7 +3014,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$3(id);
+  remove$4(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -3363,18 +3376,33 @@ const create$z = async ({
   });
 };
 
-// TODO add test
+const workers = Object.create(null);
+const set$8 = (id, worker) => {
+  workers[id] = worker;
+};
+const remove$3 = id => {
+  const worker = workers[id];
+  delete workers[id];
+  return worker;
+};
+
 const create$y = async ({
+  id,
   name,
   port,
+  raw,
   url
-}) => {
-  await create$A({
+}, createRpc = create$A) => {
+  const rpc = await createRpc({
     commandMap: {},
     name,
     port,
     url
   });
+  const worker = rpc.ipc?._rawIpc;
+  if (typeof id === 'number' && raw && worker) {
+    set$8(id, worker);
+  }
   return undefined;
 };
 
@@ -3566,7 +3594,7 @@ const hydrate$3 = async () => {
 };
 
 // TODO needed?
-const dispose$j = () => {
+const dispose$k = () => {
   if (state$7.rpc) {
     state$7.rpc.dispose();
   }
@@ -3590,7 +3618,7 @@ const invokeAndTransfer = (method, ...params) => {
 
 const RendererWorker = {
   __proto__: null,
-  dispose: dispose$j,
+  dispose: dispose$k,
   hydrate: hydrate$3,
   invoke: invoke$1,
   invokeAndTransfer,
@@ -3618,6 +3646,10 @@ const create$w = async ({
   // @ts-ignore
   return module.create(options);
 };
+const dispose$j = id => {
+  const worker = remove$3(id);
+  worker?.terminate();
+};
 
 const getElementHeight = $Element => {
   document.body.append($Element);
@@ -3798,7 +3830,7 @@ const create2 = async (canvasId, objectId, width, height) => {
   }
   const offscreenCanvas = canvas.transferControlToOffscreen();
   canvas.dataset.id = canvasId;
-  set$9(canvasId, {
+  set$a(canvasId, {
     factory: {},
     state: {
       $Viewlet: canvas
@@ -5177,7 +5209,7 @@ const handleMouseDown$3 = event => {
   preventDefault(event);
   stopPropagation(event);
   const index = getNodeIndex($Item);
-  return ['handleClick', button, index, clientX, clientY];
+  return ['handleClickIndex', button, index, clientX, clientY];
 };
 const handleBlur$8 = () => {
   return ['handleBlur'];
@@ -8560,7 +8592,7 @@ const create$4 = (id, uid = id) => {
   if (module.attachEvents) {
     module.attachEvents(instanceState);
   }
-  set$9(uid, {
+  set$a(uid, {
     factory: module,
     state: instanceState
   });
@@ -8580,7 +8612,7 @@ const createFunctionalRoot = (id, uid = id, hasFunctionalEvents) => {
   const instanceState = {
     $Viewlet: document.createElement('div')
   };
-  set$9(uid, {
+  set$a(uid, {
     factory: module,
     state: instanceState
   });
@@ -8761,7 +8793,7 @@ const createPlaceholder = (viewletId, parentId, top, left, width, height) => {
   const parentInstance = get$a(parentId);
   const $Parent = parentInstance.state.$Viewlet;
   $Parent.append($Placeholder);
-  set$9(viewletId, {
+  set$a(viewletId, {
     state: {
       $Viewlet: $Placeholder
     }
@@ -8806,7 +8838,7 @@ const setDom2 = (viewletId, dom) => {
     // @ts-ignore
     set$3($NewViewlet, uid);
   }
-  set$9(viewletId, {
+  set$a(viewletId, {
     ...instance,
     state: {
       ...instance.state,
@@ -8892,7 +8924,7 @@ const dispose$4 = id => {
       instance.state.$Viewlet.remove();
     }
     removeCssStyleSheet(id);
-    set$9(id, undefined);
+    set$a(id, undefined);
   } catch {
     throw new Error(`Failed to dispose ${id}`);
   }
@@ -9345,6 +9377,7 @@ const commandMap = {
   'HandleMessagePort.handleMessagePort': handleMessagePort,
   'InitData.getInitData': getInitData,
   'IpcParent.create': create$w,
+  'IpcParent.dispose': dispose$j,
   'KeyBindings.setIdentifiers': setIdentifiers,
   'Layout.getBounds': getBounds,
   'Location.getHref': getHref,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.12.2",
+  "version": "30.12.4",
   "keywords": [
     "lvce-editor",
     "renderer-process"