From 1d1d8877b663365d6d93028681e0d8e6cd5b11af Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Wed, 25 May 2022 15:47:16 +0800 Subject: [PATCH] fix: :current-page could be empty --- src/main/frontend/db/query_react.cljs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/frontend/db/query_react.cljs b/src/main/frontend/db/query_react.cljs index cbf2c11a1..2d8b511a7 100644 --- a/src/main/frontend/db/query_react.cljs +++ b/src/main/frontend/db/query_react.cljs @@ -12,6 +12,7 @@ [frontend.state :as state] [logseq.graph-parser.text :as text] [frontend.util :as util] + [frontend.date :as date] [lambdaisland.glogi :as log])) (defn resolve-input @@ -28,8 +29,10 @@ (= :tomorrow input) (date->int (t/plus (t/today) (t/days 1))) (= :current-page input) - ;; This sometimes runs when there isn't a current page e.g. :home route - (some-> (state/get-current-page) string/lower-case) + (some-> (or (state/get-current-page) + (:page (state/get-default-home)) + (date/today)) string/lower-case) + (and (keyword? input) (util/safe-re-find #"^\d+d(-before)?$" (name input))) (let [input (name input)