@gjsify/canvas2d 0.62.0 → 0.63.1-next.235

package/lib/types/canvas2d-bridge.d.ts

@@ -7,7 +7,19 @@ import { HTMLCanvasElement as GjsifyHTMLCanvasElement } from '@gjsify/dom-elemen
 import '@gjsify/dom-elements/register/canvas';
 import '@gjsify/canvas2d-core/gdk';
 import type { CanvasRenderingContext2D } from '@gjsify/canvas2d-core';
-type Canvas2DReadyCallback = (canvas: globalThis.HTMLCanvasElement, ctx: CanvasRenderingContext2D) => void;
+/** `FrameRequestCallback` without `lib.dom`: a GJS program has none. */
+export type FrameCallback = (time: number) => void;
+/**
+ * The canvas type handed to consumers: the DOM `HTMLCanvasElement` when the consumer loads
+ * `lib.dom`, gjsify's own element otherwise. Resolved through `globalThis` so this file never
+ * names a lib.dom type directly.
+ */
+export type BridgeCanvas = typeof globalThis extends {
+    HTMLCanvasElement: {
+        prototype: infer T;
+    };
+} ? T : GjsifyHTMLCanvasElement;
+type Canvas2DReadyCallback = (canvas: BridgeCanvas, ctx: CanvasRenderingContext2D) => void;
 /**
  * A `Gtk.DrawingArea` subclass that creates an `HTMLCanvasElement` +
  * `CanvasRenderingContext2D` on first draw and blits its Cairo surface each frame.
@@ -30,12 +42,12 @@ export declare const Canvas2DBridge: {
         _readyCallbacks: Canvas2DReadyCallback[];
         _resizeCallbacks: ((w: number, h: number) => void)[];
         _tickCallbackId: number | null;
-        _frameCallback: FrameRequestCallback | null;
+        _frameCallback: FrameCallback | null;
         _timeOrigin: number;
         /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
         _onDraw(_area: Gtk.DrawingArea, cr: Cairo.Context, width: number, height: number): void;
         /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-        get canvas(): globalThis.HTMLCanvasElement | null;
+        get canvas(): BridgeCanvas | null;
         /** The 2D rendering context; available after the first draw. */
         getContext(_id: "2d"): CanvasRenderingContext2D | null;
         /** Runs `cb` once the 2D context is ready — synchronously if it already is. */
@@ -49,7 +61,7 @@ export declare const Canvas2DBridge: {
          * Browser `requestAnimationFrame`, driven by the vsync-synced GTK frame clock.
          * Always returns 0: there is no `cancelAnimationFrame` here to hand a handle to.
          */
-        requestAnimationFrame(cb: FrameRequestCallback): number;
+        requestAnimationFrame(cb: FrameCallback): number;
         /**
          * Sets browser globals (`requestAnimationFrame`, `performance`) so that
          * browser-targeted code works unchanged on GJS.
@@ -450,12 +462,12 @@ export declare const Canvas2DBridge: {
             _readyCallbacks: Canvas2DReadyCallback[];
             _resizeCallbacks: ((w: number, h: number) => void)[];
             _tickCallbackId: number | null;
-            _frameCallback: FrameRequestCallback | null;
+            _frameCallback: FrameCallback | null;
             _timeOrigin: number;
             /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
             _onDraw(_area: Gtk.DrawingArea, cr: Cairo.Context, width: number, height: number): void;
             /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-            get canvas(): globalThis.HTMLCanvasElement | null;
+            get canvas(): BridgeCanvas | null;
             /** The 2D rendering context; available after the first draw. */
             getContext(_id: "2d"): CanvasRenderingContext2D | null;
             /** Runs `cb` once the 2D context is ready — synchronously if it already is. */
@@ -469,7 +481,7 @@ export declare const Canvas2DBridge: {
              * Browser `requestAnimationFrame`, driven by the vsync-synced GTK frame clock.
              * Always returns 0: there is no `cancelAnimationFrame` here to hand a handle to.
              */
-            requestAnimationFrame(cb: FrameRequestCallback): number;
+            requestAnimationFrame(cb: FrameCallback): number;
             /**
              * Sets browser globals (`requestAnimationFrame`, `performance`) so that
              * browser-targeted code works unchanged on GJS.
@@ -870,12 +882,12 @@ export declare const Canvas2DBridge: {
                 _readyCallbacks: Canvas2DReadyCallback[];
                 _resizeCallbacks: ((w: number, h: number) => void)[];
                 _tickCallbackId: number | null;
-                _frameCallback: FrameRequestCallback | null;
+                _frameCallback: FrameCallback | null;
                 _timeOrigin: number;
                 /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
                 _onDraw(_area: Gtk.DrawingArea, cr: Cairo.Context, width: number, height: number): void;
                 /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-                get canvas(): globalThis.HTMLCanvasElement | null;
+                get canvas(): BridgeCanvas | null;
                 /** The 2D rendering context; available after the first draw. */
                 getContext(_id: "2d"): CanvasRenderingContext2D | null;
                 /** Runs `cb` once the 2D context is ready — synchronously if it already is. */
@@ -889,7 +901,7 @@ export declare const Canvas2DBridge: {
                  * Browser `requestAnimationFrame`, driven by the vsync-synced GTK frame clock.
                  * Always returns 0: there is no `cancelAnimationFrame` here to hand a handle to.
                  */
-                requestAnimationFrame(cb: FrameRequestCallback): number;
+                requestAnimationFrame(cb: FrameCallback): number;
                 /**
                  * Sets browser globals (`requestAnimationFrame`, `performance`) so that
                  * browser-targeted code works unchanged on GJS.
@@ -1290,12 +1302,12 @@ export declare const Canvas2DBridge: {
                 _readyCallbacks: Canvas2DReadyCallback[];
                 _resizeCallbacks: ((w: number, h: number) => void)[];
                 _tickCallbackId: number | null;
-                _frameCallback: FrameRequestCallback | null;
+                _frameCallback: FrameCallback | null;
                 _timeOrigin: number;
                 /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
                 _onDraw(_area: Gtk.DrawingArea, cr: Cairo.Context, width: number, height: number): void;
                 /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-                get canvas(): globalThis.HTMLCanvasElement | null;
+                get canvas(): BridgeCanvas | null;
                 /** The 2D rendering context; available after the first draw. */
                 getContext(_id: "2d"): CanvasRenderingContext2D | null;
                 /** Runs `cb` once the 2D context is ready — synchronously if it already is. */
@@ -1309,7 +1321,7 @@ export declare const Canvas2DBridge: {
                  * Browser `requestAnimationFrame`, driven by the vsync-synced GTK frame clock.
                  * Always returns 0: there is no `cancelAnimationFrame` here to hand a handle to.
                  */
-                requestAnimationFrame(cb: FrameRequestCallback): number;
+                requestAnimationFrame(cb: FrameCallback): number;
                 /**
                  * Sets browser globals (`requestAnimationFrame`, `performance`) so that
                  * browser-targeted code works unchanged on GJS.
@@ -1710,12 +1722,12 @@ export declare const Canvas2DBridge: {
             _readyCallbacks: Canvas2DReadyCallback[];
             _resizeCallbacks: ((w: number, h: number) => void)[];
             _tickCallbackId: number | null;
-            _frameCallback: FrameRequestCallback | null;
+            _frameCallback: FrameCallback | null;
             _timeOrigin: number;
             /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
             _onDraw(_area: Gtk.DrawingArea, cr: Cairo.Context, width: number, height: number): void;
             /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-            get canvas(): globalThis.HTMLCanvasElement | null;
+            get canvas(): BridgeCanvas | null;
             /** The 2D rendering context; available after the first draw. */
             getContext(_id: "2d"): CanvasRenderingContext2D | null;
             /** Runs `cb` once the 2D context is ready — synchronously if it already is. */
@@ -1729,7 +1741,7 @@ export declare const Canvas2DBridge: {
              * Browser `requestAnimationFrame`, driven by the vsync-synced GTK frame clock.
              * Always returns 0: there is no `cancelAnimationFrame` here to hand a handle to.
              */
-            requestAnimationFrame(cb: FrameRequestCallback): number;
+            requestAnimationFrame(cb: FrameCallback): number;
             /**
              * Sets browser globals (`requestAnimationFrame`, `performance`) so that
              * browser-targeted code works unchanged on GJS.
@@ -2130,12 +2142,12 @@ export declare const Canvas2DBridge: {
         _readyCallbacks: Canvas2DReadyCallback[];
         _resizeCallbacks: ((w: number, h: number) => void)[];
         _tickCallbackId: number | null;
-        _frameCallback: FrameRequestCallback | null;
+        _frameCallback: FrameCallback | null;
         _timeOrigin: number;
         /** @internal Draw function called by GTK. Blits the Cairo surface to screen. */
         _onDraw(_area: Gtk.DrawingArea, cr: Cairo.Context, width: number, height: number): void;
         /** The HTMLCanvasElement backing this widget. Available after the first draw. */
-        get canvas(): globalThis.HTMLCanvasElement | null;
+        get canvas(): BridgeCanvas | null;
         /** The 2D rendering context; available after the first draw. */
         getContext(_id: "2d"): CanvasRenderingContext2D | null;
         /** Runs `cb` once the 2D context is ready — synchronously if it already is. */
@@ -2149,7 +2161,7 @@ export declare const Canvas2DBridge: {
          * Browser `requestAnimationFrame`, driven by the vsync-synced GTK frame clock.
          * Always returns 0: there is no `cancelAnimationFrame` here to hand a handle to.
          */
-        requestAnimationFrame(cb: FrameRequestCallback): number;
+        requestAnimationFrame(cb: FrameCallback): number;
         /**
          * Sets browser globals (`requestAnimationFrame`, `performance`) so that
          * browser-targeted code works unchanged on GJS.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/canvas2d",
-    "version": "0.62.0",
+    "version": "0.63.1-next.235",
     "description": "Canvas 2D rendering context for GJS, backed by Cairo; Canvas2DBridge on GJS, the browser and NativeScript",
     "type": "module",
     "module": "lib/esm/index.js",
@@ -62,17 +62,17 @@
         "@girs/gtk-4.0": "5.4.0",
         "@girs/pango-1.0": "5.4.0",
         "@girs/pangocairo-1.0": "5.4.0",
-        "@gjsify/canvas2d-core": "^0.62.0",
-        "@gjsify/dom-elements": "^0.62.0",
-        "@gjsify/dom-events": "^0.62.0",
-        "@gjsify/event-bridge": "^0.62.0",
-        "@gjsify/utils": "^0.62.0"
+        "@gjsify/canvas2d-core": "0.63.1-next.235",
+        "@gjsify/dom-elements": "0.63.1-next.235",
+        "@gjsify/dom-events": "0.63.1-next.235",
+        "@gjsify/event-bridge": "0.63.1-next.235",
+        "@gjsify/utils": "0.63.1-next.235"
     },
     "devDependencies": {
-        "@gjsify/adwaita-nativescript": "^0.62.0",
-        "@gjsify/adwaita-web": "^0.62.0",
-        "@gjsify/cli": "^0.62.0",
-        "@gjsify/unit": "^0.62.0",
+        "@gjsify/adwaita-nativescript": "0.63.1-next.235",
+        "@gjsify/adwaita-web": "0.63.1-next.235",
+        "@gjsify/cli": "0.63.1-next.235",
+        "@gjsify/unit": "0.63.1-next.235",
         "@types/node": "^25.9.2",
         "typescript": "^6.0.3"
     },
@@ -96,8 +96,8 @@
     },
     "homepage": "https://github.com/gjsify/gjsify/tree/main/packages/framework/canvas2d#readme",
     "peerDependencies": {
-        "@gjsify/adwaita-web": "^0.62.0",
-        "@gjsify/adwaita-nativescript": "^0.62.0"
+        "@gjsify/adwaita-web": "0.63.1-next.235",
+        "@gjsify/adwaita-nativescript": "0.63.1-next.235"
     },
     "peerDependenciesMeta": {
         "@gjsify/adwaita-web": {
@@ -106,5 +106,6 @@
         "@gjsify/adwaita-nativescript": {
             "optional": true
         }
-    }
+    },
+    "gitHead": "9d2cca56170a0215b3e0792e98421ed1f83e7f72"
 }