uicore-ts 1.1.81 → 1.1.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uicore-ts",
-  "version": "1.1.81",
+  "version": "1.1.83",
   "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/UITextView.ts

@@ -44,6 +44,8 @@ export class UITextView extends UIView {
     private _useFastMeasurement: boolean | undefined;
     private _cachedMeasurementStyles: TextMeasurementStyle | undefined;
     
+    override usesVirtualLayoutingForIntrinsicSizing = NO
+    
     
     constructor(
         elementID?: string,

package/scripts/UIView.ts

@@ -161,7 +161,10 @@ export class UIView extends UIObject {
     
     _localizedTextObject?: UILocalizedTextObject
     
-    _controlEventTargets: ControlEventTargetsObject = {} //{ "PointerDown": Function[]; "PointerMove": Function[]; "PointerLeave": Function[]; "PointerEnter": Function[]; "PointerUpInside": Function[]; "PointerUp": Function[]; "PointerHover": Function[]; };
+    _controlEventTargets: ControlEventTargetsObject = {} //{ "PointerDown": Function[]; "PointerMove": Function[];
+                                                         // "PointerLeave": Function[]; "PointerEnter": Function[];
+                                                         // "PointerUpInside": Function[]; "PointerUp": Function[];
+                                                         // "PointerHover": Function[]; };
     _frameTransform: string
     viewController?: UIViewController
     _updateLayoutFunction?: Function
@@ -727,93 +730,23 @@ export class UIView extends UIObject {
     }
     
     
-    static createStyleSelector(selector: string, style: string) {
+    static injectCSS(cssText: string, id?: string) {
+        // Prevent duplicate injection if an ID is supplied
+        if (id && document.getElementById(id)) {
+            return
+        }
         
-        return
+        const style = document.createElement("style")
+        if (id) {
+            style.id = id
+        }
         
-        // // @ts-ignore
-        // if (!document.styleSheets) {
-        //     return
-        // }
-        // if (document.getElementsByTagName("head").length == 0) {
-        //     return
-        // }
-        //
-        // let styleSheet
-        // let mediaType
-        //
-        // if (document.styleSheets.length > 0) {
-        //     for (var i = 0, l: any = document.styleSheets.length; i < l; i++) {
-        //         if (document.styleSheets[i].disabled) {
-        //             continue
-        //         }
-        //         const media = document.styleSheets[i].media
-        //         mediaType = typeof media
-        //
-        //         if (mediaType === "string") {
-        //             if (media as any === "" || ((media as any).indexOf("screen") !== -1)) {
-        //                 styleSheet = document.styleSheets[i]
-        //             }
-        //         }
-        //         else if (mediaType == "object") {
-        //             if (media.mediaText === "" || (media.mediaText.indexOf("screen") !== -1)) {
-        //                 styleSheet = document.styleSheets[i]
-        //             }
-        //         }
-        //
-        //         if (typeof styleSheet !== "undefined") {
-        //             break
-        //         }
-        //     }
-        // }
-        //
-        // if (typeof styleSheet === "undefined") {
-        //     const styleSheetElement = document.createElement("style")
-        //     styleSheetElement.type = "text/css"
-        //     document.getElementsByTagName("head")[0].appendChild(styleSheetElement)
-        //
-        //     for (i = 0; i < document.styleSheets.length; i++) {
-        //         if (document.styleSheets[i].disabled) {
-        //             continue
-        //         }
-        //         styleSheet = document.styleSheets[i]
-        //     }
-        //
-        //     mediaType = typeof styleSheet.media
-        // }
-        //
-        // if (mediaType === "string") {
-        //     for (var i = 0, l = styleSheet.rules.length; i < l; i++) {
-        //         if (styleSheet.rules[i].selectorText && styleSheet.rules[i].selectorText.toLowerCase() ==
-        //             selector.toLowerCase()) {
-        //             styleSheet.rules[i].style.cssText = style
-        //             return
-        //         }
-        //     }
-        //     styleSheet.addRule(selector, style)
-        // }
-        // else if (mediaType === "object") {
-        //
-        //     var styleSheetLength = 0
-        //
-        //     try {
-        //
-        //         styleSheetLength = (styleSheet.cssRules) ? styleSheet.cssRules.length : 0
-        //
-        //     } catch (error) {
-        //
-        //     }
-        //
-        //
-        //     for (var i = 0; i < styleSheetLength; i++) {
-        //         if (styleSheet.cssRules[i].selectorText && styleSheet.cssRules[i].selectorText.toLowerCase() ==
-        //             selector.toLowerCase()) {
-        //             styleSheet.cssRules[i].style.cssText = style
-        //             return
-        //         }
-        //     }
-        //     styleSheet.insertRule(selector + "{" + style + "}", styleSheetLength)
-        // }
+        style.textContent = cssText
+        document.head.appendChild(style)
+    }
+    
+    static createStyleSelector(selector: string, style: string) {
+        this.injectCSS(selector + " { " + style + " }")
     }
     
     static getStyleRules(selector: string) {
@@ -997,7 +930,8 @@ export class UIView extends UIObject {
             this._frameForVirtualLayouting = rectangle
         }
         
-        if (frame && frame != nil && frame.isEqualTo(rectangle) && frame.zIndex == rectangle.zIndex && !performUncheckedLayout) {
+        if (frame && frame != nil && frame.isEqualTo(
+            rectangle) && frame.zIndex == rectangle.zIndex && !performUncheckedLayout) {
             return
         }
         
@@ -1260,7 +1194,8 @@ export class UIView extends UIObject {
             // @ts-ignore
             this.style[propertyName] = value
             
-        } catch (exception) {
+        }
+        catch (exception) {
             
             console.log(exception)
             
@@ -1560,7 +1495,8 @@ export class UIView extends UIObject {
                 
                 element = parentElement.querySelector("#" + key)
                 
-            } catch (error) {
+            }
+            catch (error) {
                 
                 //console.log("Error occurred " + error);
                 
@@ -1690,7 +1626,8 @@ export class UIView extends UIObject {
             
             this.layoutSubviews()
             
-        } catch (exception) {
+        }
+        catch (exception) {
             
             console.log(exception)
             
@@ -1847,7 +1784,8 @@ export class UIView extends UIObject {
         
         try {
             resultHTMLElement = this.viewHTMLElement.querySelector("#" + viewID)
-        } catch (error) {
+        }
+        catch (error) {
             console.log(error)
         }
         
@@ -3385,7 +3323,8 @@ export class UIView extends UIObject {
             selfOffsetPoint = selfOffsetPoint.add(
                 element.UIViewObject?.frame.min ?? new UIPoint(element.offsetLeft, element.offsetTop)
             )
-            //selfScale = selfScale * (element.UIView?.scale ?? (element.getBoundingClientRect().width / element.offsetWidth))
+            //selfScale = selfScale * (element.UIView?.scale ?? (element.getBoundingClientRect().width /
+            // element.offsetWidth))
         }
         
         let viewOffsetPoint = new UIPoint(0, 0)
@@ -3395,7 +3334,8 @@ export class UIView extends UIObject {
             viewOffsetPoint = viewOffsetPoint.add(
                 element.UIViewObject?.frame.min ?? new UIPoint(element.offsetLeft, element.offsetTop)
             )
-            //viewScale = viewScale * (element.UIView?.scale ?? (element.getBoundingClientRect().width / element.offsetWidth))
+            //viewScale = viewScale * (element.UIView?.scale ?? (element.getBoundingClientRect().width /
+            // element.offsetWidth))
         }
         
         const offsetPoint = selfOffsetPoint.subtract(viewOffsetPoint)
@@ -3498,9 +3438,18 @@ export class UIView extends UIObject {
             UIView.isVirtualLayouting = YES
             this.frame = this.frame.rectangleWithHeight(constrainingHeight)
             this.layoutIfNeeded()
-            const result = this.frame
+            const framePoints: UIPoint[] = []
+            this.forEachViewInSubtree(view => {
+                const frame = view.rectangleInView(
+                    view.frame,
+                    this
+                )
+                framePoints.push(frame.min)
+                framePoints.push(frame.max)
+            })
+            const resultFrame = UIRectangle.boundingBoxForPoints(framePoints)
             UIView.isVirtualLayouting = NO
-            return result.width
+            return resultFrame.width
         }
         
         return this.intrinsicContentSizeWithConstraints(constrainingHeight).width
@@ -3513,9 +3462,18 @@ export class UIView extends UIObject {
             UIView.isVirtualLayouting = YES
             this.frame = this.frame.rectangleWithWidth(constrainingWidth)
             this.layoutIfNeeded()
-            const result = this.frame
+            const framePoints: UIPoint[] = []
+            this.forEachViewInSubtree(view => {
+                const frame = view.rectangleInView(
+                    view.frame,
+                    this
+                )
+                framePoints.push(frame.min)
+                framePoints.push(frame.max)
+            })
+            const resultFrame = UIRectangle.boundingBoxForPoints(framePoints)
             UIView.isVirtualLayouting = NO
-            return result.height
+            return resultFrame.height
         }
         
         return this.intrinsicContentSizeWithConstraints(undefined, constrainingWidth).height
@@ -3529,9 +3487,18 @@ export class UIView extends UIObject {
         if (this.usesVirtualLayoutingForIntrinsicSizing) {
             UIView.isVirtualLayouting = YES
             this.layoutIfNeeded()
-            const result = this.frame
+            const framePoints: UIPoint[] = []
+            this.forEachViewInSubtree(view => {
+                const frame = view.rectangleInView(
+                    view.frame,
+                    this
+                )
+                framePoints.push(frame.min)
+                framePoints.push(frame.max)
+            })
+            const resultFrame = UIRectangle.boundingBoxForPoints(framePoints)
             UIView.isVirtualLayouting = NO
-            return result
+            return resultFrame
         }
         
         return nil