Clear skip cells covered by a skip label when the label is cleared

nilenso · Feb 19, 2024 · 9d90417 · 9d90417
1 parent e295248
commit 9d90417
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/src/bean/tables.cljs b/src/bean/tables.cljs
@@ -30,12 +30,6 @@
     (assoc-in sheet [:tables table-name :labels rc] {:dirn dirn :color color})
     sheet))
 
-(defn mark-skipped [sheet table-name addresses]
-  (update-in sheet [:tables table-name :skip-cells] #(apply conj % (set addresses))))
-
-(defn unmark-skipped [sheet table-name addresses]
-  (update-in sheet [:tables table-name :skip-cells] #(apply disj % (set addresses))))
-
 (defn add-labels [sheet table-name addresses dirn]
   (reduce #(add-label %1 table-name %2 dirn (util/random-color-hex)) sheet addresses))
 
@@ -103,27 +97,36 @@
 (defn label->cells [sheet table-name label]
   (let [{:keys [end] :as table} (get-table sheet table-name)
         [table-end-r table-end-c] end
-        labels (:labels table)
-        {:keys [dirn]} (get labels label)]
-    (as->
-     (area/area->addresses
-      {:start label
-       :end (let [[br bc] (blocking-label sheet table-name label)]
-              (case dirn
-                :top [(if br (dec br) table-end-r)
-                      (min (last-col label sheet) table-end-c)]
-                :left [(min (last-row label sheet) table-end-r)
-                       (if bc (dec bc) table-end-c)]))}) cells
-      (apply disj cells (filter #(get labels %) cells))
-      (apply disj cells
-             (get-in (util/get-cell (:grid sheet) label)
-                     [:style :merged-addresses])))))
+        labels (:labels table)]
+    (when-let [{:keys [dirn]} (get labels label)]
+      (as->
+       (area/area->addresses
+        {:start label
+         :end (let [[br bc] (blocking-label sheet table-name label)]
+                (case dirn
+                  :top [(if br (dec br) table-end-r)
+                        (min (last-col label sheet) table-end-c)]
+                  :left [(min (last-row label sheet) table-end-r)
+                         (if bc (dec bc) table-end-c)]))}) cells
+        (apply disj cells (filter #(get labels %) cells))
+        (apply disj cells
+               (get-in (util/get-cell (:grid sheet) label)
+                       [:style :merged-addresses]))))))
+
+(defn mark-skipped [sheet table-name addresses]
+  (update-in sheet [:tables table-name :skip-cells] #(apply conj % (set addresses))))
+
+(defn unmark-skipped [sheet table-name addresses]
+  (let [addresses*
+        (set/union
+         (set addresses)
+         (set (mapcat #(label->cells sheet table-name %) addresses)))]
+    (update-in sheet [:tables table-name :skip-cells] #(apply disj % addresses*))))
 
 (defn skipped-cells [sheet table-name]
   (let [table (get-table sheet table-name)
         labels (:labels table)
         skip-labels (filter #(get-in table [:skip-cells %]) (keys labels))]
-    (->> (map #(label->cells sheet table-name %) skip-labels)
-         (mapcat identity)
-         set
-         (set/union (:skip-cells table)))))
+    (set/union
+     (set (mapcat #(label->cells sheet table-name %) skip-labels))
+     (:skip-cells table))))
diff --git a/src/bean/ui/events.cljs b/src/bean/ui/events.cljs
@@ -125,8 +125,8 @@
  ::remove-labels
  (fn remove-labels [db [_ table-name addresses]]
    (->  db
-        (update-in [:sheet] #(tables/remove-labels % table-name addresses))
-        (update-in [:sheet] #(tables/unmark-skipped % table-name addresses)))))
+        (update-in [:sheet] #(tables/unmark-skipped % table-name addresses))
+        (update-in [:sheet] #(tables/remove-labels % table-name addresses)))))
 
 (rf/reg-event-db
  ::mark-skip-cells