Merge pull request #2093 from penpot/niwinz-minor-release-1.14.2

Prepare the 1.14.2 minor release
2025-04-06 20:11:29 -05:00 · 2022-07-14 07:26:58 +02:00 · 2022-07-14 07:26:58 +02:00 · a958aed058
commit a958aed058
parent 8446df2056 4bac2f15a2
9 changed files with 32 additions and 37 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -7,6 +7,8 @@
 - Fix colors from unlinked libs in color selected widget [Taiga #3712](https://tree.taiga.io/project/penpot/issue/3712)
 - Fix fill information not complete when paste plain text [Taiga #3680](https://tree.taiga.io/project/penpot/issue/3680)
 - Fix problem when resizing groups [Taiga #3702](https://tree.taiga.io/project/penpot/issue/3702)
+- Fix issues on typographies assets grouping [#2073](https://github.com/penpot/penpot/issues/2073)
+- Fix text positioning inconsistencies between browsers

 ## 1.14.1-beta

--- a/backend/deps.edn
+++ b/backend/deps.edn
@ -34,7 +34,8 @@
  buddy/buddy-sign {:mvn/version "3.4.333"}

  org.jsoup/jsoup {:mvn/version "1.14.3"}
-  org.im4java/im4java {:mvn/version "1.4.0"}
+  org.im4java/im4java {:git/tag "1.4.0-penpot-2" :git/sha "e2b3e16"
+                       :git/url "https://github.com/penpot/im4java"}
  org.lz4/lz4-java {:mvn/version "1.8.0"}

  org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@ -32,7 +32,7 @@
  [request]
  (or (some-> (yrq/get-header request "x-forwarded-for") (str/split ",") first)
      (yrq/get-header request "x-real-ip")
-      (yrq/remote-addr request)))
+      (some-> (yrq/remote-addr request) str)))

 (defn extract-utm-params
  "Extracts additional data from params and namespace them under
--- a/backend/test/app/services_media_test.clj
+++ b/backend/test/app/services_media_test.clj
@ -46,7 +46,8 @@
        (t/is (sto/storage-object? mobj1))
        (t/is (sto/storage-object? mobj2))
        (t/is (= 122785 (:size mobj1)))
-        (t/is (= 3303   (:size mobj2)))))
+        (t/is (or (= 3302 (:size mobj2))
+                  (= 3303 (:size mobj2))))))
    ))

 (t/deftest media-object-upload
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@ -233,10 +233,12 @@

 (defn- do-update-tipography
  [it state typography file-id]
-  (let [data    (get state :workspace-data)
-        changes (-> (pcb/empty-changes it)
-                    (pcb/with-library-data data)
-                    (pcb/update-typography typography))]
+  (let [data        (get state :workspace-data)
+        [path name] (cph/parse-path-name (:name typography))
+        typography  (assoc typography :path path :name name)
+        changes     (-> (pcb/empty-changes it)
+                        (pcb/with-library-data data)
+                        (pcb/update-typography typography))]
    (rx/of (dwu/start-undo-transaction)
           (dch/commit-changes changes)
           (sync-file (:current-file-id state) file-id)
@ -259,9 +261,9 @@
  (ptk/reify ::rename-typography
    ptk/WatchEvent
    (watch [it state _]
-      (let [data    (get state :workspace-data)
+      (let [data        (get state :workspace-data)
            [path name] (cph/parse-path-name new-name)
-            object  (get-in data [:typographies id])
+            object      (get-in data [:typographies id])
            new-object  (assoc object :path path :name name)]
        (do-update-tipography it state new-object file-id)))))

--- a/frontend/src/app/main/ui/shapes/text/svg_text.cljs
+++ b/frontend/src/app/main/ui/shapes/text/svg_text.cljs
@ -11,7 +11,6 @@
   [app.common.geom.matrix :as gmt]
   [app.common.geom.point :as gpt]
   [app.common.geom.shapes :as gsh]
-   [app.config :as cfg]
   [app.main.ui.context :as muc]
   [app.main.ui.shapes.attrs :as attrs]
   [app.main.ui.shapes.custom-stroke :refer [shape-custom-strokes]]
@ -87,18 +86,13 @@

     [:> :g group-props
      (for [[index data] (d/enumerate position-data)]
-        (let [y (if (cfg/check-browser? :safari)
-                  (- (:y data) (:height data))
-                  (:y data))
-
-              alignment-bl (when (cfg/check-browser? :safari) "text-before-edge")
-              dominant-bl (when-not (cfg/check-browser? :safari) "ideographic")
+        (let [y (- (:y data) (:height data))
+              dominant-bl "text-before-edge"
              rtl? (= "rtl" (:direction data))
              props (-> #js {:key (dm/str "text-" (:id shape) "-" index)
                             :x (if rtl? (+ (:x data) (:width data)) (:x data))
                             :y y
                             :transform (position-data-transform shape data)
-                             :alignmentBaseline alignment-bl
                             :dominantBaseline dominant-bl
                             :style (-> #js {:fontFamily (:font-family data)
                                             :fontSize (:font-size data)
--- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs
@ -1562,7 +1562,6 @@
         (fn [event]
           (on-drop-asset-group event dragging? prefix selected-typographies-paths selected-typographies-full move-typography)))]

-
    [:div {:on-drag-enter on-drag-enter
           :on-drag-leave on-drag-leave
           :on-drag-over on-drag-over
@ -1588,6 +1587,7 @@
             [:div.drop-space])
           (for [typography typographies]
             [:& typography-item {:typography typography
+                                  :key (dm/str (:id typography))
                                  :file file
                                  :local? local?
                                  :handle-change handle-change
@ -1605,6 +1605,7 @@
          (when-not (empty? path-item)
            [:& typographies-group {:file-id file-id
                                    :prefix (cph/merge-path-item prefix path-item)
+                                    :key (dm/str path-item)
                                    :groups content
                                    :open-groups open-groups
                                    :file file
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
@ -468,27 +468,21 @@
         (fn [event]
           (let [name (dom/get-target-val event)]
             (when-not (str/blank? name)
-               (on-change {:name name })))))]
+               (on-change {:name name})))))]

-    (mf/use-effect
-     (mf/deps editing?)
-     (fn []
-       (when editing?
-         (reset! open? editing?))))
+    (mf/with-effect [editing?]
+      (when editing?
+        (reset! open? editing?)))

-    (mf/use-effect
-     (mf/deps focus-name?)
-     (fn []
-       (when focus-name?
-         (tm/schedule
-          #(when-let [node (mf/ref-val name-input-ref)]
-             (dom/focus! node)
-             (dom/select-text! node))))))
+    (mf/with-effect [focus-name?]
+      (when focus-name?
+        (tm/schedule
+         #(when-let [node (mf/ref-val name-input-ref)]
+            (dom/focus! node)
+            (dom/select-text! node)))))

-    (mf/use-effect
-     (mf/deps on-change)
-     (fn []
-       (mf/set-ref-val! on-change-ref {:on-change on-change})))
+    (mf/with-effect [on-change]
+      (mf/set-ref-val! on-change-ref {:on-change on-change}))

    [:*
     [:div.element-set-options-group.typography-entry
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1.14.1-beta
+1.14.2-beta