+Installing and maintaining a self-hosted Penpot instance requires some technical knowledge: +Docker and Docker Compose, basic DNS management, and proxy configuration. +If you're not comfortable with this stack, we encourage you to try +more straight-forward installations with Elestio +or use the SAAS at https://design.penpot.app. +
+ # Install with Docker This section details everything you need to know to get Penpot up and running in @@ -10,42 +18,10 @@ production environments using Docker. For this, we provide a series of *Dockerfi ## Install Docker --Skip this section if you already have docker installed, up and running. -
- -Currently, Docker comes into two different flavours: - -### Docker Desktop - -This is the only option to have Docker in a Windows or MacOS. Recently it's also available -for Linux, in the most popular distributions (Debian, Ubuntu and Fedora). - -You can install it following the official guide. - -Docker Desktop has a graphical control panel (GUI) to manage the service and view the -containers, images and volumes. But you need the command line (Terminal in Linux and Mac, or -PowerShell in Windows) to build and run the containers, and execute other operations. - -It already includes **docker compose** utility, needed by Penpot. - -### Docker Engine - -This is the classic and default Docker setup for Linux machines, and the only option for a -Linux VPS without graphical interface. - -You can install it following the official guide. - -And you also need the [docker -compose](https://docs.docker.com/compose/cli-command/#installing-compose-v2) (V2) -plugin. You can use the old **docker-compose** tool, but all the documentation supposes -you are using the V2. - -You can easily check which version of **docker compose** you have. If you can execute -docker compose command, then you have V2. If you need to write docker-compose (with a
--) for it to work, you have the old version.
+To host a Penpot instance with Docker, it's necessary to have
+docker and docker compose
+installed. Check the comprehensive official documentation
+to install and maintain docker.
## Start Penpot
diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs
index b509f49ce..0d7677f82 100644
--- a/frontend/src/app/main/data/comments.cljs
+++ b/frontend/src/app/main/data/comments.cljs
@@ -648,9 +648,7 @@
(defn detach-comment-thread
"Detach comment threads that are inside a frame when that frame is deleted"
[ids]
- (dm/assert!
- "expected a valid coll of uuid's"
- (sm/check-coll-of-uuid! ids))
+ (assert (sm/check-coll-of-uuid ids))
(ptk/reify ::detach-comment-thread
ptk/WatchEvent
diff --git a/frontend/src/app/main/data/dashboard.cljs b/frontend/src/app/main/data/dashboard.cljs
index f74c834e3..57a886340 100644
--- a/frontend/src/app/main/data/dashboard.cljs
+++ b/frontend/src/app/main/data/dashboard.cljs
@@ -536,11 +536,8 @@
(defn move-files
[{:keys [ids project-id] :as params}]
- (dm/assert! (uuid? project-id))
-
- (dm/assert!
- "expected a valid set of uuids"
- (sm/check-set-of-uuid! ids))
+ (assert (uuid? project-id))
+ (assert (sm/check-set-of-uuid ids))
(ptk/reify ::move-files
ev/Event
diff --git a/frontend/src/app/main/data/team.cljs b/frontend/src/app/main/data/team.cljs
index 383183a6c..2ee1e5828 100644
--- a/frontend/src/app/main/data/team.cljs
+++ b/frontend/src/app/main/data/team.cljs
@@ -350,12 +350,10 @@
(defn create-invitations
[{:keys [emails role team-id resend?] :as params}]
- (dm/assert! (keyword? role))
- (dm/assert! (uuid? team-id))
- (dm/assert!
- "expected a valid set of emails"
- (sm/check-set-of-emails! emails))
+ (assert (keyword? role))
+ (assert (uuid? team-id))
+ (assert (sm/check-set-of-emails emails))
(ptk/reify ::create-invitations
ev/Event
@@ -376,11 +374,8 @@
(defn copy-invitation-link
[{:keys [email team-id] :as params}]
- (dm/assert!
- "expected a valid email"
- (sm/check-email! email))
-
- (dm/assert! (uuid? team-id))
+ (assert (sm/check-email email))
+ (assert (uuid? team-id))
(ptk/reify ::copy-invitation-link
IDeref
@@ -406,12 +401,9 @@
(defn update-invitation-role
[{:keys [email team-id role] :as params}]
- (dm/assert!
- "expected a valid email"
- (sm/check-email! email))
-
- (dm/assert! (uuid? team-id))
- (dm/assert! (contains? ctt/valid-roles role))
+ (assert (sm/check-email email))
+ (assert (uuid? team-id))
+ (assert (contains? ctt/valid-roles role))
(ptk/reify ::update-invitation-role
IDeref
@@ -428,8 +420,9 @@
(defn delete-invitation
[{:keys [email team-id] :as params}]
- (dm/assert! (sm/check-email! email))
- (dm/assert! (uuid? team-id))
+ (assert (sm/check-email email))
+ (assert (uuid? team-id))
+
(ptk/reify ::delete-invitation
ptk/WatchEvent
(watch [_ _ _]
diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs
index 6f5ea56d6..415c06bbb 100644
--- a/frontend/src/app/main/data/tokens.cljs
+++ b/frontend/src/app/main/data/tokens.cljs
@@ -252,6 +252,8 @@
:level :error
:timeout 9000})))))))
+;; FIXME: add schema for params
+
(defn drop-token-set-group [drop-opts]
(ptk/reify ::drop-token-set-group
ptk/WatchEvent
@@ -265,17 +267,21 @@
(rx/of
(drop-error (ex-data e))))))))
-(defn drop-token-set [drop-opts]
+;; FIXME: add schema for params
+
+(defn drop-token-set
+ [params]
(ptk/reify ::drop-token-set
ptk/WatchEvent
(watch [it state _]
(try
- (when-let [changes (clt/generate-move-token-set (pcb/empty-changes it) (get-tokens-lib state) drop-opts)]
+ (let [tokens-lib (get-tokens-lib state)
+ changes (-> (pcb/empty-changes it)
+ (clt/generate-move-token-set tokens-lib params))]
(rx/of (dch/commit-changes changes)
(wtu/update-workspace-tokens)))
- (catch :default e
- (rx/of
- (drop-error (ex-data e))))))))
+ (catch :default cause
+ (rx/of (drop-error (ex-data cause))))))))
(defn- create-token-with-set
"A special case when a first token is created and no set exists"
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index b676dc8d9..1f353c4ac 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -406,6 +406,7 @@
:workspace-media-objects
:workspace-persistence
:workspace-presence
+ :workspace-tokens
:workspace-undo)
(update :workspace-global dissoc :read-only?)
(assoc-in [:workspace-global :options-mode] :design)))
diff --git a/frontend/src/app/main/data/workspace/comments.cljs b/frontend/src/app/main/data/workspace/comments.cljs
index 97bc7747e..5920f4615 100644
--- a/frontend/src/app/main/data/workspace/comments.cljs
+++ b/frontend/src/app/main/data/workspace/comments.cljs
@@ -134,9 +134,7 @@
;; Move comment threads that are inside a frame when that frame is moved"
(defmethod ptk/resolve ::move-frame-comment-threads
[_ ids]
- (dm/assert!
- "expected a valid coll of uuid's"
- (sm/check-coll-of-uuid! ids))
+ (assert (sm/check-coll-of-uuid ids))
(ptk/reify ::move-frame-comment-threads
ptk/WatchEvent
diff --git a/frontend/src/app/main/data/workspace/groups.cljs b/frontend/src/app/main/data/workspace/groups.cljs
index 2e1c1c0ff..bb0dfe1a8 100644
--- a/frontend/src/app/main/data/workspace/groups.cljs
+++ b/frontend/src/app/main/data/workspace/groups.cljs
@@ -120,6 +120,14 @@
(pcb/with-page-id page-id)
(pcb/with-objects objects)
(pcb/add-object group {:index group-idx})
+
+ ;; Create a group needs to reset the constraints to scale/scale
+ (pcb/update-shapes
+ (map :id shapes)
+ (fn [shape]
+ (-> shape
+ (d/assoc-when :constraints-h :scale)
+ (d/assoc-when :constraints-v :scale))))
(pcb/update-shapes (map :id shapes) ctl/remove-layout-item-data)
(pcb/change-parent (:id group) (reverse shapes))
(pcb/update-shapes (map :id shapes-to-detach) ctk/detach-shape)
diff --git a/frontend/src/app/main/data/workspace/modifiers.cljs b/frontend/src/app/main/data/workspace/modifiers.cljs
index de9d58800..ace4d0fc4 100644
--- a/frontend/src/app/main/data/workspace/modifiers.cljs
+++ b/frontend/src/app/main/data/workspace/modifiers.cljs
@@ -533,14 +533,98 @@
(assoc state :workspace-modifiers modif-tree)))))
+(def ^:private xf:without-uuid-zero
+ (remove #(= % uuid/zero)))
+
+(def ^:private transform-attrs
+ #{:selrect
+ :points
+ :x
+ :y
+ :r1
+ :r2
+ :r3
+ :r4
+ :shadow
+ :blur
+ :strokes
+ :width
+ :height
+ :content
+ :transform
+ :transform-inverse
+ :rotation
+ :flip-x
+ :flip-y
+ :grow-type
+ :position-data
+ :layout-gap
+ :layout-padding
+ :layout-item-h-sizing
+ :layout-item-max-h
+ :layout-item-max-w
+ :layout-item-min-h
+ :layout-item-min-w
+ :layout-item-v-sizing
+ :layout-padding-type
+ :layout-item-margin
+ :layout-item-margin-type
+ :layout-grid-cells
+ :layout-grid-columns
+ :layout-grid-rows})
+
+(defn apply-modifiers*
+ "A lower-level version of apply-modifiers, that expects receive ready
+ to use objects, object-modifiers and text-modifiers."
+ [objects object-modifiers text-modifiers options]
+ (ptk/reify ::apply-modifiers*
+ ptk/WatchEvent
+ (watch [_ _ _]
+ (let [ids
+ (into [] xf:without-uuid-zero (keys object-modifiers))
+
+ ids-with-children
+ (into ids
+ (mapcat (partial cfh/get-children-ids objects))
+ ids)
+
+ ignore-tree
+ (calculate-ignore-tree object-modifiers objects)
+
+ options
+ (-> options
+ (assoc :reg-objects? true)
+ (assoc :ignore-tree ignore-tree)
+ ;; Attributes that can change in the transform. This
+ ;; way we don't have to check all the attributes
+ (assoc :attrs transform-attrs))
+
+ update-shape
+ (fn [shape]
+ (let [shape-id (dm/get-prop shape :id)
+ modifiers (dm/get-in object-modifiers [shape-id :modifiers])
+ text-shape? (cfh/text-shape? shape)
+ pos-data (when ^boolean text-shape?
+ (dm/get-in text-modifiers [shape-id :position-data]))]
+ (-> shape
+ (gsh/transform-shape modifiers)
+ (cond-> (d/not-empty? pos-data)
+ (assoc-position-data pos-data shape))
+ (cond-> text-shape?
+ (update-grow-type shape)))))]
+
+ (rx/of (ptk/event ::dwg/move-frame-guides {:ids ids-with-children :modifiers object-modifiers})
+ (ptk/event ::dwcm/move-frame-comment-threads ids-with-children)
+ (dwsh/update-shapes ids update-shape options))))))
+
(defn apply-modifiers
([]
(apply-modifiers nil))
-
- ([{:keys [modifiers undo-transation? stack-undo? ignore-constraints
- ignore-snap-pixel ignore-touched undo-group page-id]
- :or {undo-transation? true stack-undo? false ignore-constraints false
- ignore-snap-pixel false ignore-touched false}}]
+ ([{:keys [modifiers undo-transation? ignore-constraints
+ ignore-snap-pixel page-id]
+ :or {undo-transation? true ignore-constraints false
+ ignore-snap-pixel false}
+ :as options}]
(ptk/reify ::apply-modifiers
ptk/WatchEvent
(watch [_ state _]
@@ -553,88 +637,17 @@
(calculate-modifiers state ignore-constraints ignore-snap-pixel modifiers page-id)
(get state :workspace-modifiers))
- ids
- (into []
- (remove #(= % uuid/zero))
- (keys object-modifiers))
-
- ids-with-children
- (into ids
- (mapcat (partial cfh/get-children-ids objects))
- ids)
-
- ignore-tree
- (calculate-ignore-tree object-modifiers objects)
-
- undo-id (js/Symbol)]
+ undo-id
+ (js/Symbol)]
(rx/concat
(if undo-transation?
(rx/of (dwu/start-undo-transaction undo-id))
(rx/empty))
- (rx/of (ptk/event ::dwg/move-frame-guides {:ids ids-with-children :modifiers object-modifiers})
- (ptk/event ::dwcm/move-frame-comment-threads ids-with-children)
- (dwsh/update-shapes
- ids
- (fn [shape]
- (let [modif (get-in object-modifiers [(:id shape) :modifiers])
- text-shape? (cfh/text-shape? shape)
- position-data (when text-shape?
- (dm/get-in text-modifiers [(:id shape) :position-data]))]
- (-> shape
- (gsh/transform-shape modif)
- (cond-> (d/not-empty? position-data)
- (assoc-position-data position-data shape))
- (cond-> text-shape?
- (update-grow-type shape)))))
- {:reg-objects? true
- :stack-undo? stack-undo?
- :ignore-tree ignore-tree
- :ignore-touched ignore-touched
- :undo-group undo-group
- :page-id page-id
- ;; Attributes that can change in the transform. This way we don't have to check
- ;; all the attributes
- :attrs [:selrect
- :points
- :x
- :y
- :r1
- :r2
- :r3
- :r4
- :shadow
- :blur
- :strokes
- :width
- :height
- :content
- :transform
- :transform-inverse
- :rotation
- :flip-x
- :flip-y
- :grow-type
- :position-data
- :layout-gap
- :layout-padding
- :layout-item-h-sizing
- :layout-item-margin
- :layout-item-max-h
- :layout-item-max-w
- :layout-item-min-h
- :layout-item-min-w
- :layout-item-v-sizing
- :layout-padding-type
- :layout-gap
- :layout-item-margin
- :layout-item-margin-type
- :layout-grid-cells
- :layout-grid-columns
- :layout-grid-rows]})
- ;; We've applied the text-modifier so we can dissoc the temporary data
+ (rx/of (apply-modifiers* objects object-modifiers text-modifiers options)
(fn [state]
- (update state :workspace-text-modifier #(apply dissoc % ids))))
+ (let [ids (into [] xf:without-uuid-zero (keys object-modifiers))]
+ (update state :workspace-text-modifier #(apply dissoc % ids)))))
(if (nil? modifiers)
(rx/of (clear-local-transform))
(rx/empty))
diff --git a/frontend/src/app/main/data/workspace/shapes.cljs b/frontend/src/app/main/data/workspace/shapes.cljs
index cceea35af..b65989e26 100644
--- a/frontend/src/app/main/data/workspace/shapes.cljs
+++ b/frontend/src/app/main/data/workspace/shapes.cljs
@@ -51,11 +51,8 @@
([ids update-fn {:keys [reg-objects? save-undo? stack-undo? attrs ignore-tree page-id ignore-touched undo-group with-objects? changed-sub-attr]
:or {reg-objects? false save-undo? true stack-undo? false ignore-touched false with-objects? false}}]
- (dm/assert!
- "expected a valid coll of uuid's"
- (sm/check-coll-of-uuid! ids))
-
- (dm/assert! (fn? update-fn))
+ (assert (sm/check-coll-of-uuid ids))
+ (assert (fn? update-fn))
(ptk/reify ::update-shapes
ptk/WatchEvent
@@ -162,9 +159,7 @@
([ids] (delete-shapes nil ids {}))
([page-id ids] (delete-shapes page-id ids {}))
([page-id ids options]
- (dm/assert!
- "expected a valid set of uuid's"
- (sm/check-set-of-uuid! ids))
+ (assert (sm/check-set-of-uuid ids))
(ptk/reify ::delete-shapes
ptk/WatchEvent
diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs
index 0c5effb80..ccd166395 100644
--- a/frontend/src/app/main/data/workspace/transforms.cljs
+++ b/frontend/src/app/main/data/workspace/transforms.cljs
@@ -340,35 +340,35 @@
(rx/filter (ptk/type? ::trigger-bounding-box-cloaking) stream)))))))
(defn update-dimensions
- "Change size of shapes, from the sideber options form.
- Will ignore pixel snap used in the options side panel"
+ "Change size of shapes, from the sidebar options form
+ (will ignore pixel snap)"
([ids attr value] (update-dimensions ids attr value nil))
([ids attr value options]
- (dm/assert! (number? value))
- (dm/assert!
- "expected valid coll of uuids"
- (every? uuid? ids))
- (dm/assert!
- "expected valid attr"
- (contains? #{:width :height} attr))
- (ptk/reify ::update-dimensions
- ptk/UpdateEvent
- (update [_ state]
- (let [page-id (or (get options :page-id)
- (get state :current-page-id))
+ (assert (number? value))
+ (assert (every? uuid? ids)
+ "expected valid coll of uuids")
+ (assert (contains? #{:width :height} attr)
+ "expected valid attr")
+
+ (ptk/reify ::update-dimensions
+ ptk/WatchEvent
+ (watch [_ state _]
+ (let [page-id
+ (or (get options :page-id)
+ (get state :current-page-id))
+
+ objects
+ (dsh/lookup-page-objects state page-id)
- objects (dsh/lookup-page-objects state page-id)
get-modifier
- (fn [shape] (ctm/change-dimensions-modifiers shape attr value))
+ (fn [shape]
+ (ctm/change-dimensions-modifiers shape attr value))
+
modif-tree
(-> (dwm/build-modif-tree ids objects get-modifier)
(gm/set-objects-modifiers objects))]
- (assoc state :workspace-modifiers modif-tree)))
-
- ptk/WatchEvent
- (watch [_ _ _]
- (rx/of (dwm/apply-modifiers options))))))
+ (rx/of (dwm/apply-modifiers* objects modif-tree nil options)))))))
(defn change-orientation
"Change orientation of shapes, from the sidebar options form.
@@ -859,42 +859,44 @@
(rx/of (reorder-selected-layout-child direction))
(rx/of (nudge-selected-shapes direction shift?)))))))
-(defn- get-delta [position bbox]
- (let [cpos (gpt/point (:x bbox) (:y bbox))
- pos (gpt/point (or (:x position) (:x bbox))
- (or (:y position) (:y bbox)))]
- (gpt/subtract pos cpos)))
-
-(defn- get-relative-delta [position bbox frame]
- (let [frame-bbox (-> frame :points grc/points->rect)
- relative-cpos (gpt/subtract (gpt/point (:x bbox) (:y bbox))
- (gpt/point (:x frame-bbox)
- (:y frame-bbox)))
- cpos (gpt/point (:x relative-cpos) (:y relative-cpos))
- pos (gpt/point (or (:x position) (:x relative-cpos))
- (or (:y position) (:y relative-cpos)))]
- (gpt/subtract pos cpos)))
+(defn- calculate-delta
+ [position bbox relative-to]
+ (let [current (gpt/point (:x bbox) (:y bbox))
+ position (gpt/point (or (some-> (:x position) (+ (dm/get-prop relative-to :x)))
+ (:x bbox))
+ (or (some-> (:y position) (+ (dm/get-prop relative-to :y)))
+ (:y bbox)))]
+ (gpt/subtract position current)))
(defn update-position
- "Move shapes to a new position"
+ "Move shapes to a new position. It will resolve to the current frame
+ of the shape, unless given the absolute option. In this case it will
+ resolve to the root frame of the page.
+
+ The position is a map that can have a partial position (it means it
+ can receive {:x 10}."
([id position] (update-position id position nil))
([id position options]
- (dm/assert! (uuid? id))
+ (assert (uuid? id) "expected a valid uuid for `id`")
+ (assert (map? position) "expected a valid map for `position`")
+
(ptk/reify ::update-position
ptk/WatchEvent
(watch [_ state _]
- (let [page-id (or (get options :page-id)
- (get state :current-page-id))
- objects (dsh/lookup-page-objects state page-id)
- shape (get objects id)
- ;; FIXME: performance rect
- bbox (-> shape :points grc/points->rect)
- frame (cfh/get-frame objects shape)
- delta (if (:absolute? options)
- (get-delta position bbox)
- (get-relative-delta position bbox frame))
- modif-tree (dwm/create-modif-tree [id] (ctm/move-modifiers delta))]
- (rx/of (dwm/apply-modifiers {:modifiers modif-tree
+ (let [page-id (or (get options :page-id)
+ (get state :current-page-id))
+ objects (dsh/lookup-page-objects state page-id)
+ shape (get objects id)
+
+ bbox (-> shape :points grc/points->rect)
+ frame (if (:absolute? options)
+ (cfh/get-frame objects)
+ (cfh/get-parent-frame objects shape))
+
+ delta (calculate-delta position bbox frame)
+ modifiers (dwm/create-modif-tree [id] (ctm/move-modifiers delta))]
+
+ (rx/of (dwm/apply-modifiers {:modifiers modifiers
:page-id page-id
:ignore-constraints false
:ignore-touched (:ignore-touched options)
diff --git a/frontend/src/app/main/data/workspace/undo.cljs b/frontend/src/app/main/data/workspace/undo.cljs
index 52a8f68af..114ba759f 100644
--- a/frontend/src/app/main/data/workspace/undo.cljs
+++ b/frontend/src/app/main/data/workspace/undo.cljs
@@ -22,7 +22,8 @@
;; Change this to :info :debug or :trace to debug this module
(log/set-level! :warn)
-(def discard-transaction-time-millis (* 20 1000))
+(def ^:private
+ discard-transaction-time-millis (* 20 1000))
(def ^:private
schema:undo-entry
@@ -30,7 +31,7 @@
[:undo-changes [:vector ::cpc/change]]
[:redo-changes [:vector ::cpc/change]]])
-(def check-undo-entry!
+(def check-undo-entry
(sm/check-fn schema:undo-entry))
(def MAX-UNDO-SIZE 50)
@@ -48,8 +49,7 @@
(ptk/reify ::materialize-undo
ptk/UpdateEvent
(update [_ state]
- (-> state
- (assoc-in [:workspace-undo :index] index)))))
+ (update state :workspace-undo assoc :index index))))
(defn- add-undo-entry
[state entry]
@@ -88,12 +88,9 @@
(defn append-undo
[entry stack?]
- (dm/assert!
- "expected valid undo entry"
- (check-undo-entry! entry))
- (dm/assert!
- (boolean? stack?))
+ (assert (check-undo-entry entry))
+ (assert (boolean? stack?))
(ptk/reify ::append-undo
ptk/UpdateEvent
@@ -118,17 +115,11 @@
(defn start-undo-transaction
"Start a transaction, so that every changes inside are added together in a single undo entry."
- [id]
+ [id & {:keys [timeout] :or {timeout discard-transaction-time-millis}}]
(ptk/reify ::start-undo-transaction
- ptk/WatchEvent
- (watch [_ _ _]
- (->> (rx/of (check-open-transactions))
- ;; Wait the configured time
- (rx/delay discard-transaction-time-millis)))
-
ptk/UpdateEvent
(update [_ state]
- (log/info :msg "start-undo-transaction")
+ (log/info :hint "start-undo-transaction")
;; We commit the old transaction before starting the new one
(let [current-tx (get-in state [:workspace-undo :transaction])
pending-tx (get-in state [:workspace-undo :transactions-pending])]
@@ -136,20 +127,28 @@
(nil? current-tx) (assoc-in [:workspace-undo :transaction] empty-tx)
(nil? pending-tx) (assoc-in [:workspace-undo :transactions-pending] #{id})
(some? pending-tx) (update-in [:workspace-undo :transactions-pending] conj id)
- :always (update-in [:workspace-undo :transactions-pending-ts] assoc id (dt/now)))))))
+ :always (update-in [:workspace-undo :transactions-pending-ts] assoc id (dt/now)))))
+
+ ptk/WatchEvent
+ (watch [_ _ _]
+ (when (and timeout (pos? timeout))
+ (->> (rx/of (check-open-transactions timeout))
+ ;; Wait the configured time
+ (rx/delay timeout))))))
+
(defn discard-undo-transaction []
(ptk/reify ::discard-undo-transaction
ptk/UpdateEvent
(update [_ state]
- (log/info :msg "discard-undo-transaction")
+ (log/info :hint "discard-undo-transaction")
(update state :workspace-undo dissoc :transaction :transactions-pending :transactions-pending-ts))))
(defn commit-undo-transaction [id]
(ptk/reify ::commit-undo-transaction
ptk/UpdateEvent
(update [_ state]
- (log/info :msg "commit-undo-transaction")
+ (log/info :hint "commit-undo-transaction")
(let [state (-> state
(update-in [:workspace-undo :transactions-pending] disj id)
(update-in [:workspace-undo :transactions-pending-ts] dissoc id))]
@@ -166,15 +165,15 @@
(assoc state :workspace-undo {}))))
(defn check-open-transactions
- []
+ [timeout]
(ptk/reify ::check-open-transactions
ptk/WatchEvent
(watch [_ state _]
- (log/info :msg "check-open-transactions")
+ (log/info :hint "check-open-transactions" :timeout timeout)
(let [pending-ts (-> (dm/get-in state [:workspace-undo :transactions-pending-ts])
- (update-vals #(.toMillis (dt/diff (dt/now) %))))]
+ (update-vals #(inst-ms (dt/diff (dt/now) %))))]
(->> pending-ts
- (filter (fn [[_ ts]] (>= ts discard-transaction-time-millis)))
+ (filter (fn [[_ ts]] (>= ts timeout)))
(rx/from)
(rx/tap #(js/console.warn (dm/str "FORCE COMMIT TRANSACTION AFTER " (second %) "MS")))
(rx/map first)
diff --git a/frontend/src/app/main/ui/dashboard/templates.cljs b/frontend/src/app/main/ui/dashboard/templates.cljs
index ae2df1b08..ac4a62512 100644
--- a/frontend/src/app/main/ui/dashboard/templates.cljs
+++ b/frontend/src/app/main/ui/dashboard/templates.cljs
@@ -112,16 +112,16 @@
(dom/stop-propagation event)
(on-import item event))))]
- [:a {:class (stl/css :card-container)
- :tab-index (if (or (not is-visible) collapsed) "-1" "0")
- :id id
- :data-index index
- :on-click on-click
- :on-mouse-down dom/prevent-default
- :on-mouse-enter #(reset! hover? true)
- :on-mouse-leave #(reset! hover? false)
- :on-key-down on-key-down}
- [:div {:class (stl/css :template-card)}
+ [:div {:class (stl/css :card-container)
+ :tab-index (if (or (not is-visible) collapsed) "-1" "0")
+ :id id
+ :data-index index}
+ [:a {:class (stl/css :template-card)
+ :on-click on-click
+ :on-mouse-down dom/prevent-default
+ :on-mouse-enter #(reset! hover? true)
+ :on-mouse-leave #(reset! hover? false)
+ :on-key-down on-key-down}
[:div {:class (stl/css :img-container)}
[:img {:src (dm/str thb)
:alt (:name item)
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
index 4642633f1..eb7069cb6 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
@@ -175,7 +175,7 @@
show-in-viewer-ref (mf/use-ref nil)
;; PRESETS
- preset-state* (mf/use-state false)
+ preset-state* (mf/use-state false)
show-presets-dropdown? (deref preset-state*)
open-presets
@@ -205,11 +205,11 @@
;; ORIENTATION
- orientation (when (= type :frame)
- (cond (> (:width values) (:height values))
- :horiz
- :else
- :vert))
+ orientation
+ (when (= type :frame)
+ (if (> (:width values) (:height values))
+ :horiz
+ :vert))
on-orientation-change
(mf/use-fn
@@ -235,10 +235,8 @@
(run! #(st/emit! (udw/set-shape-proportion-lock % new-lock)) ids))))
;; POSITION
-
do-position-change
(mf/use-fn
- (mf/deps ids)
(fn [shape' value attr]
(st/emit! (udw/update-position (:id shape') {attr value}))))
@@ -248,7 +246,7 @@
(fn [value attr]
(st/emit! (udw/trigger-bounding-box-cloaking ids))
(binding [cts/*wasm-sync* true]
- (doall (map #(do-position-change %1 value attr) shapes)))))
+ (run! #(do-position-change %1 value attr) shapes))))
;; ROTATION
diff --git a/frontend/src/app/main/ui/workspace/tokens/changes.cljs b/frontend/src/app/main/ui/workspace/tokens/changes.cljs
index 1137b28e4..8bdc1a67f 100644
--- a/frontend/src/app/main/ui/workspace/tokens/changes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/changes.cljs
@@ -304,13 +304,11 @@
ptk/WatchEvent
(watch [_ state _]
(when (number? value)
- (let [page-id' (or page-id (get state :current-page-id))]
- (rx/concat
- (map #(dwt/update-position % (zipmap attributes (repeat value))
- {:ignore-touched true
- :page-id page-id'})
- shape-ids))))))))
-
+ (let [page-id (or page-id (get state :current-page-id))]
+ (->> (rx/from shape-ids)
+ (rx/map #(dwt/update-position % (zipmap attributes (repeat value))
+ {:ignore-touched true
+ :page-id page-id})))))))))
(defn update-layout-sizing-limits
([value shape-ids attributes] (update-layout-sizing-limits value shape-ids attributes nil))
diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
index be7fee634..cdeec2753 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
@@ -140,24 +140,18 @@
[:div {:class (stl/css :theme-row-right)}
- (if-let [sets-count (some-> theme :sets seq count)]
- [:> button* {:class (stl/css :sets-count-button)
+ (let [sets-count (some-> theme :sets seq count)]
+ [:> button* {:class (stl/css-case :sets-count-button sets-count
+ :sets-count-empty-button (not sets-count))
:variant "secondary"
:type "button"
:title (tr "workspace.token.sets-hint")
:on-click on-edit-theme}
[:div {:class (stl/css :label-wrapper)}
[:> text* {:as "span" :typography "body-medium"}
- (tr "workspace.token.num-active-sets" sets-count)]
- [:> icon* {:icon-id "arrow-right"}]]]
-
- [:> button* {:class (stl/css :sets-count-empty-button)
- :type "button"
- :variant "secondary"
- :on-click on-edit-theme}
- [:div {:class (stl/css :label-wrapper)}
- [:> text* {:as "span" :typography "body-medium"}
- (tr "workspace.token.no-active-sets")]
+ (if sets-count
+ (tr "workspace.token.num-active-sets" sets-count)
+ (tr "workspace.token.no-active-sets"))]
[:> icon* {:icon-id "arrow-right"}]]])
[:> icon-button* {:on-click delete-theme
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets.cljs b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
index 9ad06f0cb..d118136fc 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets.cljs
@@ -368,13 +368,13 @@
(mf/use-fn
(mf/deps collapsed-paths)
(fn [tree-index position data]
- (let [props {:from-index (:index data)
- :to-index tree-index
- :position position
- :collapsed-paths collapsed-paths}]
+ (let [params {:from-index (:index data)
+ :to-index tree-index
+ :position position
+ :collapsed-paths collapsed-paths}]
(if (:is-group data)
- (st/emit! (dt/drop-token-set-group props))
- (st/emit! (dt/drop-token-set props))))))
+ (st/emit! (dt/drop-token-set-group params))
+ (st/emit! (dt/drop-token-set params))))))
on-toggle-collapse
(mf/use-fn
diff --git a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs
index cce133af3..2f375cf56 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs
@@ -103,8 +103,9 @@
(defn- generate-tooltip
"Generates a tooltip for a given token"
[is-viewer shape theme-token token half-applied no-valid-value ref-not-in-active-set]
- (let [{:keys [name value type]} token
- {:keys [resolved-value]} theme-token
+ (let [{:keys [name value type resolved-value]} token
+ resolved-value-theme (:resolved-value theme-token)
+ resolved-value (or resolved-value-theme resolved-value)
{:keys [title] :as token-props} (wtch/get-token-properties theme-token)
applied-tokens (:applied-tokens shape)
app-token-vals (set (vals applied-tokens))
diff --git a/frontend/src/app/main/ui/workspace/tokens/update.cljs b/frontend/src/app/main/ui/workspace/tokens/update.cljs
index b60a8c441..9de0bd233 100644
--- a/frontend/src/app/main/ui/workspace/tokens/update.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/update.cljs
@@ -1,6 +1,13 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
(ns app.main.ui.workspace.tokens.update
(:require
[app.common.files.helpers :as cfh]
+ [app.common.logging :as l]
[app.common.types.token :as ctt]
[app.main.data.helpers :as dsh]
[app.main.data.workspace.shapes :as dwsh]
@@ -9,6 +16,7 @@
[app.main.ui.workspace.tokens.changes :as wtch]
[app.main.ui.workspace.tokens.style-dictionary :as wtsd]
[app.main.ui.workspace.tokens.token-set :as wtts]
+ [app.util.time :as dt]
[beicon.v2.core :as rx]
[clojure.data :as data]
[clojure.set :as set]
@@ -70,7 +78,7 @@
(reduce
(fn [acc [attrs v]]
(cond
- (some attrs #{:widht :height}) (let [[_ a b] (data/diff #{:width :height} attrs)]
+ (some attrs #{:width :height}) (let [[_ a b] (data/diff #{:width :height} attrs)]
(cond-> (assoc acc b v)
;; Exact match in attrs
a (assoc a v)))
@@ -127,8 +135,14 @@
[state resolved-tokens]
(let [file-id (get state :current-file-id)
current-page-id (get state :current-page-id)
- fdata (dsh/lookup-file-data state file-id)]
- (->> (rx/from (:pages fdata))
+ fdata (dsh/lookup-file-data state file-id)
+ tpoint (dt/tpoint-ms)]
+
+ (l/inf :status "START" :hint "update-tokens")
+ (->> (rx/concat
+ (rx/of current-page-id)
+ (->> (rx/from (:pages fdata))
+ (rx/filter (fn [id] (not= id current-page-id)))))
(rx/mapcat
(fn [page-id]
(let [page
@@ -140,6 +154,12 @@
actions
(actionize-shapes-update-info page-id attrs)]
+ (l/inf :status "PROGRESS"
+ :hint "update-tokens"
+ :page-id (str page-id)
+ :elapsed (tpoint)
+ ::l/sync? true)
+
(rx/merge
(rx/from actions)
(->> (rx/from frame-ids)
@@ -151,7 +171,11 @@
(fn [shape]
(dissoc shape :position-data))
{:page-id page-id
- :ignore-touched true}))))))))))
+ :ignore-touched true})))))))
+ (rx/finalize
+ (fn [_]
+ (let [elapsed (tpoint)]
+ (l/inf :status "END" :hint "update-tokens" :elapsed elapsed)))))))
(defn update-workspace-tokens
[]
@@ -164,6 +188,6 @@
(rx/mapcat (fn [sd-tokens]
(let [undo-id (js/Symbol)]
(rx/concat
- (rx/of (dwu/start-undo-transaction undo-id))
+ (rx/of (dwu/start-undo-transaction undo-id :timeout false))
(update-tokens state sd-tokens)
(rx/of (dwu/commit-undo-transaction undo-id)))))))))))
diff --git a/frontend/src/app/plugins/format.cljs b/frontend/src/app/plugins/format.cljs
index 6555f6a36..fdd1c7be9 100644
--- a/frontend/src/app/plugins/format.cljs
+++ b/frontend/src/app/plugins/format.cljs
@@ -176,8 +176,9 @@
(defn format-shadows
[shadows]
- (when (some? shadows)
- (format-array format-shadow shadows)))
+ (if (some? shadows)
+ (format-array format-shadow shadows)
+ (array)))
;;export interface Fill {
;; fillColor?: string;
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index 2517f9095..fdc013d6c 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -6738,7 +6738,7 @@ msgstr "%s sets activos"
#: src/app/main/ui/workspace/tokens/modals/themes.cljs:147
msgid "workspace.token.sets-hint"
-msgstr "Editar tema y gestionar set"
+msgstr "Editar tema y gestionar sets"
#: src/app/main/ui/workspace/tokens/token_pill.cljs:114
#, fuzzy