@yodaos-pkg/ink 0.9.1 → 0.10.0

package/README.md

@@ -76,6 +76,10 @@ Creates an `InkView` instance and initializes the wasm runtime internally.
 - `options.scaleFactor?: number`
   - Optional
   - The device pixel ratio, defaulting to `window.devicePixelRatio`
+- `options.appFps?: number`
+  - Optional
+  - Per-view app logic frame rate
+  - Defaults to `60`
 - `options.canvas?: HTMLCanvasElement`
   - Optional
   - If provided, the view is automatically bound to this canvas
@@ -109,6 +113,7 @@ const view = await createInkView({
   width: 360,
   layoutMode: 'width-constrained-auto-height',
   scaleFactor: window.devicePixelRatio,
+  appFps: 30,
   canvas,
 });
 ```
@@ -117,7 +122,8 @@ In this mode:
 
 - the host still owns the constrained width
 - the SDK automatically adopts runtime-reported content height
-- browser hosts should call `view.resize()` when width or device pixel ratio changes
+- browser hosts should call `view.setViewport()` when width or device pixel ratio changes
+- pass `{ resetScroll: true }` only when the host explicitly wants to reset the current page scroll position during that viewport update
 - browser hosts do not need to manually apply HTML canvas height in the common case
 
 ### `configureNetwork(options)`
@@ -800,7 +806,7 @@ onBeforeUnmount(() => {
 
 - Treat `files` and `appId` as component inputs
 - If the bundle changes, destroy the old view before creating a new one
-- If the component size changes, call `view.resize()` from the host layer
+- If the component size changes, call `view.setViewport()` from the host layer
 
 ## React.js Integration
 
@@ -898,7 +904,7 @@ export function InkCanvas({ appId, files }: InkCanvasProps) {
 - If you need to switch apps, reinitialize when `appId` or a wrapping `key`
   changes
 - If the host size changes significantly, use `ResizeObserver` and call
-  `view.resize()`
+  `view.setViewport()`
 
 ## Frequently Asked Questions
 

package/index.d.ts

@@ -44,8 +44,12 @@ export interface CreateInkViewOptions {
   height?: number;
   /** Layout behavior used by the host surface. Defaults to `bounded`. */
   layoutMode?: InkLayoutMode;
+  /** Optional built-in Ink host theme name applied when bootstrapping the view. */
+  themeName?: string;
   /** Device pixel ratio override. Defaults to `window.devicePixelRatio` when available. */
   scaleFactor?: number;
+  /** Per-view app logic frame rate. Defaults to `60`. */
+  appFps?: number;
   /** Legacy shortcut for immediately binding an HTML canvas after creation. */
   canvas?: HTMLCanvasElement;
   /** Optional surface descriptor bound immediately after creation. */
@@ -63,6 +67,20 @@ export interface CreateInkViewOptions {
 /** Cross-platform layout mode exposed by browser hosts. */
 export type InkLayoutMode = 'bounded' | 'width-constrained-auto-height';
 
+/**
+ * Optional resize-time overrides applied atomically with the new viewport size.
+ *
+ * When `layoutMode` is omitted, the current view mode is preserved. When
+ * `scaleFactor` is omitted, the current view scale factor is preserved.
+ * `resetScroll` defaults to `false` and only resets the current page scroll
+ * position when explicitly enabled.
+ */
+export interface InkResizeOptions {
+  scaleFactor?: number;
+  layoutMode?: InkLayoutMode;
+  resetScroll?: boolean;
+}
+
 /** Measured content size reported by the Ink runtime in CSS pixels. */
 export interface InkContentSize {
   width: number;
@@ -240,8 +258,18 @@ export interface InkHostMessageStream {
   close(): void;
 }
 
-/** Callback invoked after the runtime requests that the host close the current view. */
-export type InkCloseRequestedHandler = () => void;
+export interface InkCloseRequestContext {
+  source: 'host-close' | 'window-close' | 'exit-mini-program' | 'root-backspace';
+}
+
+export interface InkClosedContext {
+  source: 'host-close' | 'window-close' | 'exit-mini-program' | 'root-backspace';
+}
+
+/** Callback invoked before the runtime closes, allowing the host to allow or deny it. */
+export type InkCloseRequestedHandler = (context: InkCloseRequestContext) => boolean;
+/** Callback invoked after the runtime successfully closes. */
+export type InkClosedHandler = (context: InkClosedContext) => void;
 /** Callback invoked after the runtime reports a new measured content size. */
 export type InkContentSizeChangedHandler = (contentSize: InkContentSize) => void;
 
@@ -388,13 +416,30 @@ export declare class InkView {
   openFromVfs(options: OpenFromVfsOptions): Promise<LoadedVfsBundle>;
 
   /**
-   * Resizes the logical surface and optionally updates the scale factor.
+   * Sets the logical viewport and optionally updates the scale factor.
    *
    * Hosts should call this whenever the constrained width or device pixel ratio
    * changes. In `width-constrained-auto-height` mode, the SDK continues to
    * adopt the runtime-reported height automatically after width-driven relayout.
    */
+  setViewport(width: number, height: number, scaleFactor?: number): this;
+  /**
+   * Sets the logical viewport and atomically applies optional viewport-time overrides.
+   *
+   * Use this overload when the host needs to update `layoutMode` together with
+   * the new viewport size in one call, without exposing an intermediate mode or
+   * size state to the host surface. Pass `resetScroll: true` to also reset the
+   * current page scroll position as part of the same update.
+   */
+  setViewport(width: number, height: number, options: InkResizeOptions): this;
+  /**
+   * Legacy alias for `setViewport()`.
+   *
+   * Prefer `setViewport()` for new integrations.
+   */
   resize(width: number, height: number, scaleFactor?: number): this;
+  /** Legacy alias for `setViewport()`. */
+  resize(width: number, height: number, options: InkResizeOptions): this;
 
   /** Switches the active layout mode and forces the current page to re-layout. */
   setLayoutMode(layoutMode: InkLayoutMode): this;
@@ -493,19 +538,35 @@ export declare class InkView {
   isDestroyed(): boolean;
 
   /**
-   * Registers the callback fired after Ink requests that the host close this view.
+   * Registers the pre-close interceptor fired when Ink asks the host whether a
+   * close request should be allowed.
+   *
+   * The callback must synchronously return `true` to allow closing or `false`
+   * to deny it. When omitted, the SDK preserves the current compatible behavior
+   * and allows closing by default.
    *
-   * When close is requested, the SDK marks the view as close-requested, stops
-   * the internal render loop automatically, relies on the runtime to blank the
-   * currently attached surface, and then invokes this callback.
+   * Throwing or returning a non-boolean value is treated as "deny close".
    * Pass `null` to clear the current callback.
    */
   setOnCloseRequested(callback: InkCloseRequestedHandler | null): this;
 
-  /** Property-style close callback preferred by the new SDK shape. */
+  /** Property-style pre-close interceptor preferred by the new SDK shape. */
   onCloseRequested: InkCloseRequestedHandler | null;
 
-  /** Returns whether Ink has already requested that the host close this view. */
+  /**
+   * Registers the post-close callback fired only after the host allowed the
+   * close request and the runtime reported that closing completed.
+   */
+  setOnClosed(callback: InkClosedHandler | null): this;
+
+  /** Property-style post-close notification preferred by the new SDK shape. */
+  onClosed: InkClosedHandler | null;
+
+  /**
+   * Returns whether the current app lifetime has already completed closing.
+   *
+   * This remains `false` when the host denies a close request.
+   */
   isCloseRequested(): boolean;
 
   /** Registers the callback fired after Ink reports a new measured content size. */

package/index.js

@@ -28,6 +28,14 @@ function normalizeScaleFactor(value) {
   return 1;
 }
 
+function normalizeAppFps(value) {
+  const numericValue = Math.trunc(Number(value));
+  if (Number.isFinite(numericValue) && numericValue > 0) {
+    return numericValue;
+  }
+  return 60;
+}
+
 function ensureFetch(fetchImpl) {
   const resolved = fetchImpl || globalThis.fetch;
   if (typeof resolved !== 'function') {
@@ -392,6 +400,18 @@ function normalizeLayoutMode(value) {
   throw new TypeError('`layoutMode` must be either `bounded` or `width-constrained-auto-height`.');
 }
 
+function normalizeThemeName(value) {
+  if (value == null) {
+    return null;
+  }
+  const themeName = String(value).trim();
+  return themeName ? themeName : null;
+}
+
+function isResizeOptions(value) {
+  return value != null && typeof value === 'object' && !Array.isArray(value);
+}
+
 function normalizeHostLanguageModelConfig(config) {
   if (config == null) {
     return null;
@@ -475,8 +495,10 @@ export class InkView {
     const config = options || {};
     const width = Number(config.width);
     const layoutMode = normalizeLayoutMode(config.layoutMode);
+    const themeName = normalizeThemeName(config.themeName);
     const height = Number(config.height);
     const scaleFactor = normalizeScaleFactor(config.scaleFactor);
+    const appFps = normalizeAppFps(config.appFps);
 
     if (!Number.isFinite(width)) {
       throw new Error('`width` is a required numeric value.');
@@ -490,7 +512,14 @@ export class InkView {
     const bindings = await initInk(config.wasm);
     const physicalWidth = Math.max(1, Math.round(width * scaleFactor));
     const physicalHeight = Math.max(1, Math.round(initialHeight * scaleFactor));
-    const rawView = new bindings.InkWebView(physicalWidth, physicalHeight, scaleFactor, layoutMode);
+    const rawView = new bindings.InkWebView(
+      physicalWidth,
+      physicalHeight,
+      scaleFactor,
+      appFps,
+      layoutMode,
+      themeName,
+    );
     const view = new InkView(rawView, config);
     const initialSurface =
       config.surface || (config.canvas ? { type: 'html-canvas', canvas: config.canvas } : null);
@@ -514,6 +543,7 @@ export class InkView {
   #destroyed;
   #domCleanup;
   #onCloseRequested;
+  #onClosed;
   #clearOnDestroy;
   #logicalWidth;
   #logicalHeight;
@@ -535,6 +565,7 @@ export class InkView {
     this.#destroyed = false;
     this.#domCleanup = null;
     this.#onCloseRequested = null;
+    this.#onClosed = null;
     this.#clearOnDestroy = options.clearOnDestroy !== false;
     this.#logicalWidth = Number(options.width) || 1;
     this.#logicalHeight = Number(options.height) || 1;
@@ -662,6 +693,38 @@ export class InkView {
     return true;
   }
 
+  #syncBoundSurfaceSize() {
+    if (this.#surfaceBinding?.type === 'html-canvas') {
+      this.#syncHtmlCanvasBindingSize(this.#logicalWidth, this.#logicalHeight, {
+        updateStyleWidth: true,
+        updateContainerWidth: true,
+      });
+      return;
+    }
+    this.#syncSurfaceBindingSize(this.#logicalWidth, this.#logicalHeight);
+  }
+
+  #syncAutoHeightSurfaceSize() {
+    if (this.#surfaceBinding?.type === 'html-canvas') {
+      this.#syncHtmlCanvasBindingSize(this.#logicalWidth, this.#logicalHeight, {
+        updateStyleWidth: true,
+        updateStyleHeight: true,
+        updateContainerWidth: true,
+        updateContainerHeight: true,
+      });
+      return;
+    }
+    this.#syncSurfaceBindingSize(this.#logicalWidth, this.#logicalHeight);
+  }
+
+  #syncSurfaceForCurrentLayoutMode() {
+    if (this.#layoutMode === 'width-constrained-auto-height') {
+      this.#syncAutoHeightSurfaceSize();
+      return;
+    }
+    this.#syncBoundSurfaceSize();
+  }
+
   #physicalWidth() {
     return Math.max(1, Math.round(this.#logicalWidth * this.#scaleFactor));
   }
@@ -670,15 +733,17 @@ export class InkView {
     return Math.max(1, Math.round((Number(height) || 1) * this.#scaleFactor));
   }
 
-  #syncRawViewSize(width = this.#logicalWidth, height = this.#logicalHeight) {
-    if (typeof this.#rawView.resize !== 'function') {
+  #syncRawViewSize(width = this.#logicalWidth, height = this.#logicalHeight, resetScroll = false) {
+    if (typeof this.#rawView.setViewport !== 'function') {
       return;
     }
-    this.#rawView.resize(
-      Math.max(1, Math.round((Number(width) || 1) * this.#scaleFactor)),
-      Math.max(1, Math.round((Number(height) || 1) * this.#scaleFactor)),
-      this.#scaleFactor,
-    );
+    const physicalWidth = Math.max(1, Math.round((Number(width) || 1) * this.#scaleFactor));
+    const physicalHeight = Math.max(1, Math.round((Number(height) || 1) * this.#scaleFactor));
+    if (resetScroll) {
+      this.#rawView.setViewport(physicalWidth, physicalHeight, this.#scaleFactor, true);
+      return;
+    }
+    this.#rawView.setViewport(physicalWidth, physicalHeight, this.#scaleFactor);
   }
 
   #currentContentSize() {
@@ -762,7 +827,7 @@ export class InkView {
 
   #consumeCloseRequested() {
     if (this.#destroyed || this.#closeRequested) {
-      return this.#closeRequested;
+      return false;
     }
     if (typeof this.#rawView.consumeCloseRequested !== 'function') {
       return false;
@@ -771,10 +836,56 @@ export class InkView {
       return false;
     }
 
+    const source =
+      typeof this.#rawView.currentCloseRequestSource === 'function'
+        ? this.#rawView.currentCloseRequestSource()
+        : '';
+    const context = { source };
+    let allow = true;
+    if (typeof this.#onCloseRequested === 'function') {
+      try {
+        const result = this.#onCloseRequested(context);
+        if (typeof result !== 'boolean') {
+          console.warn(
+            'InkView onCloseRequested returned a non-boolean value; treating it as allow=true.',
+            result,
+          );
+        } else {
+          allow = result;
+        }
+      } catch (error) {
+        allow = false;
+        console.error('InkView onCloseRequested failed; denying close request.', error);
+      }
+    }
+    if (typeof this.#rawView.resolveCloseRequested === 'function') {
+      this.#rawView.resolveCloseRequested(allow);
+    }
+    if (allow) {
+      this.#consumeClosed();
+    }
+    return false;
+  }
+
+  #consumeClosed() {
+    if (this.#destroyed || this.#closeRequested) {
+      return this.#closeRequested;
+    }
+    if (typeof this.#rawView.consumeClosed !== 'function') {
+      return false;
+    }
+    if (!this.#rawView.consumeClosed()) {
+      return false;
+    }
+
+    const source =
+      typeof this.#rawView.currentClosedSource === 'function'
+        ? this.#rawView.currentClosedSource()
+        : '';
     this.#closeRequested = true;
     this.stopRendering();
-    if (typeof this.#onCloseRequested === 'function') {
-      this.#onCloseRequested();
+    if (typeof this.#onClosed === 'function') {
+      this.#onClosed({ source });
     }
     return true;
   }
@@ -991,7 +1102,8 @@ export class InkView {
       initialPage,
       serializeQuery(query),
     );
-    if (!this.#consumeCloseRequested()) {
+    this.#consumeCloseRequested();
+    if (!this.#consumeClosed()) {
       this.requestRender();
     }
     return this;
@@ -1004,7 +1116,8 @@ export class InkView {
 
     this.#resetCloseRequestedState();
     this.#rawView.open(path.trim(), initialPage, serializeQuery(query));
-    if (!this.#consumeCloseRequested()) {
+    this.#consumeCloseRequested();
+    if (!this.#consumeClosed()) {
       this.requestRender();
     }
     return this;
@@ -1037,35 +1150,53 @@ export class InkView {
     return bundle;
   }
 
-  resize(width, height, scaleFactor = getDefaultScaleFactor()) {
+  setViewport(width, height, scaleFactorOrOptions = getDefaultScaleFactor()) {
+    const hasResizeOptions = isResizeOptions(scaleFactorOrOptions);
+    const shouldResetScroll = hasResizeOptions && scaleFactorOrOptions.resetScroll === true;
+    const nextLayoutMode = hasResizeOptions
+      ? scaleFactorOrOptions.layoutMode == null
+        ? this.#layoutMode
+        : normalizeLayoutMode(scaleFactorOrOptions.layoutMode)
+      : this.#layoutMode;
+    const nextScaleFactor = hasResizeOptions
+      ? Object.prototype.hasOwnProperty.call(scaleFactorOrOptions, 'scaleFactor')
+        ? normalizeScaleFactor(scaleFactorOrOptions.scaleFactor)
+        : this.#scaleFactor
+      : normalizeScaleFactor(scaleFactorOrOptions);
     const nextWidth = Math.max(1, Number(width) || 1);
     const fallbackHeight =
-      this.#layoutMode === 'width-constrained-auto-height'
+      nextLayoutMode === 'width-constrained-auto-height'
         ? this.#logicalHeight
         : this.#boundedHeight;
     const nextHeight = Math.max(1, Number(height) || fallbackHeight || 1);
+    const layoutModeChanged = nextLayoutMode !== this.#layoutMode;
+
     this.#logicalWidth = nextWidth;
     this.#logicalHeight = nextHeight;
-    if (this.#layoutMode === 'bounded') {
+    this.#scaleFactor = nextScaleFactor;
+    if (nextLayoutMode === 'bounded') {
       this.#boundedHeight = nextHeight;
     }
-    this.#scaleFactor = normalizeScaleFactor(scaleFactor);
-    this.#syncRawViewSize();
-    if (this.#surfaceBinding?.type === 'html-canvas') {
-      this.#syncHtmlCanvasBindingSize(this.#logicalWidth, this.#logicalHeight, {
-        updateStyleWidth: true,
-        updateStyleHeight: this.#layoutMode === 'width-constrained-auto-height',
-        updateContainerWidth: true,
-        updateContainerHeight: this.#layoutMode === 'width-constrained-auto-height',
-      });
-    } else {
-      this.#syncSurfaceBindingSize(this.#logicalWidth, this.#logicalHeight);
+
+    if (layoutModeChanged) {
+      this.#layoutMode = nextLayoutMode;
+      this.#latestContentSize = null;
+      if (typeof this.#rawView.setLayoutMode === 'function') {
+        this.#rawView.setLayoutMode(nextLayoutMode);
+      }
     }
+
+    this.#syncRawViewSize(this.#logicalWidth, this.#logicalHeight, shouldResetScroll);
+    this.#syncSurfaceForCurrentLayoutMode();
     this.#presentSurface();
     this.requestRender();
     return this;
   }
 
+  resize(width, height, scaleFactorOrOptions = getDefaultScaleFactor()) {
+    return this.setViewport(width, height, scaleFactorOrOptions);
+  }
+
   setLayoutMode(layoutMode) {
     const nextLayoutMode = normalizeLayoutMode(layoutMode);
     if (this.#layoutMode === nextLayoutMode) {
@@ -1080,23 +1211,12 @@ export class InkView {
     if (nextLayoutMode === 'bounded') {
       this.#logicalHeight = this.#boundedHeight;
       this.#syncRawViewSize();
-      if (this.#surfaceBinding?.type === 'html-canvas') {
-        this.#syncHtmlCanvasBindingSize(this.#logicalWidth, this.#logicalHeight);
-      } else {
-        this.#syncSurfaceBindingSize(this.#logicalWidth, this.#logicalHeight);
-      }
+      this.#syncBoundSurfaceSize();
     } else if (currentContentSize) {
       this.#syncHtmlCanvasAutoHeight(currentContentSize);
     } else {
       this.#syncRawViewSize();
-      if (this.#surfaceBinding?.type === 'html-canvas') {
-        this.#syncHtmlCanvasBindingSize(this.#logicalWidth, this.#logicalHeight, {
-          updateStyleWidth: true,
-          updateStyleHeight: true,
-          updateContainerWidth: true,
-          updateContainerHeight: true,
-        });
-      }
+      this.#syncAutoHeightSurfaceSize();
     }
 
     this.requestRender();
@@ -1176,7 +1296,8 @@ export class InkView {
     const hasMoreWork = Boolean(this.#rawView.render());
     const contentSizeChanged = this.#consumeContentSizeChanged();
     this.#presentSurface();
-    const closeRequested = this.#consumeCloseRequested();
+    this.#consumeCloseRequested();
+    const closeRequested = this.#consumeClosed();
     if (!closeRequested && (hasMoreWork || contentSizeChanged || this.#autoRender)) {
       this.requestRender();
     }
@@ -1247,6 +1368,25 @@ export class InkView {
     this.#onCloseRequested = callback || null;
   }
 
+  setOnClosed(callback) {
+    if (callback != null && typeof callback !== 'function') {
+      throw new TypeError('`callback` must be a function or null.');
+    }
+    this.onClosed = callback || null;
+    return this;
+  }
+
+  get onClosed() {
+    return this.#onClosed;
+  }
+
+  set onClosed(callback) {
+    if (callback != null && typeof callback !== 'function') {
+      throw new TypeError('`callback` must be a function or null.');
+    }
+    this.#onClosed = callback || null;
+  }
+
   setOnContentSizeChanged(callback) {
     if (callback != null && typeof callback !== 'function') {
       throw new TypeError('`callback` must be a function or null.');

package/package.json

@@ -10,7 +10,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.com/"
   },
-  "version": "0.9.1",
+  "version": "0.10.0",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/pkg/ink_web.d.ts

@@ -16,8 +16,11 @@ export class InkWebView {
     blur(): void;
     clearSurface(): void;
     consumeCloseRequested(): boolean;
+    consumeClosed(): boolean;
     consumeContentSizeChanged(): boolean;
     createMessageStream(origin: string, last_event_id: string): InkWebMessageStream;
+    currentCloseRequestSource(): string;
+    currentClosedSource(): string;
     currentContentHeight(): number;
     currentContentWidth(): number;
     destroy(): void;
@@ -27,15 +30,16 @@ export class InkWebView {
     focus(): void;
     isInteractive(): boolean;
     isRunning(): boolean;
-    constructor(width: number, height: number, scale_factor: number, layout_mode: string);
+    constructor(width: number, height: number, scale_factor: number, app_fps: number, layout_mode: string, theme_name?: string | null);
     notifyUserInteraction(): void;
     open(path: string, initial_page?: string | null, query_json?: string | null): void;
     openBundle(app_id: string, files: Map<any, any>, initial_page?: string | null, query_json?: string | null): void;
     render(): boolean;
-    resize(width: number, height: number, scale_factor: number): void;
+    resolveCloseRequested(allow: boolean): void;
     setInteractive(interactive: boolean): void;
     setLanguageModelConfig(config_json?: string | null): void;
     setLayoutMode(layout_mode: string): void;
+    setViewport(width: number, height: number, scale_factor: number, reset_scroll?: boolean | null): void;
 }
 
 export function get_version(): string;
@@ -55,8 +59,11 @@ export interface InitOutput {
     readonly inkwebview_blur: (a: number) => void;
     readonly inkwebview_clearSurface: (a: number) => void;
     readonly inkwebview_consumeCloseRequested: (a: number) => number;
+    readonly inkwebview_consumeClosed: (a: number) => number;
     readonly inkwebview_consumeContentSizeChanged: (a: number) => number;
     readonly inkwebview_createMessageStream: (a: number, b: number, c: number, d: number, e: number) => number;
+    readonly inkwebview_currentCloseRequestSource: (a: number, b: number) => void;
+    readonly inkwebview_currentClosedSource: (a: number, b: number) => void;
     readonly inkwebview_currentContentHeight: (a: number) => number;
     readonly inkwebview_currentContentWidth: (a: number) => number;
     readonly inkwebview_destroy: (a: number) => void;
@@ -66,21 +73,22 @@ export interface InitOutput {
     readonly inkwebview_focus: (a: number) => void;
     readonly inkwebview_isInteractive: (a: number) => number;
     readonly inkwebview_isRunning: (a: number) => number;
-    readonly inkwebview_new: (a: number, b: number, c: number, d: number, e: number) => number;
+    readonly inkwebview_new: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
     readonly inkwebview_notifyUserInteraction: (a: number) => void;
     readonly inkwebview_open: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => void;
     readonly inkwebview_openBundle: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
     readonly inkwebview_render: (a: number, b: number) => void;
-    readonly inkwebview_resize: (a: number, b: number, c: number, d: number) => void;
+    readonly inkwebview_resolveCloseRequested: (a: number, b: number) => void;
     readonly inkwebview_setInteractive: (a: number, b: number) => void;
     readonly inkwebview_setLanguageModelConfig: (a: number, b: number, c: number, d: number) => void;
     readonly inkwebview_setLayoutMode: (a: number, b: number, c: number) => void;
+    readonly inkwebview_setViewport: (a: number, b: number, c: number, d: number, e: number) => void;
     readonly main: () => void;
-    readonly __wasm_bindgen_func_elem_9470: (a: number, b: number) => void;
-    readonly __wasm_bindgen_func_elem_13736: (a: number, b: number) => void;
-    readonly __wasm_bindgen_func_elem_9754: (a: number, b: number, c: number) => void;
-    readonly __wasm_bindgen_func_elem_13737: (a: number, b: number, c: number) => void;
-    readonly __wasm_bindgen_func_elem_9755: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_9822: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_14048: (a: number, b: number) => void;
+    readonly __wasm_bindgen_func_elem_9965: (a: number, b: number, c: number) => void;
+    readonly __wasm_bindgen_func_elem_14049: (a: number, b: number, c: number) => void;
+    readonly __wasm_bindgen_func_elem_9963: (a: number, b: number) => void;
     readonly __wbindgen_export: (a: number, b: number) => number;
     readonly __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
     readonly __wbindgen_export3: (a: number) => void;

package/pkg/ink_web.js

@@ -82,6 +82,13 @@ export class InkWebView {
         const ret = wasm.inkwebview_consumeCloseRequested(this.__wbg_ptr);
         return ret !== 0;
     }
+    /**
+     * @returns {boolean}
+     */
+    consumeClosed() {
+        const ret = wasm.inkwebview_consumeClosed(this.__wbg_ptr);
+        return ret !== 0;
+    }
     /**
      * @returns {boolean}
      */
@@ -102,6 +109,44 @@ export class InkWebView {
         const ret = wasm.inkwebview_createMessageStream(this.__wbg_ptr, ptr0, len0, ptr1, len1);
         return InkWebMessageStream.__wrap(ret);
     }
+    /**
+     * @returns {string}
+     */
+    currentCloseRequestSource() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.inkwebview_currentCloseRequestSource(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            deferred1_0 = r0;
+            deferred1_1 = r1;
+            return getStringFromWasm0(r0, r1);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+            wasm.__wbindgen_export4(deferred1_0, deferred1_1, 1);
+        }
+    }
+    /**
+     * @returns {string}
+     */
+    currentClosedSource() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.inkwebview_currentClosedSource(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            deferred1_0 = r0;
+            deferred1_1 = r1;
+            return getStringFromWasm0(r0, r1);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+            wasm.__wbindgen_export4(deferred1_0, deferred1_1, 1);
+        }
+    }
     /**
      * @returns {number}
      */
@@ -210,12 +255,16 @@ export class InkWebView {
      * @param {number} width
      * @param {number} height
      * @param {number} scale_factor
+     * @param {number} app_fps
      * @param {string} layout_mode
+     * @param {string | null} [theme_name]
      */
-    constructor(width, height, scale_factor, layout_mode) {
+    constructor(width, height, scale_factor, app_fps, layout_mode, theme_name) {
         const ptr0 = passStringToWasm0(layout_mode, wasm.__wbindgen_export, wasm.__wbindgen_export2);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.inkwebview_new(width, height, scale_factor, ptr0, len0);
+        var ptr1 = isLikeNone(theme_name) ? 0 : passStringToWasm0(theme_name, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        var len1 = WASM_VECTOR_LEN;
+        const ret = wasm.inkwebview_new(width, height, scale_factor, app_fps, ptr0, len0, ptr1, len1);
         this.__wbg_ptr = ret >>> 0;
         InkWebViewFinalization.register(this, this.__wbg_ptr, this);
         return this;
@@ -291,12 +340,10 @@ export class InkWebView {
         }
     }
     /**
-     * @param {number} width
-     * @param {number} height
-     * @param {number} scale_factor
+     * @param {boolean} allow
      */
-    resize(width, height, scale_factor) {
-        wasm.inkwebview_resize(this.__wbg_ptr, width, height, scale_factor);
+    resolveCloseRequested(allow) {
+        wasm.inkwebview_resolveCloseRequested(this.__wbg_ptr, allow);
     }
     /**
      * @param {boolean} interactive
@@ -330,6 +377,15 @@ export class InkWebView {
         const len0 = WASM_VECTOR_LEN;
         wasm.inkwebview_setLayoutMode(this.__wbg_ptr, ptr0, len0);
     }
+    /**
+     * @param {number} width
+     * @param {number} height
+     * @param {number} scale_factor
+     * @param {boolean | null} [reset_scroll]
+     */
+    setViewport(width, height, scale_factor, reset_scroll) {
+        wasm.inkwebview_setViewport(this.__wbg_ptr, width, height, scale_factor, isLikeNone(reset_scroll) ? 0xFFFFFF : reset_scroll ? 1 : 0);
+    }
 }
 if (Symbol.dispose) InkWebView.prototype[Symbol.dispose] = InkWebView.prototype.free;
 
@@ -492,6 +548,10 @@ function __wbg_get_imports() {
             const ret = getObject(arg0).call(getObject(arg1));
             return addHeapObject(ret);
         }, arguments); },
+        __wbg_call_4708e0c13bdc8e95: function() { return handleError(function (arg0, arg1, arg2) {
+            const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
+            return addHeapObject(ret);
+        }, arguments); },
         __wbg_call_e8c868596c950cf6: function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) {
             const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3), getObject(arg4));
             return addHeapObject(ret);
@@ -696,6 +756,16 @@ function __wbg_get_imports() {
             const ret = result;
             return ret;
         },
+        __wbg_instanceof_Object_1c6af87502b733ed: function(arg0) {
+            let result;
+            try {
+                result = getObject(arg0) instanceof Object;
+            } catch (_) {
+                result = false;
+            }
+            const ret = result;
+            return ret;
+        },
         __wbg_instanceof_Promise_0094681e3519d6ec: function(arg0) {
             let result;
             try {
@@ -1147,28 +1217,28 @@ function __wbg_get_imports() {
             return ret;
         },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 2522, function: Function { arguments: [NamedExternref("CloseEvent")], shim_idx: 2526, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9470, __wasm_bindgen_func_elem_9754);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 2633, function: Function { arguments: [NamedExternref("CloseEvent")], shim_idx: 2621, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9822, __wasm_bindgen_func_elem_9965);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000002: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 2522, function: Function { arguments: [NamedExternref("Event")], shim_idx: 2526, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9470, __wasm_bindgen_func_elem_9754);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 2633, function: Function { arguments: [NamedExternref("Event")], shim_idx: 2621, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9822, __wasm_bindgen_func_elem_9965);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000003: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 2522, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 2526, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9470, __wasm_bindgen_func_elem_9754);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 2633, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 2621, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9822, __wasm_bindgen_func_elem_9965);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000004: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 2522, function: Function { arguments: [], shim_idx: 2523, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9470, __wasm_bindgen_func_elem_9755);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 2633, function: Function { arguments: [], shim_idx: 2634, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_9822, __wasm_bindgen_func_elem_9963);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000005: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 3491, function: Function { arguments: [Externref], shim_idx: 3492, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_13736, __wasm_bindgen_func_elem_13737);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 3529, function: Function { arguments: [Externref], shim_idx: 3530, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_14048, __wasm_bindgen_func_elem_14049);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000006: function(arg0) {
@@ -1225,16 +1295,16 @@ function __wbg_get_imports() {
     };
 }
 
-function __wasm_bindgen_func_elem_9755(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_9755(arg0, arg1);
+function __wasm_bindgen_func_elem_9963(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_9963(arg0, arg1);
 }
 
-function __wasm_bindgen_func_elem_9754(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_9754(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_9965(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_9965(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wasm_bindgen_func_elem_13737(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_13737(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_14049(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_14049(arg0, arg1, addHeapObject(arg2));
 }
 
 

package/pkg/ink_web_bg.wasm.d.ts

@@ -10,8 +10,11 @@ export const inkwebview_bindCanvas: (a: number, b: number, c: number) => void;
 export const inkwebview_blur: (a: number) => void;
 export const inkwebview_clearSurface: (a: number) => void;
 export const inkwebview_consumeCloseRequested: (a: number) => number;
+export const inkwebview_consumeClosed: (a: number) => number;
 export const inkwebview_consumeContentSizeChanged: (a: number) => number;
 export const inkwebview_createMessageStream: (a: number, b: number, c: number, d: number, e: number) => number;
+export const inkwebview_currentCloseRequestSource: (a: number, b: number) => void;
+export const inkwebview_currentClosedSource: (a: number, b: number) => void;
 export const inkwebview_currentContentHeight: (a: number) => number;
 export const inkwebview_currentContentWidth: (a: number) => number;
 export const inkwebview_destroy: (a: number) => void;
@@ -21,21 +24,22 @@ export const inkwebview_dispatchPointer: (a: number, b: number, c: number, d: nu
 export const inkwebview_focus: (a: number) => void;
 export const inkwebview_isInteractive: (a: number) => number;
 export const inkwebview_isRunning: (a: number) => number;
-export const inkwebview_new: (a: number, b: number, c: number, d: number, e: number) => number;
+export const inkwebview_new: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => number;
 export const inkwebview_notifyUserInteraction: (a: number) => void;
 export const inkwebview_open: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => void;
 export const inkwebview_openBundle: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => void;
 export const inkwebview_render: (a: number, b: number) => void;
-export const inkwebview_resize: (a: number, b: number, c: number, d: number) => void;
+export const inkwebview_resolveCloseRequested: (a: number, b: number) => void;
 export const inkwebview_setInteractive: (a: number, b: number) => void;
 export const inkwebview_setLanguageModelConfig: (a: number, b: number, c: number, d: number) => void;
 export const inkwebview_setLayoutMode: (a: number, b: number, c: number) => void;
+export const inkwebview_setViewport: (a: number, b: number, c: number, d: number, e: number) => void;
 export const main: () => void;
-export const __wasm_bindgen_func_elem_9470: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_13736: (a: number, b: number) => void;
-export const __wasm_bindgen_func_elem_9754: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_13737: (a: number, b: number, c: number) => void;
-export const __wasm_bindgen_func_elem_9755: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_9822: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_14048: (a: number, b: number) => void;
+export const __wasm_bindgen_func_elem_9965: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_14049: (a: number, b: number, c: number) => void;
+export const __wasm_bindgen_func_elem_9963: (a: number, b: number) => void;
 export const __wbindgen_export: (a: number, b: number) => number;
 export const __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export3: (a: number) => void;