@plait/draw 0.41.0 → 0.43.0

package/fesm2022/plait-draw.mjs

@@ -1456,13 +1456,12 @@ const getDrawDefaultStrokeColor = (theme) => {
 const getFlowchartDefaultFill = (theme) => {
     return DrawThemeColors[theme].fill;
 };
-const getDefaultTextShapeProperty = (board, fontSize) => {
+const getTextShapeProperty = (board, text = DefaultTextProperty.text, fontSize) => {
     fontSize = fontSize ? Number(fontSize) : DEFAULT_FONT_SIZE;
-    const textSize = getTextSize(board, '文本', 10, { fontSize });
+    const textSize = getTextSize(board, text, Infinity, { fontSize });
     return {
         width: textSize.width + ShapeDefaultSpace.rectangleAndText * 2,
-        height: textSize.height,
-        text: '文本'
+        height: textSize.height
     };
 };
 const getDefaultGeometryPoints = (pointer, centerPoint) => {
@@ -1479,7 +1478,7 @@ const getDefaultGeometryProperty = (pointer) => {
     }
 };
 const getDefaultTextPoints = (board, centerPoint, fontSize) => {
-    const property = getDefaultTextShapeProperty(board, fontSize);
+    const property = getTextShapeProperty(board, DefaultTextProperty.text, fontSize);
     return getPointsByCenterPoint(centerPoint, property.width, property.height);
 };
 const insertElement = (board, element) => {
@@ -1489,14 +1488,17 @@ const insertElement = (board, element) => {
     addSelectedElement(board, element);
     BoardTransforms.updatePointerType(board, PlaitPointerType.selection);
 };
-const createDefaultText = (board, points) => {
+const createTextElement = (board, points, text = DefaultTextProperty.text, textHeight) => {
     const memorizedLatest = getMemorizedLatestByPointer(BasicShapes.text);
-    const property = getDefaultTextShapeProperty(board, memorizedLatest.textProperties['font-size']);
-    return createGeometryElement(BasicShapes.text, points, DefaultTextProperty.text, memorizedLatest.geometryProperties, { ...memorizedLatest.textProperties, textHeight: property.height });
+    textHeight = textHeight ? textHeight : getRectangleByPoints(points).height;
+    return createGeometryElement(BasicShapes.text, points, text, memorizedLatest.geometryProperties, {
+        ...memorizedLatest.textProperties,
+        textHeight
+    });
 };
 const createDefaultGeometry = (board, points, shape) => {
     const memorizedLatest = getMemorizedLatestByPointer(shape);
-    const textHeight = getDefaultTextShapeProperty(board, memorizedLatest.textProperties['font-size']).height;
+    const textHeight = getTextShapeProperty(board, DefaultTextProperty.text, memorizedLatest.textProperties['font-size']).height;
     return createGeometryElement(shape, points, '', {
         strokeWidth: DefaultBasicShapeProperty.strokeWidth,
         ...memorizedLatest.geometryProperties
@@ -1918,14 +1920,20 @@ const getConnectionPoint = (geometry, connection, direction, delta) => {
         return RectangleClient.getConnectionPoint(rectangle, connection);
     }
 };
-const transformPointToConnection = (board, point, hitElement, tolerance = ACTIVE_STROKE_WIDTH) => {
+const transformPointToConnection = (board, point, hitElement) => {
     let rectangle = getRectangleByPoints(hitElement.points);
-    rectangle = RectangleClient.inflate(rectangle, tolerance);
-    let nearestPoint = getNearestPoint(hitElement, point, tolerance);
+    rectangle = RectangleClient.inflate(rectangle, ACTIVE_STROKE_WIDTH);
+    let nearestPoint = getNearestPoint(hitElement, point, ACTIVE_STROKE_WIDTH);
     const hitConnector = getHitConnectorPoint(nearestPoint, hitElement, rectangle);
     nearestPoint = hitConnector ? hitConnector : nearestPoint;
     return [(nearestPoint[0] - rectangle.x) / rectangle.width, (nearestPoint[1] - rectangle.y) / rectangle.height];
 };
+// export const getConnectionByPointOnRectangleEdge = (board: PlaitBoard, point: Point, hitElement: PlaitShape): Point => {
+//     let rectangle = getRectangleByPoints(hitElement.points);
+//     const hitConnector = getHitConnectorPoint(point, hitElement, rectangle);
+//     const newPoint = hitConnector ?? point;
+//     return [(newPoint[0] - rectangle.x) / rectangle.width, (newPoint[1] - rectangle.y) / rectangle.height];
+// };
 const getHitConnectorPoint = (movingPoint, hitElement, rectangle) => {
     const shape = getShape(hitElement);
     const connector = getEngine(shape).getConnectorPoints(rectangle);
@@ -2303,7 +2311,7 @@ const collectLineUpdatedRefsByGeometry = (board, geometry, refs) => {
 const connectLineToGeometry = (board, lineElement, handle, geometryElement) => {
     const linePoints = PlaitLine.getPoints(board, lineElement);
     const point = handle === LineHandleKey.source ? linePoints[0] : linePoints[linePoints.length - 1];
-    const connection = transformPointToConnection(board, point, geometryElement, Math.max(geometryElement.width, geometryElement.height));
+    const connection = transformPointToConnection(board, point, geometryElement);
     if (connection) {
         let source = lineElement.source;
         let target = lineElement.target;
@@ -2348,8 +2356,11 @@ const insertGeometryByVector = (board, point, shape, vector) => {
     }
     return null;
 };
-const insertText = (board, points, text = '文本') => {
-    const newElement = createDefaultText(board, points);
+const insertText = (board, point, text) => {
+    const memorizedLatest = getMemorizedLatestByPointer(BasicShapes.text);
+    const property = getTextShapeProperty(board, text, memorizedLatest.textProperties['font-size']);
+    const points = [point, [point[0] + property.width, point[1] + property.height]];
+    const newElement = createTextElement(board, points, text);
     insertElement(board, newElement);
 };
 const resizeGeometry = (board, points, textHeight, path) => {
@@ -2934,9 +2945,9 @@ const withGeometryCreateByDrag = (board) => {
         if (dragMode) {
             const memorizedLatest = getMemorizedLatestByPointer(pointer);
             if (pointer === BasicShapes.text) {
-                const property = getDefaultTextShapeProperty(board, memorizedLatest.textProperties['font-size']);
+                const property = getTextShapeProperty(board, DefaultTextProperty.text, memorizedLatest.textProperties['font-size']);
                 const points = getPointsByCenterPoint(movingPoint, property.width, property.height);
-                temporaryElement = createDefaultText(board, points);
+                temporaryElement = createTextElement(board, points);
                 if (!fakeCreateTextRef) {
                     const textManage = new TextManage(board, PlaitBoard.getComponent(board).viewContainerRef, {
                         getRectangle: () => {
@@ -3010,9 +3021,9 @@ const withGeometryCreateByDrawing = (board) => {
             preventTouchMove(board, event, true);
             if (pointer === BasicShapes.text) {
                 const memorizedLatest = getMemorizedLatestByPointer(pointer);
-                const property = getDefaultTextShapeProperty(board, memorizedLatest.textProperties['font-size']);
+                const property = getTextShapeProperty(board, DefaultTextProperty.text, memorizedLatest.textProperties['font-size']);
                 const points = getPointsByCenterPoint(point, property.width, property.height);
-                const textElement = createDefaultText(board, points);
+                const textElement = createTextElement(board, points);
                 insertElement(board, textElement);
                 start = null;
             }
@@ -3161,8 +3172,7 @@ const withDrawFragment = (baseBoard) => {
             const insertAsChildren = selectedElements.length === 1 && selectedElements[0].children;
             const insertAsFreeText = !insertAsChildren;
             if (text && insertAsFreeText) {
-                const { width, height } = getTextSize(board, text);
-                DrawTransforms.insertText(board, [targetPoint, [targetPoint[0] + width, targetPoint[1] + height]], text);
+                DrawTransforms.insertText(board, targetPoint, text);
                 return;
             }
         }
@@ -3831,5 +3841,5 @@ const withDraw = (board) => {
  * Generated bundle index. Do not edit.
  */
 
-export { BasicShapes, DEFAULT_IMAGE_WIDTH, DefaultBasicShapeProperty, DefaultConnectorProperty, DefaultDataProperty, DefaultDecisionProperty, DefaultFlowchartProperty, DefaultFlowchartPropertyMap, DefaultGeometryActiveStyle, DefaultGeometryStyle, DefaultManualInputProperty, DefaultMergeProperty, DefaultTextProperty, DrawThemeColors, DrawTransforms, FlowchartSymbols, GeometryComponent, GeometryThreshold, LineComponent, LineHandleKey, LineMarkerType, LineShape, MemorizeKey, PlaitDrawElement, PlaitGeometry, PlaitLine, Q2C, REACTION_MARGIN, ShapeDefaultSpace, StrokeStyle, WithLineAutoCompletePluginKey, alignPoints, createDefaultFlowchart, createDefaultGeometry, createDefaultText, createGeometryElement, createLineElement, drawBoundMask, drawGeometry, drawLine, getAutoCompletePoints, getBasicPointers, getBoardLines, getCenterPointsOnPolygon, getConnectionPoint, getCurvePoints, getDefaultFlowchartProperty, getDefaultGeometryPoints, getDefaultGeometryProperty, getDefaultTextPoints, getDefaultTextShapeProperty, getDrawDefaultStrokeColor, getEdgeOnPolygonByPoint, getElbowPoints, getFillByElement, getFlowchartDefaultFill, getFlowchartPointers, getGeometryPointers, getHitConnectorPoint, getHitIndexOfAutoCompletePoint, getHitLineTextIndex, getLineDashByElement, getLineHandleRefPair, getLineMemorizedLatest, getLinePointers, getLinePoints, getLineTextRectangle, getMemorizeKey, getMemorizedLatestByPointer, getMemorizedLatestShape, getNearestPoint, getPointsByCenterPoint, getSelectedDrawElements, getSelectedGeometryElements, getSelectedImageElements, getSelectedLineElements, getStrokeColorByElement, getStrokeStyleByElement, getStrokeWidthByElement, getTextRectangle, getVectorByConnection, handleLineCreating, insertElement, isHitDrawElement, isHitLineText, isHitPolyLine, isRectangleHitDrawElement, isTextExceedingBounds, memorizeLatestShape, memorizeLatestText, transformOpsToPoints, transformPointToConnection, withDraw, withLineAutoComplete };
+export { BasicShapes, DEFAULT_IMAGE_WIDTH, DefaultBasicShapeProperty, DefaultConnectorProperty, DefaultDataProperty, DefaultDecisionProperty, DefaultFlowchartProperty, DefaultFlowchartPropertyMap, DefaultGeometryActiveStyle, DefaultGeometryStyle, DefaultManualInputProperty, DefaultMergeProperty, DefaultTextProperty, DrawThemeColors, DrawTransforms, FlowchartSymbols, GeometryComponent, GeometryThreshold, LineComponent, LineHandleKey, LineMarkerType, LineShape, MemorizeKey, PlaitDrawElement, PlaitGeometry, PlaitLine, Q2C, REACTION_MARGIN, ShapeDefaultSpace, StrokeStyle, WithLineAutoCompletePluginKey, alignPoints, createDefaultFlowchart, createDefaultGeometry, createGeometryElement, createLineElement, createTextElement, drawBoundMask, drawGeometry, drawLine, getAutoCompletePoints, getBasicPointers, getBoardLines, getCenterPointsOnPolygon, getConnectionPoint, getCurvePoints, getDefaultFlowchartProperty, getDefaultGeometryPoints, getDefaultGeometryProperty, getDefaultTextPoints, getDrawDefaultStrokeColor, getEdgeOnPolygonByPoint, getElbowPoints, getFillByElement, getFlowchartDefaultFill, getFlowchartPointers, getGeometryPointers, getHitConnectorPoint, getHitIndexOfAutoCompletePoint, getHitLineTextIndex, getLineDashByElement, getLineHandleRefPair, getLineMemorizedLatest, getLinePointers, getLinePoints, getLineTextRectangle, getMemorizeKey, getMemorizedLatestByPointer, getMemorizedLatestShape, getNearestPoint, getPointsByCenterPoint, getSelectedDrawElements, getSelectedGeometryElements, getSelectedImageElements, getSelectedLineElements, getStrokeColorByElement, getStrokeStyleByElement, getStrokeWidthByElement, getTextRectangle, getTextShapeProperty, getVectorByConnection, handleLineCreating, insertElement, isHitDrawElement, isHitLineText, isHitPolyLine, isRectangleHitDrawElement, isTextExceedingBounds, memorizeLatestShape, memorizeLatestText, transformOpsToPoints, transformPointToConnection, withDraw, withLineAutoComplete };
 //# sourceMappingURL=plait-draw.mjs.map