ciphera-net/pulse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

fix(settings): remove duplicate comma listener from Sidebar — modal handles it globally

Browse Source
This commit is contained in:
Usman Baig
2026-03-24 17:24:45 +01:00
parent c48023be9f
commit bb4861dbdc
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/dashboard/Sidebar.tsx
View File

@@ -6,7 +6,7 @@ import { usePathname, useRouter } from 'next/navigation'
import { listSites, type Site } from '@/lib/api/sites' import { listSites, type Site } from '@/lib/api/sites'
import { useAuth } from '@/lib/auth/context' import { useAuth } from '@/lib/auth/context'
import { useSettingsModal } from '@/lib/settings-modal-context' import { useSettingsModal } from '@/lib/settings-modal-context'
import { useUnifiedSettings } from '@/lib/unified-settings-context' // `,` shortcut handled globally by UnifiedSettingsModal
import { getUserOrganizations, switchContext, type OrganizationMember } from '@/lib/api/organization' import { getUserOrganizations, switchContext, type OrganizationMember } from '@/lib/api/organization'
import { setSessionAction } from '@/app/actions/auth' import { setSessionAction } from '@/app/actions/auth'
import { logger } from '@/lib/utils/logger' import { logger } from '@/lib/utils/logger'
@@ -444,7 +444,6 @@ export default function Sidebar({
const pathname = usePathname() const pathname = usePathname()
const router = useRouter() const router = useRouter()
const { openSettings } = useSettingsModal() const { openSettings } = useSettingsModal()
const { openUnifiedSettings } = useUnifiedSettings()
const [sites, setSites] = useState<Site[]>([]) const [sites, setSites] = useState<Site[]>([])
const [orgs, setOrgs] = useState<OrganizationMember[]>([]) const [orgs, setOrgs] = useState<OrganizationMember[]>([])
const [pendingHref, setPendingHref] = useState<string | null>(null) const [pendingHref, setPendingHref] = useState<string | null>(null)
@@ -485,14 +484,11 @@ export default function Sidebar({
if (e.key === '[' && !e.metaKey && !e.ctrlKey && !e.altKey) { if (e.key === '[' && !e.metaKey && !e.ctrlKey && !e.altKey) {
e.preventDefault(); toggle() e.preventDefault(); toggle()
} }
// `,` opens unified settings (same as GitHub/Linear) // `,` shortcut is handled globally by UnifiedSettingsModal — not here
if (e.key === ',' && !e.metaKey && !e.ctrlKey && !e.altKey) {
e.preventDefault(); openUnifiedSettings()
}
} }
document.addEventListener('keydown', handler) document.addEventListener('keydown', handler)
return () => document.removeEventListener('keydown', handler) return () => document.removeEventListener('keydown', handler)
}, [collapsed, openUnifiedSettings]) }, [collapsed])
const toggle = useCallback(() => { const toggle = useCallback(() => {
setCollapsed((prev) => { const next = !prev; localStorage.setItem(SIDEBAR_KEY, String(next)); return next }) setCollapsed((prev) => { const next = !prev; localStorage.setItem(SIDEBAR_KEY, String(next)); return next })