Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-13 08:11:30 -05:00
Code Issues Activity

Simplified rendering of options toolbox.

Browse source
This commit is contained in:
Andrey Antukh 2016-02-27 18:21:20 +02:00
parent 3d8fb7f116
commit 016b43e1a5
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/uxbox/ui/workspace/sidebar/options.cljs
View file

@ -15,6 +15,7 @@
[uxbox.ui.colorpicker :refer (colorpicker)] [uxbox.ui.colorpicker :refer (colorpicker)]
[uxbox.ui.workspace.recent-colors :refer (recent-colors)] [uxbox.ui.workspace.recent-colors :refer (recent-colors)]
[uxbox.ui.workspace.base :as wb] [uxbox.ui.workspace.base :as wb]
[uxbox.util.lens :as ul]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.data :refer (parse-int parse-float read-string)])) [uxbox.util.data :refer (parse-int parse-float read-string)]))
@ -101,11 +102,11 @@
[:option {:value ":dashed"} "Dashed"] [:option {:value ":dashed"} "Dashed"]
[:option {:value ":mixed"} "Mixed"]] [:option {:value ":mixed"} "Mixed"]]
[:input.input-text [:input.input-text
{:placeholder "Width" {:placeholder "Width"
:type "number" :type "number"
:min "0" :min "0"
:value (:stroke-width shape "1") :value (:stroke-width shape "1")
:on-change on-width-change}]] :on-change on-width-change}]]
;; SLIDEBAR FOR ROTATION AND OPACITY ;; SLIDEBAR FOR ROTATION AND OPACITY
[:span "Color"] [:span "Color"]
@ -536,7 +537,6 @@
(defn options-menus-render (defn options-menus-render
[own shape] [own shape]
(let [local (:rum/local own) (let [local (:rum/local own)
shape (rum/react shape)
menus (get +menus-map+ (:type shape)) menus (get +menus-map+ (:type shape))
active-menu (:menu @local (first menus))] active-menu (:menu @local (first menus))]
(html (html
@ -558,16 +558,20 @@
(mx/component (mx/component
{:render options-menus-render {:render options-menus-render
:name "options-menus" :name "options-menus"
:mixins [mx/static rum/reactive (mx/local)]})) :mixins [mx/static (mx/local)]}))
(def ^:const selected-shape-l
(letfn [(getter [state]
(let [selected (get-in state [:workspace :selected])]
(when (= 1 (count selected))
(get-in state [:shapes-by-id (first selected)]))))]
(as-> (ul/getter getter) $
(l/focus-atom $ st/state))))
(defn options-toolbox-render (defn options-toolbox-render
[own] [own]
(let [workspace (rum/react wb/workspace-l) (let [shape (rum/react selected-shape-l)
close #(rs/emit! (dw/toggle-flag :element-options)) close #(rs/emit! (dw/toggle-flag :element-options))]
shape (when (and (:selected workspace)
(= (count (:selected workspace)) 1))
(let [shape-id (first (:selected workspace))]
(l/focus-atom (l/in [:shapes-by-id shape-id]) st/state)))]
(html (html
[:div.elementa-options.tool-window [:div.elementa-options.tool-window
[:div.tool-window-bar [:div.tool-window-bar