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

CHANGES.md

@@ -42,6 +42,7 @@
 
 ### :bug: Bugs fixed
 
+- On dashboard enter on empty search refresh the page [Taiga #2597](https://tree.taiga.io/project/penpot/issue/2597)
 - Pencil cursor changes when activated [Taiga #2276](https://tree.taiga.io/project/penpot/issue/2276)
 - Fix icon placement in Mixed message [Taiga #3037](https://tree.taiga.io/project/penpot/issue/3037)
 - Fix scroll in comment section [Taiga #3068](https://tree.taiga.io/project/penpot/issue/3068)

frontend/resources/styles/main/partials/modal.scss

@@ -1420,7 +1420,7 @@
 
   .body {
     overflow-y: auto;
-    margin: 0.5rem 0.5rem 0.5rem 0;
+    margin: 0 0.5rem 0rem 0;
   }
 
   .field {
@@ -1438,6 +1438,7 @@
       display: flex;
       justify-content: center;
       height: 32px;
+      margin: 0 8px;
       width: 32px;
 
       svg {

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

@@ -28,7 +28,7 @@
          [:a {:href cf/terms-of-service-uri :target "_blank"} (tr "auth.terms-of-service")])
 
        (when show-all?
-         [:span (tr "auth.and")])
+         [:span (tr "labels.and")])
 
        (when show-privacy?
          [:a {:href cf/privacy-policy-uri :target "_blank"} (tr "auth.privacy-policy")])])))

frontend/src/app/main/ui/dashboard/sidebar.cljs

@@ -26,6 +26,7 @@
    [app.util.dom :as dom]
    [app.util.dom.dnd :as dnd]
    [app.util.i18n :as i18n :refer [tr]]
+   [app.util.keyboard :as kbd]
    [app.util.object :as obj]
    [app.util.router :as rt]
    [beicon.core :as rx]
@@ -169,7 +170,14 @@
            (let [search-input (dom/get-element "search-input")]
              (dom/clean-value! search-input)
              (dom/focus! search-input)
-             (emit! (dd/go-to-search)))))]
+             (emit! (dd/go-to-search)))))
+        
+        on-key-press
+        (mf/use-callback
+         (fn [e]
+           (when (kbd/enter? e)
+             (dom/prevent-default e)
+             (dom/stop-propagation e))))]
 
     [:form.sidebar-search
      [:input.input-text
@@ -182,6 +190,7 @@
        :on-focus on-search-focus
        :on-blur on-search-blur
        :on-change on-search-change
+       :on-key-press on-key-press
        :ref #(when % (set! (.-value %) search-term))}]
 
      (if (or @focused? (seq search-term))

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

@@ -74,8 +74,8 @@
            [:div.header
             [:div.field.check {:on-click change-all}
              (cond
-               all-checked? [:span i/checkbox-checked]
-               all-unchecked? [:span i/checkbox-unchecked]
+               all-checked? [:span.checked i/checkbox-checked]
+               all-unchecked? [:span.unchecked i/checkbox-unchecked]
                :else [:span i/checkbox-intermediate])]
             [:div.field.title (tr "dashboard.export-multiple.selected"
                                   (c (count enabled-exports))

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

@@ -374,7 +374,10 @@
 
         (cond-> (obj/merge! props fill-props)
           (some? style)
-          (obj/set! "style" style))))))
+          (obj/set! "style" style)))
+
+      :else
+      props)))
 
 (defn build-stroke-props [position child value render-id]
   (let [props (-> (obj/get child "props")

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

@@ -41,7 +41,8 @@
 
 (mf/defc root-shape
   "Draws the root shape of the viewport and recursively all the shapes"
-  {::mf/wrap-props false}
+  {::mf/wrap [mf/memo]
+   ::mf/wrap-props false}
   [props]
   (let [objects       (obj/get props "objects")
         active-frames (obj/get props "active-frames")

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

@@ -114,11 +114,10 @@
                (mf/deps all-children)
                (fn []
                  (->> all-children
-                      (filter #(= :text (:type %)))
+                      (filter #(and (= :text (:type %)) (not (:hidden %))))
                       (every? #(some? (:position-data %))))))
 
-              show-thumbnail?
-              (and thumbnail? (some? (:thumbnail shape)) all-svg-text?)]
+              show-thumbnail? (and thumbnail? (some? (:thumbnail shape)) all-svg-text?)]
 
           [:g.frame-wrapper {:display (when (:hidden shape) "none")}
            [:> shape-container {:shape shape}

frontend/src/app/main/ui/workspace/viewport/utils.cljs

@@ -7,11 +7,11 @@
 (ns app.main.ui.workspace.viewport.utils
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.geom.matrix :as gmt]
    [app.common.geom.point :as gpt]
    [app.main.ui.cursors :as cur]
-   [app.util.dom :as dom]
-   [cuerdas.core :as str]))
+   [app.util.dom :as dom]))
 
 (defn- text-corrected-transform
   "If we apply a scale directly to the texts it will show deformed so we need to create this
@@ -158,10 +158,10 @@
             (dom/remove-attribute node "transform")))))))
 
 (defn format-viewbox [vbox]
-  (str/join " " [(:x vbox 0)
-                 (:y vbox 0)
-                 (:width vbox 0)
-                 (:height vbox 0)]))
+  (dm/str (:x vbox 0) " "
+          (:y vbox 0) " "
+          (:width vbox 0) " "
+          (:height vbox 0)))
 
 (defn translate-point-to-viewport [viewport zoom pt]
   (let [vbox     (.. ^js viewport -viewBox -baseVal)

frontend/src/app/util/dom.cljs

@@ -412,6 +412,7 @@
     "image/webp"         "webp"
     "application/zip"    "zip"
     "application/penpot" "penpot"
+    "application/pdf"    "pdf"
     nil))
 
 (defn set-attribute [^js node ^string attr value]

frontend/translations/en.po

@@ -117,9 +117,6 @@ msgstr "Password"
 msgid "auth.password-length-hint"
 msgstr "At least 8 characters"
 
-msgid "auth.and"
-msgstr "and"
-
 msgid "auth.privacy-policy"
 msgstr "Privacy policy"
 
@@ -275,7 +272,7 @@ msgstr "%s de %s elements selected"
 
 #: src/app/main/ui/workspace/header.cljs
 msgid "dashboard.export-shapes"
-msgstr "Exportar"
+msgstr "Export"
 
 #: src/app/main/ui/export.cljs
 msgid "dashboard.export-shapes.how-to"
@@ -1022,6 +1019,9 @@ msgstr "Admin"
 msgid "labels.all"
 msgstr "All"
 
+msgid "labels.and"
+msgstr "and"
+
 #: src/app/main/ui/static.cljs
 msgid "labels.bad-gateway.desc-message"
 msgstr ""
@@ -3658,4 +3658,4 @@ msgid "workspace.updates.update"
 msgstr "Update"
 
 msgid "workspace.viewport.click-to-close-path"
-msgstr "Click to close the path"
+msgstr "Click to close the path"

frontend/translations/es.po

@@ -121,9 +121,6 @@ msgstr "Contraseña"
 msgid "auth.password-length-hint"
 msgstr "8 caracteres como mínimo"
 
-msgid "auth.and"
-msgstr "y"
-
 msgid "auth.privacy-policy"
 msgstr "Política de privacidad"
 
@@ -1023,6 +1020,9 @@ msgstr "Administración"
 msgid "labels.all"
 msgstr "Todo"
 
+msgid "labels.and"
+msgstr "y"
+
 #: src/app/main/ui/static.cljs
 msgid "labels.bad-gateway.desc-message"
 msgstr ""