Fix re-mount

Author: mk

src/nextjournal/clerk/render.cljs

@@ -622,6 +622,15 @@
 (defn remount? [doc-or-patch]
   (true? (some #(= % :nextjournal.clerk/remount) (tree-seq coll? seq doc-or-patch))))
 
+(defn await-render-fns [x]
+  (let [viewer-fns (set (filter viewer/viewer-fn? (tree-seq coll? seq x)))
+        !viewer-fns->resolved (atom {})]
+    (doseq [viewer-fn viewer-fns]
+      (.then (js/Promise.resolve (:f viewer-fn))
+             #(swap! !viewer-fns->resolved assoc viewer-fn (assoc viewer-fn :f %))))
+    (-> (js/Promise.allSettled (into-array (map #(js/Promise.resolve (:f %)) viewer-fns)))
+        (.then #(clojure.walk/postwalk-replace @!viewer-fns->resolved x)))))
+
 (defn re-eval-viewer-fns [doc]
   (let [re-eval (fn [{:keys [form]}] (viewer/->viewer-fn form))]
     (w/postwalk (fn [x] (cond-> x (viewer/viewer-fn? x) re-eval)) doc)))
@@ -644,9 +653,11 @@
 
 (defn patch-state! [{:keys [patch]}]
   (if (remount? patch)
-    (do (swap! !doc #(re-eval-viewer-fns (apply-patch % patch)))
-        ;; TODO: figure out why it doesn't work without `js/setTimeout`
-        (js/setTimeout #(swap! !eval-counter inc) 10))
+    (-> (await-render-fns (re-eval-viewer-fns (apply-patch @!doc patch)))
+        (.then #(do (reset! !doc %)
+                    ;; TODO: figure out why it doesn't work without `js/setTimeout`
+                    (js/setTimeout (fn [] (swap! !eval-counter inc)) 10)
+                    %)))
     (swap! !doc apply-patch patch)))
 
 (defonce !pending-clerk-eval-replies
@@ -764,8 +775,9 @@
     (.render react-root (r/as-element [root]))))
 
 (defn ^:dev/after-load ^:after-load re-render []
-  (swap! !doc re-eval-viewer-fns)
-  (mount))
+  (-> (await-render-fns (re-eval-viewer-fns @!doc))
+      (.then #(do (reset! !doc %)
+                  (mount)))))
 
 (defn ^:export init [{:as state :keys [bundle? path->doc path->url current-path]}]
   (setup-router! state)

src/nextjournal/clerk/sci_env.cljs

@@ -186,24 +186,15 @@
                       sci.configs.js-interop/namespaces
                       sci.configs.reagent/namespaces)})
 
-(defn await-render-fns [x]
-  (let [viewer-fns (set (filter viewer/viewer-fn? (tree-seq coll? seq x)))
-        !viewer-fns->resolved (atom {})]
-    (doseq [viewer-fn viewer-fns]
-      (.then (:f viewer-fn)
-             #(swap! !viewer-fns->resolved assoc viewer-fn (assoc viewer-fn :f %))))
-    (-> (js/Promise.allSettled (into-array (map :f viewer-fns)))
-        (.then #(clojure.walk/postwalk-replace @!viewer-fns->resolved x)))))
-
 (defn ^:export onmessage [ws-msg]
-  (-> (await-render-fns (read-string (.-data ws-msg)))
+  (-> (render/await-render-fns (read-string (.-data ws-msg)))
       (.then #(render/dispatch %))))
 
 (defn ^:export eval-form [f]
   (sci-async/eval-form (sci.ctx-store/get-ctx) f))
 
 (defn ^:export init [state]
-  (-> (await-render-fns state)
+  (-> (render/await-render-fns state)
       (.then #(render/init %))))
 
 (defn ^:export ssr [state-str]