Merge branch 'develop' into 3061_refactoring_and_modularisation

.github/workflows/checks.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     name: check tests
-    if: github.repository_owner == 'mermaid'
+    if: github.repository_owner == 'mermaid-js'
     steps:
     - uses: actions/checkout@v2
       with:

package.json

@@ -81,7 +81,7 @@
     "concurrently": "^7.0.0",
     "coveralls": "^3.0.2",
     "css-to-string-loader": "^0.1.3",
-    "cypress": "10.2.0",
+    "cypress": "10.3.0",
     "cypress-image-snapshot": "^4.0.1",
     "documentation": "13.2.0",
     "eslint": "^8.4.1",

src/diagrams/class/classRenderer-v2.js

@@ -338,7 +338,6 @@ export const draw = function (text, id) {
       ? select(sandboxElement.nodes()[0].contentDocument.body)
       : select('body');
   const svg = root.select(`[id="${id}"]`);
-  svg.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   // Run the renderer. This is what draws the final graph.
   const element = root.select('#' + id + ' g');

src/diagrams/class/classRenderer.js

@@ -181,7 +181,6 @@ export const draw = function (text, id) {
 
   // Fetch the default direction, use TD if none was found
   const diagram = root.select(`[id='${id}']`);
-  diagram.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
   insertMarkers(diagram);
 
   // Layout graph, Create a new directed graph

src/diagrams/flowchart/flowRenderer-v2.js

@@ -443,7 +443,6 @@ export const draw = function (text, id) {
 
   // Set up an SVG group so that we can translate the final graph.
   const svg = root.select(`[id="${id}"]`);
-  svg.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   // Adds title and description to the flow chart
   addSVGAccessibilityFields(parser.yy, svg, id);

src/diagrams/flowchart/flowRenderer.js

@@ -425,7 +425,6 @@ export const draw = function (text, id) {
 
   // Set up an SVG group so that we can translate the final graph.
   const svg = root.select(`[id="${id}"]`);
-  svg.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   // Adds title and description to the flow chart
   addSVGAccessibilityFields(parser.yy, svg, id);

src/diagrams/user-journey/journeyRenderer.js

@@ -69,7 +69,6 @@ export const draw = function (text, id) {
 
   bounds.init();
   const diagram = root.select('#' + id);
-  diagram.attr('xmlns:xlink', 'http://www.w3.org/1999/xlink');
 
   svgDraw.initGraphics(diagram);
 

src/mermaidAPI.js

@@ -236,6 +236,7 @@ const render = function (id, _txt, cb, container) {
       .attr('id', id)
       .attr('width', '100%')
       .attr('xmlns', 'http://www.w3.org/2000/svg')
+      .attr('xmlns:xlink', 'http://www.w3.org/1999/xlink')
       .append('g');
   } else {
     // No container was provided