uicore-ts 1.1.128 → 1.1.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uicore-ts",
-  "version": "1.1.128",
+  "version": "1.1.142",
   "description": "UICore is a library to build native-like user interfaces using pure Typescript. No HTML is needed at all. Components are described as TS classes and all user interactions are handled explicitly. This library is strongly inspired by the UIKit framework that is used in IOS. In addition, UICore has tools to handle URL based routing, array sorting and filtering and adds a number of other utilities for convenience.",
   "main": "compiledScripts/index.js",
   "types": "compiledScripts/index.d.ts",

package/scripts/UIObject.ts

@@ -332,7 +332,7 @@ type NativeGlobal = Date | RegExp | Map<any, any> | Set<any> | WeakMap<any, any>
 // 2. The value type
 export type UIInitializerValue<T> =
 // Handle Functions
-    T extends Function
+    T extends (Function | ((...args: any) => any))
         //@ts-ignore
     ? UIFunctionCall<T> | UIFunctionCall<T>[] | UIFunctionExtender<T> | T
         // Handle Arrays (do not recurse)

package/scripts/UIRectangle.ts

@@ -917,8 +917,9 @@ export class UIRectangle extends UIObject {
     }
     
     
-    assignedAsFrameOfView(view: UIView) {
+    assignedAsFrameOfView(view: UIView, isWeakFrame = view.hasWeakFrame) {
         view.frame = this
+        view.hasWeakFrame = isWeakFrame
         return this
     }
     

package/scripts/UITableView.ts

@@ -196,7 +196,8 @@ export class UITableView extends UINativeScrollView {
     
     invalidateSizeOfRowWithIndex(index: number, animateChange = NO) {
         if (this._rowPositions?.[index]) {
-            this._rowPositions[index].isValid = NO
+            FIRST_OR_NIL(this._rowPositions[index]).isValid = NO
+            this._rowPositions.slice(index, -1).everyElement.isValid = NO
         }
         this._highestValidRowPositionIndex = Math.min(this._highestValidRowPositionIndex, index - 1)
         this._needsDrawingOfVisibleRowsBeforeLayout = YES
@@ -204,12 +205,36 @@ export class UITableView extends UINativeScrollView {
     }
     
     
+    _rowPositionWithIndex(index: number, positions = this._rowPositions) {
+        if (this.allRowsHaveEqualHeight && index > 0) {
+            const firstPositionObject = positions[0]
+            const rowHeight = firstPositionObject.bottomY - firstPositionObject.topY
+            const result = {
+                bottomY: rowHeight * (index + 1),
+                topY: rowHeight * index,
+                isValid: firstPositionObject.isValid
+            }
+            return result
+        }
+        return positions[index]
+    }
+    
     _calculateAllPositions() {
         this._calculatePositionsUntilIndex(this.numberOfRows() - 1)
     }
     
     _calculatePositionsUntilIndex(maxIndex: number) {
         
+        if (this.allRowsHaveEqualHeight) {
+            const positionObject: UITableViewReusableViewPositionObject = {
+                bottomY: this.heightForRowWithIndex(0),
+                topY: 0,
+                isValid: YES
+            }
+            this._rowPositions = [positionObject]
+            return
+        }
+        
         let validPositionObject = this._rowPositions[this._highestValidRowPositionIndex]
         if (!IS(validPositionObject)) {
             validPositionObject = {
@@ -320,12 +345,11 @@ export class UITableView extends UINativeScrollView {
         
         // Variable Heights
         this._calculateAllPositions()
-        const rowPositions = this._rowPositions
         const result = []
         
         for (let i = 0; i < numberOfRows; i++) {
             
-            const position = rowPositions[i]
+            const position = this._rowPositionWithIndex(i)
             if (!position) {
                 break
             }
@@ -624,8 +648,8 @@ export class UITableView extends UINativeScrollView {
     }
     
     
-    override setNeedsLayout() {
-        super.setNeedsLayout()
+    override clearIntrinsicSizeCache() {
+        super.clearIntrinsicSizeCache()
         this.invalidateSizeOfRowWithIndex(0)
     }
     
@@ -638,7 +662,7 @@ export class UITableView extends UINativeScrollView {
                 
                 const frame = bounds.copy()
                 
-                const positionObject = positions[row._UITableViewRowIndex!]
+                const positionObject = this._rowPositionWithIndex(row._UITableViewRowIndex!, positions)
                 frame.min.y = positionObject.topY
                 frame.max.y = positionObject.bottomY
                 row.frame = frame
@@ -750,8 +774,10 @@ export class UITableView extends UINativeScrollView {
         
         let result = 0
         this._calculateAllPositions()
-        if (this._rowPositions.length) {
-            result = this._rowPositions[this._rowPositions.length - 1].bottomY
+        
+        const numberOfRows = this.numberOfRows()
+        if (numberOfRows) {
+            result = this._rowPositionWithIndex(numberOfRows - 1).bottomY
         }
         
         return result

package/scripts/UIView.ts

@@ -1130,6 +1130,20 @@ export class UIView extends UIObject {
         }
     }
     
+    // If YES, then the view is not counted in intrinsic content size calculation.
+    // This should be used for things like background views that just take the shape of the parent view.
+    hasWeakFrame = NO
+    // Set view as having a weak frame and set the frame.
+    public set weakFrame(rectangle: UIRectangle & { zIndex?: number }) {
+        this.hasWeakFrame = YES
+        this.frame = rectangle
+    }
+    // Set view as having a strong frame and set the frame.
+    public set strongFrame(rectangle: UIRectangle & { zIndex?: number }) {
+        this.hasWeakFrame = NO
+        this.frame = rectangle
+    }
+    
     
     setFrame(rectangle: UIRectangle & { zIndex?: number }, zIndex = 0, performUncheckedLayout = NO) {
         
@@ -3763,7 +3777,7 @@ export class UIView extends UIObject {
         
         const framePoints: UIPoint[] = []
         this.subviews.forEach(subview => {
-            if (subview == this._loadingView) {
+            if (subview == this._loadingView || subview.hasWeakFrame) {
                 return
             }
             subview.layoutIfNeeded()