minor fixes

Author: sprocketc

src/renderer/app/effects.cljs

@@ -14,10 +14,9 @@
 (rf.storage/reg-co-fx! config/app-key {:cofx :store})
 
 (defn persist!
-  [data]
-  (rf.storage/->store config/app-key (-> data
-                                         (history.h/drop-rest)
-                                         (select-keys db/persistent-keys))))
+  [db]
+  (let [data (-> db history.h/drop-rest (select-keys db/persistent-keys))]
+    (rf.storage/->store config/app-key data)))
 
 (def persist
   "This is a modified version of akiroz.re-frame.storage/persist-db-keys
@@ -48,8 +47,8 @@
 
 (rf/reg-fx
  ::persist
- (fn [data]
-   (persist! data)))
+ (fn [db]
+   (persist! db)))
 
 (rf/reg-fx
  ::local-storage-clear

src/renderer/element/hierarchy.cljs

@@ -24,7 +24,7 @@
 (defmulti translate "Translates the element by a given offset." (fn [el _offset] (:tag el)))
 (defmulti scale "Scales the element by a given ratio and pivot-point." (fn [el _ration _pivot-point] (:tag el)))
 (defmulti edit "Edits the element by a given offset and handle." (fn [el _offset _handle] (:tag el)))
-(defmulti properties "Returns the properties of the element." keyword)
+(defmulti properties "Returns the properties of the element." identity)
 
 (defmethod render :default [])
 (defmethod render-to-string :default [element] [render element])

src/renderer/element/impl/shape/core.cljs

@@ -21,11 +21,8 @@
   [el]
   (let [{:keys [tag attrs title children content]} el
         child-elements @(rf/subscribe [::element.s/filter-visible children])
+        children (doall (map hierarchy/render-to-string child-elements))
         attrs (->> (element/style->map attrs)
                    (remove #(empty? (str (second %))))
                    (into {}))]
-    [tag
-     attrs
-     (when title [:title title])
-     content
-     (doall (map hierarchy/render-to-string child-elements))]))
+    [tag attrs (when title [:title title]) content children]))

src/renderer/handle/views.cljs

@@ -30,8 +30,7 @@
                     :cursor "default"
                     :on-pointer-up pointer-handler
                     :on-pointer-down pointer-handler
-                    :on-pointer-move pointer-handler
-                    :on-scroll pointer-handler}] children)))
+                    :on-pointer-move pointer-handler}] children)))
 
 (defn square
   [el & children]
@@ -53,8 +52,7 @@
                   :cursor (if (or active (not cursor)) "default" cursor)
                   :on-pointer-up pointer-handler
                   :on-pointer-down pointer-handler
-                  :on-pointer-move pointer-handler
-                  :on-scroll pointer-handler}] children)))
+                  :on-pointer-move pointer-handler}] children)))
 
 (defn scale
   [props]

src/renderer/utils/compatibility.cljs

@@ -6,7 +6,8 @@
 
 ;; https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
 (def ver-regex
-  #"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$")
+  #"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)
+    (?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$")
 
 (def Version
   [:tuple

src/renderer/utils/element.cljs

@@ -56,7 +56,8 @@
 (m/=> snapping-points [:-> Element SnapOptions [:* Vec2D]])
 (defn snapping-points
   [el options]
-  (let [points (or (element.hierarchy/snapping-points el) [])]
+  (let [points (or (when (contains? options :nodes)
+                     (element.hierarchy/snapping-points el)) [])]
     (cond-> points
       (:bounds el)
       (into (utils.bounds/->snapping-points (:bounds el) options)))))

src/renderer/utils/overlay.cljs

@@ -81,7 +81,7 @@
    (let [zoom @(rf/subscribe [::document.s/zoom])
          size (/ theme.db/handle-size zoom)
          mid (/ size Math/PI)]
-     [:g
+     [:g {:style {:pointer-events "none"}}
       [line
        (- x mid) (- y mid)
        (+ x mid) (+ y mid) false]