clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-28 22:49:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: cannot rename untitled whiteboard issue

Browse Source
This commit is contained in:
Peng Xiao
2022-08-19 19:22:31 +08:00
parent fdb9a9f569
commit 204bf0dbd8
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/frontend/components/page.cljs
View File

@@ -192,12 +192,14 @@
(rum/defcs page-title < rum/reactive
(rum/local false ::edit?)
(rum/local "" ::input-value)
{:init (fn [state]
(assoc state ::title-value (atom (nth (:rum/args state) 2))))}
[state page-name icon title _format fmt-journal?]
(when title
(let [*title-value (get state ::title-value)
*edit? (get state ::edit?)
*input-value (get state ::input-value)
input-ref (rum/create-ref)
repo (state/get-current-repo)
hls-file? (pdf-assets/hls-file? title)
@@ -264,6 +266,7 @@
(:db/id page)
:page))
(when (and (not hls-file?) (not fmt-journal?))
(reset! *input-value (if untitled? "" old-name))
(reset! *edit? true))))}
(when (not= icon "") [:span.page-icon icon])
[:div.page-title-sizer-wrapper.relative
@@ -278,14 +281,16 @@
:width "100%"
:font-weight "inherit"}
:auto-complete (if (util/chrome?) "chrome-off" "off") ; off not working here
:default-value (if untitled? "" old-name)
:value (rum/react *input-value)
:on-change (fn [^js e]
(let [value (util/evalue e)]
(reset! *title-value (string/trim value))))
(reset! *title-value (string/trim value))
(reset! *input-value value)))
:on-blur blur-fn
:on-key-down (fn [^js e]
(when (= (gobj/get e "key") "Enter")
(blur-fn e)))
:placeholder (when untitled? (t :untitled))
:on-key-up (fn [^js e]
;; Esc
(when (= 27 (.-keyCode e))
@@ -295,12 +300,13 @@
(when untitled? (reset! *title-value ""))
(js/setTimeout #(when-let [input (rum/deref input-ref)] (.select input))))}]])
[:span.title.inline-block
{:data-ref page-name
{:data-value (rum/react *input-value)
:data-ref page-name
:style {:opacity (when @*edit? 0)
:pointer-events "none"
:font-weight "inherit"
:min-width "40px"}}
(cond @*edit? (rum/react *title-value)
:min-width "80px"}}
(cond @*edit? [:span {:style {:white-space "pre"}} (rum/react *input-value)]
untitled? [:span.opacity-50 (t :untitled)]
:else title)]]])))

18
src/main/frontend/components/whiteboard.cljs
View File

@@ -83,14 +83,11 @@
(defn- get-page-display-name
[page-name]
(let [untitled? (parse-uuid page-name)
page-entity (model/get-page page-name)]
(if untitled?
[:span.opacity-50 (t :untitled)]
(or
(get-in page-entity [:block/properties :title] nil)
(:block/original-name page-entity)
page-name))))
(let [page-entity (model/get-page page-name)]
(or
(get-in page-entity [:block/properties :title] nil)
(:block/original-name page-entity)
page-name)))
;; This is not accurate yet
;; (defn- get-page-human-update-time
@@ -108,7 +105,10 @@
(route-handler/redirect-to-whiteboard! page-name))}
[:div.dashboard-card-title
[:div.flex.w-full
[:div.dashboard-card-title-name (get-page-display-name page-name)]
[:div.dashboard-card-title-name
(if (parse-uuid page-name)
[:span.opacity-50 (t :untitled)]
(get-page-display-name page-name))]
[:div.flex-1]
(page-refs-count page-name nil)]
;; [:div.flex.w-full