@plait/draw 0.42.0 → 0.44.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
@@ -1816,7 +1818,8 @@ const getCurvePoints = (board, element) => {
         return pointsOnBezierCurves(curvePoints);
     }
     else {
-        const allPoints = PlaitLine.getPoints(board, element);
+        let allPoints = PlaitLine.getPoints(board, element);
+        allPoints = removeDuplicatePoints(allPoints);
         const points = catmullRomFitting(allPoints);
         return pointsOnBezierCurves(points);
     }
@@ -2354,8 +2357,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) => {
@@ -2940,9 +2946,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: () => {
@@ -3016,9 +3022,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;
             }
@@ -3075,15 +3081,22 @@ const buildClipboardData = (board, elements, startPoint) => {
         if (PlaitDrawElement.isLine(element)) {
             let source = { ...element.source };
             let target = { ...element.target };
-            if (element.source.boundId && !getElementById(board, element.source.boundId, elements)) {
-                delete source.boundId;
-                delete source.connection;
+            let points = [...element.points];
+            if (element.source.boundId) {
+                points[0] = getConnectionPoint(getElementById(board, element.source.boundId), element.source.connection);
+                if (!getElementById(board, element.source.boundId, elements)) {
+                    delete source.boundId;
+                    delete source.connection;
+                }
             }
-            if (element.target.boundId && !getElementById(board, element.target.boundId, elements)) {
-                delete target.boundId;
-                delete target.connection;
+            if (element.target.boundId) {
+                points[points.length - 1] = getConnectionPoint(getElementById(board, element.target.boundId), element.target.connection);
+                if (!getElementById(board, element.target.boundId, elements)) {
+                    delete target.boundId;
+                    delete target.connection;
+                }
             }
-            const points = element.points.map(point => [point[0] - startPoint[0], point[1] - startPoint[1]]);
+            points = points.map(point => [point[0] - startPoint[0], point[1] - startPoint[1]]);
             return { ...element, points, source, target };
         }
         return element;
@@ -3167,8 +3180,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;
             }
         }
@@ -3837,5 +3849,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