Parcourir la source

fix: can't ref block

related to LOG-2956
Tienson Qin il y a 2 ans
Parent
commit
bdd8aa05c5
2 fichiers modifiés avec 8 ajouts et 4 suppressions
  1. 1 1
      src/main/frontend/components/search.cljs
  2. 7 3
      src/main/frontend/state.cljs

+ 1 - 1
src/main/frontend/components/search.cljs

@@ -13,7 +13,7 @@
                            :block? true
                            :search? true}
                           repo
-                          (clojure.core/uuid uuid)
+                          uuid
                           {:indent? false})])
      [:div {:class "font-medium" :key "content"}
       (search-handler/highlight-exact-query content q)]]))

+ 7 - 3
src/main/frontend/state.cljs

@@ -966,9 +966,13 @@ Similar to re-frame subscriptions"
 
 (defn get-edit-input-id
   []
-  (when-let [node @*editor-editing-ref]
-    (some-> (dom/sel1 node "textarea")
-            (gobj/get "id"))))
+  (or
+   (when-let [node @*editor-editing-ref]
+     (some-> (dom/sel1 node "textarea")
+             (gobj/get "id")))
+   (when-let [elem js/document.activeElement]
+     (when (util/input? elem)
+       (gobj/get elem "id")))))
 
 (defn get-input
   []