Skip to content

fix: prevent blocks from being outdented past zoom root in focused view #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
talentwill wants to merge 1 commit into from
Closed

fix: prevent blocks from being outdented past zoom root in focused view #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions src/main/frontend/handler/editor.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1765,12 +1765,21 @@
(defn on-tab
"`direction` = :left | :right."
[direction]
(let [blocks (get-selected-ordered-blocks)]
(let [blocks (get-selected-ordered-blocks)
indent? (= direction :right)
page (state/get-current-page)
zoom-root (when (and (not indent?) page (util/uuid-string? page))
(db/entity [:block/uuid (parse-uuid page)]))
blocks (if zoom-root
(remove (fn [b]
(= (:db/id (:block/parent b)) (:db/id zoom-root)))
blocks)
blocks)]
(when (seq blocks)
(outliner-tx/transact!
{:outliner-op :move-blocks
:real-outliner-op :indent-outdent}
(outliner-core/indent-outdent-blocks! blocks (= direction :right))))))
(outliner-core/indent-outdent-blocks! blocks indent?)))))

(defn- get-link [format link label]
(let [link (or link "")
Expand Down Expand Up @@ -2820,16 +2829,23 @@
(let [pos (some-> (state/get-input) cursor/pos)
{:keys [block]} (get-state)]
(when block
(state/set-editor-last-pos! pos)
(outliner-tx/transact!
{:outliner-op :move-blocks
:real-outliner-op :indent-outdent}
(outliner-core/indent-outdent-blocks! [block] indent?))
(edit-block!
(db/pull (:db/id block))
(cursor/pos (state/get-input))
(:block/uuid block)))
(state/set-editor-op! :nil)))
(let [outdent-past-zoom-root? (when-not indent?
(let [page (state/get-current-page)]
(and page
(util/uuid-string? page)
(let [zoom-root (db/entity [:block/uuid (parse-uuid page)])]
(= (:db/id (:block/parent block)) (:db/id zoom-root))))))]
(when-not outdent-past-zoom-root?
(state/set-editor-last-pos! pos)
(outliner-tx/transact!
{:outliner-op :move-blocks
:real-outliner-op :indent-outdent}
(outliner-core/indent-outdent-blocks! [block] indent?))
(edit-block!
(db/pull (:db/id block))
(cursor/pos (state/get-input))
(:block/uuid block))))))
(state/set-editor-op! :nil))

(defn keydown-tab-handler
[direction]
Expand Down
Loading