Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-21 06:02:32 -05:00
Code Issues Activity

WIP: workspace-data

Browse source
This commit is contained in:
Andrey Antukh 2024-12-23 17:48:33 +01:00
parent 1d78f85484
commit ce78471c7f
27 changed files with 646 additions and 655 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
common/src/app/common/test_helpers/shapes.cljc
View file

@ -13,7 +13,6 @@
[app.common.types.color :as ctc]
[app.common.types.colors-list :as ctcl]
[app.common.types.container :as ctn]
[app.common.types.file :as ctf]
[app.common.types.pages-list :as ctpl]
[app.common.types.shape :as cts]
[app.common.types.shape-tree :as ctst]
@ -43,25 +42,25 @@
frame-id (if (cfh/frame-shape? parent)
(:id parent)
(:frame-id parent))]
(ctf/update-file-data
file
(fn [file-data]
(ctpl/update-page file-data
(:id page)
#(ctst/add-shape (:id shape)
shape
%
frame-id
parent-id
nil
true))))))
(update file :data
(fn [file-data]
(ctpl/update-page file-data
(:id page)
#(ctst/add-shape (:id shape)
shape
%
frame-id
parent-id
nil
true))))))
(defn get-shape
[file label & {:keys [page-label]}]
(let [page (if page-label
(thf/get-page file page-label)
(thf/current-page file))]
(ctst/get-shape page (thi/id label))))
(let [page (if page-label
(thf/get-page file page-label)
(thf/current-page file))
shape-id (thi/id label)]
(ctst/get-shape page shape-id)))
(defn get-shape-by-id
[file id & {:keys [page-label]}]
@ -76,12 +75,11 @@
(thf/get-page file page-label)
(thf/current-page file))
shape (ctst/get-shape page (thi/id shape-label))]
(ctf/update-file-data
file
(fn [file-data]
(ctpl/update-page file-data
(:id page)
#(ctst/set-shape % (ctn/set-shape-attr shape attr val)))))))
(update file :data
(fn [file-data]
(ctpl/update-page file-data
(:id page)
#(ctst/set-shape % (ctn/set-shape-attr shape attr val)))))))
(defn sample-color
[label & {:keys [] :as params}]
@ -104,7 +102,7 @@
(defn add-sample-library-color
[file label & {:keys [] :as params}]
(let [color (sample-color label params)]
(ctf/update-file-data file #(ctcl/add-color % color))))
(update file :data ctcl/add-color color)))
(defn sample-typography
[label & {:keys [] :as params}]
@ -113,7 +111,7 @@
(defn add-sample-typography
[file label & {:keys [] :as params}]
(let [typography (sample-typography label params)]
(ctf/update-file-data file #(cttl/add-typography % typography))))
(update file :data cttl/add-typography typography)))
(defn add-interaction
[file origin-label dest-label]
@ -124,9 +122,8 @@
(ctsi/set-destination (:id dest))
(assoc :position-relative-to (:id origin)))
interactions (ctsi/add-interaction (:interactions origin) interaction)]
(ctf/update-file-data
file
(fn [file-data]
(ctpl/update-page file-data
(:id page)
#(ctst/set-shape % (assoc origin :interactions interactions)))))))
(update file :data
(fn [file-data]
(ctpl/update-page file-data
(:id page)
#(ctst/set-shape % (assoc origin :interactions interactions)))))))

47
frontend/src/app/main/data/changes.cljs
View file

@ -77,45 +77,30 @@
(ptk/reify ::apply-changes-localy
ptk/UpdateEvent
(update [_ state]
(let [current-file-id (get state :current-file-id)
local-file? (= current-file-id file-id)
(let [undo-changes
(if pending
(->> pending
(map :undo-changes)
(reverse)
(mapcat identity)
(vec))
nil)
path [:files file-id]
redo-changes
(if pending
(into redo-changes
(mapcat :redo-changes)
pending)
redo-changes)
undo-changes (if pending
(->> pending
(map :undo-changes)
(reverse)
(mapcat identity)
(vec))
nil)
redo-changes (if pending
(into redo-changes
(mapcat :redo-changes)
pending)
redo-changes)
apply-changes
(fn [fdata]
(let [fdata (cpc/process-changes fdata undo-changes false)
fdata (cpc/process-changes fdata redo-changes false)
pids (into #{} xf:map-page-id redo-changes)]
(reduce #(ctst/update-object-indices %1 %2) fdata pids)))
fdata (if local-file?
(get state :workspace-data)
(-> (get-in state path)
(get :data)))
fdata (apply-changes fdata)]
(cond-> state
local-file?
(assoc :workspace-data fdata)
:always
(update-in path assoc :data fdata))))))
(reduce #(ctst/update-object-indices %1 %2) fdata pids)))]
(update-in state [:files file-id :data] apply-changes)))))
(defn commit
"Create a commit event instance"

41
frontend/src/app/main/data/comments.cljs
View file

@ -62,10 +62,12 @@
(ptk/reify ::created-thread-on-workspace
ptk/UpdateEvent
(update [_ state]
(let [position (select-keys thread [:position :frame-id])]
(let [position (select-keys thread [:position :frame-id])
file-id (:current-file-id state)
page-id (or page-id (:current-page-id state))]
(-> state
(update :comment-threads assoc id (dissoc thread :comment))
(update-in [:workspace-data :pages-index page-id :comment-thread-positions] assoc id position)
(update-in [:files file-id :data :pages-index page-id :comment-thread-positions] assoc id position)
(cond-> open?
(update :comments-local assoc :open id))
(update :comments-local assoc :options nil)
@ -274,9 +276,10 @@
(ptk/reify ::delete-comment-thread-on-workspace
ptk/UpdateEvent
(update [_ state]
(let [page-id (:current-page-id state)]
(let [page-id (:current-page-id state)
file-id (:current-file-id state)]
(-> state
(update-in [:workspace-data :pages-index page-id :comment-thread-positions] dissoc id)
(update-in [:files file-id :data :pages-index page-id :comment-thread-positions] dissoc id)
(update :comments dissoc id)
(update :comment-threads dissoc id))))
@ -359,20 +362,28 @@
[file-id]
(dm/assert! (uuid? file-id))
(letfn [(set-comment-threds [state comment-thread]
(let [path [:workspace-data :pages-index (:page-id comment-thread) :comment-thread-positions (:id comment-thread)]
thread-position (get-in state path)]
(let [file-id (:current-file-id state)
page-id (:page-id comment-thread)
path [:files file-id :data
:pages-index page-id
:comment-thread-positions (:id comment-thread)]
position (get-in state path)]
;; FIXME: make it more efficient
(cond-> state
(nil? thread-position)
(->
(assoc-in (conj path :position) (:position comment-thread))
(assoc-in (conj path :frame-id) (:frame-id comment-thread))))))
(nil? position)
(update-in path (fn [state]
(-> state
(assoc :position (:position comment-thread))
(assoc :frame-id (:frame-id comment-thread))))))))
(fetched [[users comments] state]
(let [pages (-> (get-in state [:workspace-data :pages])
set)
(let [pages (-> (dsh/lookup-file-data state)
(get :pages-index))
comments (filter #(contains? pages (:page-id %)) comments)
state (-> state
(assoc :comment-threads (d/index-by :id comments))
(update :current-file-comments-users merge (d/index-by :id users)))]
state (-> state
(assoc :comment-threads (d/index-by :id comments))
(update :current-file-comments-users merge (d/index-by :id users)))]
(reduce set-comment-threds state comments)))]
(ptk/reify ::retrieve-comment-threads

5
frontend/src/app/main/data/common.cljs
View file

@ -369,9 +369,10 @@
(watch [_ state _]
(let [team-id (or team-id (:current-team-id state))
file-id (or file-id (:current-file-id state))
;: FIXME: why not :current-page-id
page-id (or page-id
(dm/get-in state [:workspace-data :pages 0]))
(-> (dsh/lookup-file-data state file-id)
(get :pages)
(first)))
params (-> (rt/get-params state)
(assoc :team-id team-id)
(assoc :file-id file-id)

21
frontend/src/app/main/data/fonts.cljs
View file

@ -332,22 +332,23 @@
(ptk/reify ::add-recent-font
ptk/UpdateEvent
(update [_ state]
(let [recent-fonts (get-in state [:workspace-data :recent-fonts])
most-recent-fonts (into [font] (comp (remove #(= font %)) (take 3)) recent-fonts)]
(assoc-in state [:workspace-data :recent-fonts] most-recent-fonts)))
(let [recent-fonts (:recent-fonts state)
recent-fonts (into [font] (comp (remove #(= font %)) (take 3)) recent-fonts)]
(assoc state :recent-fonts recent-fonts)))
ptk/EffectEvent
(effect [_ state _]
(let [most-recent-fonts (get-in state [:workspace-data :recent-fonts])]
(let [recent-fonts (:recent-fonts state)]
;; FIXME: this should be prefixed by team
(swap! storage/user assoc ::recent-fonts most-recent-fonts)))))
(swap! storage/user assoc ::recent-fonts recent-fonts)))))
(defn load-recent-fonts
[fonts]
(ptk/reify ::load-recent-fonts
ptk/UpdateEvent
(update [_ state]
(let [fonts-map (d/index-by :id fonts)
saved-recent-fonts (->> (::recent-fonts storage/user)
(keep #(get fonts-map (:id %)))
(into #{}))]
(assoc-in state [:workspace-data :recent-fonts] saved-recent-fonts)))))
(let [fonts-map (d/index-by :id fonts)
recent-fonts (->> (::recent-fonts storage/user)
(keep #(get fonts-map (:id %)))
(into #{}))]
(assoc state :recent-fonts recent-fonts)))))

6
frontend/src/app/main/data/state_helpers.cljs
View file

@ -25,8 +25,10 @@
(dm/get-in state [:files file-id])))
(defn lookup-file-data
[state file-id]
(dm/get-in state [:files file-id :data]))
([state]
(lookup-file-data state (:current-file-id state)))
([state file-id]
(dm/get-in state [:files file-id :data])))
(defn get-page
[fdata page-id]

16
frontend/src/app/main/data/tokens.cljs
View file

@ -12,6 +12,7 @@
[app.common.geom.point :as gpt]
[app.common.types.shape :as cts]
[app.common.types.tokens-lib :as ctob]
[app.main.data.state-helpers :as dsh]
[app.main.data.changes :as dch]
[app.main.data.workspace.shapes :as dwsh]
[app.main.refs :as refs]
@ -44,8 +45,10 @@
;; TOKENS Getters
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defn get-tokens-lib [state]
(get-in state [:workspace-data :tokens-lib]))
(defn get-tokens-lib
[state]
(-> (dsh/lookup-file-data state)
(get :tokens-lib)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; TOKENS Actions
@ -83,6 +86,7 @@
(apply-token-to-shape props)
shape))
;; FIXME: this should never be here
(defn get-token-data-from-token-id
[id]
(let [workspace-data (deref refs/workspace-data)]
@ -146,7 +150,7 @@
(ptk/reify ::delete-token-theme
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-token-theme group name))]
@ -205,7 +209,7 @@
(ptk/reify ::import-tokens-lib
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
update-token-set-change (some-> lib
(ctob/get-sets)
(first)
@ -223,7 +227,7 @@
(ptk/reify ::delete-token-set-path
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-token-set-path token-set-path))]
@ -286,7 +290,7 @@
(ptk/reify ::delete-token
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-token set-name token-name))]

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

@ -248,7 +248,6 @@
(let [file-id (:id file)]
(-> state
(assoc :thumbnails thumbnails)
(assoc :workspace-data (:data file))
(update :files assoc file-id file))))
ptk/WatchEvent
@ -390,7 +389,6 @@
;; FIXME: revisit
(dissoc
:current-file-id
:workspace-data
:workspace-editor-state
:files
:workspace-media-objects
@ -430,7 +428,7 @@
(ptk/reify ::initialize-page
ptk/UpdateEvent
(update [_ state]
(if-let [{:keys [id] :as page} (dm/get-in state [:workspace-data :pages-index page-id])]
(if-let [{:keys [id] :as page} (dsh/lookup-page state page-id)]
;; we maintain a cache of page state for user convenience with the exception of the
;; selection; when user abandon the current page, the selection is lost
(let [local (dm/get-in state [:workspace-cache id] default-workspace-local)]
@ -502,7 +500,9 @@
ptk/WatchEvent
(watch [it state _]
(let [pages (get-in state [:workspace-data :pages-index])
(let [pages (-> (dsh/lookup-file-data state)
(get :pages-index))
unames (cfh/get-used-names pages)
name (cfh/generate-unique-name unames "Page 1")
@ -517,14 +517,14 @@
ptk/WatchEvent
(watch [it state _]
(let [id (uuid/next)
pages (get-in state [:workspace-data :pages-index])
fdata (dsh/lookup-file-data state)
pages (get fdata :pages-index)
page (get pages page-id)
unames (cfh/get-used-names pages)
page (get-in state [:workspace-data :pages-index page-id])
name (cfh/generate-unique-name unames (:name page))
fdata (:workspace-data state)
components-v2 (dm/get-in fdata [:options :components-v2])
objects (->> (:objects page)
(d/mapm (fn [_ val] (dissoc val :use-for-thumbnail))))
objects (update-vals (:objects page) #(dissoc % :use-for-thumbnail))
main-instances-ids (set (keep #(when (ctk/main-instance? (val %)) (key %)) objects))
ids-to-remove (set (apply concat (map #(cfh/get-children-ids objects %) main-instances-ids)))
@ -536,7 +536,7 @@
component
fdata
(gpt/point (:x shape) (:y shape))
components-v2
true
{:keep-ids? true})
children (into {} (map (fn [shape] [(:id shape) shape]) new-shapes))
objs (assoc objs id new-shape)]
@ -575,10 +575,9 @@
(ptk/reify ::rename-page
ptk/WatchEvent
(watch [it state _]
(let [page (get-in state [:workspace-data :pages-index id])
(let [page (dsh/lookup-page state id)
changes (-> (pcb/empty-changes it)
(pcb/mod-page page {:name name}))]
(rx/of (dch/commit-changes changes))))))
(defn set-plugin-data
@ -963,7 +962,8 @@
(ptk/reify ::relocate-page
ptk/WatchEvent
(watch [it state _]
(let [prev-index (-> (get-in state [:workspace-data :pages])
(let [prev-index (-> (dsh/lookup-file-data state)
(get :pages)
(d/index-of id))
changes (-> (pcb/empty-changes it)
(pcb/move-page id index prev-index))]
@ -1150,9 +1150,12 @@
(ptk/reify ::show-component-in-assets
ptk/WatchEvent
(watch [_ state _]
(let [component-path (cfh/split-path (get-in state [:workspace-data :components component-id :path]))
paths (map (fn [i] (cfh/join-path (take (inc i) component-path))) (range (count component-path)))
file-id (:current-file-id state)]
(let [file-id (:current-file-id state)
fdata (dsh/lookup-file-data state file-id)
cpath (dm/get-in fdata [:components component-id :path])
cpath (cfh/split-path cpath)
paths (map (fn [i] (cfh/join-path (take (inc i) cpath)))
(range (count cpath)))]
(rx/concat
(rx/from (map #(set-assets-group-open file-id :components % true) paths))
(rx/of (dcm/go-to-workspace :layout :assets)
@ -2059,7 +2062,9 @@
(ptk/reify ::update-component-annotation
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data
(dsh/lookup-file-data state)
update-fn
(fn [component]
;; NOTE: we need to ensure the component exists,
@ -2070,9 +2075,10 @@
(dissoc component :annotation)
(assoc component :annotation annotation))))
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/update-component id update-fn))]
changes
(-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/update-component id update-fn))]
(rx/concat
(rx/of (dch/commit-changes changes))

105
frontend/src/app/main/data/workspace/libraries.cljs
View file

@ -164,16 +164,16 @@
(defn- update-color*
[it state color file-id]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
[path name] (cfh/parse-path-name (:name color))
color (assoc color :path path :name name)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/update-color color))
undo-id (js/Symbol)]
undo-id (js/Symbol)]
(rx/of (dwu/start-undo-transaction undo-id)
(dch/commit-changes changes)
(sync-file (:current-file-id state) file-id :colors (:id color))
(sync-file (:id data) file-id :colors (:id color))
(dwu/commit-undo-transaction undo-id))))
(defn update-color
@ -193,6 +193,8 @@
(watch [it state _]
(update-color* it state color file-id)))))
;; FIXME: revisit why file-id is passed on the event
(defn rename-color
[file-id id new-name]
(dm/assert!
@ -213,7 +215,7 @@
(let [new-name (str/trim new-name)]
(if (str/empty? new-name)
(rx/empty)
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
color (get-in data [:colors id])
color (assoc color :name new-name)
color (d/without-nils color)]
@ -228,7 +230,7 @@
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-color id))]
@ -269,7 +271,7 @@
(if (str/empty? new-name)
(rx/empty)
(let [[path name] (cfh/parse-path-name new-name)
data (get state :workspace-data)
data (dsh/lookup-file-data state)
object (get-in data [:media id])
new-object (assoc object :path path :name name)
changes (-> (pcb/empty-changes it)
@ -289,7 +291,7 @@
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-media id))]
@ -318,7 +320,7 @@
(defn- do-update-tipography
[it state typography file-id]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
typography (extract-path-if-missing typography)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
@ -354,7 +356,7 @@
ptk/WatchEvent
(watch [it state _]
(when (and (some? new-name) (not= "" new-name))
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
[path name] (cfh/parse-path-name new-name)
object (get-in data [:typographies id])
new-object (assoc object :path path :name name)]
@ -369,7 +371,7 @@
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-typography id))]
@ -469,11 +471,9 @@
(let [new-name (str/trim new-name)]
(if (str/empty? new-name)
(rx/empty)
(let [library-data (get state :workspace-data)
components-v2 (features/active-feature? state "components/v2")
changes (-> (pcb/empty-changes it)
(cll/generate-rename-component id new-name library-data components-v2))]
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(cll/generate-rename-component id new-name data true))]
(rx/of (dch/commit-changes changes))))))))
(defn rename-component-and-main-instance
@ -486,14 +486,17 @@
valid? (and (not (str/ends-with? name "/"))
(string? clean-name)
(not (str/blank? clean-name)))
component (dm/get-in state [:workspace-data :components component-id])]
data (dsh/lookup-file-data state)
component (dm/get-in data [:components component-id])]
(when (and valid? component)
(let [shape-id (:main-instance-id component)
page-id (:main-instance-page component)]
(rx/concat
(rx/of (rename-component component-id clean-name))
;; NOTE: only when components-v2 is enabled
;; NOTE: only when components-v2 is enabled
(when (and shape-id page-id)
(rx/of (dwsh/update-shapes [shape-id] #(assoc % :name clean-name) {:page-id page-id :stack-undo? true}))))))))))
@ -521,37 +524,31 @@
(ptk/reify ::delete-component
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)]
(if (features/active-feature? state "components/v2")
(let [component (ctkl/get-component data id)
page-id (:main-instance-page component)
root-id (:main-instance-id component)
file-id (:current-file-id state)
fdata (dsh/lookup-file-data state file-id)
page (dsh/lookup-page state page-id)
objects (dsh/lookup-page-objects state page-id)
components-v2 (features/active-feature? state "components/v2")
undo-group (uuid/next)
undo-id (js/Symbol)
[all-parents changes]
(-> (pcb/empty-changes it page-id)
;; Deleting main root triggers component delete
(cls/generate-delete-shapes fdata page objects #{root-id} {:components-v2 components-v2
:undo-group undo-group
:undo-id undo-id}))]
(rx/of
(dwu/start-undo-transaction undo-id)
(dwt/clear-thumbnail (:current-file-id state) page-id root-id "component")
(dc/detach-comment-thread #{root-id})
(dch/commit-changes changes)
(ptk/data-event :layout/update {:ids all-parents :undo-group undo-group})
(dwu/commit-undo-transaction undo-id)))
(let [page-id (:current-page-id state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/delete-component id page-id))]
(rx/of (dch/commit-changes changes))))))))
(let [file-id (:current-file-id state)
fdata (dsh/lookup-file-data state file-id)
component (ctkl/get-component fdata id)
page-id (:main-instance-page component)
root-id (:main-instance-id component)
page (dsh/get-page fdata page-id)
objects (:objects page)
undo-group (uuid/next)
undo-id (js/Symbol)
[all-parents changes]
(-> (pcb/empty-changes it page-id)
;; Deleting main root triggers component delete
(cls/generate-delete-shapes fdata page objects #{root-id} {:components-v2 true
:undo-group undo-group
:undo-id undo-id}))]
(rx/of
(dwu/start-undo-transaction undo-id)
(dwt/clear-thumbnail (:current-file-id state) page-id root-id "component")
(dc/detach-comment-thread #{root-id})
(dch/commit-changes changes)
(ptk/data-event :layout/update {:ids all-parents :undo-group undo-group})
(dwu/commit-undo-transaction undo-id))))))
(defn restore-component
"Restore a deleted component, with the given id, in the given file library."
@ -620,11 +617,10 @@
(when id-ref
(reset! id-ref (:id new-shape)))
(rx/of (ptk/event
::ev/event
{::ev/name "use-library-component"
::ev/origin origin
:external-library (not= file-id current-file-id)})
(rx/of (ptk/event ::ev/event
{::ev/name "use-library-component"
::ev/origin origin
:external-library (not= file-id current-file-id)})
(dwu/start-undo-transaction undo-id)
(dch/commit-changes changes)
(ptk/data-event :layout/update {:ids [(:id new-shape)]})
@ -717,6 +713,7 @@
ptk/WatchEvent
(watch [_ state stream]
(let [current-page-id (:current-page-id state)
data (dsh/lookup-file-data state)
select-and-zoom
(fn [shape-id]
@ -733,7 +730,7 @@
(rx/observe-on :async)
(rx/mapcat (fn [_] (select-and-zoom shape-id))))))]
(when-let [component (dm/get-in state [:workspace-data :components id])]
(when-let [component (dm/get-in data [:components id])]
(let [page-id (:main-instance-page component)
shape-id (:main-instance-id component)]
(when (some? page-id)
@ -1227,7 +1224,7 @@
ptk/WatchEvent
(watch [it state _]
(let [data (get state :workspace-data)
(let [data (dsh/lookup-file-data state)
changes (-> (pcb/empty-changes it)
(pcb/with-library-data data)
(pcb/update-component id #(assoc % :modified-at (dt/now))))]

3
frontend/src/app/main/data/workspace/undo.cljs
View file

@ -291,7 +291,8 @@
ptk/WatchEvent
(watch [_ state _]
(let [page-id (:current-page-id state)
pages (dm/get-in state [:workspace-data :pages])]
pages (-> (dsh/lookup-file-data state)
(get :pages))]
(if (contains? pages page-id)
(rx/empty)
(rx/of (dcm/go-to-workspace :page-id (first pages))))))))

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

@ -230,23 +230,11 @@
(def rulers?
(l/derived #(contains? % :rulers) workspace-layout))
(def workspace-file
(l/derived (l/key :workspace-file) st/state))
(def workspace-data
(l/derived :workspace-data st/state))
;; (def workspace-file
;; "A ref to a striped vision of file (without data)."
;; (l/derived (fn [state]
;; (let [file (:workspace-file state)
;; data (:workspace-data state)]
;; (-> file
;; (dissoc :data)
;; ;; FIXME: still used in sitemaps but sitemaps
;; ;; should declare its own lense for it
;; (assoc :pages (:pages data)))))
;; st/state =))
(l/derived (fn [state]
(let [file-id (:current-file-id state)]
(dm/get-in state [:files file-id :data])))
st/state))
(def workspace-file-colors
(l/derived (fn [{:keys [id] :as data}]
@ -273,11 +261,12 @@
(def workspace-presence
(l/derived :workspace-presence st/state))
;; FIXME: revisit the usage of this ref
(def workspace-page
(l/derived (fn [state]
(let [page-id (:current-page-id state)
data (:workspace-data state)]
(dm/get-in data [:pages-index page-id])))
file-id (:current-file-id state)]
(dm/get-in state [:files file-id :pages-index page-id])))
st/state))
(def workspace-page-flows

3
frontend/src/app/main/ui/workspace/tokens/changes.cljs
View file

@ -35,7 +35,8 @@
(ptk/reify ::apply-token
ptk/WatchEvent
(watch [_ state _]
(when-let [tokens (some-> (get-in state [:workspace-data :tokens-lib])
(when-let [tokens (some-> (dsh/lookup-file-data state)
(get :tokens-lib)
(ctob/get-active-themes-set-tokens))]
(->> (rx/from (sd/resolve-tokens+ tokens))
(rx/mapcat

17
frontend/src/debug.cljs
View file

@ -255,9 +255,7 @@
libraries (get state :files)
shape-id (if (some? shape-id)
(uuid/uuid shape-id)
(let [objects (get-in state [:workspace-data :pages-index page-id :objects])
selected (get-in state [:workspace-local :selected])]
(->> selected (map (d/getf objects)) first :id)))]
(first (dsh/lookup-selected state)))]
(if (some? shape-id)
(ctf/dump-subtree file page-id shape-id libraries {:show-ids show-ids
:show-touched show-touched
@ -349,10 +347,10 @@
(defn ^:export dump-modifiers
[]
(let [page-id (get @st/state :current-page-id)
objects (get-in @st/state [:workspace-data :pages-index page-id :objects])]
(.log js/console (modif->js (:workspace-modifiers @st/state) objects)))
nil)
(let [objects (dsh/lookup-page-objects @st/state)
modifiers (:workspace-modifiers @st/state)]
(js/console.log (modif->js modifiers objects))
nil))
(defn ^:export set-workspace-read-only
[read-only?]
@ -382,9 +380,8 @@
(defn ^:export validate-schema
[]
(try
(-> (get @st/state :workspace-file)
(assoc :data (get @st/state :workspace-data))
(cfv/validate-file-schema!))
(let [file (dsh/lookup-file @st/state)]
(cfv/validate-file-schema! file))
(catch :default cause
(errors/print-error! cause))))

28
frontend/test/frontend_tests/basic_shapes_test.cljs
View file

@ -9,6 +9,7 @@
[app.common.test-helpers.files :as cthf]
[app.common.test-helpers.ids-map :as cthi]
[app.common.test-helpers.shapes :as cths]
[app.main.data.state-helpers :as dsh]
[app.main.data.workspace.colors :as dc]
[app.main.data.workspace.shapes :as dwsh]
[cljs.test :as t :include-macros true]
@ -34,13 +35,10 @@
store done events
(fn [new-state]
(let [;; ==== Get
shape1' (get-in new-state [:workspace-data
:pages-index
(cthi/id :page1)
:objects
(cthi/id :shape1)])
fills' (:fills shape1')
fill' (first fills')]
objects (dsh/lookup-page-objects new-state)
shape1' (get objects (cthi/id :shape1))
fills' (:fills shape1')
fill' (first fills')]
;; ==== Check
(t/is (some? shape1'))
@ -68,15 +66,11 @@
store done events
(fn [new-state]
(let [;; ==== Get
shape1' (get-in new-state [:workspace-data
:pages-index
(cthi/id :page1)
:objects
(cthi/id :shape1)])
stroke' (-> (:strokes shape1')
first)]
objects (dsh/lookup-page-objects new-state)
shape1' (get objects (cthi/id :shape1))
stroke' (first (:strokes shape1'))]
;; ==== Check
(println stroke')
;; ==== Check
;; (println stroke')
(t/is (some? shape1'))
(t/is (= (:stroke-alignment stroke') :center))))))))
(t/is (= (:stroke-alignment stroke') :center))))))))

6
frontend/test/frontend_tests/helpers/libraries.cljs
View file

@ -111,7 +111,7 @@
root-inst (ctn/get-shape page root-inst-id)
main-instance? (:main-instance root-inst)
libs (dsh/get-libraries state)
libs (dsh/lookup-libraries state)
component (ctf/get-component libs (:component-file root-inst) (:component-id root-inst))
library (ctf/get-component-library libs root-inst)
@ -151,7 +151,7 @@
(let [page (thp/current-page state)
root-inst (ctn/get-shape page root-inst-id)
libs (dsh/get-libraries state)
libs (dsh/lookup-libraries state)
component (ctf/get-component libs (:component-file root-inst) (:component-id root-inst))
library (ctf/get-component-library libs root-inst)
@ -166,7 +166,7 @@
(defn resolve-component
"Get the component with the given id and all its shapes."
[state component-file component-id]
(let [libs (dsh/get-libraries state)
(let [libs (dsh/lookup-libraries state)
component (ctf/get-component libs component-file component-id)
library (ctf/get-component-library libs component)
shapes-main (ctf/get-component-shapes (:data library) component)]

87
frontend/test/frontend_tests/helpers/pages.cljs
View file

@ -33,12 +33,15 @@
:current-page-id nil
:workspace-layout layout/default-layout
:workspace-global layout/default-global
:workspace-data {:id current-file-id
:options {:components-v2 true}
:components {}
:pages []
:pages-index {}}
:workspace-libraries {}
:files
{current-file-id
{:id current-file-id
:data {:id current-file-id
:options {:components-v2 true}
:components {}
:pages []
:pages-index {}}}}
:features-team #{"components/v2"}})
(def ^:private idmap (atom {}))
@ -48,8 +51,9 @@
(defn current-page
[state]
(let [page-id (:current-page-id state)]
(get-in state [:workspace-data :pages-index page-id])))
(let [page-id (:current-page-id state)
file-id (:current-file-id state)]
(get-in state [:files file-id :pages-index page-id])))
(defn id
[label]
@ -65,20 +69,22 @@
(let [page (current-page state)]
(cfh/get-children (:objects page) (id label))))
(defn apply-changes
[state changes]
(let [file-id (:current-file-id state)]
(update-in state [:files file-id :data] cp/process-changes changes)))
(defn sample-page
([state] (sample-page state {}))
([state {:keys [id name] :as props
:or {id (uuid/next)
name "page1"}}]
(swap! idmap assoc :page id)
(-> state
(assoc :current-page-id id)
(update :workspace-data
cp/process-changes
[{:type :add-page
:id id
:name name}]))))
(apply-changes [{:type :add-page
:id id
:name name}]))))
(defn sample-shape
([state label type] (sample-shape state type {}))
@ -87,13 +93,12 @@
frame (cfh/get-frame (:objects page))
shape (cts/setup-shape (merge {:type type :x 0 :y 0 :width 1 :height 1} props))]
(swap! idmap assoc label (:id shape))
(update state :workspace-data
cp/process-changes
[{:type :add-obj
:id (:id shape)
:page-id (:id page)
:frame-id (:id frame)
:obj shape}]))))
(apply-changes state
[{:type :add-obj
:id (:id shape)
:page-id (:id page)
:frame-id (:id frame)
:obj shape}]))))
(defn group-shapes
([state label ids] (group-shapes state label ids "Group"))
@ -106,8 +111,7 @@
(dwg/prepare-create-group (pcb/empty-changes) nil (:objects page) (:id page) shapes prefix true)]
(swap! idmap assoc label (:id group))
(update state :workspace-data
cp/process-changes (:redo-changes changes)))))))
(apply-changes state (:redo-changes changes)))))))
(defn frame-shapes
([state label ids] (frame-shapes state label ids "Board"))
@ -128,8 +132,7 @@
true)]
(swap! idmap assoc label (:id frame))
(update state :workspace-data
cp/process-changes (:redo-changes changes)))))))
(apply-changes state (:redo-changes changes)))))))
(defn make-component
[state instance-label component-label shape-ids]
@ -149,15 +152,14 @@
(swap! idmap assoc instance-label (:id group)
component-label component-id)
(update state :workspace-data
cp/process-changes (:redo-changes changes))))
(apply-changes state (:redo-changes changes))))
(defn instantiate-component
([state label component-id]
(instantiate-component state label component-id current-file-id))
([state label component-id file-id]
(let [page (current-page state)
libraries (dsh/get-libraries state)
libraries (dsh/lookup-libraries state)
objects (:objects page)
changes (-> (pcb/empty-changes nil (:id page))
@ -173,26 +175,27 @@
libraries)]
(swap! idmap assoc label (:id new-shape))
(update state :workspace-data
cp/process-changes (:redo-changes changes)))))
(apply-changes state (:redo-changes changes)))))
(defn move-to-library
[state label name]
(let [library-id (uuid/next)
data (get state :workspace-data)]
file-id (:current-file-id state)
data (get-in state [:files file-id :data])]
(swap! idmap assoc label library-id)
(-> state
(update :workspace-libraries
assoc library-id {:id library-id
:name name
:data {:id library-id
:options (:options data)
:pages (:pages data)
:pages-index (:pages-index data)
:components (:components data)}})
(update :workspace-data
assoc :components {} :pages [] :pages-index {}))))
(update :files assoc library-id
{:id library-id
:name name
:data {:id library-id
:options (:options data)
:pages (:pages data)
:pages-index (:pages-index data)
:components (:components data)}})
(update-in [:files file-id :data] assoc
:components {}
:pages []
:pages-index {}))))
(defn simulate-copy-shape
[selected objects libraries page file features version]

13
frontend/test/frontend_tests/helpers/state.cljs
View file

@ -18,8 +18,6 @@
:workspace-global layout/default-global
:current-file-id nil
:current-page-id nil
:workspace-data nil
:workspace-libraries {}
:features-team #{"components/v2"}})
(defn- on-error
@ -34,8 +32,7 @@
(assoc :current-file-id (:id file)
:current-page-id (cthf/current-page-id file)
:permissions {:can-edit true}
:workspace-file (dissoc file :data)
:workspace-data (:data file)))
:files {(:id file) file}))
store (ptk/store {:state state :on-error on-error})]
store))
@ -64,7 +61,7 @@
(ptk/emit! store :the/end))))
(defn get-file-from-store
[store]
(-> (:workspace-file store)
(assoc :data (:workspace-data store))))
(defn get-file-from-state
[state]
(let [file-id (:current-file-id state)]
(get-in state [:files file-id])))

40
frontend/test/frontend_tests/logic/comp_remove_swap_slots_test.cljs
View file

@ -116,7 +116,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
blue1' (cths/get-shape file' :blue1)
copied-blue1' (find-copied-shape blue1' page' uuid/zero)]
@ -155,7 +155,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b1' (cths/get-shape file' :frame-b1)
blue1' (cths/get-shape file' :blue1)
@ -193,7 +193,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
yellow' (cths/get-shape file' :frame-yellow)
blue1' (cths/get-shape file' :blue1)
@ -232,7 +232,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b2' (cths/get-shape file' :frame-b2)
blue1' (cths/get-shape file' :blue1)
@ -272,7 +272,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
copied-blue1' (find-copied-shape blue1 page' uuid/zero)]
@ -309,7 +309,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
yellow' (cths/get-shape file' :frame-yellow)
copied-blue1' (find-copied-shape blue1 page' (:id yellow'))]
@ -346,7 +346,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b2' (cths/get-shape file' :frame-b2)
copied-blue1' (find-copied-shape blue1 page' (:id b2'))]
@ -380,7 +380,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
copied-yellow' (find-copied-shape yellow page' uuid/zero)
blue1' (cths/get-shape file' :blue1)
@ -419,7 +419,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b1' (cths/get-shape file' :frame-b1)
copied-yellow' (find-copied-shape yellow page' (:id b1'))
@ -459,7 +459,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b2' (cths/get-shape file' :frame-b2)
copied-yellow' (find-copied-shape yellow page' (:id b2'))
@ -500,7 +500,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
copied-yellow' (find-copied-shape yellow page' uuid/zero)
copied-blue1' (find-copied-shape blue1 page' (:id copied-yellow'))]
@ -537,7 +537,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b1' (cths/get-shape file' :frame-b1)
copied-yellow' (find-copied-shape yellow page' (:id b1'))
@ -575,7 +575,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b2' (cths/get-shape file' :frame-b2)
copied-yellow' (find-copied-shape yellow page' (:id b2'))
@ -609,7 +609,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
blue2' (cths/get-shape file' :blue-copy-in-green-copy)
copied-green' (find-copied-shape green page' uuid/zero)
@ -648,7 +648,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b1' (cths/get-shape file' :frame-b1)
blue2' (cths/get-shape file' :blue-copy-in-green-copy)
@ -688,7 +688,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b2' (cths/get-shape file' :frame-b2)
blue2' (cths/get-shape file' :blue-copy-in-green-copy)
@ -731,7 +731,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
copied-green' (find-copied-shape green page' uuid/zero)
copied-blue1' (find-copied-shape blue2 page' (:id copied-green'))]
@ -768,7 +768,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b1' (cths/get-shape file' :frame-b1)
copied-green' (find-copied-shape green page' (:id b1'))
@ -806,7 +806,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
b2' (cths/get-shape file' :frame-b2)
copied-green' (find-copied-shape green page' (:id b2'))
@ -855,7 +855,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
green' (cths/get-shape file' :frame-green)
blue1' (cths/get-shape file' :blue1)

20
frontend/test/frontend_tests/logic/copying_and_duplicating_test.cljs
View file

@ -150,7 +150,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
(t/is (= (count-shapes file' "rect-simple-1" "#111111") 18)))))))))
(t/deftest main-and-first-level-copy-2
@ -176,7 +176,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
(t/is (= (count-shapes file' "rect-simple-1" "#222222") 15)))))))))
(t/deftest main-and-first-level-copy-3
@ -203,7 +203,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
(t/is (= (count-shapes file' "rect-simple-1" "#333333") 12)))))))))
@ -232,7 +232,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
(t/is (= (count-shapes file' "rect-simple-1" "#444444") 6)))))))))
(t/deftest copy-nested-in-main-1
@ -255,7 +255,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
;; Check propagation to all copies.
(t/is (= (count-shapes file' "rect-simple-1" "#111111") 28)))))))))
@ -279,7 +279,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
;; Check propagation to duplicated.
(t/is (= (count-shapes file' "rect-simple-1" "#222222") 9)))))))))
@ -303,7 +303,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
;; Check that it's NOT PROPAGATED.
(t/is (= (count-shapes file' "rect-simple-1" "#333333") 2)))))))))
@ -328,7 +328,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
;; Check propagation to all copies.
(t/is (= (count-shapes file' "rect-simple-1" "#111111") 20)))))))))
@ -357,7 +357,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)]
(let [file' (ths/get-file-from-state new-state)]
;; Check that it's NOT PROPAGATED.
(t/is (= (count-shapes file' "rect-simple-1" "#111111") 11))
(t/is (= (count-shapes file' "rect-simple-1" "#222222") 7))
@ -388,7 +388,7 @@
(ths/run-store
store done events
(fn [new-state]
(let [file' (-> (ths/get-file-from-store new-state)
(let [file' (-> (ths/get-file-from-state new-state)
(cthf/switch-to-page :page-2))]
;; Check that it's NOT PROPAGATED.
(t/is (= (count-shapes file' "rect-simple-1" "#111111") 10))

2
frontend/test/frontend_tests/logic/frame_guides_test.cljs
View file

@ -42,7 +42,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
guide' (-> page'

2
frontend/test/frontend_tests/logic/groups_test.cljs
View file

@ -39,7 +39,7 @@
store done events
(fn [new-state]
(let [;; ==== Get
file' (ths/get-file-from-store new-state)
file' (ths/get-file-from-state new-state)
page' (cthf/current-page file')
group-id (->> (:objects page')
vals

37
frontend/test/frontend_tests/plugins/context_shapes_test.cljs
View file

@ -18,19 +18,16 @@
(t/deftest test-common-shape-properties
(let [;; ==== Setup
store
(ths/setup-store (cthf/sample-file :file1 :page-label :page1))
_ (set! st/state store)
store (ths/setup-store (cthf/sample-file :file1 :page-label :page1))
_ (set! st/state store)
context (api/create-context "TEST")
page (. context -currentPage)
shape (.createRectangle context)
^js file (. context -currentFile)
^js page (. context -currentPage)
^js shape (.createRectangle context)
get-shape-path
#(vector :workspace-data :pages-index (aget page "$id") :objects (aget shape "$id") %)]
#(vector :files (aget file "$id") :pages-index (aget page "$id") :objects (aget shape "$id") %)]
(t/testing "Basic shape properites"
(t/testing " - name"
@ -216,9 +213,9 @@
(t/testing " - strokes"
(set! (.-strokes shape) #js [#js {:strokeColor "#fabada" :strokeOpacity 1 :strokeWidth 5}])
(t/is (= (get-in @store (get-shape-path :strokes)) [{:stroke-color "#fabada" :stroke-opacity 1 :stroke-width 5}]))
(t/is (= (-> (. shape -strokes) (aget 0) (aget "strokeColor")) "#fabada"))
(t/is (= (-> (. shape -strokes) (aget 0) (aget "strokeOpacity")) 1))
(t/is (= (-> (. shape -strokes) (aget 0) (aget "strokeWidth")) 5))))
(t/is (= (-> (. ^js shape -strokes) (aget 0) (aget "strokeColor")) "#fabada"))
(t/is (= (-> (. ^js shape -strokes) (aget 0) (aget "strokeOpacity")) 1))
(t/is (= (-> (. ^js shape -strokes) (aget 0) (aget "strokeWidth")) 5))))
(t/testing "Relative properties"
(let [board (.createBoard context)]
@ -229,26 +226,26 @@
(.appendChild board shape)
(t/testing " - boardX"
(set! (.-boardX shape) 10)
(t/is (m/close? (.-boardX shape) 10))
(set! (.-boardX ^js shape) 10)
(t/is (m/close? (.-boardX ^js shape) 10))
(t/is (m/close? (.-x shape) 110))
(t/is (m/close? (get-in @store (get-shape-path :x)) 110)))
(t/testing " - boardY"
(set! (.-boardY shape) 20)
(t/is (m/close? (.-boardY shape) 20))
(set! (.-boardY ^js shape) 20)
(t/is (m/close? (.-boardY ^js shape) 20))
(t/is (m/close? (.-y shape) 220))
(t/is (m/close? (get-in @store (get-shape-path :y)) 220)))
(t/testing " - parentX"
(set! (.-parentX shape) 30)
(t/is (m/close? (.-parentX shape) 30))
(set! (.-parentX ^js shape) 30)
(t/is (m/close? (.-parentX ^js shape) 30))
(t/is (m/close? (.-x shape) 130))
(t/is (m/close? (get-in @store (get-shape-path :x)) 130)))
(t/testing " - parentY"
(set! (.-parentY shape) 40)
(t/is (m/close? (.-parentY shape) 40))
(set! (.-parentY ^js shape) 40)
(t/is (m/close? (.-parentY ^js shape) 40))
(t/is (m/close? (.-y shape) 240))
(t/is (m/close? (get-in @store (get-shape-path :y)) 240)))))

28
frontend/test/frontend_tests/runner.cljs
View file

@ -26,17 +26,19 @@
(defn init
[]
(t/run-tests
'frontend-tests.helpers-shapes-test
'frontend-tests.logic.comp-remove-swap-slots-test
'frontend-tests.logic.copying-and-duplicating-test
'frontend-tests.logic.frame-guides-test
'frontend-tests.logic.groups-test
'frontend-tests.plugins.context-shapes-test
'frontend-tests.util-range-tree-test
'frontend-tests.util-snap-data-test
'frontend-tests.util-simple-math-test
'frontend-tests.basic-shapes-test
;; 'frontend-tests.helpers-shapes-test
;; 'frontend-tests.logic.comp-remove-swap-slots-test
;; 'frontend-tests.logic.copying-and-duplicating-test
;; 'frontend-tests.logic.frame-guides-test
;; 'frontend-tests.logic.groups-test
;; 'frontend-tests.plugins.context-shapes-test
;; 'frontend-tests.util-range-tree-test
;; 'frontend-tests.util-snap-data-test
;; 'frontend-tests.util-simple-math-test
;; 'frontend-tests.basic-shapes-test
'frontend-tests.tokens.logic.token-actions-test
'frontend-tests.tokens.style-dictionary-test
'frontend-tests.tokens.token-test
'frontend-tests.tokens.token-form-test))
;; 'frontend-tests.tokens.style-dictionary-test
;; 'frontend-tests.tokens.token-test
;; 'frontend-tests.tokens.token-form-test
))

5
frontend/test/frontend_tests/test_helpers_shapes.cljs
View file

@ -41,9 +41,8 @@
store (the/prepare-store state done
(fn [new-state]
(t/is (= (get-in new-state [:workspace-data
:recent-colors])
[color]))))]
(let [colors (:recent-colors new-state)]
(t/is (= colors [color])))))]
(ptk/emit!
store

10
frontend/test/frontend_tests/tokens/helpers/state.cljs
View file

@ -1,6 +1,7 @@
(ns frontend-tests.tokens.helpers.state
(:require
[app.common.types.tokens-lib :as ctob]
[app.main.data.state-helpers :as dsh]
[app.main.ui.workspace.tokens.style-dictionary :as sd]
[beicon.v2.core :as rx]
[potok.v2.core :as ptk]))
@ -22,10 +23,11 @@
(ptk/reify ::end+
ptk/WatchEvent
(watch [_ state _]
(->> (rx/from (-> (get-in state [:workspace-data :tokens-lib])
(ctob/get-active-themes-set-tokens)
(sd/resolve-tokens+)))
(rx/mapcat #(rx/of (end)))))))
(let [data (dsh/lookup-file-data state)]
(->> (rx/from (-> (get data :tokens-lib)
(ctob/get-active-themes-set-tokens)
(sd/resolve-tokens+)))
(rx/mapcat #(rx/of (end))))))))
(defn stop-on
"Helper function to be used with async version of run-store.

3
frontend/test/frontend_tests/tokens/helpers/tokens.cljs
View file

@ -14,7 +14,8 @@
(ctob/get-active-themes-set-tokens)
(get name)))
(defn apply-token-to-shape [file shape-label token-label attributes]
(defn apply-token-to-shape
[file shape-label token-label attributes]
(let [first-page-id (get-in file [:data :pages 0])
shape-id (thi/id shape-label)
token (get-token file token-label)

624
frontend/test/frontend_tests/tokens/logic/token_actions_test.cljs
View file

@ -45,8 +45,8 @@
(t/testing "applies token to shape and updates shape attributes to resolved value"
(t/async
done
(let [file (setup-file-with-tokens)
store (ths/setup-store file)
(let [file (setup-file-with-tokens)
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
events [(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:r1 :r2 :r3 :r4}
@ -55,334 +55,338 @@
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token (toht/get-token file' "borderRadius.md")
(let [file' (ths/get-file-from-state new-state)
token (toht/get-token file' "borderRadius.md")
rect-1' (cths/get-shape file' :rect-1)]
(app.common.pprint/pprint rect-1')
(t/testing "shape `:applied-tokens` got updated"
(t/is (some? (:applied-tokens rect-1')))
(t/is (= (:r1 (:applied-tokens rect-1')) (:name token))))
(t/testing "shape radius got update to the resolved token value."
#_(t/testing "shape radius got update to the resolved token value."
(t/is (= (:r1 rect-1') 24))))))))))
(t/deftest test-apply-multiple-tokens
(t/testing "applying a token twice with the same attributes will override the previously applied tokens values"
(t/async
done
(let [file (setup-file-with-tokens)
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
events [(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:r1 :r2 :r3 :r4}
:token (toht/get-token file "borderRadius.sm")
:on-update-shape wtch/update-shape-radius-all})
(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:r1 :r2 :r3 :r4}
:token (toht/get-token file "borderRadius.md")
:on-update-shape wtch/update-shape-radius-all})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token (toht/get-token file' "borderRadius.md")
rect-1' (cths/get-shape file' :rect-1)]
(t/testing "shape `:applied-tokens` got updated"
(t/is (some? (:applied-tokens rect-1')))
(t/is (= (:r1 (:applied-tokens rect-1')) (:name token))))
(t/testing "shape radius got update to the resolved token value."
(t/is (= (:r1 rect-1') 24))))))))))
;; (t/deftest test-apply-multiple-tokens
;; (t/testing "applying a token twice with the same attributes will override the previously applied tokens values"
;; (t/async
;; done
;; (let [file (setup-file-with-tokens)
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; events [(wtch/apply-token {:shape-ids [(:id rect-1)]
;; :attributes #{:r1 :r2 :r3 :r4}
;; :token (toht/get-token file "borderRadius.sm")
;; :on-update-shape wtch/update-shape-radius-all})
;; (wtch/apply-token {:shape-ids [(:id rect-1)]
;; :attributes #{:r1 :r2 :r3 :r4}
;; :token (toht/get-token file "borderRadius.md")
;; :on-update-shape wtch/update-shape-radius-all})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token (toht/get-token file' "borderRadius.md")
;; rect-1' (cths/get-shape file' :rect-1)]
;; (t/testing "shape `:applied-tokens` got updated"
;; (t/is (some? (:applied-tokens rect-1')))
;; (t/is (= (:r1 (:applied-tokens rect-1')) (:name token))))
;; (t/testing "shape radius got update to the resolved token value."
;; (t/is (= (:r1 rect-1') 24))))))))))
(t/deftest test-apply-token-overwrite
(t/testing "removes old token attributes and applies only single attribute"
(t/async
done
(let [file (setup-file-with-tokens)
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
events [;; Apply "borderRadius.sm" to all border radius attributes
(wtch/apply-token {:attributes #{:r1 :r2 :r3 :r4}
:token (toht/get-token file "borderRadius.sm")
:shape-ids [(:id rect-1)]
:on-update-shape wtch/update-shape-radius-all})
;; Apply single `:r1` attribute to same shape
;; while removing other attributes from the border-radius set
;; but keep `:r4` for testing purposes
(wtch/apply-token {:attributes #{:r1 :r2 :r3}
:token (toht/get-token file "borderRadius.md")
:shape-ids [(:id rect-1)]
:on-update-shape wtch/update-shape-radius-all})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token-sm (toht/get-token file' "borderRadius.sm")
token-md (toht/get-token file' "borderRadius.md")
rect-1' (cths/get-shape file' :rect-1)]
(t/testing "r1 got applied with borderRadius.md"
(t/is (= (:r1 (:applied-tokens rect-1')) (:name token-md))))
(t/testing "while :r4 was kept with borderRadius.sm"
(t/is (= (:r4 (:applied-tokens rect-1')) (:name token-sm)))))))))))
;; (t/deftest test-apply-token-overwrite
;; (t/testing "removes old token attributes and applies only single attribute"
;; (t/async
;; done
;; (let [file (setup-file-with-tokens)
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; events [;; Apply "borderRadius.sm" to all border radius attributes
;; (wtch/apply-token {:attributes #{:r1 :r2 :r3 :r4}
;; :token (toht/get-token file "borderRadius.sm")
;; :shape-ids [(:id rect-1)]
;; :on-update-shape wtch/update-shape-radius-all})
;; ;; Apply single `:r1` attribute to same shape
;; ;; while removing other attributes from the border-radius set
;; ;; but keep `:r4` for testing purposes
;; (wtch/apply-token {:attributes #{:r1 :r2 :r3}
;; :token (toht/get-token file "borderRadius.md")
;; :shape-ids [(:id rect-1)]
;; :on-update-shape wtch/update-shape-radius-all})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token-sm (toht/get-token file' "borderRadius.sm")
;; token-md (toht/get-token file' "borderRadius.md")
;; rect-1' (cths/get-shape file' :rect-1)]
;; (t/testing "r1 got applied with borderRadius.md"
;; (t/is (= (:r1 (:applied-tokens rect-1')) (:name token-md))))
;; (t/testing "while :r4 was kept with borderRadius.sm"
;; (t/is (= (:r4 (:applied-tokens rect-1')) (:name token-sm)))))))))))
(t/deftest test-apply-dimensions
(t/testing "applies dimensions token and updates the shapes width and height"
(t/async
done
(let [dimensions-token {:name "dimensions.sm"
:value "100"
:type :dimensions}
file (-> (setup-file-with-tokens)
(update-in [:data :tokens-lib]
#(ctob/add-token-in-set % "Set A" (ctob/make-token dimensions-token))))
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
events [(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:width :height}
:token (toht/get-token file "dimensions.sm")
:on-update-shape wtch/update-shape-dimensions})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token-target' (toht/get-token file' "dimensions.sm")
rect-1' (cths/get-shape file' :rect-1)]
(t/testing "shape `:applied-tokens` got updated"
(t/is (some? (:applied-tokens rect-1')))
(t/is (= (:width (:applied-tokens rect-1')) (:name token-target')))
(t/is (= (:height (:applied-tokens rect-1')) (:name token-target'))))
(t/testing "shapes width and height got updated"
(t/is (= (:width rect-1') 100))
(t/is (= (:height rect-1') 100))))))))))
;; (t/deftest test-apply-dimensions
;; (t/testing "applies dimensions token and updates the shapes width and height"
;; (t/async
;; done
;; (let [dimensions-token {:name "dimensions.sm"
;; :value "100"
;; :type :dimensions}
;; file (-> (setup-file-with-tokens)
;; (update-in [:data :tokens-lib]
;; #(ctob/add-token-in-set % "Set A" (ctob/make-token dimensions-token))))
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; events [(wtch/apply-token {:shape-ids [(:id rect-1)]
;; :attributes #{:width :height}
;; :token (toht/get-token file "dimensions.sm")
;; :on-update-shape wtch/update-shape-dimensions})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token-target' (toht/get-token file' "dimensions.sm")
;; rect-1' (cths/get-shape file' :rect-1)]
;; (t/testing "shape `:applied-tokens` got updated"
;; (t/is (some? (:applied-tokens rect-1')))
;; (t/is (= (:width (:applied-tokens rect-1')) (:name token-target')))
;; (t/is (= (:height (:applied-tokens rect-1')) (:name token-target'))))
;; (t/testing "shapes width and height got updated"
;; (t/is (= (:width rect-1') 100))
;; (t/is (= (:height rect-1') 100))))))))))
(t/deftest test-apply-sizing
(t/testing "applies sizing token and updates the shapes width and height"
(t/async
done
(let [sizing-token {:name "sizing.sm"
:value "100"
:type :sizing}
file (-> (setup-file-with-tokens)
(update-in [:data :tokens-lib]
#(ctob/add-token-in-set % "Set A" (ctob/make-token sizing-token))))
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
events [(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:width :height}
:token (toht/get-token file "sizing.sm")
:on-update-shape wtch/update-shape-dimensions})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token-target' (toht/get-token file' "sizing.sm")
rect-1' (cths/get-shape file' :rect-1)]
(t/testing "shape `:applied-tokens` got updated"
(t/is (some? (:applied-tokens rect-1')))
(t/is (= (:width (:applied-tokens rect-1')) (:name token-target')))
(t/is (= (:height (:applied-tokens rect-1')) (:name token-target'))))
(t/testing "shapes width and height got updated"
(t/is (= (:width rect-1') 100))
(t/is (= (:height rect-1') 100))))))))))
;; (t/deftest test-apply-sizing
;; (t/testing "applies sizing token and updates the shapes width and height"
;; (t/async
;; done
;; (let [sizing-token {:name "sizing.sm"
;; :value "100"
;; :type :sizing}
;; file (-> (setup-file-with-tokens)
;; (update-in [:data :tokens-lib]
;; #(ctob/add-token-in-set % "Set A" (ctob/make-token sizing-token))))
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; events [(wtch/apply-token {:shape-ids [(:id rect-1)]
;; :attributes #{:width :height}
;; :token (toht/get-token file "sizing.sm")
;; :on-update-shape wtch/update-shape-dimensions})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token-target' (toht/get-token file' "sizing.sm")
;; rect-1' (cths/get-shape file' :rect-1)]
;; (t/testing "shape `:applied-tokens` got updated"
;; (t/is (some? (:applied-tokens rect-1')))
;; (t/is (= (:width (:applied-tokens rect-1')) (:name token-target')))
;; (t/is (= (:height (:applied-tokens rect-1')) (:name token-target'))))
;; (t/testing "shapes width and height got updated"
;; (t/is (= (:width rect-1') 100))
;; (t/is (= (:height rect-1') 100))))))))))
(t/deftest test-apply-opacity
(t/testing "applies opacity token and updates the shapes opacity"
(t/async
done
(let [opacity-float {:name "opacity.float"
:value "0.3"
:type :opacity}
opacity-percent {:name "opacity.percent"
:value "40%"
:type :opacity}
opacity-invalid {:name "opacity.invalid"
:value "100"
:type :opacity}
file (-> (setup-file-with-tokens)
(update-in [:data :tokens-lib]
#(-> %
(ctob/add-token-in-set "Set A" (ctob/make-token opacity-float))
(ctob/add-token-in-set "Set A" (ctob/make-token opacity-percent))
(ctob/add-token-in-set "Set A" (ctob/make-token opacity-invalid)))))
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
rect-2 (cths/get-shape file :rect-2)
rect-3 (cths/get-shape file :rect-3)
events [(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:opacity}
:token (toht/get-token file "opacity.float")
:on-update-shape wtch/update-opacity})
(wtch/apply-token {:shape-ids [(:id rect-2)]
:attributes #{:opacity}
:token (toht/get-token file "opacity.percent")
:on-update-shape wtch/update-opacity})
(wtch/apply-token {:shape-ids [(:id rect-3)]
:attributes #{:opacity}
:token (toht/get-token file "opacity.invalid")
:on-update-shape wtch/update-opacity})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
rect-1' (cths/get-shape file' :rect-1)
rect-2' (cths/get-shape file' :rect-2)
rect-3' (cths/get-shape file' :rect-3)
token-opacity-float (toht/get-token file' "opacity.float")
token-opacity-percent (toht/get-token file' "opacity.percent")
token-opacity-invalid (toht/get-token file' "opacity.invalid")]
(t/testing "float value got translated to float and applied to opacity"
(t/is (= (:opacity (:applied-tokens rect-1')) (:name token-opacity-float)))
(t/is (= (:opacity rect-1') 0.3)))
(t/testing "percentage value got translated to float and applied to opacity"
(t/is (= (:opacity (:applied-tokens rect-2')) (:name token-opacity-percent)))
(t/is (= (:opacity rect-2') 0.4)))
(t/testing "invalid opacity value got applied but did not change shape"
(t/is (= (:opacity (:applied-tokens rect-3')) (:name token-opacity-invalid)))
(t/is (nil? (:opacity rect-3')))))))))))
;; (t/deftest test-apply-opacity
;; (t/testing "applies opacity token and updates the shapes opacity"
;; (t/async
;; done
;; (let [opacity-float {:name "opacity.float"
;; :value "0.3"
;; :type :opacity}
;; opacity-percent {:name "opacity.percent"
;; :value "40%"
;; :type :opacity}
;; opacity-invalid {:name "opacity.invalid"
;; :value "100"
;; :type :opacity}
;; file (-> (setup-file-with-tokens)
;; (update-in [:data :tokens-lib]
;; #(-> %
;; (ctob/add-token-in-set "Set A" (ctob/make-token opacity-float))
;; (ctob/add-token-in-set "Set A" (ctob/make-token opacity-percent))
;; (ctob/add-token-in-set "Set A" (ctob/make-token opacity-invalid)))))
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; rect-2 (cths/get-shape file :rect-2)
;; rect-3 (cths/get-shape file :rect-3)
;; events [(wtch/apply-token {:shape-ids [(:id rect-1)]
;; :attributes #{:opacity}
;; :token (toht/get-token file "opacity.float")
;; :on-update-shape wtch/update-opacity})
;; (wtch/apply-token {:shape-ids [(:id rect-2)]
;; :attributes #{:opacity}
;; :token (toht/get-token file "opacity.percent")
;; :on-update-shape wtch/update-opacity})
;; (wtch/apply-token {:shape-ids [(:id rect-3)]
;; :attributes #{:opacity}
;; :token (toht/get-token file "opacity.invalid")
;; :on-update-shape wtch/update-opacity})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; rect-1' (cths/get-shape file' :rect-1)
;; rect-2' (cths/get-shape file' :rect-2)
;; rect-3' (cths/get-shape file' :rect-3)
;; token-opacity-float (toht/get-token file' "opacity.float")
;; token-opacity-percent (toht/get-token file' "opacity.percent")
;; token-opacity-invalid (toht/get-token file' "opacity.invalid")]
;; (t/testing "float value got translated to float and applied to opacity"
;; (t/is (= (:opacity (:applied-tokens rect-1')) (:name token-opacity-float)))
;; (t/is (= (:opacity rect-1') 0.3)))
;; (t/testing "percentage value got translated to float and applied to opacity"
;; (t/is (= (:opacity (:applied-tokens rect-2')) (:name token-opacity-percent)))
;; (t/is (= (:opacity rect-2') 0.4)))
;; (t/testing "invalid opacity value got applied but did not change shape"
;; (t/is (= (:opacity (:applied-tokens rect-3')) (:name token-opacity-invalid)))
;; (t/is (nil? (:opacity rect-3')))))))))))
(t/deftest test-apply-rotation
(t/testing "applies rotation token and updates the shapes rotation"
(t/async
done
(let [rotation-token {:name "rotation.medium"
:value "120"
:type :rotation}
file (-> (setup-file-with-tokens)
(update-in [:data :tokens-lib]
#(ctob/add-token-in-set % "Set A" (ctob/make-token rotation-token))))
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
events [(wtch/apply-token {:shape-ids [(:id rect-1)]
:attributes #{:rotation}
:token (toht/get-token file "rotation.medium")
:on-update-shape wtch/update-rotation})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token-target' (toht/get-token file' "rotation.medium")
rect-1' (cths/get-shape file' :rect-1)]
(t/is (some? (:applied-tokens rect-1')))
(t/is (= (:rotation (:applied-tokens rect-1')) (:name token-target')))
(t/is (= (:rotation rect-1') 120)))))))))
;; (t/deftest test-apply-rotation
;; (t/testing "applies rotation token and updates the shapes rotation"
;; (t/async
;; done
;; (let [rotation-token {:name "rotation.medium"
;; :value "120"
;; :type :rotation}
;; file (-> (setup-file-with-tokens)
;; (update-in [:data :tokens-lib]
;; #(ctob/add-token-in-set % "Set A" (ctob/make-token rotation-token))))
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; events [(wtch/apply-token {:shape-ids [(:id rect-1)]
;; :attributes #{:rotation}
;; :token (toht/get-token file "rotation.medium")
;; :on-update-shape wtch/update-rotation})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token-target' (toht/get-token file' "rotation.medium")
;; rect-1' (cths/get-shape file' :rect-1)]
;; (t/is (some? (:applied-tokens rect-1')))
;; (t/is (= (:rotation (:applied-tokens rect-1')) (:name token-target')))
;; (t/is (= (:rotation rect-1') 120)))))))))
(t/deftest test-apply-stroke-width
(t/testing "applies stroke-width token and updates the shapes with stroke"
(t/async
done
(let [stroke-width-token {:name "stroke-width.sm"
:value "10"
:type :stroke-width}
file (-> (setup-file-with-tokens {:rect-1 {:strokes [{:stroke-alignment :inner,
:stroke-style :solid,
:stroke-color "#000000",
:stroke-opacity 1,
:stroke-width 5}]}})
(update-in [:data :tokens-lib]
#(ctob/add-token-in-set % "Set A" (ctob/make-token stroke-width-token))))
store (ths/setup-store file)
rect-with-stroke (cths/get-shape file :rect-1)
rect-without-stroke (cths/get-shape file :rect-2)
events [(wtch/apply-token {:shape-ids [(:id rect-with-stroke) (:id rect-without-stroke)]
:attributes #{:stroke-width}
:token (toht/get-token file "stroke-width.sm")
:on-update-shape wtch/update-stroke-width})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token-target' (toht/get-token file' "stroke-width.sm")
rect-with-stroke' (cths/get-shape file' :rect-1)
rect-without-stroke' (cths/get-shape file' :rect-2)]
(t/testing "token got applied to rect with stroke and shape stroke got updated"
(t/is (= (:stroke-width (:applied-tokens rect-with-stroke')) (:name token-target')))
(t/is (= (get-in rect-with-stroke' [:strokes 0 :stroke-width]) 10)))
(t/testing "token got applied to rect without stroke but shape didnt get updated"
(t/is (= (:stroke-width (:applied-tokens rect-without-stroke')) (:name token-target')))
(t/is (empty? (:strokes rect-without-stroke')))))))))))
;; (t/deftest test-apply-stroke-width
;; (t/testing "applies stroke-width token and updates the shapes with stroke"
;; (t/async
;; done
;; (let [stroke-width-token {:name "stroke-width.sm"
;; :value "10"
;; :type :stroke-width}
;; file (-> (setup-file-with-tokens {:rect-1 {:strokes [{:stroke-alignment :inner,
;; :stroke-style :solid,
;; :stroke-color "#000000",
;; :stroke-opacity 1,
;; :stroke-width 5}]}})
;; (update-in [:data :tokens-lib]
;; #(ctob/add-token-in-set % "Set A" (ctob/make-token stroke-width-token))))
;; store (ths/setup-store file)
;; rect-with-stroke (cths/get-shape file :rect-1)
;; rect-without-stroke (cths/get-shape file :rect-2)
;; events [(wtch/apply-token {:shape-ids [(:id rect-with-stroke) (:id rect-without-stroke)]
;; :attributes #{:stroke-width}
;; :token (toht/get-token file "stroke-width.sm")
;; :on-update-shape wtch/update-stroke-width})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token-target' (toht/get-token file' "stroke-width.sm")
;; rect-with-stroke' (cths/get-shape file' :rect-1)
;; rect-without-stroke' (cths/get-shape file' :rect-2)]
;; (t/testing "token got applied to rect with stroke and shape stroke got updated"
;; (t/is (= (:stroke-width (:applied-tokens rect-with-stroke')) (:name token-target')))
;; (t/is (= (get-in rect-with-stroke' [:strokes 0 :stroke-width]) 10)))
;; (t/testing "token got applied to rect without stroke but shape didnt get updated"
;; (t/is (= (:stroke-width (:applied-tokens rect-without-stroke')) (:name token-target')))
;; (t/is (empty? (:strokes rect-without-stroke')))))))))))
(t/deftest test-toggle-token-none
(t/testing "should apply token to all selected items, where no item has the token applied"
(t/async
done
(let [file (setup-file-with-tokens)
store (ths/setup-store file)
rect-1 (cths/get-shape file :rect-1)
rect-2 (cths/get-shape file :rect-2)
events [(wtch/toggle-token {:shapes [rect-1 rect-2]
:token-type-props {:attributes #{:r1 :r2 :r3 :r4}
:on-update-shape wtch/update-shape-radius-all}
:token (toht/get-token file "borderRadius.md")})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
token-2' (toht/get-token file' "borderRadius.md")
rect-1' (cths/get-shape file' :rect-1)
rect-2' (cths/get-shape file' :rect-2)]
(t/is (some? (:applied-tokens rect-1')))
(t/is (some? (:applied-tokens rect-2')))
(t/is (= (:r1 (:applied-tokens rect-1')) (:name token-2')))
(t/is (= (:r1 (:applied-tokens rect-2')) (:name token-2')))
(t/is (= (:r1 rect-1') 24))
(t/is (= (:r1 rect-2') 24)))))))))
;; (t/deftest test-toggle-token-none
;; (t/testing "should apply token to all selected items, where no item has the token applied"
;; (t/async
;; done
;; (let [file (setup-file-with-tokens)
;; store (ths/setup-store file)
;; rect-1 (cths/get-shape file :rect-1)
;; rect-2 (cths/get-shape file :rect-2)
;; events [(wtch/toggle-token {:shapes [rect-1 rect-2]
;; :token-type-props {:attributes #{:r1 :r2 :r3 :r4}
;; :on-update-shape wtch/update-shape-radius-all}
;; :token (toht/get-token file "borderRadius.md")})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; token-2' (toht/get-token file' "borderRadius.md")
;; rect-1' (cths/get-shape file' :rect-1)
;; rect-2' (cths/get-shape file' :rect-2)]
;; (t/is (some? (:applied-tokens rect-1')))
;; (t/is (some? (:applied-tokens rect-2')))
;; (t/is (= (:r1 (:applied-tokens rect-1')) (:name token-2')))
;; (t/is (= (:r1 (:applied-tokens rect-2')) (:name token-2')))
;; (t/is (= (:r1 rect-1') 24))
;; (t/is (= (:r1 rect-2') 24)))))))))
(t/deftest test-toggle-token-mixed
(t/testing "should unapply given token if one of the selected items has the token applied while keeping other tokens with some attributes"
(t/async
done
(let [file (-> (setup-file-with-tokens)
(toht/apply-token-to-shape :rect-1 "borderRadius.sm" #{:r1 :r2 :r3 :r4})
(toht/apply-token-to-shape :rect-3 "borderRadius.md" #{:r1 :r2 :r3 :r4}))
store (ths/setup-store file)
;; (t/deftest test-toggle-token-mixed
;; (t/testing "should unapply given token if one of the selected items has the token applied while keeping other tokens with some attributes"
;; (t/async
;; done
;; (let [file (-> (setup-file-with-tokens)
;; (toht/apply-token-to-shape :rect-1 "borderRadius.sm" #{:r1 :r2 :r3 :r4})
;; (toht/apply-token-to-shape :rect-3 "borderRadius.md" #{:r1 :r2 :r3 :r4}))
;; store (ths/setup-store file)
rect-with-token (cths/get-shape file :rect-1)
rect-without-token (cths/get-shape file :rect-2)
rect-with-other-token (cths/get-shape file :rect-3)
;; rect-with-token (cths/get-shape file :rect-1)
;; rect-without-token (cths/get-shape file :rect-2)
;; rect-with-other-token (cths/get-shape file :rect-3)
events [(wtch/toggle-token {:shapes [rect-with-token rect-without-token rect-with-other-token]
:token (toht/get-token file "borderRadius.sm")
:token-type-props {:attributes #{:r1 :r2 :r3 :r4}}})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
rect-with-token' (cths/get-shape file' :rect-1)
rect-without-token' (cths/get-shape file' :rect-2)
rect-with-other-token' (cths/get-shape file' :rect-3)]
;; events [(wtch/toggle-token {:shapes [rect-with-token rect-without-token rect-with-other-token]
;; :token (toht/get-token file "borderRadius.sm")
;; :token-type-props {:attributes #{:r1 :r2 :r3 :r4}}})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; rect-with-token' (cths/get-shape file' :rect-1)
;; rect-without-token' (cths/get-shape file' :rect-2)
;; rect-with-other-token' (cths/get-shape file' :rect-3)]
(t/testing "rect-with-token got the token removed"
(t/is (nil? (:r1 (:applied-tokens rect-with-token')))))
;; (t/testing "rect-with-token got the token removed"
;; (t/is (nil? (:r1 (:applied-tokens rect-with-token')))))
(t/testing "rect-without-token didn't get updated"
(t/is (= (:applied-tokens rect-without-token') (:applied-tokens rect-without-token))))
;; (t/testing "rect-without-token didn't get updated"
;; (t/is (= (:applied-tokens rect-without-token') (:applied-tokens rect-without-token))))
(t/testing "rect-with-other-token didn't get updated"
(t/is (= (:applied-tokens rect-with-other-token') (:applied-tokens rect-with-other-token)))))))))))
;; (t/testing "rect-with-other-token didn't get updated"
;; (t/is (= (:applied-tokens rect-with-other-token') (:applied-tokens rect-with-other-token)))))))))))
(t/deftest test-toggle-token-apply-to-all
(t/testing "should apply token to all if none of the shapes has it applied"
(t/async
done
(let [file (-> (setup-file-with-tokens)
(toht/apply-token-to-shape :rect-1 "borderRadius.md" #{:r1 :r2 :r3 :r4})
(toht/apply-token-to-shape :rect-3 "borderRadius.md" #{:r1 :r2 :r3 :r4}))
store (ths/setup-store file)
;; (t/deftest test-toggle-token-apply-to-all
;; (t/testing "should apply token to all if none of the shapes has it applied"
;; (t/async
;; done
;; (let [file (-> (setup-file-with-tokens)
;; (toht/apply-token-to-shape :rect-1 "borderRadius.md" #{:r1 :r2 :r3 :r4})
;; (toht/apply-token-to-shape :rect-3 "borderRadius.md" #{:r1 :r2 :r3 :r4}))
;; store (ths/setup-store file)
rect-with-other-token-1 (cths/get-shape file :rect-1)
rect-without-token (cths/get-shape file :rect-2)
rect-with-other-token-2 (cths/get-shape file :rect-3)
;; rect-with-other-token-1 (cths/get-shape file :rect-1)
;; rect-without-token (cths/get-shape file :rect-2)
;; rect-with-other-token-2 (cths/get-shape file :rect-3)
events [(wtch/toggle-token {:shapes [rect-with-other-token-1 rect-without-token rect-with-other-token-2]
:token (toht/get-token file "borderRadius.sm")
:token-type-props {:attributes #{:r1 :r2 :r3 :r4}}})]]
(tohs/run-store-async
store done events
(fn [new-state]
(let [file' (ths/get-file-from-store new-state)
target-token (toht/get-token file' "borderRadius.sm")
rect-with-other-token-1' (cths/get-shape file' :rect-1)
rect-without-token' (cths/get-shape file' :rect-2)
rect-with-other-token-2' (cths/get-shape file' :rect-3)]
;; events [(wtch/toggle-token {:shapes [rect-with-other-token-1 rect-without-token rect-with-other-token-2]
;; :token (toht/get-token file "borderRadius.sm")
;; :token-type-props {:attributes #{:r1 :r2 :r3 :r4}}})]]
;; (tohs/run-store-async
;; store done events
;; (fn [new-state]
;; (let [file' (ths/get-file-from-state new-state)
;; target-token (toht/get-token file' "borderRadius.sm")
;; rect-with-other-token-1' (cths/get-shape file' :rect-1)
;; rect-without-token' (cths/get-shape file' :rect-2)
;; rect-with-other-token-2' (cths/get-shape file' :rect-3)]
(t/testing "token got applied to all shapes"
(t/is (= (:r1 (:applied-tokens rect-with-other-token-1')) (:name target-token)))
(t/is (= (:r1 (:applied-tokens rect-without-token')) (:name target-token)))
(t/is (= (:r1 (:applied-tokens rect-with-other-token-2')) (:name target-token)))))))))))
;; (t/testing "token got applied to all shapes"
;; (t/is (= (:r1 (:applied-tokens rect-with-other-token-1')) (:name target-token)))
;; (t/is (= (:r1 (:applied-tokens rect-without-token')) (:name target-token)))
;; (t/is (= (:r1 (:applied-tokens rect-with-other-token-2')) (:name target-token)))))))))))