Bunch of fixes to think about in a bit

Null references
Override style on paste
Save to slot repl function.
Fix bug with pasting colors
Somewhat non-colliding label lines

src/bean/functions.cljs

@@ -40,7 +40,7 @@
   (remove #(every? nil? %) matrix))
 
 (defn minimum-matrix [matrix]
-  (if (not (first (first matrix)))
+  (if (zero? (count (first matrix)))
     [[nil]]
     matrix))
 
@@ -124,7 +124,13 @@
 
               new-selection
               (->> (util/map-on-matrix
-                    #(get first-match (:representation (util/get-cell (:grid sheet) %)))
+                    #(let [value (:representation (util/get-cell (:grid sheet) %))]
+                       (if (empty? value)
+                         ;;  Hack for null references cells (to make it work like a left join)
+                         ;;  return a null cell 
+                         ;;  but this breaks the renderer etc so we'll fix this later
+                         [79 15]
+                         (get first-match value)))
                     (:selection from-frame))
                    remove-nil-columns
                    remove-nil-rows)]
@@ -147,7 +153,11 @@
                                              (and (contains? (:skips frame-result) %)
                                                   (contains? (:skips label-cells) %))) %))
                                  remove-nil-columns
-                                 remove-nil-rows)]
+                                 remove-nil-rows
+                                ;;  Hack for null references cells
+                                ;;  these come from top left labels
+                                 (util/map-on-matrix
+                                  #(if-not % [79 15] %)))]
           {:matrix (address-matrix->cells-matrix sheet (minimum-matrix new-selection))
            :frame (merge frame-result {:selection new-selection})})
         (errors/label-not-found

src/bean/grid.cljs

@@ -307,7 +307,7 @@
           (let [existing-cell (util/get-cell (:grid sheet*) address)
                 new-cell (-> existing-cell
                              (assoc :content (:content attrs))
-                             (assoc :style (merge (:style existing-cell) (:style attrs))))
+                             (assoc :style (:style attrs)))
                 new-sheet (eval-cell address sheet* new-cell true)]
             (if (:merge-until attrs)
               (merge-cells new-sheet
@@ -387,7 +387,7 @@
 (defn clear-area [sheet {:keys [start end]}]
   (->> (util/addresses-matrix start end)
        (mapcat identity)
-       (map #(do [% {:content ""}]))
+       (map #(do [% {:content "" :style {}}]))
        (into {})
        (update-cells-bulk sheet start)))
 

src/bean/ui/db.cljs

@@ -55,7 +55,8 @@ average:{x.sum() / x.count()}"))
                 (assoc :grid-dimensions {:num-rows num-rows
                                          :num-cols num-cols
                                          :row-heights (vec (repeat num-rows (:cell-h styles/sizes)))
-                                         :col-widths (vec (repeat num-cols (:cell-w styles/sizes)))}))
+                                         :col-widths (vec (repeat num-cols (:cell-w styles/sizes)))})
+                (assoc :frames {}))
      :ui {:help-display false
           :grid {:editing-cell nil
                  :selection nil

src/bean/ui/events.cljs

@@ -10,7 +10,8 @@
             [bean.ui.util :as util]
             [day8.re-frame.undo :as undo :refer [undoable]]
             [re-frame.core :as rf]
-            [reagent.core :as rc]))
+            [reagent.core :as rc]
+            [bean.area :as area]))
 
 (rf/reg-event-db
  ::initialize-db
@@ -51,6 +52,13 @@
  (fn clear-area [db [_ area]]
    (update-in db [:sheet] #(grid/clear-area % area))))
 
+(rf/reg-event-fx
+ ::save-to-slot
+ ;;  for repl usage only
+ (fn set-demo [{:keys [db]} [_ frame-name]]
+   {:db (assoc-in db [:ui :current-demo-name] frame-name)
+    :fx [[:dispatch [::export-demos]]]}))
+
 (rf/reg-event-fx
  ::export-demos
  (fn [{:keys [db]} [_]]
@@ -254,12 +262,6 @@
  (fn [db [_]]
    (assoc-in db [:ui :grid :selection] nil)))
 
-(rf/reg-event-fx
- ::select-frame
- (fn select-frame [{:keys [db]} [_ frame-name]]
-   (let [{:keys [start]} (get-in db [:sheet :frames frame-name])]
-     (when start {:fx [[:dispatch [::edit-cell start]]]}))))
-
 (rf/reg-event-fx
  ::make-frame
  (undoable)
@@ -285,7 +287,6 @@
 
 (rf/reg-event-db
  ::highlight-matrix
- (undoable)
  (fn highlight-matrix [db [_ content]]
    (assoc-in db [:ui :grid :highlighted-cells]
              (set (mapcat identity (get-in

src/bean/ui/paste.cljs

@@ -70,7 +70,7 @@
                              [(when (get-in cell [:style :bold])
                                 "font-weight: bold")
                               (when-let [bg (get-in cell [:style :background])]
-                                (str "background: " (util/color-int->hex bg)))])}
+                                (str "background: " (.toString bg 16)))])}
         (when mc {:colspan (str (inc (- mc c)))})
         (when mr {:rowspan (str (inc (- mr r)))}))
        (:representation cell)])))

src/bean/ui/views/sheet.cljs

@@ -487,7 +487,9 @@
   (let [xs (reductions + 0 col-widths)
         ys (reductions + 0 row-heights)
         g (new pixi/Graphics)]
-    (let [skipped-cells (frames/skipped-cells sheet frame-name)]
+    (let [frame (get-in sheet [:frames frame-name])
+          skipped-cells (frames/skipped-cells sheet frame-name)
+          [fr fc] (:start frame)]
       (doseq [[[label-r label-c :as label] {:keys [color dirn]}] labels]
         (doseq [[r c] (frames/label->cells sheet frame-name label)]
           (if (get skipped-cells [r c])
@@ -496,11 +498,11 @@
           (case dirn
             :top (when (= c label-c)
                    (.drawRect g
-                              (+ (nth xs c) (* label-c 1.5)) (nth ys r)
+                              (+ (nth xs c) (* (- label-r fr) 2.5)) (nth ys r)
                               2 (nth row-heights r)))
             :left (when (= r label-r)
                     (.drawRect g
-                               (nth xs c) (+ (nth ys r) (* label-r 0.5))
+                               (nth xs c) (+ (nth ys r) (* (- label-c fc) 2.5))
                                (nth col-widths c) 2))
             :top-left nil))
         (.beginFill g color 0.25)