Merge pull request #4111 from penpot/alotor-bugfix-16

Alotor bugfix 16

common/src/app/common/types/modifiers.cljc

@@ -777,14 +777,19 @@
 
                 :add-children
                 (let [value (dm/get-prop operation :value)
-                      index (dm/get-prop operation :index)]
+                      index (dm/get-prop operation :index)
-                  (if (some? index)
+
-                    (update shape :shapes
+                      shape
-                            (fn [shapes]
+                      (if (some? index)
-                              (if (vector? shapes)
+                        (update shape :shapes
-                                (d/insert-at-index shapes index value)
+                                (fn [shapes]
-                                (d/concat-vec shapes value))))
+                                  (if (vector? shapes)
-                    (update shape :shapes d/concat-vec value)))
+                                    (d/insert-at-index shapes index value)
+                                    (d/concat-vec shapes value))))
+                        (update shape :shapes d/concat-vec value))]
+
+                  ;; Remove duplication
+                  (update shape :shapes #(into [] (apply d/ordered-set %))))
 
                 :remove-children
                 (let [value (dm/get-prop operation :value)]

frontend/src/app/main/ui/components/numeric_input.cljs

@@ -191,15 +191,15 @@
         (mf/use-fn
          (mf/deps parse-value apply-value update-input on-blur)
          (fn [event]
-           (let [new-value (or @last-value* default)]
+           (when (mf/ref-val dirty-ref)
-             (if (or nillable? new-value)
+             (let [new-value (or @last-value* default)]
-               (apply-value event new-value)
+               (if (or nillable? new-value)
-               (update-input new-value)))
+                 (apply-value event new-value)
-           (when (fn? on-blur)
+                 (update-input new-value)))
-             (on-blur event))))
+             (when (fn? on-blur)
+               (on-blur event)))))
 
-        handle-unmount
+        handle-unmount (h/use-ref-callback handle-blur)
-        (h/use-ref-callback handle-blur)
 
         on-click
         (mf/use-fn
@@ -240,10 +240,7 @@
       (when-let [input-node (mf/ref-val ref)]
         (dom/set-value! input-node (fmt/format-number value))))
 
-    (mf/with-effect []
+    (mf/with-effect [handle-unmount] handle-unmount)
-      (fn []
-        (when (mf/ref-val dirty-ref)
-          (handle-unmount))))
 
     (mf/with-layout-effect []
       (let [keys [(events/listen globals/window "pointerdown" on-click)

frontend/src/app/main/ui/shapes/attrs.cljs

@@ -90,7 +90,7 @@
     attrs))
 
 (defn add-stroke!
-  [attrs data render-id index]
+  [attrs data render-id index open-path?]
   (let [style (:stroke-style data :solid)]
     (when-not (= style :none)
       (let [width       (:stroke-width data 1)
@@ -122,16 +122,18 @@
           (cond
             (and (contains? stroke-caps-line caps-start)
                  (= caps-start caps-end)
-                 (not= :inner alignment)
+                 (or open-path?
-                 (not= :outer alignment)
+                     (and (not= :inner alignment)
+                          (not= :outer alignment)))
                  (not= :dotted style))
             (obj/set! attrs "strokeLinecap" (name caps-start))
 
             (= :dotted style)
             (obj/set! attrs "strokeLinecap" "round"))
 
-          (when (and (not= :inner alignment)
+          (when (or open-path?
-                     (not= :outer alignment))
+                    (and (not= :inner alignment)
+                         (not= :outer alignment)))
 
             ;; For other cap types we use markers.
             (when (or (contains? stroke-caps-marker caps-start)

frontend/src/app/main/ui/shapes/custom_stroke.cljs

@@ -420,7 +420,7 @@
     (mf/html [:> type props])))
 
 (defn- build-stroke-element
-  [child value position render-id]
+  [child value position render-id open-path?]
   (let [props (obj/get child "props")
         type  (obj/get child "type")
 
@@ -428,7 +428,7 @@
                   (obj/clone)
                   (obj/set! "fill" "none")
                   (obj/set! "fillOpacity" "none")
-                  (attrs/add-stroke! value render-id position))
+                  (attrs/add-stroke! value render-id position open-path?))
 
         style (if (:stroke-image value)
                 (obj/set! style "stroke" (dm/fmt "url(#stroke-fill-%-%)" render-id position))
@@ -484,9 +484,10 @@
         props        (mf/spread-props svg-attrs
                                       {:id stroke-id
                                        :className "strokes"
-                                       :style style})]
+                                       :style style})
-
 
+        open-path?    (and ^boolean (cfh/path-shape? shape)
+                           ^boolean (gsh/open-path? shape))]
     (when-not ^boolean (cfh/frame-shape? shape)
       (when (and (some? shape-blur)
                  (not ^boolean (:hidden shape-blur)))
@@ -503,7 +504,7 @@
                                   :stroke value
                                   :index index
                                   :key (dm/str index "-" stroke-id)}
-          (build-stroke-element child value index render-id)])])))
+          (build-stroke-element child value index render-id open-path?)])])))
 
 (mf/defc shape-custom-strokes
   {::mf/wrap-props false}

frontend/src/app/main/ui/workspace/sidebar/options/menus/shadow.cljs

@@ -112,7 +112,7 @@
          (fn [color]
            (st/emit! (dch/update-shapes
                       ids
-                      #(assoc-in % [:shadow index :color] color)))))
+                      #(assoc-in % [:shadow index :color] (d/without-nils color))))))
 
         detach-color
         (mf/use-fn