forked from superset-sh/superset
-
Notifications
You must be signed in to change notification settings - Fork 1
feat(desktop): reference graph visual polish — Shiki highlighting & original styling #148
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ef7db97
feat(desktop): match original reference-graph visual style
MocA-Love d1318fb
fix(desktop): use app theme for reference graph syntax highlighting
MocA-Love f7670bb
feat(desktop): add Export PNG and fix graph state persistence on tab …
MocA-Love cf974dd
fix: align @xyflow/react and shiki versions with workspace (sherif)
MocA-Love 611249f
fix: resolve existing lint errors and test failures
MocA-Love 8d1fa95
fix(desktop): scope PNG export to active ReactFlow instance and resto…
MocA-Love File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
82 changes: 82 additions & 0 deletions
82
...mponents/WorkspaceView/ContentView/TabsContent/TabView/ReferenceGraphPane/CodePreview.tsx
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,82 @@ | ||
| import { memo, useEffect, useState } from "react"; | ||
| import { highlightCode } from "./lib/highlighter"; | ||
|
|
||
| interface CodePreviewProps { | ||
| code: string; | ||
| language: string; | ||
| startLine: number; | ||
| shikiTheme?: { | ||
| name: string; | ||
| type: string; | ||
| colors: object; | ||
| tokenColors: object[]; | ||
| }; | ||
| } | ||
|
|
||
| export const CodePreview = memo(function CodePreview({ | ||
| code, | ||
| language, | ||
| startLine, | ||
| shikiTheme, | ||
| }: CodePreviewProps) { | ||
| const [highlightedHtml, setHighlightedHtml] = useState<string | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| let cancelled = false; | ||
|
|
||
| async function highlight() { | ||
| try { | ||
| const html = await highlightCode( | ||
| code, | ||
| language || "typescript", | ||
| shikiTheme, | ||
| ); | ||
| if (!cancelled) { | ||
| setHighlightedHtml(html); | ||
| } | ||
| } catch { | ||
| if (!cancelled) { | ||
| setHighlightedHtml(null); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| highlight(); | ||
|
|
||
| return () => { | ||
| cancelled = true; | ||
| }; | ||
| }, [code, language, shikiTheme]); | ||
|
|
||
| const lines = code.split("\n"); | ||
|
|
||
| if (highlightedHtml) { | ||
| return ( | ||
| <div className="ref-graph-code-preview"> | ||
| {/* biome-ignore lint/security/noDangerouslySetInnerHtml: shiki output */} | ||
| <div dangerouslySetInnerHTML={{ __html: highlightedHtml }} /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| // Fallback: plain text with line numbers | ||
| return ( | ||
| <div className="ref-graph-code-preview"> | ||
| <pre> | ||
| <code> | ||
| {lines.map((line, index) => { | ||
| const lineNum = startLine + index; | ||
| return ( | ||
| <div key={`${lineNum}:${line}`} className="ref-graph-code-line"> | ||
| <span className="ref-graph-code-line-number">{lineNum}</span> | ||
| <span className="ref-graph-code-line-content"> | ||
| {line || " "} | ||
| </span> | ||
| </div> | ||
| ); | ||
| })} | ||
| </code> | ||
| </pre> | ||
| </div> | ||
| ); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.