@meursyphus/flitter 2.0.0-alpha.5 → 2.0.0-alpha.7

package/index.cjs

@@ -123,7 +123,13 @@ var SceneBuilder = class {
   }
   render(ctx) {
     for (const { x, y, picture } of __privateGet(this, _pictures)) {
-      ctx.drawImage(picture.toImage(), x, y);
+      ctx.drawImage(
+        picture.toImage(),
+        x,
+        y,
+        picture.size.width,
+        picture.size.height
+      );
     }
   }
   addPicture(props) {
@@ -140,6 +146,12 @@ var Picture = class {
   toImage() {
     return __privateGet(this, _source);
   }
+  get size() {
+    return {
+      width: __privateGet(this, _source).width / window.devicePixelRatio,
+      height: __privateGet(this, _source).height / window.devicePixelRatio
+    };
+  }
 };
 _source = new WeakMap();
 var _source2;
@@ -151,8 +163,9 @@ var PictureRecorder = class {
   constructor(paintBounds) {
     __privateAdd(this, _source2, void 0);
     __privateSet(this, _source2, document.createElement("canvas"));
-    __privateGet(this, _source2).width = paintBounds.width;
-    __privateGet(this, _source2).height = paintBounds.height;
+    const dpr = window.devicePixelRatio;
+    __privateGet(this, _source2).width = paintBounds.width * dpr;
+    __privateGet(this, _source2).height = paintBounds.height * dpr;
   }
   /**
    * @implements: This function is still incomplete. So It needs paintSize temporarily. Once completed, it will intercept the CanvasRenderingContext2D API
@@ -161,6 +174,7 @@ var PictureRecorder = class {
    */
   createCanvasContext() {
     const ctx = __privateGet(this, _source2).getContext("2d");
+    ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
     return ctx;
   }
   endRecording() {
@@ -12544,7 +12558,12 @@ var ZOrderCalculatorVisitor = class {
     __publicField(this, "currentStackingContext", []);
   }
   visit(renderObject) {
-    __privateMethod(this, _visit, visit_fn).call(this, renderObject, { willCollect: renderObject.isPainter });
+    __privateMethod(this, _visit, visit_fn).call(this, renderObject, {
+      willCollect: renderObject.isPainter
+    });
+  }
+  visitGestureDetector(gestureDetector) {
+    __privateMethod(this, _visit, visit_fn).call(this, gestureDetector, { willCollect: true });
   }
   visitZIndex(renderObject) {
     this.currentStackingContext = [...this.currentStackingContext];
@@ -13004,7 +13023,7 @@ var SvgPainter = class extends Painter {
   rearrangeDomOrder() {
     if (!__privateGet(this, _domOrderChanged))
       return;
-    if (this.isPainter) {
+    if (this.isPainter && this.domNode) {
       this.renderOwner.paintContext.insertSvgEl(
         this.domNode,
         this.renderObject.zOrder
@@ -14920,6 +14939,7 @@ var RenderFlex = class extends MultiChildRenderObject_default {
     if (this._direction === newDirection)
       return;
     this._direction = newDirection;
+    this.markNeedsLayout();
   }
   get mainAxisAlignment() {
     return this._mainAxisAlignment;
@@ -18639,6 +18659,9 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
     }
     super.updateZOrder(value);
   }
+  accept(visitor) {
+    visitor.visitGestureDetector(this);
+  }
 };
 function emptyCallback(_arg) {
 }

package/index.d.cts

@@ -3054,11 +3054,6 @@ declare class RenderZIndex extends SingleChildRenderObject {
     accept(visitor: ZOrderCalculatorVisitor): void;
 }
 
-interface RenderObjectVisitor {
-    visit(renderObject: RenderObject): void;
-    visitZIndex(zIndex: RenderZIndex): void;
-}
-
 type Cursor = "pointer" | "default" | "move" | "text" | "wait" | "help" | "progress" | "not-allowed" | "crosshair" | "grab" | "grabbing" | "e-resize" | "ne-resize" | "nw-resize" | "n-resize" | "se-resize" | "sw-resize" | "s-resize" | "w-resize" | "ew-resize" | "ns-resize" | "nesw-resize" | "nwse-resize" | "col-resize" | "row-resize" | "all-scroll";
 declare class RenderGestureDetector extends SingleChildRenderObject {
     isRenderGestureDetector: boolean;
@@ -3121,9 +3116,16 @@ declare class RenderGestureDetector extends SingleChildRenderObject {
         globalPoint: Offset$1;
     }): boolean;
     updateZOrder(value: number): void;
+    accept(visitor: RenderObjectVisitor): void;
 }
 type MouseEventCallback = (event: MouseEvent) => void;
 
+interface RenderObjectVisitor {
+    visit(renderObject: RenderObject): void;
+    visitZIndex(zIndex: RenderZIndex): void;
+    visitGestureDetector(gestureDetector: RenderGestureDetector): void;
+}
+
 type EventHandlerType = "onClick" | "onMouseMove" | "onMouseUp" | "onMouseDown" | "onMouseWheel" | "onMouseEnter" | "onMouseLeave";
 declare class HitTestDispatcher {
     #private;
@@ -3226,6 +3228,7 @@ declare class ZOrderCalculatorVisitor implements RenderObjectVisitor {
     private currentVisitedOrder;
     private currentStackingContext;
     visit(renderObject: RenderObject): void;
+    visitGestureDetector(gestureDetector: RenderGestureDetector): void;
     visitZIndex(renderObject: RenderZIndex): void;
     getRenderObjectsByDomOrder(): RenderObject[];
 }
@@ -3537,6 +3540,10 @@ declare class Picture {
     #private;
     constructor(source: HTMLCanvasElement);
     toImage(): CanvasImageSource;
+    get size(): {
+        width: number;
+        height: number;
+    };
 }
 
 declare class CanvasPaintingContext {

package/index.d.ts

@@ -3054,11 +3054,6 @@ declare class RenderZIndex extends SingleChildRenderObject {
     accept(visitor: ZOrderCalculatorVisitor): void;
 }
 
-interface RenderObjectVisitor {
-    visit(renderObject: RenderObject): void;
-    visitZIndex(zIndex: RenderZIndex): void;
-}
-
 type Cursor = "pointer" | "default" | "move" | "text" | "wait" | "help" | "progress" | "not-allowed" | "crosshair" | "grab" | "grabbing" | "e-resize" | "ne-resize" | "nw-resize" | "n-resize" | "se-resize" | "sw-resize" | "s-resize" | "w-resize" | "ew-resize" | "ns-resize" | "nesw-resize" | "nwse-resize" | "col-resize" | "row-resize" | "all-scroll";
 declare class RenderGestureDetector extends SingleChildRenderObject {
     isRenderGestureDetector: boolean;
@@ -3121,9 +3116,16 @@ declare class RenderGestureDetector extends SingleChildRenderObject {
         globalPoint: Offset$1;
     }): boolean;
     updateZOrder(value: number): void;
+    accept(visitor: RenderObjectVisitor): void;
 }
 type MouseEventCallback = (event: MouseEvent) => void;
 
+interface RenderObjectVisitor {
+    visit(renderObject: RenderObject): void;
+    visitZIndex(zIndex: RenderZIndex): void;
+    visitGestureDetector(gestureDetector: RenderGestureDetector): void;
+}
+
 type EventHandlerType = "onClick" | "onMouseMove" | "onMouseUp" | "onMouseDown" | "onMouseWheel" | "onMouseEnter" | "onMouseLeave";
 declare class HitTestDispatcher {
     #private;
@@ -3226,6 +3228,7 @@ declare class ZOrderCalculatorVisitor implements RenderObjectVisitor {
     private currentVisitedOrder;
     private currentStackingContext;
     visit(renderObject: RenderObject): void;
+    visitGestureDetector(gestureDetector: RenderGestureDetector): void;
     visitZIndex(renderObject: RenderZIndex): void;
     getRenderObjectsByDomOrder(): RenderObject[];
 }
@@ -3537,6 +3540,10 @@ declare class Picture {
     #private;
     constructor(source: HTMLCanvasElement);
     toImage(): CanvasImageSource;
+    get size(): {
+        width: number;
+        height: number;
+    };
 }
 
 declare class CanvasPaintingContext {

package/index.global.js

@@ -304,7 +304,13 @@
     }
     render(ctx) {
       for (const { x, y, picture } of __privateGet(this, _pictures)) {
-        ctx.drawImage(picture.toImage(), x, y);
+        ctx.drawImage(
+          picture.toImage(),
+          x,
+          y,
+          picture.size.width,
+          picture.size.height
+        );
       }
     }
     addPicture(props) {
@@ -321,6 +327,12 @@
     toImage() {
       return __privateGet(this, _source);
     }
+    get size() {
+      return {
+        width: __privateGet(this, _source).width / window.devicePixelRatio,
+        height: __privateGet(this, _source).height / window.devicePixelRatio
+      };
+    }
   };
   _source = new WeakMap();
   var _source2;
@@ -332,8 +344,9 @@
     constructor(paintBounds) {
       __privateAdd(this, _source2, void 0);
       __privateSet(this, _source2, document.createElement("canvas"));
-      __privateGet(this, _source2).width = paintBounds.width;
-      __privateGet(this, _source2).height = paintBounds.height;
+      const dpr = window.devicePixelRatio;
+      __privateGet(this, _source2).width = paintBounds.width * dpr;
+      __privateGet(this, _source2).height = paintBounds.height * dpr;
     }
     /**
      * @implements: This function is still incomplete. So It needs paintSize temporarily. Once completed, it will intercept the CanvasRenderingContext2D API
@@ -342,6 +355,7 @@
      */
     createCanvasContext() {
       const ctx = __privateGet(this, _source2).getContext("2d");
+      ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
       return ctx;
     }
     endRecording() {
@@ -12923,7 +12937,12 @@
       __publicField(this, "currentStackingContext", []);
     }
     visit(renderObject) {
-      __privateMethod(this, _visit, visit_fn).call(this, renderObject, { willCollect: renderObject.isPainter });
+      __privateMethod(this, _visit, visit_fn).call(this, renderObject, {
+        willCollect: renderObject.isPainter
+      });
+    }
+    visitGestureDetector(gestureDetector) {
+      __privateMethod(this, _visit, visit_fn).call(this, gestureDetector, { willCollect: true });
     }
     visitZIndex(renderObject) {
       this.currentStackingContext = [...this.currentStackingContext];
@@ -13383,7 +13402,7 @@
     rearrangeDomOrder() {
       if (!__privateGet(this, _domOrderChanged))
         return;
-      if (this.isPainter) {
+      if (this.isPainter && this.domNode) {
         this.renderOwner.paintContext.insertSvgEl(
           this.domNode,
           this.renderObject.zOrder
@@ -16178,6 +16197,7 @@
       if (this._direction === newDirection)
         return;
       this._direction = newDirection;
+      this.markNeedsLayout();
     }
     get mainAxisAlignment() {
       return this._mainAxisAlignment;
@@ -19897,6 +19917,9 @@
       }
       super.updateZOrder(value);
     }
+    accept(visitor) {
+      visitor.visitGestureDetector(this);
+    }
   };
   function emptyCallback(_arg) {
   }

package/index.js

@@ -123,7 +123,13 @@ var SceneBuilder = class {
   }
   render(ctx) {
     for (const { x, y, picture } of __privateGet(this, _pictures)) {
-      ctx.drawImage(picture.toImage(), x, y);
+      ctx.drawImage(
+        picture.toImage(),
+        x,
+        y,
+        picture.size.width,
+        picture.size.height
+      );
     }
   }
   addPicture(props) {
@@ -140,6 +146,12 @@ var Picture = class {
   toImage() {
     return __privateGet(this, _source);
   }
+  get size() {
+    return {
+      width: __privateGet(this, _source).width / window.devicePixelRatio,
+      height: __privateGet(this, _source).height / window.devicePixelRatio
+    };
+  }
 };
 _source = new WeakMap();
 var _source2;
@@ -151,8 +163,9 @@ var PictureRecorder = class {
   constructor(paintBounds) {
     __privateAdd(this, _source2, void 0);
     __privateSet(this, _source2, document.createElement("canvas"));
-    __privateGet(this, _source2).width = paintBounds.width;
-    __privateGet(this, _source2).height = paintBounds.height;
+    const dpr = window.devicePixelRatio;
+    __privateGet(this, _source2).width = paintBounds.width * dpr;
+    __privateGet(this, _source2).height = paintBounds.height * dpr;
   }
   /**
    * @implements: This function is still incomplete. So It needs paintSize temporarily. Once completed, it will intercept the CanvasRenderingContext2D API
@@ -161,6 +174,7 @@ var PictureRecorder = class {
    */
   createCanvasContext() {
     const ctx = __privateGet(this, _source2).getContext("2d");
+    ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
     return ctx;
   }
   endRecording() {
@@ -12544,7 +12558,12 @@ var ZOrderCalculatorVisitor = class {
     __publicField(this, "currentStackingContext", []);
   }
   visit(renderObject) {
-    __privateMethod(this, _visit, visit_fn).call(this, renderObject, { willCollect: renderObject.isPainter });
+    __privateMethod(this, _visit, visit_fn).call(this, renderObject, {
+      willCollect: renderObject.isPainter
+    });
+  }
+  visitGestureDetector(gestureDetector) {
+    __privateMethod(this, _visit, visit_fn).call(this, gestureDetector, { willCollect: true });
   }
   visitZIndex(renderObject) {
     this.currentStackingContext = [...this.currentStackingContext];
@@ -13004,7 +13023,7 @@ var SvgPainter = class extends Painter {
   rearrangeDomOrder() {
     if (!__privateGet(this, _domOrderChanged))
       return;
-    if (this.isPainter) {
+    if (this.isPainter && this.domNode) {
       this.renderOwner.paintContext.insertSvgEl(
         this.domNode,
         this.renderObject.zOrder
@@ -14920,6 +14939,7 @@ var RenderFlex = class extends MultiChildRenderObject_default {
     if (this._direction === newDirection)
       return;
     this._direction = newDirection;
+    this.markNeedsLayout();
   }
   get mainAxisAlignment() {
     return this._mainAxisAlignment;
@@ -18639,6 +18659,9 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
     }
     super.updateZOrder(value);
   }
+  accept(visitor) {
+    visitor.visitGestureDetector(this);
+  }
 };
 function emptyCallback(_arg) {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meursyphus/flitter",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "description": "A declarative, widget-based library built on SVG for simplifying data visualization with a Flutter-like syntax.",
   "keywords": [
     "flitter",