Merge remote-tracking branch 'origin/staging' into develop

This commit is contained in:
Andrey Antukh 2024-06-25 16:33:52 +02:00
commit 253e5a11fc

View file

@ -559,8 +559,10 @@
:layout-grid-rows]}) :layout-grid-rows]})
;; We've applied the text-modifier so we can dissoc the temporary data ;; We've applied the text-modifier so we can dissoc the temporary data
(fn [state] (fn [state]
(update state :workspace-text-modifier #(apply dissoc % ids))) (update state :workspace-text-modifier #(apply dissoc % ids))))
(clear-local-transform)) (if (nil? modifiers)
(rx/of (clear-local-transform))
(rx/empty))
(if undo-transation? (if undo-transation?
(rx/of (dwu/commit-undo-transaction undo-id)) (rx/of (dwu/commit-undo-transaction undo-id))
(rx/empty)))))))) (rx/empty))))))))