Merge pull request #3410 from penpot/eva-fix

🐛 Some frontend fixes

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

@@ -16,6 +16,7 @@
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.dropdown :refer [dropdown]]
+   [app.main.ui.components.forms :as fm]
    [app.main.ui.icons :as i]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
@@ -66,8 +67,7 @@
              (let [target (dom/get-target event)]
                (dom/select-text! target)
                ;; In webkit browsers the mouseup event will be called after the on-focus causing and unselect
-               (.addEventListener target "mouseup" dom/prevent-default #js {:once true})))))
-        ]
+               (.addEventListener target "mouseup" dom/prevent-default #js {:once true})))))]
 
 
 
@@ -129,7 +129,8 @@
          {:type "button"
           :value "Post"
           :on-click on-submit
-          :disabled (str/empty-or-nil? @content)}]
+          :disabled (or (fm/all-spaces? @content)
+                        (str/empty-or-nil? @content))}]
         [:input.btn-secondary
          {:type "button"
           :value "Cancel"
@@ -186,7 +187,8 @@
          {:on-click on-submit
           :type "button"
           :value "Post"
-          :disabled (str/empty-or-nil? content)}]
+          :disabled (or (fm/all-spaces? content)
+                        (str/empty-or-nil? content))}]
         [:input.btn-secondary
          {:on-click on-esc
           :type "button"
@@ -203,8 +205,7 @@
         on-submit*
         (mf/use-fn
          (mf/deps @content)
-         (fn [] (on-submit @content)))
-        ]
+         (fn [] (on-submit @content)))]
 
 
     [:div.reply-form.edit-form

frontend/src/app/main/ui/onboarding/questions.cljs

@@ -24,15 +24,15 @@
     [:div.step-number (str/ffmt "%/4" step)]]
 
    children
+   [:div.buttons
+    [:div.step-next
+     [:& fm/submit-button
+      {:label (if (< step 4) (tr "questions.next") (tr "questions.start"))
+       :class "step-next"}]]
 
-   [:div.step-next
-    [:& fm/submit-button
-     {:label (if (< step 4) (tr "questions.next") (tr "questions.start"))
-      :class "step-next"}]]
-
-   (when on-prev
-     [:div.step-prev
-      [:button {:on-click on-prev} (tr "questions.previous")]])])
+    (when on-prev
+      [:div.step-prev
+       [:button {:on-click on-prev} (tr "questions.previous")]])]])
 
 (s/def ::questions-form-step-1
   (s/keys :req-un [::planning]))

frontend/src/app/main/ui/viewer/inspect/exports.cljs

@@ -13,6 +13,7 @@
    [app.main.ui.icons :as i]
    [app.util.dom :as dom]
    [app.util.i18n :refer [tr c]]
+   [app.util.keyboard :as kbd]
    [rumext.v2 :as mf]))
 
 (mf/defc exports
@@ -30,6 +31,11 @@
                           (str suffix)))
                       (:name page))
 
+        scale-enabled?
+        (mf/use-callback
+         (fn [export]
+           (#{:png :jpeg} (:type export))))
+
         in-progress? (:in-progress xstate)
 
         on-download
@@ -97,7 +103,13 @@
            (let [target  (dom/get-target event)
                  value   (dom/get-value target)
                  value   (keyword value)]
-             (swap! exports assoc-in [index :type] value))))]
+             (swap! exports assoc-in [index :type] value))))
+        manage-key-down
+        (mf/use-callback
+         (fn [event]
+           (let [esc?   (kbd/esc? event)]
+             (when esc?
+               (dom/blur! (dom/get-target event))))))]
 
     (mf/use-effect
      (mf/deps shapes)
@@ -117,24 +129,27 @@
         (for [[index export] (d/enumerate @exports)]
           [:div.element-set-options-group
            {:key index}
-           [:select.input-select {:on-change (partial on-scale-change index)
-                                  :value (:scale export)}
-            [:option {:value "0.5"}  "0.5x"]
-            [:option {:value "0.75"} "0.75x"]
-            [:option {:value "1"} "1x"]
-            [:option {:value "1.5"} "1.5x"]
-            [:option {:value "2"} "2x"]
-            [:option {:value "4"} "4x"]
-            [:option {:value "6"} "6x"]]
+           (when (scale-enabled? export)
+             [:select.input-select {:on-change (partial on-scale-change index)
+                                    :value (:scale export)}
+              [:option {:value "0.5"}  "0.5x"]
+              [:option {:value "0.75"} "0.75x"]
+              [:option {:value "1"} "1x"]
+              [:option {:value "1.5"} "1.5x"]
+              [:option {:value "2"} "2x"]
+              [:option {:value "4"} "4x"]
+              [:option {:value "6"} "6x"]])
 
-           [:input.input-text {:on-change (partial on-suffix-change index)
-                               :value (:suffix export)}]
-           [:select.input-select {:on-change (partial on-type-change index)
-                                  :value (d/name (:type export))}
+           [:input.input-text {:value (:suffix export)
+                               :placeholder (tr "workspace.options.export.suffix")
+                               :on-change (partial on-suffix-change index)
+                               :on-key-down manage-key-down}]
+           [:select.input-select {:value (d/name (:type export))
+                                  :on-change (partial on-type-change index)}
             [:option {:value "png"} "PNG"]
             [:option {:value "jpeg"} "JPEG"]
-            [:option {:value "svg"} "SVG"]]
-
+            [:option {:value "svg"} "SVG"]
+            [:option {:value "pdf"} "PDF"]]
            [:div.delete-icon {:on-click (partial delete-export index)}
             i/minus]])
 

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

@@ -1879,6 +1879,7 @@
         (mf/use-fn
          (mf/deps file-id)
          (fn [_]
+           (st/emit! (dw/set-assets-section-open file-id :typographies true))
            (st/emit! (dwt/add-typography file-id))))
 
         handle-change

frontend/src/app/main/ui/workspace/sidebar/options/menus/exports.cljs

@@ -125,7 +125,7 @@
            (st/emit! (dch/update-shapes ids
                                         (fn [shape]
                                           (assoc shape :exports []))))))
-        manage-key-down 
+        manage-key-down
         (mf/use-callback
          (fn [event]
            (let [esc?   (kbd/esc? event)]
@@ -165,7 +165,7 @@
                                :placeholder (tr "workspace.options.export.suffix")
                                :on-change (partial on-suffix-change index)
                                :on-key-down manage-key-down}]
-           [:select.input-select {:value (name (:type export))
+           [:select.input-select {:value (d/name (:type export))
                                   :on-change (partial on-type-change index)}
             [:option {:value "png"} "PNG"]
             [:option {:value "jpeg"} "JPEG"]