Skip to content
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.

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

feat: add checklist support in RichText editor and viewer components #399

Merged
merged 2 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions apps/web/app/components/RichText/Editor.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { EditorContent, useEditor } from "@tiptap/react";
// eslint-disable-next-line import/no-named-as-default
import StarterKit from "@tiptap/starter-kit";

import { cn } from "~/lib/utils";

import { plugins } from "./plugins";
import { defaultClasses } from "./styles";
import EditorToolbar from "./toolbar/EditorToolbar";

type EditorProps = {
Expand All @@ -16,7 +16,7 @@ type EditorProps = {

const Editor = ({ content, placeholder, onChange, id, className }: EditorProps) => {
const editor = useEditor({
extensions: [StarterKit],
extensions: [...plugins],
content: content,
onUpdate: ({ editor }) => {
onChange(editor.getHTML());
Expand All @@ -30,6 +30,8 @@ const Editor = ({ content, placeholder, onChange, id, className }: EditorProps)

if (!editor) return <></>;

const editorClasses = cn("h-full", defaultClasses.ul, defaultClasses.ol, defaultClasses.taskList);

return (
<div className="prose w-full max-w-none overflow-hidden rounded-lg border border-neutral-300 bg-background dark:prose-invert [&_.ProseMirror]:leading-tight">
<EditorToolbar editor={editor} />
Expand All @@ -39,7 +41,12 @@ const Editor = ({ content, placeholder, onChange, id, className }: EditorProps)
className,
)}
>
<EditorContent id={id} editor={editor} placeholder={placeholder} className="h-full" />
<EditorContent
id={id}
editor={editor}
placeholder={placeholder}
className={editorClasses}
/>
</div>
</div>
);
Expand Down
19 changes: 10 additions & 9 deletions apps/web/app/components/RichText/Viever.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import { EditorContent, useEditor } from "@tiptap/react";
// eslint-disable-next-line import/no-named-as-default
import StarterKit from "@tiptap/starter-kit";

import { cn } from "~/lib/utils";

import { plugins } from "./plugins";
import { defaultClasses } from "./styles";

type ViewerProps = {
content: string;
style?: "default" | "prose";
className?: string;
variant?: "default" | "lesson";
};

const defaultClasses = {
ul: "[&>div>ul]:list-disc [&>div>ul]:list-inside [&>div>ul>li>p]:inline",
ol: "[&>div>ol]:list-decimal [&>div>ol]:list-inside [&>div>ol>li>p]:inline",
};

const lessonVariantClasses = {
layout: "[&>div]:flex [&>div]:flex-col [&>div]:gap-y-6",
h2: "[&>div>h2]:h6 [&>div>h2]:text-neutral-950",
Expand All @@ -26,7 +22,7 @@ const lessonVariantClasses = {

const Viewer = ({ content, style, className, variant = "default" }: ViewerProps) => {
const editor = useEditor({
extensions: [StarterKit],
extensions: [...plugins],
content: content,
editable: false,
});
Expand All @@ -49,7 +45,12 @@ const Viewer = ({ content, style, className, variant = "default" }: ViewerProps)
]
: [];

const editorClasses = cn(defaultClasses.ul, defaultClasses.ol, ...variantClasses);
const editorClasses = cn(
defaultClasses.ul,
defaultClasses.ol,
defaultClasses.taskList,
...variantClasses,
);

return (
<article className={classNames}>
Expand Down
19 changes: 19 additions & 0 deletions apps/web/app/components/RichText/plugins.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { TaskItem } from "@tiptap/extension-task-item";
import { TaskList } from "@tiptap/extension-task-list";
import { StarterKit } from "@tiptap/starter-kit";

export const plugins = [
StarterKit,
TaskList.configure({
HTMLAttributes: {
class: "list-none",
},
}),
TaskItem.configure({
nested: true,
HTMLAttributes: {
class: "flex items-start gap-2 [&_p]:inline [&_p]:m-0",
},
onReadOnlyChecked: (_node, _checked) => true,
}),
];
25 changes: 25 additions & 0 deletions apps/web/app/components/RichText/styles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
export const defaultClasses = {
ul: `
[&>div>ul]:list-disc
[&>div>ul]:pl-5
[&>div>ul>li>p]:inline
[&>div>ul>li>p]:text-neutral-900

[&_ul]:list-disc
[&_[contenteditable='true']>ul>li]:pl-0
[&_[contenteditable='true']>ul>li_ul_li]:pl-0
[&_[contenteditable='false']>ul>li]:pl-4
[&_[contenteditable='false']>ul>li_ul_li]:pl-4
[&_ul>li]:marker:text-neutral-400
[&_ul>li>p]:inline
[&_ul>li>p]:text-neutral-900
`,
ol: `
[&>div>ol]:list-decimal
[&>div>ol]:list-inside
[&>div>ol>li>p]:inline
[&>div>ol>li>ol]:pl-4
[&_ol>li>ol]:pl-4
`,
taskList: "[&_[data-type='taskList']]:list-none [&_[data-type='taskList']]:pl-0",
};
19 changes: 19 additions & 0 deletions apps/web/app/components/RichText/toolbar/EditorToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ import {
Redo,
Strikethrough,
Undo,
CheckSquare,
} from "lucide-react";

import { Button } from "~/components/ui/button";
import { ToggleGroup, Toolbar } from "~/components/ui/toolbar";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "~/components/ui/tooltip";
import { cn } from "~/lib/utils";

import { FormatType } from "./FormatType";

Expand Down Expand Up @@ -135,6 +137,23 @@ const EditorToolbar = ({ editor }: EditorToolbarProps) => {
</TooltipTrigger>
<TooltipContent>Horizontal Rule: Inserts a horizontal line</TooltipContent>
</Tooltip>

<Tooltip>
<TooltipTrigger>
<Button
size="sm"
className={cn("bg-transparent text-black", {
"bg-blue-100": editor.isActive("taskList"),
"hover:bg-blue-100": !editor.isActive("taskList"),
})}
onClick={handleToggle(() => editor.chain().focus().toggleTaskList().run())}
>
<CheckSquare className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent>Checkbox: Adds a checklist</TooltipContent>
</Tooltip>

<FormatType editor={editor} />
</ToggleGroup>
<ToggleGroup
Expand Down
2 changes: 2 additions & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
"@tiptap/extension-document": "2.10.3",
"@tiptap/extension-highlight": "2.10.3",
"@tiptap/extension-paragraph": "2.10.3",
"@tiptap/extension-task-item": "^2.11.3",
"@tiptap/extension-task-list": "^2.11.3",
"@tiptap/extension-text": "2.10.3",
"@tiptap/extension-text-style": "2.10.3",
"@tiptap/pm": "2.9.1",
Expand Down
26 changes: 26 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading