clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 11:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge issues

Browse Source
This commit is contained in:
Peng Xiao
2022-09-24 10:16:19 +08:00
parent fd94862312
commit 526a8d99c8
6 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/frontend/ui.cljs
View File

@@ -5,6 +5,7 @@
["react-textarea-autosize" :as TextareaAutosize]
["react-tippy" :as react-tippy]
["react-transition-group" :refer [CSSTransition TransitionGroup]]
[camel-snake-kebab.core :as csk]
[cljs-bean.core :as bean]
[clojure.string :as string]
[datascript.core :as d]
@@ -30,18 +31,8 @@
[goog.object :as gobj]
[lambdaisland.glogi :as log]
[medley.core :as medley]
[electron.ipc :as ipc]
["react-resize-context" :as Resize]
["react-textarea-autosize" :as TextareaAutosize]
["react-tippy" :as react-tippy]
["react-transition-group" :refer [CSSTransition TransitionGroup]]
["@logseq/react-tweet-embed" :as react-tweet-embed]
["react-intersection-observer" :as react-intersection-observer]
[rum.core :as rum]
[camel-snake-kebab.core :as csk]
[frontend.db-mixins :as db-mixins]
[frontend.mobile.util :as mobile-util]
[goog.functions :refer [debounce]]))
[promesa.core :as p]
[rum.core :as rum]))
(defonce transition-group (r/adapt-class TransitionGroup))
(defonce css-transition (r/adapt-class CSSTransition))
@@ -970,6 +961,12 @@
{:class (str "ls-icon-" class)}
(f (merge {:size 18} (r/map-keys->camel-case opts)))])))))))
(rum/defc type-icon
[{:keys [name class title extension?]}]
[:.type-icon {:class class
:title title}
(icon name {:extension? extension?})])
(rum/defc with-shortcut < rum/reactive
< {:key-fn (fn [key pos] (str "shortcut-" key pos))}
[shortcut-key position content]