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

🔥 Remove deprecated code.

Browse source
This commit is contained in:
Andrey Antukh 2020-09-14 16:06:44 +02:00 • committed by Alonso Torres
parent 51541303a6
commit a33689cbae
4 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/app/main/data/workspace.cljs
View file

@ -183,14 +183,10 @@
(ptk/reify ::initialize-page (ptk/reify ::initialize-page
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
;; TODO: looks workspace-page is unused (let [local (get-in state [:workspace-cache page-id] workspace-local-default)]
(let [page (get-in state [:workspace-data :pages-index page-id])
local (get-in state [:workspace-cache page-id] workspace-local-default)]
(assoc state (assoc state
:current-page-id page-id ; mainly used by events :current-page-id page-id ; mainly used by events
:workspace-page page :workspace-local local)))))
:workspace-local local
)))))
(defn finalize-page (defn finalize-page
[page-id] [page-id]
@ -201,7 +197,7 @@
(let [local (:workspace-local state)] (let [local (:workspace-local state)]
(-> state (-> state
(assoc-in [:workspace-cache page-id] local) (assoc-in [:workspace-cache page-id] local)
(dissoc :current-page-id :workspace-page)))))) (dissoc :current-page-id))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Workspace Page CRUD ;; Workspace Page CRUD

2
frontend/src/app/main/data/workspace/common.cljs
View file

@ -187,7 +187,7 @@
(ptk/reify ::rehash-shape-frame-relationship (ptk/reify ::rehash-shape-frame-relationship
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(let [page-id (get-in state [:workspace-page :id]) (let [page-id (:current-page-id state)
objects (lookup-page-objects state page-id) objects (lookup-page-objects state page-id)
shapes (cph/select-toplevel-shapes objects) shapes (cph/select-toplevel-shapes objects)

6
frontend/src/app/main/refs.cljs
View file

@ -165,7 +165,7 @@
(def selected-objects (def selected-objects
(letfn [(selector [state] (letfn [(selector [state]
(let [selected (get-in state [:workspace-local :selected]) (let [selected (get-in state [:workspace-local :selected])
page-id (get-in state [:workspace-page :id]) page-id (:current-page-id state)
objects (get-in state [:workspace-data :pages-index page-id :objects])] objects (get-in state [:workspace-data :pages-index page-id :objects])]
(mapv #(get objects %) selected)))] (mapv #(get objects %) selected)))]
(l/derived selector st/state =))) (l/derived selector st/state =)))
@ -173,7 +173,7 @@
(def selected-shapes-with-children (def selected-shapes-with-children
(letfn [(selector [state] (letfn [(selector [state]
(let [selected (get-in state [:workspace-local :selected]) (let [selected (get-in state [:workspace-local :selected])
page-id (get-in state [:workspace-page :id]) page-id (:current-page-id state)
objects (get-in state [:workspace-data :pages-index page-id :objects]) objects (get-in state [:workspace-data :pages-index page-id :objects])
children (mapcat #(cph/get-children % objects) selected)] children (mapcat #(cph/get-children % objects) selected)]
(into selected children)))] (into selected children)))]
@ -184,7 +184,7 @@
(def selected-objects-with-children (def selected-objects-with-children
(letfn [(selector [state] (letfn [(selector [state]
(let [selected (get-in state [:workspace-local :selected]) (let [selected (get-in state [:workspace-local :selected])
page-id (get-in state [:workspace-page :id]) page-id (:current-page-id state)
objects (get-in state [:workspace-data :pages-index page-id :objects]) objects (get-in state [:workspace-data :pages-index page-id :objects])
children (mapcat #(cph/get-children % objects) selected) children (mapcat #(cph/get-children % objects) selected)
shapes (into selected children)] shapes (into selected children)]

5
frontend/src/app/main/ui/workspace/sidebar.cljs
View file

@ -39,13 +39,12 @@
;; --- Right Sidebar (Component) ;; --- Right Sidebar (Component)
;; TODO: revisit page prop
(mf/defc right-sidebar (mf/defc right-sidebar
[{:keys [layout page-id file-id local] :as props}] [{:keys [layout page-id file-id local] :as props}]
[:aside#settings-bar.settings-bar [:aside#settings-bar.settings-bar
[:div.settings-bar-inside [:div.settings-bar-inside
(when (contains? layout :element-options) (when (contains? layout :element-options)
[:& options-toolbox {:page-id page-id [:& options-toolbox
{:page-id page-id
:file-id file-id :file-id file-id
:local local}])]]) :local local}])]])