@meursyphus/flitter 2.0.0-alpha.4 → 2.0.0-alpha.6

package/index.cjs

@@ -12330,7 +12330,7 @@ var TextSpan = class extends Inline_span_default {
   equals(other) {
     if (other === this)
       return true;
-    return this.text === other.text && Inline_span_default.equals(this.children, other.children);
+    return this.text === other.text && this.style.equals(other.style) && Inline_span_default.equals(this.children, other.children);
   }
   visitChildren(visitor) {
     visitor(this);
@@ -12544,7 +12544,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 +13009,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
@@ -13650,7 +13655,7 @@ var RenderObjectToWidgetAdapter = class extends RenderObjectWidget_default {
 var RenderObjectToWidgetAdapter_default = RenderObjectToWidgetAdapter;
 
 // src/hit-test/HitTestDispatcher.ts
-var _activated, _detectors, _rootPosition, _renderContext, _hitPosition, _handleMouseDown, _handleClick, _hitHistory, _handleMouseMove, _handleMouseUp, _handleMouseWheel, _handleMouseEnter, _handleMouseLeave, _wrapEvent, _didDomOrderChangeState;
+var _activated, _detectors, _rootPosition, _renderContext, _hitPosition, _handleMouseDown, _handleClick, _hitHistory, _previousCursorDetector, _handleMouseMove, _handleMouseUp, _handleMouseWheel, _handleMouseEnter, _handleMouseLeave, _wrapEvent, _didDomOrderChangeState;
 var HitTestDispatcher = class {
   constructor() {
     __privateAdd(this, _activated, typeof window !== "undefined");
@@ -13665,7 +13670,9 @@ var HitTestDispatcher = class {
       this.hitTest(e, "onClick");
     });
     __privateAdd(this, _hitHistory, []);
+    __privateAdd(this, _previousCursorDetector, null);
     __privateAdd(this, _handleMouseMove, (e) => {
+      var _a, _b;
       this.traceHitPosition(e);
       this.hitTest(e, "onMouseMove");
       e.isPropagationStopped = false;
@@ -13691,6 +13698,12 @@ var HitTestDispatcher = class {
           globalPoint: __privateGet(this, _hitPosition)
         });
       });
+      const cursorDetectorIndex = __privateGet(this, _hitHistory).findIndex((hit) => hit);
+      const cursorDetector = (_a = __privateGet(this, _detectors)[cursorDetectorIndex]) != null ? _a : null;
+      if (cursorDetector !== __privateGet(this, _previousCursorDetector)) {
+        __privateSet(this, _previousCursorDetector, cursorDetector);
+        __privateGet(this, _renderContext).view.style.cursor = (_b = cursorDetector == null ? void 0 : cursorDetector.cursor) != null ? _b : "default";
+      }
     });
     __privateAdd(this, _handleMouseUp, (e) => {
       this.hitTest(e, "onMouseUp");
@@ -13789,6 +13802,7 @@ _hitPosition = new WeakMap();
 _handleMouseDown = new WeakMap();
 _handleClick = new WeakMap();
 _hitHistory = new WeakMap();
+_previousCursorDetector = new WeakMap();
 _handleMouseMove = new WeakMap();
 _handleMouseUp = new WeakMap();
 _handleMouseWheel = new WeakMap();
@@ -14911,6 +14925,7 @@ var RenderFlex = class extends MultiChildRenderObject_default {
     if (this._direction === newDirection)
       return;
     this._direction = newDirection;
+    this.markNeedsLayout();
   }
   get mainAxisAlignment() {
     return this._mainAxisAlignment;
@@ -18459,7 +18474,7 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
     cursor,
     onWheel
   }) {
-    super({ isPainter: true });
+    super({ isPainter: false });
     __publicField(this, "isRenderGestureDetector", true);
     __publicField(this, "id", createUniqueId());
     __publicField(this, "_cursor");
@@ -18615,9 +18630,6 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
       onDragEnd: this.onDragEnd
     });
   }
-  createSvgPainter() {
-    return new SvgPainterGestureDetector(this);
-  }
   hitTest({ globalPoint }) {
     const viewPort = this.renderOwner.renderContext.viewPort;
     const { translation, scale } = viewPort;
@@ -18633,23 +18645,8 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
     }
     super.updateZOrder(value);
   }
-};
-var SvgPainterGestureDetector = class extends SvgPainter {
-  get cursor() {
-    return this.renderObject.cursor;
-  }
-  performPaint({ rect }) {
-    rect.setAttribute("width", `${this.size.width}`);
-    rect.setAttribute("height", `${this.size.height}`);
-    rect.setAttribute("cursor", this.cursor);
-    rect.setAttribute("pointer-events", "auto");
-    rect.setAttribute("fill", "transparent");
-  }
-  createDefaultSvgEl({ createSvgEl }) {
-    const rect = createSvgEl("rect");
-    return {
-      rect
-    };
+  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;
@@ -3117,14 +3112,20 @@ declare class RenderGestureDetector extends SingleChildRenderObject {
     dispose(): void;
     private removeEventListeners;
     private addEventListeners;
-    protected createSvgPainter(): SvgPainter;
     hitTest({ globalPoint }: {
         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;
@@ -3227,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[];
 }

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;
@@ -3117,14 +3112,20 @@ declare class RenderGestureDetector extends SingleChildRenderObject {
     dispose(): void;
     private removeEventListeners;
     private addEventListeners;
-    protected createSvgPainter(): SvgPainter;
     hitTest({ globalPoint }: {
         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;
@@ -3227,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[];
 }

package/index.global.js

@@ -12709,7 +12709,7 @@
     equals(other) {
       if (other === this)
         return true;
-      return this.text === other.text && Inline_span_default.equals(this.children, other.children);
+      return this.text === other.text && this.style.equals(other.style) && Inline_span_default.equals(this.children, other.children);
     }
     visitChildren(visitor) {
       visitor(this);
@@ -12923,7 +12923,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 +13388,7 @@
     rearrangeDomOrder() {
       if (!__privateGet(this, _domOrderChanged))
         return;
-      if (this.isPainter) {
+      if (this.isPainter && this.domNode) {
         this.renderOwner.paintContext.insertSvgEl(
           this.domNode,
           this.renderObject.zOrder
@@ -14029,7 +14034,7 @@
   var RenderObjectToWidgetAdapter_default = RenderObjectToWidgetAdapter;
 
   // src/hit-test/HitTestDispatcher.ts
-  var _activated, _detectors, _rootPosition, _renderContext, _hitPosition, _handleMouseDown, _handleClick, _hitHistory, _handleMouseMove, _handleMouseUp, _handleMouseWheel, _handleMouseEnter, _handleMouseLeave, _wrapEvent, _didDomOrderChangeState;
+  var _activated, _detectors, _rootPosition, _renderContext, _hitPosition, _handleMouseDown, _handleClick, _hitHistory, _previousCursorDetector, _handleMouseMove, _handleMouseUp, _handleMouseWheel, _handleMouseEnter, _handleMouseLeave, _wrapEvent, _didDomOrderChangeState;
   var HitTestDispatcher = class {
     constructor() {
       __privateAdd(this, _activated, typeof window !== "undefined");
@@ -14044,7 +14049,9 @@
         this.hitTest(e, "onClick");
       });
       __privateAdd(this, _hitHistory, []);
+      __privateAdd(this, _previousCursorDetector, null);
       __privateAdd(this, _handleMouseMove, (e) => {
+        var _a, _b;
         this.traceHitPosition(e);
         this.hitTest(e, "onMouseMove");
         e.isPropagationStopped = false;
@@ -14070,6 +14077,12 @@
             globalPoint: __privateGet(this, _hitPosition)
           });
         });
+        const cursorDetectorIndex = __privateGet(this, _hitHistory).findIndex((hit) => hit);
+        const cursorDetector = (_a = __privateGet(this, _detectors)[cursorDetectorIndex]) != null ? _a : null;
+        if (cursorDetector !== __privateGet(this, _previousCursorDetector)) {
+          __privateSet(this, _previousCursorDetector, cursorDetector);
+          __privateGet(this, _renderContext).view.style.cursor = (_b = cursorDetector == null ? void 0 : cursorDetector.cursor) != null ? _b : "default";
+        }
       });
       __privateAdd(this, _handleMouseUp, (e) => {
         this.hitTest(e, "onMouseUp");
@@ -14168,6 +14181,7 @@
   _handleMouseDown = new WeakMap();
   _handleClick = new WeakMap();
   _hitHistory = new WeakMap();
+  _previousCursorDetector = new WeakMap();
   _handleMouseMove = new WeakMap();
   _handleMouseUp = new WeakMap();
   _handleMouseWheel = new WeakMap();
@@ -16169,6 +16183,7 @@
       if (this._direction === newDirection)
         return;
       this._direction = newDirection;
+      this.markNeedsLayout();
     }
     get mainAxisAlignment() {
       return this._mainAxisAlignment;
@@ -19717,7 +19732,7 @@
       cursor,
       onWheel
     }) {
-      super({ isPainter: true });
+      super({ isPainter: false });
       __publicField(this, "isRenderGestureDetector", true);
       __publicField(this, "id", createUniqueId());
       __publicField(this, "_cursor");
@@ -19873,9 +19888,6 @@
         onDragEnd: this.onDragEnd
       });
     }
-    createSvgPainter() {
-      return new SvgPainterGestureDetector(this);
-    }
     hitTest({ globalPoint }) {
       const viewPort = this.renderOwner.renderContext.viewPort;
       const { translation, scale: scale2 } = viewPort;
@@ -19891,23 +19903,8 @@
       }
       super.updateZOrder(value);
     }
-  };
-  var SvgPainterGestureDetector = class extends SvgPainter {
-    get cursor() {
-      return this.renderObject.cursor;
-    }
-    performPaint({ rect }) {
-      rect.setAttribute("width", `${this.size.width}`);
-      rect.setAttribute("height", `${this.size.height}`);
-      rect.setAttribute("cursor", this.cursor);
-      rect.setAttribute("pointer-events", "auto");
-      rect.setAttribute("fill", "transparent");
-    }
-    createDefaultSvgEl({ createSvgEl }) {
-      const rect = createSvgEl("rect");
-      return {
-        rect
-      };
+    accept(visitor) {
+      visitor.visitGestureDetector(this);
     }
   };
   function emptyCallback(_arg) {

package/index.js

@@ -12330,7 +12330,7 @@ var TextSpan = class extends Inline_span_default {
   equals(other) {
     if (other === this)
       return true;
-    return this.text === other.text && Inline_span_default.equals(this.children, other.children);
+    return this.text === other.text && this.style.equals(other.style) && Inline_span_default.equals(this.children, other.children);
   }
   visitChildren(visitor) {
     visitor(this);
@@ -12544,7 +12544,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 +13009,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
@@ -13650,7 +13655,7 @@ var RenderObjectToWidgetAdapter = class extends RenderObjectWidget_default {
 var RenderObjectToWidgetAdapter_default = RenderObjectToWidgetAdapter;
 
 // src/hit-test/HitTestDispatcher.ts
-var _activated, _detectors, _rootPosition, _renderContext, _hitPosition, _handleMouseDown, _handleClick, _hitHistory, _handleMouseMove, _handleMouseUp, _handleMouseWheel, _handleMouseEnter, _handleMouseLeave, _wrapEvent, _didDomOrderChangeState;
+var _activated, _detectors, _rootPosition, _renderContext, _hitPosition, _handleMouseDown, _handleClick, _hitHistory, _previousCursorDetector, _handleMouseMove, _handleMouseUp, _handleMouseWheel, _handleMouseEnter, _handleMouseLeave, _wrapEvent, _didDomOrderChangeState;
 var HitTestDispatcher = class {
   constructor() {
     __privateAdd(this, _activated, typeof window !== "undefined");
@@ -13665,7 +13670,9 @@ var HitTestDispatcher = class {
       this.hitTest(e, "onClick");
     });
     __privateAdd(this, _hitHistory, []);
+    __privateAdd(this, _previousCursorDetector, null);
     __privateAdd(this, _handleMouseMove, (e) => {
+      var _a, _b;
       this.traceHitPosition(e);
       this.hitTest(e, "onMouseMove");
       e.isPropagationStopped = false;
@@ -13691,6 +13698,12 @@ var HitTestDispatcher = class {
           globalPoint: __privateGet(this, _hitPosition)
         });
       });
+      const cursorDetectorIndex = __privateGet(this, _hitHistory).findIndex((hit) => hit);
+      const cursorDetector = (_a = __privateGet(this, _detectors)[cursorDetectorIndex]) != null ? _a : null;
+      if (cursorDetector !== __privateGet(this, _previousCursorDetector)) {
+        __privateSet(this, _previousCursorDetector, cursorDetector);
+        __privateGet(this, _renderContext).view.style.cursor = (_b = cursorDetector == null ? void 0 : cursorDetector.cursor) != null ? _b : "default";
+      }
     });
     __privateAdd(this, _handleMouseUp, (e) => {
       this.hitTest(e, "onMouseUp");
@@ -13789,6 +13802,7 @@ _hitPosition = new WeakMap();
 _handleMouseDown = new WeakMap();
 _handleClick = new WeakMap();
 _hitHistory = new WeakMap();
+_previousCursorDetector = new WeakMap();
 _handleMouseMove = new WeakMap();
 _handleMouseUp = new WeakMap();
 _handleMouseWheel = new WeakMap();
@@ -14911,6 +14925,7 @@ var RenderFlex = class extends MultiChildRenderObject_default {
     if (this._direction === newDirection)
       return;
     this._direction = newDirection;
+    this.markNeedsLayout();
   }
   get mainAxisAlignment() {
     return this._mainAxisAlignment;
@@ -18459,7 +18474,7 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
     cursor,
     onWheel
   }) {
-    super({ isPainter: true });
+    super({ isPainter: false });
     __publicField(this, "isRenderGestureDetector", true);
     __publicField(this, "id", createUniqueId());
     __publicField(this, "_cursor");
@@ -18615,9 +18630,6 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
       onDragEnd: this.onDragEnd
     });
   }
-  createSvgPainter() {
-    return new SvgPainterGestureDetector(this);
-  }
   hitTest({ globalPoint }) {
     const viewPort = this.renderOwner.renderContext.viewPort;
     const { translation, scale } = viewPort;
@@ -18633,23 +18645,8 @@ var RenderGestureDetector = class extends SingleChildRenderObject_default {
     }
     super.updateZOrder(value);
   }
-};
-var SvgPainterGestureDetector = class extends SvgPainter {
-  get cursor() {
-    return this.renderObject.cursor;
-  }
-  performPaint({ rect }) {
-    rect.setAttribute("width", `${this.size.width}`);
-    rect.setAttribute("height", `${this.size.height}`);
-    rect.setAttribute("cursor", this.cursor);
-    rect.setAttribute("pointer-events", "auto");
-    rect.setAttribute("fill", "transparent");
-  }
-  createDefaultSvgEl({ createSvgEl }) {
-    const rect = createSvgEl("rect");
-    return {
-      rect
-    };
+  accept(visitor) {
+    visitor.visitGestureDetector(this);
   }
 };
 function emptyCallback(_arg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meursyphus/flitter",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.6",
   "description": "A declarative, widget-based library built on SVG for simplifying data visualization with a Flutter-like syntax.",
   "keywords": [
     "flitter",
@@ -16,7 +16,7 @@
     "build": "tsup && npm run copy-package && npm run copy-readme && cd dist && npm run fix-package",
     "copy-package": "cp package.json dist/package.json",
     "copy-readme": "cp README.md dist/README.md",
-    "fix-package": "npm pkg set main=./index.cjs module=./index.js exports.default=./index.js exports.import=./index.js types=./index.d.ts",
+    "fix-package": "npm pkg set main=./index.cjs module=./index.js exports.import=./index.js exports.default=./index.js  types=./index.d.ts",
     "lint": "eslint src/**",
     "postbuild": "echo \"Build complete. Please run: \n\ncd dist\nnpm publish\n\"",
     "format": "prettier --write ."
@@ -55,7 +55,7 @@
   },
   "module": "./index.js",
   "exports": {
-    "default": "./index.js",
-    "import": "./index.js"
+    "import": "./index.js",
+    "default": "./index.js"
   }
 }