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.

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

WIP: Spike adding Scratch project type #1159

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
37 changes: 25 additions & 12 deletions src/components/Editor/Project/Project.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const Project = (props) => {
} = props;
const saving = useSelector((state) => state.editor.saving);
const autosave = useSelector((state) => state.editor.lastSaveAutosave);
const project = useSelector((state) => state.editor.project);

useEffect(() => {
if (saving === "success" && autosave === false) {
Expand Down Expand Up @@ -52,6 +53,8 @@ const Project = (props) => {
setLoading(false);
}, []);

const iframeSrc = "https://scratch-editor.pages.dev/";

return (
<div className="proj" data-testid="project">
<div
Expand All @@ -64,18 +67,28 @@ const Project = (props) => {
{withProjectbar && <ProjectBar nameEditable={nameEditable} />}
{!loading && (
<div className="proj-editor-wrapper">
<ResizableWithHandle
data-testid="proj-editor-container"
className="proj-editor-container"
defaultWidth={defaultWidth}
defaultHeight={defaultHeight}
handleDirection={handleDirection}
minWidth="25%"
maxWidth={maxWidth}
>
<EditorInput />
</ResizableWithHandle>
<Output />
{project.project_type === "scratch" ? (
<iframe
src={iframeSrc}
style={{ width: "100%", border: "0px" }}
title="scratch"
></iframe>
) : (
<>
<ResizableWithHandle
data-testid="proj-editor-container"
className="proj-editor-container"
defaultWidth={defaultWidth}
defaultHeight={defaultHeight}
handleDirection={handleDirection}
minWidth="25%"
maxWidth={maxWidth}
>
<EditorInput />
</ResizableWithHandle>
<Output />
</>
)}
</div>
)}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useProject.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { useRef, useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import { syncProject, setProject } from "../redux/EditorSlice";
import { defaultPythonProject } from "../utils/defaultProjects";
import { defaultScratchProject } from "../utils/defaultProjects";
import { useTranslation } from "react-i18next";

export const useProject = ({
Expand Down Expand Up @@ -87,7 +87,7 @@ export const useProject = ({
return;
}

const data = defaultPythonProject;
const data = defaultScratchProject;
dispatch(setProject(data));
}
}, [
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/useProject.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import configureStore from "redux-mock-store";

import { useProject } from "./useProject";
import { syncProject, setProject } from "../redux/EditorSlice";
import { defaultPythonProject } from "../utils/defaultProjects";
import { defaultScratchProject } from "../utils/defaultProjects";

jest.mock("react-redux", () => ({
...jest.requireActual("react-redux"),
Expand Down Expand Up @@ -53,9 +53,9 @@ describe("When not embedded", () => {
wrapper = ({ children }) => <Provider store={store}>{children}</Provider>;
});

test("If no identifier uses default python project", () => {
test("If no identifier uses default Scratch project", () => {
renderHook(() => useProject({}), { wrapper });
expect(setProject).toHaveBeenCalledWith(defaultPythonProject);
expect(setProject).toHaveBeenCalledWith(defaultScratchProject);
});

test("If cached project matches identifer uses cached project", () => {
Expand Down
7 changes: 7 additions & 0 deletions src/utils/defaultProjects.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ export const defaultHtmlProject = {
],
};

export const defaultScratchProject = {
project_type: "scratch",
name: i18n.t("project.untitled"),
components: [{ extension: "sb3", name: "main", content: "" }],
};

export const DEFAULT_PROJECTS = {
python: defaultPythonProject,
html: defaultHtmlProject,
scratch: defaultScratchProject,
};
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ module.exports = {
"X-Requested-With, content-type, Authorization",
// Pyodide - required for input and code interruption - needed on the host app
"Cross-Origin-Opener-Policy": "same-origin",
"Cross-Origin-Embedder-Policy": "require-corp",
"Cross-Origin-Embedder-Policy": "cross-origin"
},
setupMiddlewares: (middlewares, devServer) => {
devServer.app.use((req, res, next) => {
Expand Down
Loading