uicore-ts 1.1.141 → 1.1.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uicore-ts",
-  "version": "1.1.141",
+  "version": "1.1.145",
   "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/UITableView.ts

@@ -196,7 +196,7 @@ 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)
@@ -205,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 = {
@@ -321,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
             }
@@ -639,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
@@ -751,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/UITextField.ts

@@ -12,24 +12,28 @@ export class UITextField extends UITextView {
     
     override _viewHTMLElement!: HTMLInputElement
     
-    constructor(elementID?: string, viewHTMLElement = null, type: string | ValueOf<typeof UITextView.type> = UITextView.type.textField) {
+    constructor(
+        elementID?: string,
+        viewHTMLElement = null,
+        type: string | ValueOf<typeof UITextView.type> = UITextView.type.textField
+    ) {
         
         super(elementID, type, viewHTMLElement)
         
-        this.viewHTMLElement.setAttribute("type", "text")
+        this.textElementView.viewHTMLElement.setAttribute("type", "text")
         this.backgroundColor = UIColor.whiteColor
         this.addTargetForControlEvent(
             UIView.controlEvent.PointerUpInside,
             (sender, event) => sender.focus()
         )
-        this.viewHTMLElement.oninput = (event) => {
+        this.textElementView.viewHTMLElement.oninput = (event) => {
             this.sendControlEventForKey(UITextField.controlEvent.TextChange, event)
         }
-        this.style.webkitUserSelect = "text"
+        this.textElementView.style.webkitUserSelect = "text"
         this.nativeSelectionEnabled = YES
         this.pausesPointerEvents = NO
         this.changesOften = YES
-    
+        
     }
     
     
@@ -50,30 +54,20 @@ export class UITextField extends UITextView {
     
     
     public override set text(text: string) {
-        
-        this.viewHTMLElement.value = text
-        
+        this.textElementView.viewHTMLElement.value = text
     }
     
-    
     public override get text(): string {
-        
-        return this.viewHTMLElement.value
-        
+        return this.textElementView.viewHTMLElement.value
     }
     
     
     public set placeholderText(text: string) {
-        
-        this.viewHTMLElement.placeholder = text
-        
+        this.textElementView.viewHTMLElement.placeholder = text
     }
     
-    
     public get placeholderText(): string {
-        
-        return this.viewHTMLElement.placeholder
-        
+        return this.textElementView.viewHTMLElement.placeholder
     }
     
     
@@ -122,67 +116,17 @@ export class UITextField extends UITextView {
     
     
     public get isSecure(): boolean {
-        
-        const result = (this.viewHTMLElement.type == "password")
-        
+        const result = (this.textElementView.viewHTMLElement.type == "password")
         return result
-        
     }
     
-    
-    
     public set isSecure(secure: boolean) {
-        
-        var type = "text"
-        
+        let type = "text"
         if (secure) {
-            
             type = "password"
-            
         }
-        
-        this.viewHTMLElement.type = type
-        
+        this.textElementView.viewHTMLElement.type = type
     }
     
     
-    
-    
-    
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-