Skip to content
Merged
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
2 changes: 1 addition & 1 deletion demo/app.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ReactP5Wrapper } from "@/main.tsx";
import React, { useCallback, useMemo, useState } from "react";
import { createRoot } from "react-dom/client";

import { ReactP5Wrapper } from "../src/main.tsx";
import "./demo.css";
import { sketch as box } from "./sketches/box";
import { sketch as plane } from "./sketches/plane";
Expand Down
4 changes: 3 additions & 1 deletion src/components/ReactP5Wrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import * as React from "react";
import { propsAreEqual } from "@utils/propsAreEqual";

const ReactP5WrapperGuard = React.lazy(() => import("./ReactP5WrapperGuard"));
const ReactP5WrapperGuard = React.lazy(
() => import("@components/ReactP5WrapperGuard")
);

export const ReactP5Wrapper = React.memo(ReactP5WrapperGuard, propsAreEqual);
2 changes: 1 addition & 1 deletion src/components/ReactP5WrapperGuard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ReactNode } from "react";
import { FallbackProps } from "react-error-boundary";

const ReactP5WrapperWithSketch = React.lazy(
() => import("./ReactP5WrapperWithSketch")
() => import("@components/ReactP5WrapperWithSketch")
);

const ErrorBoundary = React.lazy(() =>
Expand Down
12 changes: 6 additions & 6 deletions src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { ReactP5Wrapper } from "./components/ReactP5Wrapper";
export { P5WrapperClassName } from "./constants/P5WrapperClassName";
export { type P5CanvasInstance } from "./contracts/P5CanvasInstance";
export { type P5WrapperProps } from "./contracts/P5WrapperProps";
export { type Sketch } from "./contracts/Sketch";
export { type SketchProps } from "./contracts/SketchProps";
export { ReactP5Wrapper } from "@components/ReactP5Wrapper";
export { P5WrapperClassName } from "@constants/P5WrapperClassName";
export { type P5CanvasInstance } from "@contracts/P5CanvasInstance";
export { type P5WrapperProps } from "@contracts/P5WrapperProps";
export { type Sketch } from "@contracts/Sketch";
export { type SketchProps } from "@contracts/SketchProps";
5 changes: 2 additions & 3 deletions src/utils/updateCanvasInstance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ import { type CanvasInstanceRef } from "@contracts/CanvasInstanceRef";
import { type Sketch } from "@contracts/Sketch";
import { type SketchProps } from "@contracts/SketchProps";
import { type WrapperRef } from "@contracts/WrapperRef";

import { createCanvasInstance } from "./createCanvasInstance";
import { removeCanvasInstance } from "./removeCanvasInstance";
import { createCanvasInstance } from "@utils/createCanvasInstance";
import { removeCanvasInstance } from "@utils/removeCanvasInstance";

export function updateCanvasInstance<Props extends SketchProps>(
canvasInstanceRef: CanvasInstanceRef<Props>,
Expand Down
3 changes: 1 addition & 2 deletions tests/exports.test.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { P5WrapperClassName, ReactP5Wrapper } from "@/main";
import { createElement, isValidElement } from "react";
import { assert, describe, expect, it, vi } from "vitest";

import { P5WrapperClassName, ReactP5Wrapper } from "../src/main";

describe("Exports", () => {
describe("P5WrapperClassName", () => {
it("Exports the css class name used on the wrapper", () => {
Expand Down
3 changes: 1 addition & 2 deletions tests/utils/removeCanvasInstance.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { SketchProps } from "@/main";
import { type CanvasInstanceRef } from "@contracts/CanvasInstanceRef";
import p5 from "@contracts/p5";
import { removeCanvasInstance } from "@utils/removeCanvasInstance";
import { createRef } from "react";
import { describe, expect, it, vi } from "vitest";

import { SketchProps } from "../../src/main";

describe("removeCanvasInstance", () => {
it("Calls the remove method on the canvas if it exists", () => {
const instance = new p5(() => {
Expand Down
3 changes: 1 addition & 2 deletions tests/utils/updateCanvasInstance.test.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { SketchProps } from "@/main";
import { type CanvasInstanceRef } from "@contracts/CanvasInstanceRef";
import p5 from "@contracts/p5";
import { type WrapperRef } from "@contracts/WrapperRef";
Expand All @@ -6,8 +7,6 @@ import { updateCanvasInstance } from "@utils/updateCanvasInstance";
import { createRef } from "react";
import { describe, expect, it, vi } from "vitest";

import { SketchProps } from "../../src/main";

describe("updateCanvasInstance", () => {
it("Should update a canvas instance to a new version", () => {
const sketch = vi.fn();
Expand Down
Loading