3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-21 20:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Minor refactor on multiple selection handlers component.

Browse source
This commit is contained in:
Andrey Antukh 2016-04-06 22:18:35 +03:00
parent 8f3c049536
commit 3424c768ab
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/uxbox/ui/workspace/canvas.cljs
View file

@ -27,7 +27,7 @@
[uxbox.ui.workspace.movement :as cmov] [uxbox.ui.workspace.movement :as cmov]
[uxbox.ui.workspace.resize :as cres] [uxbox.ui.workspace.resize :as cres]
[uxbox.ui.workspace.ruler :refer (ruler)] [uxbox.ui.workspace.ruler :refer (ruler)]
[uxbox.ui.workspace.canvas.selection :refer (shapes-selection)] [uxbox.ui.workspace.selection :refer (selection-handlers)]
[uxbox.ui.workspace.selrect :refer (selrect)] [uxbox.ui.workspace.selrect :refer (selrect)]
[uxbox.ui.workspace.grid :refer (grid)]) [uxbox.ui.workspace.grid :refer (grid)])
(:import goog.events.EventType)) (:import goog.events.EventType))
@ -64,7 +64,7 @@
:height height} :height height}
(background) (background)
[:svg.page-layout {} [:svg.page-layout {}
(shapes-selection) (selection-handlers)
[:g.main {} [:g.main {}
(for [item (reverse (:shapes page))] (for [item (reverse (:shapes page))]
(-> (uus/shape item) (-> (uus/shape item)

23
src/uxbox/ui/workspace/canvas/selection.cljs → src/uxbox/ui/workspace/selection.cljs
View file

@ -5,24 +5,27 @@
;; Copyright (c) 2015-2016 Andrey Antukh <niwi@niwi.nz> ;; Copyright (c) 2015-2016 Andrey Antukh <niwi@niwi.nz>
;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com> ;; Copyright (c) 2015-2016 Juan de la Cruz <delacruzgarciajuan@gmail.com>
(ns uxbox.ui.workspace.canvas.selection (ns uxbox.ui.workspace.selection
"Multiple selection handlers component."
(:require [sablono.core :as html :refer-macros [html]] (:require [sablono.core :as html :refer-macros [html]]
[rum.core :as rum] [rum.core :as rum]
[lentes.core :as l] [lentes.core :as l]
[uxbox.state :as ust] [uxbox.state :as st]
[uxbox.shapes :as ush] [uxbox.shapes :as ush]
[uxbox.util.lens :as ul]
[uxbox.ui.workspace.base :as wb]
[uxbox.ui.mixins :as mx])) [uxbox.ui.mixins :as mx]))
;; --- Lenses
(def ^:const selected-shapes-l (def ^:const selected-shapes-l
(letfn [(getter [state] (letfn [(getter [state]
(let [selected (get-in state [:workspace :selected])] (let [selected (get-in state [:workspace :selected])]
(mapv #(get-in state [:shapes-by-id %]) selected)))] (mapv #(get-in state [:shapes-by-id %]) selected)))]
(as-> (ul/getter getter) $ (-> (l/getter getter)
(l/focus-atom $ ust/state)))) (l/focus-atom st/state))))
(defn shapes-selection-render ;; --- Selection Handlers (Component)
(defn selection-handlers-render
[own] [own]
(let [shapes (rum/react selected-shapes-l)] (let [shapes (rum/react selected-shapes-l)]
(when (> (count shapes) 1) (when (> (count shapes) 1)
@ -34,8 +37,8 @@
:style {:stroke "#333" :fill "transparent" :style {:stroke "#333" :fill "transparent"
:stroke-opacity "1"}}]]))))) :stroke-opacity "1"}}]])))))
(def ^:const shapes-selection (def selection-handlers
(mx/component (mx/component
{:render shapes-selection-render {:render selection-handlers-render
:name "shapes-selection" :name "selection-handlers"
:mixins [rum/reactive mx/static]})) :mixins [rum/reactive mx/static]}))