Merge branch 'master' into seFlyingButton

badges/coverage-badge.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="421" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="green" stroke="#000" d="M0 0h113v20H0zM113 0h109v20H113zM222 0h87v20h-87zM309 0h112v20H309z"/><path fill="url(#smooth)" d="M0 0h421v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Statements 51.1%</text><text class="high" x="5" y="14">Statements 51.1%</text><text class="shadow" x="118.5" y="15">Branches 40.83%</text><text class="high" x="118" y="14">Branches 40.83%</text><text class="shadow" x="227.5" y="15">Lines 51.81%</text><text class="high" x="227" y="14">Lines 51.81%</text><text class="shadow" x="314.5" y="15">Functions 58.62%</text><text class="high" x="314" y="14">Functions 58.62%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="421" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="green" stroke="#000" d="M0 0h120v20H0zM120 0h102v20H120zM222 0h87v20h-87zM309 0h112v20H309z"/><path fill="url(#smooth)" d="M0 0h421v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Statements 52.79%</text><text class="high" x="5" y="14">Statements 52.79%</text><text class="shadow" x="125.5" y="15">Branches 41.6%</text><text class="high" x="125" y="14">Branches 41.6%</text><text class="shadow" x="227.5" y="15">Lines 53.61%</text><text class="high" x="227" y="14">Lines 53.61%</text><text class="shadow" x="314.5" y="15">Functions 60.18%</text><text class="high" x="314" y="14">Functions 60.18%</text></g></svg>

cypress/integration/ui/__snapshots__/scenario.js.snap

@@ -221,6 +221,7 @@ exports[`use various parts of svg-edit > check tool_italic #0`] = `
       fill-opacity="1"
       stroke-opacity="1"
       id="svg_2"
+      transform="matrix(1 0 0 1 0 0)"
     >
       B
     </text>
@@ -285,6 +286,7 @@ exports[`use various parts of svg-edit > check tool_bold #0`] = `
       fill-opacity="1"
       stroke-opacity="1"
       id="svg_2"
+      transform="matrix(1 0 0 1 0 0)"
     >
       B
     </text>
@@ -349,6 +351,7 @@ exports[`use various parts of svg-edit > check change color #0`] = `
       fill-opacity="1"
       stroke-opacity="1"
       id="svg_2"
+      transform="matrix(1 0 0 1 0 0)"
     >
       B
     </text>
@@ -414,6 +417,7 @@ exports[`use various parts of svg-edit > check tool_start #0`] = `
       fill-opacity="1"
       stroke-opacity="1"
       id="svg_2"
+      transform="matrix(1 0 0 1 0 0)"
     >
       B
     </text>
@@ -445,3 +449,203 @@ exports[`use various parts of svg-edit > check tool_start #0`] = `
   </g>
 </svg>
 `;
+
+exports[`use various parts of svg-edit > check tool_star #0`] = `
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  width="640"
+  height="480"
+  id="svgcontent"
+  overflow="visible"
+  x="640"
+  y="480"
+  viewBox="0 0 640 480"
+>
+  <g class="layer" style="pointer-events:all">
+    <title style="pointer-events:inherit">Layer 1</title>
+    <rect
+      id="rect"
+      fill="#FF0000"
+      height="70"
+      stroke="#000000"
+      stroke-width="5"
+      width="94"
+      x="69.5"
+      y="51.5"
+      style="pointer-events:inherit"
+      fill-opacity="1"
+      stroke-opacity="1"
+    ></rect>
+    <text
+      fill="#ffff00"
+      stroke="#000000"
+      stroke-width="0"
+      x="116"
+      y="87"
+      id="svg_1"
+      font-size="24"
+      font-family="serif"
+      text-anchor="middle"
+      xml:space="preserve"
+      fill-opacity="1"
+      stroke-opacity="1"
+      font-style="italic"
+      font-weight="bold"
+    >
+      B
+    </text>
+    <text
+      fill="#000000"
+      stroke="#000000"
+      stroke-width="0"
+      x="136"
+      y="107"
+      font-size="24"
+      font-family="serif"
+      text-anchor="middle"
+      xml:space="preserve"
+      fill-opacity="1"
+      stroke-opacity="1"
+      id="svg_2"
+      transform="matrix(1 0 0 1 0 0)"
+    >
+      B
+    </text>
+    <polygon
+      cx="407"
+      cy="45"
+      id="svg_3"
+      shape="star"
+      point="5"
+      r="13.333333333333334"
+      radialshift=""
+      r2="5.333333333333334"
+      orient="point"
+      fill="#000000"
+      strokecolor="#000000"
+      strokeWidth="0"
+      points="407,31.666666666666664 410.1348546788932,40.68524269666695 419.68075355060205,40.87977340833403 412.0723014202408,46.64809063666639 414.83713669723295,55.78689325833263 407,50.333333333333336 399.16286330276705,55.78689325833263 401.9276985797592,46.64809063666639 394.31924644939795,40.87977340833404 403.8651453211068,40.68524269666695 407,31.666666666666664 410.1348546788932,40.68524269666695 "
+      stroke="#000000"
+      stroke-width="0"
+    >
+      <animate
+        attributeName="opacity"
+        begin="indefinite"
+        dur="0.2"
+        fill="freeze"
+        to="1"
+      ></animate>
+    </polygon>
+  </g>
+</svg>
+`;
+
+exports[`use various parts of svg-edit > check tool_polygon #0`] = `
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  width="640"
+  height="480"
+  id="svgcontent"
+  overflow="visible"
+  x="640"
+  y="480"
+  viewBox="0 0 640 480"
+>
+  <g class="layer" style="pointer-events:all">
+    <title style="pointer-events:inherit">Layer 1</title>
+    <rect
+      id="rect"
+      fill="#FF0000"
+      height="70"
+      stroke="#000000"
+      stroke-width="5"
+      width="94"
+      x="69.5"
+      y="51.5"
+      style="pointer-events:inherit"
+      fill-opacity="1"
+      stroke-opacity="1"
+    ></rect>
+    <text
+      fill="#ffff00"
+      stroke="#000000"
+      stroke-width="0"
+      x="116"
+      y="87"
+      id="svg_1"
+      font-size="24"
+      font-family="serif"
+      text-anchor="middle"
+      xml:space="preserve"
+      fill-opacity="1"
+      stroke-opacity="1"
+      font-style="italic"
+      font-weight="bold"
+    >
+      B
+    </text>
+    <text
+      fill="#000000"
+      stroke="#000000"
+      stroke-width="0"
+      x="136"
+      y="107"
+      font-size="24"
+      font-family="serif"
+      text-anchor="middle"
+      xml:space="preserve"
+      fill-opacity="1"
+      stroke-opacity="1"
+      id="svg_2"
+      transform="matrix(1 0 0 1 0 0)"
+    >
+      B
+    </text>
+    <polygon
+      cx="407"
+      cy="45"
+      id="svg_3"
+      shape="star"
+      point="5"
+      r="13.333333333333334"
+      radialshift=""
+      r2="5.333333333333334"
+      orient="point"
+      fill="#000000"
+      strokecolor="#000000"
+      strokeWidth="0"
+      points="407,31.666666666666664 410.1348546788932,40.68524269666695 419.68075355060205,40.87977340833403 412.0723014202408,46.64809063666639 414.83713669723295,55.78689325833263 407,50.333333333333336 399.16286330276705,55.78689325833263 401.9276985797592,46.64809063666639 394.31924644939795,40.87977340833404 403.8651453211068,40.68524269666695 407,31.666666666666664 410.1348546788932,40.68524269666695 "
+      stroke="#000000"
+      stroke-width="0"
+      style="pointer-events:inherit"
+      fill-opacity="1"
+      stroke-opacity="1"
+    ></polygon>
+    <polygon
+      cx="457"
+      cy="95"
+      id="svg_4"
+      shape="regularPoly"
+      sides="5"
+      orient="x"
+      edge="6.666666666666667"
+      fill="#000000"
+      strokecolor="#000000"
+      strokeWidth="5"
+      points="462.6710053890136,95 458.7524370403971,100.39344662916632 452.4120602650961,98.33333333333333 452.4120602650961,91.66666666666667 458.7524370403971,89.60655337083368 462.6710053890136,95 "
+      stroke="#000000"
+      stroke-width="5"
+    >
+      <animate
+        attributeName="opacity"
+        begin="indefinite"
+        dur="0.2"
+        fill="freeze"
+        to="1"
+      ></animate>
+    </polygon>
+  </g>
+</svg>
+`;

src/svgcanvas/event.js

@@ -211,7 +211,7 @@ export const mouseMoveEvent = function (evt) {
       top = box.y,
       {width, height} = box;
     dx = (x - eventContext_.getStartX());
-    dy = (y - eventContext_.getStartX());
+    dy = (y - eventContext_.getStartY());
 
     if (eventContext_.getCurConfig().gridSnapping) {
       dx = snapToGrid(dx);