0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-23 07:16:07 -05:00

🐛 Fix exports menu on viewer mode

This commit is contained in:
Eva 2023-07-12 13:04:52 +02:00
parent ee73384993
commit 13b1762873
3 changed files with 34 additions and 18 deletions

View file

@ -77,6 +77,7 @@
- Fix rotate several elements in bulk [Taiga #5165](https://tree.taiga.io/project/penpot/issue/5165) - Fix rotate several elements in bulk [Taiga #5165](https://tree.taiga.io/project/penpot/issue/5165)
- Fix onboarding slides height [Taiga #5373](https://tree.taiga.io/project/penpot/issue/5373) - Fix onboarding slides height [Taiga #5373](https://tree.taiga.io/project/penpot/issue/5373)
- Fix create typography with section closed [Taiga #5574](https://tree.taiga.io/project/penpot/issue/5574) - Fix create typography with section closed [Taiga #5574](https://tree.taiga.io/project/penpot/issue/5574)
- Fix exports menu on viewer mode [Taiga #5568](https://tree.taiga.io/project/penpot/issue/5568)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

View file

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

View file

@ -165,7 +165,7 @@
:placeholder (tr "workspace.options.export.suffix") :placeholder (tr "workspace.options.export.suffix")
:on-change (partial on-suffix-change index) :on-change (partial on-suffix-change index)
:on-key-down manage-key-down}] :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)} :on-change (partial on-type-change index)}
[:option {:value "png"} "PNG"] [:option {:value "png"} "PNG"]
[:option {:value "jpeg"} "JPEG"] [:option {:value "jpeg"} "JPEG"]