Pass entire sheet around instead of piecemeal

nilenso · Feb 12, 2024 · 6ccd26b · 6ccd26b
1 parent a1d9d33
commit 6ccd26b
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/bean/ui/views/sheet.cljs b/src/bean/ui/views/sheet.cljs
@@ -317,7 +317,7 @@
 (defn- draw-merged-cells
   ([]
    (let [g (new pixi/Graphics)] g))
-  ([^js g grid row-heights col-widths]
+  ([^js g {:keys [grid]} row-heights col-widths]
    (.clear g)
    (util/map-on-matrix-addressed
     (fn [rc cell]
@@ -354,7 +354,7 @@
 
 (defn- draw-tables
   ([] (new pixi/Graphics))
-  ([^js g tables selected-table row-heights col-widths]
+  ([^js g {:keys [tables]} selected-table row-heights col-widths]
    (-> g (.clear) (.removeChildren))
    (doseq [[table-name area] tables]
      (let [[x y w h] (area->xywh area row-heights col-widths)
@@ -386,7 +386,7 @@
         (set! (.. g -position -y) (:cell-h styles/sizes))
         (set! (.-interactiveChildren g) false)
         g))
-  ([^js g grid row-heights col-widths]
+  ([^js g {:keys [grid]} row-heights col-widths]
    (.clear g)
    (let [xs (reductions + 0 col-widths)
          ys (reductions + 0 row-heights)]
@@ -479,7 +479,7 @@
 
 (defn- draw-cell-text
   ([] (new pixi/Graphics))
-  ([^js g grid row-heights col-widths]
+  ([^js g {:keys [grid]} row-heights col-widths]
    (.removeChildren g)
    (let [xs (reductions + 0 col-widths)
          ys (reductions + 0 row-heights)]
@@ -506,7 +506,7 @@
      (set! (.. g -position -x) (:heading-left-width styles/sizes))
      (set! (.. g -position -y) (:cell-h styles/sizes))
      g))
-  ([g grid tables row-heights col-widths pixi-app]
+  ([g {:keys [grid tables]} row-heights col-widths pixi-app]
    (letfn [(grid-line*
              [sx sy ex ey]
              (grid-line g sx sy ex ey))
@@ -561,16 +561,15 @@
       (.then (.loadBundle pixi/Assets "fonts") cb))
     (cb)))
 
-(defn repaint [sheet {:keys [grid]} pixi-app]
+(defn repaint [sheet {grid-ui :grid} pixi-app]
   (let [{:keys [row-heights col-widths]} (:grid-dimensions sheet)
-        {:keys [selection selected-table]} grid
         v (:viewport @pixi-app)]
-    (draw-grid (:grid @pixi-app) (:grid sheet) (:tables sheet) row-heights col-widths pixi-app)
-    (draw-merged-cells (:merged-cells @pixi-app) (:grid sheet) row-heights col-widths)
-    (draw-cell-backgrounds (:cell-backgrounds @pixi-app) (:grid sheet) row-heights col-widths)
-    (draw-cell-text (:cell-text @pixi-app) (:grid sheet) row-heights col-widths)
-    (draw-tables (:tables @pixi-app) (:tables sheet) selected-table row-heights col-widths)
-    (draw-selection (:selection @pixi-app) selection row-heights col-widths)
+    (draw-grid (:grid @pixi-app) sheet row-heights col-widths pixi-app)
+    (draw-merged-cells (:merged-cells @pixi-app) sheet row-heights col-widths)
+    (draw-cell-backgrounds (:cell-backgrounds @pixi-app) sheet row-heights col-widths)
+    (draw-cell-text (:cell-text @pixi-app) sheet row-heights col-widths)
+    (draw-tables (:tables @pixi-app) sheet (:selected-table grid-ui) row-heights col-widths)
+    (draw-selection (:selection @pixi-app) (:selection grid-ui) row-heights col-widths)
     (draw-top-heading (:top-heading @pixi-app) col-widths v)
     (draw-left-heading (:left-heading @pixi-app) row-heights v)
     (draw-corner (:corner @pixi-app) v)))