@dao42/d42paas-front 0.6.13 → 0.6.17

package/dist/DaoPaaS.es.js

@@ -187822,10 +187822,11 @@ const Editor = ({
   serviceWorkerOrigin,
   useLsp
 }) => {
+  const [lspInited, setlspInited] = react.exports.useState(false);
+  const [client2, setClient] = react.exports.useState(new IoClient(0));
   const divEl = react.exports.useRef(null);
   const file = oTStore((state) => state.doc);
   const setFromServer = oTStore((state) => state.setFromServer);
-  const [client2, setClient] = react.exports.useState(new IoClient(0));
   const OTSTATE = oTStore((state) => state);
   const USERLISTSTORE = userListStore((state) => state);
   const setPosition = useValue((state) => state.setPosition);
@@ -187835,6 +187836,23 @@ const Editor = ({
   const debounced = lodash$2.exports.debounce((callback) => {
     callback();
   }, 300);
+  const cursorTool = (evt) => {
+    var _a2, _b2, _c2, _d2;
+    const {
+      userInfo
+    } = userStore.getState();
+    const selection2 = [[evt.selection.startLineNumber, evt.selection.startColumn, evt.selection.endLineNumber, evt.selection.endColumn, evt.selection.selectionStartLineNumber, evt.selection.selectionStartColumn, evt.selection.positionColumn, evt.selection.positionLineNumber], ...evt.secondarySelections.map((s2) => [s2.startLineNumber, s2.startColumn, s2.endLineNumber, s2.endColumn, s2.selectionStartLineNumber, s2.selectionStartColumn, s2.positionColumn, s2.positionLineNumber])];
+    const crdt = {
+      timestamp: Date.now(),
+      selection: selection2,
+      file: {
+        action: "Update",
+        path: (_b2 = (_a2 = oTStore.getState()) == null ? void 0 : _a2.doc) == null ? void 0 : _b2.path
+      },
+      userInfo: lodash$2.exports.pick(userInfo, "uuid", "role")
+    };
+    (_d2 = (_c2 = useOT.getState()) == null ? void 0 : _c2.socket) == null ? void 0 : _d2.emit("selection", JSON.stringify(crdt));
+  };
   const receiveOperation = (revision, operation, _path) => {
     client2.receiveOperation = operation;
     return {
@@ -187849,8 +187867,21 @@ const Editor = ({
       }
     });
     editor.onDidChangeCursorSelection((evt) => {
-      oTStore.getState();
-      return;
+      const {
+        appStatus
+      } = oTStore.getState();
+      if (appStatus === "replay")
+        return;
+      if (evt.source === "api") {
+        debounced(() => {
+          cursorTool(evt);
+        });
+      }
+      if (evt.reason === 0 || evt.source === "model")
+        return;
+      debounced(() => {
+        cursorTool(evt);
+      });
     });
     editor.onDidChangeModelContent((evt) => {
       const {
@@ -188007,13 +188038,14 @@ const Editor = ({
       extensions: [".ts"],
       aliases: ["TypeScript", "ts", "TS", "typescript"]
     });
-    if (!useLsp2)
-      return;
-    lib.MonacoServices.install(monaco);
     const {
       lspUrl,
       ticket
     } = oTStore.getState().dockerInfo;
+    if (!useLsp2 || !lspUrl || lspInited)
+      return;
+    setlspInited(true);
+    lib.MonacoServices.install(monaco);
     if (!lspUrl)
       return;
     const webSocket = new ReconnectingWebSocket(`wss://${lspUrl}/${ticket}`, [], {
@@ -188094,7 +188126,7 @@ const Editor = ({
         }
       });
       editorEventBinder();
-      lspServerInject(INIT_LANGUAGE, useLsp);
+      lspServerInject(INIT_LANGUAGE, false);
       const editorService = editor._codeEditorService;
       const openEditorBase = editorService.openCodeEditor.bind(editorService);
       editorService.openCodeEditor = async (input, source, workspacePath) => {
@@ -188341,7 +188373,7 @@ const Editor = ({
   }, [file == null ? void 0 : file.path]);
   react.exports.useEffect(() => {
     lspServerInject("", useLsp);
-  }, [useLsp]);
+  }, [useLsp, OTSTATE.dockerInfo, lspInited]);
   react.exports.useEffect(() => {
     const {
       usersDelta,
@@ -195678,22 +195710,19 @@ const StopMask = newStyled.div`
   opacity: 0.6;
 `;
 const OutputBrowser = (_g2) => {
-  var _h2 = _g2, {
-    url: url2
-  } = _h2, props2 = __objRest(_h2, [
-    "url"
-  ]);
+  var props2 = __objRest(_g2, []);
+  var _a2;
   const pStatus = oTStore((state) => state.playgroundStatus);
   const dStatus = oTStore((state) => state.dockerStatus);
   const [playgroundStatus, setPlaygroundStatus] = react.exports.useState("EMPTY");
   const [dockerStatus, setDockerStatus] = react.exports.useState("STOP");
-  const urlWithProtocol = (url22) => {
-    if (!url22)
+  const urlWithProtocol = (url2) => {
+    if (!url2)
       return `${PROTOCOL}showmebug.com`;
-    if (url22.indexOf("http://") !== 0 && url22.indexOf("https://") !== 0) {
-      url22 = `${PROTOCOL}${url22}`;
+    if (url2.indexOf("http://") !== 0 && url2.indexOf("https://") !== 0) {
+      url2 = `${PROTOCOL}${url2}`;
     }
-    return url22;
+    return url2;
   };
   react.exports.useEffect(() => {
     setPlaygroundStatus(pStatus);
@@ -195705,34 +195734,32 @@ const OutputBrowser = (_g2) => {
     }, 800);
   }, [dStatus]);
   const iframeRef = react.exports.useRef(null);
-  const [iframeSrc, setIframeSrc] = react.exports.useState(urlWithProtocol(url2));
-  react.exports.useEffect(() => {
-    setIframeSrc(urlWithProtocol(url2));
-  }, [url2]);
+  const [iframeSrc, setIframeSrc] = react.exports.useState(urlWithProtocol((_a2 = oTStore.getState().dockerInfo) == null ? void 0 : _a2.url));
   react.exports.useEffect(() => {
   }, [iframeRef]);
   const onEnterKey = (e2) => {
-    var _a2, _b2;
+    var _a3, _b2;
     if (e2.keyCode !== 13)
       return;
-    const url22 = urlWithProtocol(e2.target.value);
-    setIframeSrc(url22);
-    (_b2 = (_a2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a2.contentWindow) == null ? void 0 : _b2.location.replace(url22);
+    const url2 = urlWithProtocol(e2.target.value);
+    setIframeSrc(url2);
+    (_b2 = (_a3 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a3.contentWindow) == null ? void 0 : _b2.location.replace(url2);
   };
   const onRefresh = () => {
-    var _a2, _b2;
-    (_b2 = (_a2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a2.contentWindow) == null ? void 0 : _b2.location.replace(iframeSrc);
+    var _a3, _b2;
+    (_b2 = (_a3 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a3.contentWindow) == null ? void 0 : _b2.location.replace(iframeSrc);
   };
   const onOpenInNewTab = () => {
     window.open(iframeSrc);
   };
   react.exports.useEffect(() => {
-    var _a2, _b2;
+    var _a3, _b2, _c2;
     if (playgroundStatus === "EMPTY")
       return;
+    setIframeSrc(urlWithProtocol((_a3 = oTStore.getState().dockerInfo) == null ? void 0 : _a3.url));
     if (playgroundStatus === "ACTIVE" && dockerStatus === "RUNNING") {
       if (iframeSrc !== "http://" && iframeSrc !== "https://") {
-        (_b2 = (_a2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _a2.contentWindow) == null ? void 0 : _b2.location.replace(iframeSrc);
+        (_c2 = (_b2 = iframeRef == null ? void 0 : iframeRef.current) == null ? void 0 : _b2.contentWindow) == null ? void 0 : _c2.location.replace(iframeSrc);
       }
     }
   }, [playgroundStatus, dockerStatus]);
@@ -195770,10 +195797,10 @@ var index$2 = /* @__PURE__ */ Object.freeze({
   [Symbol.toStringTag]: "Module",
   "default": OutputBrowser
 });
-const TerminalComponent = (_i) => {
-  var _j = _i, {
+const TerminalComponent = (_h2) => {
+  var _i = _h2, {
     options
-  } = _j, props2 = __objRest(_j, [
+  } = _i, props2 = __objRest(_i, [
     "options"
   ]);
   const defaultOptions2 = __spreadValues({}, options);
@@ -195886,12 +195913,12 @@ var index$1 = /* @__PURE__ */ Object.freeze({
   [Symbol.toStringTag]: "Module",
   "default": TerminalComponent
 });
-const Tabs = (_k) => {
-  var _l = _k, {
+const Tabs = (_j) => {
+  var _k = _j, {
     activeKey,
     onSelect,
     tabItems
-  } = _l, props2 = __objRest(_l, [
+  } = _k, props2 = __objRest(_k, [
     "activeKey",
     "onSelect",
     "tabItems"
@@ -196209,10 +196236,10 @@ const AvatarLayout = newStyled.div`
   border-color: ${(props2) => props2.user.color};
   background-image: ${(props2) => 'url("' + props2.user.avatar + '")'};
 `;
-const Avatar = (_m) => {
-  var _n = _m, {
+const Avatar = (_l) => {
+  var _m = _l, {
     user
-  } = _n, props2 = __objRest(_n, [
+  } = _m, props2 = __objRest(_m, [
     "user"
   ]);
   return /* @__PURE__ */ jsx(AvatarLayout, __spreadValues({
@@ -196221,8 +196248,8 @@ const Avatar = (_m) => {
   }, props2));
 };
 const SkeletonThemeContext = React.createContext({});
-function SkeletonTheme(_o) {
-  var _p = _o, { children } = _p, styleOptions = __objRest(_p, ["children"]);
+function SkeletonTheme(_n) {
+  var _o = _n, { children } = _o, styleOptions = __objRest(_o, ["children"]);
   return React.createElement(SkeletonThemeContext.Provider, { value: styleOptions }, children);
 }
 const defaultEnableAnimation = true;
@@ -196248,8 +196275,8 @@ function styleOptionsToCssProperties({ baseColor, highlightColor, width: width2,
     style["--highlight-color"] = highlightColor;
   return style;
 }
-function Skeleton$1(_q) {
-  var _r = _q, { count = 1, wrapper: Wrapper, className: customClassName, containerClassName, containerTestId, circle = false, style: styleProp } = _r, propsStyleOptions = __objRest(_r, ["count", "wrapper", "className", "containerClassName", "containerTestId", "circle", "style"]);
+function Skeleton$1(_p) {
+  var _q = _p, { count = 1, wrapper: Wrapper, className: customClassName, containerClassName, containerTestId, circle = false, style: styleProp } = _q, propsStyleOptions = __objRest(_q, ["count", "wrapper", "className", "containerClassName", "containerTestId", "circle", "style"]);
   var _a2, _b2;
   const contextStyleOptions = React.useContext(SkeletonThemeContext);
   const styleOptions = __spreadProps(__spreadValues(__spreadValues({}, contextStyleOptions), propsStyleOptions), {
@@ -196372,8 +196399,8 @@ const ButtonContent = ({
     })()
   });
 };
-const ToolBar = (_s) => {
-  var props2 = __objRest(_s, []);
+const ToolBar = (_r) => {
+  var props2 = __objRest(_r, []);
   const io = useOT.getState().socket;
   const pStatus = oTStore((state) => state.playgroundStatus);
   const dStatus = oTStore((state) => state.dockerStatus);