@itwin/core-backend 5.6.0-dev.7 → 5.7.0-dev.1

package/lib/esm/test/annotations/TextAnnotation.test.js

@@ -811,9 +811,9 @@ describe("AnnotationTextStyle", () => {
             }
             expect(migratedStyle.settings.leader.terminatorShape).to.not.be.undefined;
         });
-        it("should return same data when version is 1.0.1", () => {
+        it("should return same data when version is 1.0.2", () => {
             const styleData = {
-                version: "1.0.1",
+                version: "1.0.2",
                 data: TextStyleSettings.defaultProps
             };
             const migratedStyle = makeStyle({
@@ -829,10 +829,35 @@ describe("AnnotationTextStyle", () => {
                 expect(parsedJson.data).to.deep.equal(styleData.data);
             }
         });
+        it("should migrate text style settings to 1.0.2", () => {
+            const oldStyleData = {
+                ...TextStyleSettings.defaultProps,
+                textHeight: 0.5,
+                margins: {
+                    left: 0.25,
+                    right: 0.25,
+                    top: 0.25,
+                    bottom: 0.25
+                }
+            };
+            const migratedStyle = makeStyle({
+                settings: JSON.stringify({
+                    version: "1.0.1",
+                    data: oldStyleData
+                }),
+            });
+            const jsonStyleData = migratedStyle.toJSON();
+            if (jsonStyleData.settings) {
+                const jsonVersion = JSON.parse(jsonStyleData.settings).version;
+                expect(jsonVersion).to.equal(TEXT_STYLE_SETTINGS_JSON_VERSION);
+            }
+            // Margins should be converted back to margin factors i.e 0.25/0.5=0.5
+            expect(migratedStyle.settings.margins).to.deep.equal({ left: 0.5, right: 0.5, top: 0.5, bottom: 0.5 });
+        });
         it("should return defaultProps when styleData is unrecognized", () => {
             const textStyle = makeStyle({
                 settings: JSON.stringify({
-                    version: "1.0.1",
+                    version: "1.0.2",
                     data: { invalid: "data" }
                 }),
             });
@@ -891,6 +916,7 @@ describe("appendTextAnnotationGeometry", () => {
     let seedCategoryId;
     let seedStyleId;
     let seedStyleId2;
+    let annotationRenderPriority;
     before(async () => {
         imodel = await createIModel("DefaultTextStyle");
         const jobSubjectId = createJobSubjectElement(imodel, "Job").insert();
@@ -908,8 +934,9 @@ describe("appendTextAnnotationGeometry", () => {
         seedCategoryId = category;
         seedStyleId = styleId;
         seedStyleId2 = differentStyleId;
+        annotationRenderPriority = { annotation: 100, annotationLabels: 110 };
     });
-    function runAppendTextAnnotationGeometry(annotation, styleId, scaleFactor = 1) {
+    function runAppendTextAnnotationGeometry(annotation, styleId, scaleFactor = 1, renderPriority) {
         const builder = new MockBuilder();
         const resolver = new TextStyleResolver({
             textBlock: annotation.textBlock,
@@ -928,6 +955,7 @@ describe("appendTextAnnotationGeometry", () => {
             scaleFactor,
             builder,
             categoryId: seedCategoryId,
+            renderPriority
         });
         expect(result).to.be.true;
         return builder;
@@ -977,6 +1005,13 @@ describe("appendTextAnnotationGeometry", () => {
         expect(builder1.geometries).to.not.deep.equal(builder2.geometries);
         expect(builder1.textStrings).to.not.deep.equal(builder2.textStrings);
     });
+    it("applies render priority correctly", () => {
+        const annotation = createAnnotation();
+        const builder = runAppendTextAnnotationGeometry(annotation, seedStyleId, 1, annotationRenderPriority);
+        expect(builder.params.length).to.equal(2);
+        expect(builder.params[0].elmPriority).to.equal(annotationRenderPriority.annotationLabels);
+        expect(builder.params[1].elmPriority).to.equal(annotationRenderPriority.annotation);
+    });
     it("accounts for style overrides in the text", () => {
         const block = TextBlock.create();
         block.styleOverrides = { margins: { left: 0, right: 1, top: 2, bottom: 3 } };