Skip to content

Add scrollable and loadable from file EditableSketches #1469

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

Draft
ksen0 wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add scrollable and loadable from file EditableSketches #1469

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78711ab
Add scrollable and loadable from file EditableSketches
ksen0 Jun 10, 2026
8556518
Support custom css/body in editable sketch also
ksen0 Jun 26, 2026
c6338d5
Merge branch '2.0' into bigsketches
ksen0 Jun 26, 2026
f43986b
Scollable editable code blocks are optional
ksen0 Jun 26, 2026
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
26 changes: 20 additions & 6 deletions src/components/CodeEmbed/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ export const CodeEmbed = (props) => {
}

const codeFrameRef = useRef(null);
const editorRef = useRef(null);
const [hasScrollbar, setHasScrollbar] = useState(false);

const updateOrReRun = () => {
if (codeString === previewCodeString) {
Expand All @@ -79,6 +81,17 @@ export const CodeEmbed = (props) => {
}
}, []);

useEffect(() => {
if (!rendered) return;
const scroller = editorRef.current?.querySelector(".cm-scroller");
if (!scroller) return;
const observer = new ResizeObserver(() => {
setHasScrollbar(scroller.scrollHeight > scroller.clientHeight);
});
observer.observe(scroller);
return () => observer.disconnect();
}, [rendered]);

if (!rendered) return <div className="code-placeholder" />;

return (
Expand Down Expand Up @@ -125,11 +138,12 @@ export const CodeEmbed = (props) => {
</div>
</div>
) : null}
<div className="code-editor-container relative w-full">
<div ref={editorRef} className="code-editor-container relative w-full">
<CodeMirror
value={codeString}
theme="light"
width="100%"
height="300px"

@davepagurek davepagurek Jun 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Do we want to make this optional/opt-in for long sketches?

@ksen0 ksen0 Jun 26, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ah yes thanks for the reminder! That's the intent. (For other testers/reviewers looking later: when I add missing tutorials they shouldn't have anything changed except some scrollable sketches where intended.)

minimalSetup={{
highlightSpecialChars: false,
history: false,
Expand All @@ -139,19 +153,19 @@ export const CodeEmbed = (props) => {
historyKeymap: true,
}}
basicSetup={{
lineNumbers: false,
foldGutter: false,
lineNumbers: hasScrollbar,
foldGutter: true,
autocompletion: false,
}}
indentWithTab={false}
extensions={[javascript(), EditorView.lineWrapping]}
extensions={[javascript(), EditorView.lineWrapping, EditorView.theme({ "&": { overflowY: "auto" } })]}
onChange={(val) => setCodeString(val)}
editable={props.editable}
onCreateEditor={(editorView) =>
(editorView.contentDOM.ariaLabel = "Code Editor")
}
/>
<div className="absolute right-0 top-0 flex flex-col gap-xs p-xs md:flex-row">
<div className={`absolute top-0 flex flex-col gap-xs p-xs md:flex-row ${hasScrollbar ? "right-[25px]" : "right-0"}`}>
<CopyCodeButton textToCopy={codeString || initialCode} />
<CircleButton
onClick={() => {
Expand All @@ -171,4 +185,4 @@ export const CodeEmbed = (props) => {
);
};

export default CodeEmbed;
export default CodeEmbed;
6 changes: 4 additions & 2 deletions src/components/EditableSketch/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import CodeEmbed from "../CodeEmbed";

interface Props {
code: string;
cssCode?: string;
bodyCode?: string;
width?: number;
height?: number;
base?: string;
Expand All @@ -13,7 +15,7 @@ const { props } = Astro;

let previewWidth = props.width;
let previewHeight = props.height;
const match = /createCanvas\(\s*(\d+),\s*(\d+)\s*(?:,\s*(?:P2D|WEBGL)\s*)?\)/m.exec(props.code);
const match = /createCanvas\(\s*(\d+),\s*(\d+)\s*(?:,\s*(?:P2D|WEBGL|WEBGPU)\s*)?\)/m.exec(props.code);
if (match) {
previewWidth = previewWidth || parseFloat(match[1]);
previewHeight = previewHeight || parseFloat(match[2]);
Expand All @@ -23,4 +25,4 @@ const vertical = !previewWidth || previewWidth > 200

---

<CodeEmbed client:load initialValue={props.code.trim()} previewWidth={previewWidth} previewHeight={previewHeight} base={props.base} previewable editable allowSideBySide={!vertical} fullWidth={!vertical} scripts={props.scripts} />
<CodeEmbed client:load initialValue={props.code.trim()} previewWidth={previewWidth} previewHeight={previewHeight} base={props.base} previewable editable allowSideBySide={!vertical} fullWidth={!vertical} scripts={props.scripts} cssCode={props.cssCode} htmlBodyCode={props.bodyCode}/>
7 changes: 7 additions & 0 deletions test/components/CodeEmbed.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ import { render, screen, act, cleanup, within } from "@testing-library/preact";
import { server } from "../mocks/server";
import { CodeEmbed } from "@/src/components/CodeEmbed";

class ResizeObserverMock {
observe() {}
unobserve() {}
disconnect() {}
}
(globalThis as any).ResizeObserver = ResizeObserverMock;

suite("CodeEmbed", () => {
// Start a mock server to intercept network requests
beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
Expand Down