Naming: close-window, close-all-windows, ::clerk/taps; use clerk-eval to close

Author: philippamarkovics

notebooks/tap_window.clj

@@ -9,9 +9,9 @@
 #_(clerk/window! :my-window (clerk/html [:div.w-8.h-8.bg-green-500]))
 
 #_(comment
-    (clerk/destroy-window! :my-window)
-    (clerk/destroy-all-windows!)
-    (clerk/window! ::window/taps)
+    (clerk/close-window! :my-window)
+    (clerk/close-all-windows!)
+    (clerk/window! ::clerk/taps)
     (tap> (clerk/html [:div.w-8.h-8.bg-green-500]))
     (tap> (clerk/plotly {:data [{:x [1 2 3 4]}]}))
     (tap/reset-taps!))

scratch_window.clj

@@ -0,0 +1,36 @@
+;; # 🪲Debug
+(ns scratch-window
+  {:nextjournal.clerk/visibility {:code :hide :result :hide}
+   :nextjournal.clerk/no-cache true}
+  (:require [nextjournal.clerk :as clerk]
+            [nextjournal.clerk.viewer :as v]))
+
+(def window-viewer
+  {:render-fn '(fn [{:keys [vals]} opts]
+                 [nextjournal.clerk.render.window/show
+                  (into [:div]
+                        (map (fn [v]
+                               [:div.mb-4.pb-4.border-b
+                                [nextjournal.clerk.render/inspect-presented v]]))
+                        (:nextjournal/value vals))])
+   :transform-fn v/mark-preserve-keys})
+
+(defonce !taps (atom '()))
+
+(defonce taps-setup (add-tap (fn [x]
+                               (swap! !taps conj x)
+                               (clerk/recompute!))))
+
+^{::clerk/visibility {:result :show}}
+(clerk/with-viewer window-viewer
+  {:vals @!taps})
+
+(comment
+  (tap> (clerk/html [:div.w-8.h-8.bg-green-500]))
+  (tap> (clerk/plotly {:data [{:x [1 2 3 4]}]})))
+
+(clerk/window! ::clerk/taps)
+(clerk/destroy-window ::clerk/taps)
+(clerk/list-windows)
+
+(clerk/window! :test (range 100))

src/nextjournal/clerk.clj

@@ -71,8 +71,8 @@
 #_(show! (java.io.StringReader. ";; # In Memory Notebook 👋\n(+ 41 1)"))
 
 (defn window! "todo" [& args] (apply (requiring-resolve 'nextjournal.clerk.window/open!) args))
-(defn destroy-window! "todo" [id] ((requiring-resolve 'nextjournal.clerk.window/destroy!) id))
-(defn destroy-all-windows! "todo" [] ((requiring-resolve 'nextjournal.clerk.window/destroy-all!)))
+(defn close-window! "todo" [id] ((requiring-resolve 'nextjournal.clerk.window/close!) id))
+(defn close-all-windows! "todo" [] ((requiring-resolve 'nextjournal.clerk.window/close-all!)))
 
 (defn recompute!
   "Recomputes the currently visible doc, without parsing it."

src/nextjournal/clerk/render.cljs

@@ -600,6 +600,8 @@
                                                 (swap! !state update :desc viewer/merge-presentations more fetch-opts))))}
      [inspect-presented (:desc @!state)]]))
 
+(declare clerk-eval)
+
 (defn root []
   [:<>
    [inspect-presented @!doc]
@@ -616,7 +618,7 @@
                 [window/show
                  [render-result state {}]
                  (-> state
-                     (assoc :id id :on-close #(swap! !windows dissoc id))
+                     (assoc :id id :on-close #(clerk-eval `(nextjournal.clerk.window/close! ~id)))
                      (dissoc :nextjournal/presented))]))
          @!windows)])
 
@@ -711,13 +713,13 @@
     (js/console.warn :process-eval-reply!/not-found :eval-id eval-id :keys (keys @!pending-clerk-eval-replies))))
 
 (defn set-window-state! [{:keys [id state]}] (swap! !windows assoc id state))
-(defn destroy-window! [{:keys [id]}] (swap! !windows dissoc id))
+(defn close-window! [{:keys [id]}] (swap! !windows dissoc id))
 
 (defn ^:export dispatch [{:as msg :keys [type]}]
   (let [dispatch-fn (get {:patch-state! patch-state!
                           :set-state! set-state!
                           :set-window-state! set-window-state!
-                          :destroy-window! destroy-window!
+                          :close-window! close-window!
                           :eval-reply process-eval-reply!}
                          type
                          (fn [_]

src/nextjournal/clerk/webserver.clj

@@ -197,9 +197,9 @@
   (swap! !windows assoc id state)
   (broadcast! {:type :set-window-state! :id id :state state}))
 
-(defn destroy-window! [id]
+(defn close-window! [id]
   (swap! !windows dissoc id)
-  (broadcast! {:type :destroy-window! :id id}))
+  (broadcast! {:type :close-window! :id id}))
 
 
 (defn broadcast-status! [status]

src/nextjournal/clerk/window.clj

@@ -1,5 +1,6 @@
 (ns nextjournal.clerk.window
-  (:require [nextjournal.clerk.tap :as tap]
+  (:require [nextjournal.clerk :as clerk]
+            [nextjournal.clerk.tap :as tap]
             [nextjournal.clerk.viewer :as v]
             [nextjournal.clerk.webserver :as webserver]))
 
@@ -33,7 +34,7 @@
 (defn open!
   ([id]
    (case id
-     ::taps (open! id {:title "🚰 Taps" :css-class "p-0 relative overflow-auto"}
+     ::clerk/taps (open! id {:title "🚰 Taps" :css-class "p-0 relative overflow-auto"}
                    (v/with-viewers (v/add-viewers [tap/tap-viewer])
                      (v/with-viewer taps-viewer {:nextjournal/opts {:taps-view @!taps-view}}
                        @tap/!taps)))))
@@ -45,23 +46,23 @@
                                              :nextjournal/fetch-opts {:blob-id (str id)}
                                              :nextjournal/blob-id (str id)}))))
 
-(add-watch tap/!taps ::tap-watcher (fn [_ _ _ _] (open! ::taps)))
+(add-watch tap/!taps ::tap-watcher (fn [_ _ _ _] (open! ::clerk/taps)))
 
-(defn destroy! [id] (webserver/destroy-window! id))
+(defn close! [id] (webserver/close-window! id))
 
-(defn destroy-all! []
+(defn close-all! []
   (doseq [w (keys @webserver/!windows)]
-    (destroy! w)))
+    (close! w)))
 
-#_(open! ::taps)
+#_(open! ::clerk/taps)
 #_(doseq [f @@(resolve 'clojure.core/tapset)] (remove-tap f))
 #_(tap> (range 30))
-#_(destroy! ::taps)
+#_(close! ::clerk/taps)
 #_(tap> (v/plotly {:data [{:y [1 2 3]}]}))
 #_(tap> (v/table [[1 2] [3 4]]))
 #_(open! ::my-window {:title "🔭 Rear Window"} (v/table [[1 2] [3 4]]))
 #_(open! ::my-window {:title "🔭 Rear Window"} (range 30))
 #_(open! ::my-window {:title "🔭 Rear Window"} (v/plotly {:data [{:y [1 2 3]}]}))
 #_(open! ::my-window-2 {:title "🪟"} (range 100))
-#_(destroy! ::my-window)
-#_(destroy-all!)
+#_(close! ::my-window)
+#_(close-all!)