Skip to content

Commit 4462634

Browse files
committed
enhance(ux): keep today queries to avoid scroll junk
1 parent d9cad12 commit 4462634

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

src/main/frontend/components/page.cljs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@
239239
(ui/catch-error
240240
(ui/component-error "Failed default query:" {:content (pr-str query')})
241241
(query/custom-query (component-block/wrap-query-components
242-
{:attr {:class "mt-10"}
243-
:editor-box editor/box
242+
{:editor-box editor/box
244243
:page page-cp
245-
:built-in-query? true})
244+
:built-in-query? true
245+
:today-query? true})
246246
query'))
247247
(str repo "-custom-query-" (:query query')))))]))))
248248

src/main/frontend/components/query/result.cljs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454

5555
:else
5656
(let [[k result] (query-custom/custom-query query {:current-block-uuid current-block-uuid
57-
:built-in-query? (:built-in-query? config)})]
57+
:built-in-query? (:built-in-query? config)
58+
:today-query? (:today-query? config)})]
5859
[k (rum/react result)]))
5960
(catch :default e
6061
(js/console.error e)

src/main/frontend/components/scheduled_deadlines.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
[state page-name]
2828
(let [scheduled-or-deadlines (rum/react (::result state))]
2929
(when (seq scheduled-or-deadlines)
30-
[:div.scheduled-or-deadlines.mt-8
30+
[:div.scheduled-or-deadlines
3131
(ui/foldable
32-
[:div "SCHEDULED AND DEADLINE"]
32+
[:div.text-sm.font-medium "Scheduled and Deadline"]
3333
(fn []
3434
[:div.scheduled-deadlines.references-blocks.mb-6
3535
(let [ref-hiccup (block/->hiccup scheduled-or-deadlines

src/main/frontend/db/query_react.cljs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@
109109
inputs (cond-> resolved-inputs
110110
rules
111111
(conj rules))
112-
k [:custom (or (:query-string query') query') inputs]]
112+
k [:custom
113+
(or (:query-string query') (dissoc query' :title))
114+
(:today-query? query-opts)
115+
inputs]]
113116
(pprint "inputs (post-resolution):" resolved-inputs)
114117
(pprint "query-opts:" query-opts)
115118
(pprint (str "time elapsed: " (.toFixed (- (.now js/performance) start-time) 2) "ms"))

src/main/frontend/db/react.cljs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262

6363
(defn remove-q!
6464
[k]
65-
(swap! *query-state dissoc k))
65+
(when-not (and (= (second k) :custom) (nth k 3)) ; today query
66+
(swap! *query-state dissoc k)))
6667

6768
(defn add-query-component!
6869
[k component]

0 commit comments

Comments
 (0)