Skip to content

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

editor: remove editor.current usage

Ammar Ahmed832652730ae9
diff --git a/packages/editor/src/extensions/web-clip/component.tsx b/packages/editor/src/extensions/web-clip/component.tsx
index 40325b575..5395a513c 100644
--- a/packages/editor/src/extensions/web-clip/component.tsx
+++ b/packages/editor/src/extensions/web-clip/component.tsx
@@ -48,7 +48,7 @@ export function WebClipComponent(
const iframe = embedRef.current;
if (!iframe || !iframe.contentDocument || !isLoading) return;
- const html = await editor.current?.storage
+ const html = await editor.storage
.getAttachmentData?.(node.attrs)
.catch(() => null);
iframe.contentDocument.open();
diff --git a/packages/editor/src/toolbar/popups/color-picker.tsx b/packages/editor/src/toolbar/popups/color-picker.tsx
index 7af8cd8d6..69ca700ad 100644
--- a/packages/editor/src/toolbar/popups/color-picker.tsx
+++ b/packages/editor/src/toolbar/popups/color-picker.tsx
@@ -211,16 +211,13 @@ export function ColorPicker(props: ColorPickerProps) {
onClick={() => {
setIsPickerOpen((s) => {
if (s) {
- editor.current?.commands.focus();
+ editor.commands.focus();
} else {
const onSelectionChange = () => {
setIsPickerOpen(false);
- editor.current?.off(
- "selectionUpdate",
- onSelectionChange
- );
+ editor.off("selectionUpdate", onSelectionChange);
};
- editor.current?.on("selectionUpdate", onSelectionChange);
+ editor.on("selectionUpdate", onSelectionChange);
}
return !s;
});
diff --git a/packages/editor/src/toolbar/tools/block.tsx b/packages/editor/src/toolbar/tools/block.tsx
index 14186cfd4..6393f8249 100644
--- a/packages/editor/src/toolbar/tools/block.tsx
+++ b/packages/editor/src/toolbar/tools/block.tsx
@@ -159,10 +159,10 @@ const callout = (editor: Editor): MenuItem => ({
title: type,
key: type,
type: "button",
- isChecked: editor?.isActive("callout", { type: type.toLowerCase() }),
+ isChecked: editor.isActive("callout", { type: type.toLowerCase() }),
onClick: () =>
- editor.current
- ?.chain()
+ editor
+ .chain()
.focus()
.setCallout({ type: type.toLowerCase() as any })
.run()
diff --git a/packages/editor/src/toolbar/tools/image.tsx b/packages/editor/src/toolbar/tools/image.tsx
index ac0adb2de..151cf30a9 100644
--- a/packages/editor/src/toolbar/tools/image.tsx
+++ b/packages/editor/src/toolbar/tools/image.tsx
@@ -120,11 +120,7 @@ export function ImageFloat(props: ToolProps) {
{...props}
toggled={!!float}
onClick={() =>
- editor.current
- ?.chain()
- .focus()
- .setImageAlignment({ float: !float })
- .run()
+ editor.chain().focus().setImageAlignment({ float: !float }).run()
}
/>
);
diff --git a/packages/editor/src/toolbar/tools/lists.tsx b/packages/editor/src/toolbar/tools/lists.tsx
index d383b321d..9698a784a 100644
--- a/packages/editor/src/toolbar/tools/lists.tsx
+++ b/packages/editor/src/toolbar/tools/lists.tsx
@@ -181,7 +181,7 @@ export function CheckList(props: ToolProps) {
<ToolButton
{...toolProps}
toggled={false}
- onClick={() => editor.current?.chain().focus().toggleCheckList().run()}
+ onClick={() => editor.chain().focus().toggleCheckList().run()}
/>
);
}