Revert "Migrate to !sync-state (global for now)"

This reverts commit 9bde9c6.

Author: Sohalt

notebooks/table_filters.clj

@@ -5,7 +5,6 @@
                                   :result :hide}}
   (:require [clojure.math :as math]
             [nextjournal.clerk :as clerk]
-            [nextjournal.clerk.viewer :as viewer]
             [nextjournal.clerk-table-stats :as clerk-table-stats]))
 
 (def cities
@@ -58,11 +57,6 @@
 (defonce data
   (mapv row-fn (range 10000)))
 
-^{:nextjournal.clerk/visibility {:result :show}}
-@viewer/!sync-state
-
-#_(reset! viewer/!sync-state {:active-filters {}})
-
 ^{:nextjournal.clerk/visibility {:result :show}}
 (clerk/with-viewer clerk-table-stats/viewer
   {::clerk/render-opts {:filters {[:location :country] :multiselect

src/nextjournal/clerk_table_stats.cljc

@@ -493,7 +493,18 @@
   (assoc viewer/table-viewer
          :transform-fn
          (fn transform-fn [{:as wrapped-value :nextjournal/keys [applied-viewer render-opts]}]
-           (let [table-state @(:!sync-state wrapped-value)]
+           (let [#?@(:clj [id (or (:id wrapped-value)
+                                  (symbol (str (ns-name *ns*)) (str (gensym))))
+                           var-name (symbol (namespace id) (str (name id) "-table"))])
+                 _ #?(:clj (when-not (resolve var-name)
+                             (when-some [ns' (find-ns (symbol (namespace var-name)))]
+                               (intern ns' (symbol (name var-name)) (doto (atom {:active-filters {}})
+                                                                      (add-watch ::recompute
+                                                                                 (fn [_ _ _ _]
+                                                                                   (nextjournal.clerk/recompute!)))))))
+                      :cljs nil)
+                 table-state #?(:clj @@(resolve var-name)
+                                :cljs nil)]
 
              (if-let [{:keys [head rows summary filter-data autocomplete-data state]}
                       (normalize-table-data (merge render-opts table-state)
@@ -502,6 +513,9 @@
                    (assoc :nextjournal/viewer table-markup-viewer)
                    (update :nextjournal/width #(or % :wide))
                    (update :nextjournal/render-opts merge {:num-cols (count (or head (first rows)))
+                                                           #?@(:clj [:sync-var (viewer/->viewer-eval
+                                                                                (list 'nextjournal.clerk.render/intern-atom!
+                                                                                      (list 'quote var-name) table-state))])
                                                            :number-col? (into #{}
                                                                               (comp (map-indexed vector)
                                                                                     (keep #(when (number? (second %)) (first %))))

src/nextjournal/clerk_table_stats/render.cljs

@@ -834,10 +834,10 @@
                 label])]])
           js/document.body))])))
 
-(defn table-markup-viewer [head+body {:as opts :keys [!sync-state]}]
-  (r/with-let [table-state (if !sync-state
-                             !sync-state
-                             #?(:clj (throw (js/Error. (str "no sync var: " !sync-state)))
+(defn table-markup-viewer [head+body {:as opts :keys [sync-var]}]
+  (r/with-let [table-state (if sync-var
+                             (deref sync-var)
+                             #?(:clj (throw (js/Error. (str "no sync var: " sync-var)))
                                 :cljs nil))]
     [:div
      [table-search head+body table-state opts]