@inkandswitch/patchwork-pkg-base 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkandswitch/patchwork-pkg-base",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "description": "Base packages for the Patchwork system",
   "repository": {

package/packages/codemirror-base/dist/tool.js

@@ -1572,7 +1572,7 @@ function subscribeDoc(element, selector) {
 }
 
 // src/tool.tsx
-import { createMemo as createMemo2, createResource as createResource2, createSignal as createSignal3, onMount as onMount2 } from "solid-js";
+import { createMemo as createMemo2, createResource as createResource2, Show } from "solid-js";
 var _tmpl$ = /* @__PURE__ */ _$template(`<div style="width:100%;height:100%;overflow:hidden;position:relative;background:var(--studio-fill, white)"><div style=display:flex;height:100%><div style=position:relative;flex:1;height:100%>`);
 var PATH = ["content"];
 function CodeMirrorEditor(props) {
@@ -1702,31 +1702,35 @@ function CodeMirrorEditor(props) {
       });
     });
   };
-  const [extensions, setExtensions] = createSignal3([commentUI({
+  const [datatypeExtensions] = createResource2(() => loadCodeMirrorExtensionsForDoc(props.handle));
+  const extensions = () => [commentUI({
     createThreadForRange,
     threadAtPos,
     watchThreadForClose,
     onClose: onClosePopover
-  })]);
-  onMount2(async () => {
-    const loaded = await loadCodeMirrorExtensionsForDoc(props.handle);
-    setExtensions((exts) => [...exts, ...loaded]);
-  });
+  }), ...datatypeExtensions() ?? []];
   return (() => {
     var _el$ = _tmpl$(), _el$2 = _el$.firstChild, _el$3 = _el$2.firstChild;
-    _$insert(_el$3, _$createComponent(CodeMirror, {
-      get handle() {
-        return props.handle;
-      },
-      path: PATH,
-      decorations,
-      baseline: () => baseline()?.heads ?? null,
-      get extensions() {
-        return extensions();
+    _$insert(_el$3, _$createComponent(Show, {
+      get when() {
+        return datatypeExtensions.state === "ready";
       },
-      readOnly: isReadOnly,
-      onChangeSelection,
-      scrollTarget
+      get children() {
+        return _$createComponent(CodeMirror, {
+          get handle() {
+            return props.handle;
+          },
+          path: PATH,
+          decorations,
+          baseline: () => baseline()?.heads ?? null,
+          get extensions() {
+            return extensions();
+          },
+          readOnly: isReadOnly,
+          onChangeSelection,
+          scrollTarget
+        });
+      }
     }));
     return _el$;
   })();