clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-27 07:35:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: stop shadowing vars for components

Browse Source 
Turn on kondo :shadowed-var lint and fix failures.  If this lint had
been turned on, it would have caught logseq/db-test#38 and saved us time
from debugging which random component was accidentally shadowed by a var
and failing with 'Objects are not valid as a React child'. Also fixed a
few outside components but stopped b/c there are too many to do right
now
This commit is contained in:
Gabriel Horner
2024-08-23 15:19:20 -04:00
parent 187fa1d29e
commit 5ff364ba1e
32 changed files with 163 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/frontend/components/cmdk/core.cljs
View File

@@ -86,8 +86,8 @@
(let [sidebar? (:sidebar? (last (:rum/args state)))
results @(::results state)
input @(::input state)
filter @(::filter state)
filter-group (:group filter)
filter' @(::filter state)
filter-group (:group filter')
index (volatile! -1)
visible-items (fn [group]
(let [{:keys [items show]} (get results group)]
@@ -556,7 +556,7 @@
highlighted-item (or @(::highlighted-item state) first-item)
highlighted-group @(::highlighted-group state)
*mouse-active? (::mouse-active? state')
filter @(::filter state)
filter' @(::filter state)
can-show-less? (< GROUP-LIMIT (count visible-items))
can-show-more? (< (count visible-items) (count items))
show-less #(swap! (::results state) assoc-in [group :show] :less)
@@ -586,7 +586,7 @@
(when (and (= group highlighted-group)
(or can-show-more? can-show-less?)
(empty? filter)
(empty? filter')
(not sidebar?))
[:a.text-link.select-node.opacity-50.hover:opacity-90
{:on-click (if (= show :more) show-less show-more)}
@@ -737,11 +737,11 @@
(and enter? (not composing?)) (do
(handle-action :default state e)
(util/stop-propagation e))
esc? (let [filter @(::filter state)]
esc? (let [filter' @(::filter state)]
(when-not (string/blank? input)
(util/stop e)
(handle-input-change state nil ""))
(when (and filter (string/blank? input))
(when (and filter' (string/blank? input))
(util/stop e)
(reset! (::filter state) nil)
(load-results :default state)))
@@ -830,9 +830,9 @@
{:init (fn [state]
(assoc state ::rand-tip (rand-tip)))}
[inner-state state]
(let [filter @(::filter state)]
(let [filter' @(::filter state)]
(cond
filter
filter'
[:div.flex.flex-row.gap-1.items-center.opacity-50.hover:opacity-100
[:div "Type"]
(shui/shortcut "esc" {:tiled false})