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

Merge branch 'master' into feat/light-theme

Browse Source
This commit is contained in:
anoffvu
2020-12-02 20:40:25 -08:00
parent e73729aeee c49a31778a
commit d409aa682c
26 changed files with 447 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,22 @@
(defonce transition-group (r/adapt-class TransitionGroup))
(defonce css-transition (r/adapt-class CSSTransition))
(defonce textarea (r/adapt-class (gobj/get TextareaAutosize "default")))
(rum/defc ls-textarea [{:keys [on-change] :as -props}]
(let [composition? (atom false)
set-composition? #(reset! composition? %)
on-composition (fn [e]
(case e.type
"compositionend" (do (set-composition? false) (on-change e))
(set-composition? true)))
props (assoc -props
:on-change (fn [e] (when-not @composition?
(on-change e)))
:on-composition-start on-composition
:on-composition-update on-composition
:on-composition-end on-composition)]
(textarea props)))
(rum/defc dropdown-content-wrapper [state content class]
(let [class (or class
(util/hiccup->class "origin-top-right.absolute.right-0.mt-2.rounded-md.shadow-lg"))]
@@ -292,7 +308,7 @@
:else
nil)
(when-let [element (gdom/getElement (str "ac-" @current-idx))]
(let [ac-inner (gdom/getElement "ac-inner")
(let [ac-inner (gdom/getElement "ui__ac-inner")
element-top (gobj/get element "offsetTop")
scroll-top (- (gobj/get element "offsetTop") 360)]
(set! (.-scrollTop ac-inner) scroll-top)))))
@@ -306,7 +322,7 @@
(reset! current-idx 0)
(swap! current-idx inc)))
(when-let [element (gdom/getElement (str "ac-" @current-idx))]
(let [ac-inner (gdom/getElement "ac-inner")
(let [ac-inner (gdom/getElement "ui__ac-inner")
element-top (gobj/get element "offsetTop")
scroll-top (- (gobj/get element "offsetTop") 360)]
(set! (.-scrollTop ac-inner) scroll-top)))))
@@ -320,8 +336,7 @@
(> (count matched)
@current-idx))
(on-chosen (nth matched @current-idx) false)
(and on-enter (on-enter state))))))}
nil)))
(and on-enter (on-enter state))))))})))
[state matched {:keys [on-chosen
on-shift-chosen
on-enter
@@ -329,24 +344,16 @@
item-render
class]}]
(let [current-idx (get state ::current-idx)]
[:div.rounded-md.shadow-xs.bg-base-3 {:class class}
[:div#ui__ac {:class class}
(if (seq matched)
[:div#ac-inner
{:style {:max-height 400
:overflow "hidden"
:overflow-x "hidden"
:overflow-y "auto"
:position "relative"
"-webkit-overflow-scrolling" "touch"}}
[:div#ui__ac-inner
(for [[idx item] (medley/indexed matched)]
(rum/with-key
(menu-link
{:id (str "ac-" idx)
:style {:padding-top 6
:padding-bottom 6}
:class (when (= @current-idx idx)
"chosen")
;; :tab-index -1
{:id (str "ac-" idx)
:class (when (= @current-idx idx)
"chosen")
;; :tab-index -1
:on-click (fn [e]
(util/stop e)
(if (and (gobj/get e "shiftKey") on-shift-chosen)