@contrail/documents 2.2.0 → 2.2.1-alpha.ed045c5

package/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to `@contrail/documents` are documented here.
 Format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.1] - 2026-09-15
+
+### Changed
+
+- The DESIGN-150 annotation-row collapse is reverted, to go out in a later release alongside the rest of the change. `calculateAnnotationHeight` returns its flat `fontSize + ANNOTATION_PADDING_Y` minimum again whether or not the row draws anything, and `getComponentSize` reserves a flat 18px row in every item card's height.
+
+### Removed
+
+- `ItemComponentService.isAnnotationRowEmpty` and `ItemComponentService.getAnnotationRowHeight`, both added in 2.2.0, and the optional `annotations` parameter they were reached through on `DocumentElementFactory.getBoundingClientRect` and `getSize`. Removed under a patch because 2.2.0 published hours earlier and nothing had consumed them: the canvas renderer mirrors the predicate privately rather than importing it, and every `contrail-apps` app pins this package on its 1.x range.
+
 ## [2.2.0] - 2026-09-15
 
 ### Added

package/lib/components/item-component.service.d.ts

@@ -15,8 +15,6 @@ export interface ScaledItemCardResult {
 export declare class ItemComponentService {
     static isItemComponent(element: DocumentElement): boolean;
     static isThumbnailOnlyComponent(element: DocumentElement): boolean;
-    static isAnnotationRowEmpty(annotationElement: DocumentElement, annotations?: any[]): boolean;
-    static getAnnotationRowHeight(annotationElement: DocumentElement, annotations?: any[], width?: number): number;
     static updateSizeAndPosition(propertyElements: any[], componentElement: DocumentElement, annotatedElements?: any[]): any;
     private static getYMargin;
     private static calculateAnnotationHeight;

package/lib/components/item-component.service.js

@@ -17,30 +17,6 @@ class ItemComponentService {
         const imageElement = element.elements.find((e) => e.type == 'image');
         return (!annotationElement || annotationElement.isHidden) && imageElement && !imageElement.isHidden;
     }
-    static isAnnotationRowEmpty(annotationElement, annotations = []) {
-        if (annotationElement === null || annotationElement === void 0 ? void 0 : annotationElement.isHidden) {
-            return true;
-        }
-        return !(annotations === null || annotations === void 0 ? void 0 : annotations.some((annotation) => (annotation === null || annotation === void 0 ? void 0 : annotation.category) === 'property'));
-    }
-    static getAnnotationRowHeight(annotationElement, annotations = [], width = exports.DEFAULT_THUMBNAIL_WIDTH) {
-        var _a, _b;
-        if (this.isAnnotationRowEmpty(annotationElement, annotations)) {
-            return 0;
-        }
-        const annotationSize = ((_b = (_a = annotationElement === null || annotationElement === void 0 ? void 0 : annotationElement.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.size) || document_element_constants_1.ANNOTATION_IMG_SIZE;
-        const propertyAnnotations = annotations.filter((annotation) => (annotation === null || annotation === void 0 ? void 0 : annotation.category) === 'property');
-        let height = annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
-        let count = 0;
-        propertyAnnotations.forEach(() => {
-            if ((count + 1) * annotationSize * 1.25 > width) {
-                count = 0;
-                height = height + annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
-            }
-            count++;
-        });
-        return height;
-    }
     static updateSizeAndPosition(propertyElements, componentElement, annotatedElements = []) {
         var _a, _b, _c, _d;
         const newElements = [];
@@ -88,11 +64,9 @@ class ItemComponentService {
                     lastYPosition = element.position.y;
                 }
                 const annotationHeight = this.calculateAnnotationHeight(element, componentElement, width, annotatedElements);
+                lastYPosition = lastYPosition + annotationHeight;
                 if (annotationHeight === 0 && index === 0) {
-                    lastYPosition = 0;
-                }
-                else {
-                    lastYPosition = lastYPosition + annotationHeight;
+                    lastYPosition = lastYPosition + document_element_constants_1.ANNOTATION_IMG_SIZE;
                 }
             }
             element.size.width = width;
@@ -138,8 +112,28 @@ class ItemComponentService {
         return marginY;
     }
     static calculateAnnotationHeight(element, componentElement, width, annotatedElements = []) {
+        var _a, _b;
+        const annotationSize = ((_b = (_a = element.style) === null || _a === void 0 ? void 0 : _a.font) === null || _b === void 0 ? void 0 : _b.size) || document_element_constants_1.ANNOTATION_IMG_SIZE;
+        let height = annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
+        let xPos = 0;
         const annotatedElement = annotatedElements.find((elem) => elem.id === componentElement.id);
-        return this.getAnnotationRowHeight(element, annotatedElement === null || annotatedElement === void 0 ? void 0 : annotatedElement.annotations, width);
+        if (!annotatedElement || element.isHidden) {
+            return height;
+        }
+        const annotations = annotatedElement.annotations.filter((annotation) => annotation.category === 'property');
+        if (annotations.length > 0) {
+            let count = 0;
+            annotations === null || annotations === void 0 ? void 0 : annotations.forEach((annotation) => {
+                if ((count + 1) * annotationSize * 1.25 > width) {
+                    count = 0;
+                    xPos = -width * 0.5;
+                    height = height + annotationSize + document_element_constants_1.ANNOTATION_PADDING_Y;
+                }
+                xPos = xPos + annotationSize * 1.25;
+                count++;
+            });
+        }
+        return height;
     }
     static getImageElement(element) {
         var _a;

package/lib/document-element-constants.d.ts

@@ -1,8 +1,5 @@
 export declare const ANNOTATION_IMG_SIZE = 15;
 export declare const ANNOTATION_PADDING_Y = 8;
-export declare const COMPONENT_PADDING_X = 8;
-export declare const COMPONENT_PADDING_T = 18;
-export declare const COMPONENT_PADDING_B = 8;
 export declare const COLOR_PADDING = 5;
 export declare const COLOR_FONT_SIZE = 8;
 export declare const COLOR_WIDTH = 140;

package/lib/document-element-constants.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COLOR_WIDTH = exports.COLOR_FONT_SIZE = exports.COLOR_PADDING = exports.COMPONENT_PADDING_B = exports.COMPONENT_PADDING_T = exports.COMPONENT_PADDING_X = exports.ANNOTATION_PADDING_Y = exports.ANNOTATION_IMG_SIZE = void 0;
+exports.COLOR_WIDTH = exports.COLOR_FONT_SIZE = exports.COLOR_PADDING = exports.ANNOTATION_PADDING_Y = exports.ANNOTATION_IMG_SIZE = void 0;
 exports.ANNOTATION_IMG_SIZE = 15;
 exports.ANNOTATION_PADDING_Y = 8;
-exports.COMPONENT_PADDING_X = 8;
-exports.COMPONENT_PADDING_T = 18;
-exports.COMPONENT_PADDING_B = 8;
 exports.COLOR_PADDING = 5;
 exports.COLOR_FONT_SIZE = 8;
 exports.COLOR_WIDTH = 140;

package/lib/document-element-factory.d.ts

@@ -16,7 +16,7 @@ export declare class DocumentElementFactory {
         newElements: DocumentElement[];
     };
     static isMask(element: DocumentElement): boolean;
-    static getBoundingClientRect(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement, annotations?: any[]): {
+    static getBoundingClientRect(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement): {
         x: any;
         y: any;
         width: any;
@@ -25,6 +25,5 @@ export declare class DocumentElementFactory {
     private static getPosition;
     private static getSize;
     private static getComponentSize;
-    private static getComponentPaddingTop;
     static getLineDefinition(documentElement: DocumentElement, startElement?: DocumentElement, endElement?: DocumentElement): LineDefinition;
 }

package/lib/document-element-factory.js

@@ -8,7 +8,6 @@ const components_1 = require("./components/components");
 const document_element_property_binding_handler_1 = require("./document-element-property-binding-handler");
 const document_table_1 = require("@contrail/document-table");
 const document_element_constants_1 = require("./document-element-constants");
-const item_component_service_1 = require("./components/item-component.service");
 const callout_1 = require("./util/callout/callout");
 class DocumentElementFactory {
     static initNewElement(type) {
@@ -207,9 +206,9 @@ class DocumentElementFactory {
         var _a;
         return ['rectangle', 'circle'].indexOf(element === null || element === void 0 ? void 0 : element.type) !== -1 && ((_a = element === null || element === void 0 ? void 0 : element.elementIds) === null || _a === void 0 ? void 0 : _a.length) > 0;
     }
-    static getBoundingClientRect(documentElement, startElement, endElement, annotations) {
+    static getBoundingClientRect(documentElement, startElement, endElement) {
         const { x, y } = this.getPosition(documentElement, startElement, endElement);
-        const { width, height } = this.getSize(documentElement, startElement, endElement, annotations);
+        const { width, height } = this.getSize(documentElement, startElement, endElement);
         return {
             x,
             y,
@@ -236,7 +235,7 @@ class DocumentElementFactory {
                 (documentElement.type === 'component' && ((_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _b === void 0 ? void 0 : _b.item) ? 18 : 0),
         };
     }
-    static getSize(documentElement, startElement, endElement, annotations) {
+    static getSize(documentElement, startElement, endElement) {
         if (documentElement.type === 'line' || documentElement.type === 'callout') {
             const lineDefinition = this.getLineDefinition(documentElement, startElement, endElement);
             if (!lineDefinition) {
@@ -247,12 +246,10 @@ class DocumentElementFactory {
                 height: Math.abs(lineDefinition.y1 - lineDefinition.y2),
             };
         }
-        return documentElement.type === 'component'
-            ? this.getComponentSize(documentElement, annotations)
-            : documentElement.size;
+        return documentElement.type === 'component' ? this.getComponentSize(documentElement) : documentElement.size;
     }
-    static getComponentSize(documentElement, annotations) {
-        var _a, _b, _c, _d, _e;
+    static getComponentSize(documentElement) {
+        var _a, _b, _c, _d, _e, _f;
         let width = 0, height = 0, lastY = null;
         for (let i = 0; i < ((_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.elements) === null || _a === void 0 ? void 0 : _a.length); i++) {
             const element = documentElement.elements[i];
@@ -266,26 +263,11 @@ class DocumentElementFactory {
                 lastY = y + renderedHeight;
             }
         }
-        if (!((_e = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _e === void 0 ? void 0 : _e.item)) {
-            return { width, height };
-        }
         return {
-            width: width + document_element_constants_1.COMPONENT_PADDING_X * 2,
-            height: height + this.getComponentPaddingTop(documentElement, annotations) + document_element_constants_1.COMPONENT_PADDING_B,
+            width: width + (((_e = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _e === void 0 ? void 0 : _e.item) ? 8 + 8 : 0),
+            height: height + (((_f = documentElement === null || documentElement === void 0 ? void 0 : documentElement.modelBindings) === null || _f === void 0 ? void 0 : _f.item) ? 18 + 8 : 0),
         };
     }
-    static getComponentPaddingTop(documentElement, annotations) {
-        var _a, _b, _c, _d, _e;
-        if (!annotations) {
-            return document_element_constants_1.COMPONENT_PADDING_T;
-        }
-        const annotationElement = (_a = documentElement === null || documentElement === void 0 ? void 0 : documentElement.elements) === null || _a === void 0 ? void 0 : _a.find((element) => element.type === 'annotation');
-        if (!item_component_service_1.ItemComponentService.isAnnotationRowEmpty(annotationElement, annotations)) {
-            return document_element_constants_1.COMPONENT_PADDING_T;
-        }
-        const contentOffsetY = (_e = (_d = (_c = (_b = documentElement === null || documentElement === void 0 ? void 0 : documentElement.elements) === null || _b === void 0 ? void 0 : _b.find((element) => element.type === 'image')) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.y) !== null && _e !== void 0 ? _e : 0;
-        return -contentOffsetY;
-    }
     static getLineDefinition(documentElement, startElement, endElement) {
         var _a, _b;
         if (documentElement.type === 'line')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/documents",
-  "version": "2.2.0",
+  "version": "2.2.1-alpha.ed045c5",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",