modern-canvas 0.12.3 → 0.12.5

package/dist/index.cjs

@@ -6250,9 +6250,12 @@ exports.Node = class Node extends CoreObject {
   }
   findOne(callbackfn) {
     for (const child of this._children.default) {
-      const value = callbackfn(child) || child.findOne(callbackfn);
-      if (value) {
-        return value;
+      if (callbackfn(child)) {
+        return child;
+      }
+      const res = child.findOne(callbackfn);
+      if (res) {
+        return res;
       }
     }
     return void 0;
@@ -6260,9 +6263,8 @@ exports.Node = class Node extends CoreObject {
   findAll(callbackfn) {
     const items = [];
     for (const child of this._children.default) {
-      const value = callbackfn(child);
-      if (value) {
-        items.push(value);
+      if (callbackfn(child)) {
+        items.push(child);
       }
       items.push(...child.findAll(callbackfn));
     }
@@ -6271,7 +6273,10 @@ exports.Node = class Node extends CoreObject {
   findAncestor(callbackfn) {
     const parent = this._parent;
     if (parent) {
-      const value = callbackfn(parent) ?? parent.findAncestor(callbackfn);
+      if (callbackfn(parent)) {
+        return parent;
+      }
+      const value = parent.findAncestor(callbackfn);
       if (value) {
         return value;
       }
@@ -10094,7 +10099,6 @@ class BaseElement2DText extends CoreObject {
     this.parent = parent;
     this.base = new modernText.Text();
     this.base.setPropertyAccessor(this);
-    this.update();
   }
   base;
   _texture = new CanvasTexture();
@@ -10114,20 +10118,19 @@ class BaseElement2DText extends CoreObject {
       case "measureDom":
       case "fonts":
         this.update();
-        this.parent.requestRedraw();
         break;
       case "fill":
       case "outline":
       case "content":
         this.update();
         this._updateTextureMap();
-        this.parent.requestRedraw();
         break;
     }
   }
   update() {
     this.base.fonts = this.base.fonts ?? this.parent.tree?.fonts;
     this.base.update();
+    this.parent.requestRedraw();
   }
   _updateTextureMap() {
     this._textureMap.clear();
@@ -10401,6 +10404,12 @@ exports.BaseElement2D = class BaseElement2D extends exports.Node2D {
     this.style = new BaseElement2DStyle();
     this.setProperties(properties).append(nodes);
   }
+  _treeEnter(tree) {
+    super._treeEnter(tree);
+    if (this._text.isValid()) {
+      this._text.update();
+    }
+  }
   setProperties(properties) {
     if (properties) {
       const {
@@ -10492,7 +10501,6 @@ exports.BaseElement2D = class BaseElement2D extends exports.Node2D {
     if (textStyles.has(key) || layoutStyle.has(key)) {
       if (this.text.isValid()) {
         this.text.update();
-        this.requestRedraw();
       }
     }
   }

package/dist/index.d.cts

@@ -1757,7 +1757,7 @@ declare class Node extends CoreObject {
     remove(): void;
     findOne<T extends Node = Node>(callbackfn: (value: Node) => boolean): T | undefined;
     findAll<T extends Node = Node>(callbackfn: (value: Node) => boolean): T[];
-    findAncestor<T extends Node = Node>(callbackfn: (value: Node) => Node | undefined): T | undefined;
+    findAncestor<T extends Node = Node>(callbackfn: (value: Node) => boolean): T | undefined;
     /** override */
     protected _ready(): void;
     protected _treeEnter(tree: SceneTree): void;
@@ -2174,6 +2174,7 @@ declare class BaseElement2D extends Node2D implements Rectangulable {
     get shadow(): BaseElement2DShadow;
     set shadow(value: Shadow);
     constructor(properties?: Partial<BaseElement2DProperties>, nodes?: Node[]);
+    protected _treeEnter(tree: SceneTree): void;
     setProperties(properties?: Record<string, any>): this;
     protected _updateStyleProperty(key: string, value: any, oldValue: any): void;
     protected _process(delta: number): void;

package/dist/index.d.mts

@@ -1757,7 +1757,7 @@ declare class Node extends CoreObject {
     remove(): void;
     findOne<T extends Node = Node>(callbackfn: (value: Node) => boolean): T | undefined;
     findAll<T extends Node = Node>(callbackfn: (value: Node) => boolean): T[];
-    findAncestor<T extends Node = Node>(callbackfn: (value: Node) => Node | undefined): T | undefined;
+    findAncestor<T extends Node = Node>(callbackfn: (value: Node) => boolean): T | undefined;
     /** override */
     protected _ready(): void;
     protected _treeEnter(tree: SceneTree): void;
@@ -2174,6 +2174,7 @@ declare class BaseElement2D extends Node2D implements Rectangulable {
     get shadow(): BaseElement2DShadow;
     set shadow(value: Shadow);
     constructor(properties?: Partial<BaseElement2DProperties>, nodes?: Node[]);
+    protected _treeEnter(tree: SceneTree): void;
     setProperties(properties?: Record<string, any>): this;
     protected _updateStyleProperty(key: string, value: any, oldValue: any): void;
     protected _process(delta: number): void;

package/dist/index.d.ts

@@ -1757,7 +1757,7 @@ declare class Node extends CoreObject {
     remove(): void;
     findOne<T extends Node = Node>(callbackfn: (value: Node) => boolean): T | undefined;
     findAll<T extends Node = Node>(callbackfn: (value: Node) => boolean): T[];
-    findAncestor<T extends Node = Node>(callbackfn: (value: Node) => Node | undefined): T | undefined;
+    findAncestor<T extends Node = Node>(callbackfn: (value: Node) => boolean): T | undefined;
     /** override */
     protected _ready(): void;
     protected _treeEnter(tree: SceneTree): void;
@@ -2174,6 +2174,7 @@ declare class BaseElement2D extends Node2D implements Rectangulable {
     get shadow(): BaseElement2DShadow;
     set shadow(value: Shadow);
     constructor(properties?: Partial<BaseElement2DProperties>, nodes?: Node[]);
+    protected _treeEnter(tree: SceneTree): void;
     setProperties(properties?: Record<string, any>): this;
     protected _updateStyleProperty(key: string, value: any, oldValue: any): void;
     protected _process(delta: number): void;