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.

Sign up for GitHub

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

fix: formatting issues on tiptap editor #869

Merged
merged 2 commits into from
Apr 12, 2024
Merged

fix: formatting issues on tiptap editor #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6caa1be
chore: upgrade tiptap to latest version
prathameshkurunkar7 Apr 12, 2024
f255c9f
fix: formatting issues on tiptap editor
prathameshkurunkar7 Apr 12, 2024
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
25 changes: 13 additions & 12 deletions raven-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@
},
"dependencies": {
"@radix-ui/themes": "^2.0.3",
"@tiptap/extension-code-block-lowlight": "^2.2.2",
"@tiptap/extension-highlight": "^2.2.2",
"@tiptap/extension-image": "^2.2.4",
"@tiptap/extension-link": "^2.2.2",
"@tiptap/extension-mention": "^2.2.2",
"@tiptap/extension-placeholder": "^2.2.2",
"@tiptap/extension-typography": "^2.2.2",
"@tiptap/extension-underline": "^2.2.2",
"@tiptap/pm": "^2.2.2",
"@tiptap/react": "^2.2.2",
"@tiptap/starter-kit": "^2.2.2",
"@tiptap/suggestion": "^2.2.2",
"@tiptap/extension-code-block-lowlight": "^2.3",
"@tiptap/extension-highlight": "^2.3",
"@tiptap/extension-image": "^2.3",
"@tiptap/extension-link": "^2.3",
"@tiptap/extension-mention": "^2.3",
"@tiptap/extension-placeholder": "^2.3",
"@tiptap/extension-typography": "^2.3",
"@tiptap/extension-underline": "^2.3",
"@tiptap/extension-code":"^2.3",
"@tiptap/pm": "^2.3",
"@tiptap/react": "^2.3",
"@tiptap/starter-kit": "^2.3",
"@tiptap/suggestion": "^2.3",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.17",
"cal-sans": "^1.0.1",
Expand Down
27 changes: 23 additions & 4 deletions raven-app/src/components/feature/chat/ChatInput/TextFormattingMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCurrentEditor } from '@tiptap/react'
import { BiBold, BiCodeAlt, BiHighlight, BiItalic, BiLink, BiListOl, BiListUl, BiStrikethrough, BiUnderline, BiSolidQuoteAltRight } from 'react-icons/bi'
import { BiBold, BiCodeAlt, BiCodeBlock ,BiHighlight, BiItalic, BiListOl, BiListUl, BiStrikethrough, BiUnderline, BiSolidQuoteAltRight } from 'react-icons/bi'
import { DEFAULT_BUTTON_STYLE, ICON_PROPS } from './ToolPanel'
import { Box, Flex, IconButton, Separator, Tooltip } from '@radix-ui/themes'
import { getKeyboardMetaKeyString } from '@/utils/layout/keyboardKey'
Expand Down Expand Up @@ -76,23 +76,42 @@ export const TextFormattingMenu = () => {
<Flex gap='3' align='center'>
<Tooltip content={getKeyboardMetaKeyString() + ' + E'} aria-label={getKeyboardMetaKeyString() + ' + E'}>
<IconButton
onClick={() => editor.chain().focus().toggleCodeBlock().run()}
onClick={() => editor.chain().focus().toggleCode().run()}
aria-label='code'
variant='ghost'
size='1'
title='Code'
className={editor.isActive('codeBlock') ? highlightBgColor : DEFAULT_BUTTON_STYLE}
className={editor.isActive('code') ? highlightBgColor : DEFAULT_BUTTON_STYLE}
disabled={
!editor.can()
.chain()
.focus()
.toggleCodeBlock()
.toggleCode()
.run()
}
>
<BiCodeAlt {...ICON_PROPS} />
</IconButton>
</Tooltip>
{/* <Tooltip content={getKeyboardMetaKeyString() +'+ shift + E'} aria-label={getKeyboardMetaKeyString() +'+ shift + E'}> */}
<IconButton
onClick={() => editor.chain().focus().toggleCodeBlock().run()}
aria-label='code block'
variant='ghost'
size='1'
title='Code Block'
className={editor.isActive('codeBlock') ? highlightBgColor : DEFAULT_BUTTON_STYLE}
disabled={
!editor.can()
.chain()
.focus()
.toggleCodeBlock()
.run()
}
>
<BiCodeBlock {...ICON_PROPS} />
</IconButton>
{/* </Tooltip> */}
{/* <Tooltip content={getKeyboardMetaKeyString() + ' + Shift + X'} aria-label={getKeyboardMetaKeyString() + ' + Shift + X'}> */}
<IconButton
onClick={() => editor.chain().focus().toggleStrike().run()}
Expand Down
44 changes: 28 additions & 16 deletions raven-app/src/components/feature/chat/ChatInput/Tiptap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { ToolPanel } from './ToolPanel'
import { RightToolbarButtons } from './RightToolbarButtons'
import { common, createLowlight } from 'lowlight'
import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
import Code from '@tiptap/extension-code'
import css from 'highlight.js/lib/languages/css'
import js from 'highlight.js/lib/languages/javascript'
import ts from 'highlight.js/lib/languages/typescript'
Expand Down Expand Up @@ -167,20 +168,15 @@ const Tiptap = ({ slotBefore, fileProps, onMessageSend, replyMessage, clearReply
}

return false
}

// 'Shift-Enter': () => {
// /**
// * currently we do not have an option to show a soft line break in the posts, so we overwrite
// * the behavior from tiptap with the default behavior on pressing enter
// */
// return this.editor.commands.first(({ commands }) => [
// () => commands.newlineInCode(),
// () => commands.createParagraphNear(),
// () => commands.liftEmptyBlock(),
// () => commands.splitBlock(),
// ]);
// },
},
'Shift-Enter': () => {
return this.editor.commands.first(({ commands }) => [
() => commands.newlineInCode(),
() => commands.createParagraphNear(),
() => commands.liftEmptyBlock(),
() => commands.splitBlock(),
]);
},
};
},
addProseMirrorPlugins() {
Expand Down Expand Up @@ -405,16 +401,32 @@ const Tiptap = ({ slotBefore, fileProps, onMessageSend, replyMessage, clearReply
class: 'bg-[var(--yellow-6)] dark:bg-[var(--yellow-11)] px-2 py-1'
}
}),
Link.configure({
protocols: ['mailto', 'https', 'http']
Link.extend({ inclusive: false }).configure({
autolink: true,
protocols: ['mailto', 'https', 'http'],
}),
Placeholder.configure({
// Pick a random placeholder from the list.
placeholder,
}),
// ToDo: can be added later as this breaks existing functionality(existing keyboard shortcuts).
// CodeBlockLowlight.extend({
// addKeyboardShortcuts(){
// return {
// 'Mod-Shift-E': () => this.editor.commands.toggleCodeBlock(),
// }
// }
// }).configure({
// lowlight
// }),
CodeBlockLowlight.configure({
lowlight
}),
Code.configure({
HTMLAttributes:{
class: 'pt-0.5 px-1 pb-px bg-[var(--gray-a3)] dark:bg-[#0d0d0d] text-[var(--ruby-a11)] dark-[var(--accent-a3)] text text-xs font-mono rounded border border-gray-4 dark:border-gray-6'
}
}),
Image.configure({
inline: true,
}),
Expand Down
8 changes: 2 additions & 6 deletions raven-app/src/components/feature/chat/ChatMessage/MessageActions/useMessageCopy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,14 @@ export const useMessageCopy = (message?: Message | null) => {
toast.error('Could not copy text')
}

} else {
} else if (message.message_type === "Image" || message.message_type === "File") {
if (message.file.startsWith('http') || message.file.startsWith('https')) {
navigator.clipboard.writeText(message.file)
}
else {
navigator.clipboard.writeText(window.location.origin + message.file)
}
toast({
title: 'Link copied',
duration: 800,
variant: 'accent'
})
toast.success('Link copied')
}
}

Expand Down
6 changes: 6 additions & 0 deletions ...n-app/src/components/feature/chat/ChatMessage/Renderers/TiptapRenderer/TiptapRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ts from 'highlight.js/lib/languages/typescript'
import html from 'highlight.js/lib/languages/xml'
import json from 'highlight.js/lib/languages/json'
import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight'
import Code from '@tiptap/extension-code'
import { common, createLowlight } from 'lowlight'
import python from 'highlight.js/lib/languages/python'
import { CustomBold } from './Bold'
Expand Down Expand Up @@ -75,6 +76,11 @@ export const TiptapRenderer = ({ message, user, isScrolling = false, isTruncated
CodeBlockLowlight.configure({
lowlight
}),
Code.configure({
HTMLAttributes:{
class: 'pt-0.5 px-1 pb-px bg-[var(--gray-a3)] dark:bg-[#0d0d0d] text-[var(--ruby-a11)] dark-[var(--accent-a3)] text text-xs font-mono rounded border border-gray-4 dark:border-gray-6'
}
}),
CustomBold,
CustomUserMention,
CustomLink,
Expand Down
26 changes: 13 additions & 13 deletions raven-app/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,7 +2107,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.3.0.tgz#14400e19b87e7e9b1cf9c6d3900e7243461abc8d"
integrity sha512-4nU4vJ5FjRDLqHm085vYAkuo68UK84Wl6CDSjm7sPVcu0FvQX02Okqt65azoSYQeS1SSSd5qq9YZuGWcYdp4Cw==

"@tiptap/extension-code-block-lowlight@^2.2.2":
"@tiptap/extension-code-block-lowlight@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.3.0.tgz#0bd1c45c2c5115d9cd964288a58f23688217f4fe"
integrity sha512-xMxWr/Fvv0hnN+u+6SW0OI3RVan+C6nJDU8xKh2Tx2DlBXJ0yODmq5v8WJJpW38AbaLkFuJuY/OA3AZ6n9pNbg==
Expand All @@ -2117,7 +2117,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.3.0.tgz#9bfaaeaf6abf2452233d1da64b6c5712cab2503b"
integrity sha512-+Ne6PRBwQt70Pp8aW2PewaEy4bHrNYn4N+y8MObsFtqLutXBz4nXnsXWiNYFQZwzlUY+CHG4XS73mx8oMOFfDw==

"@tiptap/extension-code@^2.3.0":
"@tiptap/extension-code@^2.3", "@tiptap/extension-code@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.3.0.tgz#19b5435c59021f11e24ac8427da4434b03596b35"
integrity sha512-O2FZmosiIRoVbW82fZy8xW4h4gb2xAzxWzHEcsHPlwCbE3vYvcBMmbkQ5p+33eRtuRQInzl3Q/cwupv9ctIepQ==
Expand Down Expand Up @@ -2154,7 +2154,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.3.0.tgz#4daf92c94797fdd504e798935efd6ca2fbbd73a8"
integrity sha512-YcZoUYfqb0nohoPgem4f8mjn5OqDomFrbJiC9VRHUOCIuEu+aJEYwp8mmdkLnS3f+LRCZ6G76cJJ50lkzSAZRw==

"@tiptap/extension-highlight@^2.2.2":
"@tiptap/extension-highlight@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.3.0.tgz#b743b878ffaad7731c6a3509dbcfb5073a96de83"
integrity sha512-An/tzoCMbugdaU02ORJeJ74DZI5pf9oqwX9RoYPQ5K81Ia3jG52BBVtFjGq/j10Tr4iOuCmOuE+PzNtnzz3UIw==
Expand All @@ -2169,7 +2169,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.3.0.tgz#e4934b32c005b1cf0f03fab5f4caff8cacbf4c7e"
integrity sha512-4DB8GU3uuDzzyqUmONIb3CHXcQ6Nuy4mHHkFSmUyEjg1i5eMQU5H7S6mNvZbltcJB2ImgCSwSMlj1kVN3MLIPg==

"@tiptap/extension-image@^2.2.4":
"@tiptap/extension-image@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.3.0.tgz#914c4c5030fa4278f53e808c03819f7422da4497"
integrity sha512-v1fLEEzrfXWavsLFUEkTiYYxwm1WDNrjuUriU5tG2Jv22NL1BL4BLVbZbGdkAk+qHWy8QWszrDJbcgGh2VNCoQ==
Expand All @@ -2179,7 +2179,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.3.0.tgz#72279632a2652642abed2078a920e2e05aff030e"
integrity sha512-jdFjLjdt5JtPlGMpoS6TEq5rznjbAYVlPwcw5VkYENVIYIGIR1ylIw2JwK1nUEsQ+OgYwVxHLejcUXWG1dCi2g==

"@tiptap/extension-link@^2.2.2":
"@tiptap/extension-link@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.3.0.tgz#37d25144a59cc71dd7b42e7c52b69e6b4ed29522"
integrity sha512-CnJAlV0ZOdEhKmDfYKuHJVG8g79iCFQ85cX/CROTWyuMfXz9uhj2rLpZ6nfidVbonqxAhQp7NAIr2y+Fj5/53A==
Expand All @@ -2191,7 +2191,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.3.0.tgz#7f0af465c1af160648ace586100ff3f8e612e9bf"
integrity sha512-mHU+IuRa56OT6YCtxf5Z7OSUrbWdKhGCEX7RTrteDVs5oMB6W3oF9j88M5qQmZ1WDcxvQhAOoXctnMt6eX9zcA==

"@tiptap/extension-mention@^2.2.2":
"@tiptap/extension-mention@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.3.0.tgz#d61c1c2ffa74346d20e1d1ed18783dd83c9e442a"
integrity sha512-Zu18LIKOMWm7XQztGuwLTxGGwGMc0QDbEAXB5TLrKFYWdHoaU0wu65+mBa61kuUoZ1Ur71J7vu2tuU70uPd16w==
Expand All @@ -2206,7 +2206,7 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.3.0.tgz#959928b57785f4647d807fffe76e63719f2e53c4"
integrity sha512-peCpA7DFqkd0cHb+cHv4YHNoMsXG8tKFNJlCHpLmsZWl2hWmpKgKmUrXAUfzjcFSvkZxn0xYc5oWbqUgg+2LzA==

"@tiptap/extension-placeholder@^2.2.2":
"@tiptap/extension-placeholder@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.3.0.tgz#db1f4375c8365c491211457c6d13f6efa486cd3a"
integrity sha512-1BOyxVLzyUYf6yOOeJ8CfpP6DSCS4L6HjBZqj6WP1z1NyBV8RAfhf3UuLNcimfSWAETXFR3g0ZbaxxWffI1cEg==
Expand All @@ -2221,17 +2221,17 @@
resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.3.0.tgz#2ebd13dcb4f54b9f72af25fc1015eec474afe89d"
integrity sha512-zkudl0TyKRy/8vHtyo5dMzjBRD0HEUnsS8YOsjR4xwQq5EYUXleRgM1s6lb6Yms2sLUAZRWdDddoQ686iq4zQg==

"@tiptap/extension-typography@^2.2.2":
"@tiptap/extension-typography@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-typography/-/extension-typography-2.3.0.tgz#d52cf73b7e0d23eb7166146668eae81440a65739"
integrity sha512-bI9t6dVp3wvzp3RVhJYRAV5Gi4pCSnumYith62TJmEk7fI24XuwMAXJu32+RTtBkaWHX/nwSGPh/ol0PRmtzKw==

"@tiptap/extension-underline@^2.2.2":
"@tiptap/extension-underline@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.3.0.tgz#3b79174ac09794523c017ddeb8da7d04ce6228fe"
integrity sha512-vmmcwCPmWqGKYHZevz50+bxrpHyiu5y6YZweAE476hn8Mud6vYg7RpkXgW8bjkCOky6UA51uelslSc0XrLE6uw==

"@tiptap/pm@^2.2.2":
"@tiptap/pm@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.3.0.tgz#3f971d5d26401ba0db306f2ee1e317acb8ff6c91"
integrity sha512-4WYqShZBwDyReKvapC0nmeYdOtZbZ31y4MjolpKQaSD4I7kg/oZspC+byUGdvIRsNpRN7i2X0IyvdISKk8gw5Q==
Expand All @@ -2255,15 +2255,15 @@
prosemirror-transform "^1.8.0"
prosemirror-view "^1.32.7"

"@tiptap/react@^2.2.2":
"@tiptap/react@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/react/-/react-2.3.0.tgz#b9a7c29a8bae38a28a3d6ab910da11290addcc58"
integrity sha512-ThgFJQTWYKRClTV2Zg0wBRqfy0EGz3U4NOey7jwncUjSjx5+o9nXbfQAYWDKQFfWyE+wnrBTYfddEP9pHNX5cQ==
dependencies:
"@tiptap/extension-bubble-menu" "^2.3.0"
"@tiptap/extension-floating-menu" "^2.3.0"

"@tiptap/starter-kit@^2.2.2":
"@tiptap/starter-kit@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.3.0.tgz#6a0834a98c0f780e706159dd3f3d70c992a98dd5"
integrity sha512-TjvCd/hzEnuEYOdr5uQqcfHOMuj7JRoZBPdheupwl3SbuYiCxtcqYyAE5qoGXWwuVe9xVGerOLVPkDUgmyrH6A==
Expand All @@ -2288,7 +2288,7 @@
"@tiptap/extension-strike" "^2.3.0"
"@tiptap/extension-text" "^2.3.0"

"@tiptap/suggestion@^2.2.2":
"@tiptap/suggestion@^2.3":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.3.0.tgz#6bb07afdf928853c1a638cae81da72b0ad92a09b"
integrity sha512-QngwR9ahodVfwqp/kXxJvuL3zNb6XZu+vCuWy8RJrGP8DA7SCI9t8t7iB6NfG4kSsRGxM+3DuLi+2xOZQUaEVQ==
Expand Down
Loading