marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-22 01:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

#1055 Better selectors

Browse Source
This commit is contained in:
Knut Sveidqvist
2019-11-08 20:15:48 +01:00
parent d01f494277
commit 3f8f9f6711
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cypress/integration/other/interaction.spec.js
View File

@@ -16,7 +16,7 @@ describe('Interaction', () => {
cy.viewport(1440, 1024); cy.viewport(1440, 1024);
cy.visit(url); cy.visit(url);
cy.get('body') cy.get('body')
.find('g#mermaid-dom-id-1Function') .find('g[id="1Function"]')
.click(); .click();
cy.get('.created-by-click').should('have.text', 'Clicked By Flow'); cy.get('.created-by-click').should('have.text', 'Clicked By Flow');
@@ -38,7 +38,7 @@ describe('Interaction', () => {
cy.viewport(1440, 1024); cy.viewport(1440, 1024);
cy.visit(url); cy.visit(url);
cy.get('body') cy.get('body')
.find('g#mermaid-dom-id-2URL') .find('g[id="2URL"]')
.click(); .click();
cy.location().should(location => { cy.location().should(location => {
@@ -108,7 +108,7 @@ describe('Interaction', () => {
cy.viewport(1440, 1024); cy.viewport(1440, 1024);
cy.visit(url); cy.visit(url);
cy.get('body') cy.get('body')
.find('g#mermaid-dom-id-1Function') .find('g[id="1Function"]')
.click(); .click();
cy.get('.created-by-click').should('not.have.text', 'Clicked By Flow'); cy.get('.created-by-click').should('not.have.text', 'Clicked By Flow');
@@ -130,7 +130,7 @@ describe('Interaction', () => {
cy.viewport(1440, 1024); cy.viewport(1440, 1024);
cy.visit(url); cy.visit(url);
cy.get('body') cy.get('body')
.find('g#mermaid-dom-id-2URL') .find('g[id="2URL"]')
.click(); .click();
cy.location().should(location => { cy.location().should(location => {
@@ -200,7 +200,7 @@ describe('Interaction', () => {
cy.viewport(1440, 1024); cy.viewport(1440, 1024);
cy.visit(url); cy.visit(url);
cy.get('body') cy.get('body')
.find('g#mermaid-dom-id-1Function') .find('g[id="1Function"]')
.click(); .click();
cy.get('.created-by-click').should('not.have.text', 'Clicked By Flow'); cy.get('.created-by-click').should('not.have.text', 'Clicked By Flow');

3
src/diagrams/flowchart/flowDb.js
View File

@@ -4,7 +4,8 @@ import { logger } from '../../logger';
import utils from '../../utils'; import utils from '../../utils';
import { getConfig } from '../../config'; import { getConfig } from '../../config';
const MERMAID_DOM_ID_PREFIX = 'mermaid-dom-id-'; // const MERMAID_DOM_ID_PREFIX = 'mermaid-dom-id-';
const MERMAID_DOM_ID_PREFIX = '';
const config = getConfig(); const config = getConfig();
let vertices = {}; let vertices = {};

6
src/diagrams/flowchart/flowRenderer.js
View File

@@ -460,8 +460,8 @@ export const draw = function(text, id) {
subG = subGraphs[i]; subG = subGraphs[i];
if (subG.title !== 'undefined') { if (subG.title !== 'undefined') {
const clusterRects = document.querySelectorAll('#' + id + ' #' + subG.id + ' rect'); const clusterRects = document.querySelectorAll('#' + id + ' [id="' + subG.id + '"] rect');
const clusterEl = document.querySelectorAll('#' + id + ' #' + subG.id); const clusterEl = document.querySelectorAll('#' + id + ' [id="' + subG.id + '"]');
const xPos = clusterRects[0].x.baseVal.value; const xPos = clusterRects[0].x.baseVal.value;
const yPos = clusterRects[0].y.baseVal.value; const yPos = clusterRects[0].y.baseVal.value;
@@ -475,7 +475,7 @@ export const draw = function(text, id) {
// Add label rects for non html labels // Add label rects for non html labels
if (!conf.htmlLabels) { if (!conf.htmlLabels) {
const labels = document.querySelectorAll('#' + id + ' .edgeLabel .label'); const labels = document.querySelectorAll('[id="' + id + '"] .edgeLabel .label');
for (let k = 0; k < labels.length; k++) { for (let k = 0; k < labels.length; k++) {
const label = labels[k]; const label = labels[k];