- Notifications
You must be signed in to change notification settings - Fork 0
Realtime doc sync yjs#20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
5645199
initial setup with persisting doc updates
Matia-R fa0a6de
add leader delegation for clients (only one client writes updates at …
Matia-R 111fb67
WIP doc persistance
Matia-R 8b75dc4
cleanup logic into separate hook
Matia-R 8e7256a
serializing / deserializing doc seems to work?
Matia-R 470f7eb
move normalization logic to server
Matia-R 05867c4
remove previous doc content fetching + error handling
Matia-R 6fc0dc5
fix client error handling
Matia-R a88c197
fix theme clearing doc content issue
Matia-R 7b57e25
style collaborative cursors
Matia-R 63c94a6
upgrade nextjs version to fix vulnerability
Matia-R 897763e
prevent fetching of snapshot on window refocus mount and reconnect
Matia-R 701eb47
pull out common avatar color logic into util functions
Matia-R fcb02df
remove documentId from the editor props
Matia-R 0c2f7aa
pull highlighter logic into own utils file
Matia-R 614bf5c
add profile loading as dependency to document page load + pull out co…
Matia-R a10f0a4
add more robust error handling
Matia-R 889dad7
replace delete / insert with upsert
Matia-R bf777a1
remove unused theme property in useCreateBlocnote hook
Matia-R File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| import { createHighlighter } from "shiki"; | ||
| // Code block language configuration | ||
| // Add or remove languages here - changes will be applied to both BlockNote and Shiki | ||
| const codeBlockLanguages = { | ||
| javascript: { name: "JavaScript", aliases: ["js"] }, | ||
| typescript: { name: "TypeScript", aliases: ["ts"] }, | ||
| python: { name: "Python", aliases: ["py"] }, | ||
| java: { name: "Java" }, | ||
| c: { name: "C" }, | ||
| cpp: { name: "C++" }, | ||
| go: { name: "Go" }, | ||
| ruby: { name: "Ruby" }, | ||
| php: { name: "PHP" }, | ||
| rust: { name: "Rust" }, | ||
| kotlin: { name: "Kotlin" }, | ||
| swift: { name: "Swift" }, | ||
| csharp: { name: "C#", aliases: ["cs"] }, | ||
| scala: { name: "Scala" }, | ||
| html: { name: "HTML" }, | ||
| css: { name: "CSS" }, | ||
| json: { name: "JSON" }, | ||
| yaml: { name: "YAML", aliases: ["yml"] }, | ||
| markdown: { name: "Markdown", aliases: ["md"] }, | ||
| sql: { name: "SQL" }, | ||
| bash: { name: "Bash", aliases: ["sh"] }, | ||
| powershell: { name: "PowerShell", aliases: ["ps"] }, | ||
| dart: { name: "Dart" }, | ||
| "objective-c": { name: "Objective-C", aliases: ["objc"] }, | ||
| } as const; | ||
| // Derive the supported languages object for BlockNote | ||
| export const supportedLanguages = Object.fromEntries( | ||
| Object.entries(codeBlockLanguages).map(([key, value]) => { | ||
| const langConfig = | ||
| "aliases" in value && value.aliases | ||
| ? { name: value.name, aliases: [...value.aliases] } // Convert readonly array to mutable | ||
| : { name: value.name }; | ||
| return [key, langConfig]; | ||
| }), | ||
| ) as Record<string, { name: string; aliases?: string[] }>; | ||
| // Extract language IDs for Shiki highlighter | ||
| const shikiLanguageIds = Object.keys(codeBlockLanguages); | ||
| // Create the highlighter factory function for BlockNote | ||
| // Type mismatch between shiki and @blocknote/core shiki types - both use different versions of @shikijs/types | ||
| /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */ | ||
| export const createCodeBlockHighlighter = () => | ||
| createHighlighter({ | ||
| themes: ["github-dark"], | ||
| langs: shikiLanguageIds, | ||
| }) as any; | ||
| /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return */ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| type CollaborationUser = { | ||
| name: string; | ||
| color: string; | ||
| [key: string]: string; | ||
| }; | ||
| // Custom cursor renderer for Google Docs-like appearance | ||
| export const renderCursor = (user: CollaborationUser): HTMLElement => { | ||
| const cursorElement = document.createElement("span"); | ||
| cursorElement.classList.add("bn-collaboration-cursor__base"); | ||
| // Create the caret (vertical line) | ||
| const caretElement = document.createElement("span"); | ||
| caretElement.setAttribute("contenteditable", "false"); | ||
| caretElement.classList.add("bn-collaboration-cursor__caret"); | ||
| caretElement.setAttribute( | ||
| "style", | ||
| `border-left: 2.5px solid ${user.color}; height: 1.25em; position: relative; display: inline-block; vertical-align: text-bottom;` | ||
| ); | ||
| // Create the label | ||
| const labelElement = document.createElement("span"); | ||
| labelElement.classList.add("bn-collaboration-cursor__label"); | ||
| labelElement.setAttribute( | ||
| "style", | ||
| `background-color: ${user.color}; color: #ffffff; padding: 3px 7px; font-size: 11px; font-weight: 600; border-radius: 4px; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), 0 1px 1px rgba(0, 0, 0, 0.15); position: absolute; left: -2.5px; top: -1.85em; white-space: nowrap; z-index: 10; pointer-events: none; user-select: none;` | ||
| ); | ||
| labelElement.textContent = user.name; | ||
| // Assemble the cursor | ||
| caretElement.appendChild(labelElement); | ||
| cursorElement.appendChild(document.createTextNode("\u2060")); // Non-breaking space | ||
| cursorElement.appendChild(caretElement); | ||
| cursorElement.appendChild(document.createTextNode("\u2060")); // Non-breaking space | ||
| return cursorElement; | ||
| }; | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: Matia-R/Chptr
Length of output: 115
🏁 Script executed:
Repository: Matia-R/Chptr
Length of output: 2544
🏁 Script executed:
Repository: Matia-R/Chptr
Length of output: 2647
🏁 Script executed:
Repository: Matia-R/Chptr
Length of output: 84
🏁 Script executed:
Repository: Matia-R/Chptr
Length of output: 84
Load both light and dark themes in the code highlighter.
Currently only
"github-dark"is loaded, causing users in light mode to see dark syntax highlighting in code blocks. Shiki supports loading multiple themes which are switched using CSS variables.The editor already passes the current theme to BlockNoteView (editor.tsx line 87:
theme={currentTheme as "light" | "dark"}), and BlockNote automatically selects the appropriate theme based on the user's system preference. Shiki handles the light/dark switching through CSS variables automatically—no additional theme-selection code is needed.Apply this diff:
export const createCodeBlockHighlighter = () => createHighlighter({ - themes: ["github-dark"],+ themes: ["github-light", "github-dark"], langs: shikiLanguageIds, }) as any;📝 Committable suggestion
🤖 Prompt for AI Agents