fix: directory table multi select
This commit is contained in:
@@ -17,6 +17,7 @@ export function isApplicationError(error: unknown): error is ApplicationError {
|
|||||||
export function create(code: Code, message?: string) {
|
export function create(code: Code, message?: string) {
|
||||||
return new ConvexError({
|
return new ConvexError({
|
||||||
code,
|
code,
|
||||||
message,
|
message:
|
||||||
|
code === Code.Internal ? "Internal application error" : message,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@@ -35,6 +35,10 @@ import {
|
|||||||
TableHeader,
|
TableHeader,
|
||||||
TableRow,
|
TableRow,
|
||||||
} from "@/components/ui/table"
|
} from "@/components/ui/table"
|
||||||
|
import {
|
||||||
|
isControlOrCommandKeyActive,
|
||||||
|
keyboardModifierAtom,
|
||||||
|
} from "@/lib/keyboard"
|
||||||
import { TextFileIcon } from "../../components/icons/text-file-icon"
|
import { TextFileIcon } from "../../components/icons/text-file-icon"
|
||||||
import { Button } from "../../components/ui/button"
|
import { Button } from "../../components/ui/button"
|
||||||
import { LoadingSpinner } from "../../components/ui/loading-spinner"
|
import { LoadingSpinner } from "../../components/ui/loading-spinner"
|
||||||
@@ -67,15 +71,18 @@ const columns: ColumnDef<DirectoryItem>[] = [
|
|||||||
header: ({ table }) => (
|
header: ({ table }) => (
|
||||||
<Checkbox
|
<Checkbox
|
||||||
checked={table.getIsAllPageRowsSelected()}
|
checked={table.getIsAllPageRowsSelected()}
|
||||||
onCheckedChange={(value) =>
|
onCheckedChange={(value) => {
|
||||||
table.toggleAllPageRowsSelected(!!value)
|
table.toggleAllPageRowsSelected(!!value)
|
||||||
}
|
}}
|
||||||
aria-label="Select all"
|
aria-label="Select all"
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
cell: ({ row }) => (
|
cell: ({ row }) => (
|
||||||
<Checkbox
|
<Checkbox
|
||||||
checked={row.getIsSelected()}
|
checked={row.getIsSelected()}
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation()
|
||||||
|
}}
|
||||||
onCheckedChange={row.getToggleSelectedHandler()}
|
onCheckedChange={row.getToggleSelectedHandler()}
|
||||||
aria-label="Select row"
|
aria-label="Select row"
|
||||||
/>
|
/>
|
||||||
@@ -229,10 +236,25 @@ export function DirectoryContentTableContent() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const selectRow = (row: Row<DirectoryItem>) => {
|
const selectRow = (row: Row<DirectoryItem>) => {
|
||||||
console.log("row.getIsSelected()", row.getIsSelected())
|
const keyboardModifiers = store.get(keyboardModifierAtom)
|
||||||
if (!row.getIsSelected()) {
|
const isMultiSelectMode = isControlOrCommandKeyActive(keyboardModifiers)
|
||||||
table.toggleAllPageRowsSelected(false)
|
const isRowSelected = row.getIsSelected()
|
||||||
|
console.log({ isMultiSelectMode, isRowSelected })
|
||||||
|
if (isRowSelected && isMultiSelectMode) {
|
||||||
|
row.toggleSelected(false)
|
||||||
|
} else if (isRowSelected && !isMultiSelectMode) {
|
||||||
|
table.setRowSelection({
|
||||||
|
[row.id]: true,
|
||||||
|
})
|
||||||
row.toggleSelected(true)
|
row.toggleSelected(true)
|
||||||
|
} else if (!isRowSelected) {
|
||||||
|
if (isMultiSelectMode) {
|
||||||
|
row.toggleSelected(true)
|
||||||
|
} else {
|
||||||
|
table.setRowSelection({
|
||||||
|
[row.id]: true,
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
85
packages/web/src/lib/keyboard.ts
Normal file
85
packages/web/src/lib/keyboard.ts
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
import { atom, useSetAtom } from "jotai"
|
||||||
|
import { useEffect } from "react"
|
||||||
|
|
||||||
|
export enum KeyboardModifier {
|
||||||
|
Alt = "Alt",
|
||||||
|
Control = "Control",
|
||||||
|
Meta = "Meta",
|
||||||
|
Shift = "Shift",
|
||||||
|
}
|
||||||
|
|
||||||
|
export const keyboardModifierAtom = atom(new Set<KeyboardModifier>())
|
||||||
|
|
||||||
|
const addKeyboardModifierAtom = atom(
|
||||||
|
null,
|
||||||
|
(get, set, modifier: KeyboardModifier) => {
|
||||||
|
const activeModifiers = get(keyboardModifierAtom)
|
||||||
|
const nextActiveModifiers = new Set(activeModifiers)
|
||||||
|
nextActiveModifiers.add(modifier)
|
||||||
|
set(keyboardModifierAtom, nextActiveModifiers)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
const removeKeyboardModifierAtom = atom(
|
||||||
|
null,
|
||||||
|
(get, set, modifier: KeyboardModifier) => {
|
||||||
|
const activeModifiers = get(keyboardModifierAtom)
|
||||||
|
const nextActiveModifiers = new Set(activeModifiers)
|
||||||
|
nextActiveModifiers.delete(modifier)
|
||||||
|
set(keyboardModifierAtom, nextActiveModifiers)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
export function useKeyboardModifierListener() {
|
||||||
|
const addKeyboardModifier = useSetAtom(addKeyboardModifierAtom)
|
||||||
|
const removeKeyboardModifier = useSetAtom(removeKeyboardModifierAtom)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const handleKeyDown = (event: KeyboardEvent) => {
|
||||||
|
switch (event.key) {
|
||||||
|
case "Alt":
|
||||||
|
addKeyboardModifier(KeyboardModifier.Alt)
|
||||||
|
break
|
||||||
|
case "Control":
|
||||||
|
addKeyboardModifier(KeyboardModifier.Control)
|
||||||
|
break
|
||||||
|
case "Meta":
|
||||||
|
addKeyboardModifier(KeyboardModifier.Meta)
|
||||||
|
break
|
||||||
|
case "Shift":
|
||||||
|
addKeyboardModifier(KeyboardModifier.Shift)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const handleKeyUp = (event: KeyboardEvent) => {
|
||||||
|
switch (event.key) {
|
||||||
|
case "Alt":
|
||||||
|
removeKeyboardModifier(KeyboardModifier.Alt)
|
||||||
|
break
|
||||||
|
case "Control":
|
||||||
|
removeKeyboardModifier(KeyboardModifier.Control)
|
||||||
|
break
|
||||||
|
case "Meta":
|
||||||
|
removeKeyboardModifier(KeyboardModifier.Meta)
|
||||||
|
break
|
||||||
|
case "Shift":
|
||||||
|
removeKeyboardModifier(KeyboardModifier.Shift)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.addEventListener("keydown", handleKeyDown)
|
||||||
|
window.addEventListener("keyup", handleKeyUp)
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener("keydown", handleKeyDown)
|
||||||
|
window.removeEventListener("keyup", handleKeyUp)
|
||||||
|
}
|
||||||
|
}, [addKeyboardModifier, removeKeyboardModifier])
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isControlOrCommandKeyActive(
|
||||||
|
keyboardModifiers: Set<KeyboardModifier>,
|
||||||
|
) {
|
||||||
|
return (
|
||||||
|
keyboardModifiers.has(KeyboardModifier.Control) ||
|
||||||
|
keyboardModifiers.has(KeyboardModifier.Meta)
|
||||||
|
)
|
||||||
|
}
|
@@ -6,6 +6,7 @@ import { AuthKitProvider, useAuth } from "@workos-inc/authkit-react"
|
|||||||
import { ConvexReactClient } from "convex/react"
|
import { ConvexReactClient } from "convex/react"
|
||||||
import { toast } from "sonner"
|
import { toast } from "sonner"
|
||||||
import { formatError } from "@/lib/error"
|
import { formatError } from "@/lib/error"
|
||||||
|
import { useKeyboardModifierListener } from "@/lib/keyboard"
|
||||||
|
|
||||||
export const Route = createRootRoute({
|
export const Route = createRootRoute({
|
||||||
component: RootLayout,
|
component: RootLayout,
|
||||||
@@ -25,6 +26,8 @@ const queryClient = new QueryClient({
|
|||||||
})
|
})
|
||||||
|
|
||||||
function RootLayout() {
|
function RootLayout() {
|
||||||
|
useKeyboardModifierListener()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<AuthKitProvider
|
<AuthKitProvider
|
||||||
|
78
platform.ts
Normal file
78
platform.ts
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
export enum Platform {
|
||||||
|
Windows = 'windows',
|
||||||
|
MacOS = 'macos',
|
||||||
|
Linux = 'linux',
|
||||||
|
Android = 'android',
|
||||||
|
iOS = 'ios'
|
||||||
|
}
|
||||||
|
|
||||||
|
// Internal global variables (computed once at module load)
|
||||||
|
let _isWindows = false
|
||||||
|
let _isMacOS = false
|
||||||
|
let _isLinux = false
|
||||||
|
let _isAndroid = false
|
||||||
|
let _isIOS = false
|
||||||
|
let _isMobile = false
|
||||||
|
let _userAgent: string | undefined
|
||||||
|
let _platform: Platform = Platform.Linux // Default fallback
|
||||||
|
|
||||||
|
interface INavigator {
|
||||||
|
userAgent: string
|
||||||
|
maxTouchPoints?: number
|
||||||
|
}
|
||||||
|
declare const navigator: INavigator
|
||||||
|
|
||||||
|
// Platform detection logic (runs once at module load)
|
||||||
|
if (typeof navigator === "object") {
|
||||||
|
_userAgent = navigator.userAgent
|
||||||
|
|
||||||
|
// iOS detection (must come before macOS since iOS contains "Mac")
|
||||||
|
if (
|
||||||
|
/iPad|iPhone|iPod/.test(_userAgent) ||
|
||||||
|
(/Macintosh/.test(_userAgent) &&
|
||||||
|
navigator.maxTouchPoints &&
|
||||||
|
navigator.maxTouchPoints > 0)
|
||||||
|
) {
|
||||||
|
_isIOS = true
|
||||||
|
_platform = Platform.iOS
|
||||||
|
_isMobile = /iPhone|iPod/.test(_userAgent) || /Mobi/.test(_userAgent)
|
||||||
|
}
|
||||||
|
// Android detection
|
||||||
|
else if (/Android/.test(_userAgent)) {
|
||||||
|
_isAndroid = true
|
||||||
|
_platform = Platform.Android
|
||||||
|
_isMobile = true
|
||||||
|
}
|
||||||
|
// Windows detection
|
||||||
|
else if (/Windows/.test(_userAgent)) {
|
||||||
|
_isWindows = true
|
||||||
|
_platform = Platform.Windows
|
||||||
|
_isMobile = /Mobi/.test(_userAgent)
|
||||||
|
}
|
||||||
|
// macOS detection
|
||||||
|
else if (/Macintosh|Mac OS X/.test(_userAgent)) {
|
||||||
|
_isMacOS = true
|
||||||
|
_platform = Platform.MacOS
|
||||||
|
_isMobile = false
|
||||||
|
}
|
||||||
|
// Linux detection
|
||||||
|
else if (/Linux/.test(_userAgent)) {
|
||||||
|
_isLinux = true
|
||||||
|
_platform = Platform.Linux
|
||||||
|
_isMobile = /Mobi/.test(_userAgent)
|
||||||
|
}
|
||||||
|
// Fallback - check for mobile
|
||||||
|
else {
|
||||||
|
_isMobile = /Mobi/.test(_userAgent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exported constants (computed once)
|
||||||
|
export const isWindows = _isWindows
|
||||||
|
export const isMacOS = _isMacOS
|
||||||
|
export const isLinux = _isLinux
|
||||||
|
export const isAndroid = _isAndroid
|
||||||
|
export const isIOS = _isIOS
|
||||||
|
export const isMobile = _isMobile
|
||||||
|
export const platform = _platform
|
||||||
|
export const userAgent = _userAgent
|
Reference in New Issue
Block a user