feat : update excel
This commit is contained in:
@@ -6,18 +6,48 @@ import {
|
||||
ArrowRightIcon,
|
||||
ArrowUpIcon,
|
||||
Columns3Icon,
|
||||
GripHorizontalIcon,
|
||||
GripVerticalIcon,
|
||||
PlusIcon,
|
||||
PencilIcon,
|
||||
PaletteIcon,
|
||||
Redo2Icon,
|
||||
Rows3Icon,
|
||||
Trash2Icon,
|
||||
Undo2Icon,
|
||||
} from "lucide-react";
|
||||
import Spreadsheet, { type ColumnIndicatorProps, type DataEditorProps, type Point } from "react-spreadsheet";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import Spreadsheet, {
|
||||
type ColumnIndicatorProps,
|
||||
type DataEditorProps,
|
||||
type Point,
|
||||
type RowIndicatorProps,
|
||||
type SpreadsheetRef,
|
||||
} from "react-spreadsheet";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState, type KeyboardEvent } from "react";
|
||||
import {
|
||||
closestCenter,
|
||||
DndContext,
|
||||
KeyboardSensor,
|
||||
PointerSensor,
|
||||
useSensor,
|
||||
useSensors,
|
||||
type CollisionDetection,
|
||||
type DragEndEvent,
|
||||
} from "@dnd-kit/core";
|
||||
import {
|
||||
horizontalListSortingStrategy,
|
||||
rectSortingStrategy,
|
||||
sortableKeyboardCoordinates,
|
||||
SortableContext,
|
||||
useSortable,
|
||||
verticalListSortingStrategy,
|
||||
} from "@dnd-kit/sortable";
|
||||
import { CSS } from "@dnd-kit/utilities";
|
||||
|
||||
import { DeleteConfirmationDialog } from "@/components/admin/delete-confirmation-dialog";
|
||||
import { RichTextContent } from "@/components/rich-text-content";
|
||||
import { RichTextEditor } from "@/components/rich-text-editor";
|
||||
import { SimpleTooltip } from "@/components/tooltip";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Dialog,
|
||||
@@ -38,6 +68,7 @@ import {
|
||||
} from "@/components/ui/dropdown-menu";
|
||||
import { Field, FieldGroup, FieldLabel } from "@/components/ui/field";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Kbd } from "@/components/ui/kbd";
|
||||
import {
|
||||
addExtraSheetColumn,
|
||||
addExtraSheetRow,
|
||||
@@ -48,15 +79,47 @@ import {
|
||||
moveExtraSheetColumn,
|
||||
moveExtraSheetRow,
|
||||
nextExtraSheetColumnLabel,
|
||||
styleExtraSheetCells,
|
||||
updateExtraSheetCell,
|
||||
updateExtraSheetCells,
|
||||
type ExtraSheet,
|
||||
type ExtraSheetMatrix,
|
||||
} from "@/lib/guides/extra-sheet";
|
||||
import { normalizeExtraRichText } from "@/lib/rich-text";
|
||||
import {
|
||||
normalizeExtraRichText,
|
||||
richTextContentSignature,
|
||||
type RichTextStylePatch,
|
||||
} from "@/lib/rich-text";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
type DeleteTarget = "column" | "row" | null;
|
||||
interface SheetHistory {
|
||||
items: ExtraSheet[];
|
||||
index: number;
|
||||
value: ExtraSheet;
|
||||
}
|
||||
|
||||
const DEFAULT_CELL_BACKGROUND = "#16A34A";
|
||||
const SHEET_HISTORY_LIMIT = 80;
|
||||
const columnDragId = (id: string) => `column:${id}`;
|
||||
const rowDragId = (id: string) => `row:${id}`;
|
||||
|
||||
const sameAxisCollision: CollisionDetection = (args) => {
|
||||
const axis = String(args.active.id).split(":", 1)[0];
|
||||
return closestCenter({
|
||||
...args,
|
||||
droppableContainers: args.droppableContainers.filter(
|
||||
(container) => String(container.id).startsWith(`${axis}:`),
|
||||
),
|
||||
});
|
||||
};
|
||||
|
||||
function movedIndex(current: number, from: number, to: number): number {
|
||||
if (current === from) return to;
|
||||
if (from < to && current > from && current <= to) return current - 1;
|
||||
if (to < from && current >= to && current < from) return current + 1;
|
||||
return current;
|
||||
}
|
||||
|
||||
function LiteralDataViewer({ cell }: { cell?: { value?: unknown; backgroundColor?: string } }) {
|
||||
return (
|
||||
@@ -86,18 +149,38 @@ function DialogDataEditor({
|
||||
}
|
||||
|
||||
function EditableColumnIndicator({
|
||||
id,
|
||||
column,
|
||||
label,
|
||||
selected,
|
||||
onRename,
|
||||
}: ColumnIndicatorProps & { onRename: (column: number) => void }) {
|
||||
}: ColumnIndicatorProps & { id: string; onRename: (column: number) => void }) {
|
||||
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
||||
id,
|
||||
strategy: horizontalListSortingStrategy,
|
||||
});
|
||||
return (
|
||||
<th className={selected ? "Spreadsheet__header Spreadsheet__header--selected" : "Spreadsheet__header"}>
|
||||
<th
|
||||
ref={setNodeRef}
|
||||
className={cn("Spreadsheet__header", selected && "Spreadsheet__header--selected", isDragging && "opacity-60")}
|
||||
style={{ transform: CSS.Transform.toString(transform), transition }}
|
||||
>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
className="touch-none"
|
||||
aria-label={`ลากเพื่อย้าย ${String(label ?? `คอลัมน์ ${column + 1}`)}`}
|
||||
{...attributes}
|
||||
{...listeners}
|
||||
>
|
||||
<GripHorizontalIcon />
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="w-full"
|
||||
className="min-w-0 flex-1"
|
||||
onClick={() => onRename(column)}
|
||||
>
|
||||
{label}
|
||||
@@ -106,6 +189,41 @@ function EditableColumnIndicator({
|
||||
);
|
||||
}
|
||||
|
||||
function SortableRowIndicator({ id, row, label, selected, onSelect }: RowIndicatorProps & { id: string }) {
|
||||
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
|
||||
id,
|
||||
strategy: verticalListSortingStrategy,
|
||||
});
|
||||
return (
|
||||
<th
|
||||
ref={setNodeRef}
|
||||
className={cn("Spreadsheet__header", selected && "Spreadsheet__header--selected", isDragging && "opacity-60")}
|
||||
style={{ transform: CSS.Transform.toString(transform), transition }}
|
||||
>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
className="touch-none"
|
||||
aria-label={`ลากเพื่อย้ายแถว ${row + 1}`}
|
||||
{...attributes}
|
||||
{...listeners}
|
||||
>
|
||||
<GripVerticalIcon />
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="min-w-0 flex-1"
|
||||
onClick={(event) => onSelect(row, event.shiftKey)}
|
||||
>
|
||||
{label ?? row + 1}
|
||||
</Button>
|
||||
</th>
|
||||
);
|
||||
}
|
||||
|
||||
export function ExtraSheetEditor({
|
||||
value,
|
||||
createId,
|
||||
@@ -117,6 +235,11 @@ export function ExtraSheetEditor({
|
||||
onChange: (value: ExtraSheet) => void;
|
||||
onRemove: () => void;
|
||||
}) {
|
||||
const sensors = useSensors(
|
||||
useSensor(PointerSensor),
|
||||
useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates }),
|
||||
);
|
||||
const spreadsheetRef = useRef<SpreadsheetRef>(null);
|
||||
const [active, setActive] = useState<Point>({ row: 0, column: 0 });
|
||||
const [labelDialogOpen, setLabelDialogOpen] = useState(false);
|
||||
const [renaming, setRenaming] = useState(false);
|
||||
@@ -125,11 +248,107 @@ export function ExtraSheetEditor({
|
||||
const [removeOpen, setRemoveOpen] = useState(false);
|
||||
const [cellDialogOpen, setCellDialogOpen] = useState(false);
|
||||
const [cellDraft, setCellDraft] = useState("");
|
||||
const [originalCellDraft, setOriginalCellDraft] = useState("");
|
||||
const [stylePatch, setStylePatch] = useState<RichTextStylePatch>({});
|
||||
const [selectedCount, setSelectedCount] = useState(1);
|
||||
const [history, setHistory] = useState<SheetHistory>({ items: [value], index: 0, value });
|
||||
const selectedPointsRef = useRef<Point[]>([active]);
|
||||
const matrix = useMemo(() => extraSheetToMatrix(value), [value]);
|
||||
const activeColumn = value.columns[active.column];
|
||||
const activeRow = value.rows[active.row];
|
||||
const canUndo = history.index > 0;
|
||||
const canRedo = history.index < history.items.length - 1;
|
||||
const sortableIds = useMemo(() => [
|
||||
...value.columns.map((column) => columnDragId(column.id)),
|
||||
...value.rows.map((row) => rowDragId(row.id)),
|
||||
], [value.columns, value.rows]);
|
||||
|
||||
if (history.value !== value) {
|
||||
setHistory(history.items[history.index] === value
|
||||
? { ...history, value }
|
||||
: { items: [value], index: 0, value });
|
||||
}
|
||||
|
||||
const commitSheet = useCallback((next: ExtraSheet) => {
|
||||
if (JSON.stringify(next) === JSON.stringify(value)) return;
|
||||
setHistory((current) => {
|
||||
const items = [...current.items.slice(0, current.index + 1), next]
|
||||
.slice(-SHEET_HISTORY_LIMIT);
|
||||
return { items, index: items.length - 1, value: next };
|
||||
});
|
||||
onChange(next);
|
||||
}, [onChange, value]);
|
||||
|
||||
const travel = useCallback((direction: -1 | 1) => {
|
||||
const index = history.index + direction;
|
||||
const next = history.items[index];
|
||||
if (!next) return;
|
||||
setHistory((current) => ({ ...current, index, value: next }));
|
||||
onChange(next);
|
||||
const point = {
|
||||
row: Math.min(active.row, next.rows.length - 1),
|
||||
column: Math.min(active.column, next.columns.length - 1),
|
||||
};
|
||||
setActive(point);
|
||||
selectedPointsRef.current = [point];
|
||||
setSelectedCount(1);
|
||||
window.requestAnimationFrame(() => spreadsheetRef.current?.activate(point));
|
||||
}, [active, history, onChange]);
|
||||
|
||||
const activateOnly = useCallback((point: Point) => {
|
||||
setActive(point);
|
||||
selectedPointsRef.current = [point];
|
||||
setSelectedCount(1);
|
||||
window.requestAnimationFrame(() => spreadsheetRef.current?.activate(point));
|
||||
}, []);
|
||||
|
||||
const moveRow = useCallback((from: number, to: number) => {
|
||||
const next = moveExtraSheetRow(value, from, to);
|
||||
if (next === value) return;
|
||||
const point = { ...active, row: movedIndex(active.row, from, to) };
|
||||
commitSheet(next);
|
||||
activateOnly(point);
|
||||
}, [active, activateOnly, commitSheet, value]);
|
||||
|
||||
const moveColumn = useCallback((from: number, to: number) => {
|
||||
const next = moveExtraSheetColumn(value, from, to);
|
||||
if (next === value) return;
|
||||
const point = { ...active, column: movedIndex(active.column, from, to) };
|
||||
commitSheet(next);
|
||||
activateOnly(point);
|
||||
}, [active, activateOnly, commitSheet, value]);
|
||||
|
||||
const handleDragEnd = useCallback(({ active: dragged, over }: DragEndEvent) => {
|
||||
if (!over || dragged.id === over.id) return;
|
||||
const draggedId = String(dragged.id);
|
||||
const overId = String(over.id);
|
||||
if (draggedId.startsWith("row:") && overId.startsWith("row:")) {
|
||||
const from = value.rows.findIndex((row) => rowDragId(row.id) === draggedId);
|
||||
const to = value.rows.findIndex((row) => rowDragId(row.id) === overId);
|
||||
if (from !== -1 && to !== -1) moveRow(from, to);
|
||||
}
|
||||
if (draggedId.startsWith("column:") && overId.startsWith("column:")) {
|
||||
const from = value.columns.findIndex((column) => columnDragId(column.id) === draggedId);
|
||||
const to = value.columns.findIndex((column) => columnDragId(column.id) === overId);
|
||||
if (from !== -1 && to !== -1) moveColumn(from, to);
|
||||
}
|
||||
}, [moveColumn, moveRow, value.columns, value.rows]);
|
||||
|
||||
const handleSheetKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
|
||||
const target = event.target as HTMLElement;
|
||||
if (target.closest("input, textarea, [contenteditable='true']")) return;
|
||||
const key = event.key.toLowerCase();
|
||||
const undo = (event.metaKey || event.ctrlKey) && !event.shiftKey && key === "z";
|
||||
const redo = (event.metaKey || event.ctrlKey) && event.shiftKey && key === "z"
|
||||
|| event.ctrlKey && !event.shiftKey && key === "y";
|
||||
if (undo && canUndo) {
|
||||
event.preventDefault();
|
||||
travel(-1);
|
||||
} else if (redo && canRedo) {
|
||||
event.preventDefault();
|
||||
travel(1);
|
||||
}
|
||||
};
|
||||
const normalizedLabel = columnLabel.trim().toLocaleLowerCase();
|
||||
const labelInvalid = !normalizedLabel || value.columns.some((column, index) =>
|
||||
index !== (renaming ? active.column : -1) &&
|
||||
@@ -151,7 +370,7 @@ export function ExtraSheetEditor({
|
||||
const saveColumnLabel = () => {
|
||||
if (labelInvalid) return;
|
||||
if (renaming) {
|
||||
onChange({
|
||||
commitSheet({
|
||||
...value,
|
||||
columns: value.columns.map((column, index) =>
|
||||
index === active.column ? { ...column, label: columnLabel.trim() } : column,
|
||||
@@ -159,12 +378,12 @@ export function ExtraSheetEditor({
|
||||
});
|
||||
} else {
|
||||
const column = value.columns.length;
|
||||
onChange(addExtraSheetColumn(
|
||||
commitSheet(addExtraSheetColumn(
|
||||
value,
|
||||
columnLabel.trim(),
|
||||
createId("extra-sheet-column"),
|
||||
));
|
||||
setActive((current) => ({ ...current, column }));
|
||||
activateOnly({ ...active, column });
|
||||
}
|
||||
setLabelDialogOpen(false);
|
||||
};
|
||||
@@ -175,27 +394,66 @@ export function ExtraSheetEditor({
|
||||
setCellDraft(normalizeExtraRichText(
|
||||
content ?? (column && row ? row.cells[column.id] ?? "" : ""),
|
||||
));
|
||||
setOriginalCellDraft(normalizeExtraRichText(
|
||||
content ?? (column && row ? row.cells[column.id] ?? "" : ""),
|
||||
));
|
||||
setStylePatch({});
|
||||
setCellDialogOpen(true);
|
||||
}, [value.columns, value.rows]);
|
||||
const openActiveCellEditor = () => openCellEditorAt(active);
|
||||
const columnIndicator = useCallback((props: ColumnIndicatorProps) => (
|
||||
<EditableColumnIndicator {...props} onRename={openRenameColumn} />
|
||||
), [openRenameColumn]);
|
||||
<EditableColumnIndicator
|
||||
{...props}
|
||||
id={columnDragId(value.columns[props.column].id)}
|
||||
onRename={openRenameColumn}
|
||||
/>
|
||||
), [openRenameColumn, value.columns]);
|
||||
const rowIndicator = useCallback((props: RowIndicatorProps) => (
|
||||
<SortableRowIndicator {...props} id={rowDragId(value.rows[props.row].id)} />
|
||||
), [value.rows]);
|
||||
const dataEditor = useCallback((props: DataEditorProps<{ value: string }>) => (
|
||||
<DialogDataEditor {...props} onEdit={openCellEditorAt} />
|
||||
), [openCellEditorAt]);
|
||||
|
||||
return (
|
||||
<div className="flex min-w-0 flex-col gap-3" aria-label="ตารางข้อมูลเสริม">
|
||||
<div
|
||||
className="flex min-w-0 flex-col gap-3"
|
||||
aria-label="ตารางข้อมูลเสริม"
|
||||
onKeyDown={handleSheetKeyDown}
|
||||
>
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<SimpleTooltip text={<>ย้อนกลับ <Kbd>Ctrl/⌘ Z</Kbd></>}>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
disabled={!canUndo}
|
||||
aria-label="ย้อนกลับการแก้ไขตาราง"
|
||||
onClick={() => travel(-1)}
|
||||
>
|
||||
<Undo2Icon />
|
||||
</Button>
|
||||
</SimpleTooltip>
|
||||
<SimpleTooltip text={<>ทำซ้ำ <Kbd>Ctrl/⌘ Shift Z</Kbd></>}>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
disabled={!canRedo}
|
||||
aria-label="ทำซ้ำการแก้ไขตาราง"
|
||||
onClick={() => travel(1)}
|
||||
>
|
||||
<Redo2Icon />
|
||||
</Button>
|
||||
</SimpleTooltip>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => {
|
||||
const row = value.rows.length;
|
||||
onChange(addExtraSheetRow(value, createId("extra-sheet-row")));
|
||||
setActive((current) => ({ ...current, row }));
|
||||
commitSheet(addExtraSheetRow(value, createId("extra-sheet-row")));
|
||||
activateOnly({ ...active, row });
|
||||
}}
|
||||
>
|
||||
<PlusIcon data-icon="inline-start" />
|
||||
@@ -220,7 +478,7 @@ export function ExtraSheetEditor({
|
||||
className="absolute inset-0 cursor-pointer opacity-0"
|
||||
value={activeRow?.backgrounds?.[activeColumn?.id ?? ""] ?? DEFAULT_CELL_BACKGROUND}
|
||||
onChange={(event) => {
|
||||
onChange(updateExtraSheetCells(
|
||||
commitSheet(updateExtraSheetCells(
|
||||
value,
|
||||
selectedPointsRef.current,
|
||||
{ backgroundColor: event.target.value },
|
||||
@@ -232,7 +490,7 @@ export function ExtraSheetEditor({
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => onChange(updateExtraSheetCells(value, selectedPointsRef.current, { backgroundColor: null }))}
|
||||
onClick={() => commitSheet(updateExtraSheetCells(value, selectedPointsRef.current, { backgroundColor: null }))}
|
||||
>
|
||||
ล้างสีพื้นหลัง
|
||||
</Button>
|
||||
@@ -249,8 +507,7 @@ export function ExtraSheetEditor({
|
||||
<DropdownMenuItem
|
||||
disabled={!activeRow || active.row === 0}
|
||||
onClick={() => {
|
||||
onChange(moveExtraSheetRow(value, active.row, active.row - 1));
|
||||
setActive((current) => ({ ...current, row: current.row - 1 }));
|
||||
moveRow(active.row, active.row - 1);
|
||||
}}
|
||||
>
|
||||
<ArrowUpIcon />ย้ายขึ้น
|
||||
@@ -258,8 +515,7 @@ export function ExtraSheetEditor({
|
||||
<DropdownMenuItem
|
||||
disabled={!activeRow || active.row === value.rows.length - 1}
|
||||
onClick={() => {
|
||||
onChange(moveExtraSheetRow(value, active.row, active.row + 1));
|
||||
setActive((current) => ({ ...current, row: current.row + 1 }));
|
||||
moveRow(active.row, active.row + 1);
|
||||
}}
|
||||
>
|
||||
<ArrowDownIcon />ย้ายลง
|
||||
@@ -291,8 +547,7 @@ export function ExtraSheetEditor({
|
||||
<DropdownMenuItem
|
||||
disabled={!activeColumn || active.column === 0}
|
||||
onClick={() => {
|
||||
onChange(moveExtraSheetColumn(value, active.column, active.column - 1));
|
||||
setActive((current) => ({ ...current, column: current.column - 1 }));
|
||||
moveColumn(active.column, active.column - 1);
|
||||
}}
|
||||
>
|
||||
<ArrowLeftIcon />ย้ายไปทางซ้าย
|
||||
@@ -300,8 +555,7 @@ export function ExtraSheetEditor({
|
||||
<DropdownMenuItem
|
||||
disabled={!activeColumn || active.column === value.columns.length - 1}
|
||||
onClick={() => {
|
||||
onChange(moveExtraSheetColumn(value, active.column, active.column + 1));
|
||||
setActive((current) => ({ ...current, column: current.column + 1 }));
|
||||
moveColumn(active.column, active.column + 1);
|
||||
}}
|
||||
>
|
||||
<ArrowRightIcon />ย้ายไปทางขวา
|
||||
@@ -326,31 +580,41 @@ export function ExtraSheetEditor({
|
||||
</div>
|
||||
|
||||
<div className="overflow-x-auto rounded-lg border">
|
||||
<Spreadsheet
|
||||
className="extra-sheet-grid"
|
||||
data={matrix}
|
||||
columnLabels={value.columns.map((column) => column.label)}
|
||||
ColumnIndicator={columnIndicator}
|
||||
DataViewer={LiteralDataViewer}
|
||||
DataEditor={dataEditor}
|
||||
onActivate={(point) => {
|
||||
setActive(point);
|
||||
setSelectedCount(1);
|
||||
selectedPointsRef.current = [point];
|
||||
}}
|
||||
onSelect={(nextSelection) => {
|
||||
const range = nextSelection.toRange(matrix);
|
||||
if (range) {
|
||||
selectedPointsRef.current = Array.from(range);
|
||||
setSelectedCount(range.size());
|
||||
}
|
||||
}}
|
||||
onChange={(next) => onChange(matrixToExtraSheet(
|
||||
value,
|
||||
next as ExtraSheetMatrix,
|
||||
createId,
|
||||
))}
|
||||
/>
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
collisionDetection={sameAxisCollision}
|
||||
onDragEnd={handleDragEnd}
|
||||
>
|
||||
<SortableContext items={sortableIds} strategy={rectSortingStrategy}>
|
||||
<Spreadsheet
|
||||
ref={spreadsheetRef}
|
||||
className="extra-sheet-grid"
|
||||
data={matrix}
|
||||
columnLabels={value.columns.map((column) => column.label)}
|
||||
ColumnIndicator={columnIndicator}
|
||||
RowIndicator={rowIndicator}
|
||||
DataViewer={LiteralDataViewer}
|
||||
DataEditor={dataEditor}
|
||||
onActivate={(point) => {
|
||||
setActive(point);
|
||||
setSelectedCount(1);
|
||||
selectedPointsRef.current = [point];
|
||||
}}
|
||||
onSelect={(nextSelection) => {
|
||||
const range = nextSelection.toRange(matrix);
|
||||
if (range) {
|
||||
selectedPointsRef.current = Array.from(range);
|
||||
setSelectedCount(range.size());
|
||||
}
|
||||
}}
|
||||
onChange={(next) => commitSheet(matrixToExtraSheet(
|
||||
value,
|
||||
next as ExtraSheetMatrix,
|
||||
createId,
|
||||
))}
|
||||
/>
|
||||
</SortableContext>
|
||||
</DndContext>
|
||||
</div>
|
||||
|
||||
<Dialog open={cellDialogOpen} onOpenChange={setCellDialogOpen}>
|
||||
@@ -359,16 +623,30 @@ export function ExtraSheetEditor({
|
||||
<DialogTitle>แก้ไขเซลล์</DialogTitle>
|
||||
<DialogDescription>
|
||||
{selectedCount > 1
|
||||
? `นำข้อความเดียวกันไปใช้กับ ${selectedCount} เซลล์ที่เลือก`
|
||||
? `การแก้ข้อความจะแทนที่ทั้ง ${selectedCount} เซลล์ แต่การเปลี่ยนรูปแบบจะเก็บข้อความเดิมของแต่ละเซลล์`
|
||||
: `แถว ${active.row + 1} · ${activeColumn?.label ?? "คอลัมน์"}`}
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
<RichTextEditor value={cellDraft} onChange={setCellDraft} showBubbleMenu={false} />
|
||||
<RichTextEditor
|
||||
value={cellDraft}
|
||||
onChange={setCellDraft}
|
||||
showBubbleMenu={false}
|
||||
formatWholeContent={selectedCount > 1}
|
||||
onFormatChange={(patch) => setStylePatch((current) => ({ ...current, ...patch }))}
|
||||
/>
|
||||
<DialogFooter showCloseButton>
|
||||
<Button type="button" onClick={() => {
|
||||
onChange(selectedCount > 1
|
||||
? updateExtraSheetCells(value, selectedPointsRef.current, { value: cellDraft })
|
||||
: updateExtraSheetCell(value, active.row, active.column, cellDraft));
|
||||
const contentUnchanged = richTextContentSignature(cellDraft)
|
||||
=== richTextContentSignature(originalCellDraft);
|
||||
if (selectedCount > 1 && contentUnchanged) {
|
||||
if (Object.keys(stylePatch).length > 0) {
|
||||
commitSheet(styleExtraSheetCells(value, selectedPointsRef.current, stylePatch));
|
||||
}
|
||||
} else {
|
||||
commitSheet(selectedCount > 1
|
||||
? updateExtraSheetCells(value, selectedPointsRef.current, { value: cellDraft })
|
||||
: updateExtraSheetCell(value, active.row, active.column, cellDraft));
|
||||
}
|
||||
setCellDialogOpen(false);
|
||||
}}>บันทึกเซลล์</Button>
|
||||
</DialogFooter>
|
||||
@@ -412,11 +690,11 @@ export function ExtraSheetEditor({
|
||||
showSuccessToast={false}
|
||||
onConfirm={() => {
|
||||
if (deleteTarget === "column") {
|
||||
onChange(deleteExtraSheetColumn(value, active.column));
|
||||
setActive((current) => ({ ...current, column: Math.max(0, current.column - 1) }));
|
||||
commitSheet(deleteExtraSheetColumn(value, active.column));
|
||||
activateOnly({ ...active, column: Math.max(0, active.column - 1) });
|
||||
} else if (deleteTarget === "row") {
|
||||
onChange(deleteExtraSheetRow(value, active.row));
|
||||
setActive((current) => ({ ...current, row: Math.max(0, current.row - 1) }));
|
||||
commitSheet(deleteExtraSheetRow(value, active.row));
|
||||
activateOnly({ ...active, row: Math.max(0, active.row - 1) });
|
||||
}
|
||||
setDeleteTarget(null);
|
||||
}}
|
||||
|
||||
@@ -38,6 +38,7 @@ import { Input } from "@/components/ui/input";
|
||||
import { Separator } from "@/components/ui/separator";
|
||||
import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
|
||||
import {
|
||||
type RichTextStylePatch,
|
||||
sanitizeRichTextHtml,
|
||||
sanitizeRichTextUrl,
|
||||
} from "@/lib/rich-text";
|
||||
@@ -50,6 +51,8 @@ export interface RichTextEditorProps {
|
||||
className?: string;
|
||||
invalid?: boolean;
|
||||
showBubbleMenu?: boolean;
|
||||
formatWholeContent?: boolean;
|
||||
onFormatChange?: (patch: RichTextStylePatch) => void;
|
||||
}
|
||||
|
||||
type Format = "bold" | "italic" | "underline" | "strike";
|
||||
@@ -62,20 +65,39 @@ function normalizedEditorHtml(editor: Editor): string {
|
||||
function FormatControls({
|
||||
editor,
|
||||
onLink,
|
||||
formatWholeContent,
|
||||
onFormatChange,
|
||||
}: {
|
||||
editor: Editor;
|
||||
onLink: () => void;
|
||||
formatWholeContent: boolean;
|
||||
onFormatChange?: (patch: RichTextStylePatch) => void;
|
||||
}) {
|
||||
const formats: Format[] = ["bold", "italic", "underline", "strike"];
|
||||
const active = formats.filter((format) => editor.isActive(format));
|
||||
const color = editor.getAttributes("textStyle").color ?? "#FF3B30";
|
||||
|
||||
const toggleFormat = (format: Format) => {
|
||||
if (formatWholeContent) editor.commands.selectAll();
|
||||
const enabled = !editor.isActive(format);
|
||||
const chain = editor.chain().focus();
|
||||
if (format === "bold") chain.toggleBold().run();
|
||||
if (format === "italic") chain.toggleItalic().run();
|
||||
if (format === "underline") chain.toggleUnderline().run();
|
||||
if (format === "strike") chain.toggleStrike().run();
|
||||
if (format === "bold") {
|
||||
if (enabled) chain.setBold().run();
|
||||
else chain.unsetBold().run();
|
||||
}
|
||||
if (format === "italic") {
|
||||
if (enabled) chain.setItalic().run();
|
||||
else chain.unsetItalic().run();
|
||||
}
|
||||
if (format === "underline") {
|
||||
if (enabled) chain.setUnderline().run();
|
||||
else chain.unsetUnderline().run();
|
||||
}
|
||||
if (format === "strike") {
|
||||
if (enabled) chain.setStrike().run();
|
||||
else chain.unsetStrike().run();
|
||||
}
|
||||
onFormatChange?.({ [format]: enabled });
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -113,7 +135,11 @@ function FormatControls({
|
||||
type="color"
|
||||
value={color}
|
||||
className="absolute inset-0 cursor-pointer opacity-0"
|
||||
onChange={(event) => editor.chain().focus().setColor(event.target.value).run()}
|
||||
onChange={(event) => {
|
||||
if (formatWholeContent) editor.commands.selectAll();
|
||||
editor.chain().focus().setColor(event.target.value).run();
|
||||
onFormatChange?.({ color: event.target.value });
|
||||
}}
|
||||
/>
|
||||
</label>
|
||||
<Button
|
||||
@@ -122,7 +148,11 @@ function FormatControls({
|
||||
size="icon-sm"
|
||||
aria-label="ล้างสีข้อความ"
|
||||
title="ล้างสีข้อความ"
|
||||
onClick={() => editor.chain().focus().unsetColor().run()}
|
||||
onClick={() => {
|
||||
if (formatWholeContent) editor.commands.selectAll();
|
||||
editor.chain().focus().unsetColor().run();
|
||||
onFormatChange?.({ color: null });
|
||||
}}
|
||||
>
|
||||
<RemoveFormattingIcon />
|
||||
</Button>
|
||||
@@ -147,6 +177,8 @@ export function RichTextEditor({
|
||||
className,
|
||||
invalid = false,
|
||||
showBubbleMenu = true,
|
||||
formatWholeContent = false,
|
||||
onFormatChange,
|
||||
}: RichTextEditorProps) {
|
||||
const [linkOpen, setLinkOpen] = useState(false);
|
||||
const [linkText, setLinkText] = useState("");
|
||||
@@ -241,11 +273,21 @@ export function RichTextEditor({
|
||||
aria-invalid={invalid || undefined}
|
||||
>
|
||||
<div className="border-b bg-muted/50 p-1">
|
||||
<FormatControls editor={editor} onLink={openLinkDialog} />
|
||||
<FormatControls
|
||||
editor={editor}
|
||||
onLink={openLinkDialog}
|
||||
formatWholeContent={formatWholeContent}
|
||||
onFormatChange={onFormatChange}
|
||||
/>
|
||||
</div>
|
||||
{showBubbleMenu ? (
|
||||
<BubbleMenu editor={editor} className="rounded-lg border bg-popover p-1 shadow-md">
|
||||
<FormatControls editor={editor} onLink={openLinkDialog} />
|
||||
<FormatControls
|
||||
editor={editor}
|
||||
onLink={openLinkDialog}
|
||||
formatWholeContent={formatWholeContent}
|
||||
onFormatChange={onFormatChange}
|
||||
/>
|
||||
</BubbleMenu>
|
||||
) : null}
|
||||
<EditorContent editor={editor} />
|
||||
|
||||
Reference in New Issue
Block a user