Browse Source

enhance(ui): demos for the multi select

charlie 1 year ago
parent
commit
02bc2dbdc8

+ 2 - 9
deps/shui/src/logseq/shui/demo2.cljs

@@ -124,8 +124,6 @@
 
 
               :content-props
               :content-props
               {:align "start"
               {:align "start"
-               :onInteractOutside #(set-open! false)
-               :onEscapeKeyDown #(set-open! false)
                :class "w-80"}})))))
                :class "w-80"}})))))
 
 
    [:hr]
    [:hr]
@@ -181,9 +179,7 @@
                                 [:b.text-red-800 v]
                                 [:b.text-red-800 v]
                                 [:b.text-green-800 v]))
                                 [:b.text-green-800 v]))
               :content-props
               :content-props
-              {:onInteractOutside #(set-open! false)
-               :class "w-48"}})
-           ))))
+              {:class "w-48"}})))))
 
 
    [:hr]
    [:hr]
 
 
@@ -253,10 +249,7 @@
               ;:foot-render (fn [] [:b "footer"])
               ;:foot-render (fn [] [:b "footer"])
               :content-props
               :content-props
               {:align "start"
               {:align "start"
-               :onInteractOutside #(set-open! false)
-               :onEscapeKeyDown #(set-open! false)
-               :class "w-48"}})
-           ))))
+               :class "w-48"}})))))
    ])
    ])
 
 
 (rum/defc icon-picker-demo
 (rum/defc icon-picker-demo

+ 4 - 4
deps/shui/src/logseq/shui/select/multi.cljs

@@ -87,14 +87,14 @@
 
 
     (rum/use-effect!
     (rum/use-effect!
       (fn []
       (fn []
-        (when (and search-enabled? (false? open?))
-          (js/setTimeout #(set-search-key! "") 500)))
+        (when-let [t (when (and search-enabled? (false? open?))
+                       (js/setTimeout #(set-search-key! "") 500))]
+          #(js/clearTimeout t)))
       [open?])
       [open?])
 
 
     (x-content
     (x-content
       (merge
       (merge
-        {:onCloseAutoFocus false
-         :onInteractOutside close1!
+        {:onInteractOutside close1!
          :onEscapeKeyDown close1!
          :onEscapeKeyDown close1!
          :on-key-down (fn [^js e]
          :on-key-down (fn [^js e]
                         (when-let [^js target (.-target e)]
                         (when-let [^js target (.-target e)]