Merge branch 'main' into staging

CHANGES.md

@@ -93,6 +93,16 @@
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
 
+## 1.12.4-beta
+
+### :bug: Bugs fixed
+
+- Fix crash on iOS when displaying viewer [#1522](https://github.com/penpot/penpot/issues/1522)
+- Fix problems with trackpad zoom and scroll in MacOS [#1161](https://github.com/penpot/penpot/issues/1161)
+- Fix problem with copy/paste in Safari [#1209](https://github.com/penpot/penpot/issues/1209)
+- Improved command support for MacOS [Taiga #2789](https://tree.taiga.io/project/penpot/issue/2789)
+- Fix shift+2 shortcut in MacOS with non-english keyboards [Taiga #3038](https://tree.taiga.io/project/penpot/issue/3038)
+
 ## 1.12.3-beta
 
 ### :bug: Bugs fixed

common/src/app/common/data.cljc

@@ -678,6 +678,7 @@
                    (recur acc (step k))
                    acc)))
              acc))))))
+
 (defn toggle-selection
   ([set value]
    (toggle-selection set value false))

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

@@ -1740,7 +1740,6 @@
 (dm/export dws/shift-select-shapes)
 
 ;; Groups
-
 (dm/export dwg/mask-group)
 (dm/export dwg/unmask-group)
 (dm/export dwg/group-selected)
@@ -1772,4 +1771,3 @@
 
 ;; Thumbnails
 (dm/export dwth/update-thumbnail)
-

frontend/src/app/main/data/workspace/svg_upload.cljs

@@ -441,15 +441,14 @@
       ;; all shapes.
       (->> (rx/from (usvg/collect-images svg-data))
            (rx/map (fn [uri]
-                     (d/merge
+                     (merge
                       {:file-id file-id
-                       :is-local true
-                       :url uri}
-
+                       :is-local true}
                       (if (str/starts-with? uri "data:")
                         {:name "image"
                          :content (uu/data-uri->blob uri)}
-                        {:name (uu/uri-name uri)}))))
+                        {:name (uu/uri-name uri)
+                         :url uri}))))
            (rx/mapcat (fn [uri-data]
                         (->> (rp/mutation! (if (contains? uri-data :content)
                                              :upload-file-media-object

frontend/src/app/main/data/workspace/transforms.cljs

@@ -632,6 +632,7 @@
                       ;; Otherwise just plain old move
                       (rx/of (start-move initial selected))))))
                 (rx/take-until stopper))))))))
+
 (defn- start-move-duplicate
   [from-position]
   (ptk/reify ::start-move-duplicate