Merge branch 'main' into develop

CHANGES.md

@@ -24,6 +24,12 @@
 ### :boom: Breaking changes
 ### :heart: Community contributions by (Thank you!)
 
+## 1.6.5-alpha
+
+### :bug: Bugs fixed
+
+- Fix problem with paths editing after flip [#1040](https://github.com/penpot/penpot/issues/1040)
+
 ## 1.6.4-alpha
 
 ### :sparkles: Minor improvements

common/src/app/common/geom/matrix.cljc

@@ -159,7 +159,9 @@
 (defmethod pp/simple-dispatch Matrix [obj] (pr obj))
 
 (defn transform-in [pt mtx]
-  (-> (matrix)
+  (if (some? pt)
-      (translate pt)
+    (-> (matrix)
-      (multiply mtx)
+        (translate pt)
-      (translate (gpt/negate pt))))
+        (multiply mtx)
+        (translate (gpt/negate pt)))
+    mtx))

common/src/app/common/geom/shapes/transforms.cljc

@@ -298,21 +298,26 @@
 
                 :else
                 (-> shape
-                    (merge rect-shape)))]
+                    (merge rect-shape)))
+
+        base-rotation  (or (:rotation shape) 0)
+        modif-rotation (or (get-in shape [:modifiers :rotation]) 0)]
+
     (as-> shape $
       (update $ :transform #(gmt/multiply (or % (gmt/matrix)) matrix))
       (update $ :transform-inverse #(gmt/multiply matrix-inverse (or % (gmt/matrix))))
       (assoc  $ :points (into [] points))
       (assoc  $ :selrect (gpr/rect->selrect rect-shape))
-      (update $ :rotation #(mod (+ (or % 0)
+      (assoc  $ :rotation (mod (+ base-rotation modif-rotation) 360)))))
-                                   (or (get-in $ [:modifiers :rotation]) 0)) 360)))))
 
 (defn set-flip [shape modifiers]
   (let [rx (get-in modifiers [:resize-vector :x])
         ry (get-in modifiers [:resize-vector :y])]
     (cond-> shape
-      (and rx (< rx 0)) (update :flip-x not)
+      (and rx (< rx 0)) (-> (update :flip-x not)
-      (and ry (< ry 0)) (update :flip-y not))))
+                            (update :rotation -))
+      (and ry (< ry 0)) (-> (update :flip-y not)
+                            (update :rotation -)))))
 
 (defn apply-displacement [shape]
   (let [modifiers (:modifiers shape)]

docker/images/Dockerfile.backend

@@ -7,7 +7,18 @@ WORKDIR /root
 
 RUN set -ex; \
     apt-get -qq update; \
-    apt-get -qqy --no-install-recommends install curl tzdata locales ca-certificates imagemagick webp fontconfig; \
+    apt-get -qqy --no-install-recommends install \
+        curl \
+        tzdata \
+        locales \
+        ca-certificates \
+        imagemagick \
+        webp \
+        fontconfig \
+        woff-tools \
+        woff2 \
+        fontforge \
+    ; \
     echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
     locale-gen; \
     rm -rf /var/lib/apt/lists/*;

frontend/src/app/main/data/fonts.cljs

@@ -172,7 +172,7 @@
                     (uuid/next))]
     (update current-fonts id (fn [font]
                                (-> font
-                                   (assoc :name name)
+                                   (assoc :font-family name)
                                    (assoc :font-id font-id))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

frontend/src/app/main/data/workspace/path/helpers.cljs

@@ -26,12 +26,31 @@
       (= event :interrupt) ;; ESC
       (and (ms/mouse-double-click? event))))
 
+(defn content-center
+  [content]
+  (-> content
+      gsh/content->selrect
+      gsh/center-selrect))
+
 (defn content->points+selrect
   "Given the content of a shape, calculate its points and selrect"
   [shape content]
-  (let [transform (:transform shape (gmt/matrix))
+
-        transform-inverse (:transform-inverse shape (gmt/matrix))
+  (let [{:keys [flip-x flip-y]} shape
-        center (gsh/center-shape shape)
+        transform
+        (cond-> (:transform shape (gmt/matrix))
+          flip-x (gmt/scale (gpt/point -1 1))
+          flip-y (gmt/scale (gpt/point 1 -1)))
+
+        transform-inverse
+        (cond-> (gmt/matrix)
+          flip-x (gmt/scale (gpt/point -1 1))
+          flip-y (gmt/scale (gpt/point 1 -1))
+          :always (gmt/multiply (:transform-inverse shape (gmt/matrix))))
+
+        center (or (gsh/center-shape shape)
+                   (content-center content))
+
         base-content (gsh/transform-content
                       content
                       (gmt/transform-in center transform-inverse))
@@ -39,30 +58,22 @@
         ;; Calculates the new selrect with points given the old center
         points (-> (gsh/content->selrect base-content)
                    (gsh/rect->points)
-                   (gsh/transform-points center (:transform shape (gmt/matrix))))
+                   (gsh/transform-points center transform))
 
         points-center (gsh/center-points points)
 
         ;; Points is now the selrect but the center is different so we can create the selrect
         ;; through points
         selrect (-> points
-                    (gsh/transform-points points-center (:transform-inverse shape (gmt/matrix)))
+                    (gsh/transform-points points-center transform-inverse)
                     (gsh/points->selrect))]
     [points selrect]))
 
 (defn update-selrect
   "Updates the selrect and points for a path"
   [shape]
-  (if (= (:rotation shape 0) 0)
+  (let [[points selrect] (content->points+selrect shape (:content shape))]
-    (let [content (:content shape)
+    (assoc shape :points points :selrect selrect)))
-          selrect (gsh/content->selrect content)
-          points (gsh/rect->points selrect)]
-      (assoc shape :points points :selrect selrect))
-
-    (let [content (:content shape)
-          [points selrect] (content->points+selrect shape content)]
-      (assoc shape :points points :selrect selrect))))
-
 
 (defn closest-angle
   [angle]