From 9c00de047a950cd51965fc087010a1c59982e6cd Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Tue, 8 Mar 2022 09:49:38 +0100
Subject: [PATCH] :bug: Fix problem with booleans and new fills/strokes

---
 common/src/app/common/path/shapes_to_path.cljc | 7 ++++++-
 frontend/src/app/main/data/workspace/bool.cljs | 9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/src/app/common/path/shapes_to_path.cljc b/common/src/app/common/path/shapes_to_path.cljc
index 4cb03272b..4a297f7f0 100644
--- a/common/src/app/common/path/shapes_to_path.cljc
+++ b/common/src/app/common/path/shapes_to_path.cljc
@@ -6,6 +6,7 @@
 
 (ns app.common.path.shapes-to-path
   (:require
+   [app.common.colors :as clr]
    [app.common.data :as d]
    [app.common.geom.matrix :as gmt]
    [app.common.geom.point :as gpt]
@@ -38,6 +39,7 @@
          :fill-color-ref-file
          :fill-color-ref-id
          :fill-image
+         :fills
          :stroke-color
          :stroke-color-ref-file
          :stroke-color-ref-id
@@ -46,7 +48,10 @@
          :stroke-width
          :stroke-alignment
          :stroke-cap-start
-         :stroke-cap-end]))
+         :stroke-cap-end
+         :strokes]))
+
+(def default-bool-fills [{:fill-color clr/black}])
 
 (defn make-corner-arc
   "Creates a curvle corner for border radius"
diff --git a/frontend/src/app/main/data/workspace/bool.cljs b/frontend/src/app/main/data/workspace/bool.cljs
index e67346103..959f7bd5a 100644
--- a/frontend/src/app/main/data/workspace/bool.cljs
+++ b/frontend/src/app/main/data/workspace/bool.cljs
@@ -6,7 +6,6 @@
 
 (ns app.main.data.workspace.bool
   (:require
-   [app.common.colors :as clr]
    [app.common.data :as d]
    [app.common.geom.shapes :as gsh]
    [app.common.pages.changes-builder :as cb]
@@ -35,8 +34,8 @@
   (let [shapes (mapv #(stp/convert-to-path % objects) shapes)
         head (if (= bool-type :difference) (first shapes) (last shapes))
         head (cond-> head
-               (and (contains? head :svg-attrs) (nil? (:fill-color head)))
-               (assoc :fill-color clr/black))
+               (and (contains? head :svg-attrs) (empty? (:fills head)))
+               (assoc :fills stp/default-bool-fills))
 
         head-data (select-keys head stp/style-properties)
 
@@ -61,8 +60,8 @@
                     (mapv #(stp/convert-to-path % objects)))
         head (if (= bool-type :difference) (first shapes) (last shapes))
         head (cond-> head
-               (and (contains? head :svg-attrs) (nil? (:fill-color head)))
-               (assoc :fill-color clr/black))
+               (and (contains? head :svg-attrs) (empty? (:fills head)))
+               (assoc :fills stp/default-bool-fills))
         head-data (select-keys head stp/style-properties)]
 
     (-> group