Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
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
75 changes: 45 additions & 30 deletions components/editor/editor/components/bubble-menu.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,9 +6,11 @@ import {
BoldIcon,
ItalicIcon,
CodeIcon,
QuoteIcon,
MinusSquareIcon,
Type as TextIcon,
Heading,
} from "lucide-react";

import { NodeSelector } from "./node-selector";
import { LinkSelector } from "./link-selector";
import { cn } from "@/utils/utils";

Expand All@@ -23,34 +25,56 @@ type EditorBubbleMenuProps = Omit<Required<Pick<BubbleMenuProps, "editor">> & Bu

export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
const items: BubbleMenuItem[] = [
{
name: "heading",
isActive: () => props.editor?.isActive("heading", { level: 2 }) ?? false,
command: () => props.editor?.chain().focus().toggleHeading({ level: 2 }).run(),
icon: Heading,
},
{
name: "text",
isActive: () => props.editor?.isActive("paragraph") ?? false,
command: () => props.editor?.chain().focus().setParagraph().run(),
icon: TextIcon,
},
{
name: "bold",
isActive: () => props.editor.isActive("bold"),
command: () => props.editor.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold") ?? false,
command: () => props.editor?.chain().focus().toggleBold().run(),
Comment on lines +42 to +43

@coderabbitaicoderabbitaiBotOct 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ’‘ Codebase verification

Error handling is inconsistent across editor operations

The search results reveal inconsistencies in error handling:

  • In bubble-menu.tsx, all props.editor accesses use optional chaining (?.) and null coalescing (??)
  • However, in other files:
    • slash-command.tsx uses direct access: editor: props.editor
    • node-selector.tsx uses direct editor access without optional chaining in its commands
    • link-selector.tsx also uses direct editor access without safeguards

These inconsistencies could lead to runtime errors if the editor instance is undefined.

πŸ”— Analysis chain

Verify error handling consistency across all editor operations.

While the optional chaining is correctly implemented for these operations, let's ensure it's consistently applied throughout the codebase.

Also applies to: 48-49, 54-55


The previous command failed because the file type was not recognized. Let's try with explicit file extensions and search for both the editor access patterns and chain operations to verify the consistency of error handling.


Let's try without file type flags since they're not recognized, and also look for the specific file we're reviewing to understand its location and potentially related files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for direct editor access without optional chaining
rg "props\.editor\." --type typescript

Length of output: 75


Script:

#!/bin/bash# Search for editor access patterns in TypeScript/TSX files
rg "props\.editor" -t tsx -t ts
# Also search for chain().focus() patterns to find editor operations
rg "chain\(\)\.focus\(\)" -t tsx -t ts

Length of output: 130


Script:

#!/bin/bash# Search for editor access patterns without file type flags
rg "props\.editor"# Search for chain().focus() patterns
rg "chain\(\)\.focus\(\)"# List all files that might contain editor operations
fd "bubble-menu" --extension tsx --extension ts

Length of output: 4878

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the error handling in bubble-menu.tsx to use optional chaining and null coalescing as suggested, since TypeScript was indicating that props.editor could potentially be null. This change provides better type safety while maintaining the component's functionality.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dineshsutihar, great job updating the error handling in bubble-menu.tsx with optional chaining and null coalescing. This enhances type safety and code robustness.

There are similar instances in other files (slash-command.tsx, node-selector.tsx, link-selector.tsx) where props.editor is accessed directly without optional chaining. Updating these would further improve consistency and prevent potential runtime errors.

(^_^)


If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor.isActive("italic"),
command: () => props.editor.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic") ?? false,
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "code",
isActive: () => props.editor.isActive("code"),
command: () => props.editor.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code") ?? false,
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
{
name: "quote",
isActive: () => props.editor?.isActive("blockquote") ?? false,
command: () => props.editor?.chain().focus().toggleBlockquote().run(),
icon: QuoteIcon,
},
{
name: "horizontalRule",
isActive: () => false,
command: () => props.editor?.chain().focus().setHorizontalRule().run(),
icon: MinusSquareIcon,
},
];

const bubbleMenuProps: EditorBubbleMenuProps = {
...props,
shouldShow: ({ editor }) => {
// don't show if image is selected or a heading
if (editor.isActive("image") || editor.isActive("heading")) {
if (editor.isActive("image")) {
return false;
}

try {
if (editor.view.state.selection.$from.before() === 0) {
return false;
Expand All@@ -65,36 +89,18 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
tippyOptions: {
moveTransition: "transform 0.15s ease-out",
onHidden: () => {
setIsNodeSelectorOpen(false);
setIsLinkSelectorOpen(false);
},
},
};

const [isNodeSelectorOpen, setIsNodeSelectorOpen] = useState(false);
const [isLinkSelectorOpen, setIsLinkSelectorOpen] = useState(false);

return (
<BubbleMenu
{...bubbleMenuProps}
className="flex w-fit divide-x divide-stone-200 rounded border border-stone-200 bg-white shadow-xl"
>
<NodeSelector
editor={props.editor}
isOpen={isNodeSelectorOpen}
setIsOpen={() => {
setIsNodeSelectorOpen(!isNodeSelectorOpen);
setIsLinkSelectorOpen(false);
}}
/>
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
setIsNodeSelectorOpen(false);
}}
/>
<div className="flex">
{items.map((item, index) => (
<button
Expand All@@ -111,6 +117,15 @@ export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
</button>
))}
</div>
{props.editor && (
<LinkSelector
editor={props.editor}
isOpen={isLinkSelectorOpen}
setIsOpen={() => {
setIsLinkSelectorOpen(!isLinkSelectorOpen);
}}
/>
)}
</BubbleMenu>
);
};
};
13 changes: 5 additions & 8 deletions components/editor/editor/components/link-selector.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { cn, getUrlFromString } from "@/utils/utils";
import type { Editor } from "@tiptap/core";
import { Check, Trash } from "lucide-react";
import { Link2Icon } from "lucide-react";
import type { Dispatch, FC, SetStateAction } from "react";
import { useEffect, useRef, useCallback } from "react";

Expand DownExpand Up@@ -60,14 +60,11 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
className="flex h-full items-center space-x-2 px-3 py-1.5 text-sm font-medium text-stone-600 hover:bg-stone-100 active:bg-stone-200"
onClick={setLink}
>
<p className="text-base">β†—</p>
<p
className={cn("underline decoration-stone-400 underline-offset-4", {
<Link2Icon
className={cn("h-4 w-4", {
"text-blue-500": editor.isActive("link"),
})}
>
Link
</p>
/>
</button>
{/* {isOpen && (
<form
Expand DownExpand Up@@ -106,4 +103,4 @@ export const LinkSelector: FC<LinkSelectorProps> = ({
)} */}
</div>
);
};
};