github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-11 05:06:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic refactor on sidebar options ns.

Browse Source
This commit is contained in:
Andrey Antukh 2016-09-29 07:12:50 +02:00
parent a11b618d24
commit 95a72a3057
No known key found for this signature in database
GPG Key ID: 4DFEBCB8316A8B95
1 changed files with 50 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/uxbox/main/ui/workspace/sidebar/options.cljs
View File

@ -6,32 +6,31 @@
;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com> ;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com>
(ns uxbox.main.ui.workspace.sidebar.options (ns uxbox.main.ui.workspace.sidebar.options
(:require [sablono.core :as html :refer-macros [html]] (:require
[rum.core :as rum] [lentes.core :as l]
[lentes.core :as l] [uxbox.util.i18n :refer (tr)]
[uxbox.util.i18n :refer (tr)] [uxbox.util.router :as r]
[uxbox.util.router :as r] [uxbox.util.rstore :as rs]
[uxbox.util.rstore :as rs] [uxbox.main.state :as st]
[uxbox.main.state :as st] [uxbox.main.library :as library]
[uxbox.main.library :as library] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.shapes :as uds]
[uxbox.main.data.shapes :as uds] [uxbox.main.ui.workspace.base :as wb]
[uxbox.main.ui.workspace.base :as wb] [uxbox.main.ui.icons :as i]
[uxbox.main.ui.icons :as i] [uxbox.util.mixins :as mx :include-macros true]
[uxbox.util.mixins :as mx :include-macros true] [uxbox.main.ui.workspace.colorpicker :refer (colorpicker)]
[uxbox.main.ui.workspace.colorpicker :refer (colorpicker)] [uxbox.main.ui.workspace.recent-colors :refer (recent-colors)]
[uxbox.main.ui.workspace.recent-colors :refer (recent-colors)] [uxbox.main.ui.workspace.sidebar.options.icon-measures :as options-iconm]
[uxbox.main.ui.workspace.sidebar.options.icon-measures :as options-iconm] [uxbox.main.ui.workspace.sidebar.options.circle-measures :as options-circlem]
[uxbox.main.ui.workspace.sidebar.options.circle-measures :as options-circlem] [uxbox.main.ui.workspace.sidebar.options.rect-measures :as options-rectm]
[uxbox.main.ui.workspace.sidebar.options.rect-measures :as options-rectm] [uxbox.main.ui.workspace.sidebar.options.line-measures :as options-linem]
[uxbox.main.ui.workspace.sidebar.options.line-measures :as options-linem] [uxbox.main.ui.workspace.sidebar.options.fill :as options-fill]
[uxbox.main.ui.workspace.sidebar.options.fill :as options-fill] [uxbox.main.ui.workspace.sidebar.options.text :as options-text]
[uxbox.main.ui.workspace.sidebar.options.text :as options-text] [uxbox.main.ui.workspace.sidebar.options.stroke :as options-stroke]
[uxbox.main.ui.workspace.sidebar.options.stroke :as options-stroke] [uxbox.main.ui.workspace.sidebar.options.interactions :as options-interactions]
[uxbox.main.ui.workspace.sidebar.options.interactions :as options-interactions] [uxbox.main.geom :as geom]
[uxbox.main.geom :as geom] [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)]))
;; --- Constants ;; --- Constants
@ -83,29 +82,23 @@
;; --- Options ;; --- Options
(defn- options-render (mx/defcs options
{:mixins [mx/static (mx/local)]}
[own shape] [own shape]
(let [local (:rum/local own) (let [local (:rum/local own)
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 [:div
[:div [:ul.element-icons
[:ul.element-icons (for [menu-id (get +menus-map+ (:type shape))
(for [menu-id (get +menus-map+ (:type shape)) :let [menu (get +menus-by-id+ menu-id)
:let [menu (get +menus-by-id+ menu-id) selected? (= active-menu menu-id)]]
selected? (= active-menu menu-id)]] [:li#e-info {:on-click #(swap! local assoc :menu menu-id)
[:li#e-info {:on-click #(swap! local assoc :menu menu-id) :key (str "menu-" (:id menu))
:key (str "menu-" (:id menu)) :class (when selected? "selected")}
:class (when selected? "selected")} (:icon menu)])]
(:icon menu)])] (when-let [menu (get +menus-by-id+ active-menu)]
(when-let [menu (get +menus-by-id+ active-menu)] ((:comp menu) menu shape))]))
((:comp menu) menu shape))])))
(def ^:private options
(mx/component
{:render options-render
:name "options"
:mixins [mx/static (mx/local)]}))
(def selected-shape-ref (def selected-shape-ref
(letfn [(getter [state] (letfn [(getter [state]
@ -115,23 +108,18 @@
(-> (l/lens getter) (-> (l/lens getter)
(l/derive st/state)))) (l/derive st/state))))
(defn options-toolbox-render (mx/defc options-toolbox
[own] {:mixins [mx/static mx/reactive]}
[]
(let [shape (mx/react selected-shape-ref) (let [shape (mx/react selected-shape-ref)
close #(rs/emit! (udw/toggle-flag :element-options))] close #(rs/emit! (udw/toggle-flag :element-options))]
(html [:div.elementa-options.tool-window
[:div.elementa-options.tool-window [:div.tool-window-bar
[:div.tool-window-bar [:div.tool-window-icon i/options]
[:div.tool-window-icon i/options] [:span (tr "ds.element-options")]
[:span (tr "ds.element-options")] [:div.tool-window-close {:on-click close} i/close]]
[:div.tool-window-close {:on-click close} i/close]] [:div.tool-window-content
[:div.tool-window-content [:div.element-options
[:div.element-options (if shape
(if shape (options shape))]]]))
(options shape))]]])))
(def options-toolbox
(mx/component
{:render options-toolbox-render
:name "options-toolbox"
:mixins [mx/static mx/reactive (mx/local)]}))