♻️ Refactor common.page.helpers namespace.

This commit is contained in:
Andrey Antukh 2022-02-07 12:37:54 +01:00 committed by Andrés Moya
parent 24724e3340
commit a1da4d4233
55 changed files with 1235 additions and 1348 deletions

View file

@ -9,7 +9,7 @@
(:require
[app.common.data :as d]
[app.common.geom.shapes :as gsh]
[app.common.pages :as cp]
[app.common.pages.helpers :as cph]
[app.common.path.commands :as upc]
[app.main.data.workspace.state-helpers :as wsh]
[app.main.store :as st]
@ -218,7 +218,7 @@
:media
:typographies
:components]))
st/state))
st/state =))
(def workspace-libraries
(l/derived :workspace-libraries st/state))
@ -246,7 +246,7 @@
(l/derived :options workspace-page))
(def workspace-frames
(l/derived cp/select-frames workspace-page-objects =))
(l/derived cph/get-frames workspace-page-objects =))
(def workspace-editor
(l/derived :workspace-editor st/state))
@ -276,9 +276,11 @@
(defn select-bool-children [id]
(let [selector
(fn [state]
(let [objects (wsh/lookup-page-objects state)
modifiers (:workspace-modifiers state)]
(as-> (cp/select-children id objects) $
(let [objects (wsh/lookup-page-objects state)
modifiers (:workspace-modifiers state)
children (->> (cph/get-children-ids objects id)
(select-keys objects))]
(as-> children $
(gsh/merge-modifiers $ modifiers)
(d/mapm (set-content-modifiers state) $))))]
(l/derived selector st/state =)))
@ -293,7 +295,7 @@
(defn is-child-selected?
[id]
(letfn [(selector [{:keys [selected objects]}]
(let [children (cp/get-children id objects)]
(let [children (cph/get-children-ids objects id)]
(some #(contains? selected %) children)))]
(l/derived selector selected-data =)))
@ -307,7 +309,7 @@
(def selected-shapes-with-children
(letfn [(selector [{:keys [selected objects]}]
(let [xform (comp (remove nil?)
(mapcat #(cp/get-children % objects)))
(mapcat #(cph/get-children-ids objects %)))
shapes (into selected xform selected)]
(mapv (d/getf objects) shapes)))]
(l/derived selector selected-data =)))