@lvce-editor/renderer-process 6.1.0 → 6.3.0

package/dist/rendererProcessMain.js

@@ -769,7 +769,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const getErrorResponse = (message, error, ipc, preparePrettyError, logError) => {
+const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
@@ -791,7 +791,7 @@ const getResponse = async (message, ipc, execute, preparePrettyError, logError,
     const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
     return getSuccessResponse(message, result);
   } catch (error) {
-    return getErrorResponse(message, error, ipc, preparePrettyError, logError);
+    return getErrorResponse(message, error, preparePrettyError, logError);
   }
 };
 const handleJsonRpcMessage = async (ipc, message, execute, resolve, preparePrettyError, logError, requiresSocket) => {
@@ -801,7 +801,7 @@ const handleJsonRpcMessage = async (ipc, message, execute, resolve, preparePrett
       try {
         ipc.send(response);
       } catch (error) {
-        const errorResponse = getErrorResponse(message, error, ipc, preparePrettyError, logError);
+        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
         ipc.send(errorResponse);
       }
       return;
@@ -5869,7 +5869,7 @@ const handleScrollBarThumbPointerMove$3 = forwardViewletCommand('handleScrollBar
 forwardViewletCommand('handleScrollBarMove');
 forwardViewletCommand('handleScrollBarVerticalPointerDown');
 forwardViewletCommand('handleSliderPointerDown');
-const handleSliderPointerMove$1 = forwardViewletCommand('handleSliderPointerMove');
+forwardViewletCommand('handleSliderPointerMove');
 const handleTabClick = forwardViewletCommand('handleTabClick');
 const handleTabContextMenu = forwardViewletCommand('handleTabContextMenu');
 forwardViewletCommand('handleTabsPointerOut');
@@ -5977,32 +5977,54 @@ const stopTracking$1 = ($Target, pointerId, handlePointerMove, handlePointerUp)
   // TODO use pointerlost event instead
   $Target.removeEventListener(PointerUp, handlePointerUp);
 };
-
-const handleSliderPointerCaptureLost = event => {
-  const {
-    target,
-    pointerId
-  } = event;
-  stopTracking$1(target, pointerId, handleSliderPointerMove, handleSliderPointerCaptureLost);
+const create$v = (pointerDown, pointerMove, pointerUp) => {
+  const shared = (fn, event) => {
+    const message = fn(event);
+    if (!message || message.length === 0) {
+      return;
+    }
+    const uid = fromEvent(event);
+    send('Viewlet.executeViewletCommand', uid, ...message);
+  };
+  const handlePointerMove = event => {
+    shared(pointerMove, event);
+  };
+  const handlePointerUp = event => {
+    const {
+      target,
+      pointerId
+    } = event;
+    stopTracking$1(target, pointerId, handlePointerMove, handlePointerUp);
+    shared(pointerUp, event);
+  };
+  const handlePointerDown = event => {
+    const {
+      target,
+      pointerId
+    } = event;
+    startTracking$1(target, pointerId, handlePointerMove, handlePointerUp);
+    shared(pointerDown, event);
+    return [];
+  };
+  return handlePointerDown;
 };
-const handleSliderPointerMove = event => {
+
+const handleOffset = 20;
+const handleSliderPointerDown = create$v(event => {
   const {
     clientX,
     clientY
   } = event;
-  const uid = fromEvent(event);
-  handleSliderPointerMove$1(uid, clientX - 20, clientY);
-};
-const handleSliderPointerDown = event => {
+  return ['handleSliderPointerDown', clientX - handleOffset, clientY];
+}, event => {
   const {
     clientX,
-    clientY,
-    target,
-    pointerId
+    clientY
   } = event;
-  startTracking$1(target, pointerId, handleSliderPointerMove, handleSliderPointerCaptureLost);
-  return ['handleSliderPointerDown', clientX - 20, clientY];
-};
+  return ['handleSliderPointerMove', clientX - handleOffset, clientY];
+}, () => {
+  return [];
+});
 const handlePointerDown$6 = event => {
   const {
     target
@@ -6062,7 +6084,7 @@ const ViewletDebugConsoleEvents = {
   handleInput: handleInput$7
 };
 
-const create$v = () => {
+const create$u = () => {
   const $Viewlet = document.createElement('div');
   $Viewlet.className = 'Viewlet DebugConsole';
   return {
@@ -6078,7 +6100,7 @@ const setDom$8 = (state, dom) => {
 
 const ViewletDebugConsole = {
   __proto__: null,
-  create: create$v,
+  create: create$u,
   setDom: setDom$8
 };
 
@@ -6139,7 +6161,7 @@ const setMaskImage = ($Element, icon) => {
   }
 };
 
-const create$u = icon => {
+const create$t = icon => {
   const $Icon = document.createElement('div');
   $Icon.className = 'MaskIcon';
   setMaskImage($Icon, icon);
@@ -6149,7 +6171,7 @@ const create$u = icon => {
 
 const create$Button = (label, icon) => {
   // TODO icon div might not be needed (unnecessary html element)
-  const $Icon = create$u(icon);
+  const $Icon = create$t(icon);
   const $Button = document.createElement('button');
   $Button.className = 'IconButton';
   $Button.title = label;
@@ -6170,7 +6192,7 @@ const handleClick$7 = event => {
   handleClick$8(index);
 };
 
-const create$t = () => {
+const create$s = () => {
   const $DialogTitle = document.createElement('h2');
   $DialogTitle.id = 'DialogTitle';
   const $DialogCloseButton = create$Button('Close', 'Close');
@@ -6251,7 +6273,7 @@ const setErrorStack = (state, errorStack) => {
 
 const ViewletDialog = {
   __proto__: null,
-  create: create$t,
+  create: create$s,
   postAppend,
   setButtons,
   setCodeFrame,
@@ -6311,6 +6333,19 @@ const Capture = {
   capture: true
 };
 
+const startTracking = ($Target, pointerId, handlePointerMove, handlePointerUp) => {
+  $Target.setPointerCapture(pointerId);
+  $Target.addEventListener(PointerMove, handlePointerMove);
+  // TODO use pointerlost event instead
+  $Target.addEventListener(PointerUp, handlePointerUp);
+};
+const stopTracking = ($Target, pointerId, handlePointerMove, handlePointerUp) => {
+  $Target.releasePointerCapture(pointerId);
+  $Target.removeEventListener(PointerMove, handlePointerMove);
+  // TODO use pointerlost event instead
+  $Target.removeEventListener(PointerUp, handlePointerUp);
+};
+
 const handleMousedown = event => {
   preventDefault(event);
   const {
@@ -6332,7 +6367,7 @@ const handlePointerCaptureLost$2 = event => {
     target,
     pointerId
   } = event;
-  stopTracking$1(target, pointerId, handleScrollBarThumbPointerMove$2, handlePointerCaptureLost$2);
+  stopTracking(target, pointerId, handleScrollBarThumbPointerMove$2, handlePointerCaptureLost$2);
 };
 const handleScrollBarPointerDown$3 = event => {
   preventDefault(event);
@@ -6341,7 +6376,7 @@ const handleScrollBarPointerDown$3 = event => {
     pointerId,
     clientY
   } = event;
-  startTracking$1(target, pointerId, handleScrollBarThumbPointerMove$2, handlePointerCaptureLost$2);
+  startTracking(target, pointerId, handleScrollBarThumbPointerMove$2, handlePointerCaptureLost$2);
   const uid = fromEvent(event);
   handleScrollBarClick(uid, clientY);
 };
@@ -6393,7 +6428,7 @@ const setNegativeMargin = (state, negativeMargin) => {
   setTop($ListItems, negativeMargin);
 };
 
-const create$s = () => {
+const create$r = () => {
   const $ListItems = document.createElement('div');
   $ListItems.className = 'ListItems';
   $ListItems.role = ListBox;
@@ -6476,7 +6511,7 @@ const setBounds$4 = (state, x, y, width, height) => {
 const ViewletEditorCompletion = {
   __proto__: null,
   attachEvents: attachEvents$a,
-  create: create$s,
+  create: create$r,
   dispose: dispose$c,
   handleError: handleError$6,
   setBounds: setBounds$4,
@@ -6501,7 +6536,7 @@ const ViewletEditorCompletion = {
 
 // TODO aria alert
 
-const create$r = () => {
+const create$q = () => {
   const $Viewlet = document.createElement('div');
   $Viewlet.className = 'Viewlet EditorError';
   return {
@@ -6523,57 +6558,13 @@ const setBounds$3 = (state, x, y, width, height) => {
 
 const ViewletEditorError = {
   __proto__: null,
-  create: create$r,
+  create: create$q,
   setBounds: setBounds$3,
   setDom: setDom$6
 };
 
-const startTracking = ($Target, pointerId, handlePointerMove, handlePointerUp) => {
-  $Target.setPointerCapture(pointerId);
-  $Target.addEventListener(PointerMove, handlePointerMove);
-  // TODO use pointerlost event instead
-  $Target.addEventListener(PointerUp, handlePointerUp);
-};
-const stopTracking = ($Target, pointerId, handlePointerMove, handlePointerUp) => {
-  $Target.releasePointerCapture(pointerId);
-  $Target.removeEventListener(PointerMove, handlePointerMove);
-  // TODO use pointerlost event instead
-  $Target.removeEventListener(PointerUp, handlePointerUp);
-};
-const create$q = (pointerDown, pointerMove, pointerUp) => {
-  const shared = (fn, event) => {
-    const message = fn(event);
-    if (!message || message.length === 0) {
-      return;
-    }
-    const uid = fromEvent(event);
-    send('Viewlet.executeViewletCommand', uid, ...message);
-  };
-  const handlePointerMove = event => {
-    shared(pointerMove, event);
-  };
-  const handlePointerUp = event => {
-    const {
-      target,
-      pointerId
-    } = event;
-    stopTracking(target, pointerId, handlePointerMove, handlePointerUp);
-    shared(pointerUp, event);
-  };
-  const handlePointerDown = event => {
-    const {
-      target,
-      pointerId
-    } = event;
-    startTracking(target, pointerId, handlePointerMove, handlePointerUp);
-    shared(pointerDown, event);
-    return [];
-  };
-  return handlePointerDown;
-};
-
 const returnValue$4 = true;
-const handleSashPointerDown$2 = create$q(event => {
+const handleSashPointerDown$2 = create$v(event => {
   const {
     clientX,
     clientY
@@ -7037,7 +7028,7 @@ const handlePaste = event => {
   const text = getText(clipboardData);
   return ['paste', text];
 };
-const handleScrollBarVerticalPointerDown = create$q(event => {
+const handleScrollBarVerticalPointerDown = create$v(event => {
   const {
     clientY
   } = event;
@@ -7071,7 +7062,7 @@ const handleScrollBarHorizontalPointerUp = event => {
     target,
     pointerId
   } = event;
-  stopTracking$1(target, pointerId, handleScrollBarThumbHorizontalPointerMove, handleScrollBarHorizontalPointerUp);
+  stopTracking(target, pointerId, handleScrollBarThumbHorizontalPointerMove, handleScrollBarHorizontalPointerUp);
   return [];
 };
 
@@ -7085,7 +7076,7 @@ const handleScrollBarHorizontalPointerDown = event => {
     pointerId,
     clientX
   } = event;
-  startTracking$1(target, pointerId, handleScrollBarThumbHorizontalPointerMove, handleScrollBarHorizontalPointerUp);
+  startTracking(target, pointerId, handleScrollBarThumbHorizontalPointerMove, handleScrollBarHorizontalPointerUp);
   return ['handleScrollBarHorizontalPointerDown', clientX];
 };
 const handleScrollBarContextMenu = event => {
@@ -7786,7 +7777,7 @@ const handleScrollBarPointerCaptureLost = event => {
     target,
     pointerId
   } = event;
-  stopTracking$1(target, pointerId, handleScrollBarThumbPointerMove$1, handleScrollBarPointerCaptureLost);
+  stopTracking(target, pointerId, handleScrollBarThumbPointerMove$1, handleScrollBarPointerCaptureLost);
   const uid = fromEvent(event);
   handleScrollBarCaptureLost(uid);
 };
@@ -7796,7 +7787,7 @@ const handleScrollBarPointerDown$2 = event => {
     pointerId,
     clientY
   } = event;
-  startTracking$1(target, pointerId, handleScrollBarThumbPointerMove$1, handleScrollBarPointerCaptureLost);
+  startTracking(target, pointerId, handleScrollBarThumbPointerMove$1, handleScrollBarPointerCaptureLost);
   const uid = fromEvent(event);
   handleScrollBarClick(uid, clientY);
 };
@@ -8238,7 +8229,7 @@ const handleResizerPointerUp = event => {
     target,
     pointerId
   } = event;
-  stopTracking$1(target, pointerId, handleResizerPointerMove, handleResizerPointerUp);
+  stopTracking(target, pointerId, handleResizerPointerMove, handleResizerPointerUp);
 };
 const handleResizerPointerDown = event => {
   const {
@@ -8246,7 +8237,7 @@ const handleResizerPointerDown = event => {
     pointerId,
     clientX
   } = event;
-  startTracking$1(target, pointerId, handleResizerPointerMove, handleResizerPointerUp);
+  startTracking(target, pointerId, handleResizerPointerMove, handleResizerPointerUp);
   const id = target.nextSibling ? 1 : 2;
   const uid = fromEvent(event);
   handleResizerClick(uid, id, clientX);
@@ -8767,7 +8758,7 @@ const handlePointerCaptureLost = event => {
     target,
     pointerId
   } = event;
-  stopTracking$1(target, pointerId, handleSashPointerMove, handlePointerCaptureLost);
+  stopTracking(target, pointerId, handleSashPointerMove, handlePointerCaptureLost);
   const id = getSashId(target);
   handleSashPointerUp(id);
 };
@@ -8776,7 +8767,7 @@ const handleSashPointerDown = event => {
     target,
     pointerId
   } = event;
-  startTracking$1(target, pointerId, handleSashPointerMove, handlePointerCaptureLost);
+  startTracking(target, pointerId, handleSashPointerMove, handlePointerCaptureLost);
   const id = getSashId(target);
   handleSashPointerDown$1(id);
 };
@@ -9845,7 +9836,7 @@ const handleScrollBarPointerUp = event => {
     target,
     pointerId
   } = event;
-  stopTracking$1(target, pointerId, handleScrollBarThumbPointerMove, handleScrollBarPointerUp);
+  stopTracking(target, pointerId, handleScrollBarThumbPointerMove, handleScrollBarPointerUp);
 };
 const handleScrollBarPointerDown$1 = event => {
   const {
@@ -9853,7 +9844,7 @@ const handleScrollBarPointerDown$1 = event => {
     pointerId,
     clientY
   } = event;
-  startTracking$1(target, pointerId, handleScrollBarThumbPointerMove, handleScrollBarPointerUp);
+  startTracking(target, pointerId, handleScrollBarThumbPointerMove, handleScrollBarPointerUp);
   return ['handleScrollBarClick', clientY];
 };
 const handleToggleButtonClick = event => {
@@ -11077,10 +11068,6 @@ const setFocused = (state, selector) => {
     $Viewlet
   } = state;
   const $Focusable = $Viewlet.querySelector(selector);
-  console.log({
-    $Focusable,
-    selector
-  });
   $Focusable.focus();
 };
 
@@ -11456,6 +11443,11 @@ const tryToGetActualErrorMessage$1 = async ({
   return `Failed to import ${url}: Unknown Network Error (${response.status})`;
 };
 
+const javaScriptContentTypes = ['application/javascript', 'text/javascript', 'application/javascript; charset=UTF-8'];
+const isJavaScriptContentType = contentType => {
+  return javaScriptContentTypes.includes(contentType);
+};
+
 const tryToGetActualErrorMessage = async ({
   url,
   name
@@ -11469,7 +11461,7 @@ const tryToGetActualErrorMessage = async ({
   }
   if (response.ok) {
     const contentType = response.headers.get('Content-Type');
-    if (contentType !== 'application/javascript' && contentType !== 'text/javascript') {
+    if (!isJavaScriptContentType(contentType)) {
       return `Failed to start ${displayName}: Content type for worker must be application/javascript but is ${contentType}`;
     }
     const crossOriginEmbedderPolicy = response.headers.get('Cross-Origin-Embedder-Policy');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "6.1.0",
+  "version": "6.3.0",
   "description": "",
   "main": "dist/diffWorkerMain.js",
   "type": "module",