@itwin/core-backend 5.13.0-dev.9 → 5.14.0-dev.1

package/lib/esm/annotations/LeaderGeometry.js

@@ -50,51 +50,76 @@ export function appendLeadersToBuilder(builder, leaders, layout, transform, para
             params.lineColor = ColorDef.fromJSON(effectiveColor);
             result = result && builder.appendGeometryParamsChange(params);
         }
-        const attachmentPoint = computeLeaderAttachmentPoint(leader, frameCurve, layout, transform);
-        if (!attachmentPoint)
-            return false;
-        // Leader line geometry
-        const leaderLinePoints = [];
-        leaderLinePoints.push(leader.startPoint);
-        leader.intermediatePoints?.forEach((point) => {
-            leaderLinePoints.push(point);
-        });
-        if (leaderStyle.leader.wantElbow) {
-            const elbowLength = leaderStyle.leader.elbowLength * scaledBlockTextHeight;
-            const elbowDirection = computeElbowDirection(attachmentPoint, frameCurve, elbowLength);
-            if (elbowDirection)
-                leaderLinePoints.push(attachmentPoint.plusScaled(elbowDirection, elbowLength));
+        if (leaderStyle.leader.showLeaders) {
+            const attachmentPoint = computeLeaderAttachmentPoint(leader, frameCurve, layout, transform);
+            if (!attachmentPoint)
+                return false;
+            let elbowPoint;
+            if (leaderStyle.leader.wantElbow) {
+                const elbowLength = leaderStyle.leader.elbowLength * scaledBlockTextHeight;
+                const elbowDirection = computeElbowDirection(attachmentPoint, frameCurve, elbowLength);
+                if (elbowDirection)
+                    elbowPoint = attachmentPoint.plusScaled(elbowDirection, elbowLength);
+            }
+            // Leader line geometry
+            const leaderLinePoints = [];
+            const terminatorWidth = leaderStyle.leader.terminatorWidthFactor * scaledBlockTextHeight;
+            let leaderStartPoint = leader.startPoint;
+            if (leaderStyle.leader.showTargetPoint && leaderStyle.leader.targetPointOffsetFactor !== 0) {
+                const offset = leaderStyle.leader.targetPointOffsetFactor * scaledBlockTextHeight;
+                let firstSegmentEnd = leader.intermediatePoints?.[0];
+                // If there are no intermediate points, offset along the elbow segment when present.
+                if (!firstSegmentEnd && elbowPoint)
+                    firstSegmentEnd = elbowPoint;
+                if (!firstSegmentEnd)
+                    firstSegmentEnd = attachmentPoint;
+                // Offset the target-point marker away from the start point along the first leader segment.
+                // Clamp the added distance so negative values resolve to 0 and large values cannot overshoot the first vertex.
+                // When terminators are hidden, use the text height as a conservative guard distance; otherwise use the terminator width.
+                const firstSegmentLength = leader.startPoint.distance(firstSegmentEnd);
+                const clampDistance = leaderStyle.leader.showTerminators ? terminatorWidth : scaledBlockTextHeight;
+                const maxOffset = Math.max(0, firstSegmentLength - clampDistance);
+                const clampedOffset = Math.min(Math.max(offset, 0), maxOffset);
+                const leaderDirection = Vector3d.createStartEnd(leader.startPoint, firstSegmentEnd).normalize();
+                if (leaderDirection)
+                    leaderStartPoint = leader.startPoint.plusScaled(leaderDirection, clampedOffset);
+            }
+            leaderLinePoints.push(leaderStartPoint);
+            leader.intermediatePoints?.forEach((point) => {
+                leaderLinePoints.push(point);
+            });
+            if (elbowPoint)
+                leaderLinePoints.push(elbowPoint);
+            leaderLinePoints.push(attachmentPoint);
+            const terminatorDirection = Vector3d.createStartEnd(leaderLinePoints[0], leaderLinePoints[1]).normalize();
+            // Truncate the first segment of the leader lines to account for the arrowhead size when closedArrow (hollow triangle) terminatorShape is used.
+            if (leaderStyle.leader.showTerminators && leaderStyle.leader.terminatorShape === "closedArrow") {
+                if (terminatorDirection)
+                    leaderLinePoints[0] = leaderLinePoints[0].plusScaled(terminatorDirection, terminatorWidth);
+            }
+            result = result && builder.appendGeometryQuery(LineString3d.create(leaderLinePoints));
+            if (leaderStyle.leader.terminatorShape !== "none" && leaderStyle.leader.showTerminators) {
+                // Terminator geometry
+                if (!terminatorDirection)
+                    continue; // Assuming leaders without terminators is a valid case.
+                result = result && createTerminatorGeometry({ builder, point: leaderStartPoint, dir: terminatorDirection, params, textStyleSettings: leaderStyle, textHeight: scaledBlockTextHeight });
+            }
         }
-        leaderLinePoints.push(attachmentPoint);
-        const terminatorDirection = Vector3d.createStartEnd(leaderLinePoints[0], leaderLinePoints[1]).normalize();
-        const terminatorWidth = leaderStyle.leader.terminatorWidthFactor * scaledBlockTextHeight;
-        // Truncate the first segment of the leader lines to account for the arrowhead size when closedArrow (hollow triangle) terminatorShape is used.
-        if (leaderStyle.leader.terminatorShape === "closedArrow") {
-            if (terminatorDirection)
-                leaderLinePoints[0] = leaderLinePoints[0].plusScaled(terminatorDirection, terminatorWidth);
-        }
-        result = result && builder.appendGeometryQuery(LineString3d.create(leaderLinePoints));
-        if (leaderStyle.leader.terminatorShape !== "none") {
-            // Terminator geometry
-            if (!terminatorDirection)
-                continue; // Assuming leaders without terminators is a valid case.
-            result = result && createTerminatorGeometry(builder, leader.startPoint, terminatorDirection, params, leaderStyle, scaledBlockTextHeight);
+        if (leaderStyle.leader.showTargetPoint) {
+            result = result && createTerminatorGeometry({ builder, point: leader.startPoint, dir: Vector3d.unitX(), params, textStyleSettings: leaderStyle, textHeight: scaledBlockTextHeight, isArrow: false });
         }
     }
     return result;
 }
 /**
  * Creates the geometry for a terminator at the end of a leader line.
- * @param builder The geometry builder to append the terminator geometry to.
- * @param point The starting point of the leader line.
- * @param dir The direction vector of the leader line.
- * @param params The geometry parameters to use for the terminator.
- * @param textStyleSettings The text style settings to use for the terminator.
- * @param textHeight The height of the text block.
+ * @param args Describes the terminator geometry to create. See [[CreateTerminatorGeometryArgs]].
  * @returns True if the geometry was successfully created, false otherwise.
  * @beta
  */
-export function createTerminatorGeometry(builder, point, dir, params, textStyleSettings, textHeight) {
+export function createTerminatorGeometry(args) {
+    const { builder, point, dir, params, textStyleSettings, textHeight } = args;
+    const isArrow = args.isArrow ?? true;
     let result = true;
     const termY = dir.unitCrossProduct(Vector3d.unitZ());
     if (!termY)
@@ -115,7 +140,8 @@ export function createTerminatorGeometry(builder, point, dir, params, textStyleS
         const finalContent = useLoop ? Loop.create(content) : content;
         result = result && builder.appendGeometryQuery(finalContent);
     };
-    switch (textStyleSettings.leader.terminatorShape) {
+    const shape = isArrow ? textStyleSettings.leader.terminatorShape : textStyleSettings.leader.targetPointShape;
+    switch (shape) {
         case "openArrow": {
             const lineString = LineString3d.create([point1, point, point2]);
             addGeometry(lineString);
@@ -154,6 +180,48 @@ export function createTerminatorGeometry(builder, point, dir, params, textStyleS
             addGeometry(slashLine);
             break;
         }
+        case "cross": {
+            // Diagonal "X" centered on the point, axis-aligned (horizontal upright).
+            const halfSize = terminatorHalfHeight;
+            addGeometry(LineSegment3d.create(point.plusXYZ(-halfSize, -halfSize), point.plusXYZ(halfSize, halfSize)));
+            addGeometry(LineSegment3d.create(point.plusXYZ(-halfSize, halfSize), point.plusXYZ(halfSize, -halfSize)));
+            break;
+        }
+        case "plus": {
+            // Orthogonal "+" centered on the point, axis-aligned (horizontal upright).
+            const halfSize = terminatorHalfHeight;
+            addGeometry(LineSegment3d.create(point.plusXYZ(-halfSize, 0), point.plusXYZ(halfSize, 0)));
+            addGeometry(LineSegment3d.create(point.plusXYZ(0, -halfSize), point.plusXYZ(0, halfSize)));
+            break;
+        }
+        case "square": {
+            // Axis-aligned square centered on the point (horizontal upright).
+            const halfSize = terminatorHalfHeight;
+            const square = LineString3d.create([
+                point.plusXYZ(-halfSize, -halfSize),
+                point.plusXYZ(halfSize, -halfSize),
+                point.plusXYZ(halfSize, halfSize),
+                point.plusXYZ(-halfSize, halfSize),
+                point.plusXYZ(-halfSize, -halfSize),
+            ]);
+            addGeometry(square);
+            break;
+        }
+        case "rectangle": {
+            // Axis-aligned rectangle centered on the point (horizontal upright).
+            // Respect the configured width/height factors directly.
+            const halfWidth = terminatorWidth / 2;
+            const halfHeight = terminatorHalfHeight;
+            const rectangle = LineString3d.create([
+                point.plusXYZ(-halfWidth, -halfHeight),
+                point.plusXYZ(halfWidth, -halfHeight),
+                point.plusXYZ(halfWidth, halfHeight),
+                point.plusXYZ(-halfWidth, halfHeight),
+                point.plusXYZ(-halfWidth, -halfHeight),
+            ]);
+            addGeometry(rectangle);
+            break;
+        }
     }
     return result;
 }

package/lib/esm/annotations/LeaderGeometry.js.map

@@ -1 +1 @@
-{"version":3,"file":"LeaderGeometry.js","sourceRoot":"","sources":["../../../src/annotations/LeaderGeometry.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ElementGeometry\r\n */\r\n\r\nimport { ColorDef, ElementGeometry, FillDisplay, GeometryParams, TextAnnotationLeader, TextFrameStyleProps, TextStyleColor, TextStyleSettings } from \"@itwin/core-common\";\r\nimport { Angle, Arc3d, CurveCurve, CurvePrimitive, LineSegment3d, LineString3d, Loop, Path, Point3d, Transform, Vector3d } from \"@itwin/core-geometry\";\r\nimport { computeFrame } from \"./FrameGeometry\";\r\nimport { TextBlockLayout, TextStyleResolver } from \"./TextBlockLayout\";\r\n\r\n/**\r\n * Constructs and appends leader lines and their terminators to the provided geometry builder for a text annotation.\r\n *\r\n * This function processes an array of `TextAnnotationLeader` objects, computes their attachment points\r\n * relative to a text frame (or a default rectangular frame if none is provided), and appends the leader\r\n * line and terminator geometry to the builder. It also applies color overrides if specified\r\n * in the leader's style overrides.\r\n *\r\n * @param builder - The geometry builder to which the leader geometries will be appended.\r\n * @param leaders - An array of leader properties.\r\n * @param layout - The layout information for the text block, including its range.\r\n * @param transform - The transform to apply to the frame and leader geometry.\r\n * @param params - The geometry parameters, such as color, to use for the leader lines.\r\n * @param textStyleResolver - Resolver for text styles, used to obtain leader styles.\r\n * @param scaleFactor - The scale factor to apply to leader dimensions, usually comes from the `scaleFactor` of a [[Drawing]] element.\r\n * @returns `true` if at least one leader with a terminator was successfully appended; otherwise, `false`.\r\n * @beta\r\n */\r\nexport function appendLeadersToBuilder(builder: ElementGeometry.Builder, leaders: TextAnnotationLeader[], layout: TextBlockLayout, transform: Transform, params: GeometryParams, textStyleResolver: TextStyleResolver, scaleFactor: number): boolean {\r\n  let result = true;\r\n  const scaledBlockTextHeight = textStyleResolver.blockSettings.textHeight * scaleFactor;\r\n  let frame: TextFrameStyleProps | undefined = textStyleResolver.blockSettings.frame;\r\n\r\n  // If there is no frame, use a rectangular frame to compute the attachmentPoints for leaders.\r\n  if (frame === undefined || frame.shape === \"none\") {\r\n    frame = { shape: \"rectangle\" }\r\n  }\r\n  if (frame.shape === undefined || frame.shape === \"none\") return false;\r\n  const frameCurve = computeFrame({ frame: frame.shape, range: layout.range, transform });\r\n\r\n  for (const leader of leaders) {\r\n    const leaderStyle = textStyleResolver.resolveSettings(leader.styleOverrides ?? {}, true);\r\n\r\n    let effectiveColor: TextStyleColor = \"subcategory\";\r\n\r\n    if (leaderStyle.leader.color === \"inherit\") {\r\n      effectiveColor = leaderStyle.color;\r\n    } else if (leaderStyle.leader.color !== \"subcategory\") {\r\n      effectiveColor = leaderStyle.leader.color;\r\n    }\r\n\r\n    if (effectiveColor !== \"subcategory\") {\r\n      params.lineColor = ColorDef.fromJSON(effectiveColor);\r\n      result = result && builder.appendGeometryParamsChange(params);\r\n    }\r\n\r\n    const attachmentPoint = computeLeaderAttachmentPoint(leader, frameCurve, layout, transform);\r\n    if (!attachmentPoint) return false;\r\n\r\n    // Leader line geometry\r\n    const leaderLinePoints: Point3d[] = [];\r\n\r\n    leaderLinePoints.push(leader.startPoint)\r\n\r\n    leader.intermediatePoints?.forEach((point) => {\r\n      leaderLinePoints.push(point);\r\n    });\r\n\r\n    if (leaderStyle.leader.wantElbow) {\r\n      const elbowLength = leaderStyle.leader.elbowLength * scaledBlockTextHeight;\r\n      const elbowDirection = computeElbowDirection(attachmentPoint, frameCurve, elbowLength);\r\n      if (elbowDirection)\r\n        leaderLinePoints.push(attachmentPoint.plusScaled(elbowDirection, elbowLength))\r\n    }\r\n\r\n    leaderLinePoints.push(attachmentPoint)\r\n\r\n    const terminatorDirection = Vector3d.createStartEnd(\r\n      leaderLinePoints[0], leaderLinePoints[1]\r\n    ).normalize();\r\n    const terminatorWidth = leaderStyle.leader.terminatorWidthFactor * scaledBlockTextHeight;\r\n    // Truncate the first segment of the leader lines to account for the arrowhead size when closedArrow (hollow triangle) terminatorShape is used.\r\n    if (leaderStyle.leader.terminatorShape === \"closedArrow\") {\r\n      if (terminatorDirection)\r\n        leaderLinePoints[0] = leaderLinePoints[0].plusScaled(terminatorDirection, terminatorWidth);\r\n    }\r\n\r\n    result = result && builder.appendGeometryQuery(LineString3d.create(leaderLinePoints));\r\n\r\n    if (leaderStyle.leader.terminatorShape !== \"none\") {\r\n      // Terminator geometry\r\n      if (!terminatorDirection) continue; // Assuming leaders without terminators is a valid case.\r\n      result = result && createTerminatorGeometry(builder, leader.startPoint, terminatorDirection, params, leaderStyle, scaledBlockTextHeight);\r\n\r\n    }\r\n\r\n  }\r\n  return result;\r\n}\r\n\r\n/**\r\n * Creates the geometry for a terminator at the end of a leader line.\r\n * @param builder The geometry builder to append the terminator geometry to.\r\n * @param point The starting point of the leader line.\r\n * @param dir The direction vector of the leader line.\r\n * @param params The geometry parameters to use for the terminator.\r\n * @param textStyleSettings The text style settings to use for the terminator.\r\n * @param textHeight The height of the text block.\r\n * @returns True if the geometry was successfully created, false otherwise.\r\n * @beta\r\n */\r\nexport function createTerminatorGeometry(builder: ElementGeometry.Builder, point: Point3d, dir: Vector3d, params: GeometryParams, textStyleSettings: TextStyleSettings, textHeight: number): boolean {\r\n\r\n  let result = true;\r\n  const termY = dir.unitCrossProduct(Vector3d.unitZ());\r\n  if (!termY) return false; // If dir is parallel to Z, we can't create a terminator\r\n  const terminatorHeight = textStyleSettings.leader.terminatorHeightFactor * textHeight;\r\n  const terminatorWidth = textStyleSettings.leader.terminatorWidthFactor * textHeight;\r\n  const terminatorHalfHeight = terminatorHeight / 2;\r\n  const basePoint = point.plusScaled(dir, terminatorWidth);\r\n  const point1 = basePoint.plusScaled(termY, terminatorHalfHeight);\r\n  const point2 = basePoint.plusScaled(termY.negate(), terminatorHalfHeight);\r\n\r\n  // Helper function to add fill parameters\r\n  const addFillParams = () => {\r\n    params.fillDisplay = FillDisplay.Always;\r\n    result = result && builder.appendGeometryParamsChange(params);\r\n  };\r\n\r\n  // Helper function to create geometry entry\r\n  const addGeometry = (content: CurvePrimitive, useLoop = false) => {\r\n    const finalContent = useLoop ? Loop.create(content) : content;\r\n    result = result && builder.appendGeometryQuery(finalContent);\r\n  };\r\n\r\n  switch (textStyleSettings.leader.terminatorShape) {\r\n    case \"openArrow\": {\r\n      const lineString = LineString3d.create([point1, point, point2]);\r\n      addGeometry(lineString);\r\n      break;\r\n    }\r\n\r\n    case \"closedArrow\": {\r\n      const lineString = LineString3d.create([point1, point, point2, point1]);\r\n      addGeometry(lineString);\r\n      break;\r\n    }\r\n\r\n    case \"closedArrowFilled\": {\r\n      addFillParams();\r\n      const lineString = LineString3d.create([point1, point, point2, point1]);\r\n      addGeometry(lineString, true);\r\n      break;\r\n    }\r\n\r\n    case \"circle\": {\r\n      const circle = Arc3d.createXY(point, terminatorHalfHeight);\r\n      addGeometry(circle);\r\n      break;\r\n    }\r\n\r\n    case \"circleFilled\": {\r\n      addFillParams();\r\n      const circle = Arc3d.createXY(point, terminatorHalfHeight);\r\n      addGeometry(circle, true);\r\n      break;\r\n    }\r\n\r\n    case \"slash\": {\r\n      const normalizedVector = dir.normalize();\r\n      if (!normalizedVector) throw new Error(\"Invalid reference vector for slash terminator.\");\r\n\r\n      const rotatedVector = normalizedVector.rotateXY(Angle.createDegrees(45));\r\n      const startPoint = point.plusScaled(rotatedVector, -terminatorHalfHeight);\r\n      const endPoint = point.plusScaled(rotatedVector, terminatorHalfHeight);\r\n\r\n      const slashLine = LineSegment3d.create(startPoint, endPoint);\r\n      addGeometry(slashLine);\r\n      break;\r\n    }\r\n  }\r\n\r\n  return result;\r\n};\r\n\r\n\r\n/**\r\n * Computes the direction vector for an \"elbow\" for leader based on the attachment point and a frame curve.\r\n * The elbow direction is determined by whether the attachment point is closer to the left or right side of the frame.\r\n * If the computed elbow would be tangent to the frame at the intersection, no elbow direction is returned.\r\n *\r\n * @param attachmentPoint - The point where the leader attaches.\r\n * @param frameCurve - The frame curve (either a Loop or Path) to which the leader is attached.\r\n * @param elbowLength - The length of the elbow segment to be created.\r\n * @returns The direction vector for the elbow, or `undefined` if the elbow would be tangent to the frame.\r\n * @beta\r\n */\r\nexport function computeElbowDirection(attachmentPoint: Point3d, frameCurve: Loop | Path, elbowLength: number): Vector3d | undefined {\r\n\r\n  let elbowDirection: Vector3d | undefined;\r\n  // Determine the direction based on the closest point's position relative to the frame\r\n  const isCloserToLeft = Math.abs(attachmentPoint.x - frameCurve.range().low.x) < Math.abs(attachmentPoint.x - frameCurve.range().high.x);\r\n\r\n  // Decide the direction: left (-X) or right (+X)\r\n  elbowDirection = isCloserToLeft ? Vector3d.unitX().negate() : Vector3d.unitX();\r\n\r\n  // Verify if the elbow is a tangent to the frame, if yes, do not create an elbow\r\n  const elbowPoint = attachmentPoint.plusScaled(elbowDirection, elbowLength);\r\n  const elbowLine = LineSegment3d.create(attachmentPoint, elbowPoint);\r\n  // Find intersection points between the elbow and the frame\r\n  const intersections = CurveCurve.intersectionXYZPairs(elbowLine, false, frameCurve, false);\r\n  // As the elbow will intersect the frame only at one point, we can safely use the first intersection\r\n  const intersection = intersections[0];\r\n  const curveFraction = intersection.detailB.fraction;\r\n  const derivative = intersection.detailB.curve?.fractionToPointAndDerivative(curveFraction);\r\n  const tangent = derivative?.direction.normalize();\r\n  const lineDirection = Vector3d.createStartEnd(elbowLine.point0Ref, elbowLine.point1Ref).normalize();\r\n  if (tangent && lineDirection) {\r\n    const dot = tangent.dotProduct(lineDirection);\r\n    // If the tangent and line direction are aligned (dot product close to 1 or -1), it's tangent\r\n    if (Math.abs(dot) > 0.999) {\r\n      elbowDirection = undefined;\r\n    }\r\n  }\r\n  return elbowDirection;\r\n}\r\n\r\n/**\r\n * Computes the attachment point for a leader line on a text annotation frame.\r\n *\r\n * The attachment point is determined based on the leader's attachment mode:\r\n * - `\"Nearest\"`: Finds the closest point on the frame curve to the leader's start point.\r\n * - `\"KeyPoint\"`: Uses a specific curve segment and fraction along that segment to determine the point.\r\n * - `\"TextPoint\"`: Calculates a point on the text layout (top/bottom, left/right) and projects it onto the frame curve.\r\n *\r\n * @param leader - The leader props.\r\n * @param frameCurve - The curve (Loop or Path) representing the annotation frame.\r\n * @param textLayout - The layout information for the text block.\r\n * @param transform - The transform applied to the text layout.\r\n * @returns The computed attachment point as a `Point3d`, or `undefined` if it cannot be determined.\r\n * @beta\r\n */\r\nexport function computeLeaderAttachmentPoint(\r\n  leader: TextAnnotationLeader,\r\n  frameCurve: Loop | Path,\r\n  textLayout: TextBlockLayout,\r\n  transform: Transform\r\n): Point3d | undefined {\r\n  let attachmentPoint: Point3d | undefined;\r\n\r\n  if (leader.attachment.mode === \"Nearest\") {\r\n    attachmentPoint = frameCurve.closestPoint(leader.startPoint)?.point;\r\n  } else if (leader.attachment.mode === \"KeyPoint\") {\r\n    const curves = frameCurve.collectCurvePrimitives(undefined, false, true);\r\n    const curveIndex = leader.attachment.curveIndex;\r\n    const fraction = leader.attachment.fraction;\r\n    if (curveIndex >= curves.length) {\r\n      // If the curveIndex is invalid, use the last curve\r\n      // This is a fallback to avoid out-of-bounds access\r\n      attachmentPoint = curves[curves.length - 1].fractionToPoint(fraction);\r\n    } else {\r\n      attachmentPoint = curves[curveIndex].fractionToPoint(fraction);\r\n    }\r\n  } else { // attachment.mode=\"TextPoint\"\r\n    let scaleDirection = transform.matrix.getColumn(0).negate(); // direction to draw a scaled line from text attachment point to find intersection point on frame\r\n    let lineIndex: number;\r\n    if (leader.attachment.position.includes(\"Top\")) {\r\n      lineIndex = 0\r\n    } else {\r\n      lineIndex = textLayout.lines.length - 1\r\n    }\r\n    const lineRange = textLayout.lines[lineIndex].range;\r\n    const lineOffset = textLayout.lines[lineIndex].offsetFromDocument;\r\n    const origin = transform.multiplyPoint3d(Point3d.fromJSON(lineOffset));\r\n    let attachmentPointOnText = origin.plusScaled(transform.matrix.getColumn(1), ((lineRange.yLength()) / 2));\r\n\r\n    if (leader.attachment.position.includes(\"Right\")) {\r\n      attachmentPointOnText = attachmentPointOnText.plusScaled(transform.matrix.getColumn(0), lineRange.xLength());\r\n      scaleDirection = scaleDirection.negate();\r\n    }\r\n    // Find the nearest intersection point on the frame to get the correct attachment point\r\n    // Extend the direction vector to create a target point far along the direction\r\n    const targetPoint = attachmentPointOnText.plusScaled(scaleDirection, 1e6); // Scale the direction vector to a large value\r\n    const intersectionLine = LineSegment3d.create(attachmentPointOnText, targetPoint);\r\n    const closestPointDetail = CurveCurve.intersectionXYZPairs(intersectionLine, false, frameCurve, false);\r\n    attachmentPoint = closestPointDetail[0]?.detailA.point;\r\n  }\r\n  return attachmentPoint;\r\n}"]}
+{"version":3,"file":"LeaderGeometry.js","sourceRoot":"","sources":["../../../src/annotations/LeaderGeometry.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ElementGeometry\r\n */\r\n\r\nimport { ColorDef, ElementGeometry, FillDisplay, GeometryParams, TextAnnotationLeader, TextFrameStyleProps, TextStyleColor, TextStyleSettings } from \"@itwin/core-common\";\r\nimport { Angle, Arc3d, CurveCurve, CurvePrimitive, LineSegment3d, LineString3d, Loop, Path, Point3d, Transform, Vector3d } from \"@itwin/core-geometry\";\r\nimport { computeFrame } from \"./FrameGeometry\";\r\nimport { TextBlockLayout, TextStyleResolver } from \"./TextBlockLayout\";\r\n\r\n/**\r\n * Constructs and appends leader lines and their terminators to the provided geometry builder for a text annotation.\r\n *\r\n * This function processes an array of `TextAnnotationLeader` objects, computes their attachment points\r\n * relative to a text frame (or a default rectangular frame if none is provided), and appends the leader\r\n * line and terminator geometry to the builder. It also applies color overrides if specified\r\n * in the leader's style overrides.\r\n *\r\n * @param builder - The geometry builder to which the leader geometries will be appended.\r\n * @param leaders - An array of leader properties.\r\n * @param layout - The layout information for the text block, including its range.\r\n * @param transform - The transform to apply to the frame and leader geometry.\r\n * @param params - The geometry parameters, such as color, to use for the leader lines.\r\n * @param textStyleResolver - Resolver for text styles, used to obtain leader styles.\r\n * @param scaleFactor - The scale factor to apply to leader dimensions, usually comes from the `scaleFactor` of a [[Drawing]] element.\r\n * @returns `true` if at least one leader with a terminator was successfully appended; otherwise, `false`.\r\n * @beta\r\n */\r\nexport function appendLeadersToBuilder(builder: ElementGeometry.Builder, leaders: TextAnnotationLeader[], layout: TextBlockLayout, transform: Transform, params: GeometryParams, textStyleResolver: TextStyleResolver, scaleFactor: number): boolean {\r\n  let result = true;\r\n  const scaledBlockTextHeight = textStyleResolver.blockSettings.textHeight * scaleFactor;\r\n  let frame: TextFrameStyleProps | undefined = textStyleResolver.blockSettings.frame;\r\n\r\n  // If there is no frame, use a rectangular frame to compute the attachmentPoints for leaders.\r\n  if (frame === undefined || frame.shape === \"none\") {\r\n    frame = { shape: \"rectangle\" }\r\n  }\r\n  if (frame.shape === undefined || frame.shape === \"none\") return false;\r\n  const frameCurve = computeFrame({ frame: frame.shape, range: layout.range, transform });\r\n\r\n  for (const leader of leaders) {\r\n    const leaderStyle = textStyleResolver.resolveSettings(leader.styleOverrides ?? {}, true);\r\n\r\n    let effectiveColor: TextStyleColor = \"subcategory\";\r\n\r\n    if (leaderStyle.leader.color === \"inherit\") {\r\n      effectiveColor = leaderStyle.color;\r\n    } else if (leaderStyle.leader.color !== \"subcategory\") {\r\n      effectiveColor = leaderStyle.leader.color;\r\n    }\r\n\r\n    if (effectiveColor !== \"subcategory\") {\r\n      params.lineColor = ColorDef.fromJSON(effectiveColor);\r\n      result = result && builder.appendGeometryParamsChange(params);\r\n    }\r\n\r\n    if (leaderStyle.leader.showLeaders) {\r\n      const attachmentPoint = computeLeaderAttachmentPoint(leader, frameCurve, layout, transform);\r\n      if (!attachmentPoint) return false;\r\n\r\n      let elbowPoint: Point3d | undefined;\r\n      if (leaderStyle.leader.wantElbow) {\r\n        const elbowLength = leaderStyle.leader.elbowLength * scaledBlockTextHeight;\r\n        const elbowDirection = computeElbowDirection(attachmentPoint, frameCurve, elbowLength);\r\n        if (elbowDirection)\r\n          elbowPoint = attachmentPoint.plusScaled(elbowDirection, elbowLength);\r\n      }\r\n\r\n      // Leader line geometry\r\n      const leaderLinePoints: Point3d[] = [];\r\n      const terminatorWidth = leaderStyle.leader.terminatorWidthFactor * scaledBlockTextHeight;\r\n      let leaderStartPoint = leader.startPoint;\r\n      if (leaderStyle.leader.showTargetPoint && leaderStyle.leader.targetPointOffsetFactor !== 0) {\r\n        const offset = leaderStyle.leader.targetPointOffsetFactor * scaledBlockTextHeight;\r\n        let firstSegmentEnd = leader.intermediatePoints?.[0];\r\n\r\n        // If there are no intermediate points, offset along the elbow segment when present.\r\n        if (!firstSegmentEnd && elbowPoint)\r\n          firstSegmentEnd = elbowPoint;\r\n\r\n        if (!firstSegmentEnd)\r\n          firstSegmentEnd = attachmentPoint;\r\n\r\n\r\n        // Offset the target-point marker away from the start point along the first leader segment.\r\n        // Clamp the added distance so negative values resolve to 0 and large values cannot overshoot the first vertex.\r\n        // When terminators are hidden, use the text height as a conservative guard distance; otherwise use the terminator width.\r\n        const firstSegmentLength = leader.startPoint.distance(firstSegmentEnd);\r\n        const clampDistance = leaderStyle.leader.showTerminators ? terminatorWidth : scaledBlockTextHeight;\r\n        const maxOffset = Math.max(0, firstSegmentLength - clampDistance);\r\n        const clampedOffset = Math.min(Math.max(offset, 0), maxOffset);\r\n        const leaderDirection = Vector3d.createStartEnd(leader.startPoint, firstSegmentEnd).normalize();\r\n        if (leaderDirection)\r\n          leaderStartPoint = leader.startPoint.plusScaled(leaderDirection, clampedOffset);\r\n      }\r\n      leaderLinePoints.push(leaderStartPoint);\r\n\r\n      leader.intermediatePoints?.forEach((point) => {\r\n        leaderLinePoints.push(point);\r\n      });\r\n\r\n      if (elbowPoint)\r\n        leaderLinePoints.push(elbowPoint);\r\n\r\n      leaderLinePoints.push(attachmentPoint);\r\n\r\n      const terminatorDirection = Vector3d.createStartEnd(\r\n        leaderLinePoints[0], leaderLinePoints[1]\r\n      ).normalize();\r\n\r\n      // Truncate the first segment of the leader lines to account for the arrowhead size when closedArrow (hollow triangle) terminatorShape is used.\r\n      if (leaderStyle.leader.showTerminators && leaderStyle.leader.terminatorShape === \"closedArrow\") {\r\n        if (terminatorDirection)\r\n          leaderLinePoints[0] = leaderLinePoints[0].plusScaled(terminatorDirection, terminatorWidth);\r\n      }\r\n\r\n      result = result && builder.appendGeometryQuery(LineString3d.create(leaderLinePoints));\r\n      if (leaderStyle.leader.terminatorShape !== \"none\" && leaderStyle.leader.showTerminators) {\r\n        // Terminator geometry\r\n        if (!terminatorDirection) continue; // Assuming leaders without terminators is a valid case.\r\n        result = result && createTerminatorGeometry({ builder, point: leaderStartPoint, dir: terminatorDirection, params, textStyleSettings: leaderStyle, textHeight: scaledBlockTextHeight });\r\n\r\n      }\r\n    }\r\n\r\n    if (leaderStyle.leader.showTargetPoint) {\r\n      result = result && createTerminatorGeometry({ builder, point: leader.startPoint, dir: Vector3d.unitX(), params, textStyleSettings: leaderStyle, textHeight: scaledBlockTextHeight, isArrow: false });\r\n    }\r\n\r\n  }\r\n  return result;\r\n}\r\n\r\n/**\r\n * Arguments supplied to [[createTerminatorGeometry]].\r\n * @beta\r\n */\r\nexport interface CreateTerminatorGeometryArgs {\r\n  /** The geometry builder to append the terminator geometry to. */\r\n  builder: ElementGeometry.Builder;\r\n  /** The point at which the terminator is placed - typically the start or end of a leader line. */\r\n  point: Point3d;\r\n  /** The direction vector of the leader line. */\r\n  dir: Vector3d;\r\n  /** The geometry parameters to use for the terminator. */\r\n  params: GeometryParams;\r\n  /** The text style settings describing the terminator's shape and dimensions. */\r\n  textStyleSettings: TextStyleSettings;\r\n  /** The height of the text block, used to scale the terminator's dimensions. */\r\n  textHeight: number;\r\n  /** If `true` (the default), the leader's terminator shape is used; otherwise the target-point shape is used. */\r\n  isArrow?: boolean;\r\n}\r\n\r\n/**\r\n * Creates the geometry for a terminator at the end of a leader line.\r\n * @param args Describes the terminator geometry to create. See [[CreateTerminatorGeometryArgs]].\r\n * @returns True if the geometry was successfully created, false otherwise.\r\n * @beta\r\n */\r\nexport function createTerminatorGeometry(args: CreateTerminatorGeometryArgs): boolean {\r\n  const { builder, point, dir, params, textStyleSettings, textHeight } = args;\r\n  const isArrow = args.isArrow ?? true;\r\n\r\n  let result = true;\r\n  const termY = dir.unitCrossProduct(Vector3d.unitZ());\r\n  if (!termY) return false; // If dir is parallel to Z, we can't create a terminator\r\n  const terminatorHeight = textStyleSettings.leader.terminatorHeightFactor * textHeight;\r\n  const terminatorWidth = textStyleSettings.leader.terminatorWidthFactor * textHeight;\r\n  const terminatorHalfHeight = terminatorHeight / 2;\r\n  const basePoint = point.plusScaled(dir, terminatorWidth);\r\n  const point1 = basePoint.plusScaled(termY, terminatorHalfHeight);\r\n  const point2 = basePoint.plusScaled(termY.negate(), terminatorHalfHeight);\r\n\r\n  // Helper function to add fill parameters\r\n  const addFillParams = () => {\r\n    params.fillDisplay = FillDisplay.Always;\r\n    result = result && builder.appendGeometryParamsChange(params);\r\n  };\r\n\r\n  // Helper function to create geometry entry\r\n  const addGeometry = (content: CurvePrimitive, useLoop = false) => {\r\n    const finalContent = useLoop ? Loop.create(content) : content;\r\n    result = result && builder.appendGeometryQuery(finalContent);\r\n  };\r\n  const shape = isArrow ? textStyleSettings.leader.terminatorShape : textStyleSettings.leader.targetPointShape;\r\n\r\n  switch (shape) {\r\n    case \"openArrow\": {\r\n      const lineString = LineString3d.create([point1, point, point2]);\r\n      addGeometry(lineString);\r\n      break;\r\n    }\r\n\r\n    case \"closedArrow\": {\r\n      const lineString = LineString3d.create([point1, point, point2, point1]);\r\n      addGeometry(lineString);\r\n      break;\r\n    }\r\n\r\n    case \"closedArrowFilled\": {\r\n      addFillParams();\r\n      const lineString = LineString3d.create([point1, point, point2, point1]);\r\n      addGeometry(lineString, true);\r\n      break;\r\n    }\r\n\r\n    case \"circle\": {\r\n      const circle = Arc3d.createXY(point, terminatorHalfHeight);\r\n      addGeometry(circle);\r\n      break;\r\n    }\r\n\r\n    case \"circleFilled\": {\r\n      addFillParams();\r\n      const circle = Arc3d.createXY(point, terminatorHalfHeight);\r\n      addGeometry(circle, true);\r\n      break;\r\n    }\r\n\r\n    case \"slash\": {\r\n      const normalizedVector = dir.normalize();\r\n      if (!normalizedVector) throw new Error(\"Invalid reference vector for slash terminator.\");\r\n\r\n      const rotatedVector = normalizedVector.rotateXY(Angle.createDegrees(45));\r\n      const startPoint = point.plusScaled(rotatedVector, -terminatorHalfHeight);\r\n      const endPoint = point.plusScaled(rotatedVector, terminatorHalfHeight);\r\n\r\n      const slashLine = LineSegment3d.create(startPoint, endPoint);\r\n      addGeometry(slashLine);\r\n      break;\r\n    }\r\n\r\n    case \"cross\": {\r\n      // Diagonal \"X\" centered on the point, axis-aligned (horizontal upright).\r\n      const halfSize = terminatorHalfHeight;\r\n      addGeometry(LineSegment3d.create(point.plusXYZ(-halfSize, -halfSize), point.plusXYZ(halfSize, halfSize)));\r\n      addGeometry(LineSegment3d.create(point.plusXYZ(-halfSize, halfSize), point.plusXYZ(halfSize, -halfSize)));\r\n      break;\r\n    }\r\n\r\n    case \"plus\": {\r\n      // Orthogonal \"+\" centered on the point, axis-aligned (horizontal upright).\r\n      const halfSize = terminatorHalfHeight;\r\n      addGeometry(LineSegment3d.create(point.plusXYZ(-halfSize, 0), point.plusXYZ(halfSize, 0)));\r\n      addGeometry(LineSegment3d.create(point.plusXYZ(0, -halfSize), point.plusXYZ(0, halfSize)));\r\n      break;\r\n    }\r\n\r\n    case \"square\": {\r\n      // Axis-aligned square centered on the point (horizontal upright).\r\n      const halfSize = terminatorHalfHeight;\r\n      const square = LineString3d.create([\r\n        point.plusXYZ(-halfSize, -halfSize),\r\n        point.plusXYZ(halfSize, -halfSize),\r\n        point.plusXYZ(halfSize, halfSize),\r\n        point.plusXYZ(-halfSize, halfSize),\r\n        point.plusXYZ(-halfSize, -halfSize),\r\n      ]);\r\n      addGeometry(square);\r\n      break;\r\n    }\r\n\r\n    case \"rectangle\": {\r\n      // Axis-aligned rectangle centered on the point (horizontal upright).\r\n      // Respect the configured width/height factors directly.\r\n      const halfWidth = terminatorWidth / 2;\r\n      const halfHeight = terminatorHalfHeight;\r\n      const rectangle = LineString3d.create([\r\n        point.plusXYZ(-halfWidth, -halfHeight),\r\n        point.plusXYZ(halfWidth, -halfHeight),\r\n        point.plusXYZ(halfWidth, halfHeight),\r\n        point.plusXYZ(-halfWidth, halfHeight),\r\n        point.plusXYZ(-halfWidth, -halfHeight),\r\n      ]);\r\n      addGeometry(rectangle);\r\n      break;\r\n    }\r\n  }\r\n\r\n  return result;\r\n};\r\n\r\n\r\n/**\r\n * Computes the direction vector for an \"elbow\" for leader based on the attachment point and a frame curve.\r\n * The elbow direction is determined by whether the attachment point is closer to the left or right side of the frame.\r\n * If the computed elbow would be tangent to the frame at the intersection, no elbow direction is returned.\r\n *\r\n * @param attachmentPoint - The point where the leader attaches.\r\n * @param frameCurve - The frame curve (either a Loop or Path) to which the leader is attached.\r\n * @param elbowLength - The length of the elbow segment to be created.\r\n * @returns The direction vector for the elbow, or `undefined` if the elbow would be tangent to the frame.\r\n * @beta\r\n */\r\nexport function computeElbowDirection(attachmentPoint: Point3d, frameCurve: Loop | Path, elbowLength: number): Vector3d | undefined {\r\n\r\n  let elbowDirection: Vector3d | undefined;\r\n  // Determine the direction based on the closest point's position relative to the frame\r\n  const isCloserToLeft = Math.abs(attachmentPoint.x - frameCurve.range().low.x) < Math.abs(attachmentPoint.x - frameCurve.range().high.x);\r\n\r\n  // Decide the direction: left (-X) or right (+X)\r\n  elbowDirection = isCloserToLeft ? Vector3d.unitX().negate() : Vector3d.unitX();\r\n\r\n  // Verify if the elbow is a tangent to the frame, if yes, do not create an elbow\r\n  const elbowPoint = attachmentPoint.plusScaled(elbowDirection, elbowLength);\r\n  const elbowLine = LineSegment3d.create(attachmentPoint, elbowPoint);\r\n  // Find intersection points between the elbow and the frame\r\n  const intersections = CurveCurve.intersectionXYZPairs(elbowLine, false, frameCurve, false);\r\n  // As the elbow will intersect the frame only at one point, we can safely use the first intersection\r\n  const intersection = intersections[0];\r\n  const curveFraction = intersection.detailB.fraction;\r\n  const derivative = intersection.detailB.curve?.fractionToPointAndDerivative(curveFraction);\r\n  const tangent = derivative?.direction.normalize();\r\n  const lineDirection = Vector3d.createStartEnd(elbowLine.point0Ref, elbowLine.point1Ref).normalize();\r\n  if (tangent && lineDirection) {\r\n    const dot = tangent.dotProduct(lineDirection);\r\n    // If the tangent and line direction are aligned (dot product close to 1 or -1), it's tangent\r\n    if (Math.abs(dot) > 0.999) {\r\n      elbowDirection = undefined;\r\n    }\r\n  }\r\n  return elbowDirection;\r\n}\r\n\r\n/**\r\n * Computes the attachment point for a leader line on a text annotation frame.\r\n *\r\n * The attachment point is determined based on the leader's attachment mode:\r\n * - `\"Nearest\"`: Finds the closest point on the frame curve to the leader's start point.\r\n * - `\"KeyPoint\"`: Uses a specific curve segment and fraction along that segment to determine the point.\r\n * - `\"TextPoint\"`: Calculates a point on the text layout (top/bottom, left/right) and projects it onto the frame curve.\r\n *\r\n * @param leader - The leader props.\r\n * @param frameCurve - The curve (Loop or Path) representing the annotation frame.\r\n * @param textLayout - The layout information for the text block.\r\n * @param transform - The transform applied to the text layout.\r\n * @returns The computed attachment point as a `Point3d`, or `undefined` if it cannot be determined.\r\n * @beta\r\n */\r\nexport function computeLeaderAttachmentPoint(\r\n  leader: TextAnnotationLeader,\r\n  frameCurve: Loop | Path,\r\n  textLayout: TextBlockLayout,\r\n  transform: Transform\r\n): Point3d | undefined {\r\n  let attachmentPoint: Point3d | undefined;\r\n\r\n  if (leader.attachment.mode === \"Nearest\") {\r\n    attachmentPoint = frameCurve.closestPoint(leader.startPoint)?.point;\r\n  } else if (leader.attachment.mode === \"KeyPoint\") {\r\n    const curves = frameCurve.collectCurvePrimitives(undefined, false, true);\r\n    const curveIndex = leader.attachment.curveIndex;\r\n    const fraction = leader.attachment.fraction;\r\n    if (curveIndex >= curves.length) {\r\n      // If the curveIndex is invalid, use the last curve\r\n      // This is a fallback to avoid out-of-bounds access\r\n      attachmentPoint = curves[curves.length - 1].fractionToPoint(fraction);\r\n    } else {\r\n      attachmentPoint = curves[curveIndex].fractionToPoint(fraction);\r\n    }\r\n  } else { // attachment.mode=\"TextPoint\"\r\n    let scaleDirection = transform.matrix.getColumn(0).negate(); // direction to draw a scaled line from text attachment point to find intersection point on frame\r\n    let lineIndex: number;\r\n    if (leader.attachment.position.includes(\"Top\")) {\r\n      lineIndex = 0\r\n    } else {\r\n      lineIndex = textLayout.lines.length - 1\r\n    }\r\n    const lineRange = textLayout.lines[lineIndex].range;\r\n    const lineOffset = textLayout.lines[lineIndex].offsetFromDocument;\r\n    const origin = transform.multiplyPoint3d(Point3d.fromJSON(lineOffset));\r\n    let attachmentPointOnText = origin.plusScaled(transform.matrix.getColumn(1), ((lineRange.yLength()) / 2));\r\n\r\n    if (leader.attachment.position.includes(\"Right\")) {\r\n      attachmentPointOnText = attachmentPointOnText.plusScaled(transform.matrix.getColumn(0), lineRange.xLength());\r\n      scaleDirection = scaleDirection.negate();\r\n    }\r\n    // Find the nearest intersection point on the frame to get the correct attachment point\r\n    // Extend the direction vector to create a target point far along the direction\r\n    const targetPoint = attachmentPointOnText.plusScaled(scaleDirection, 1e6); // Scale the direction vector to a large value\r\n    const intersectionLine = LineSegment3d.create(attachmentPointOnText, targetPoint);\r\n    const closestPointDetail = CurveCurve.intersectionXYZPairs(intersectionLine, false, frameCurve, false);\r\n    attachmentPoint = closestPointDetail[0]?.detailA.point;\r\n  }\r\n  return attachmentPoint;\r\n}"]}

package/lib/esm/annotations/TextAnnotationElement.d.ts

@@ -231,7 +231,7 @@ export declare class TextAnnotation3d extends GraphicalElement3d {
  * Uses the same semantics as [ECVersion]($ecschema-metadata).
  * @internal
 */
-export declare const TEXT_STYLE_SETTINGS_JSON_VERSION = "1.0.2";
+export declare const TEXT_STYLE_SETTINGS_JSON_VERSION = "1.0.3";
 /** Arguments supplied when creating an [[AnnotationTextStyle]].
  * @beta
  */

package/lib/esm/annotations/TextAnnotationElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextAnnotationElement.d.ts","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationElement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TextAnnotationElement.d.ts","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationElement.ts"],"names":[],"mappings":"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"}

package/lib/esm/annotations/TextAnnotationElement.js

@@ -439,27 +439,42 @@ function updateTextBlocks(elem, textBlocks) {
 */
 // 1.0.1 - Added terminatorShapes for leaders
 // 1.0.2 - Changed margins to be fractions of text height instead of absolute values
-export const TEXT_STYLE_SETTINGS_JSON_VERSION = "1.0.2";
+// 1.0.3 - Added new leader style properties for targetPoint feature (showLeaders,showTerminators,showTargetPoint,targetPointShape,targetPointOffsetFactor)
+export const TEXT_STYLE_SETTINGS_JSON_VERSION = "1.0.3";
 function migrateTextStyleSettings(oldData) {
-    if (oldData.version === TEXT_STYLE_SETTINGS_JSON_VERSION)
-        return oldData.data;
+    const data = oldData.data;
+    const version = oldData.version;
+    if (version === TEXT_STYLE_SETTINGS_JSON_VERSION)
+        return data;
     // Migrate from 1.0.0 to 1.0.1
-    if (oldData.data.leader && !oldData.data.leader.terminatorShape) {
-        oldData.data.leader.terminatorShape = TextStyleSettings.defaultProps.leader.terminatorShape;
+    if (semver.lt(version, "1.0.1")) {
+        if (data.leader && !data.leader.terminatorShape) {
+            data.leader.terminatorShape = TextStyleSettings.defaultProps.leader.terminatorShape;
+        }
     }
     // Migrate from 1.0.1 to 1.0.2.
-    if (oldData.version === "1.0.1") {
+    if (semver.lt(version, "1.0.2")) {
         // In 1.0.2, margins are specified as a fraction of text height instead of absolute values.
-        const textHeight = oldData.data.textHeight ?? TextStyleSettings.defaultProps.textHeight;
-        const margins = oldData.data.margins ?? TextStyleSettings.defaultProps.margins;
-        oldData.data.margins = {
+        const textHeight = data.textHeight ?? TextStyleSettings.defaultProps.textHeight;
+        const margins = data.margins ?? TextStyleSettings.defaultProps.margins;
+        data.margins = {
             top: (margins.top ?? TextStyleSettings.defaultProps.margins.top) / textHeight,
             bottom: (margins.bottom ?? TextStyleSettings.defaultProps.margins.bottom) / textHeight,
             left: (margins.left ?? TextStyleSettings.defaultProps.margins.left) / textHeight,
             right: (margins.right ?? TextStyleSettings.defaultProps.margins.right) / textHeight,
         };
     }
-    return oldData.data;
+    // Migrate from 1.0.2 to 1.0.3.
+    if (semver.lt(version, "1.0.3")) {
+        if (data.leader) {
+            data.leader.showLeaders = data.leader?.showLeaders ?? TextStyleSettings.defaultProps.leader.showLeaders;
+            data.leader.showTerminators = data.leader?.showTerminators ?? TextStyleSettings.defaultProps.leader.showTerminators;
+            data.leader.showTargetPoint = data.leader?.showTargetPoint ?? TextStyleSettings.defaultProps.leader.showTargetPoint;
+            data.leader.targetPointShape = data.leader?.targetPointShape ?? TextStyleSettings.defaultProps.leader.targetPointShape;
+            data.leader.targetPointOffsetFactor = data.leader?.targetPointOffsetFactor ?? TextStyleSettings.defaultProps.leader.targetPointOffsetFactor;
+        }
+    }
+    return data;
 }
 /**
  * The definition element that holds text style information.