@itwin/core-backend 5.1.0-dev.60 → 5.1.0-dev.62

package/lib/cjs/annotations/TextAnnotationElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextAnnotationElement.js","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationElement.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Elements\n */\n\nimport { ElementGeometry, ElementGeometryBuilderParams, PlacementProps, TextAnnotation, TextAnnotation2dProps, TextAnnotation3dProps, TextAnnotationProps } from \"@itwin/core-common\";\nimport { IModelDb } from \"../IModelDb\";\nimport { AnnotationElement2d, GraphicalElement3d } from \"../Element\";\nimport { Id64String } from \"@itwin/core-bentley\";\nimport { layoutTextBlock } from \"./TextBlockLayout\";\nimport { appendTextAnnotationGeometry } from \"./TextAnnotationGeometry\";\n\nfunction getElementGeometryBuilderParams(iModel: IModelDb, _placementProps: PlacementProps, annotationProps: TextAnnotationProps, categoryId: Id64String, _subCategory?: Id64String): ElementGeometryBuilderParams {\n  const textBlock = TextAnnotation.fromJSON(annotationProps).textBlock;\n  const layout = layoutTextBlock({ iModel, textBlock });\n  const builder = new ElementGeometry.Builder();\n  appendTextAnnotationGeometry({ layout, annotationProps, builder, categoryId })\n\n  return { entryArray: builder.entries };\n}\n\n/** An element that displays textual content within a 2d model.\n * The text is stored as a [TextAnnotation]($common) from which the element's [geometry]($docs/learning/common/GeometryStream.md) and [Placement]($common) are computed.\n * @see [[setAnnotation]] to change the textual content.\n * @public @preview\n */\nexport class TextAnnotation2d extends AnnotationElement2d {\n  /** @internal */\n  public static override get className(): string { return \"TextAnnotation2d\"; }\n  protected constructor(props: TextAnnotation2dProps, iModel: IModelDb) { super(props, iModel); }\n\n  public static fromJSON(props: TextAnnotation2dProps, iModel: IModelDb): TextAnnotation2d {\n    return new TextAnnotation2d(props, iModel);\n  }\n\n  public override toJSON(): TextAnnotation2dProps {\n    const props = super.toJSON();\n    props.elementGeometryBuilderParams = getElementGeometryBuilderParams(this.iModel, this.placement, this.jsonProperties.annotation, this.category);\n\n    return props;\n  }\n\n  /** Extract the textual content, if present.\n   * @see [[setAnnotation]] to change it.\n   */\n  public getAnnotation(): TextAnnotation | undefined {\n    const json = this.jsonProperties.annotation;\n    return json ? TextAnnotation.fromJSON(json) : undefined;\n  }\n\n  /** Change the textual content, updating the element's geometry and placement accordingly.\n   * @see [[getAnnotation]] to extract the current annotation.\n   * @param annotation The new annotation\n   */\n  public setAnnotation(annotation: TextAnnotation) {\n    this.jsonProperties.annotation = annotation.toJSON();\n  }\n}\n\n/** An element that displays textual content within a 3d model.\n * The text is stored as a [TextAnnotation]($common) from which the element's [geometry]($docs/learning/common/GeometryStream.md) and [Placement]($common) are computed.\n * @see [[setAnnotation]] to change the textual content.\n * @public @preview\n */\nexport class TextAnnotation3d extends GraphicalElement3d {\n  /** @internal */\n  public static override get className(): string { return \"TextAnnotation3d\"; }\n  protected constructor(props: TextAnnotation3dProps, iModel: IModelDb) { super(props, iModel); }\n\n  public static fromJSON(props: TextAnnotation3dProps, iModel: IModelDb): TextAnnotation3d {\n    return new TextAnnotation3d(props, iModel);\n  }\n\n  public override toJSON(): TextAnnotation3dProps {\n    const props = super.toJSON();\n    props.elementGeometryBuilderParams = getElementGeometryBuilderParams(this.iModel, this.placement, this.jsonProperties.annotation, this.category);\n\n    return props;\n  }\n\n  /** Extract the textual content, if present.\n   * @see [[setAnnotation]] to change it.\n   */\n  public getAnnotation(): TextAnnotation | undefined {\n    const json = this.jsonProperties.annotation;\n    return json ? TextAnnotation.fromJSON(json) : undefined;\n  }\n\n  /** Change the textual content, updating the element's geometry and placement accordingly.\n   * @see [[getAnnotation]] to extract the current annotation.\n   * @param annotation The new annotation\n   */\n  public setAnnotation(annotation: TextAnnotation) {\n    this.jsonProperties.annotation = annotation.toJSON();\n  }\n}\n"]}
+{"version":3,"file":"TextAnnotationElement.js","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationElement.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Elements\n */\n\nimport { AnnotationTextStyleProps, BisCodeSpec, Code, CodeProps, CodeScopeProps, CodeSpec, ElementGeometry, ElementGeometryBuilderParams, EntityReferenceSet, Placement2d, Placement2dProps, Placement3d, Placement3dProps, PlacementProps, TextAnnotation, TextAnnotation2dProps, TextAnnotation3dProps, TextAnnotationProps, TextStyleSettings, TextStyleSettingsProps } from \"@itwin/core-common\";\nimport { IModelDb } from \"../IModelDb\";\nimport { AnnotationElement2d, DefinitionElement, GraphicalElement3d, OnElementPropsArg } from \"../Element\";\nimport { Id64String } from \"@itwin/core-bentley\";\nimport { layoutTextBlock, TextStyleResolver } from \"./TextBlockLayout\";\nimport { appendTextAnnotationGeometry } from \"./TextAnnotationGeometry\";\n\nfunction parseTextAnnotationData(json: string | undefined): TextAnnotationProps | undefined {\n  if (!json) return undefined;\n  try {\n    return JSON.parse(json);\n  } catch {\n    return undefined;\n  }\n}\n\nfunction getElementGeometryBuilderParams(iModel: IModelDb, modelId: Id64String, _placementProps: PlacementProps, stringifiedAnnotationProps: string, categoryId: Id64String, _subCategory?: Id64String): ElementGeometryBuilderParams {\n  const annotationProps = parseTextAnnotationData(stringifiedAnnotationProps);\n  const textBlock = TextAnnotation.fromJSON(annotationProps).textBlock;\n  const textStyleResolver = new TextStyleResolver({textBlock, iModel, modelId});\n  const layout = layoutTextBlock({ iModel, textBlock, textStyleResolver });\n  const builder = new ElementGeometry.Builder();\n  appendTextAnnotationGeometry({ layout, textStyleResolver, annotationProps: annotationProps ?? {}, builder, categoryId })\n\n  return { entryArray: builder.entries };\n}\n\n/** An element that displays textual content within a 2d model.\n * The text is stored as a [TextAnnotation]($common) from which the element's [geometry]($docs/learning/common/GeometryStream.md) and [Placement]($common) are computed.\n * @see [[setAnnotation]] to change the textual content.\n * @public @preview\n */\nexport class TextAnnotation2d extends AnnotationElement2d {\n  /** @internal */\n  public static override get className(): string { return \"TextAnnotation2d\"; }\n  /** Optional string containing the data associated with the text annotation. */\n  private _textAnnotationData?: string;\n\n  /** Extract the textual content, if present.\n   * @see [[setAnnotation]] to change it.\n   */\n  public getAnnotation(): TextAnnotation | undefined {\n    const textAnnotationProps = parseTextAnnotationData(this._textAnnotationData);\n    return textAnnotationProps ? TextAnnotation.fromJSON(textAnnotationProps) : undefined;\n  }\n\n  /** Change the textual content of the `TextAnnotation2d`.\n   * @see [[getAnnotation]] to extract the current annotation.\n   * @param annotation The new annotation\n   */\n  public setAnnotation(annotation: TextAnnotation) {\n    this._textAnnotationData = annotation ? JSON.stringify(annotation.toJSON()) : undefined;\n  }\n\n  protected constructor(props: TextAnnotation2dProps, iModel: IModelDb) {\n    super(props, iModel);\n    this._textAnnotationData = props.textAnnotationData;\n  }\n\n  /** Creates a new instance of `TextAnnotation2d` from its JSON representation. */\n  public static fromJSON(props: TextAnnotation2dProps, iModel: IModelDb): TextAnnotation2d {\n    return new TextAnnotation2d(props, iModel);\n  }\n\n  /**\n   * Converts the current `TextAnnotation2d` instance to its JSON representation.\n   * It also computes the `elementGeometryBuilderParams` property used to create the GeometryStream.\n\n   * @inheritdoc\n   */\n  public override toJSON(): TextAnnotation2dProps {\n    const props = super.toJSON() as TextAnnotation2dProps;\n    props.textAnnotationData = this._textAnnotationData;\n    if (this._textAnnotationData) {\n      props.elementGeometryBuilderParams = getElementGeometryBuilderParams(this.iModel, this.model, this.placement, this._textAnnotationData, this.category);\n    }\n\n    return props;\n  }\n\n  /** Creates a new `TextAnnotation2d` instance with the specified properties.\n   * @param iModelDb The iModel.\n   * @param category The category ID for the annotation.\n   * @param model The model ID where the annotation will be placed.\n   * @param placement The placement properties for the annotation.\n   * @param textAnnotationData Optional [[TextAnnotation]] JSON representation used to create the `TextAnnotation2d`. Essentially an empty element if not provided.\n   * @param code Optional code for the element.\n   */\n  public static create(iModelDb: IModelDb, category: Id64String, model: Id64String, placement: Placement2dProps, textAnnotationData?: TextAnnotationProps, code?: CodeProps): TextAnnotation2d {\n    const props: TextAnnotation2dProps = {\n      classFullName: this.classFullName,\n      textAnnotationData: JSON.stringify(textAnnotationData),\n      placement,\n      model,\n      category,\n      code: code ?? Code.createEmpty(),\n    }\n    return new this(props, iModelDb);\n  }\n\n  /**\n   * Updates the geometry of the TextAnnotation2d on insert.\n   * @inheritdoc\n   * @beta\n   */\n  protected static override onInsert(arg: OnElementPropsArg): void {\n    super.onInsert(arg);\n    this.updateGeometry(arg.iModel, arg.props as TextAnnotation2dProps);\n  }\n\n  /**\n   * Updates the geometry of the TextAnnotation2d on update.\n   * @inheritdoc\n   * @beta\n   */\n  protected static override onUpdate(arg: OnElementPropsArg): void {\n    super.onUpdate(arg);\n    this.updateGeometry(arg.iModel, arg.props as TextAnnotation2dProps);\n  }\n\n  /**\n   * Populates the `elementGeometryBuilderParams` property in the [TextAnnotation2dProps]($common).\n   * It only does this if the `elementGeometryBuilderParams` is not already set and if there is actually a text annotation to produce geometry for.\n   */\n  protected static updateGeometry(iModelDb: IModelDb, props: TextAnnotation2dProps): void {\n    if (props.elementGeometryBuilderParams || !props.textAnnotationData) {\n      return;\n    }\n\n    props.elementGeometryBuilderParams = getElementGeometryBuilderParams(iModelDb, props.model, props.placement ?? Placement2d.fromJSON(), props.textAnnotationData, props.category);\n  }\n\n  /**\n   * Collects reference IDs used by this `TextAnnotation2d`.\n   * @inheritdoc\n   */\n  protected override collectReferenceIds(ids: EntityReferenceSet): void {\n    super.collectReferenceIds(ids);\n    const annotation = this.getAnnotation();\n    if (!annotation) {\n      return;\n    }\n    if (annotation.textBlock.styleId)\n      ids.addElement(annotation.textBlock.styleId);\n  }\n}\n\n/** An element that displays textual content within a 3d model.\n * The text is stored as a [TextAnnotation]($common) from which the element's [geometry]($docs/learning/common/GeometryStream.md) and [Placement]($common) are computed.\n * @see [[setAnnotation]] to change the textual content.\n * @public @preview\n */\nexport class TextAnnotation3d extends GraphicalElement3d {\n  /** @internal */\n  public static override get className(): string { return \"TextAnnotation3d\"; }\n  /** Optional string containing the data associated with the text annotation. */\n  private _textAnnotationData?: string;\n\n  /** Extract the textual content, if present.\n   * @see [[setAnnotation]] to change it.\n   */\n  public getAnnotation(): TextAnnotation | undefined {\n    const textAnnotationProps = parseTextAnnotationData(this._textAnnotationData);\n    return textAnnotationProps ? TextAnnotation.fromJSON(textAnnotationProps) : undefined;\n  }\n\n  /** Change the textual content of the `TextAnnotation3d`.\n   * @see [[getAnnotation]] to extract the current annotation.\n   * @param annotation The new annotation\n   */\n  public setAnnotation(annotation: TextAnnotation) {\n    this._textAnnotationData = annotation ? JSON.stringify(annotation.toJSON()) : undefined;\n  }\n\n  protected constructor(props: TextAnnotation3dProps, iModel: IModelDb) {\n    super(props, iModel);\n    this._textAnnotationData = props.textAnnotationData;\n  }\n\n  /** Creates a new instance of `TextAnnotation3d` from its JSON representation. */\n  public static fromJSON(props: TextAnnotation3dProps, iModel: IModelDb): TextAnnotation3d {\n    return new TextAnnotation3d(props, iModel);\n  }\n\n  /**\n   * Converts the current `TextAnnotation3d` instance to its JSON representation.\n   * It also computes the `elementGeometryBuilderParams` property used to create the GeometryStream.\n   * @inheritdoc\n   */\n  public override toJSON(): TextAnnotation3dProps {\n    const props = super.toJSON() as TextAnnotation3dProps;\n    props.textAnnotationData = this._textAnnotationData;\n    if (this._textAnnotationData) {\n      props.elementGeometryBuilderParams = getElementGeometryBuilderParams(this.iModel, this.model, this.placement, this._textAnnotationData, this.category);\n    }\n\n    return props;\n  }\n\n  /** Creates a new `TextAnnotation3d` instance with the specified properties.\n   * @param iModelDb The iModel.\n   * @param category The category ID for the annotation.\n   * @param model The model ID where the annotation will be placed.\n   * @param placement The placement properties for the annotation.\n   * @param textAnnotationData Optional [[TextAnnotation]] JSON representation used to create the `TextAnnotation3d`. Essentially an empty element if not provided.\n   * @param code Optional code for the element.\n   */\n  public static create(iModelDb: IModelDb, category: Id64String, model: Id64String, placement: Placement3dProps, textAnnotationData?: TextAnnotationProps, code?: CodeProps): TextAnnotation3d {\n    const props: TextAnnotation3dProps = {\n      classFullName: this.classFullName,\n      textAnnotationData: JSON.stringify(textAnnotationData),\n      placement,\n      model,\n      category,\n      code: code ?? Code.createEmpty(),\n    }\n    return new this(props, iModelDb);\n  }\n\n  /**\n   * Updates the geometry of the TextAnnotation3d on insert.\n   * @inheritdoc\n   * @beta\n   */\n  protected static override onInsert(arg: OnElementPropsArg): void {\n    super.onInsert(arg);\n    this.updateGeometry(arg.iModel, arg.props as TextAnnotation3dProps);\n  }\n\n  /**\n   * Updates the geometry of the TextAnnotation3d on update.\n   * @inheritdoc\n   * @beta\n   */\n  protected static override onUpdate(arg: OnElementPropsArg): void {\n    super.onUpdate(arg);\n    this.updateGeometry(arg.iModel, arg.props as TextAnnotation3dProps);\n  }\n\n  /**\n   * Populates the `elementGeometryBuilderParams` property in the [TextAnnotation3dProps]($common).\n   * It only does this if the `elementGeometryBuilderParams` is not already set and if there is actually a text annotation to produce geometry for.\n   */\n  protected static updateGeometry(iModelDb: IModelDb, props: TextAnnotation3dProps): void {\n    if (props.elementGeometryBuilderParams || !props.textAnnotationData) {\n      return;\n    }\n\n    props.elementGeometryBuilderParams = getElementGeometryBuilderParams(iModelDb, props.model, props.placement ?? Placement3d.fromJSON(), props.textAnnotationData, props.category);\n  }\n\n  /**\n   * Collects reference IDs used by this `TextAnnotation3d`.\n   * @inheritdoc\n   */\n  protected override collectReferenceIds(ids: EntityReferenceSet): void {\n    super.collectReferenceIds(ids);\n    const annotation = this.getAnnotation();\n    if (!annotation) {\n      return;\n    }\n    if (annotation.textBlock.styleId)\n      ids.addElement(annotation.textBlock.styleId);\n  }\n}\n\n/**\n * The definition element that holds text style information.\n * The style is stored as a [TextStyleSettings]($common).\n * @beta\n */\nexport class AnnotationTextStyle extends DefinitionElement {\n  /** @internal */\n  public static override get className(): string { return \"AnnotationTextStyle\"; }\n  /**\n   * Optional text describing the `AnnotationTextStyle`.\n   */\n  public description?: string;\n  /**\n   * The text style settings for the `AnnotationTextStyle`.\n   * @see [[TextStyleSettings]] for more information.\n   */\n  public settings: TextStyleSettings;\n\n  protected constructor(props: AnnotationTextStyleProps, iModel: IModelDb) {\n    super(props, iModel);\n    this.description = props.description;\n    const settingsProps = AnnotationTextStyle.parseTextStyleSettings(props.settings);\n    this.settings = TextStyleSettings.fromJSON(settingsProps);\n  }\n\n  /**\n   * Creates a Code for an `AnnotationTextStyle` given a name that is meant to be unique within the scope of the specified DefinitionModel.\n   *\n   * @param iModel - The IModelDb.\n   * @param definitionModelId - The ID of the DefinitionModel that contains the AnnotationTextStyle and provides the scope for its name.\n   * @param name - The AnnotationTextStyle name.\n   */\n  public static createCode(iModel: IModelDb, definitionModelId: CodeScopeProps, name: string): Code {\n    const codeSpec: CodeSpec = iModel.codeSpecs.getByName(BisCodeSpec.annotationTextStyle);\n    return new Code({ spec: codeSpec.id, scope: definitionModelId, value: name });\n  }\n\n  /**\n   * Creates a new instance of `AnnotationTextStyle` with the specified properties.\n   *\n   * @param iModelDb - The iModelDb.\n   * @param definitionModelId - The ID of the [[DefinitionModel]].\n   * @param name - The name to assign to the `AnnotationTextStyle`.\n   * @param settings - Optional text style settings used to create the `AnnotationTextStyle`. Default settings will be used if not provided.\n   * @param description - Optional description for the `AnnotationTextStyle`.\n   */\n  public static create(iModelDb: IModelDb, definitionModelId: Id64String, name: string, settings?: TextStyleSettingsProps, description?: string) {\n    const props: AnnotationTextStyleProps = {\n      classFullName: this.classFullName,\n      model: definitionModelId,\n      code: this.createCode(iModelDb, definitionModelId, name).toJSON(),\n      description,\n      settings: JSON.stringify(settings),\n    }\n    return new this(props, iModelDb);\n  }\n\n  /**\n   * Converts the current `AnnotationTextStyle` instance to its JSON representation.\n   * @inheritdoc\n   */\n  public override toJSON(): AnnotationTextStyleProps {\n    const props = super.toJSON() as AnnotationTextStyleProps;\n    props.description = this.description;\n    props.settings = JSON.stringify(this.settings.toJSON());\n    return props;\n  }\n\n  /** Creates a new instance of `AnnotationTextStyle` from its JSON representation. */\n  public static fromJSON(props: AnnotationTextStyleProps, iModel: IModelDb): AnnotationTextStyle {\n    return new AnnotationTextStyle(props, iModel);\n  }\n\n  /**\n   * Validates that the AnnotationTextStyle's settings are valid before insert.\n   * @inheritdoc\n   * @beta\n   */\n  protected static override onInsert(arg: OnElementPropsArg): void {\n    super.onInsert(arg);\n    this.validateSettings(arg.props as AnnotationTextStyleProps);\n  }\n\n  /**\n   * Validates that the AnnotationTextStyle's settings are valid before update.\n   * @inheritdoc\n   * @beta\n   */\n  protected static override onUpdate(arg: OnElementPropsArg): void {\n    super.onUpdate(arg);\n    this.validateSettings(arg.props as AnnotationTextStyleProps);\n  }\n\n  private static validateSettings(props: AnnotationTextStyleProps): void {\n    const settingProps = AnnotationTextStyle.parseTextStyleSettings(props.settings);\n    if (!settingProps) return;\n    const settings = TextStyleSettings.fromJSON(settingProps);\n    const errors = settings.getValidationErrors();\n    if (errors.length > 0) {\n      throw new Error(`Invalid AnnotationTextStyle settings: ${errors.join(\", \")}`);\n    }\n  }\n\n  private static parseTextStyleSettings(json: string | undefined): TextStyleSettingsProps | undefined {\n    if (!json) return undefined;\n    try {\n      return JSON.parse(json);\n    } catch {\n      return undefined;\n    }\n  }\n}\n\n\n"]}

package/lib/cjs/annotations/TextAnnotationGeometry.d.ts

@@ -2,7 +2,7 @@
  * @module ElementGeometry
  */
 import { ElementGeometry, TextAnnotationProps } from "@itwin/core-common";
-import { TextBlockLayout } from "./TextBlockLayout";
+import { TextBlockLayout, TextStyleResolver } from "./TextBlockLayout";
 import { Id64String } from "@itwin/core-bentley";
 /**
  * Properties required to compute the geometry of a text annotation.
@@ -14,6 +14,8 @@ export interface AppendTextAnnotationGeometryArgs {
     annotationProps: TextAnnotationProps;
     /** Layout provided by calling [[layoutTextBlock]] */
     layout: TextBlockLayout;
+    /** [[TextStyleResolver]] used to get styling and scale information for creating geometry. */
+    textStyleResolver: TextStyleResolver;
     /** Builder that will be added to in place */
     builder: ElementGeometry.Builder;
     /** The category the element will belong to. This will passed into the [[GeometryParams]] */

package/lib/cjs/annotations/TextAnnotationGeometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextAnnotationGeometry.d.ts","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationGeometry.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAY,eAAe,EAA+C,mBAAmB,EAAuB,MAAM,oBAAoB,CAAC;AACtJ,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAQ,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKvD;;;;GAIG;AACH,MAAM,WAAW,gCAAgC;IAC/C,4GAA4G;IAC5G,eAAe,EAAE,mBAAmB,CAAC;IACrC,qDAAqD;IACrD,MAAM,EAAE,eAAe,CAAC;IACxB,6CAA6C;IAC7C,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC;IACjC,4FAA4F;IAC5F,UAAU,EAAE,UAAU,CAAA;IACtB,yGAAyG;IACzG,aAAa,CAAC,EAAE,UAAU,CAAA;IAC1B,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gCAAgC,GAAG,OAAO,CA6B7F"}
+{"version":3,"file":"TextAnnotationGeometry.d.ts","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationGeometry.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAY,eAAe,EAA+C,mBAAmB,EAAqB,MAAM,oBAAoB,CAAC;AACpJ,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAQ,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAKvD;;;;GAIG;AACH,MAAM,WAAW,gCAAgC;IAC/C,4GAA4G;IAC5G,eAAe,EAAE,mBAAmB,CAAC;IACrC,qDAAqD;IACrD,MAAM,EAAE,eAAe,CAAC;IACxB,6FAA6F;IAC7F,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,6CAA6C;IAC7C,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC;IACjC,4FAA4F;IAC5F,UAAU,EAAE,UAAU,CAAA;IACtB,yGAAyG;IACzG,aAAa,CAAC,EAAE,UAAU,CAAA;IAC1B,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,gCAAgC,GAAG,OAAO,CA8B7F"}

package/lib/cjs/annotations/TextAnnotationGeometry.js

@@ -20,27 +20,26 @@ const LeaderGeometry_1 = require("./LeaderGeometry");
  */
 function appendTextAnnotationGeometry(props) {
     const annotation = core_common_1.TextAnnotation.fromJSON(props.annotationProps);
-    const range = core_geometry_1.Range2d.fromJSON(props.layout.range);
-    const transform = annotation.computeTransform(range);
+    const transform = annotation.computeTransform(props.layout.range, props.textStyleResolver.scaleFactor);
     let result = true;
     // Construct the TextBlockGeometry
     const params = new core_common_1.GeometryParams(props.categoryId, props.subCategoryId);
-    const entries = (0, TextBlockGeometry_1.produceTextBlockGeometry)(props.layout, annotation.computeTransform(props.layout.range));
+    const entries = (0, TextBlockGeometry_1.produceTextBlockGeometry)(props.layout, transform.clone());
     result = result && props.builder.appendTextBlock(entries, params);
     // Construct the frame geometry
-    if (annotation.frame && annotation.frame.shape !== "none") {
-        result = result && (0, FrameGeometry_1.appendFrameToBuilder)(props.builder, annotation.frame, range, transform, params);
+    if (props.textStyleResolver.blockSettings.frame.shape !== "none") {
+        result = result && (0, FrameGeometry_1.appendFrameToBuilder)(props.builder, props.textStyleResolver.blockSettings.frame, props.layout.range, transform.clone(), params);
     }
     // Construct the leader geometry
     if (annotation.leaders && annotation.leaders.length > 0) {
-        result = result && (0, LeaderGeometry_1.appendLeadersToBuilder)(props.builder, annotation.leaders, props.layout, transform, params, annotation.frame);
+        result = result && (0, LeaderGeometry_1.appendLeadersToBuilder)(props.builder, annotation.leaders, props.layout, transform.clone(), params, props.textStyleResolver);
     }
     // Construct the debug geometry
     if (props.wantDebugGeometry) {
-        result = result && debugAnchorPoint(props.builder, annotation, props.layout, annotation.computeTransform(props.layout.range));
-        result = result && debugRunLayout(props.builder, props.layout, annotation.computeTransform(props.layout.range));
-        if (annotation.frame)
-            result = result && debugSnapPoints(props.builder, annotation.frame, props.layout.range, annotation.computeTransform(props.layout.range));
+        result = result && debugAnchorPoint(props.builder, annotation, props.layout, transform.clone());
+        result = result && debugRunLayout(props.builder, props.layout, transform.clone());
+        if (props.textStyleResolver.blockSettings.frame.shape !== "none")
+            result = result && debugSnapPoints(props.builder, props.textStyleResolver.blockSettings, props.layout.range, transform.clone());
     }
     return result;
 }
@@ -75,13 +74,13 @@ function debugAnchorPoint(builder, annotation, layout, transform) {
     return result;
 }
 /** Draws the interval points defined by calling [[computeIntervalPoints]]. The points are shown as black dots 5x larger than the borderWeight */
-function debugSnapPoints(builder, frame, range, transform) {
-    if (undefined === frame.shape || frame.shape === "none")
+function debugSnapPoints(builder, style, range, transform) {
+    if (style.frame.shape === "none")
         return false;
-    const points = (0, FrameGeometry_1.computeIntervalPoints)({ frame: frame.shape, range, transform, lineIntervalFactor: 0.5, arcIntervalFactor: 0.25 });
+    const points = (0, FrameGeometry_1.computeIntervalPoints)({ frame: style.frame.shape, range, transform, lineIntervalFactor: 0.5, arcIntervalFactor: 0.25 });
     const params = new core_common_1.GeometryParams(core_bentley_1.Id64.invalid);
     params.lineColor = core_common_1.ColorDef.black;
-    params.weight = (frame.borderWeight ?? 1) * 5; // We want the dots to be bigger than the frame so we can see them.
+    params.weight = style.frame.borderWeight * 5; // We want the dots to be bigger than the frame so we can see them.
     params.fillDisplay = core_common_1.FillDisplay.Always;
     const result = builder.appendGeometryParamsChange(params) && builder.appendGeometryQuery(core_geometry_1.PointString3d.create(points));
     return result;

package/lib/cjs/annotations/TextAnnotationGeometry.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextAnnotationGeometry.js","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationGeometry.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module ElementGeometry\n */\n\nimport { ColorDef, ElementGeometry, FillDisplay, GeometryParams, TextAnnotation, TextAnnotationProps, TextFrameStyleProps } from \"@itwin/core-common\";\nimport { TextBlockLayout } from \"./TextBlockLayout\";\nimport { LineString3d, PointString3d, Range2d, Transform } from \"@itwin/core-geometry\";\nimport { Id64, Id64String } from \"@itwin/core-bentley\";\nimport { produceTextBlockGeometry } from \"./TextBlockGeometry\";\nimport { appendFrameToBuilder, computeIntervalPoints } from \"./FrameGeometry\";\nimport { appendLeadersToBuilder } from \"./LeaderGeometry\";\n\n/**\n * Properties required to compute the geometry of a text annotation.\n * @beta\n * @see [[appendTextAnnotationGeometry]] to append the geometry to an [[ElementGeometry.Builder]].\n */\nexport interface AppendTextAnnotationGeometryArgs {\n  /** The annotation to be drawn. Be sure to include a TextBlock with runs or no geometry will be produced. */\n  annotationProps: TextAnnotationProps;\n  /** Layout provided by calling [[layoutTextBlock]] */\n  layout: TextBlockLayout;\n  /** Builder that will be added to in place */\n  builder: ElementGeometry.Builder;\n  /** The category the element will belong to. This will passed into the [[GeometryParams]] */\n  categoryId: Id64String\n  /** The optional sub-category the element will belong to. This will passed into the [[GeometryParams]] */\n  subCategoryId?: Id64String\n  /** Whether or not to draw geometry for things like the snap points, range, and anchor point */\n  wantDebugGeometry?: boolean;\n}\n\n/** Constructs the TextBlockGeometry and frame geometry and appends the geometry to the provided builder.\n * @returns true if the geometry was successfully appended.\n * @beta\n */\nexport function appendTextAnnotationGeometry(props: AppendTextAnnotationGeometryArgs): boolean {\n  const annotation = TextAnnotation.fromJSON(props.annotationProps);\n  const range = Range2d.fromJSON(props.layout.range);\n  const transform = annotation.computeTransform(range);\n  let result = true;\n\n  // Construct the TextBlockGeometry\n  const params = new GeometryParams(props.categoryId, props.subCategoryId);\n  const entries = produceTextBlockGeometry(props.layout, annotation.computeTransform(props.layout.range));\n  result = result && props.builder.appendTextBlock(entries, params);\n\n  // Construct the frame geometry\n  if (annotation.frame && annotation.frame.shape !== \"none\") {\n    result = result && appendFrameToBuilder(props.builder, annotation.frame, range, transform, params);\n  }\n\n  // Construct the leader geometry\n  if (annotation.leaders && annotation.leaders.length > 0) {\n    result = result && appendLeadersToBuilder(props.builder, annotation.leaders, props.layout, transform, params, annotation.frame);\n  }\n\n  // Construct the debug geometry\n  if (props.wantDebugGeometry) {\n    result = result && debugAnchorPoint(props.builder, annotation, props.layout, annotation.computeTransform(props.layout.range));\n    result = result && debugRunLayout(props.builder, props.layout, annotation.computeTransform(props.layout.range));\n    if (annotation.frame) result = result && debugSnapPoints(props.builder, annotation.frame, props.layout.range, annotation.computeTransform(props.layout.range));\n  }\n\n  return result;\n};\n\n/**\n * Draws the anchor point and margins of the text annotation.\n * The anchor point is the point around which the text rotates and is drawn as a blue x (1m by 1m).\n * The margins are drawn as a blue box.\n * The text range is drawn as a red box.\n */\nfunction debugAnchorPoint(builder: ElementGeometry.Builder, annotation: TextAnnotation, layout: TextBlockLayout, transform: Transform): boolean {\n  const range = Range2d.fromJSON(layout.range);\n  const debugAnchorPt = transform.multiplyPoint3d(annotation.computeAnchorPoint(range));\n\n  // Make it blue\n  const blueLineParams = new GeometryParams(Id64.invalid);\n  blueLineParams.lineColor = ColorDef.blue;\n  let result = builder.appendGeometryParamsChange(blueLineParams);\n\n  // Draw a blue box to show the element's margin\n  const marginCorners = range.corners3d(true);\n  transform.multiplyPoint3dArrayInPlace(marginCorners);\n  result = result && builder.appendGeometryQuery(LineString3d.create(marginCorners));\n\n  // Draw a blue x to show the anchor point - Rotation occurs around this point. The x will be 1 m by 1 m.\n  result = result && builder.appendGeometryQuery(LineString3d.create(debugAnchorPt.plusXYZ(-1, -1), debugAnchorPt.plusXYZ(1, 1)));\n  result = result && builder.appendGeometryQuery(LineString3d.create(debugAnchorPt.plusXYZ(1, -1), debugAnchorPt.plusXYZ(-1, 1)));\n\n  // Draw a red box to show the text range\n  const redLineParams = new GeometryParams(Id64.invalid);\n  redLineParams.lineColor = ColorDef.red;\n  result = result && builder.appendGeometryParamsChange(redLineParams);\n\n  const rangeCorners = layout.textRange.corners3d(true);\n  transform.multiplyPoint3dArrayInPlace(rangeCorners);\n  result = result && builder.appendGeometryQuery(LineString3d.create(rangeCorners));\n\n  return result;\n}\n\n/** Draws the interval points defined by calling [[computeIntervalPoints]]. The points are shown as black dots 5x larger than the borderWeight */\nfunction debugSnapPoints(builder: ElementGeometry.Builder, frame: TextFrameStyleProps, range: Range2d, transform: Transform): boolean {\n  if (undefined === frame.shape || frame.shape === \"none\")\n    return false;\n  const points = computeIntervalPoints({ frame: frame.shape, range, transform, lineIntervalFactor: 0.5, arcIntervalFactor: 0.25 });\n\n  const params = new GeometryParams(Id64.invalid);\n  params.lineColor = ColorDef.black;\n  params.weight = (frame.borderWeight ?? 1) * 5; // We want the dots to be bigger than the frame so we can see them.\n  params.fillDisplay = FillDisplay.Always;\n\n  const result = builder.appendGeometryParamsChange(params) && builder.appendGeometryQuery(PointString3d.create(points));\n  return result;\n}\n\n/**\n * Draws debug geometry for each line and run in a TextBlockLayout.\n *\n * For each line and run, this function draws boxes to visualize their layout and boundaries.\n * Different run types (e.g., text, linebreak, fraction, tab) are assigned distinct colors for clarity.\n * This is useful for debugging text layout and alignment issues.\n *\n * @param builder - The geometry builder to append debug geometry to.\n * @param layout - The text block layout containing lines and runs to visualize.\n * @param documentTransform - The transform to apply to the entire document.\n * @returns True if all debug geometry was successfully appended.\n */\nfunction debugRunLayout(builder: ElementGeometry.Builder, layout: TextBlockLayout, documentTransform: Transform): boolean {\n  let result = true; // Tracks if all geometry was appended successfully\n  let color = ColorDef.black; // Current color for the run type\n  let lastColor = color; // Last color used, to minimize param changes\n\n  // Map run types to debug colors\n  const colors = {\n    \"text\": ColorDef.fromString(\"orange\"),\n    \"linebreak\": ColorDef.fromString(\"yellow\"),\n    \"fraction\": ColorDef.fromString(\"green\"),\n    \"tab\": ColorDef.fromString(\"aquamarine\"),\n  }\n\n  layout.lines.forEach(line => {\n    // Apply the line's offset transform\n    const lineTrans = Transform.createTranslationXYZ(line.offsetFromDocument.x, line.offsetFromDocument.y, 0);\n    documentTransform.multiplyTransformTransform(lineTrans, lineTrans);\n\n    line.runs.forEach(run => {\n      // Determine color for this run type\n      color = colors[run.source.type] ?? ColorDef.black;\n\n      // Only change geometry params if the color changes\n      if (!lastColor.equals(color)) {\n        const colorParams = new GeometryParams(Id64.invalid);\n        colorParams.lineColor = color;\n        result = result && builder.appendGeometryParamsChange(colorParams);\n        lastColor = color;\n      }\n\n      // Apply the line's offset to the run's offset\n      const runTrans = Transform.createTranslationXYZ(run.offsetFromLine.x, run.offsetFromLine.y, 0);\n      lineTrans.multiplyTransformTransform(runTrans, runTrans);\n\n      // Draw the enclosing range for the run\n      const runCorners = run.range.corners3d(true);\n      runTrans.multiplyPoint3dArrayInPlace(runCorners);\n      result = result && builder.appendGeometryQuery(LineString3d.create(runCorners));\n    });\n  });\n\n  return result;\n}"]}
+{"version":3,"file":"TextAnnotationGeometry.js","sourceRoot":"","sources":["../../../src/annotations/TextAnnotationGeometry.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module ElementGeometry\n */\n\nimport { ColorDef, ElementGeometry, FillDisplay, GeometryParams, TextAnnotation, TextAnnotationProps, TextStyleSettings } from \"@itwin/core-common\";\nimport { TextBlockLayout, TextStyleResolver } from \"./TextBlockLayout\";\nimport { LineString3d, PointString3d, Range2d, Transform } from \"@itwin/core-geometry\";\nimport { Id64, Id64String } from \"@itwin/core-bentley\";\nimport { produceTextBlockGeometry } from \"./TextBlockGeometry\";\nimport { appendFrameToBuilder, computeIntervalPoints } from \"./FrameGeometry\";\nimport { appendLeadersToBuilder } from \"./LeaderGeometry\";\n\n/**\n * Properties required to compute the geometry of a text annotation.\n * @beta\n * @see [[appendTextAnnotationGeometry]] to append the geometry to an [[ElementGeometry.Builder]].\n */\nexport interface AppendTextAnnotationGeometryArgs {\n  /** The annotation to be drawn. Be sure to include a TextBlock with runs or no geometry will be produced. */\n  annotationProps: TextAnnotationProps;\n  /** Layout provided by calling [[layoutTextBlock]] */\n  layout: TextBlockLayout;\n  /** [[TextStyleResolver]] used to get styling and scale information for creating geometry. */\n  textStyleResolver: TextStyleResolver;\n  /** Builder that will be added to in place */\n  builder: ElementGeometry.Builder;\n  /** The category the element will belong to. This will passed into the [[GeometryParams]] */\n  categoryId: Id64String\n  /** The optional sub-category the element will belong to. This will passed into the [[GeometryParams]] */\n  subCategoryId?: Id64String\n  /** Whether or not to draw geometry for things like the snap points, range, and anchor point */\n  wantDebugGeometry?: boolean;\n}\n\n/** Constructs the TextBlockGeometry and frame geometry and appends the geometry to the provided builder.\n * @returns true if the geometry was successfully appended.\n * @beta\n */\nexport function appendTextAnnotationGeometry(props: AppendTextAnnotationGeometryArgs): boolean {\n  const annotation = TextAnnotation.fromJSON(props.annotationProps);\n\n  const transform = annotation.computeTransform(props.layout.range, props.textStyleResolver.scaleFactor);\n\n  let result = true;\n\n  // Construct the TextBlockGeometry\n  const params = new GeometryParams(props.categoryId, props.subCategoryId);\n  const entries = produceTextBlockGeometry(props.layout, transform.clone());\n  result = result && props.builder.appendTextBlock(entries, params);\n\n  // Construct the frame geometry\n  if (props.textStyleResolver.blockSettings.frame.shape !== \"none\") {\n    result = result && appendFrameToBuilder(props.builder, props.textStyleResolver.blockSettings.frame, props.layout.range, transform.clone(), params);\n  }\n\n  // Construct the leader geometry\n  if (annotation.leaders && annotation.leaders.length > 0) {\n    result = result && appendLeadersToBuilder(props.builder, annotation.leaders, props.layout, transform.clone(), params, props.textStyleResolver);\n  }\n\n  // Construct the debug geometry\n  if (props.wantDebugGeometry) {\n    result = result && debugAnchorPoint(props.builder, annotation, props.layout, transform.clone());\n    result = result && debugRunLayout(props.builder, props.layout, transform.clone());\n    if (props.textStyleResolver.blockSettings.frame.shape !== \"none\") result = result && debugSnapPoints(props.builder, props.textStyleResolver.blockSettings, props.layout.range, transform.clone());\n  }\n\n  return result;\n};\n\n/**\n * Draws the anchor point and margins of the text annotation.\n * The anchor point is the point around which the text rotates and is drawn as a blue x (1m by 1m).\n * The margins are drawn as a blue box.\n * The text range is drawn as a red box.\n */\nfunction debugAnchorPoint(builder: ElementGeometry.Builder, annotation: TextAnnotation, layout: TextBlockLayout, transform: Transform): boolean {\n  const range = Range2d.fromJSON(layout.range);\n  const debugAnchorPt = transform.multiplyPoint3d(annotation.computeAnchorPoint(range));\n\n  // Make it blue\n  const blueLineParams = new GeometryParams(Id64.invalid);\n  blueLineParams.lineColor = ColorDef.blue;\n  let result = builder.appendGeometryParamsChange(blueLineParams);\n\n  // Draw a blue box to show the element's margin\n  const marginCorners = range.corners3d(true);\n  transform.multiplyPoint3dArrayInPlace(marginCorners);\n  result = result && builder.appendGeometryQuery(LineString3d.create(marginCorners));\n\n  // Draw a blue x to show the anchor point - Rotation occurs around this point. The x will be 1 m by 1 m.\n  result = result && builder.appendGeometryQuery(LineString3d.create(debugAnchorPt.plusXYZ(-1, -1), debugAnchorPt.plusXYZ(1, 1)));\n  result = result && builder.appendGeometryQuery(LineString3d.create(debugAnchorPt.plusXYZ(1, -1), debugAnchorPt.plusXYZ(-1, 1)));\n\n  // Draw a red box to show the text range\n  const redLineParams = new GeometryParams(Id64.invalid);\n  redLineParams.lineColor = ColorDef.red;\n  result = result && builder.appendGeometryParamsChange(redLineParams);\n\n  const rangeCorners = layout.textRange.corners3d(true);\n  transform.multiplyPoint3dArrayInPlace(rangeCorners);\n  result = result && builder.appendGeometryQuery(LineString3d.create(rangeCorners));\n\n  return result;\n}\n\n/** Draws the interval points defined by calling [[computeIntervalPoints]]. The points are shown as black dots 5x larger than the borderWeight */\nfunction debugSnapPoints(builder: ElementGeometry.Builder, style: TextStyleSettings, range: Range2d, transform: Transform): boolean {\n  if (style.frame.shape === \"none\")\n    return false;\n  const points = computeIntervalPoints({ frame: style.frame.shape, range, transform, lineIntervalFactor: 0.5, arcIntervalFactor: 0.25 });\n\n  const params = new GeometryParams(Id64.invalid);\n  params.lineColor = ColorDef.black;\n  params.weight = style.frame.borderWeight * 5; // We want the dots to be bigger than the frame so we can see them.\n  params.fillDisplay = FillDisplay.Always;\n\n  const result = builder.appendGeometryParamsChange(params) && builder.appendGeometryQuery(PointString3d.create(points));\n  return result;\n}\n\n/**\n * Draws debug geometry for each line and run in a TextBlockLayout.\n *\n * For each line and run, this function draws boxes to visualize their layout and boundaries.\n * Different run types (e.g., text, linebreak, fraction, tab) are assigned distinct colors for clarity.\n * This is useful for debugging text layout and alignment issues.\n *\n * @param builder - The geometry builder to append debug geometry to.\n * @param layout - The text block layout containing lines and runs to visualize.\n * @param documentTransform - The transform to apply to the entire document.\n * @returns True if all debug geometry was successfully appended.\n */\nfunction debugRunLayout(builder: ElementGeometry.Builder, layout: TextBlockLayout, documentTransform: Transform): boolean {\n  let result = true; // Tracks if all geometry was appended successfully\n  let color = ColorDef.black; // Current color for the run type\n  let lastColor = color; // Last color used, to minimize param changes\n\n  // Map run types to debug colors\n  const colors = {\n    \"text\": ColorDef.fromString(\"orange\"),\n    \"linebreak\": ColorDef.fromString(\"yellow\"),\n    \"fraction\": ColorDef.fromString(\"green\"),\n    \"tab\": ColorDef.fromString(\"aquamarine\"),\n  }\n\n  layout.lines.forEach(line => {\n    // Apply the line's offset transform\n    const lineTrans = Transform.createTranslationXYZ(line.offsetFromDocument.x, line.offsetFromDocument.y, 0);\n    documentTransform.multiplyTransformTransform(lineTrans, lineTrans);\n\n    line.runs.forEach(run => {\n      // Determine color for this run type\n      color = colors[run.source.type] ?? ColorDef.black;\n\n      // Only change geometry params if the color changes\n      if (!lastColor.equals(color)) {\n        const colorParams = new GeometryParams(Id64.invalid);\n        colorParams.lineColor = color;\n        result = result && builder.appendGeometryParamsChange(colorParams);\n        lastColor = color;\n      }\n\n      // Apply the line's offset to the run's offset\n      const runTrans = Transform.createTranslationXYZ(run.offsetFromLine.x, run.offsetFromLine.y, 0);\n      lineTrans.multiplyTransformTransform(runTrans, runTrans);\n\n      // Draw the enclosing range for the run\n      const runCorners = run.range.corners3d(true);\n      runTrans.multiplyPoint3dArrayInPlace(runCorners);\n      result = result && builder.appendGeometryQuery(LineString3d.create(runCorners));\n    });\n  });\n\n  return result;\n}"]}

package/lib/cjs/annotations/TextBlockLayout.d.ts

@@ -1,9 +1,10 @@
 /** @packageDocumentation
  * @module ElementGeometry
  */
-import { BaselineShift, FontId, FontType, FractionRun, LineLayoutResult, Paragraph, Run, RunLayoutResult, TabRun, TextBlock, TextBlockLayoutResult, TextRun, TextStyleSettings } from "@itwin/core-common";
+import { BaselineShift, FontId, FontType, FractionRun, LineLayoutResult, Paragraph, Run, RunLayoutResult, TabRun, TextAnnotationLeader, TextBlock, TextBlockLayoutResult, TextRun, TextStyleSettings } from "@itwin/core-common";
 import { Range2d } from "@itwin/core-geometry";
 import { IModelDb } from "../IModelDb";
+import { Id64String } from "@itwin/core-bentley";
 /** @internal */
 export interface TextLayoutRanges {
     layout: Range2d;
@@ -30,8 +31,8 @@ export type ComputeRangesForTextLayout = (args: ComputeRangesForTextLayoutArgs)
  * @internal
  */
 export type FindFontId = (name: string, type?: FontType) => FontId;
-/** @internal */
-export type FindTextStyle = (name: string) => TextStyleSettings;
+/** @internal chiefly for tests. */
+export type FindTextStyle = (id: Id64String) => TextStyleSettings;
 /**
  * Arguments supplied to [[computeLayoutTextBlockResult]].
  * @beta
@@ -39,12 +40,12 @@ export type FindTextStyle = (name: string) => TextStyleSettings;
 export interface LayoutTextBlockArgs {
     /** The text block whose extents are to be computed. */
     textBlock: TextBlock;
-    /** The iModel from which to obtain fonts and [TextStyle]($common)s when laying out glyphs. */
+    /** The iModel from which to obtain fonts and [[AnnotationTextStyle]]s when laying out glyphs. */
     iModel: IModelDb;
+    /** The text style resolver used to resolve effective text styles during layout. */
+    textStyleResolver: TextStyleResolver;
     /** @internal chiefly for tests, by default uses IModelJsNative.DgnDb.computeRangesForText. */
     computeTextRange?: ComputeRangesForTextLayout;
-    /** @internal chiefly for tests, by default looks up styles from a workspace. */
-    findTextStyle?: FindTextStyle;
     /** @internal chiefly for tests, by default uses IModelDb.fontMap. */
     findFontId?: FindFontId;
 }
@@ -60,7 +61,7 @@ export interface LayoutTextBlockArgs {
 export declare function layoutTextBlock(args: LayoutTextBlockArgs): TextBlockLayout;
 /**
  * Gets the result of laying out the the contents of a TextBlock into a series of lines containing runs.
- * The visual layout accounts for the [TextStyle]($common)s, fonts, and [TextBlock.width]($common). It applies word-wrapping if needed.
+ * The visual layout accounts for the [[AnnotationTextStyle]]s, fonts, and [TextBlock.width]($common). It applies word-wrapping if needed.
  * The layout returned matches the visual layout of the geometry produced by [[appendTextAnnotationGeometry]].
  * @beta
  */
@@ -85,17 +86,49 @@ export interface ComputeGraphemeOffsetsArgs extends LayoutTextBlockArgs {
  * @beta
  */
 export declare function computeGraphemeOffsets(args: ComputeGraphemeOffsetsArgs): Range2d[];
+/**
+ * Arguments used when constructing a [[TextStyleResolver]].
+ * @beta
+ */
+export interface TextStyleResolverArgs {
+    /** The text block whose styles are being resolved. */
+    textBlock: TextBlock;
+    /** The iModel from which to obtain [[AnnotationTextStyle]]s when resolving styles. */
+    iModel: IModelDb;
+    /** The ID of the model containing the text block, used to compute the scale factor. */
+    modelId?: Id64String;
+    /** @internal chiefly for tests, by default looks up an [[AnnotationTextStyle]] in the iModel by ID. */
+    findTextStyle?: FindTextStyle;
+}
+/**
+ * Resolves the effective style of TextBlockComponents and Leaders, taking into account overrides/style of the instance and its parent(s).
+ * @beta
+ */
+export declare class TextStyleResolver {
+    private readonly _textStyles;
+    private readonly _findTextStyle;
+    /** The resolved style of the TextBlock. */
+    readonly blockSettings: TextStyleSettings;
+    /** The scale factor of the model containing the TextBlock. */
+    readonly scaleFactor: number;
+    constructor(args: TextStyleResolverArgs);
+    private resolveParagraphSettingsImpl;
+    /** Looks up an [[AnnotationTextStyle]] by ID. Uses caching. */
+    findTextStyle(id: Id64String): TextStyleSettings;
+    /** Resolves the effective style for a [TextAnnotationLeader]($common). The TextAnnotationLeader should be a sibling of the provided TextBlock. */
+    resolveTextAnnotationLeaderSettings(leader: TextAnnotationLeader): TextStyleSettings;
+    /** Resolves the effective style for a [Paragraph]($common). Paragraph should be child of provided TextBlock. */
+    resolveParagraphSettings(paragraph: Paragraph): TextStyleSettings;
+    /** Resolves the effective style for a [Run]($common). Run should be child of provided Paragraph and TextBlock. */
+    resolveRunSettings(paragraph: Paragraph, run: Run): TextStyleSettings;
+}
 declare class LayoutContext {
+    readonly textStyleResolver: TextStyleResolver;
     private readonly _computeTextRange;
-    private readonly _findTextStyle;
     private readonly _findFontId;
-    private readonly _textStyles;
     private readonly _fontIds;
-    readonly blockSettings: TextStyleSettings;
-    constructor(block: TextBlock, _computeTextRange: ComputeRangesForTextLayout, _findTextStyle: FindTextStyle, _findFontId: FindFontId);
+    constructor(textStyleResolver: TextStyleResolver, _computeTextRange: ComputeRangesForTextLayout, _findFontId: FindFontId);
     findFontId(name: string): FontId;
-    findTextStyle(name: string): TextStyleSettings;
-    createRunSettings(run: Run): TextStyleSettings;
     computeRangeForText(chars: string, style: TextStyleSettings, baselineShift: BaselineShift): TextLayoutRanges;
     computeRangeForTextRun(style: TextStyleSettings, run: TextRun, charOffset: number, numChars: number): TextLayoutRanges;
     computeRangeForFractionRun(style: TextStyleSettings, source: FractionRun): {
@@ -126,7 +159,7 @@ export declare class RunLayout {
     style: TextStyleSettings;
     fontId: FontId;
     private constructor();
-    static create(source: Run, context: LayoutContext): RunLayout;
+    static create(source: Run, parentParagraph: Paragraph, context: LayoutContext): RunLayout;
     /** Compute a string representation, primarily for debugging purposes. */
     stringify(): string;
     canWrap(): this is {

package/lib/cjs/annotations/TextBlockLayout.d.ts.map

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

package/lib/cjs/annotations/TextBlockLayout.js

@@ -7,7 +7,7 @@
  * @module ElementGeometry
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextBlockLayout = exports.LineLayout = exports.RunLayout = void 0;
+exports.TextBlockLayout = exports.LineLayout = exports.RunLayout = exports.TextStyleResolver = void 0;
 exports.layoutTextBlock = layoutTextBlock;
 exports.computeLayoutTextBlockResult = computeLayoutTextBlockResult;
 exports.computeGraphemeOffsets = computeGraphemeOffsets;
@@ -15,6 +15,18 @@ const core_common_1 = require("@itwin/core-common");
 const core_geometry_1 = require("@itwin/core-geometry");
 const core_bentley_1 = require("@itwin/core-bentley");
 const LineBreaker = require("linebreak");
+const TextAnnotationElement_1 = require("./TextAnnotationElement");
+const Element_1 = require("../Element");
+/** @internal */
+function createFindTextStyleImpl(iModel) {
+    return function findTextStyleImpl(id) {
+        const annotationTextStyle = iModel.elements.tryGetElement(id);
+        if (annotationTextStyle && annotationTextStyle instanceof TextAnnotationElement_1.AnnotationTextStyle) {
+            return annotationTextStyle.settings;
+        }
+        return core_common_1.TextStyleSettings.fromJSON();
+    };
+}
 /**
  * Lays out the contents of a TextBlock into a series of lines containing runs.
  * Each paragraph is decomposed into a series of lines.
@@ -27,13 +39,11 @@ const LineBreaker = require("linebreak");
 function layoutTextBlock(args) {
     const findFontId = args.findFontId ?? ((name, type) => args.iModel.fonts.findId({ name, type }) ?? 0);
     const computeTextRange = args.computeTextRange ?? ((x) => args.iModel.computeRangesForText(x));
-    // ###TODO finding text styles in workspaces.
-    const findTextStyle = args.findTextStyle ?? (() => core_common_1.TextStyleSettings.fromJSON());
-    return new TextBlockLayout(args.textBlock, new LayoutContext(args.textBlock, computeTextRange, findTextStyle, findFontId));
+    return new TextBlockLayout(args.textBlock, new LayoutContext(args.textStyleResolver, computeTextRange, findFontId));
 }
 /**
  * Gets the result of laying out the the contents of a TextBlock into a series of lines containing runs.
- * The visual layout accounts for the [TextStyle]($common)s, fonts, and [TextBlock.width]($common). It applies word-wrapping if needed.
+ * The visual layout accounts for the [[AnnotationTextStyle]]s, fonts, and [TextBlock.width]($common). It applies word-wrapping if needed.
  * The layout returned matches the visual layout of the geometry produced by [[appendTextAnnotationGeometry]].
  * @beta
  */
@@ -53,13 +63,12 @@ function computeGraphemeOffsets(args) {
     const { textBlock, paragraphIndex, runLayoutResult, graphemeCharIndexes, iModel } = args;
     const findFontId = args.findFontId ?? ((name, type) => iModel.fonts.findId({ name, type }) ?? 0);
     const computeTextRange = args.computeTextRange ?? ((x) => iModel.computeRangesForText(x));
-    const findTextStyle = args.findTextStyle ?? (() => core_common_1.TextStyleSettings.fromJSON());
     const source = textBlock.paragraphs[paragraphIndex].runs[runLayoutResult.sourceRunIndex];
     if (source.type !== "text" || runLayoutResult.characterCount === 0) {
         return [];
     }
     const style = core_common_1.TextStyleSettings.fromJSON(runLayoutResult.textStyle);
-    const layoutContext = new LayoutContext(textBlock, computeTextRange, findTextStyle, findFontId);
+    const layoutContext = new LayoutContext(args.textStyleResolver, computeTextRange, findFontId);
     const graphemeRanges = [];
     graphemeCharIndexes.forEach((_, index) => {
         const nextGraphemeCharIndex = graphemeCharIndexes[index + 1] ?? runLayoutResult.characterCount;
@@ -71,31 +80,107 @@ function scaleRange(range, scale) {
     range.low.scaleInPlace(scale);
     range.high.scaleInPlace(scale);
 }
-function applyBlockSettings(target, source) {
+/**
+ * Applies block level settings (lineSpacingFactor, lineHeight, widthFactor, frame, and leader) to a [TextStyleSettings]($common).
+ * These must be set on the block, as they are meaningless on individual paragraphs/runs.
+ * However, leaders are a special case and can override the block's leader settings.
+ * Setting `isLeader` to `true` makes the [TextBlock]($common) settings not override the leader's settings.
+ * @internal
+ */
+function applyBlockSettings(target, source, isLeader = false) {
     if (source === target) {
         return target;
     }
     const lineSpacingFactor = source.lineSpacingFactor ?? target.lineSpacingFactor;
     const lineHeight = source.lineHeight ?? target.lineHeight;
     const widthFactor = source.widthFactor ?? target.widthFactor;
-    if (lineSpacingFactor !== target.lineSpacingFactor || lineHeight !== target.lineHeight || widthFactor !== target.widthFactor) {
-        target = target.clone({ lineSpacingFactor, lineHeight, widthFactor });
+    const frame = source.frame ?? target.frame;
+    const leader = source.leader ?? target.leader;
+    const leaderShouldChange = !isLeader && !target.leaderEquals(leader);
+    if (lineSpacingFactor !== target.lineSpacingFactor ||
+        lineHeight !== target.lineHeight ||
+        widthFactor !== target.widthFactor ||
+        !target.frameEquals(frame) ||
+        leaderShouldChange) {
+        const cloneProps = {
+            lineSpacingFactor,
+            lineHeight,
+            widthFactor,
+            frame,
+        };
+        if (leaderShouldChange) {
+            cloneProps.leader = leader;
+        }
+        target = target.clone(cloneProps);
     }
     return target;
 }
+/**
+ * Resolves the effective style of TextBlockComponents and Leaders, taking into account overrides/style of the instance and its parent(s).
+ * @beta
+ */
+class TextStyleResolver {
+    _textStyles = new Map();
+    _findTextStyle;
+    /** The resolved style of the TextBlock. */
+    blockSettings;
+    /** The scale factor of the model containing the TextBlock. */
+    scaleFactor;
+    constructor(args) {
+        this._findTextStyle = args.findTextStyle ?? createFindTextStyleImpl(args.iModel);
+        this.scaleFactor = 1;
+        if (args.modelId) {
+            const element = args.iModel.elements.getElement(args.modelId);
+            if (element instanceof Element_1.Drawing)
+                this.scaleFactor = element.scaleFactor;
+        }
+        this.blockSettings = this.findTextStyle(args.textBlock.styleId);
+        if (args.textBlock.styleOverrides)
+            this.blockSettings = this.blockSettings.clone(args.textBlock.styleOverrides);
+    }
+    resolveParagraphSettingsImpl(paragraph) {
+        let settings = this.blockSettings;
+        if (paragraph.overridesStyle)
+            settings = settings.clone(paragraph.styleOverrides);
+        return settings;
+    }
+    /** Looks up an [[AnnotationTextStyle]] by ID. Uses caching. */
+    findTextStyle(id) {
+        let style = this._textStyles.get(id);
+        if (undefined === style) {
+            this._textStyles.set(id, style = this._findTextStyle(id));
+        }
+        return style;
+    }
+    /** Resolves the effective style for a [TextAnnotationLeader]($common). The TextAnnotationLeader should be a sibling of the provided TextBlock. */
+    resolveTextAnnotationLeaderSettings(leader) {
+        let settings = this.blockSettings;
+        if (leader.styleOverrides)
+            settings = settings.clone(leader.styleOverrides);
+        return applyBlockSettings(settings, this.blockSettings, true);
+    }
+    /** Resolves the effective style for a [Paragraph]($common). Paragraph should be child of provided TextBlock. */
+    resolveParagraphSettings(paragraph) {
+        return applyBlockSettings(this.resolveParagraphSettingsImpl(paragraph), this.blockSettings);
+    }
+    /** Resolves the effective style for a [Run]($common). Run should be child of provided Paragraph and TextBlock. */
+    resolveRunSettings(paragraph, run) {
+        let settings = this.resolveParagraphSettingsImpl(paragraph);
+        if (run.overridesStyle)
+            settings = settings.clone(run.styleOverrides);
+        return applyBlockSettings(settings, this.blockSettings);
+    }
+}
+exports.TextStyleResolver = TextStyleResolver;
 class LayoutContext {
+    textStyleResolver;
     _computeTextRange;
-    _findTextStyle;
     _findFontId;
-    _textStyles = new Map();
     _fontIds = new Map();
-    blockSettings;
-    constructor(block, _computeTextRange, _findTextStyle, _findFontId) {
+    constructor(textStyleResolver, _computeTextRange, _findFontId) {
+        this.textStyleResolver = textStyleResolver;
         this._computeTextRange = _computeTextRange;
-        this._findTextStyle = _findTextStyle;
         this._findFontId = _findFontId;
-        const settings = this.findTextStyle(block.styleName);
-        this.blockSettings = applyBlockSettings(settings, block.styleOverrides);
     }
     findFontId(name) {
         let fontId = this._fontIds.get(name);
@@ -104,20 +189,6 @@ class LayoutContext {
         }
         return fontId;
     }
-    findTextStyle(name) {
-        let style = this._textStyles.get(name);
-        if (undefined === style) {
-            this._textStyles.set(name, style = this._findTextStyle(name));
-        }
-        return style;
-    }
-    createRunSettings(run) {
-        let settings = this.findTextStyle(run.styleName);
-        if (run.overridesStyle) {
-            settings = settings.clone(run.styleOverrides);
-        }
-        return applyBlockSettings(settings, this.blockSettings);
-    }
     computeRangeForText(chars, style, baselineShift) {
         if (chars.length === 0) {
             return {
@@ -132,8 +203,8 @@ class LayoutContext {
             baselineShift,
             bold: style.isBold,
             italic: style.isItalic,
-            lineHeight: this.blockSettings.lineHeight,
-            widthFactor: this.blockSettings.widthFactor,
+            lineHeight: this.textStyleResolver.blockSettings.lineHeight,
+            widthFactor: this.textStyleResolver.blockSettings.widthFactor,
         });
         if ("none" !== baselineShift) {
             const isSub = "subscript" === baselineShift;
@@ -236,8 +307,8 @@ class RunLayout {
         this.style = props.style;
         this.fontId = props.fontId;
     }
-    static create(source, context) {
-        const style = context.createRunSettings(source);
+    static create(source, parentParagraph, context) {
+        const style = context.textStyleResolver.resolveRunSettings(parentParagraph, source);
         const fontId = context.findFontId(style.fontName);
         const charOffset = 0;
         const offsetFromLine = { x: 0, y: 0 };
@@ -448,7 +519,7 @@ class TextBlockLayout {
             if (i > 0) {
                 curLine = this.flushLine(context, curLine, paragraph);
             }
-            let runs = paragraph.runs.map((run) => RunLayout.create(run, context));
+            let runs = paragraph.runs.map((run) => RunLayout.create(run, paragraph, context));
             if (doWrap) {
                 runs = runs.map((run) => run.split(context)).flat();
             }
@@ -528,14 +599,14 @@ class TextBlockLayout {
             if (prevRun.type !== "linebreak") {
                 return new LineLayout(nextParagraph);
             }
-            line.append(RunLayout.create(prevRun.clone(), context));
+            line.append(RunLayout.create(prevRun.clone(), line.source, context));
         }
         // Line origin is its baseline.
         const lineOffset = { x: 0, y: -line.range.yLength() };
         // Place it below any existing lines
         if (this.lines.length > 0) {
             lineOffset.y += this._back.offsetFromDocument.y;
-            lineOffset.y -= context.blockSettings.lineSpacingFactor * context.blockSettings.lineHeight;
+            lineOffset.y -= context.textStyleResolver.blockSettings.lineSpacingFactor * context.textStyleResolver.blockSettings.lineHeight;
         }
         line.offsetFromDocument = lineOffset;
         // Update document range from computed line range and position