From a804dbd3b9d40795ae064f985bcdaa178bc6ee10 Mon Sep 17 00:00:00 2001 From: Tchips46 Date: Wed, 29 Apr 2026 00:51:53 +0900 Subject: [PATCH] fix(render): change specific container canva for general html div --- .../asset-manager/test/asset-manager.library.spec.ts | 2 +- .../src/context/contexts/executions/init.context.ts | 8 ++++---- packages/common/src/options/types/options.type.ts | 2 +- .../core-editor/src/common/context/options.type.ts | 2 +- packages/ecs-client/test/ecs-client-library.spec.ts | 2 +- packages/ecs-server/test/ecs-server-library.spec.ts | 2 +- packages/graphics-2d/src/graphics-2d.library.ts | 10 +++++----- packages/graphics-2d/test/graphics-2d.library.spec.ts | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/asset-manager/test/asset-manager.library.spec.ts b/packages/asset-manager/test/asset-manager.library.spec.ts index ea0c2c4..752f93c 100644 --- a/packages/asset-manager/test/asset-manager.library.spec.ts +++ b/packages/asset-manager/test/asset-manager.library.spec.ts @@ -11,7 +11,7 @@ const makeContext = (files: Map) => { const configRegistry = {} as IConfigRegistry; return new InitContext(appContext, libraryManager, configRegistry, { // @ts-ignore - canvas: null, + container: null, files, }); }; diff --git a/packages/common/src/context/contexts/executions/init.context.ts b/packages/common/src/context/contexts/executions/init.context.ts index ae35678..7f34ea8 100644 --- a/packages/common/src/context/contexts/executions/init.context.ts +++ b/packages/common/src/context/contexts/executions/init.context.ts @@ -4,7 +4,7 @@ import { type ApplicationContext } from "../application.context"; import { BaseContext } from "./base.context"; export class InitContext extends BaseContext { - private readonly _canvas: IRunClientOptions["canvas"] | undefined; + private readonly _container: IRunClientOptions["container"] | undefined; private readonly _files: IRunOptions["files"]; private readonly _env: Record; private readonly _config: IConfigRegistry; @@ -17,14 +17,14 @@ export class InitContext extends BaseContext { ) { super(context, libraryManager); - this._canvas = (options as IRunClientOptions)["canvas"]; + this._container = (options as IRunClientOptions)["container"]; this._files = options.files; this._env = options.env; this._config = configRegistry; } - get canvas(): IRunClientOptions["canvas"] | undefined { - return this._canvas; + get container(): IRunClientOptions["container"] | undefined { + return this._container; } get files(): IRunOptions["files"] { diff --git a/packages/common/src/options/types/options.type.ts b/packages/common/src/options/types/options.type.ts index 3ed4767..63547da 100644 --- a/packages/common/src/options/types/options.type.ts +++ b/packages/common/src/options/types/options.type.ts @@ -1,7 +1,7 @@ export type IRunOptions = IRunClientOptions | IRunServerOptions; export interface IRunClientOptions { - canvas: HTMLCanvasElement; + container: HTMLDivElement; files: Map; env: Record; } diff --git a/packages/core-editor/src/common/context/options.type.ts b/packages/core-editor/src/common/context/options.type.ts index eabf7e6..6fde00b 100644 --- a/packages/core-editor/src/common/context/options.type.ts +++ b/packages/core-editor/src/common/context/options.type.ts @@ -4,7 +4,7 @@ import { type Save } from "./save.type"; export type IEditorRunOptions = IEditorRunClientOptions | IEditorRunServerOptions; export interface IEditorRunClientOptions { - canvas: HTMLCanvasElement; + container: HTMLDivElement; files: Map; env: Record; editor: { diff --git a/packages/ecs-client/test/ecs-client-library.spec.ts b/packages/ecs-client/test/ecs-client-library.spec.ts index 7a9e83b..6bf2510 100644 --- a/packages/ecs-client/test/ecs-client-library.spec.ts +++ b/packages/ecs-client/test/ecs-client-library.spec.ts @@ -33,7 +33,7 @@ const appContext = new EditableApplicationContext(libraryManager); const configRegistry = {} as IConfigRegistry; const initContext = new InitContext(appContext, libraryManager, configRegistry, { // @ts-ignore - canvas: null, + container: null, files: new Map([["/libecs.wasm", "./lib/libecs.wasm"]]), }); const clearContext = new ClearContext(appContext, libraryManager); diff --git a/packages/ecs-server/test/ecs-server-library.spec.ts b/packages/ecs-server/test/ecs-server-library.spec.ts index e3c6d8f..42a9ed4 100644 --- a/packages/ecs-server/test/ecs-server-library.spec.ts +++ b/packages/ecs-server/test/ecs-server-library.spec.ts @@ -33,7 +33,7 @@ const appContext = new EditableApplicationContext(libraryManager); const configRegistry = {} as IConfigRegistry; const initContext = new InitContext(appContext, libraryManager, configRegistry, { // @ts-ignore - canvas: null, + container: null, files: new Map([["/libecs.wasm", "./lib/libecs.wasm"]]), }); const clearContext = new ClearContext(appContext, libraryManager); diff --git a/packages/graphics-2d/src/graphics-2d.library.ts b/packages/graphics-2d/src/graphics-2d.library.ts index 43a8efd..7237cff 100644 --- a/packages/graphics-2d/src/graphics-2d.library.ts +++ b/packages/graphics-2d/src/graphics-2d.library.ts @@ -21,13 +21,13 @@ export class Graphics2DLibrary extends BaseGraphicsLibrary { } public override async __init(context: InitContext): Promise { - if (!context.canvas) { - throw new Error("Can't initialize the canvas context"); + if (!context.container) { + throw new Error("Can't initialize the container context"); } this._stage = new Graphics.Stage({ - container: context.canvas.parentElement as HTMLDivElement, - width: context.canvas.offsetWidth, - height: context.canvas.offsetHeight, + container: context.container, + width: context.container.offsetWidth, + height: context.container.offsetHeight, }); this._baseLayer = new Graphics.Layer(); this._stage.add(this._baseLayer); diff --git a/packages/graphics-2d/test/graphics-2d.library.spec.ts b/packages/graphics-2d/test/graphics-2d.library.spec.ts index eaa447c..0259c53 100644 --- a/packages/graphics-2d/test/graphics-2d.library.spec.ts +++ b/packages/graphics-2d/test/graphics-2d.library.spec.ts @@ -5,13 +5,13 @@ import { EditableApplicationContext } from "../../core/src/common/context/contex import { EditableLibraryManager } from "../../core/src/common/library/manager/library.manager"; import { Graphics2DLibrary } from "../src"; -const makeContext = (canvas: HTMLCanvasElement | null) => { +const makeContext = (container: HTMLDivElement | null) => { const libraryManager = new EditableLibraryManager(); const appContext = new EditableApplicationContext(libraryManager); const configRegistry = {} as IConfigRegistry; return new InitContext(appContext, libraryManager, configRegistry, { // @ts-ignore - canvas, + container, files: new Map(), }); }; @@ -38,7 +38,7 @@ describe("Graphics2DLibrary", () => { expect(() => library.baseLayer).toThrow(); }); - it("should throw when __init is called with a null canvas", async () => { + it("should throw when __init is called with a null container", async () => { await expect(library.__init(makeContext(null))).rejects.toThrow(); }); });