Skip to content

feat(data-grid): add nullable cells #1135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sadmann7 merged 1 commit into from
Jun 14, 2026
Merged

feat(data-grid): add nullable cells #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/r/data-grid.json
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 22 additions & 9 deletions src/app/data-grid-live/components/data-grid-live-demo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import * as React from "react";
import { use } from "react";
import { toast } from "sonner";
import {
generateRandomSkater,
getSkaterStatusIcon,
getStanceIcon,
getStyleIcon,
Expand Down Expand Up @@ -364,13 +363,27 @@ export function DataGridLiveDemo() {
const onRowAdd: NonNullable<UseDataGridProps<SkaterSchema>["onRowAdd"]> =
React.useCallback(() => {
const maxOrder = data.reduce((max, s) => Math.max(max, s.order), 0);
const newSkater = generateRandomSkater();
const skaterWithOrder = { ...newSkater, order: maxOrder + 1 };
const newSkater: SkaterSchema = {
id: generateId(),
name: null,
email: null,
stance: null,
style: null,
status: null,
yearsSkating: null,
startedSkating: null,
isPro: false,
tricks: null,
media: null,
order: maxOrder + 1,
createdAt: new Date(),
updatedAt: new Date(),
};

skatersCollection.insert(skaterWithOrder);
skatersCollection.insert(newSkater);

// Track for undo/redo
trackRowsAdd([skaterWithOrder]);
trackRowsAdd([newSkater]);

return {
rowIndex: data.length,
Expand All @@ -389,10 +402,10 @@ export function DataGridLiveDemo() {
id: generateId(),
name: null,
email: null,
stance: "regular",
style: "street",
status: "amateur",
yearsSkating: 0,
stance: null,
style: null,
status: null,
yearsSkating: null,
startedSkating: null,
isPro: false,
tricks: null,
Expand Down
24 changes: 12 additions & 12 deletions src/app/data-grid-live/lib/validation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ export const skaterSchema = z.object({
order: z.number(),
name: z.string().nullable(),
email: z.string().nullable(),
stance: z.enum(skaters.stance.enumValues),
style: z.enum(skaters.style.enumValues),
status: z.enum(skaters.status.enumValues),
yearsSkating: z.number(),
stance: z.enum(skaters.stance.enumValues).nullable(),
style: z.enum(skaters.style.enumValues).nullable(),
status: z.enum(skaters.status.enumValues).nullable(),
yearsSkating: z.number().nullable(),
Comment thread
sadmann7 marked this conversation as resolved.
startedSkating: z.coerce.date().nullable(),
isPro: z.boolean(),
tricks: z.array(z.string()).nullable(),
Expand All @@ -31,10 +31,10 @@ export const insertSkaterSchema = z.object({
order: z.number().optional(),
name: z.string().nullable().optional(),
email: z.string().nullable().optional(),
stance: z.enum(skaters.stance.enumValues).optional(),
style: z.enum(skaters.style.enumValues).optional(),
status: z.enum(skaters.status.enumValues).optional(),
yearsSkating: z.number().optional(),
stance: z.enum(skaters.stance.enumValues).nullable().optional(),
style: z.enum(skaters.style.enumValues).nullable().optional(),
status: z.enum(skaters.status.enumValues).nullable().optional(),
yearsSkating: z.number().nullable().optional(),
Comment thread
sadmann7 marked this conversation as resolved.
startedSkating: z.coerce.date().nullable().optional(),
isPro: z.boolean().optional(),
tricks: z.array(z.string()).nullable().optional(),
Expand All @@ -49,10 +49,10 @@ export const updateSkaterSchema = z.object({
name: z.string().nullable().optional(),
order: z.number().optional(),
email: z.string().nullable().optional(),
stance: z.enum(skaters.stance.enumValues).optional(),
style: z.enum(skaters.style.enumValues).optional(),
status: z.enum(skaters.status.enumValues).optional(),
yearsSkating: z.number().optional(),
stance: z.enum(skaters.stance.enumValues).nullable().optional(),
style: z.enum(skaters.style.enumValues).nullable().optional(),
status: z.enum(skaters.status.enumValues).nullable().optional(),
yearsSkating: z.number().nullable().optional(),
Comment thread
sadmann7 marked this conversation as resolved.
startedSkating: z.coerce.date().nullable().optional(),
isPro: z.boolean().optional(),
tricks: z.array(z.string()).nullable().optional(),
Expand Down
23 changes: 17 additions & 6 deletions src/app/data-grid-multiplayer/components/data-grid-multiplayer-demo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { toast } from "sonner";
import { DataGridActionBar } from "@/app/data-grid-live/components/data-grid-action-bar";
import type { SkaterSchema } from "@/app/data-grid-live/lib/validation";
import {
generateRandomSkater,
getSkaterStatusIcon,
getStanceIcon,
getStyleIcon,
Expand Down Expand Up @@ -313,8 +312,20 @@ export function DataGridMultiplayerDemo({
React.useCallback(() => {
const maxOrder = data.reduce((max, s) => Math.max(max, s.order), 0);
const newSkater: SkaterSchema = {
...generateRandomSkater(),
id: generateId(),
name: null,
email: null,
stance: null,
style: null,
status: null,
yearsSkating: null,
startedSkating: null,
isPro: false,
tricks: null,
media: null,
order: maxOrder + 1,
createdAt: new Date(),
updatedAt: new Date(),
};

multiplayerCollection.insert(newSkater);
Expand All @@ -335,10 +346,10 @@ export function DataGridMultiplayerDemo({
id: generateId(),
name: null,
email: null,
stance: "regular",
style: "street",
status: "amateur",
yearsSkating: 0,
stance: null,
style: null,
status: null,
yearsSkating: null,
startedSkating: null,
isPro: false,
tricks: null,
Expand Down
12 changes: 6 additions & 6 deletions src/app/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,33 +147,33 @@ export function generateRandomSkater(input?: Partial<Skater>): Skater {
}

export function getSkaterStatusIcon(status: Skater["status"]) {
const statusIcons: Record<Skater["status"], LucideIcon> = {
const statusIcons: Record<NonNullable<Skater["status"]>, LucideIcon> = {
amateur: Circle,
sponsored: Timer,
pro: CheckCircle2,
legend: CircleCheck,
};

return statusIcons[status];
return status ? statusIcons[status] : undefined;
}

export function getStanceIcon(stance: Skater["stance"]) {
const stanceIcons: Record<Skater["stance"], LucideIcon> = {
const stanceIcons: Record<NonNullable<Skater["stance"]>, LucideIcon> = {
regular: ArrowRightIcon,
goofy: ArrowDownIcon,
};

return stanceIcons[stance];
return stance ? stanceIcons[stance] : undefined;
}

export function getStyleIcon(style: Skater["style"]) {
const styleIcons: Record<Skater["style"], LucideIcon> = {
const styleIcons: Record<NonNullable<Skater["style"]>, LucideIcon> = {
street: CircleCheck,
vert: ArrowUpIcon,
park: Circle,
freestyle: CircleHelp,
"all-around": CheckCircle2,
};

return styleIcons[style];
return style ? styleIcons[style] : undefined;
}
7 changes: 5 additions & 2 deletions src/components/data-grid/data-grid-cell-variants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,8 @@ export function SelectCell<TData>({
isActiveSearchMatch,
readOnly,
}: DataGridCellProps<TData>) {
const initialValue = cell.getValue() as string;
const initialValue = (cell.getValue() ?? undefined) as string | undefined;

const [value, setValue] = React.useState(initialValue);
const containerRef = React.useRef<HTMLDivElement>(null);
const cellOpts = cell.column.columnDef.meta?.cell;
Expand Down Expand Up @@ -934,7 +935,9 @@ export function SelectCell<TData>({
[isEditing, isFocused, initialValue, tableMeta],
);

const displayLabel = optionByValue.get(value)?.label ?? value;
const displayLabel = value
? (optionByValue.get(value)?.label ?? value)
: null;

return (
<DataGridCellWrapper<TData>
Expand Down
14 changes: 4 additions & 10 deletions src/db/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,16 @@ export const skaters = pgTable("skaters", {
stance: varchar("stance", {
length: 30,
enum: ["regular", "goofy"],
})
.notNull()
.default("regular"),
}),
style: varchar("style", {
length: 30,
enum: ["street", "vert", "park", "freestyle", "all-around"],
})
.notNull()
.default("street"),
}),
status: varchar("status", {
length: 30,
enum: ["amateur", "sponsored", "pro", "legend"],
})
.notNull()
.default("amateur"),
yearsSkating: integer("years_skating").notNull().default(0),
}),
yearsSkating: integer("years_skating"),
startedSkating: timestamp("started_skating"),
isPro: boolean("is_pro").notNull().default(false),
tricks: jsonb("tricks").$type<string[]>(),
Expand Down
Loading