From c84017eb72049165884514f5a46945cb37695d19 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 13 May 2022 07:58:02 +0200 Subject: [PATCH] :bug: Fix multiple fills with texts are not working properly --- frontend/src/app/main/data/workspace/texts.cljs | 11 ++++++----- frontend/src/app/main/ui/shapes/attrs.cljs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs index 0d46f915a4..b9545818fe 100644 --- a/frontend/src/app/main/data/workspace/texts.cljs +++ b/frontend/src/app/main/data/workspace/texts.cljs @@ -246,12 +246,13 @@ [node] (let [color-attrs (select-keys node [:fill-color :fill-opacity :fill-color-ref-id :fill-color-ref-file :fill-color-gradient])] (cond-> node - (d/not-empty? color-attrs) - (-> (dissoc :fill-color :fill-opacity :fill-color-ref-id :fill-color-ref-file :fill-color-gradient) - (assoc :fills [color-attrs])) - (nil? (:fills node)) - (assoc :fills (:fills txt/default-text-attrs))))) + (assoc :fills (:fills txt/default-text-attrs)) + + (and (d/not-empty? color-attrs) (nil? (:fills node))) + (-> (dissoc :fill-color :fill-opacity :fill-color-ref-id :fill-color-ref-file :fill-color-gradient) + (assoc :fills [color-attrs]))) + )) (defn migrate-content [content] diff --git a/frontend/src/app/main/ui/shapes/attrs.cljs b/frontend/src/app/main/ui/shapes/attrs.cljs index d39ba43f2e..9de6b4ffc2 100644 --- a/frontend/src/app/main/ui/shapes/attrs.cljs +++ b/frontend/src/app/main/ui/shapes/attrs.cljs @@ -66,7 +66,7 @@ (let [fill-image-id (str "fill-image-" render-id)] {:fill (str "url(#" fill-image-id ")")}) - (contains? shape :fill-color-gradient) + (and (contains? shape :fill-color-gradient) (some? (:fill-color-gradient shape))) (let [fill-color-gradient-id (str "fill-color-gradient_" render-id (if index (str "_" index) ""))] {:fill (str "url(#" fill-color-gradient-id ")")})