fix image trace

Author: sprocketc

src/renderer/db.cljs

@@ -28,7 +28,7 @@
    [:backdrop? [boolean? {:default false}]]
    [:lang [keyword? {:default :en-US}]]
    [:repl-mode [keyword? {:default :cljs}]]
-   [:worker [:map {:default {:tasks #{}}} [:tasks set?]]]
+   [:worker [:map {:default {:tasks {}}} [:tasks map?]]]
    [:window window.db/window]
    [:theme theme.db/theme]
    [:timeline timeline.db/timeline]

src/renderer/element/effects.cljs

@@ -2,6 +2,7 @@
   (:require
    [promesa.core :as p]
    [re-frame.core :as rf]
+   [renderer.element.events :as-alias element.e]
    [renderer.utils.file :as file]
    [renderer.utils.units :as units]
    [renderer.worker.events :as-alias worker.e]))
@@ -40,6 +41,6 @@
                                           :position [x y]}
                                    :callback (fn [e]
                                                (let [data (js->clj (.. e -data) :keywordize-keys true)]
-                                                 (rf/dispatch [::import-traced-image data])
+                                                 (rf/dispatch [::element.e/import-traced-image data])
                                                  (rf/dispatch [::worker.e/completed (keyword (:id data))])))}]))))
        (set! (.-src image) data-url)))))

src/renderer/element/events.cljs

@@ -274,12 +274,12 @@
        (h/import-svg data)
        (history.h/finalize "Import svg"))))
 
-#_(rf/reg-event-db
-   ::import-traced-image
-   (fn [db [_ data]]
-     (-> db
-         (h/import-svg data)
-         (history.h/finalize "Trace image"))))
+(rf/reg-event-db
+ ::import-traced-image
+ (fn [db [_ data]]
+   (-> db
+       (h/import-svg data)
+       (history.h/finalize "Trace image"))))
 
 (rf/reg-event-db
  ::animate

src/renderer/element/handlers.cljs

@@ -509,14 +509,16 @@
     (let [key (uuid/generate)
           page (overlapping-svg db (tool/bounds el))
           parent (when-not (element/root? el)
-                  (or (:parent el)
-                      (if (element/svg? el) (:key (root db)) (:key page))))
+                   (or (:parent el)
+                       (if (element/svg? el) (:key (root db)) (:key page))))
           children (vals (select-keys (elements db) (:children el)))
           [x1 y1] (tool/bounds (element db parent))
           children (concat children (:content el))
           defaults (m/decode db/element {} mt/default-value-transformer)
           new-el (merge el defaults {:key key})
-          new-el (cond-> new-el parent (assoc :parent parent))
+          new-el (cond-> new-el
+                   parent (assoc :parent parent)
+                   (not (string? (:content new-el))) (dissoc :content))
           add-children (fn [db children]
                          (reduce #(cond-> %1
                                     (element/supported? %2)