@visactor/vrender-core 1.1.12 → 1.1.13

package/es/canvas/conical-gradient.js

@@ -123,4 +123,4 @@ export function createConicalGradient(context, stops, x, y, deltaAngle, startAng
     pattern && ConicalPatternStore.Set(stops, x, y, startAngle, endAngle, pattern, width, height), 
     pattern;
 }
-//# sourceMappingURL=conical-gradient.js.map
+//# sourceMappingURL=conical-gradient.js.map

package/es/canvas/constants.js

@@ -1,4 +1,4 @@
 export const CanvasFactory = Symbol.for("CanvasFactory");
 
 export const Context2dFactory = Symbol.for("Context2dFactory");
-//# sourceMappingURL=constants.js.map
+//# sourceMappingURL=constants.js.map

package/es/canvas/empty-context.js

@@ -206,4 +206,4 @@ export class EmptyContext2d {
         this.stack.forEach((m => matrixAllocate.free(m))), this.stack.length = 0;
     }
 }
-//# sourceMappingURL=empty-context.js.map
+//# sourceMappingURL=empty-context.js.map

package/es/canvas/index.js

@@ -5,4 +5,4 @@ export * from "./empty-context";
 export * from "./contributions/base-canvas";
 
 export * from "./conical-gradient";
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/canvas/util.js

@@ -382,4 +382,4 @@ export function contain(commands, x, y) {
 export function containStroke(commands, lineWidth, x, y) {
     return containPath(commands, lineWidth, !0, x, y);
 }
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/es/common/bezier-utils.js

@@ -36,5 +36,4 @@ export function quadPointAt(p0, p1, p2, t) {
 
 export function quadLength(p0, p1, p2, iterationCount) {
     return snapLength([ p0.x, p1.x, p2.x ], [ p0.y, p1.y, p2.y ]);
-}
-//# sourceMappingURL=bezier-utils.js.map
+}

package/es/common/contribution-store-state.js

@@ -10,4 +10,5 @@ export function getContributionStoreState() {
     const scope = globalThis;
     return scope[CONTRIBUTION_STORE_STATE_SYMBOL] || (scope[CONTRIBUTION_STORE_STATE_SYMBOL] = createContributionStoreState()), 
     scope[CONTRIBUTION_STORE_STATE_SYMBOL];
-}
+}
+//# sourceMappingURL=contribution-store-state.js.map

package/es/common/path-svg.js

@@ -54,5 +54,4 @@ export function parseSvgPath(str) {
         } else result.push(currCommandData);
     } else result.push(currCommandData);
     return result;
-}
-//# sourceMappingURL=path-svg.js.map
+}

package/es/common/render-command-list.js

@@ -5,4 +5,5 @@ export function renderCommandList(commandList, context, x = 0, y = 0, sx = 1, sy
         const command = commandList[i];
         commandFuncs[command[0]](command, context, x, y, sx, sy, z);
     }
-}
+}
+//# sourceMappingURL=render-command-list.js.map

package/es/common/seg-context.js

@@ -91,4 +91,4 @@ export class ReflectSegContext extends SegContext {
         return super.clear();
     }
 }
-//# sourceMappingURL=seg-context.js.map
+//# sourceMappingURL=seg-context.js.map

package/es/common/simplify.js

@@ -30,4 +30,4 @@ export function flatten_simplify(points, tolerance, highestQuality) {
     if (points.length <= 10) return points;
     return points = highestQuality ? points : simplifyRadialDist(points, void 0 !== tolerance ? tolerance * tolerance : 1);
 }
-//# sourceMappingURL=simplify.js.map
+//# sourceMappingURL=simplify.js.map

package/es/common/sort.js

@@ -94,4 +94,4 @@ export function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
     !1)), reverse);
     return result;
 }
-//# sourceMappingURL=sort.js.map
+//# sourceMappingURL=sort.js.map

package/es/common/split-path.js

@@ -248,4 +248,4 @@ export const splitPath = (path, count) => {
     }
     return res;
 };
-//# sourceMappingURL=split-path.js.map
+//# sourceMappingURL=split-path.js.map

package/es/common/text.js

@@ -24,4 +24,4 @@ export function textAttributesToStyle(attrs) {
     attrs.underline ? style["text-decoration"] = "underline" : attrs.lineThrough && (style["text-decoration"] = "line-through"), 
     attrs.fill && isString(attrs.fill) && (style.color = attrs.fill), style;
 }
-//# sourceMappingURL=text.js.map
+//# sourceMappingURL=text.js.map

package/es/core/contributions/layerHandler/modules.js

@@ -1,9 +1,13 @@
-import { StaticLayerHandlerContribution } from "../../constants";
+import { StaticLayerHandlerContribution, VirtualLayerHandlerContribution } from "../../constants";
 
 import { CanvasLayerHandlerContribution } from "./canvas2d-contribution";
 
+import { EmptyLayerHandlerContribution } from "./empty-contribution";
+
 export function bindLayerHandlerModules({bind: bind}) {
-    bind(CanvasLayerHandlerContribution).toSelf(), bind(StaticLayerHandlerContribution).toService(CanvasLayerHandlerContribution);
+    bind(CanvasLayerHandlerContribution).toSelf(), bind(EmptyLayerHandlerContribution).toSelf(), 
+    bind(StaticLayerHandlerContribution).toService(CanvasLayerHandlerContribution), 
+    bind(VirtualLayerHandlerContribution).toService(EmptyLayerHandlerContribution);
 }
 
 export default bindLayerHandlerModules;

package/es/core/contributions/layerHandler/modules.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/contributions/layerHandler/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,8BAA8B,EAE/B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAIzE,MAAM,UAAU,uBAAuB,CAAC,EAAE,IAAI,EAAiB;IAC7D,IAAI,CAAC,8BAA8B,CAAC,CAAC,MAAM,EAAE,CAAC;IAG9C,IAAI,CAAC,8BAA8B,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;AAUjF,CAAC;AAED,eAAe,uBAAuB,CAAC","file":"modules.js","sourcesContent":["import {\n  // DynamicLayerHandlerContribution,\n  StaticLayerHandlerContribution\n  // VirtualLayerHandlerContribution\n} from '../../constants';\nimport { CanvasLayerHandlerContribution } from './canvas2d-contribution';\n// import { EmptyLayerHandlerContribution } from './empty-contribution';\n// import { OffscreenLayerHandlerContribution } from './offscreen2d-contribution';\n\nexport function bindLayerHandlerModules({ bind }: { bind: any }) {\n  bind(CanvasLayerHandlerContribution).toSelf();\n  // bind(OffscreenLayerHandlerContribution).toSelf();\n  // bind(EmptyLayerHandlerContribution).toSelf();\n  bind(StaticLayerHandlerContribution).toService(CanvasLayerHandlerContribution);\n  // bind(DynamicLayerHandlerContribution).toService(OffscreenLayerHandlerContribution);\n  // bind(VirtualLayerHandlerContribution).toService(EmptyLayerHandlerContribution);\n  // try {\n  //   if (typeof OffscreenCanvas === 'function') {\n  //     bind(LayerHandlerContribution).toService(OffscreenLayerHandlerContribution);\n  //   }\n  // } catch (err) {\n  //   bind(LayerHandlerContribution).toService(CanvasLayerHandlerContribution);\n  // }\n}\n\nexport default bindLayerHandlerModules;\n"]}
+{"version":3,"sources":["../src/core/contributions/layerHandler/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,8BAA8B,EAC9B,+BAA+B,EAChC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAGrE,MAAM,UAAU,uBAAuB,CAAC,EAAE,IAAI,EAAiB;IAC7D,IAAI,CAAC,8BAA8B,CAAC,CAAC,MAAM,EAAE,CAAC;IAE9C,IAAI,CAAC,6BAA6B,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7C,IAAI,CAAC,8BAA8B,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;IAE/E,IAAI,CAAC,+BAA+B,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;AAQjF,CAAC;AAED,eAAe,uBAAuB,CAAC","file":"modules.js","sourcesContent":["import {\n  // DynamicLayerHandlerContribution,\n  StaticLayerHandlerContribution,\n  VirtualLayerHandlerContribution\n} from '../../constants';\nimport { CanvasLayerHandlerContribution } from './canvas2d-contribution';\nimport { EmptyLayerHandlerContribution } from './empty-contribution';\n// import { OffscreenLayerHandlerContribution } from './offscreen2d-contribution';\n\nexport function bindLayerHandlerModules({ bind }: { bind: any }) {\n  bind(CanvasLayerHandlerContribution).toSelf();\n  // bind(OffscreenLayerHandlerContribution).toSelf();\n  bind(EmptyLayerHandlerContribution).toSelf();\n  bind(StaticLayerHandlerContribution).toService(CanvasLayerHandlerContribution);\n  // bind(DynamicLayerHandlerContribution).toService(OffscreenLayerHandlerContribution);\n  bind(VirtualLayerHandlerContribution).toService(EmptyLayerHandlerContribution);\n  // try {\n  //   if (typeof OffscreenCanvas === 'function') {\n  //     bind(LayerHandlerContribution).toService(OffscreenLayerHandlerContribution);\n  //   }\n  // } catch (err) {\n  //   bind(LayerHandlerContribution).toService(CanvasLayerHandlerContribution);\n  // }\n}\n\nexport default bindLayerHandlerModules;\n"]}

package/es/core/stage.d.ts

@@ -1,6 +1,7 @@
 import { type IAABBBounds, type IBounds, type IBoundsLike, type IMatrix } from '@visactor/vutils';
-import type { IGraphic, IExportType, IStage, IStageParams, ILayer, IColor, IOption3D, ICamera, vec3, IDirectionLight, ITicker, IRenderService, IPickerService, IPluginService, ISyncHook, IDrawContext, IWindow, ILayerService, ITimeline, IOptimizeType, LayerMode, PickResult, IPlugin, IGraphicService, IRenderServiceDrawParams } from '../interface';
+import type { IGraphic, IExportType, IStage, IStageParams, ILayer, IColor, IOption3D, ICamera, vec3, IDirectionLight, ITicker, IRenderService, IPickerService, IPluginService, ISyncHook, IDrawContext, IWindow, ILayerService, ITimeline, IOptimizeType, LayerMode, PickResult, IPlugin, IGraphicService, IRenderServiceDrawParams, IRenderToOptions } from '../interface';
 import type { Layer } from './layer';
+import { FederatedMouseEvent } from '../event';
 import { Group } from '../graphic/group';
 import { type IStageFactoryDeps } from '../factory';
 import { type SharedStateScope } from '../graphic/state/shared-state-scope';
@@ -147,6 +148,7 @@ export declare class Stage extends Group implements IStage {
     sortLayer(cb: (ILayer1: ILayer, layer2: ILayer) => number): void;
     removeLayer(ILayerId: number): ILayer | false;
     tryInitInteractiveLayer(): void;
+    private prepareRenderLayers;
     clearViewBox(color?: string): void;
     render(layers?: ILayer[], params?: Partial<IDrawContext>): void;
     protected combineLayersToWindow(): void;
@@ -168,12 +170,17 @@ export declare class Stage extends Group implements IStage {
     setStage(stage?: IStage): void;
     dirty(b: IBounds, matrix?: IMatrix): void;
     getLayer(name: string): undefined | ILayer;
-    renderTo(window: IWindow): void;
+    renderTo(window: IWindow, _params?: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }, options?: IRenderToOptions): void;
     renderToNewWindow(fullImage?: boolean, viewBox?: IAABBBounds): IWindow;
     toCanvas(fullImage?: boolean, viewBox?: IAABBBounds): HTMLCanvasElement | null;
     setCursor(mode?: string): void;
     getCursor(): string;
-    eventPointTransform(e: PointerEvent | WheelEvent | TouchEvent): {
+    eventPointTransform(e: PointerEvent | WheelEvent | TouchEvent | FederatedMouseEvent): {
         x: number;
         y: number;
     };

package/es/core/stage.js

@@ -2,7 +2,7 @@ import { Bounds, Point, isString } from "@visactor/vutils";
 
 import { DefaultWindow } from "./window";
 
-import { EventSystem } from "../event";
+import { EventSystem, FederatedMouseEvent } from "../event";
 
 import { Group } from "../graphic/group";
 
@@ -381,31 +381,37 @@ export class Stage extends Group {
             layerMode: layerMode,
             canvasId: canvasId
         });
-        return this.appendChild(layer), layer;
+        return this.appendChild(layer), this.interactiveLayer && layer !== this.interactiveLayer && this.appendChild(this.interactiveLayer), 
+        layer;
     }
     sortLayer(cb) {
         const children = this.children;
         children.sort(cb), this.removeAllChild(), children.forEach((c => {
             this.appendChild(c);
-        }));
+        })), this.interactiveLayer && this.appendChild(this.interactiveLayer);
     }
     removeLayer(ILayerId) {
         return this.removeChild(this.findChildByUid(ILayerId));
     }
     tryInitInteractiveLayer() {
-        "released" !== this.releaseStatus && this.supportInteractiveLayer && !this.interactiveLayer && (this.interactiveLayer = this.createLayer(), 
+        "released" !== this.releaseStatus && this.supportInteractiveLayer && !this.interactiveLayer && (this.interactiveLayer = this.createLayer(void 0, this.params.interactiveLayerMode), 
         this.interactiveLayer.name = "_builtin_interactive", this.interactiveLayer.attribute.pickable = !1, 
         this.nextFrameRenderLayerSet.add(this.interactiveLayer));
     }
+    prepareRenderLayers() {
+        "virtual" === this.params.interactiveLayerMode && this.tryInitInteractiveLayer(), 
+        this.layerService.prepareStageLayer(this);
+    }
     clearViewBox(color) {
         this.window.clearViewBox(color);
     }
     render(layers, params) {
         if ("released" === this.releaseStatus) return;
+        if (this.params.requestRender) return void this.params.requestRender();
         this.startAnimate();
         const state = this.state;
-        this.state = "rendering", this.layerService.prepareStageLayer(this), this._skipRender || (this.lastRenderparams = params, 
-        this.hooks.beforeRender.call(this), this._skipRender || (this.renderLayerList(this.children), 
+        this.state = "rendering", this._skipRender || (this.lastRenderparams = params, this.hooks.beforeRender.call(this), 
+        this._skipRender || (this.prepareRenderLayers(), this.renderLayerList(this.children), 
         this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear()), this.hooks.afterRender.call(this)), 
         this.state = state, this._skipRender && this._skipRender++;
     }
@@ -421,11 +427,11 @@ export class Stage extends Group {
         }
     }
     renderNextFrame(layers, force) {
-        this.nextFrameRenderLayerSet.size !== this.childrenCount && (layers || this).forEach((layer => {
+        "released" !== this.releaseStatus && (this.params.requestRender ? "rendering" !== this.state && this.params.requestRender() : (this.nextFrameRenderLayerSet.size !== this.childrenCount && (layers || this).forEach((layer => {
             this.nextFrameRenderLayerSet.add(layer);
         })), this.willNextFrameRender || (this.willNextFrameRender = !0, this.global.getSpecifiedRequestAnimationFrame(this.rafId)((() => {
             this._doRenderInThisFrame(), this.willNextFrameRender = !1;
-        })));
+        })))));
     }
     ensureRootSharedStateScope(themeStateDefinitions) {
         return this.rootSharedStateScope ? (this.rootSharedStateScope.ownerStage = this, 
@@ -436,8 +442,8 @@ export class Stage extends Group {
         if ("released" === this.releaseStatus) return;
         this.startAnimate();
         const state = this.state;
-        this.state = "rendering", this.layerService.prepareStageLayer(this), this.nextFrameRenderLayerSet.size && !this._skipRender && (this.hooks.beforeRender.call(this), 
-        this._skipRender || (this.renderLayerList(Array.from(this.nextFrameRenderLayerSet.values()), this.lastRenderparams || {}), 
+        this.state = "rendering", this.nextFrameRenderLayerSet.size && !this._skipRender && (this.hooks.beforeRender.call(this), 
+        this._skipRender || (this.prepareRenderLayers(), this.renderLayerList(Array.from(this.nextFrameRenderLayerSet.values()), this.lastRenderparams || {}), 
         this.combineLayersToWindow(), this.nextFrameRenderLayerSet.clear()), this.hooks.afterRender.call(this)), 
         this.state = state, this._skipRender && this._skipRender++;
     }
@@ -536,17 +542,26 @@ export class Stage extends Group {
     getLayer(name) {
         return this.children.filter((layer => layer.name === name))[0];
     }
-    renderTo(window) {
-        "released" !== this.releaseStatus && this.forEachChildren(((layer, i) => {
-            layer.drawTo(window, {
-                renderService: this.renderService,
-                viewBox: window.getViewBox(),
-                transMatrix: window.getViewBoxTransform(),
-                background: layer === this.defaultLayer ? this.background : void 0,
-                clear: 0 === i,
-                updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty())
-            });
-        }));
+    renderTo(window, _params, options) {
+        if ("released" === this.releaseStatus) return;
+        const state = this.state;
+        this.state = "rendering";
+        try {
+            this.params.requestRender && this.hooks.beforeRender.call(this), this.prepareRenderLayers(), 
+            this.forEachChildren(((layer, i) => {
+                var _a, _b;
+                layer.drawTo(window, {
+                    renderService: this.renderService,
+                    viewBox: null !== (_a = null == options ? void 0 : options.viewBox) && void 0 !== _a ? _a : window.getViewBox(),
+                    transMatrix: null !== (_b = null == options ? void 0 : options.transMatrix) && void 0 !== _b ? _b : window.getViewBoxTransform(),
+                    background: layer === this.defaultLayer ? this.background : void 0,
+                    clear: 0 === i && !1 !== (null == options ? void 0 : options.clear),
+                    updateBounds: !(!this.dirtyBounds || this.dirtyBounds.empty())
+                });
+            })), this.params.requestRender && this.hooks.afterRender.call(this);
+        } finally {
+            this.state = state;
+        }
     }
     renderToNewWindow(fullImage = !0, viewBox) {
         if ("released" === this.releaseStatus) return;
@@ -578,6 +593,10 @@ export class Stage extends Group {
         return this._cursor;
     }
     eventPointTransform(e) {
+        if (e instanceof FederatedMouseEvent) return {
+            x: e.viewX,
+            y: e.viewY
+        };
         const point = this.global.mapToCanvasPoint(e, this.window);
         return this.stage.window.pointTransform(point.x, point.y);
     }