@cornerstonejs/tools 4.10.3 → 4.11.0

package/dist/esm/drawingSvg/drawLine.js

@@ -5,7 +5,7 @@ export default function drawLine(svgDrawingHelper, annotationUID, lineUID, start
     if (isNaN(start[0]) || isNaN(start[1]) || isNaN(end[0]) || isNaN(end[1])) {
         return;
     }
-    const { color = 'rgb(0, 255, 0)', width = 10, lineWidth, lineDash, markerStartId = null, markerEndId = null, shadow = false, strokeOpacity = 1, } = options;
+    const { color = 'rgb(0, 255, 0)', width = 10, lineWidth, lineDash, markerStartId = null, markerEndId = null, shadow = false, strokeOpacity = 1, textBoxLinkLineColor, } = options;
     const strokeWidth = lineWidth || width;
     const svgns = 'http://www.w3.org/2000/svg';
     const svgNodeHash = _getHash(annotationUID, 'line', lineUID);
@@ -17,7 +17,7 @@ export default function drawLine(svgDrawingHelper, annotationUID, lineUID, start
         y1: `${start[1]}`,
         x2: `${end[0]}`,
         y2: `${end[1]}`,
-        stroke: color,
+        stroke: textBoxLinkLineColor || color,
         style: dropShadowStyle,
         'stroke-width': strokeWidth,
         'stroke-dasharray': lineDash,

package/dist/esm/drawingSvg/drawTextBox.js

@@ -14,9 +14,14 @@ function drawTextBox(svgDrawingHelper, annotationUID, textUID, textLines, positi
     return textGroupBoundingBox;
 }
 function _drawTextGroup(svgDrawingHelper, annotationUID, textUID, textLines = [''], position, options) {
-    const { padding, color, fontFamily, fontSize, background } = options;
+    const { padding, color, fontFamily, fontSize, background, textBoxBorderRadius, textBoxMargin, } = options;
     let textGroupBoundingBox;
     const [x, y] = [position[0] + padding, position[1] + padding];
+    const backgroundStyles = {
+        color: background,
+        textBoxBorderRadius,
+        textBoxMargin,
+    };
     const svgns = 'http://www.w3.org/2000/svg';
     const svgNodeHash = _getHash(annotationUID, 'text', textUID);
     const existingTextGroup = svgDrawingHelper.getSvgNode(svgNodeHash);
@@ -48,7 +53,7 @@ function _drawTextGroup(svgDrawingHelper, annotationUID, textUID, textLines = ['
         setAttributesIfNecessary(textAttributes, textElement);
         setAttributesIfNecessary(textGroupAttributes, existingTextGroup);
         existingTextGroup.setAttribute('data-annotation-uid', annotationUID);
-        textGroupBoundingBox = _drawTextBackground(existingTextGroup, background);
+        textGroupBoundingBox = _drawTextBackground(existingTextGroup, backgroundStyles);
         svgDrawingHelper.setNodeTouched(svgNodeHash);
     }
     else {
@@ -96,8 +101,10 @@ function _createTextSpan(text) {
     textSpanElement.textContent = text;
     return textSpanElement;
 }
-function _drawTextBackground(group, color) {
+function _drawTextBackground(group, backgroundStyles) {
+    const { color, textBoxBorderRadius = 0, textBoxMargin = 0, } = backgroundStyles;
     let element = group.querySelector('rect.background');
+    const textElement = group.querySelector('text').getBBox();
     if (!color) {
         if (element) {
             group.removeChild(element);
@@ -113,10 +120,19 @@ function _drawTextBackground(group, color) {
     const attributes = {
         x: `${bBox.x}`,
         y: `${bBox.y}`,
-        width: `${bBox.width}`,
-        height: `${bBox.height}`,
+        width: `${textElement.width + Number(textBoxMargin) * 2}`,
+        height: `${textElement.height + Number(textBoxMargin) * 2}`,
         fill: color,
+        rx: textBoxBorderRadius,
+        ry: textBoxBorderRadius,
     };
+    if (textBoxMargin) {
+        const tSpans = Array.from(group.querySelector('text').querySelectorAll('tspan'));
+        tSpans.forEach((tspan, i) => {
+            i === 0 && tspan.setAttribute('y', textBoxMargin);
+            tspan.setAttribute('x', textBoxMargin);
+        });
+    }
     setAttributesIfNecessary(attributes, element);
     return bBox;
 }

package/dist/esm/tools/base/AnnotationTool.js

@@ -107,6 +107,9 @@ class AnnotationTool extends AnnotationDisplayTool {
             background: this.getStyle('textBoxBackground', specifications, annotation),
             lineWidth: this.getStyle('textBoxLinkLineWidth', specifications, annotation),
             lineDash: this.getStyle('textBoxLinkLineDash', specifications, annotation),
+            textBoxBorderRadius: this.getStyle('textBoxBorderRadius', specifications, annotation),
+            textBoxMargin: this.getStyle('textBoxMargin', specifications, annotation),
+            textBoxLinkLineColor: this.getStyle('textBoxLinkLineColor', specifications, annotation),
         };
     }
     static isSuvScaled(viewport, targetId, imageId) {

package/dist/esm/types/AnnotationStyle.d.ts

@@ -1,6 +1,6 @@
 type Modes = '' | 'Active' | 'Passive' | 'Enabled';
 type States = '' | 'Highlighted' | 'Selected' | 'Locked' | 'AutoGenerated';
-type Properties = 'color' | 'colorAutoGenerated' | 'lineWidth' | 'lineWidthAutoGenerated' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash' | 'locked' | 'fillColor' | 'fillOpacity' | 'textbox' | 'shadow' | 'visibility' | 'markerSize' | 'angleArcLineDash' | 'pointerStrokeWidth' | 'showHandlesAlways';
+type Properties = 'color' | 'colorAutoGenerated' | 'lineWidth' | 'lineWidthAutoGenerated' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash' | 'textBoxLinkLineColor' | 'textBoxMargin' | 'textBoxBorderRadius' | 'locked' | 'fillColor' | 'fillOpacity' | 'textbox' | 'shadow' | 'visibility' | 'markerSize' | 'angleArcLineDash' | 'pointerStrokeWidth' | 'showHandlesAlways';
 export type AnnotationStyle = {
     [key in `${Properties}${States}${Modes}`]?: string | number | boolean | Record<string, unknown>;
 };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.10.3";
+export declare const version = "4.11.0";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.10.3';
+export const version = '4.11.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.10.3",
+  "version": "4.11.0",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.10.3",
+    "@cornerstonejs/core": "4.11.0",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "0a81920c06c4b5d46f3f0cd74e8ab72ea096cba3"
+  "gitHead": "43af030c91534fd29c213f2f2197dc7f586d7cf1"
 }