diff --git a/packages/editor/cypress/snapshots/relationship.cy.ts/addRelationship.snap.png b/packages/editor/cypress/snapshots/relationship.cy.ts/addRelationship.snap.png index 52906c33..0277dc9c 100644 Binary files a/packages/editor/cypress/snapshots/relationship.cy.ts/addRelationship.snap.png and b/packages/editor/cypress/snapshots/relationship.cy.ts/addRelationship.snap.png differ diff --git a/packages/editor/cypress/snapshots/relationship.cy.ts/delete relationship.snap.png b/packages/editor/cypress/snapshots/relationship.cy.ts/delete relationship.snap.png index e958cc64..f8b64063 100644 Binary files a/packages/editor/cypress/snapshots/relationship.cy.ts/delete relationship.snap.png and b/packages/editor/cypress/snapshots/relationship.cy.ts/delete relationship.snap.png differ diff --git a/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 0.snap.png b/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 0.snap.png index cbae598a..10ce51bb 100644 Binary files a/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 0.snap.png and b/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 0.snap.png differ diff --git a/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 1.snap.png b/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 1.snap.png index 4226e868..a7eef5bd 100644 Binary files a/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 1.snap.png and b/packages/editor/cypress/snapshots/relationship.cy.ts/move ctl pont 1.snap.png differ diff --git a/packages/editor/cypress/snapshots/relationship.cy.ts/rel ctl undo.snap.png b/packages/editor/cypress/snapshots/relationship.cy.ts/rel ctl undo.snap.png index af5776e8..7c23bf6c 100644 Binary files a/packages/editor/cypress/snapshots/relationship.cy.ts/rel ctl undo.snap.png and b/packages/editor/cypress/snapshots/relationship.cy.ts/rel ctl undo.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-complex.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-complex.snap.png index 1c79e710..531c8b0c 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-complex.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-complex.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-connection-style.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-connection-style.snap.png index 861e0b69..b86efe03 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-connection-style.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-connection-style.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emoji.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emoji.snap.png index 9cc7ea50..5667cf79 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emoji.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emoji.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emptyNodes.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emptyNodes.snap.png index f790edab..8e444eaa 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emptyNodes.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-emptyNodes.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-error-on-load.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-error-on-load.snap.png index 85900ccc..e4c6a148 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-error-on-load.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-error-on-load.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge.snap.png index e868e2ff..4e12a581 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge2.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge2.snap.png index af43f66a..a2dc23ee 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge2.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-huge2.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-icon-sample.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-icon-sample.snap.png index 37dde9e2..5e770ff2 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-icon-sample.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-icon-sample.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-img-support.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-img-support.snap.png index 8fe45304..fa75f428 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-img-support.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-img-support.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-order.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-order.snap.png index 811517ac..15586ade 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-order.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-order.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample1.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample1.snap.png index d02518c1..8d2bdd00 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample1.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample1.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample2.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample2.snap.png index af992df0..cc347803 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample2.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample2.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample3.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample3.snap.png index 6b3a301a..8d80844b 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample3.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample3.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample4.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample4.snap.png index 0f585d1c..5d029a55 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample4.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample4.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample5.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample5.snap.png index 0bcebd37..e7aa43c5 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample5.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample5.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample6.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample6.snap.png index 75adfe82..1ef4f9c8 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample6.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample6.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample8.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample8.snap.png index b54544ca..70a97dfd 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample8.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-sample8.snap.png differ diff --git a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-welcome.snap.png b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-welcome.snap.png index e2c82253..b38af17e 100644 Binary files a/packages/editor/cypress/snapshots/renderAll.cy.ts/map-welcome.snap.png and b/packages/editor/cypress/snapshots/renderAll.cy.ts/map-welcome.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveDefaultPosition.snap.png b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveDefaultPosition.snap.png index 763e0ad4..32bc35f8 100644 Binary files a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveDefaultPosition.snap.png and b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveDefaultPosition.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/movedownNode.snap.png b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/movedownNode.snap.png index 85c39c1a..5dd5c998 100644 Binary files a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/movedownNode.snap.png and b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/movedownNode.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveleftNode.snap.png b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveleftNode.snap.png index 3653755f..355be893 100644 Binary files a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveleftNode.snap.png and b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveleftNode.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveupNode.snap.png b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveupNode.snap.png index 1dc89164..fab460aa 100644 Binary files a/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveupNode.snap.png and b/packages/editor/cypress/snapshots/topicDragAndDrop.cy.ts/moveupNode.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png index 99255db8..cb05888e 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontBold.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png index dfb3606d..ef69cdb9 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontColor.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png index 3c236039..be202a8c 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontItalic.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png index 06fbdc84..4ecf56d5 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeHuge.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png index c808d124..679898e2 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeLarge.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png index 2a119f85..6da7b680 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeNormal.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png index 47c93bb8..69652eff 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeFontSizeSmall.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeMainTopicText.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeMainTopicText.snap.png index 442d81eb..f761b595 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeMainTopicText.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/changeMainTopicText.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/fontShapePanel.snap.png b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/fontShapePanel.snap.png index 8535a402..db61537c 100644 Binary files a/packages/editor/cypress/snapshots/topicFontChange.cy.ts/fontShapePanel.snap.png and b/packages/editor/cypress/snapshots/topicFontChange.cy.ts/fontShapePanel.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicIcon.cy.ts/add-new-icon.snap.png b/packages/editor/cypress/snapshots/topicIcon.cy.ts/add-new-icon.snap.png index 78388ecf..99993fa9 100644 Binary files a/packages/editor/cypress/snapshots/topicIcon.cy.ts/add-new-icon.snap.png and b/packages/editor/cypress/snapshots/topicIcon.cy.ts/add-new-icon.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicIcon.cy.ts/icons-pannel.snap.png b/packages/editor/cypress/snapshots/topicIcon.cy.ts/icons-pannel.snap.png index 04d2e137..4709ab68 100644 Binary files a/packages/editor/cypress/snapshots/topicIcon.cy.ts/icons-pannel.snap.png and b/packages/editor/cypress/snapshots/topicIcon.cy.ts/icons-pannel.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/addChildNodeSortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/addChildNodeSortcut.snap.png index d869e227..e8c28c5e 100644 Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/addChildNodeSortcut.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/addChildNodeSortcut.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/deleteTopicShortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/deleteTopicShortcut.snap.png index bd64cf8d..83df290d 100644 Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/deleteTopicShortcut.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/deleteTopicShortcut.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/editor-shortcut-edit.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/editor-shortcut-edit.snap.png index 87a73f33..55b33142 100644 Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/editor-shortcut-edit.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/editor-shortcut-edit.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png index 7dd3639f..55b33142 100644 Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/redoChange.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/saveChagesShortcut.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/saveChagesShortcut.snap.png index 5b570f55..84122191 100644 Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/saveChagesShortcut.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/saveChagesShortcut.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicManager.cy.ts/undoChange.snap.png b/packages/editor/cypress/snapshots/topicManager.cy.ts/undoChange.snap.png index c78e5ca3..f90a5b78 100644 Binary files a/packages/editor/cypress/snapshots/topicManager.cy.ts/undoChange.snap.png and b/packages/editor/cypress/snapshots/topicManager.cy.ts/undoChange.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png index 4e2d4042..f359b8ec 100644 Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToEllipseShape.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png index 7121f2dc..471813a4 100644 Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToLine.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png index 6bd7fccf..9e97510f 100644 Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToRoundedRectangle.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToSquareShape.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToSquareShape.snap.png index 78343407..af3f51b3 100644 Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToSquareShape.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/changeToSquareShape.snap.png differ diff --git a/packages/editor/cypress/snapshots/topicShape.cy.ts/topicShapePanel.snap.png b/packages/editor/cypress/snapshots/topicShape.cy.ts/topicShapePanel.snap.png index ca124f68..ff802ce9 100644 Binary files a/packages/editor/cypress/snapshots/topicShape.cy.ts/topicShapePanel.snap.png and b/packages/editor/cypress/snapshots/topicShape.cy.ts/topicShapePanel.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-border.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-border.snap.png index 8e266884..f779585a 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-border.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-border.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-color.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-color.snap.png index a5a2b833..7e0e4483 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-color.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-color.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-icon-feature.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-icon-feature.snap.png index 70d7fc6f..06ec4fe5 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-icon-feature.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-icon-feature.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-link-feature.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-link-feature.snap.png index a6388c4f..6d71030b 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-link-feature.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-link-feature.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-note.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-note.snap.png index d95049d8..b4160b1e 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-note.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-note.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-ellipse.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-ellipse.snap.png index 329cd303..e6f8deef 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-ellipse.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-ellipse.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-line.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-line.snap.png index 27aaa737..f40b4553 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-line.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-shape-line.snap.png differ diff --git a/packages/mindplot/cypress/snapshots/topic.test.js/topic-style.snap.png b/packages/mindplot/cypress/snapshots/topic.test.js/topic-style.snap.png index 98d74e5d..22a6bb61 100644 Binary files a/packages/mindplot/cypress/snapshots/topic.test.js/topic-style.snap.png and b/packages/mindplot/cypress/snapshots/topic.test.js/topic-style.snap.png differ diff --git a/packages/mindplot/src/components/ConnectionLine.ts b/packages/mindplot/src/components/ConnectionLine.ts index 59df6201..3a905e29 100644 --- a/packages/mindplot/src/components/ConnectionLine.ts +++ b/packages/mindplot/src/components/ConnectionLine.ts @@ -104,21 +104,21 @@ class ConnectionLine { this._color = color; switch (this._type) { case LineType.POLYLINE_MIDDLE: - this._line.setStroke(1, 'solid', color, 1); + this._line.setStroke(2, 'solid', color, 1); break; case LineType.POLYLINE_CURVED: - this._line.setStroke(1, 'solid', color, 1); + this._line.setStroke(2, 'solid', color, 1); break; case LineType.THIN_CURVED: - this._line.setStroke(1, 'solid', color, 1); + this._line.setStroke(2, 'solid', color, 1); this._line.setFill(color, 1); break; case LineType.THICK_CURVED: - this._line.setStroke(1, 'solid', color, 1); + this._line.setStroke(2, 'solid', color, 1); this._line.setFill(color, 1); break; case LineType.ARC: - this._line.setStroke(1, 'solid', color, 1); + this._line.setStroke(2, 'solid', color, 1); break; default: { const exhaustiveCheck: never = this._type; diff --git a/packages/mindplot/src/components/MainTopic.ts b/packages/mindplot/src/components/MainTopic.ts index 8db16d63..daa90a0e 100644 --- a/packages/mindplot/src/components/MainTopic.ts +++ b/packages/mindplot/src/components/MainTopic.ts @@ -20,22 +20,13 @@ import { Group, ElementClass, ElementPeer } from '@wisemapping/web2d'; import Topic from './Topic'; import Shape from './util/Shape'; -import NodeModel from './model/NodeModel'; import Canvas from './Canvas'; import SizeType from './SizeType'; import PositionType from './PositionType'; -import { NodeOption } from './NodeGraph'; class MainTopic extends Topic { - private INNER_RECT_ATTRIBUTES: { stroke: string }; - - constructor(model: NodeModel, options: NodeOption) { - super(model, options); - this.INNER_RECT_ATTRIBUTES = { stroke: '0.5 solid #009900' }; - } - buildDragShape(): ElementClass { - const innerShape = this._buildShape(this.INNER_RECT_ATTRIBUTES, this.getShapeType()); + const innerShape = this._buildShape(this.getShapeType()); const size = this.getSize(); innerShape.setSize(size.width, size.height); innerShape.setPosition(0, 0); diff --git a/packages/mindplot/src/components/RelationshipControlPoints.ts b/packages/mindplot/src/components/RelationshipControlPoints.ts index 380f46e9..4fdafaad 100644 --- a/packages/mindplot/src/components/RelationshipControlPoints.ts +++ b/packages/mindplot/src/components/RelationshipControlPoints.ts @@ -16,7 +16,7 @@ * limitations under the License. */ // eslint-disable-next-line max-classes-per-file -import { Elipse, StraightLine } from '@wisemapping/web2d'; +import { Ellipse, StraightLine } from '@wisemapping/web2d'; import Shape from './util/Shape'; import ActionDispatcher from './ActionDispatcher'; import Canvas from './Canvas'; @@ -30,7 +30,7 @@ export enum PivotType { } class ControlPivotLine { - private _dot: Elipse; + private _dot: Ellipse; private _line: StraightLine; @@ -64,7 +64,7 @@ class ControlPivotLine { this._relationship = relationship; // Build dot controller ... - this._dot = new Elipse({ + this._dot = new Ellipse({ width: 6, height: 6, stroke: '1 solid #6589de', diff --git a/packages/mindplot/src/components/ShrinkConnector.ts b/packages/mindplot/src/components/ShrinkConnector.ts index 6d0fa489..ef947cad 100644 --- a/packages/mindplot/src/components/ShrinkConnector.ts +++ b/packages/mindplot/src/components/ShrinkConnector.ts @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Elipse, Group } from '@wisemapping/web2d'; +import { Ellipse, Group } from '@wisemapping/web2d'; import TopicConfig from './TopicConfig'; import ActionDispatcher from './ActionDispatcher'; @@ -26,14 +26,16 @@ import ColorUtil from './render/ColorUtil'; class ShirinkConnector { private _isShrink: boolean; - private _ellipse: Elipse; + private _ellipse: Ellipse; constructor(topic: Topic) { this._isShrink = false; - const ellipse = new Elipse(TopicConfig.INNER_RECT_ATTRIBUTES); + const ellipse = new Ellipse({ + width: TopicConfig.CONNECTOR_WIDTH, + height: TopicConfig.CONNECTOR_WIDTH, + }); this._ellipse = ellipse; - ellipse.setSize(TopicConfig.CONNECTOR_WIDTH, TopicConfig.CONNECTOR_WIDTH); ellipse.addEvent('click', (event: Event) => { const model = topic.getModel(); const collapse = !model.areChildrenShrunken(); @@ -56,11 +58,11 @@ class ShirinkConnector { }); ellipse.addEvent('mouseover', () => { - ellipse.setStroke(this._isShrink ? 1 : 2, 'solid'); + ellipse.setStroke(this._isShrink ? 2 : 3, 'solid'); }); ellipse.addEvent('mouseout', () => { - ellipse.setStroke(this._isShrink ? 2 : 1, 'solid'); + ellipse.setStroke(this._isShrink ? 3 : 2, 'solid'); }); ellipse.setCursor('default'); @@ -71,15 +73,15 @@ class ShirinkConnector { changeRender(isShrink: boolean) { const elipse = this._ellipse; if (isShrink) { - elipse.setStroke(2, 'solid'); + elipse.setStroke(4, 'solid'); } else { - elipse.setStroke(1, 'solid'); + elipse.setStroke(3, 'solid'); } this._isShrink = isShrink; } setColor(color: string) { - this._ellipse.setStroke(1, 'solid', color); + this._ellipse.setStroke(2, 'solid', color); this._ellipse.setFill(ColorUtil.lightenColor(color, 100)); } @@ -91,10 +93,6 @@ class ShirinkConnector { this._ellipse.setOpacity(opacity); } - setAttribute(name: string, value: string) { - this._ellipse.setAttribute(name, value); - } - addToWorkspace(group: Group): void { group.append(this._ellipse); } diff --git a/packages/mindplot/src/components/Topic.ts b/packages/mindplot/src/components/Topic.ts index 6f0c378d..3cdefe0e 100644 --- a/packages/mindplot/src/components/Topic.ts +++ b/packages/mindplot/src/components/Topic.ts @@ -17,10 +17,9 @@ */ import { $assert, $defined } from '@wisemapping/core-js'; -import { Rect, Text, Group, ElementClass, ElementPeer, StyleAttributes } from '@wisemapping/web2d'; +import { Rect, Text, Group, ElementClass, ElementPeer } from '@wisemapping/web2d'; import NodeGraph, { NodeOption } from './NodeGraph'; -import TopicConfig from './TopicConfig'; import TopicStyle from './TopicStyle'; import TopicFeatureFactory from './TopicFeature'; import ConnectionLine, { LineType } from './ConnectionLine'; @@ -211,7 +210,7 @@ abstract class Topic extends NodeGraph { getInnerShape(): LineTopicShape | Rect | LineTopicShape { if (!this._innerShape) { // Create inner box. - this._innerShape = this._buildShape(TopicConfig.INNER_RECT_ATTRIBUTES, this.getShapeType()); + this._innerShape = this._buildShape(this.getShapeType()); // Define the pointer ... if (!this.isCentralTopic() && !this.isReadOnly()) { @@ -223,23 +222,20 @@ abstract class Topic extends NodeGraph { return this._innerShape; } - protected _buildShape( - attributes: StyleAttributes, - shapeType: TopicShapeType, - ): LineTopicShape | Rect | LineTopicShape { + protected _buildShape(shapeType: TopicShapeType): LineTopicShape | Rect | LineTopicShape { let result: LineTopicShape | Rect | LineTopicShape; switch (shapeType) { case 'rectangle': - result = new Rect(0, attributes); + result = new Rect(0, { strokeWidth: 2 }); break; case 'elipse': - result = new Rect(0.9, attributes); + result = new Rect(0.9, { strokeWidth: 2 }); break; case 'rounded rectangle': - result = new Rect(0.3, attributes); + result = new Rect(0.3, { strokeWidth: 2 }); break; case 'line': - result = new LineTopicShape(this); + result = new LineTopicShape(this, { strokeWidth: 2 }); break; case 'image': result = new LineTopicShape(this); @@ -266,7 +262,7 @@ abstract class Topic extends NodeGraph { getOuterShape(): ElementClass { if (!this._outerShape) { - const rect = this._buildShape({}, 'rounded rectangle'); + const rect = this._buildShape('rounded rectangle'); rect.setPosition(-3, -3); rect.setOpacity(0); @@ -1271,7 +1267,7 @@ abstract class Topic extends NodeGraph { // Update topic color ... const borderColor = this.getBorderColor(); - this.getInnerShape().setStroke(1, 'solid', borderColor); + this.getInnerShape().setStroke(null, 'solid', borderColor); const bgColor = this.getBackgroundColor(); this.getInnerShape().setFill(bgColor); diff --git a/packages/mindplot/src/components/TopicConfig.ts b/packages/mindplot/src/components/TopicConfig.ts index 4a477e87..a86fffbb 100644 --- a/packages/mindplot/src/components/TopicConfig.ts +++ b/packages/mindplot/src/components/TopicConfig.ts @@ -17,9 +17,7 @@ */ const CONNECTOR_WIDTH = 6; -const INNER_RECT_ATTRIBUTES = { stroke: '2 solid' }; export default { CONNECTOR_WIDTH, - INNER_RECT_ATTRIBUTES, }; diff --git a/packages/mindplot/src/components/TopicStyle.ts b/packages/mindplot/src/components/TopicStyle.ts index e14765c3..66f1a5f5 100644 --- a/packages/mindplot/src/components/TopicStyle.ts +++ b/packages/mindplot/src/components/TopicStyle.ts @@ -54,7 +54,7 @@ const TopicDefaultStyles = { color: '#ffffff', }, connectionStyle: LineType.THICK_CURVED, - connectionColor: '#495879', + connectionColor: '#345780', msgKey: 'CENTRAL_TOPIC', shapeType: 'rounded rectangle' as TopicShapeType, }, @@ -62,14 +62,14 @@ const TopicDefaultStyles = { borderColor: '#023BB9', backgroundColor: '#E0E5EF', fontStyle: { - font: 'Arial', + font: 'Verdana', size: 8, style: 'normal' as FontStyleType, weight: 'normal' as FontWeightType, color: '#525C61', }, - connectionStyle: LineType.THICK_CURVED, - connectionColor: '#495879', + connectionStyle: LineType.ARC, + connectionColor: '#345780', msgKey: 'MAIN_TOPIC', shapeType: 'line' as TopicShapeType, }, @@ -77,14 +77,14 @@ const TopicDefaultStyles = { borderColor: '#96e3ff', backgroundColor: '#96e3ff', fontStyle: { - font: 'Arial', - size: 6, + font: 'Verdana', + size: 8, style: 'normal' as FontStyleType, weight: 'normal' as FontWeightType, color: '#525C61', }, - connectionStyle: LineType.THICK_CURVED, - connectionColor: '#495879', + connectionStyle: LineType.ARC, + connectionColor: '#345780', msgKey: 'SUB_TOPIC', shapeType: 'line' as TopicShapeType, }, @@ -101,7 +101,7 @@ const TopicDefaultStyles = { }, msgKey: 'ISOLATED_TOPIC', connectionStyle: LineType.THICK_CURVED, - connectionColor: '#495879', + connectionColor: '#345780', shapeType: 'line' as TopicShapeType, }, }; diff --git a/packages/mindplot/src/components/widget/ArcLine.ts b/packages/mindplot/src/components/widget/ArcLine.ts index e866e1e9..d2e71113 100644 --- a/packages/mindplot/src/components/widget/ArcLine.ts +++ b/packages/mindplot/src/components/widget/ArcLine.ts @@ -25,7 +25,7 @@ class ArcLine extends ArcLine2d { private _sourceTopic: Topic; constructor(sourceTopic: Topic, targetTopic: Topic) { - super(); + super({ strokeWidth: 2 }); this._targetTopic = targetTopic; this._sourceTopic = sourceTopic; } diff --git a/packages/mindplot/src/components/widget/LineTopicShape.ts b/packages/mindplot/src/components/widget/LineTopicShape.ts index 84759ee7..c1200416 100644 --- a/packages/mindplot/src/components/widget/LineTopicShape.ts +++ b/packages/mindplot/src/components/widget/LineTopicShape.ts @@ -15,19 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { StraightLine } from '@wisemapping/web2d'; +import { StraightLine, StyleAttributes } from '@wisemapping/web2d'; import SizeType from '../SizeType'; import Topic from '../Topic'; class LineTopicShape extends StraightLine { private _size: SizeType | null; - constructor(topic: Topic) { + constructor(topic: Topic, attributes?: StyleAttributes) { const stokeColor = topic.getConnectionColor(); - super({ - strokeColor: stokeColor, - strokeWidth: 1, - }); + super({ ...attributes, strokeColor: stokeColor }); this._size = null; } diff --git a/packages/web2d/src/components/WorkspaceElement.ts b/packages/web2d/src/components/WorkspaceElement.ts index 0c1a5bb7..e32f8e35 100644 --- a/packages/web2d/src/components/WorkspaceElement.ts +++ b/packages/web2d/src/components/WorkspaceElement.ts @@ -143,7 +143,7 @@ abstract class WorkspaceElement { * color: stroke color * opacity: stroke visibility */ - setStroke(width: number, style: string, color?: string, opacity?: number) { + setStroke(width: number | null, style?: string, color?: string, opacity?: number) { if ( style != null && style !== undefined && diff --git a/packages/web2d/src/components/peer/svg/ElementPeer.ts b/packages/web2d/src/components/peer/svg/ElementPeer.ts index cd0d5ff8..7d5a81cd 100644 --- a/packages/web2d/src/components/peer/svg/ElementPeer.ts +++ b/packages/web2d/src/components/peer/svg/ElementPeer.ts @@ -159,7 +159,7 @@ class ElementPeer { setStroke(width: number | null, style?: string | null, color?: string | null, opacity?: number) { if ($defined(width)) { - this._native.setAttribute('stroke-width', `${width}px`); + this._native.setAttribute('stroke-width', `${width}`); } if (color) { diff --git a/packages/web2d/src/components/peer/svg/StraightPeer.ts b/packages/web2d/src/components/peer/svg/StraightPeer.ts index 58aaa863..3c915c6b 100644 --- a/packages/web2d/src/components/peer/svg/StraightPeer.ts +++ b/packages/web2d/src/components/peer/svg/StraightPeer.ts @@ -37,15 +37,15 @@ class StraightLinePeer extends ElementPeer { setFrom(x1: number, y1: number) { this._x1 = x1; this._y1 = y1; - this._native.setAttribute('x1', String(x1)); - this._native.setAttribute('y1', String(y1)); + this._native.setAttribute('x1', x1.toFixed(2)); + this._native.setAttribute('y1', y1.toFixed(2)); } setTo(x2: number, y2: number) { this._x2 = x2; this._y2 = y2; - this._native.setAttribute('x2', String(x2)); - this._native.setAttribute('y2', String(y2)); + this._native.setAttribute('x2', x2.toFixed(2)); + this._native.setAttribute('y2', y2.toFixed(2)); } getFrom() { diff --git a/packages/web2d/src/components/peer/svg/TextPeer.ts b/packages/web2d/src/components/peer/svg/TextPeer.ts index 44286b03..0c73ed17 100644 --- a/packages/web2d/src/components/peer/svg/TextPeer.ts +++ b/packages/web2d/src/components/peer/svg/TextPeer.ts @@ -96,12 +96,12 @@ class TextPeer extends ElementPeer { setPosition(x: number, y: number) { this._position = { x, y }; - this._native.setAttribute('y', String(y)); - this._native.setAttribute('x', String(x)); + this._native.setAttribute('y', y.toFixed(2)); + this._native.setAttribute('x', x.toFixed(2)); // tspan must be positioned manually. Array.from(this._native.querySelectorAll('tspan')).forEach((element) => { - (element as Element).setAttribute('x', String(x)); + (element as Element).setAttribute('x', x.toFixed(2)); }); } diff --git a/packages/web2d/src/index.ts b/packages/web2d/src/index.ts index 73e57106..9f0e493b 100644 --- a/packages/web2d/src/index.ts +++ b/packages/web2d/src/index.ts @@ -37,7 +37,7 @@ export { Arrow, CurvedLine, WorkspaceElement as ElementClass, - Ellipse as Elipse, + Ellipse, Group, Image, StraightLine, diff --git a/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png b/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png index 19657d87..47c173d1 100644 Binary files a/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png and b/packages/webapp/cypress/snapshots/editor.cy.ts/editor-page.snap.png differ