Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

editor: minor refactors

Abdullah Atta71ad15b4b61d
diff --git a/packages/editor/src/toolbar/tools/alignment.tsx b/packages/editor/src/toolbar/tools/alignment.tsx
index 803e3358d..dc9614be7 100644
--- a/packages/editor/src/toolbar/tools/alignment.tsx
+++ b/packages/editor/src/toolbar/tools/alignment.tsx
@@ -35,7 +35,7 @@ function AlignmentTool(props: AlignmentToolProps) {
<ToolButton
{...toolProps}
onClick={() => {
- editor?.chain().focus().setTextAlign(alignmentRef.current).run();
+ editor.chain().focus().setTextAlign(alignmentRef.current).run();
}}
disabled={editor.isActive(CodeBlock.name)}
toggled={false}
diff --git a/packages/editor/src/toolbar/tools/block.tsx b/packages/editor/src/toolbar/tools/block.tsx
index 6393f8249..8253cab8b 100644
--- a/packages/editor/src/toolbar/tools/block.tsx
+++ b/packages/editor/src/toolbar/tools/block.tsx
@@ -37,25 +37,21 @@ export function InsertBlock(props: ToolProps) {
const toolbarLocation = useToolbarLocation();
const isMobile = useIsMobile();
- const menuItems = useMemo(
- () => {
- return [
- tasklist(editor),
- outlinelist(editor),
- horizontalRule(editor),
- codeblock(editor),
- mathblock(editor),
- callout(editor),
- blockquote(editor),
- image(editor, isMobile),
- attachment(editor),
- isMobile ? embedMobile(editor) : embedDesktop(editor),
- table(editor)
- ];
- },
- // eslint-disable-next-line react-hooks/exhaustive-deps
- [isMobile]
- );
+ const menuItems = useMemo(() => {
+ return [
+ tasklist(editor),
+ outlinelist(editor),
+ horizontalRule(editor),
+ codeblock(editor),
+ mathblock(editor),
+ callout(editor),
+ blockquote(editor),
+ image(editor, isMobile),
+ attachment(editor),
+ isMobile ? embedMobile(editor) : embedDesktop(editor),
+ table(editor)
+ ];
+ }, [editor, isMobile]);
return (
<>
@@ -106,7 +102,7 @@ const horizontalRule = (editor: Editor): MenuItem => ({
type: "button",
title: "Horizontal rule",
icon: Icons.horizontalRule,
- isChecked: editor?.isActive("horizontalRule"),
+ isChecked: editor.isActive("horizontalRule"),
onClick: () => editor.chain().focus().setHorizontalRule().run()
});
@@ -115,7 +111,7 @@ const codeblock = (editor: Editor): MenuItem => ({
type: "button",
title: "Code block",
icon: Icons.codeblock,
- isChecked: editor?.isActive("codeBlock"),
+ isChecked: editor.isActive("codeBlock"),
onClick: () => editor.chain().focus().toggleCodeBlock().run(),
modifier: "Mod-Shift-C"
});
@@ -125,7 +121,7 @@ const blockquote = (editor: Editor): MenuItem => ({
type: "button",
title: "Quote",
icon: Icons.blockquote,
- isChecked: editor?.isActive("blockQuote"),
+ isChecked: editor.isActive("blockQuote"),
onClick: () => editor.chain().focus().toggleBlockquote().run(),
modifier: "Mod-Shift-B"
});
@@ -135,7 +131,7 @@ const mathblock = (editor: Editor): MenuItem => ({
type: "button",
title: "Math & formulas",
icon: Icons.mathBlock,
- isChecked: editor?.isActive("mathBlock"),
+ isChecked: editor.isActive("mathBlock"),
onClick: () => editor.chain().focus().insertMathBlock().run(),
modifier: "Mod-Shift-M"
});
@@ -285,7 +281,7 @@ const attachment = (editor: Editor): MenuItem => ({
type: "button",
title: "Attachment",
icon: Icons.attachment,
- isChecked: editor?.isActive("attachment"),
+ isChecked: editor.isActive("attachment"),
onClick: () => editor.storage.openAttachmentPicker?.("file"),
modifier: "Mod-Shift-A"
});
@@ -295,7 +291,7 @@ const tasklist = (editor: Editor): MenuItem => ({
type: "button",
title: "Task list",
icon: Icons.checkbox,
- isChecked: editor?.isActive("taskList"),
+ isChecked: editor.isActive("taskList"),
onClick: () => editor.chain().focus().toggleTaskList().run(),
modifier: "Mod-Shift-T"
});
@@ -305,7 +301,7 @@ const outlinelist = (editor: Editor): MenuItem => ({
type: "button",
title: "Outline list",
icon: Icons.outlineList,
- isChecked: editor?.isActive("outlineList"),
+ isChecked: editor.isActive("outlineList"),
onClick: () => editor.chain().focus().toggleOutlineList().run(),
modifier: "Mod-Shift-O"
});
diff --git a/packages/editor/src/toolbar/tools/embed.tsx b/packages/editor/src/toolbar/tools/embed.tsx
index dad85b730..74ebd661e 100644
--- a/packages/editor/src/toolbar/tools/embed.tsx
+++ b/packages/editor/src/toolbar/tools/embed.tsx
@@ -54,7 +54,7 @@ export function EmbedAlignLeft(props: ToolProps) {
{...props}
toggled={false}
onClick={() =>
- editor?.chain().focus().setEmbedAlignment({ align: "left" }).run()
+ editor.chain().focus().setEmbedAlignment({ align: "left" }).run()
}
/>
);
@@ -67,7 +67,7 @@ export function EmbedAlignRight(props: ToolProps) {
{...props}
toggled={false}
onClick={() =>
- editor?.chain().focus().setEmbedAlignment({ align: "right" }).run()
+ editor.chain().focus().setEmbedAlignment({ align: "right" }).run()
}
/>
);
@@ -80,7 +80,7 @@ export function EmbedAlignCenter(props: ToolProps) {
{...props}
toggled={false}
onClick={() =>
- editor?.chain().focus().setEmbedAlignment({ align: "center" }).run()
+ editor.chain().focus().setEmbedAlignment({ align: "center" }).run()
}
/>
);
diff --git a/packages/editor/src/toolbar/tools/font.tsx b/packages/editor/src/toolbar/tools/font.tsx
index 3402c0f37..d37324500 100644
--- a/packages/editor/src/toolbar/tools/font.tsx
+++ b/packages/editor/src/toolbar/tools/font.tsx
@@ -49,13 +49,13 @@ export function FontSize(props: ToolProps) {
title="Font size"
disabled={editor.isActive(CodeBlock.name)}
onDecrease={() =>
- editor?.chain().focus().setFontSize(`${decreaseFontSize()}px`).run()
+ editor.chain().focus().setFontSize(`${decreaseFontSize()}px`).run()
}
onIncrease={() => {
- editor?.chain().focus().setFontSize(`${increaseFontSize()}px`).run();
+ editor.chain().focus().setFontSize(`${increaseFontSize()}px`).run();
}}
onReset={() =>
- editor?.chain().focus().setFontSize(`${defaultFontSize}px`).run()
+ editor.chain().focus().setFontSize(`${defaultFontSize}px`).run()
}
value={fontSize || `${defaultFontSize}px`}
/>
diff --git a/packages/editor/src/toolbar/tools/image.tsx b/packages/editor/src/toolbar/tools/image.tsx
index b8b4e0d3f..ca3d2ff7c 100644
--- a/packages/editor/src/toolbar/tools/image.tsx
+++ b/packages/editor/src/toolbar/tools/image.tsx
@@ -66,7 +66,7 @@ export function ImageAlignLeft(props: ToolProps) {
{...props}
toggled={!align || align === "left"}
onClick={() =>
- editor?.chain().focus().setImageAlignment({ align: "left" }).run()
+ editor.chain().focus().setImageAlignment({ align: "left" }).run()
}
/>
);
@@ -84,7 +84,7 @@ export function ImageAlignRight(props: ToolProps) {
{...props}
toggled={align === "right"}
onClick={() =>
- editor?.chain().focus().setImageAlignment({ align: "right" }).run()
+ editor.chain().focus().setImageAlignment({ align: "right" }).run()
}
/>
);
@@ -102,7 +102,7 @@ export function ImageAlignCenter(props: ToolProps) {
{...props}
toggled={align === "center"}
onClick={() =>
- editor?.chain().focus().setImageAlignment({ align: "center" }).run()
+ editor.chain().focus().setImageAlignment({ align: "center" }).run()
}
/>
);
diff --git a/packages/editor/src/toolbar/tools/table.tsx b/packages/editor/src/toolbar/tools/table.tsx
index 34e12b010..3603e1e57 100644
--- a/packages/editor/src/toolbar/tools/table.tsx
+++ b/packages/editor/src/toolbar/tools/table.tsx
@@ -263,7 +263,7 @@ export function CellBorderColor(props: ToolProps) {
activeColor={editor.getAttributes("tableCell").borderColor}
title={"Cell border color"}
onColorChange={(color) =>
- editor?.chain().focus().setCellAttribute("borderColor", color).run()
+ editor.chain().focus().setCellAttribute("borderColor", color).run()
}
/>
);
diff --git a/packages/editor/src/toolbar/tools/text-direction.tsx b/packages/editor/src/toolbar/tools/text-direction.tsx
index d2f6ba68c..5878dd883 100644
--- a/packages/editor/src/toolbar/tools/text-direction.tsx
+++ b/packages/editor/src/toolbar/tools/text-direction.tsx
@@ -38,7 +38,7 @@ function TextDirectionTool(props: TextDirectionToolProps) {
<ToolButton
{...toolProps}
onClick={() =>
- editor?.chain().focus().setTextDirection(directionRef.current).run()
+ editor.chain().focus().setTextDirection(directionRef.current).run()
}
disabled={editor.isActive(CodeBlock.name)}
toggled={false}