uicore-ts 1.1.377 → 1.1.378

package/compiledScripts/UIRectangle.d.ts

@@ -18,10 +18,11 @@ type UIGroupingWrapperFrameContext = {
     configuration: UIGroupingWrapperFrameConfiguration;
     views: UIView[];
     framesByView: Map<UIView, UIRectangle>;
+    childContexts: UIGroupingWrapperFrameContext[];
 };
 type UIGroupingWrapperFrameLayoutPass = {
     owner: UIView;
-    groupingContext?: UIGroupingWrapperFrameContext;
+    groupingContextStack: UIGroupingWrapperFrameContext[];
     requests: UIGroupingWrapperFrameContext[];
 };
 type UIGroupingWrapperFrameRecord = {
@@ -29,6 +30,7 @@ type UIGroupingWrapperFrameRecord = {
     wrapperHTMLElement: HTMLDivElement;
     coordinateSpaceHTMLElement: HTMLDivElement;
     views: UIView[];
+    childRecords: UIGroupingWrapperFrameRecord[];
     configuredClassNames: string[];
     configuredAttributeNames: string[];
     configuredStyleNames: string[];
@@ -176,10 +178,13 @@ export declare class UIRectangle extends UIObject {
     static _endGroupingWrapperFrameLayoutPass(owner: UIView): void;
     static _assignFrameToView(frame: UIRectangle, view: UIView): void;
     static _reconcileGroupingWrapperFrames(layoutPass: UIGroupingWrapperFrameLayoutPass): void;
+    static _viewsInGroupingWrapperFrameRecord(record: UIGroupingWrapperFrameRecord): UIView[];
+    static _reorderGroupingWrapperFrameElements(containerHTMLElement: HTMLElement, desiredElements: HTMLElement[]): void;
     static _newGroupingWrapperFrameRecord(): UIGroupingWrapperFrameRecord;
-    static _configureGroupingWrapperFrameRecord(record: UIGroupingWrapperFrameRecord, request: UIGroupingWrapperFrameContext, owner: UIView): void;
+    static _configureGroupingWrapperFrameRecord(record: UIGroupingWrapperFrameRecord, request: UIGroupingWrapperFrameContext, owner: UIView, containerHTMLElement: HTMLElement): void;
     static _topLevelHTMLElementForView(view: UIView): HTMLElement & import("./UIView").LooseObject;
     static _detachViewFromGroupingWrapperFrame(view: UIView): void;
+    static _removeEmptyGroupingWrapperFrameAncestors(wrapperHTMLElement: Element | null): void;
     toString(): string;
     get [Symbol.toStringTag](): string;
     IF(condition: boolean): UIRectangleConditionalChain<UIRectangle>;
@@ -194,6 +199,12 @@ export declare class UIRectangle extends UIObject {
     didChange(): void;
     _rectanglePointDidChange(): void;
 }
+declare global {
+    interface Array<T> {
+        /** Returns the smallest rectangle containing every point and rectangle in the array. */
+        boundingBox(this: Array<UIPoint | UIRectangle>): UIRectangle;
+    }
+}
 type RectangleChainMethods<TResult> = {
     [K in keyof UIRectangle as (K extends 'IF' | 'ELSE' | 'ELSE_IF' | 'ENDIF' ? never : K)]: UIRectangle[K] extends (...args: infer Args) => infer R ? R extends UIRectangle | UIRectangle[] ? (...args: Args) => UIRectangleConditionalChain<R, TResult> : never : never;
 };

package/compiledScripts/UIRectangle.js

@@ -731,28 +731,33 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     if (!layoutPass) {
       throw new Error("beginGroupingWrapperFrame() must be called during a UIView layout pass");
     }
-    if (layoutPass.groupingContext) {
-      throw new Error("Nested grouping wrapper frames are not supported");
-    }
-    layoutPass.groupingContext = {
+    const groupingContext = {
       configuration,
       views: [],
-      framesByView: /* @__PURE__ */ new Map()
+      framesByView: /* @__PURE__ */ new Map(),
+      childContexts: []
     };
+    const parentContext = layoutPass.groupingContextStack.lastElement;
+    if (parentContext) {
+      parentContext.childContexts.push(groupingContext);
+    } else {
+      layoutPass.requests.push(groupingContext);
+    }
+    layoutPass.groupingContextStack.push(groupingContext);
     return this;
   }
   endGroupingWrapperFrame() {
     const layoutPass = _UIRectangle._groupingWrapperFrameLayoutPasses.lastElement;
-    if (!(layoutPass == null ? void 0 : layoutPass.groupingContext)) {
+    if (!(layoutPass == null ? void 0 : layoutPass.groupingContextStack.length)) {
       throw new Error("endGroupingWrapperFrame() requires a matching beginGroupingWrapperFrame()");
     }
-    layoutPass.requests.push(layoutPass.groupingContext);
-    layoutPass.groupingContext = void 0;
+    layoutPass.groupingContextStack.pop();
     return this;
   }
   static _beginGroupingWrapperFrameLayoutPass(owner) {
     _UIRectangle._groupingWrapperFrameLayoutPasses.push({
       owner,
+      groupingContextStack: [],
       requests: []
     });
   }
@@ -761,9 +766,9 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     if (!layoutPass || layoutPass.owner !== owner) {
       throw new Error("Unbalanced grouping wrapper frame layout pass");
     }
-    if (layoutPass.groupingContext) {
+    if (layoutPass.groupingContextStack.length) {
       console.error("beginGroupingWrapperFrame() was not balanced with endGroupingWrapperFrame()", owner);
-      layoutPass.requests.push(layoutPass.groupingContext);
+      layoutPass.groupingContextStack.length = 0;
     }
     if (!import_UIView.UIView.isVirtualLayouting) {
       _UIRectangle._reconcileGroupingWrapperFrames(layoutPass);
@@ -772,14 +777,15 @@ const _UIRectangle = class extends import_UIObject.UIObject {
   static _assignFrameToView(frame, view) {
     var _a;
     view.frame = frame;
-    const groupingContext = (_a = _UIRectangle._groupingWrapperFrameLayoutPasses.lastElement) == null ? void 0 : _a.groupingContext;
-    if (!groupingContext) {
+    const groupingContexts = (_a = _UIRectangle._groupingWrapperFrameLayoutPasses.lastElement) == null ? void 0 : _a.groupingContextStack;
+    if (!(groupingContexts == null ? void 0 : groupingContexts.length)) {
       return;
     }
-    if (!groupingContext.framesByView.has(view)) {
-      groupingContext.views.push(view);
+    groupingContexts.forEach((groupingContext) => groupingContext.framesByView.set(view, frame.copy()));
+    const innermostContext = groupingContexts.lastElement;
+    if (!innermostContext.views.contains(view)) {
+      innermostContext.views.push(view);
     }
-    groupingContext.framesByView.set(view, frame.copy());
   }
   static _reconcileGroupingWrapperFrames(layoutPass) {
     var _a;
@@ -788,10 +794,13 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     const availablePreviousRecords = previousRecords.copy();
     const nextRecords = [];
     const groupedViews = /* @__PURE__ */ new Set();
-    layoutPass.requests.forEach((request, requestIndex) => {
-      var _a2;
-      if (!request.views.length) {
-        return;
+    const configuredIdentifiers = /* @__PURE__ */ new Set();
+    const validateContext = (request) => {
+      if (request.configuration.identifier) {
+        if (configuredIdentifiers.has(request.configuration.identifier)) {
+          throw new Error("Grouping wrapper frame identifiers must be unique within one layout owner");
+        }
+        configuredIdentifiers.add(request.configuration.identifier);
       }
       request.views.forEach((view) => {
         if (view.superview !== owner) {
@@ -802,51 +811,99 @@ const _UIRectangle = class extends import_UIObject.UIObject {
         }
         groupedViews.add(view);
       });
+      request.childContexts.forEach(validateContext);
+    };
+    layoutPass.requests.forEach(validateContext);
+    const recordForRequest = (request) => {
       let record;
       if (request.configuration.identifier) {
         record = availablePreviousRecords.find(
           (candidate) => candidate.identifier === request.configuration.identifier
         );
+      } else {
+        record = availablePreviousRecords.find((candidate) => !candidate.identifier);
       }
-      record = (_a2 = record != null ? record : availablePreviousRecords[requestIndex]) != null ? _a2 : availablePreviousRecords.firstElement;
       if (record) {
         availablePreviousRecords.removeElement(record);
       } else {
         record = _UIRectangle._newGroupingWrapperFrameRecord();
       }
-      _UIRectangle._configureGroupingWrapperFrameRecord(record, request, owner);
+      return record;
+    };
+    const reconcileContext = (request, containerHTMLElement) => {
+      if (!request.framesByView.size) {
+        return;
+      }
+      const record = recordForRequest(request);
+      _UIRectangle._configureGroupingWrapperFrameRecord(
+        record,
+        request,
+        owner,
+        containerHTMLElement
+      );
       nextRecords.push(record);
-    });
+      record.childRecords = request.childContexts.map(
+        (childContext) => reconcileContext(childContext, record.coordinateSpaceHTMLElement)
+      ).filter((childRecord) => !!childRecord);
+      const elementByView = /* @__PURE__ */ new Map();
+      record.views.forEach((view) => elementByView.set(view, view.viewHTMLElement));
+      record.childRecords.forEach((childRecord) => {
+        _UIRectangle._viewsInGroupingWrapperFrameRecord(childRecord).forEach(
+          (view) => elementByView.set(view, childRecord.wrapperHTMLElement)
+        );
+      });
+      _UIRectangle._reorderGroupingWrapperFrameElements(
+        record.coordinateSpaceHTMLElement,
+        owner.subviews.map((view) => elementByView.get(view)).filter(
+          (element) => !!element
+        )
+      );
+      return record;
+    };
+    const rootRecords = layoutPass.requests.map(
+      (request) => reconcileContext(request, owner.viewHTMLElement)
+    ).filter((record) => !!record);
     availablePreviousRecords.forEach((record) => {
       record.views.forEach((view) => {
-        var _a2;
         if (view.viewHTMLElement.parentElement === record.coordinateSpaceHTMLElement) {
-          (_a2 = record.wrapperHTMLElement.parentElement) == null ? void 0 : _a2.insertBefore(
-            view.viewHTMLElement,
-            record.wrapperHTMLElement
-          );
+          owner.viewHTMLElement.appendChild(view.viewHTMLElement);
         }
       });
       record.wrapperHTMLElement.remove();
     });
-    const recordByView = /* @__PURE__ */ new Map();
-    nextRecords.forEach((record) => record.views.forEach((view) => recordByView.set(view, record)));
+    const rootRecordByView = /* @__PURE__ */ new Map();
+    rootRecords.forEach((record) => {
+      _UIRectangle._viewsInGroupingWrapperFrameRecord(record).forEach(
+        (view) => rootRecordByView.set(view, record)
+      );
+    });
     const desiredTopLevelElements = [];
     owner.subviews.forEach((view) => {
       var _a2;
-      const record = recordByView.get(view);
+      const record = rootRecordByView.get(view);
       const element = (_a2 = record == null ? void 0 : record.wrapperHTMLElement) != null ? _a2 : view.viewHTMLElement;
       if (!desiredTopLevelElements.contains(element)) {
         desiredTopLevelElements.push(element);
       }
     });
-    const currentTopLevelElements = Array.from(owner.viewHTMLElement.children).filter(
-      (element) => desiredTopLevelElements.contains(element)
+    _UIRectangle._reorderGroupingWrapperFrameElements(owner.viewHTMLElement, desiredTopLevelElements);
+    _UIRectangle._groupingWrapperFrameRecordsByOwner.set(owner, nextRecords);
+  }
+  static _viewsInGroupingWrapperFrameRecord(record) {
+    return record.views.concat(record.childRecords.flatMap(
+      (childRecord) => _UIRectangle._viewsInGroupingWrapperFrameRecord(childRecord)
+    ));
+  }
+  static _reorderGroupingWrapperFrameElements(containerHTMLElement, desiredElements) {
+    const uniqueDesiredElements = desiredElements.filter(
+      (element, index) => desiredElements.indexOf(element) === index
+    );
+    const currentElements = Array.from(containerHTMLElement.children).filter(
+      (element) => uniqueDesiredElements.contains(element)
     );
-    if (!currentTopLevelElements.isEqualToArray(desiredTopLevelElements)) {
-      desiredTopLevelElements.forEach((element) => owner.viewHTMLElement.appendChild(element));
+    if (!currentElements.isEqualToArray(uniqueDesiredElements) || uniqueDesiredElements.some((element) => element.parentElement !== containerHTMLElement)) {
+      uniqueDesiredElements.forEach((element) => containerHTMLElement.appendChild(element));
     }
-    _UIRectangle._groupingWrapperFrameRecordsByOwner.set(owner, nextRecords);
   }
   static _newGroupingWrapperFrameRecord() {
     const wrapperHTMLElement = document.createElement("div");
@@ -860,12 +917,13 @@ const _UIRectangle = class extends import_UIObject.UIObject {
       wrapperHTMLElement,
       coordinateSpaceHTMLElement,
       views: [],
+      childRecords: [],
       configuredClassNames: [],
       configuredAttributeNames: [],
       configuredStyleNames: []
     };
   }
-  static _configureGroupingWrapperFrameRecord(record, request, owner) {
+  static _configureGroupingWrapperFrameRecord(record, request, owner, containerHTMLElement) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const wrapperHTMLElement = record.wrapperHTMLElement;
     record.configuredClassNames.forEach((className) => wrapperHTMLElement.classList.remove(className));
@@ -893,7 +951,7 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     } else {
       wrapperHTMLElement.removeAttribute("data-uicore-grouping-wrapper-frame-identifier");
     }
-    const assignedFrames = request.views.map((view) => request.framesByView.get(view));
+    const assignedFrames = Array.from(request.framesByView.values());
     const framePoints = [];
     assignedFrames.forEach((frame) => {
       framePoints.push(frame.min);
@@ -907,8 +965,8 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     wrapperHTMLElement.style.width = wrapperFrame.width + "px";
     wrapperHTMLElement.style.height = wrapperFrame.height + "px";
     wrapperHTMLElement.style.boxSizing = "border-box";
-    if (wrapperHTMLElement.parentElement !== owner.viewHTMLElement) {
-      owner.viewHTMLElement.appendChild(wrapperHTMLElement);
+    if (wrapperHTMLElement.parentElement !== containerHTMLElement) {
+      containerHTMLElement.appendChild(wrapperHTMLElement);
     }
     const coordinateSpaceHTMLElement = record.coordinateSpaceHTMLElement;
     coordinateSpaceHTMLElement.classList.add("UICore_UIGroupingWrapperFrame_CoordinateSpace");
@@ -918,11 +976,6 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     coordinateSpaceHTMLElement.style.top = -wrapperFrame.y - (wrapperHTMLElement.clientTop || 0) + "px";
     coordinateSpaceHTMLElement.style.width = owner.bounds.width + "px";
     coordinateSpaceHTMLElement.style.height = owner.bounds.height + "px";
-    const currentViewElements = Array.from(coordinateSpaceHTMLElement.children);
-    const desiredViewElements = request.views.map((view) => view.viewHTMLElement);
-    if (!currentViewElements.isEqualToArray(desiredViewElements)) {
-      desiredViewElements.forEach((element) => coordinateSpaceHTMLElement.appendChild(element));
-    }
   }
   static _topLevelHTMLElementForView(view) {
     var _a;
@@ -933,15 +986,29 @@ const _UIRectangle = class extends import_UIObject.UIObject {
     return element;
   }
   static _detachViewFromGroupingWrapperFrame(view) {
-    var _a, _b;
+    var _a;
     const superviewHTMLElement = (_a = view.superview) == null ? void 0 : _a.viewHTMLElement;
     if (!superviewHTMLElement || view.viewHTMLElement.parentElement === superviewHTMLElement) {
       return;
     }
     const wrapperHTMLElement = view.viewHTMLElement.closest("[data-uicore-grouping-wrapper-frame]");
     superviewHTMLElement.appendChild(view.viewHTMLElement);
-    if (wrapperHTMLElement && !((_b = wrapperHTMLElement.querySelector("[data-uicore-grouping-wrapper-coordinate-space]")) == null ? void 0 : _b.children.length)) {
+    _UIRectangle._removeEmptyGroupingWrapperFrameAncestors(wrapperHTMLElement);
+  }
+  static _removeEmptyGroupingWrapperFrameAncestors(wrapperHTMLElement) {
+    var _a, _b;
+    while (wrapperHTMLElement) {
+      const parentWrapperHTMLElement = (_b = (_a = wrapperHTMLElement.parentElement) == null ? void 0 : _a.closest(
+        "[data-uicore-grouping-wrapper-frame]"
+      )) != null ? _b : null;
+      const coordinateSpaceHTMLElement = wrapperHTMLElement.querySelector(
+        ":scope > [data-uicore-grouping-wrapper-coordinate-space]"
+      );
+      if (coordinateSpaceHTMLElement == null ? void 0 : coordinateSpaceHTMLElement.children.length) {
+        return;
+      }
       wrapperHTMLElement.remove();
+      wrapperHTMLElement = parentWrapperHTMLElement;
     }
   }
   toString() {
@@ -1013,6 +1080,16 @@ const _UIRectangle = class extends import_UIObject.UIObject {
 let UIRectangle = _UIRectangle;
 UIRectangle._groupingWrapperFrameLayoutPasses = [];
 UIRectangle._groupingWrapperFrameRecordsByOwner = /* @__PURE__ */ new WeakMap();
+if (!("boundingBox" in Array.prototype)) {
+  Object.defineProperty(Array.prototype, "boundingBox", {
+    configurable: import_UIObject.YES,
+    enumerable: import_UIObject.NO,
+    writable: import_UIObject.YES,
+    value: function() {
+      return UIRectangle.boundingBoxForRectanglesAndPoints(this);
+    }
+  });
+}
 class UIRectangleConditionalBlock {
   constructor(initialResult, condition) {
     this._stack = [{