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

This commit is contained in:
Andrey Antukh 2023-03-17 10:19:04 +01:00
commit 582ec187f8
9 changed files with 125 additions and 42 deletions

View file

@ -5,6 +5,7 @@
;; Copyright (c) KALEIDOS INC
(ns app.main.ui.workspace
(:import goog.events.EventType)
(:require
[app.common.data.macros :as dm]
[app.main.data.messages :as msg]
@ -31,9 +32,11 @@
[app.main.ui.workspace.textpalette :refer [textpalette]]
[app.main.ui.workspace.viewport :refer [viewport]]
[app.util.dom :as dom]
[app.util.globals :as globals]
[app.util.i18n :as i18n :refer [tr]]
[app.util.object :as obj]
[debug :refer [debug?]]
[goog.events :as events]
[okulary.core :as l]
[rumext.v2 :as mf]))
@ -135,7 +138,19 @@
components-v2 (features/use-feature :components-v2)
background-color (:background-color wglobal)]
background-color (:background-color wglobal)
focus-out
(mf/use-callback
(fn []
(st/emit! (dw/workspace-focus-lost))))]
(mf/use-effect
(mf/deps focus-out)
(fn []
(let [keys [(events/listen globals/document EventType.FOCUSOUT focus-out)]]
#(doseq [key keys]
(events/unlistenByKey key)))))
;; Setting the layout preset by its name
(mf/with-effect [layout-name]