uicore-ts 1.1.52 → 1.1.56

package/scripts/UITextView.ts

@@ -3,6 +3,7 @@ import { UILocalizedTextObject } from "./UIInterfaces"
 import { FIRST, IS_LIKE_NULL, nil, NO, UIObject, YES } from "./UIObject"
 import { UIRectangle } from "./UIRectangle"
 import type { ValueOf } from "./UIObject"
+import { UITextMeasurement } from "./UITextMeasurement"
 import { UIView, UIViewBroadcastEvent } from "./UIView"
 
 
@@ -40,6 +41,8 @@ export class UITextView extends UIView {
     static _pxToPt: number
     _text?: string
     
+    private _useFastMeasurement: boolean | undefined;
+    
     
     constructor(
         elementID?: string,
@@ -204,30 +207,24 @@ export class UITextView extends UIView {
     }
     
     set text(text) {
-        
         this._text = text
-        
         var notificationText = ""
-        
         if (this.notificationAmount) {
-            
             notificationText = "<span style=\"color: " + UITextView.notificationTextColor.stringValue + ";\">" +
                 (" (" + this.notificationAmount + ")").bold() + "</span>"
-            
         }
         
         if (this.viewHTMLElement.innerHTML != this.textPrefix + text + this.textSuffix + notificationText) {
-            
             this.viewHTMLElement.innerHTML = this.textPrefix + FIRST(text, "") + this.textSuffix + notificationText
-            
         }
         
         if (this.changesOften) {
-            
             this._intrinsicHeightCache = new UIObject() as any
             this._intrinsicWidthCache = new UIObject() as any
-            
         }
+        // Invalidate measurement strategy when text changes significantly
+        this._useFastMeasurement = undefined;
+        this._intrinsicSizesCache = {};
         
         this.setNeedsLayout()
         
@@ -452,6 +449,73 @@ export class UITextView extends UIView {
     }
     
     
+    override intrinsicContentSizeWithConstraints(
+        constrainingHeight: number = 0,
+        constrainingWidth: number = 0
+    ): UIRectangle {
+        const cacheKey = "h_" + constrainingHeight + "__w_" + constrainingWidth;
+        const cachedResult = this._intrinsicSizesCache[cacheKey];
+        if (cachedResult) {
+            return cachedResult;
+        }
+        
+        // Determine measurement strategy
+        const shouldUseFastPath = this._useFastMeasurement ?? this._shouldUseFastMeasurement();
+        
+        let result: UIRectangle;
+        
+        if (shouldUseFastPath) {
+            // Fast path: canvas-based measurement
+            const size = UITextMeasurement.calculateTextSize(
+                this.viewHTMLElement,
+                this.text || this.innerHTML,
+                constrainingWidth || undefined,
+                constrainingHeight || undefined
+            );
+            result = new UIRectangle(0, 0, size.height, size.width);
+        } else {
+            // Fallback: original DOM-based measurement for complex content
+            result = super.intrinsicContentSizeWithConstraints(constrainingHeight, constrainingWidth);
+        }
+        
+        this._intrinsicSizesCache[cacheKey] = result.copy();
+        return result;
+    }
+    
+    // Helper to determine if we can use fast measurement
+    private _shouldUseFastMeasurement(): boolean {
+        const content = this.text || this.innerHTML;
+        
+        // If using dynamic innerHTML with parameters, use DOM measurement
+        if (this._innerHTMLKey || this._localizedTextObject) {
+            return false;
+        }
+        
+        // Check for notification badges
+        if (this.notificationAmount > 0) {
+            return false; // Has span with colored text
+        }
+        
+        // Check content complexity
+        const hasComplexHTML = /<(?!\/?(b|i|em|strong|span|br)\b)[^>]+>/i.test(content);
+        
+        return !hasComplexHTML;
+    }
+    
+    // Optional: Allow manual override for specific instances
+    setUseFastMeasurement(useFast: boolean): void {
+        this._useFastMeasurement = useFast;
+        this._intrinsicSizesCache = {};
+    }
+    
+    // Optional: Force re-evaluation of measurement strategy
+    invalidateMeasurementStrategy(): void {
+        this._useFastMeasurement = undefined;
+        this._intrinsicSizesCache = {};
+    }
+    
+    
+    
     override intrinsicContentSize() {
         
         // This works but is slow

package/scripts/UIView.ts

@@ -223,7 +223,7 @@ export class UIView extends UIObject {
     static _onWindowMouseMove: (event: MouseEvent) => void = nil
     static _onWindowMouseup: (event: MouseEvent) => void = nil
     private _resizeObserverEntry?: ResizeObserverEntry
-    private _intrinsicSizesCache: Record<string, UIRectangle> = {}
+    protected _intrinsicSizesCache: Record<string, UIRectangle> = {}
     
     
     constructor(