Merge remote-tracking branch 'origin/staging' into develop

CHANGES.md

@@ -11,6 +11,13 @@
 ### :arrow_up: Deps updates
 ### :heart: Community contributions by (Thank you!)
 
+## 1.14.1-beta
+
+### :bug: Bugs fixed
+
+- Fix crash when double click on viewer assets [Taiga #3625](https://tree.taiga.io/project/penpot/issue/3625)
+- Fix right click on typographies assets [Taiga #3638](https://tree.taiga.io/project/penpot/issue/3638)
+
 ## 1.14.0-beta
 
 ### :sparkles: New features
@@ -24,6 +31,7 @@
 - Navigate to the original link after log in [Taiga #3624](https://tree.taiga.io/project/penpot/issue/3624)
 
 ### :bug: Bugs fixed
+
 - Fix menu file not accessible in certain conditions [Taiga #3385](https://tree.taiga.io/project/penpot/issue/3385)
 - Remove deprecated menu options [Taiga #3333](https://tree.taiga.io/project/penpot/issue/3333)
 - Prototype connection should be under the rules [Taiga #3384](https://tree.taiga.io/project/penpot/issue/3384)

frontend/src/app/main/ui/releases.cljs

@@ -14,6 +14,7 @@
    [app.main.ui.releases.v1-11]
    [app.main.ui.releases.v1-12]
    [app.main.ui.releases.v1-13]
+   [app.main.ui.releases.v1-14]
    [app.main.ui.releases.v1-4]
    [app.main.ui.releases.v1-5]
    [app.main.ui.releases.v1-6]
@@ -83,4 +84,4 @@
 
 (defmethod rc/render-release-notes "0.0"
   [params]
-  (rc/render-release-notes (assoc params :version "1.13")))
+  (rc/render-release-notes (assoc params :version "1.14")))

frontend/src/app/main/ui/releases/v1_14.cljs

@@ -0,0 +1,108 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) UXBOX Labs SL
+
+(ns app.main.ui.releases.v1-14
+  (:require
+   [app.main.ui.releases.common :as c]
+   [rumext.alpha :as mf]))
+
+(defmethod c/render-release-notes "1.14"
+  [{:keys [slide klass next finish navigate version]}]
+  (mf/html
+   (case @slide
+     :start
+     [:div.modal-overlay
+      [:div.animated {:class @klass}
+       [:div.modal-container.onboarding.feature
+        [:div.modal-left
+         [:img {:src "images/login-on.jpg" :border "0" :alt "What's new Beta release 1.14"}]]
+        [:div.modal-right
+         [:div.modal-title
+          [:h2 "What's new?"]]
+         [:span.release "Beta version " version]
+         [:div.modal-content
+          [:p "Penpot continues to grow with new features that improve performance, user experience and visual design."]
+          [:p "We are happy to show you a sneak peak of the most important stuff that the Beta 1.14 version brings."]]
+         [:div.modal-navigation
+          [:button.btn-secondary {:on-click next} "Continue"]]]
+        [:img.deco {:src "images/deco-left.png" :border "0"}]
+        [:img.deco.right {:src "images/deco-right.png" :border "0"}]]]]
+
+     0
+     [:div.modal-overlay
+      [:div.animated {:class @klass}
+       [:div.modal-container.onboarding.feature
+        [:div.modal-left
+         [:img {:src "images/features/1.14-shortcuts.gif" :border "0" :alt "Shortcuts panel"}]]
+        [:div.modal-right
+         [:div.modal-title
+          [:h2 "Shortcuts panel"]]
+         [:div.modal-content
+          [:p "Shortcuts boost your productivity but are not easy to find and learn. A handy panel at your workspace will help you with that."]
+          [:p "Categories and filters will help you to find the shortcut you need. One of the most requested features by the community!"]]
+         [:div.modal-navigation
+          [:button.btn-secondary {:on-click next} "Continue"]
+          [:& c/navigation-bullets
+           {:slide @slide
+            :navigate navigate
+            :total 4}]]]]]]
+
+     1
+     [:div.modal-overlay
+      [:div.animated {:class @klass}
+       [:div.modal-container.onboarding.feature
+        [:div.modal-left
+         [:img {:src "images/features/1.14-color-group.gif" :border "0" :alt "Colors selection"}]]
+        [:div.modal-right
+         [:div.modal-title
+          [:h2 "Colors selection"]]
+         [:div.modal-content
+          [:p "All of the colors that are contained within a selection of objects are showcased at the sidebar."]
+          [:p "Play with the colors of a group without the hassles of individual selection!"]]
+         [:div.modal-navigation
+          [:button.btn-secondary {:on-click next} "Continue"]
+          [:& c/navigation-bullets
+           {:slide @slide
+            :navigate navigate
+            :total 4}]]]]]]
+
+     2
+     [:div.modal-overlay
+      [:div.animated {:class @klass}
+       [:div.modal-container.onboarding.feature
+        [:div.modal-left
+         [:img {:src "images/features/1.14-fix-on-scroll.gif" :border "0" :alt "Fix elements at scroll"}]]
+        [:div.modal-right
+         [:div.modal-title
+          [:h2 "Fix elements at scroll"]]
+         [:div.modal-content
+          [:p "A new option that allows you to fix the position of an object when scrolling at the presentation view."]
+          [:p "Ideal for prototyping fixed headers, navbars and floating buttons."]]
+         [:div.modal-navigation
+          [:button.btn-secondary {:on-click next} "Continue"]
+          [:& c/navigation-bullets
+           {:slide @slide
+            :navigate navigate
+            :total 4}]]]]]]
+
+     3
+     [:div.modal-overlay
+      [:div.animated {:class @klass}
+       [:div.modal-container.onboarding.feature
+        [:div.modal-left
+         [:img {:src "images/features/1.14-group-assets.gif" :border "0" :alt "Group library assets with drag & drop"}]]
+        [:div.modal-right
+         [:div.modal-title
+          [:h2 "Group library assets with drag & drop"]]
+         [:div.modal-content
+          [:p "We have improved the way to manage asset groups at libraries."]
+          [:p "Until now you could only do it by renaming the groups, now with drag & drop it is much more user friendly."]]
+         [:div.modal-navigation
+          [:button.btn-secondary {:on-click finish} "Start!"]
+          [:& c/navigation-bullets
+           {:slide @slide
+            :navigate navigate
+            :total 4}]]]]]])))

frontend/src/app/main/ui/viewer/handoff/left_sidebar.cljs

@@ -72,7 +72,7 @@
                                                      :icon-layer (= (:type item) :icon))
                               :on-click select-shape}
       [:& si/element-icon {:shape item}]
-      [:& layer-name {:shape item}]
+      [:& layer-name {:shape item :disabled-double-click true}]
 
       (when (and (not disable-collapse?) (:shapes item))
         [:span.toggle-content

frontend/src/app/main/ui/workspace/shapes/path.cljs

@@ -28,7 +28,13 @@
         content-modifiers (mf/deref content-modifiers-ref)
         editing-id (mf/deref refs/selected-edition)
         editing? (= editing-id (:id shape))
-        shape (mf/use-memo (mf/deps shape content-modifiers) #(apply-content-modifiers shape content-modifiers))]
+
+        shape
+        (mf/use-memo
+         (mf/deps shape content-modifiers)
+         #(cond-> shape
+            (some? content-modifiers)
+            (apply-content-modifiers content-modifiers)))]
 
     [:> shape-container {:shape shape
                          :pointer-events (when editing? "none")}

frontend/src/app/main/ui/workspace/sidebar/assets.cljs

@@ -1596,6 +1596,7 @@
                                   :editing-id editing-id
                                   :local-data local-data
                                   :on-asset-click on-asset-click
+                                  :on-context-menu on-context-menu
                                   :selected-typographies-full selected-typographies-full
                                   :selected-typographies-paths selected-typographies-paths
                                   :move-typography move-typography}])])

frontend/src/app/main/ui/workspace/sidebar/layers.cljs

@@ -32,13 +32,14 @@
   (l/derived (l/in [:workspace-local :shape-for-rename]) st/state))
 
 (mf/defc layer-name
-  [{:keys [shape on-start-edit on-stop-edit name-ref] :as props}]
+  [{:keys [shape on-start-edit  disabled-double-click on-stop-edit name-ref] :as props}]
   (let [local            (mf/use-state {})
         shape-for-rename (mf/deref shape-for-rename-ref)
 
         start-edit (fn []
-                     (on-start-edit)
-                     (swap! local assoc :edition true))
+                     (when (not disabled-double-click)
+                       (on-start-edit)
+                       (swap! local assoc :edition true)))
 
         accept-edit (fn []
                       (let [name-input (mf/ref-val name-ref)