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

♻️ Remove obsolete st/emitf macro

Browse source
This commit is contained in:
Andrés Moya 2022-05-20 16:33:42 +02:00
parent eb07350cac
commit 2be432e1d4
40 changed files with 211 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/app/main/data/dashboard/shortcuts.cljs
View file

@ -14,22 +14,22 @@
{:go-to-search {:tooltip (ds/meta "F") {:go-to-search {:tooltip (ds/meta "F")
:command (ds/c-mod "f") :command (ds/c-mod "f")
:subsections [:navigation-dashboard] :subsections [:navigation-dashboard]
:fn (st/emitf (dd/go-to-search))} :fn #(st/emit! (dd/go-to-search))}
:go-to-drafts {:tooltip "G D" :go-to-drafts {:tooltip "G D"
:command "g d" :command "g d"
:subsections [:navigation-dashboard] :subsections [:navigation-dashboard]
:fn (st/emitf (dd/go-to-drafts))} :fn #(st/emit! (dd/go-to-drafts))}
:go-to-libs {:tooltip "G L" :go-to-libs {:tooltip "G L"
:command "g l" :command "g l"
:subsections [:navigation-dashboard] :subsections [:navigation-dashboard]
:fn (st/emitf (dd/go-to-libs))} :fn #(st/emit! (dd/go-to-libs))}
:create-new-project {:tooltip "+" :create-new-project {:tooltip "+"
:command "+" :command "+"
:subsections [:general-dashboard] :subsections [:general-dashboard]
:fn (st/emitf (dd/create-element))}}) :fn #(st/emit! (dd/create-element))}})
(defn get-tooltip [shortcut] (defn get-tooltip [shortcut]
(assert (contains? shortcuts shortcut) (str shortcut)) (assert (contains? shortcuts shortcut) (str shortcut))

16
frontend/src/app/main/data/viewer/shortcuts.cljs
View file

@ -14,42 +14,42 @@
{:increase-zoom {:tooltip "+" {:increase-zoom {:tooltip "+"
:command "+" :command "+"
:subsections [:zoom-viewer] :subsections [:zoom-viewer]
:fn (st/emitf dv/increase-zoom)} :fn #(st/emit! dv/increase-zoom)}
:decrease-zoom {:tooltip "-" :decrease-zoom {:tooltip "-"
:command "-" :command "-"
:subsections [:zoom-viewer] :subsections [:zoom-viewer]
:fn (st/emitf dv/decrease-zoom)} :fn #(st/emit! dv/decrease-zoom)}
:select-all {:tooltip (ds/meta "A") :select-all {:tooltip (ds/meta "A")
:command (ds/c-mod "a") :command (ds/c-mod "a")
:subsections [:general-viewer] :subsections [:general-viewer]
:fn (st/emitf (dv/select-all))} :fn #(st/emit! (dv/select-all))}
:reset-zoom {:tooltip (ds/shift "0") :reset-zoom {:tooltip (ds/shift "0")
:command "shift+0" :command "shift+0"
:subsections [:zoom-viewer] :subsections [:zoom-viewer]
:fn (st/emitf dv/reset-zoom)} :fn #(st/emit! dv/reset-zoom)}
:toggle-zoom-style {:tooltip "F" :toggle-zoom-style {:tooltip "F"
:command "f" :command "f"
:subsections [:zoom-viewer] :subsections [:zoom-viewer]
:fn (st/emitf dv/toggle-zoom-style)} :fn #(st/emit! dv/toggle-zoom-style)}
:toogle-fullscreen {:tooltip (ds/shift "F") :toogle-fullscreen {:tooltip (ds/shift "F")
:command "shift+f" :command "shift+f"
:subsections [:zoom-viewer] :subsections [:zoom-viewer]
:fn (st/emitf dv/toggle-fullscreen)} :fn #(st/emit! dv/toggle-fullscreen)}
:next-frame {:tooltip ds/left-arrow :next-frame {:tooltip ds/left-arrow
:command "left" :command "left"
:subsections [:general-viewer] :subsections [:general-viewer]
:fn (st/emitf dv/select-prev-frame)} :fn #(st/emit! dv/select-prev-frame)}
:prev-frame {:tooltip ds/right-arrow :prev-frame {:tooltip ds/right-arrow
:command "right" :command "right"
:subsections [:general-viewer] :subsections [:general-viewer]
:fn (st/emitf dv/select-next-frame)} :fn #(st/emit! dv/select-next-frame)}
:open-handoff {:tooltip "G H" :open-handoff {:tooltip "G H"
:command "g h" :command "g h"

8
frontend/src/app/main/errors.cljs
View file

@ -35,7 +35,7 @@
:else :else
(let [hint (ex-message error) (let [hint (ex-message error)
msg (dm/str "Internal Error: " hint)] msg (dm/str "Internal Error: " hint)]
(ts/schedule (st/emitf (rt/assign-exception error))) (ts/schedule #(st/emit! (rt/assign-exception error)))
(js/console.group msg) (js/console.group msg)
(ex/ignoring (js/console.error error)) (ex/ignoring (js/console.error error))
@ -51,7 +51,7 @@
[_] [_]
(let [msg (tr "errors.auth.unable-to-login")] (let [msg (tr "errors.auth.unable-to-login")]
(st/emit! (du/logout {:capture-redirect true})) (st/emit! (du/logout {:capture-redirect true}))
(ts/schedule 500 (st/emitf (msg/warn msg))))) (ts/schedule 500 #(st/emit! (msg/warn msg)))))
;; Error that happens on an active business model validation does not ;; Error that happens on an active business model validation does not
;; passes an validation (example: profile can't leave a team). From ;; passes an validation (example: profile can't leave a team). From
@ -154,7 +154,7 @@
(defmethod ptk/handle-error ::exceptional-state (defmethod ptk/handle-error ::exceptional-state
[error] [error]
(ts/schedule (ts/schedule
(st/emitf (rt/assign-exception error)))) #(st/emit! (rt/assign-exception error))))
;; This happens when the backed server fails to process the ;; This happens when the backed server fails to process the
;; request. This can be caused by an internal assertion or any other ;; request. This can be caused by an internal assertion or any other
@ -188,7 +188,7 @@
(-> error ex-data ptk/handle-error) (-> error ex-data ptk/handle-error)
(let [hint (ex-message error) (let [hint (ex-message error)
msg (dm/str "Unhandled Internal Error: " hint)] msg (dm/str "Unhandled Internal Error: " hint)]
(ts/schedule (st/emitf (rt/assign-exception error))) (ts/schedule #(st/emit! (rt/assign-exception error)))
(js/console.group msg) (js/console.group msg)
(ex/ignoring (js/console.error error)) (ex/ignoring (js/console.error error))
(js/console.groupEnd msg)))) (js/console.groupEnd msg))))

13
frontend/src/app/main/store.clj
View file

@ -1,13 +0,0 @@
;; 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) UXBOX Labs SL
(ns app.main.store)
(defmacro emitf
[& events]
`(fn []
(app.main.store/emit! ~@events)))

5
frontend/src/app/main/store.cljs
View file

@ -5,7 +5,6 @@
;; Copyright (c) UXBOX Labs SL ;; Copyright (c) UXBOX Labs SL
(ns app.main.store (ns app.main.store
(:require-macros [app.main.store])
(:require (:require
[app.util.object :as obj] [app.util.object :as obj]
[beicon.core :as rx] [beicon.core :as rx]
@ -56,10 +55,6 @@
(apply ptk/emit! state (cons event events)) (apply ptk/emit! state (cons event events))
nil)) nil))
(defn emitf
[& events]
#(apply ptk/emit! state events))
(defonce ongoing-tasks (l/atom #{})) (defonce ongoing-tasks (l/atom #{}))
(add-watch ongoing-tasks ::ongoing-tasks (add-watch ongoing-tasks ::ongoing-tasks

2
frontend/src/app/main/ui/auth/login.cljs
View file

@ -211,6 +211,6 @@
[:div.links.demo [:div.links.demo
[:div.link-entry [:div.link-entry
[:span (tr "auth.create-demo-profile") " "] [:span (tr "auth.create-demo-profile") " "]
[:a {:on-click (st/emitf (du/create-demo-profile)) [:a {:on-click #(st/emit! (du/create-demo-profile))
:data-test "demo-account-link"} :data-test "demo-account-link"}
(tr "auth.create-demo-account")]]])]]) (tr "auth.create-demo-account")]]])]])

12
frontend/src/app/main/ui/comments.cljs
View file

@ -204,19 +204,19 @@
on-delete-comment on-delete-comment
(mf/use-callback (mf/use-callback
(mf/deps comment) (mf/deps comment)
(st/emitf (dcm/delete-comment comment))) #(st/emit! (dcm/delete-comment comment)))
delete-thread delete-thread
(mf/use-callback (mf/use-callback
(mf/deps thread) (mf/deps thread)
(st/emitf (dcm/close-thread) #(st/emit! (dcm/close-thread)
(dcm/delete-comment-thread thread))) (dcm/delete-comment-thread thread)))
on-delete-thread on-delete-thread
(mf/use-callback (mf/use-callback
(mf/deps thread) (mf/deps thread)
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:title (tr "modals.delete-comment-thread.title") :title (tr "modals.delete-comment-thread.title")
:message (tr "modals.delete-comment-thread.message") :message (tr "modals.delete-comment-thread.message")
@ -292,11 +292,11 @@
(mf/use-layout-effect (mf/use-layout-effect
(mf/deps thread) (mf/deps thread)
(st/emitf (dcm/retrieve-comments (:id thread)))) #(st/emit! (dcm/retrieve-comments (:id thread))))
(mf/use-effect (mf/use-effect
(mf/deps thread) (mf/deps thread)
(st/emitf (dcm/update-comment-thread-status thread))) #(st/emit! (dcm/update-comment-thread-status thread)))
(mf/use-layout-effect (mf/use-layout-effect
(mf/deps thread comments-map) (mf/deps thread comments-map)

2
frontend/src/app/main/ui/dashboard.cljs
View file

@ -50,7 +50,7 @@
(mf/defc dashboard-content (mf/defc dashboard-content
[{:keys [team projects project section search-term profile] :as props}] [{:keys [team projects project section search-term profile] :as props}]
[:div.dashboard-content {:on-click (st/emitf (dd/clear-selected-files))} [:div.dashboard-content {:on-click #(st/emit! (dd/clear-selected-files))}
(case section (case section
:dashboard-projects :dashboard-projects
[:& projects-section {:team team :projects projects}] [:& projects-section {:team team :projects projects}]

2
frontend/src/app/main/ui/dashboard/change_owner.cljs
View file

@ -33,7 +33,7 @@
(filter #(not= (:label %) (:fullname profile)) (filter #(not= (:label %) (:fullname profile))
(map #(hash-map :label (:name %) :value (str (:id %))) members))) (map #(hash-map :label (:name %) :value (str (:id %))) members)))
on-cancel (st/emitf (modal/hide)) on-cancel #(st/emit! (modal/hide))
on-accept on-accept
(fn [_] (fn [_]
(let [member-id (get-in @form [:clean-data :member-id])] (let [member-id (get-in @form [:clean-data :member-id])]

4
frontend/src/app/main/ui/dashboard/file_menu.cljs
View file

@ -126,10 +126,10 @@
{:on-success #(on-move-success team-id project-id)})))))) {:on-success #(on-move-success team-id project-id)}))))))
add-shared add-shared
(st/emitf (dd/set-file-shared (assoc file :is-shared true))) #(st/emit! (dd/set-file-shared (assoc file :is-shared true)))
del-shared del-shared
(st/emitf (dd/set-file-shared (assoc file :is-shared false))) #(st/emit! (dd/set-file-shared (assoc file :is-shared false)))
on-add-shared on-add-shared
(fn [event] (fn [event]

2
frontend/src/app/main/ui/dashboard/files.cljs
View file

@ -39,7 +39,7 @@
toggle-pin toggle-pin
(mf/use-callback (mf/use-callback
(mf/deps project) (mf/deps project)
(st/emitf (dd/toggle-project-pin project))) #(st/emit! (dd/toggle-project-pin project)))
on-create-clicked on-create-clicked
(mf/use-callback (mf/use-callback

4
frontend/src/app/main/ui/dashboard/fonts.cljs
View file

@ -41,12 +41,12 @@
;; (let [go-fonts ;; (let [go-fonts
;; (mf/use-callback ;; (mf/use-callback
;; (mf/deps team) ;; (mf/deps team)
;; (st/emitf (rt/nav :dashboard-fonts {:team-id (:id team)}))) ;; #(st/emit! (rt/nav :dashboard-fonts {:team-id (:id team)})))
;; go-providers ;; go-providers
;; (mf/use-callback ;; (mf/use-callback
;; (mf/deps team) ;; (mf/deps team)
;; (st/emitf (rt/nav :dashboard-font-providers {:team-id (:id team)})))] ;; #(st/emit! (rt/nav :dashboard-font-providers {:team-id (:id team)})))]
(use-set-page-title team section) (use-set-page-title team section)

4
frontend/src/app/main/ui/dashboard/libraries.cljs
View file

@ -33,8 +33,8 @@
(dom/set-html-title (tr "title.dashboard.shared-libraries" tname)))))) (dom/set-html-title (tr "title.dashboard.shared-libraries" tname))))))
(mf/use-effect (mf/use-effect
(st/emitf (dd/fetch-shared-files) #(st/emit! (dd/fetch-shared-files)
(dd/clear-selected-files))) (dd/clear-selected-files)))
[:* [:*
[:header.dashboard-header [:header.dashboard-header

6
frontend/src/app/main/ui/dashboard/project_menu.cljs
View file

@ -56,7 +56,7 @@
(with-meta project {:on-success on-duplicate-success})))) (with-meta project {:on-success on-duplicate-success}))))
toggle-pin toggle-pin
(st/emitf (dd/toggle-project-pin project)) #(st/emit! (dd/toggle-project-pin project))
on-move-success on-move-success
(fn [team-id] (fn [team-id]
@ -66,7 +66,7 @@
(fn [team-id] (fn [team-id]
(let [data {:id (:id project) :team-id team-id} (let [data {:id (:id project) :team-id team-id}
mdata {:on-success #(on-move-success team-id)}] mdata {:on-success #(on-move-success team-id)}]
(st/emitf (dm/success (tr "dashboard.success-move-project")) #(st/emit! (dm/success (tr "dashboard.success-move-project"))
(dd/move-project (with-meta data mdata))))) (dd/move-project (with-meta data mdata)))))
delete-fn delete-fn
@ -76,7 +76,7 @@
(dd/go-to-projects (:team-id project)))) (dd/go-to-projects (:team-id project))))
on-delete on-delete
(st/emitf #(st/emit!
(modal/show (modal/show
{:type :confirm {:type :confirm
:title (tr "modals.delete-project-confirm.title") :title (tr "modals.delete-project-confirm.title")

8
frontend/src/app/main/ui/dashboard/projects.cljs
View file

@ -25,7 +25,7 @@
(mf/defc header (mf/defc header
{::mf/wrap [mf/memo]} {::mf/wrap [mf/memo]}
[] []
(let [create (st/emitf (dd/create-project))] (let [create #(st/emit! (dd/create-project))]
[:header.dashboard-header [:header.dashboard-header
[:div.dashboard-title [:div.dashboard-title
[:h1 (tr "dashboard.projects-title")]] [:h1 (tr "dashboard.projects-title")]]
@ -49,13 +49,13 @@
on-nav on-nav
(mf/use-callback (mf/use-callback
(mf/deps project) (mf/deps project)
(st/emitf (rt/nav :dashboard-files {:team-id (:team-id project) #(st/emit! (rt/nav :dashboard-files {:team-id (:team-id project)
:project-id (:id project)}))) :project-id (:id project)})))
toggle-pin toggle-pin
(mf/use-callback (mf/use-callback
(mf/deps project) (mf/deps project)
(st/emitf (dd/toggle-project-pin project))) #(st/emit! (dd/toggle-project-pin project)))
on-menu-click on-menu-click
(mf/use-callback (fn [event] (mf/use-callback (fn [event]

58
frontend/src/app/main/ui/dashboard/sidebar.cljs
View file

@ -102,8 +102,8 @@
on-drop-success on-drop-success
(mf/use-callback (mf/use-callback
(mf/deps (:id item)) (mf/deps (:id item))
(st/emitf (msg/success (tr "dashboard.success-move-file")) #(st/emit! (msg/success (tr "dashboard.success-move-file"))
(dd/go-to-files (:id item)))) (dd/go-to-files (:id item))))
on-drop on-drop
(mf/use-callback (mf/use-callback
@ -209,7 +209,7 @@
on-create-clicked on-create-clicked
(mf/use-callback (mf/use-callback
(st/emitf (modal/show :team-form {}))) #(st/emit! (modal/show :team-form {})))
team-selected team-selected
(mf/use-callback (mf/use-callback
@ -240,9 +240,9 @@
(mf/defc team-options-dropdown (mf/defc team-options-dropdown
[{:keys [team profile] :as props}] [{:keys [team profile] :as props}]
(let [go-members (st/emitf (dd/go-to-team-members)) (let [go-members #(st/emit! (dd/go-to-team-members))
go-invitations (st/emitf (dd/go-to-team-invitations)) go-invitations #(st/emit! (dd/go-to-team-invitations))
go-settings (st/emitf (dd/go-to-team-settings)) go-settings #(st/emit! (dd/go-to-team-settings))
members-map (mf/deref refs/dashboard-team-members) members-map (mf/deref refs/dashboard-team-members)
members (vals members-map) members (vals members-map)
@ -283,12 +283,12 @@
(st/emit! (modal/show :team-form {:team team}))) (st/emit! (modal/show :team-form {:team team})))
on-leave-clicked on-leave-clicked
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:title (tr "modals.leave-confirm.title") :title (tr "modals.leave-confirm.title")
:message (tr "modals.leave-confirm.message") :message (tr "modals.leave-confirm.message")
:accept-label (tr "modals.leave-confirm.accept") :accept-label (tr "modals.leave-confirm.accept")
:on-accept leave-fn})) :on-accept leave-fn}))
on-leave-as-owner-clicked on-leave-as-owner-clicked
(fn [] (fn []
@ -300,22 +300,22 @@
:accept leave-fn}))) :accept leave-fn})))
leave-and-close leave-and-close
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:title (tr "modals.leave-confirm.title") :title (tr "modals.leave-confirm.title")
:message (tr "modals.leave-and-close-confirm.message" (:name team)) :message (tr "modals.leave-and-close-confirm.message" (:name team))
:scd-message (tr "modals.leave-and-close-confirm.hint") :scd-message (tr "modals.leave-and-close-confirm.hint")
:accept-label (tr "modals.leave-confirm.accept") :accept-label (tr "modals.leave-confirm.accept")
:on-accept delete-fn})) :on-accept delete-fn}))
on-delete-clicked on-delete-clicked
(st/emitf #(st/emit!
(modal/show (modal/show
{:type :confirm {:type :confirm
:title (tr "modals.delete-team-confirm.title") :title (tr "modals.delete-team-confirm.title")
:message (tr "modals.delete-team-confirm.message") :message (tr "modals.delete-team-confirm.message")
:accept-label (tr "modals.delete-team-confirm.accept") :accept-label (tr "modals.delete-team-confirm.accept")
:on-accept delete-fn}))] :on-accept delete-fn}))]
[:ul.dropdown.options-dropdown [:ul.dropdown.options-dropdown
[:li {:on-click go-members :data-test "team-members"} (tr "labels.members")] [:li {:on-click go-members :data-test "team-members"} (tr "labels.members")]
@ -391,12 +391,12 @@
go-projects go-projects
(mf/use-callback (mf/use-callback
(mf/deps team) (mf/deps team)
(st/emitf (rt/nav :dashboard-projects {:team-id (:id team)}))) #(st/emit! (rt/nav :dashboard-projects {:team-id (:id team)})))
go-fonts go-fonts
(mf/use-callback (mf/use-callback
(mf/deps team) (mf/deps team)
(st/emitf (rt/nav :dashboard-fonts {:team-id (:id team)}))) #(st/emit! (rt/nav :dashboard-fonts {:team-id (:id team)})))
go-drafts go-drafts
(mf/use-callback (mf/use-callback
@ -408,7 +408,7 @@
go-libs go-libs
(mf/use-callback (mf/use-callback
(mf/deps team) (mf/deps team)
(st/emitf (rt/nav :dashboard-libraries {:team-id (:id team)}))) #(st/emit! (rt/nav :dashboard-libraries {:team-id (:id team)})))
pinned-projects pinned-projects
(->> (vals projects) (->> (vals projects)

4
frontend/src/app/main/ui/dashboard/team.cljs
View file

@ -592,8 +592,8 @@
(mf/use-effect (mf/use-effect
(st/emitf (dd/fetch-team-members) #(st/emit! (dd/fetch-team-members)
(dd/fetch-team-stats))) (dd/fetch-team-stats)))
[:* [:*
[:& header {:section :dashboard-team-settings [:& header {:section :dashboard-team-settings

2
frontend/src/app/main/ui/dashboard/team_form.cljs
View file

@ -82,7 +82,7 @@
[:h2 (tr "labels.create-team")])] [:h2 (tr "labels.create-team")])]
[:div.modal-close-button [:div.modal-close-button
{:on-click (st/emitf (modal/hide))} i/close]] {:on-click #(st/emit! (modal/hide))} i/close]]
[:div.modal-content.generic-form [:div.modal-content.generic-form
[:& fm/input {:type "text" [:& fm/input {:type "text"

2
frontend/src/app/main/ui/messages.cljs
View file

@ -49,7 +49,7 @@
(mf/defc notifications (mf/defc notifications
[] []
(let [message (mf/deref refs/message) (let [message (mf/deref refs/message)
on-close (st/emitf dm/hide)] on-close #(st/emit! dm/hide)]
(when message (when message
[:& banner (assoc message [:& banner (assoc message
:position (or (:position message) :fixed) :position (or (:position message) :fixed)

7
frontend/src/app/main/ui/releases.cljs
View file

@ -44,14 +44,13 @@
finish finish
(mf/use-callback (mf/use-callback
(st/emitf (modal/hide) #(st/emit! (modal/hide)
(du/mark-onboarding-as-viewed {:version version}))) (du/mark-onboarding-as-viewed {:version version})))]
]
(mf/use-effect (mf/use-effect
(mf/deps) (mf/deps)
(fn [] (fn []
(st/emitf (du/mark-onboarding-as-viewed {:version version})))) #(st/emit! (du/mark-onboarding-as-viewed {:version version}))))
(mf/use-layout-effect (mf/use-layout-effect
(mf/deps @slide) (mf/deps @slide)

2
frontend/src/app/main/ui/settings/change_email.cljs
View file

@ -77,7 +77,7 @@
:validators [email-equality] :validators [email-equality]
:initial profile) :initial profile)
on-close on-close
(mf/use-callback (st/emitf (modal/hide)))] (mf/use-callback #(st/emit! (modal/hide)))]
[:div.modal-overlay [:div.modal-overlay
[:div.modal-container.change-email-modal.form-container [:div.modal-container.change-email-modal.form-container

8
frontend/src/app/main/ui/settings/delete_account.cljs
View file

@ -28,13 +28,13 @@
::mf/register-as :delete-account} ::mf/register-as :delete-account}
[] []
(let [on-close (let [on-close
(mf/use-callback (st/emitf (modal/hide))) (mf/use-callback #(st/emit! (modal/hide)))
on-accept on-accept
(mf/use-callback (mf/use-callback
(st/emitf (modal/hide) #(st/emit! (modal/hide)
(du/request-account-deletion (du/request-account-deletion
(with-meta {} {:on-error on-error}))))] (with-meta {} {:on-error on-error}))))]
[:div.modal-overlay [:div.modal-overlay
[:div.modal-container.change-email-modal [:div.modal-container.change-email-modal

10
frontend/src/app/main/ui/settings/sidebar.cljs
View file

@ -29,27 +29,27 @@
go-dashboard go-dashboard
(mf/use-callback (mf/use-callback
(mf/deps profile) (mf/deps profile)
(st/emitf (rt/nav :dashboard-projects {:team-id (du/get-current-team-id profile)}))) #(st/emit! (rt/nav :dashboard-projects {:team-id (du/get-current-team-id profile)})))
go-settings-profile go-settings-profile
(mf/use-callback (mf/use-callback
(mf/deps profile) (mf/deps profile)
(st/emitf (rt/nav :settings-profile))) #(st/emit! (rt/nav :settings-profile)))
go-settings-feedback go-settings-feedback
(mf/use-callback (mf/use-callback
(mf/deps profile) (mf/deps profile)
(st/emitf (rt/nav :settings-feedback))) #(st/emit! (rt/nav :settings-feedback)))
go-settings-password go-settings-password
(mf/use-callback (mf/use-callback
(mf/deps profile) (mf/deps profile)
(st/emitf (rt/nav :settings-password))) #(st/emit! (rt/nav :settings-password)))
go-settings-options go-settings-options
(mf/use-callback (mf/use-callback
(mf/deps profile) (mf/deps profile)
(st/emitf (rt/nav :settings-options))) #(st/emit! (rt/nav :settings-options)))
show-release-notes show-release-notes
(mf/use-callback (mf/use-callback

6
frontend/src/app/main/ui/static.cljs
View file

@ -41,7 +41,7 @@
[:div.desc-message (tr "labels.bad-gateway.desc-message")] [:div.desc-message (tr "labels.bad-gateway.desc-message")]
[:div.sign-info [:div.sign-info
[:a.btn-primary.btn-small [:a.btn-primary.btn-small
{:on-click (st/emitf #(dissoc % :exception))} {:on-click (fn [] (st/emit! #(dissoc % :exception)))}
(tr "labels.retry")]]]) (tr "labels.retry")]]])
(mf/defc service-unavailable (mf/defc service-unavailable
@ -52,7 +52,7 @@
[:div.desc-message (tr "labels.service-unavailable.desc-message")] [:div.desc-message (tr "labels.service-unavailable.desc-message")]
[:div.sign-info [:div.sign-info
[:a.btn-primary.btn-small [:a.btn-primary.btn-small
{:on-click (st/emitf #(dissoc % :exception))} {:on-click (fn [] (st/emit! #(dissoc % :exception)))}
(tr "labels.retry")]]]) (tr "labels.retry")]]])
(mf/defc internal-error (mf/defc internal-error
@ -63,7 +63,7 @@
[:div.desc-message (tr "labels.internal-error.desc-message")] [:div.desc-message (tr "labels.internal-error.desc-message")]
[:div.sign-info [:div.sign-info
[:a.btn-primary.btn-small [:a.btn-primary.btn-small
{:on-click (st/emitf (rt/assign-exception nil))} {:on-click (fn [] (st/emit! (rt/assign-exception nil)))}
(tr "labels.retry")]]]) (tr "labels.retry")]]])
(mf/defc exception-page (mf/defc exception-page

2
frontend/src/app/main/ui/viewer/comments.cljs
View file

@ -122,7 +122,7 @@
on-draft-cancel on-draft-cancel
(mf/use-callback (mf/use-callback
(mf/deps cstate) (mf/deps cstate)
(st/emitf (dcm/close-thread))) #(st/emit! (dcm/close-thread)))
on-draft-submit on-draft-submit
(mf/use-callback (mf/use-callback

1
frontend/src/app/main/ui/viewer/handoff/attributes/layout.cljs
View file

@ -11,7 +11,6 @@
[app.main.ui.formats :as fmt] [app.main.ui.formats :as fmt]
[app.util.code-gen :as cg] [app.util.code-gen :as cg]
[app.util.i18n :refer [tr]] [app.util.i18n :refer [tr]]
[app.util.strings :as ust]
[cuerdas.core :as str] [cuerdas.core :as str]
[rumext.alpha :as mf])) [rumext.alpha :as mf]))

12
frontend/src/app/main/ui/viewer/header.cljs
View file

@ -92,11 +92,11 @@
[:& export-progress-widget] [:& export-progress-widget]
[:& zoom-widget [:& zoom-widget
{:zoom zoom {:zoom zoom
:on-increase (st/emitf dv/increase-zoom) :on-increase #(st/emit! dv/increase-zoom)
:on-decrease (st/emitf dv/decrease-zoom) :on-decrease #(st/emit! dv/decrease-zoom)
:on-zoom-reset (st/emitf dv/reset-zoom) :on-zoom-reset #(st/emit! dv/reset-zoom)
:on-zoom-fill (st/emitf dv/zoom-to-fill) :on-zoom-fill #(st/emit! dv/zoom-to-fill)
:on-zoom-fit (st/emitf dv/zoom-to-fit) :on-zoom-fit #(st/emit! dv/zoom-to-fit)
:on-fullscreen toggle-fullscreen}] :on-fullscreen toggle-fullscreen}]
[:span.btn-icon-dark.btn-small.tooltip.tooltip-bottom-left [:span.btn-icon-dark.btn-small.tooltip.tooltip-bottom-left
@ -172,7 +172,7 @@
(mf/defc header (mf/defc header
[{:keys [project file page frame zoom section permissions index]}] [{:keys [project file page frame zoom section permissions index]}]
(let [go-to-dashboard (let [go-to-dashboard
(st/emitf (dv/go-to-dashboard)) #(st/emit! (dv/go-to-dashboard))
go-to-handoff go-to-handoff
(fn [] (fn []

110
frontend/src/app/main/ui/workspace/context_menu.cljs
View file

@ -101,11 +101,11 @@
(mf/defc context-menu-edit (mf/defc context-menu-edit
[] []
(let [do-copy (st/emitf (dw/copy-selected)) (let [do-copy #(st/emit! (dw/copy-selected))
do-cut (st/emitf (dw/copy-selected) do-cut #(st/emit! (dw/copy-selected)
(dw/delete-selected)) (dw/delete-selected))
do-paste (st/emitf dw/paste) do-paste #(st/emit! dw/paste)
do-duplicate (st/emitf (dw/duplicate-selected false))] do-duplicate #(st/emit! (dw/duplicate-selected false))]
[:* [:*
[:& menu-entry {:title (tr "workspace.shape.menu.copy") [:& menu-entry {:title (tr "workspace.shape.menu.copy")
:shortcut (sc/get-tooltip :copy) :shortcut (sc/get-tooltip :copy)
@ -124,11 +124,11 @@
(mf/defc context-menu-layer-position (mf/defc context-menu-layer-position
[{:keys [hover-objs shapes]}] [{:keys [hover-objs shapes]}]
(let [do-bring-forward (st/emitf (dw/vertical-order-selected :up)) (let [do-bring-forward #(st/emit! (dw/vertical-order-selected :up))
do-bring-to-front (st/emitf (dw/vertical-order-selected :top)) do-bring-to-front #(st/emit! (dw/vertical-order-selected :top))
do-send-backward (st/emitf (dw/vertical-order-selected :down)) do-send-backward #(st/emit! (dw/vertical-order-selected :down))
do-send-to-back (st/emitf (dw/vertical-order-selected :bottom)) do-send-to-back #(st/emit! (dw/vertical-order-selected :bottom))
select-shapes (fn [id] (st/emitf (dws/select-shape id)))] select-shapes (fn [id] #(st/emit! (dws/select-shape id)))]
[:* [:*
(when (> (count hover-objs) 1) (when (> (count hover-objs) 1)
[:& menu-entry {:title (tr "workspace.shape.menu.select-layer")} [:& menu-entry {:title (tr "workspace.shape.menu.select-layer")}
@ -154,8 +154,8 @@
(mf/defc context-menu-flip (mf/defc context-menu-flip
[] []
(let [do-flip-vertical (st/emitf (dw/flip-vertical-selected)) (let [do-flip-vertical #(st/emit! (dw/flip-vertical-selected))
do-flip-horizontal (st/emitf (dw/flip-horizontal-selected))] do-flip-horizontal #(st/emit! (dw/flip-horizontal-selected))]
[:* [:*
[:& menu-entry {:title (tr "workspace.shape.menu.flip-vertical") [:& menu-entry {:title (tr "workspace.shape.menu.flip-vertical")
:shortcut (sc/get-tooltip :flip-vertical) :shortcut (sc/get-tooltip :flip-vertical)
@ -170,7 +170,7 @@
[{:keys [shapes]}] [{:keys [shapes]}]
(let [single? (= (count shapes) 1) (let [single? (= (count shapes) 1)
has-frame? (some cph/frame-shape? shapes) has-frame? (some cph/frame-shape? shapes)
do-toggle-thumbnail (st/emitf (dw/toggle-file-thumbnail-selected))] do-toggle-thumbnail #(st/emit! (dw/toggle-file-thumbnail-selected))]
(when (and single? has-frame?) (when (and single? has-frame?)
[:* [:*
(if (every? :use-for-thumbnail? shapes) (if (every? :use-for-thumbnail? shapes)
@ -186,7 +186,7 @@
(let [multiple? (> (count shapes) 1) (let [multiple? (> (count shapes) 1)
single? (= (count shapes) 1) single? (= (count shapes) 1)
do-create-artboard-from-selection (st/emitf (dw/create-artboard-from-selection)) do-create-artboard-from-selection #(st/emit! (dw/create-artboard-from-selection))
has-group? (->> shapes (d/seek #(= :group (:type %)))) has-group? (->> shapes (d/seek #(= :group (:type %))))
has-bool? (->> shapes (d/seek #(= :bool (:type %)))) has-bool? (->> shapes (d/seek #(= :bool (:type %))))
@ -196,10 +196,10 @@
is-group? (and single? has-group?) is-group? (and single? has-group?)
is-bool? (and single? has-bool?) is-bool? (and single? has-bool?)
do-create-group (st/emitf dw/group-selected) do-create-group #(st/emit! dw/group-selected)
do-mask-group (st/emitf dw/mask-group) do-mask-group #(st/emit! dw/mask-group)
do-remove-group (st/emitf dw/ungroup-selected) do-remove-group #(st/emit! dw/ungroup-selected)
do-unmask-group (st/emitf dw/unmask-group)] do-unmask-group #(st/emit! dw/unmask-group)]
[:* [:*
(when (or has-bool? has-group? has-mask?) (when (or has-bool? has-group? has-mask?)
@ -253,8 +253,8 @@
is-bool? (and single? has-bool?) is-bool? (and single? has-bool?)
is-frame? (and single? has-frame?) is-frame? (and single? has-frame?)
do-start-editing #(timers/schedule (st/emitf (dw/start-editing-selected))) do-start-editing (fn [] (timers/schedule #(st/emit! (dw/start-editing-selected))))
do-transform-to-path (st/emitf (dw/convert-selected-to-path)) do-transform-to-path #(st/emit! (dw/convert-selected-to-path))
make-do-bool make-do-bool
(fn [bool-type] (fn [bool-type]
@ -302,10 +302,10 @@
(mf/defc context-menu-layer-options (mf/defc context-menu-layer-options
[{:keys [shapes]}] [{:keys [shapes]}]
(let [ids (mapv :id shapes) (let [ids (mapv :id shapes)
do-show-shape (st/emitf (dw/update-shape-flags ids {:hidden false})) do-show-shape #(st/emit! (dw/update-shape-flags ids {:hidden false}))
do-hide-shape (st/emitf (dw/update-shape-flags ids {:hidden true})) do-hide-shape #(st/emit! (dw/update-shape-flags ids {:hidden true}))
do-lock-shape (st/emitf (dw/update-shape-flags ids {:blocked true})) do-lock-shape #(st/emit! (dw/update-shape-flags ids {:blocked true}))
do-unlock-shape (st/emitf (dw/update-shape-flags ids {:blocked false}))] do-unlock-shape #(st/emit! (dw/update-shape-flags ids {:blocked false}))]
[:* [:*
(if (every? :hidden shapes) (if (every? :hidden shapes)
[:& menu-entry {:title (tr "workspace.shape.menu.show") [:& menu-entry {:title (tr "workspace.shape.menu.show")
@ -323,8 +323,8 @@
[{:keys [shapes]}] [{:keys [shapes]}]
(let [options (mf/deref refs/workspace-page-options) (let [options (mf/deref refs/workspace-page-options)
options-mode (mf/deref refs/options-mode) options-mode (mf/deref refs/options-mode)
do-add-flow (st/emitf (dwi/add-flow-selected-frame)) do-add-flow #(st/emit! (dwi/add-flow-selected-frame))
do-remove-flow #(st/emitf (dwi/remove-flow (:id %))) do-remove-flow #(st/emit! (dwi/remove-flow (:id %)))
flows (:flows options) flows (:flows options)
prototype? (= options-mode :prototype) prototype? (= options-mode :prototype)
@ -357,36 +357,36 @@
current-file-id (mf/use-ctx ctx/current-file-id) current-file-id (mf/use-ctx ctx/current-file-id)
local-component? (= component-file current-file-id) local-component? (= component-file current-file-id)
do-add-component (st/emitf (dwl/add-component)) do-add-component #(st/emit! (dwl/add-component))
do-detach-component (st/emitf (dwl/detach-component shape-id)) do-detach-component #(st/emit! (dwl/detach-component shape-id))
do-detach-component-in-bulk (st/emitf dwl/detach-selected-components) do-detach-component-in-bulk #(st/emit! dwl/detach-selected-components)
do-reset-component (st/emitf (dwl/reset-component shape-id)) do-reset-component #(st/emit! (dwl/reset-component shape-id))
do-show-component (st/emitf (dw/go-to-component component-id)) do-show-component #(st/emit! (dw/go-to-component component-id))
do-navigate-component-file (st/emitf (dwl/nav-to-component-file component-file)) do-navigate-component-file #(st/emit! (dwl/nav-to-component-file component-file))
do-update-component (st/emitf (dwl/update-component-sync shape-id component-file)) do-update-component #(st/emit! (dwl/update-component-sync shape-id component-file))
do-update-component-in-bulk (st/emitf (dwl/update-component-in-bulk component-shapes component-file)) do-update-component-in-bulk #(st/emit! (dwl/update-component-in-bulk component-shapes component-file))
do-update-remote-component do-update-remote-component
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:message "" :message ""
:title (tr "modals.update-remote-component.message") :title (tr "modals.update-remote-component.message")
:hint (tr "modals.update-remote-component.hint") :hint (tr "modals.update-remote-component.hint")
:cancel-label (tr "modals.update-remote-component.cancel") :cancel-label (tr "modals.update-remote-component.cancel")
:accept-label (tr "modals.update-remote-component.accept") :accept-label (tr "modals.update-remote-component.accept")
:accept-style :primary :accept-style :primary
:on-accept do-update-component})) :on-accept do-update-component}))
do-update-in-bulk (st/emitf (modal/show do-update-in-bulk #(st/emit! (modal/show
{:type :confirm {:type :confirm
:message "" :message ""
:title (tr "modals.update-remote-component-in-bulk.message") :title (tr "modals.update-remote-component-in-bulk.message")
:hint (tr "modals.update-remote-component-in-bulk.hint") :hint (tr "modals.update-remote-component-in-bulk.hint")
:items component-shapes :items component-shapes
:cancel-label (tr "modals.update-remote-component.cancel") :cancel-label (tr "modals.update-remote-component.cancel")
:accept-label (tr "modals.update-remote-component.accept") :accept-label (tr "modals.update-remote-component.accept")
:accept-style :primary :accept-style :primary
:on-accept do-update-component-in-bulk}))] :on-accept do-update-component-in-bulk}))]
[:* [:*
(when (and (not has-frame?) (not is-component?)) (when (and (not has-frame?) (not is-component?))
[:* [:*
@ -433,7 +433,7 @@
(mf/defc context-menu-delete (mf/defc context-menu-delete
[] []
(let [do-delete (st/emitf (dw/delete-selected))] (let [do-delete #(st/emit! (dw/delete-selected))]
[:& menu-entry {:title (tr "workspace.shape.menu.delete") [:& menu-entry {:title (tr "workspace.shape.menu.delete")
:shortcut (sc/get-tooltip :delete) :shortcut (sc/get-tooltip :delete)
:on-click do-delete}])) :on-click do-delete}]))
@ -504,7 +504,7 @@
(.setAttribute ^js dropdown "style" new-style)))))) (.setAttribute ^js dropdown "style" new-style))))))
[:& dropdown {:show (boolean mdata) [:& dropdown {:show (boolean mdata)
:on-close (st/emitf dw/hide-context-menu)} :on-close #(st/emit! dw/hide-context-menu)}
[:ul.workspace-context-menu [:ul.workspace-context-menu
{:ref dropdown-ref {:ref dropdown-ref
:style {:top top :left left} :style {:top top :left left}

45
frontend/src/app/main/ui/workspace/header.cljs
View file

@ -112,36 +112,35 @@
frames (mf/deref refs/workspace-frames) frames (mf/deref refs/workspace-frames)
add-shared-fn add-shared-fn
(st/emitf (dwl/set-file-shared (:id file) true)) #(st/emit! (dwl/set-file-shared (:id file) true))
del-shared-fn del-shared-fn
(st/emitf (dwl/set-file-shared (:id file) false)) #(st/emit! (dwl/set-file-shared (:id file) false))
on-add-shared on-add-shared
(mf/use-fn (mf/use-fn
(mf/deps file) (mf/deps file)
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:message "" :message ""
:title (tr "modals.add-shared-confirm.message" (:name file)) :title (tr "modals.add-shared-confirm.message" (:name file))
:hint (tr "modals.add-shared-confirm.hint") :hint (tr "modals.add-shared-confirm.hint")
:cancel-label :omit :cancel-label :omit
:accept-label (tr "modals.add-shared-confirm.accept") :accept-label (tr "modals.add-shared-confirm.accept")
:accept-style :primary :accept-style :primary
:on-accept add-shared-fn}))) :on-accept add-shared-fn})))
on-remove-shared on-remove-shared
(mf/use-fn (mf/use-fn
(mf/deps file) (mf/deps file)
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:message "" :message ""
:title (tr "modals.remove-shared-confirm.message" (:name file)) :title (tr "modals.remove-shared-confirm.message" (:name file))
:hint (tr "modals.remove-shared-confirm.hint") :hint (tr "modals.remove-shared-confirm.hint")
:cancel-label :omit :cancel-label :omit
:accept-label (tr "modals.remove-shared-confirm.accept") :accept-label (tr "modals.remove-shared-confirm.accept")
:on-accept del-shared-fn}))) :on-accept del-shared-fn})))
handle-blur (fn [_] handle-blur (fn [_]
(let [value (-> edit-input-ref mf/ref-val dom/get-value)] (let [value (-> edit-input-ref mf/ref-val dom/get-value)]
@ -420,7 +419,7 @@
(when (contains? @cf/flags :user-feedback) (when (contains? @cf/flags :user-feedback)
[:* [:*
[:li.feedback {:on-click (st/emitf (rt/nav-new-window* {:rname :settings-feedback}))} [:li.feedback {:on-click #(st/emit! (rt/nav-new-window* {:rname :settings-feedback}))}
[:span (tr "labels.give-feedback")]]])]]])) [:span (tr "labels.give-feedback")]]])]]]))
;; --- Header Component ;; --- Header Component
@ -434,12 +433,12 @@
go-back go-back
(mf/use-callback (mf/use-callback
(mf/deps project) (mf/deps project)
(st/emitf (dw/go-to-dashboard project))) #(st/emit! (dw/go-to-dashboard project)))
go-viewer go-viewer
(mf/use-callback (mf/use-callback
(mf/deps file page-id) (mf/deps file page-id)
(st/emitf (dw/go-to-viewer params)))] #(st/emit! (dw/go-to-viewer params)))]
[:header.workspace-header [:header.workspace-header
[:div.left-area [:div.left-area

2
frontend/src/app/main/ui/workspace/left_toolbar.cljs
View file

@ -73,7 +73,7 @@
{:alt (tr "workspace.toolbar.move" (sc/get-tooltip :move)) {:alt (tr "workspace.toolbar.move" (sc/get-tooltip :move))
:class (when (and (nil? selected-drawtool) :class (when (and (nil? selected-drawtool)
(not edition)) "selected") (not edition)) "selected")
:on-click (st/emitf :interrupt)} :on-click #(st/emit! :interrupt)}
i/pointer-inner] i/pointer-inner]
[:li.tooltip.tooltip-right [:li.tooltip.tooltip-right
{:alt (tr "workspace.toolbar.frame" (sc/get-tooltip :draw-frame)) {:alt (tr "workspace.toolbar.frame" (sc/get-tooltip :draw-frame))

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

@ -317,7 +317,7 @@
content (filter #(= (get-role %) :content) children)] content (filter #(= (get-role %) :content) children)]
[:div.asset-section [:div.asset-section
[:div.asset-title {:class (when (not open?) "closed")} [:div.asset-title {:class (when (not open?) "closed")}
[:span {:on-click (st/emitf (dwl/set-assets-box-open file-id box (not open?)))} [:span {:on-click #(st/emit! (dwl/set-assets-box-open file-id box (not open?)))}
i/arrow-slide title] i/arrow-slide title]
[:span.num-assets (str "\u00A0(") assets-count ")"] ;; Unicode 00A0 is non-breaking space [:span.num-assets (str "\u00A0(") assets-count ")"] ;; Unicode 00A0 is non-breaking space
title-buttons] title-buttons]
@ -905,7 +905,7 @@
add-graphic add-graphic
(mf/use-callback (mf/use-callback
(fn [] (fn []
(st/emitf (dwl/set-assets-box-open file-id :graphics true)) #(st/emit! (dwl/set-assets-box-open file-id :graphics true))
(dom/click (mf/ref-val input-ref)))) (dom/click (mf/ref-val input-ref))))
on-file-selected on-file-selected
@ -1898,7 +1898,7 @@
(count (:colors selected-assets)) (count (:colors selected-assets))
(count (:typographies selected-assets))) (count (:typographies selected-assets)))
toggle-open (st/emitf (dwl/set-assets-box-open (:id file) :library (not open?))) toggle-open #(st/emit! (dwl/set-assets-box-open (:id file) :library (not open?)))
url (rt/resolve router :workspace url (rt/resolve router :workspace
{:project-id (:project-id file) {:project-id (:project-id file)

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

@ -260,7 +260,7 @@
:show-detail @show-detail?) :show-detail @show-detail?)
:on-mouse-enter #(reset! hover? true) :on-mouse-enter #(reset! hover? true)
:on-mouse-leave #(reset! hover? false) :on-mouse-leave #(reset! hover? false)
:on-click (st/emitf (dwc/undo-to-index idx-entry))} :on-click #(st/emit! (dwc/undo-to-index idx-entry))}
[:div.history-entry-summary [:div.history-entry-summary
[:div.history-entry-summary-icon (entry->icon entry)] [:div.history-entry-summary-icon (entry->icon entry)]
[:div.history-entry-summary-text (entry->message locale entry)] [:div.history-entry-summary-text (entry->message locale entry)]

2
frontend/src/app/main/ui/workspace/sidebar/options/menus/bool.cljs
View file

@ -83,6 +83,6 @@
[:div.align-button.tooltip.tooltip-bottom [:div.align-button.tooltip.tooltip-bottom
{:alt (tr "workspace.shape.menu.flatten") {:alt (tr "workspace.shape.menu.flatten")
:class (dom/classnames :disabled disabled-flatten) :class (dom/classnames :disabled disabled-flatten)
:on-click (st/emitf (dw/convert-selected-to-path))} :on-click #(st/emit! (dw/convert-selected-to-path))}
i/bool-flatten]]])) i/bool-flatten]]]))

28
frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
View file

@ -53,27 +53,27 @@
#(swap! local assoc :menu-open false)) #(swap! local assoc :menu-open false))
do-detach-component do-detach-component
(st/emitf (dwl/detach-component id)) #(st/emit! (dwl/detach-component id))
do-reset-component do-reset-component
(st/emitf (dwl/reset-component id)) #(st/emit! (dwl/reset-component id))
do-update-component do-update-component
(st/emitf (dwl/update-component-sync id library-id)) #(st/emit! (dwl/update-component-sync id library-id))
do-update-remote-component do-update-remote-component
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:message "" :message ""
:title (tr "modals.update-remote-component.message") :title (tr "modals.update-remote-component.message")
:hint (tr "modals.update-remote-component.hint") :hint (tr "modals.update-remote-component.hint")
:cancel-label (tr "modals.update-remote-component.cancel") :cancel-label (tr "modals.update-remote-component.cancel")
:accept-label (tr "modals.update-remote-component.accept") :accept-label (tr "modals.update-remote-component.accept")
:accept-style :primary :accept-style :primary
:on-accept do-update-component})) :on-accept do-update-component}))
do-show-component (st/emitf (dw/go-to-component component-id)) do-show-component #(st/emit! (dw/go-to-component component-id))
do-navigate-component-file (st/emitf (dwl/nav-to-component-file library-id))] do-navigate-component-file #(st/emit! (dwl/nav-to-component-file library-id))]
(when show? (when show?
[:div.element-set [:div.element-set
[:div.element-set-title [:div.element-set-title

8
frontend/src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs
View file

@ -137,7 +137,7 @@
nil)) nil))
[:div.flow-element [:div.flow-element
[:div.flow-button {:on-click (st/emitf (dw/select-shape (:starting-frame flow)))} [:div.flow-button {:on-click #(st/emit! (dw/select-shape (:starting-frame flow)))}
i/play] i/play]
(if @editing? (if @editing?
[:input.element-name [:input.element-name
@ -148,9 +148,9 @@
:auto-focus true :auto-focus true
:default-value (:name flow "")}] :default-value (:name flow "")}]
[:span.element-label.flow-name [:span.element-label.flow-name
{:on-double-click (st/emitf (dwi/start-rename-flow (:id flow)))} {:on-double-click #(st/emit! (dwi/start-rename-flow (:id flow)))}
(:name flow)]) (:name flow)])
[:div.add-page {:on-click (st/emitf (dwi/remove-flow (:id flow)))} [:div.add-page {:on-click #(st/emit! (dwi/remove-flow (:id flow)))}
i/minus]])) i/minus]]))
(mf/defc page-flows (mf/defc page-flows
@ -172,7 +172,7 @@
(if (nil? flow) (if (nil? flow)
[:div.flow-element [:div.flow-element
[:span.element-label (tr "workspace.options.flows.add-flow-start")] [:span.element-label (tr "workspace.options.flows.add-flow-start")]
[:div.add-page {:on-click (st/emitf (dwi/add-flow-selected-frame))} [:div.add-page {:on-click #(st/emit! (dwi/add-flow-selected-frame))}
i/plus]] i/plus]]
[:& flow-item {:flow flow :key (str (:id flow))}])]))) [:& flow-item {:flow flow :key (str (:id flow))}])])))

8
frontend/src/app/main/ui/workspace/sidebar/options/menus/typography.cljs
View file

@ -552,9 +552,11 @@
[:span (:text-transform typography)]] [:span (:text-transform typography)]]
[:div.row-flex [:div.row-flex
[:a.go-to-lib-button {:on-click (st/emitf (rt/nav-new-window* {:rname :workspace [:a.go-to-lib-button
:path-params {:project-id (:project-id file) :file-id (:id file)} {:on-click #(st/emit! (rt/nav-new-window* {:rname :workspace
:query-params {:page-id (get-in file [:data :pages 0])}}))} :path-params {:project-id (:project-id file)
:file-id (:id file)}
:query-params {:page-id (get-in file [:data :pages 0])}}))}
(tr "workspace.assets.typography.go-to-edit")]]] (tr "workspace.assets.typography.go-to-edit")]]]
[:* [:*

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

@ -50,11 +50,11 @@
on-delete on-delete
(mf/use-callback (mf/use-callback
(mf/deps id) (mf/deps id)
(st/emitf (modal/show #(st/emit! (modal/show
{:type :confirm {:type :confirm
:title (tr "modals.delete-page.title") :title (tr "modals.delete-page.title")
:message (tr "modals.delete-page.body") :message (tr "modals.delete-page.body")
:on-accept delete-fn}))) :on-accept delete-fn})))
on-double-click on-double-click
(mf/use-callback (mf/use-callback

2
frontend/src/app/main/ui/workspace/viewport/comments.cljs
View file

@ -36,7 +36,7 @@
on-draft-cancel on-draft-cancel
(mf/use-callback (mf/use-callback
(st/emitf :interrupt)) #(st/emit! :interrupt))
on-draft-submit on-draft-submit
(mf/use-callback (mf/use-callback

2
frontend/src/app/main/ui/workspace/viewport/hooks.cljs
View file

@ -285,4 +285,4 @@
(fn [] (fn []
(when (or drawing-path? path-editing?) (when (or drawing-path? path-editing?)
(st/emit! (dsc/push-shortcuts ::path psc/shortcuts)) (st/emit! (dsc/push-shortcuts ::path psc/shortcuts))
(st/emitf (dsc/pop-shortcuts ::path)))))) #(st/emit! (dsc/pop-shortcuts ::path))))))

6
frontend/src/app/main/ui/workspace/viewport/widgets.cljs
View file

@ -109,8 +109,8 @@
on-double-click on-double-click
(mf/use-callback (mf/use-callback
(mf/deps (:id frame)) (mf/deps (:id frame))
(st/emitf (dw/go-to-layout :layers) #(st/emit! (dw/go-to-layout :layers)
(dw/start-rename-shape (:id frame)))) (dw/start-rename-shape (:id frame))))
on-context-menu on-context-menu
(mf/use-callback (mf/use-callback
@ -209,7 +209,7 @@
on-double-click on-double-click
(mf/use-callback (mf/use-callback
(mf/deps (:id frame)) (mf/deps (:id frame))
(st/emitf (dwi/start-rename-flow (:id flow)))) #(st/emit! (dwi/start-rename-flow (:id flow))))
on-pointer-enter on-pointer-enter
(mf/use-callback (mf/use-callback