@dao42/d42paas-front 0.6.20 → 0.6.25

package/dist/DaoPaaS.es.js

@@ -44094,7 +44094,8 @@ const CmdKey = () => {
     hotkey: "a",
     mdIcon: "input",
     handler: () => {
-      io == null ? void 0 : io.emit("active");
+      var _a2, _b2;
+      (_b2 = (_a2 = useOT.getState()) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.emit("active");
     }
   }, {
     id: "clearCache",
@@ -44153,7 +44154,6 @@ const CmdKey = () => {
   }];
   const [drawerOpen, setDrawerOpen] = react.exports.useState(false);
   const [replayList, setReplayList] = react.exports.useState(null);
-  const io = useOT.getState().socket;
   const [hotkeys2, setHotkeys] = react.exports.useState(actions);
   react.exports.useEffect(() => {
     console.log("leva init");
@@ -44240,7 +44240,7 @@ const GuiComponent = () => {
 const LazyTreeComponent = lazy$2(async () => (await Promise.resolve().then(function() {
   return index$5;
 })).FileTree);
-const LazyEditorComponent = lazy$2(async () => (await Promise.resolve().then(function() {
+const LazyEditorComponent$1 = lazy$2(async () => (await Promise.resolve().then(function() {
   return index$4;
 })).Editor);
 const LazyConsoleComponent = lazy$2(async () => (await Promise.resolve().then(function() {
@@ -44521,7 +44521,7 @@ class DaoPaaS {
     this.editorDOM = container ? isHTMLElement$1(container) : this.editorDOM;
     reactDom.exports.render(/* @__PURE__ */ jsx(react.exports.Suspense, {
       fallback: /* @__PURE__ */ jsx(Loading, {}),
-      children: /* @__PURE__ */ jsx(LazyEditorComponent, __spreadProps(__spreadValues({}, props2), {
+      children: /* @__PURE__ */ jsx(LazyEditorComponent$1, __spreadProps(__spreadValues({}, props2), {
         serviceWorkerOrigin: this.serviceWorkerOrigin
       }))
     }), this.editorDOM);
@@ -44543,7 +44543,9 @@ class DaoPaaS {
     this.editorDOM = container ? isHTMLElement$1(container) : this.editorDOM;
     reactDom.exports.render(/* @__PURE__ */ jsx(react.exports.Suspense, {
       fallback: /* @__PURE__ */ jsx(Loading, {}),
-      children: /* @__PURE__ */ jsx(LazyTreeComponent, __spreadValues({}, props2))
+      children: /* @__PURE__ */ jsx(LazyTreeComponent, __spreadProps(__spreadValues({}, props2), {
+        ref: myTree
+      }))
     }), this.editorDOM);
   }
   Console({
@@ -174319,6 +174321,9 @@ const EditorLayout = newStyled.div`
     padding: 2px 10px;
     transform: scale(0.8);
     word-break: keep-all;
+    font-weight: bolder;
+    font-size: 14px;
+    color: #666;
   }
 
   .stack-list {
@@ -189430,6 +189435,34 @@ function lineAndColumnToIndex(lines, lineNumber, column2) {
   index2 += column2 - 1;
   return index2;
 }
+function operationFromMonacoChanges(changeEvent, liveOperationCode) {
+  let operation;
+  let composedCode = liveOperationCode;
+  for (const change of [...changeEvent.changes]) {
+    const newOt = new TextOperation();
+    const cursorStartOffset = lineAndColumnToIndex(composedCode.split(/\n/), change.range.startLineNumber, change.range.startColumn);
+    const retain = cursorStartOffset - newOt.targetLength;
+    if (retain !== 0) {
+      newOt.retain(retain);
+    }
+    if (change.rangeLength > 0) {
+      newOt.delete(change.rangeLength);
+    }
+    if (change.text) {
+      newOt.insert(change.text);
+    }
+    const remaining = composedCode.length - newOt.baseLength;
+    if (remaining > 0) {
+      newOt.retain(remaining);
+    }
+    operation = operation ? operation.compose(newOt) : newOt;
+    composedCode = operation.apply(liveOperationCode);
+  }
+  return {
+    operation,
+    liveOperationCode: composedCode
+  };
+}
 new IoClient(0);
 class MonacoAdapter {
   constructor(monacoIns, serviceWorkerOrigin) {
@@ -189520,11 +189553,17 @@ class MonacoAdapter {
       } = evt;
       if (!isFlush) {
         try {
-          const pair = this.operationFromMonacoChanges(evt);
-          this.trigger("change", pair);
+          const {
+            operation,
+            liveOperationCode
+          } = operationFromMonacoChanges(evt, this.liveOperationCode);
+          this.liveOperationCode = liveOperationCode;
+          this.trigger("change", operation);
         } catch (err) {
           console.log(err);
         }
+      } else {
+        this.trigger("cursorActivity", evt);
       }
     }
     this.ignoreNextChange = false;
@@ -189588,34 +189627,6 @@ class MonacoAdapter {
       });
     }, "save");
   }
-  operationFromMonacoChanges(evt) {
-    let composedCode = this.liveOperationCode;
-    let operation;
-    for (let i2 = 0; i2 < evt.changes.length; i2++) {
-      const change = evt.changes[i2];
-      const cursorStartOffset = lineAndColumnToIndex(composedCode.split(/\n/), change.range.startLineNumber, change.range.startColumn);
-      const {
-        rangeLength,
-        text: text2
-      } = change;
-      const newOt = new TextOperation();
-      newOt.retain(cursorStartOffset);
-      if (rangeLength > 0) {
-        newOt.delete(rangeLength);
-      }
-      if (text2) {
-        newOt.insert(text2);
-      }
-      const remaining = composedCode.length - newOt.baseLength;
-      if (remaining > 0) {
-        newOt.retain(remaining);
-      }
-      operation = operation ? operation.compose(newOt) : newOt;
-      composedCode = operation.apply(this.liveOperationCode);
-    }
-    this.liveOperationCode = composedCode;
-    return operation;
-  }
   lspServerInject(_lan, useLsp = true) {
     languages.register({
       id: "ruby",
@@ -189646,7 +189657,7 @@ class MonacoAdapter {
       lspUrl,
       ticket
     } = oTStore.getState().dockerInfo;
-    if (!useLsp || !lspUrl || this.lspInited)
+    if (!lspUrl || this.lspInited)
       return;
     this.lspInited = true;
     lib.MonacoServices.install(monaco);
@@ -189701,16 +189712,20 @@ class MonacoAdapter {
         globalAPI: true,
         getWorkerUrl(_moduleId, label) {
           if (label === "json") {
-            return "./json.worker.bundle.js";
+            return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
+            importScripts('${serviceWorkerOrigin}/assets/editor.worker.66c12891.js');`)}`;
           }
           if (label === "css" || label === "scss" || label === "less") {
-            return "./css.worker.bundle.js";
+            return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
+            importScripts('${serviceWorkerOrigin}/assets/editor.worker.5157db2f.js');`)}`;
           }
           if (label === "html" || label === "handlebars" || label === "razor") {
-            return "./html.worker.bundle.js";
+            return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
+            importScripts('${serviceWorkerOrigin}/assets/editor.worker.3f2697f1.js');`)}`;
           }
           if (label === "typescript" || label === "javascript") {
-            return "./ts.worker.bundle.js";
+            return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
+            importScripts('${serviceWorkerOrigin}/assets/editor.worker.d75e32f4.js');`)}`;
           }
           return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
               importScripts('${serviceWorkerOrigin}/assets/editor.worker.43309ac9.js');`)}`;
@@ -190073,7 +190088,7 @@ const Editor = ({
           path
         }
       };
-      io.emit("editFile", JSON.stringify(crdt));
+      io == null ? void 0 : io.emit("editFile", JSON.stringify(crdt));
     };
     client.applyOperation = (operation) => {
       clientEditor.applyOperation(operation);
@@ -190106,7 +190121,7 @@ const Editor = ({
       },
       userInfo: lodash$2.exports.pick(userInfo, "uuid", "role")
     };
-    io.emit("cursor", JSON.stringify(crdt));
+    io == null ? void 0 : io.emit("cursor", JSON.stringify(crdt));
   };
   const onBlur = (operation) => {
   };
@@ -190197,7 +190212,7 @@ const Editor = ({
         "editor.background": "#000000"
       }
     });
-    setClientEditor(new MonacoAdapter(editor, ""));
+    setClientEditor(new MonacoAdapter(editor, serviceWorkerOrigin));
     setOtherClients(new ClientMeta(editor, userList.filter((x2) => !IsMe(x2))));
     serviceBinder();
     return () => {
@@ -190216,7 +190231,7 @@ const Editor = ({
     clientEditor == null ? void 0 : clientEditor.onCursorActivity();
   }, [clientEditor]);
   react.exports.useEffect(() => {
-    io.on("editFile", (d2) => {
+    io == null ? void 0 : io.on("editFile", (d2) => {
       var _a2, _b2, _c2, _d3;
       const _d2 = JSON.parse(d2);
       const path = (_a2 = oTStore.getState().doc) == null ? void 0 : _a2.path;
@@ -190232,7 +190247,7 @@ const Editor = ({
         }
       }
     });
-    io.on("serverAck", async (d2) => {
+    io == null ? void 0 : io.on("serverAck", async (d2) => {
       var _a2, _b2;
       const _d2 = JSON.parse(d2);
       client.serverAck();
@@ -190242,7 +190257,7 @@ const Editor = ({
         operation: client.operation
       }));
     });
-    io.on("selection", async (d2) => {
+    io == null ? void 0 : io.on("selection", async (d2) => {
       var _a2, _b2;
       const _d2 = JSON.parse(d2);
       const path = (_a2 = oTStore.getState().doc) == null ? void 0 : _a2.path;
@@ -190255,7 +190270,7 @@ const Editor = ({
         }
       }
     });
-    io.on("cursor", async (d2) => {
+    io == null ? void 0 : io.on("cursor", async (d2) => {
       var _a2, _b2;
       const _d2 = JSON.parse(d2);
       const path = (_a2 = oTStore.getState().doc) == null ? void 0 : _a2.path;
@@ -190269,10 +190284,10 @@ const Editor = ({
       }
     });
     return () => {
-      io.off("editFile");
-      io.off("serverAck");
-      io.off("selection");
-      io.off("cursor");
+      io == null ? void 0 : io.off("editFile");
+      io == null ? void 0 : io.off("serverAck");
+      io == null ? void 0 : io.off("selection");
+      io == null ? void 0 : io.off("cursor");
     };
   }, [clientEditor]);
   react.exports.useEffect(() => {
@@ -198444,6 +198459,9 @@ const useIndexState = create$3((set2) => ({
     isFolded: arg
   })
 }));
+const LazyEditorComponent = lazy$2(async () => (await Promise.resolve().then(function() {
+  return index$4;
+})).Editor);
 const MainLayout = newStyled.div`
   width: 100vw;
   height: 100vh;
@@ -198557,7 +198575,7 @@ const Index = (props2) => {
             fallback: /* @__PURE__ */ jsx(Skeleton, {
               count: 10
             }),
-            children: /* @__PURE__ */ jsx(Editor, {
+            children: /* @__PURE__ */ jsx(LazyEditorComponent, {
               useLsp: true
             })
           }) : null