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

fix: up/down nivigation between blocks

Browse Source 
Reason: embeded blocks share the same dom id with their source blocks.
This commit is contained in:
Tienson Qin
2024-07-22 17:31:40 +08:00
parent 8bb6e7be6b
commit 8aa4fcad64
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/frontend/util.cljc
View File

@@ -874,6 +874,10 @@
(when section
(gdom/getElement section "id"))))))
(defn get-elem-idx
[nodes node]
(first (filter number? (map-indexed (fn [idx b] (when (= node b) idx)) nodes))))
#?(:cljs
(defn get-prev-block-non-collapsed
"Gets previous non-collapsed block. If given a container
@@ -883,51 +887,43 @@
(when-let [blocks (if container
(get-blocks-noncollapse container)
(get-blocks-noncollapse))]
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(let [idx (dec index)]
(when (>= idx 0)
(nth-safe blocks idx)))))))))
(when-let [index (get-elem-idx blocks block)]
(let [idx (dec index)]
(when (>= idx 0)
(nth-safe blocks idx))))))))
#?(:cljs
(defn get-prev-block-non-collapsed-non-embed
[block]
(when-let [blocks (->> (get-blocks-noncollapse)
remove-embedded-blocks)]
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(when-let [index (get-elem-idx blocks block)]
(let [idx (dec index)]
(when (>= idx 0)
(nth-safe blocks idx))))))))
(nth-safe blocks idx)))))))
#?(:cljs
(defn get-next-block-non-collapsed
[block]
(when-let [blocks (and block (get-blocks-noncollapse))]
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(let [idx (inc index)]
(when (>= (count blocks) idx)
(nth-safe blocks idx))))))))
(when-let [index (get-elem-idx blocks block)]
(let [idx (inc index)]
(when (>= (count blocks) idx)
(nth-safe blocks idx)))))))
#?(:cljs
(defn get-next-block-non-collapsed-skip
[block]
(when-let [blocks (get-blocks-noncollapse)]
(let [block-id (.-id block)
block-ids (mapv #(.-id %) blocks)]
(when-let [index (.indexOf block-ids block-id)]
(loop [idx (inc index)]
(when (>= (count blocks) idx)
(let [block (nth-safe blocks idx)
nested? (->> (array-seq (gdom/getElementsByClass "selected"))
(some (fn [dom] (.contains dom block))))]
(if nested?
(recur (inc idx))
block)))))))))
(when-let [index (get-elem-idx blocks block)]
(loop [idx (inc index)]
(when (>= (count blocks) idx)
(let [block (nth-safe blocks idx)
nested? (->> (array-seq (gdom/getElementsByClass "selected"))
(some (fn [dom] (.contains dom block))))]
(if nested?
(recur (inc idx))
block))))))))
(defn rand-str
[n]