From cbece9e29f7e82bba25432fcb477781ad7e03c53 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Mon, 5 Jan 2026 16:39:41 +0800 Subject: [PATCH] fix: lint --- deps/common/src/logseq/common/plural.cljs | 8 ++++---- deps/db/test/logseq/db_test.cljs | 2 +- src/main/frontend/components/property/value.cljs | 8 ++------ src/main/frontend/state.cljs | 2 -- typos.toml | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/deps/common/src/logseq/common/plural.cljs b/deps/common/src/logseq/common/plural.cljs index d66ec6c5c5..0292f77a49 100644 --- a/deps/common/src/logseq/common/plural.cljs +++ b/deps/common/src/logseq/common/plural.cljs @@ -147,10 +147,10 @@ (defn pluralize "Pluralize or singularize based on count. If inclusive, prefix with count." - ([word count] (pluralize word count false)) - ([word count inclusive] - (let [pluralized (if (= count 1) (singular word) (plural word))] - (str (when inclusive (str count " ")) + ([word item-count] (pluralize word item-count false)) + ([word item-count inclusive] + (let [pluralized (if (= item-count 1) (singular word) (plural word))] + (str (when inclusive (str item-count " ")) pluralized)))) (defn add-plural-rule! diff --git a/deps/db/test/logseq/db_test.cljs b/deps/db/test/logseq/db_test.cljs index 7d4a4b0be7..31f08aa3fe 100644 --- a/deps/db/test/logseq/db_test.cljs +++ b/deps/db/test/logseq/db_test.cljs @@ -145,6 +145,6 @@ target (db-test/find-page-by-title @conn "Bob") results (ldb/get-bidirectional-properties @conn (:db/id target))] (is (= 1 (count results))) - (is (= "Persons" (:title (first results)))) + (is (= "People" (:title (first results)))) (is (= ["Alice"] (map :block/title (:entities (first results)))))))) diff --git a/src/main/frontend/components/property/value.cljs b/src/main/frontend/components/property/value.cljs index 6c68db19d4..8e6df5bbea 100644 --- a/src/main/frontend/components/property/value.cljs +++ b/src/main/frontend/components/property/value.cljs @@ -1077,13 +1077,11 @@ [block property value table-view?] (let [[editing? set-editing!] (hooks/use-state false) *ref (hooks/use-ref nil) - *input-ref (hooks/use-ref nil) string-value (cond (string? value) value (some? value) (str (db-property/property-value-content value)) :else "") [value set-value!] (hooks/use-state string-value) - [*value _] (hooks/use-state (atom value)) set-property-value! (fn [value & {:keys [exit-editing?] :or {exit-editing? true}}] (let [next-value (or value "") @@ -1112,14 +1110,12 @@ (set-editing! true))} (if editing? (shui/input - {:ref *input-ref - :auto-focus true + {:auto-focus true :class (str "ls-string-input h-6 px-0 py-0 border-none bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0 text-base" (when table-view? " text-sm")) :value value :on-change (fn [e] - (set-value! (util/evalue e)) - (reset! *value (util/evalue e))) + (set-value! (util/evalue e))) :on-blur (fn [_e] (p/do! (set-property-value! value))) diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs index 5b2bd81a83..bffce5bf9d 100644 --- a/src/main/frontend/state.cljs +++ b/src/main/frontend/state.cljs @@ -1942,8 +1942,6 @@ Similar to re-frame subscriptions" (defn set-collapsed-block! ([block-id value] (set-collapsed-block! block-id value nil)) ([block-id value container-id] - (when (nil? container-id) - (js/console.trace)) (let [current-repo (get-current-repo) container-id (resolve-container-id container-id)] (set-state! [:ui/collapsed-blocks current-repo container-id block-id] value)))) diff --git a/typos.toml b/typos.toml index 19cb1067f8..de925fe2e5 100644 --- a/typos.toml +++ b/typos.toml @@ -18,4 +18,4 @@ fom = "fom" tne = "tne" Damon = "Damon" [files] -extend-exclude = ["resources/*", "src/resources/*", "scripts/resources/*", "src/test/fixtures/*", "clj-e2e/resources/*"] +extend-exclude = ["resources/*", "src/resources/*", "scripts/resources/*", "src/test/fixtures/*", "clj-e2e/resources/*", "deps/common/src/logseq/common/plural.cljs"]