uicore-ts 1.0.521 → 1.0.527

package/compiledScripts/UIView.js

@@ -61,6 +61,7 @@ if (!window.AutoLayout) {
   window.AutoLayout = import_UIObject.nil;
 }
 function UIComponentView(target, context) {
+  console.log("Recording annotation UIComponentView on " + target.name);
   import_UIObject.UIObject.recordAnnotation(UIComponentView, target);
 }
 const _UIView = class extends import_UIObject.UIObject {
@@ -90,6 +91,7 @@ const _UIView = class extends import_UIObject.UIObject {
     this._isMoving = import_UIObject.NO;
     this._isCBEditorTemporaryResizable = import_UIObject.NO;
     this._isCBEditorTemporaryMovable = import_UIObject.NO;
+    this._intrinsicSizesCache = {};
     this.controlEvent = _UIView.controlEvent;
     _UIView._UIViewIndex = _UIView.nextIndex;
     this._UIViewIndex = _UIView._UIViewIndex;
@@ -150,8 +152,6 @@ const _UIView = class extends import_UIObject.UIObject {
     this.viewHTMLElement.obeyAutolayout = import_UIObject.YES;
     this.viewHTMLElement.UIView = this;
     this.addStyleClass(this.styleClassName);
-    this._resizeObserver = new ResizeObserver(() => this.setNeedsLayout());
-    this._resizeObserver.observe(this.viewHTMLElement);
   }
   set nativeSelectionEnabled(selectable) {
     this._nativeSelectionEnabled = selectable;
@@ -456,14 +456,14 @@ const _UIView = class extends import_UIObject.UIObject {
   calculateAndSetViewFrame() {
   }
   get frame() {
-    var _a;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     let result = (_a = this._frame) == null ? void 0 : _a.copy();
     if (!result) {
       result = new import_UIRectangle.UIRectangle(
-        this.viewHTMLElement.offsetLeft,
-        this.viewHTMLElement.offsetTop,
-        this.viewHTMLElement.offsetHeight,
-        this.viewHTMLElement.offsetWidth
+        (_c = (_b = this._resizeObserverEntry) == null ? void 0 : _b.contentRect.left) != null ? _c : this.viewHTMLElement.offsetLeft,
+        (_e = (_d = this._resizeObserverEntry) == null ? void 0 : _d.contentRect.top) != null ? _e : this.viewHTMLElement.offsetTop,
+        (_g = (_f = this._resizeObserverEntry) == null ? void 0 : _f.contentRect.height) != null ? _g : this.viewHTMLElement.offsetHeight,
+        (_i = (_h = this._resizeObserverEntry) == null ? void 0 : _h.contentRect.width) != null ? _i : this.viewHTMLElement.offsetWidth
       );
       result.zIndex = 0;
     }
@@ -480,7 +480,7 @@ const _UIView = class extends import_UIObject.UIObject {
       rectangle.zIndex = zIndex;
     }
     this._frame = rectangle;
-    if (frame && frame.isEqualTo(rectangle) && frame.zIndex == rectangle.zIndex && !performUncheckedLayout) {
+    if (frame && frame != import_UIObject.nil && frame.isEqualTo(rectangle) && frame.zIndex == rectangle.zIndex && !performUncheckedLayout) {
       return;
     }
     if (this.isInternalScaling) {
@@ -497,13 +497,19 @@ const _UIView = class extends import_UIObject.UIObject {
     );
     if (frame.height != rectangle.height || frame.width != rectangle.width || performUncheckedLayout) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(this.bounds);
     }
   }
   get bounds() {
+    var _a, _b, _c, _d;
     let result;
     if ((0, import_UIObject.IS_NOT)(this._frame)) {
-      result = new import_UIRectangle.UIRectangle(0, 0, this.viewHTMLElement.offsetHeight, this.viewHTMLElement.offsetWidth);
+      result = new import_UIRectangle.UIRectangle(
+        0,
+        0,
+        (_b = (_a = this._resizeObserverEntry) == null ? void 0 : _a.contentRect.height) != null ? _b : this.viewHTMLElement.offsetHeight,
+        (_d = (_c = this._resizeObserverEntry) == null ? void 0 : _c.contentRect.width) != null ? _d : this.viewHTMLElement.offsetWidth
+      );
     } else {
       result = this.frame.copy();
       result.x = 0;
@@ -517,7 +523,12 @@ const _UIView = class extends import_UIObject.UIObject {
     newFrame.zIndex = frame.zIndex;
     this.frame = newFrame;
   }
-  boundsDidChange() {
+  boundsDidChange(bounds) {
+  }
+  didResize(entry) {
+    this._resizeObserverEntry = entry;
+    this.setNeedsLayout();
+    this.boundsDidChange(new import_UIRectangle.UIRectangle(0, 0, entry.contentRect.height, entry.contentRect.width));
   }
   get frameTransform() {
     return this._frameTransform;
@@ -537,7 +548,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setSizes(height, width) {
@@ -547,7 +558,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setMinSizes(height, width) {
@@ -557,7 +568,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setMaxSizes(height, width) {
@@ -567,7 +578,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setMargin(margin) {
@@ -576,7 +587,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setMargins(left, right, bottom, top) {
@@ -588,7 +599,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setPadding(padding) {
@@ -597,7 +608,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setPaddings(left, right, bottom, top) {
@@ -609,7 +620,7 @@ const _UIView = class extends import_UIObject.UIObject {
     const bounds = this.bounds;
     if (bounds.height != previousBounds.height || bounds.width != previousBounds.width) {
       this.setNeedsLayout();
-      this.boundsDidChange();
+      this.boundsDidChange(bounds);
     }
   }
   setBorder(radius = import_UIObject.nil, width = 1, color = import_UIColor.UIColor.blackColor, style = "solid") {
@@ -756,29 +767,27 @@ const _UIView = class extends import_UIObject.UIObject {
     if ((0, import_UIObject.IS)(width)) {
       width = width.integerValue + "px";
     }
-    let str = element.style.cssText;
-    frameTransform = _UIView._transformAttribute + ": translate3d(" + left.integerValue + "px, " + top.integerValue + "px, 0px)" + frameTransform;
+    frameTransform = "translate3d(" + left.integerValue + "px, " + top.integerValue + "px, 0px)" + frameTransform;
+    const style = element.style;
     if (element.UIView) {
-      str = str + frameTransform + ((_b = (_a = element.style.transform.match(
+      frameTransform = frameTransform + ((_b = (_a = style.transform.match(
         new RegExp("scale\\(.*\\)", "g")
-      )) == null ? void 0 : _a.firstElement) != null ? _b : "") + ";";
+      )) == null ? void 0 : _a.firstElement) != null ? _b : "");
     }
     if ((0, import_UIObject.IS_NIL)(height)) {
-      str = str + " height: unset;";
-    } else {
-      str = str + " height:" + height + ";";
+      height = "unset";
     }
     if ((0, import_UIObject.IS_NIL)(width)) {
-      str = str + " width: unset;";
-    } else {
-      str = str + " width:" + width + ";";
+      width = "unset";
     }
+    let zIndexString = "" + zIndex;
     if ((0, import_UIObject.IS_NIL)(zIndex)) {
-      str = str + " z-index: unset;";
-    } else {
-      str = str + " z-index:" + zIndex + ";";
+      zIndexString = "unset";
     }
-    element.style.cssText = element.style.cssText + str;
+    style.transform = frameTransform;
+    style.height = height;
+    style.width = width;
+    style.zIndex = zIndexString;
   }
   static performAutoLayout(parentElement, visualFormatArray, constraintsArray) {
     const view = new AutoLayout.View();
@@ -857,6 +866,7 @@ const _UIView = class extends import_UIObject.UIObject {
     }
     this._shouldLayout = import_UIObject.YES;
     _UIView._viewsToLayout.push(this);
+    this._intrinsicSizesCache = {};
     if (_UIView._viewsToLayout.length == 1) {
       _UIView.scheduleLayoutViewsIfNeeded();
     }
@@ -894,7 +904,7 @@ const _UIView = class extends import_UIObject.UIObject {
   applyClassesAndStyles() {
     for (let i = 0; i < this.styleClasses.length; i++) {
       const styleClass = this.styleClasses[i];
-      if (styleClass) {
+      if (styleClass && !this.viewHTMLElement.classList.contains(styleClass)) {
         this.viewHTMLElement.classList.add(styleClass);
       }
     }
@@ -1022,7 +1032,7 @@ const _UIView = class extends import_UIObject.UIObject {
     views.forEach((view) => this.addSubview(view));
   }
   addedAsSubviewToView(view, aboveView) {
-    view.addSubview(this, aboveView);
+    view == null ? void 0 : view.addSubview(this, aboveView);
     return this;
   }
   moveToBottomOfSuperview() {
@@ -1072,8 +1082,10 @@ const _UIView = class extends import_UIObject.UIObject {
     this.superview = superview;
   }
   wasAddedToViewTree() {
+    _UIView.resizeObserver.observe(this.viewHTMLElement);
   }
   wasRemovedFromViewTree() {
+    _UIView.resizeObserver.unobserve(this.viewHTMLElement);
   }
   get isMemberOfViewTree() {
     let element = this.viewHTMLElement;
@@ -1094,6 +1106,18 @@ const _UIView = class extends import_UIObject.UIObject {
     }
     return result;
   }
+  get elementWithAllSuperviewElements() {
+    const result = [];
+    let view = this.viewHTMLElement;
+    for (let i = 0; (0, import_UIObject.IS)(view); i = i) {
+      if (!view) {
+        return result;
+      }
+      result.push(view);
+      view = view.parentElement;
+    }
+    return result;
+  }
   setNeedsLayoutOnAllSuperviews() {
     this.withAllSuperviews.reverse().everyElement.setNeedsLayout();
   }
@@ -2034,20 +2058,48 @@ const _UIView = class extends import_UIObject.UIObject {
     this.subviews.everyElement.forEachViewInSubtree(functionToCall);
   }
   rectangleInView(rectangle, view) {
+    var _a, _b, _c, _d;
     if (!view.isMemberOfViewTree || !this.isMemberOfViewTree) {
       return import_UIObject.nil;
     }
-    const viewClientRectangle = view.viewHTMLElement.getBoundingClientRect();
-    const viewLocation = new import_UIPoint.UIPoint(viewClientRectangle.left, viewClientRectangle.top);
-    const selfClientRectangle = this.viewHTMLElement.getBoundingClientRect();
-    const selfLocation = new import_UIPoint.UIPoint(selfClientRectangle.left, selfClientRectangle.top);
-    const offsetPoint = selfLocation.subtract(viewLocation);
+    const allViewSuperviewElements = view.elementWithAllSuperviewElements;
+    const superviewElementsUntilCommonElement = this.elementWithAllSuperviewElements.slice(
+      0,
+      this.elementWithAllSuperviewElements.findIndex(
+        (viewElement) => allViewSuperviewElements.contains(viewElement)
+      ) + 1
+    );
+    const commonElement = superviewElementsUntilCommonElement.lastElement;
+    const viewSuperviewElementsUntilCommonElement = allViewSuperviewElements.slice(
+      0,
+      allViewSuperviewElements.findIndex((viewElement) => viewElement == commonElement) + 1
+    );
+    let selfOffsetPoint = new import_UIPoint.UIPoint(0, 0);
+    for (let i = 0; i < superviewElementsUntilCommonElement.length - 1; i++) {
+      const element = superviewElementsUntilCommonElement[i];
+      selfOffsetPoint = selfOffsetPoint.add(
+        (_b = (_a = element.UIView) == null ? void 0 : _a.frame.min) != null ? _b : new import_UIPoint.UIPoint(element.offsetLeft, element.offsetTop)
+      );
+    }
+    let viewOffsetPoint = new import_UIPoint.UIPoint(0, 0);
+    for (let i = 0; i < viewSuperviewElementsUntilCommonElement.length - 1; i++) {
+      const element = viewSuperviewElementsUntilCommonElement[i];
+      viewOffsetPoint = viewOffsetPoint.add(
+        (_d = (_c = element.UIView) == null ? void 0 : _c.frame.min) != null ? _d : new import_UIPoint.UIPoint(element.offsetLeft, element.offsetTop)
+      );
+    }
+    const offsetPoint = selfOffsetPoint.subtract(viewOffsetPoint);
     return rectangle.copy().offsetByPoint(offsetPoint);
   }
   rectangleFromView(rectangle, view) {
     return view.rectangleInView(rectangle, this);
   }
   intrinsicContentSizeWithConstraints(constrainingHeight = 0, constrainingWidth = 0) {
+    const cacheKey = "h_" + constrainingHeight + "__w_" + constrainingWidth;
+    const cachedResult = this._intrinsicSizesCache[cacheKey];
+    if (cachedResult) {
+      return cachedResult;
+    }
     const result = new import_UIRectangle.UIRectangle(0, 0, 0, 0);
     if (this.rootView.forceIntrinsicSizeZero) {
       return result;
@@ -2094,6 +2146,7 @@ const _UIView = class extends import_UIObject.UIObject {
     }
     result.height = resultHeight;
     result.width = resultWidth;
+    this._intrinsicSizesCache[cacheKey] = result.copy();
     return result;
   }
   intrinsicContentWidth(constrainingHeight = 0) {
@@ -2110,6 +2163,14 @@ let UIView = _UIView;
 UIView._UIViewIndex = -1;
 UIView._viewsToLayout = [];
 UIView._pageScale = 1;
+UIView.resizeObserver = new ResizeObserver((entries, observer) => {
+  var _a;
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    const view = entry.target.UIView;
+    (_a = view == null ? void 0 : view.didResize) == null ? void 0 : _a.call(view, entry);
+  }
+});
 UIView._onWindowTouchMove = import_UIObject.nil;
 UIView._onWindowMouseMove = import_UIObject.nil;
 UIView._onWindowMouseup = import_UIObject.nil;