marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-11 11:29:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

#1269 Work around for inaccurate bounding box results in Safari.

Browse Source
This commit is contained in:
Knut Sveidqvist
2020-02-26 20:01:53 +01:00
parent 737e95c3f9
commit dd5e6c18d5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cypress/platform/current.html
View File

@@ -20,15 +20,8 @@
<h1>info below</h1> <h1>info below</h1>
<div style="display: flex;width: 100%; height: 100%"> <div style="display: flex;width: 100%; height: 100%">
<div class="mermaid" style="width: 100%; height: 100%"> <div class="mermaid" style="width: 100%; height: 100%">
sequenceDiagram stateDiagram
Alice->>John: Hello John, how are you? A --> B : this text causes the rendering bug
loop Healthcheck
John->>John: Fight against hypochondria
end
Note right of John: Rational thoughts!
John-->>Alice: Great!
John->>Bob: How about you?
Bob-->>John: Jolly good!
</div> </div>
</div> </div>

11
src/diagrams/state/shapes.js
View File

@@ -4,6 +4,7 @@ import stateDb from './stateDb';
import utils from '../../utils'; import utils from '../../utils';
import common from '../common/common'; import common from '../common/common';
import { getConfig } from '../../config'; import { getConfig } from '../../config';
import { logger } from '../../logger';
// let conf; // let conf;
@@ -464,9 +465,13 @@ export const drawEdge = function(elem, path, relation) {
.attr('x', x) .attr('x', x)
.attr('y', y + titleHeight); .attr('y', y + titleHeight);
const boundstmp = label.node().getBBox();
logger.info(boundstmp, x, y + titleHeight);
if (titleHeight === 0) { if (titleHeight === 0) {
const titleBox = title.node().getBBox(); const titleBox = title.node().getBBox();
titleHeight = titleBox.height; titleHeight = titleBox.height;
logger.info('Title height', titleHeight, y);
} }
titleRows.push(title); titleRows.push(title);
} }
@@ -482,9 +487,11 @@ export const drawEdge = function(elem, path, relation) {
.insert('rect', ':first-child') .insert('rect', ':first-child')
.attr('class', 'box') .attr('class', 'box')
.attr('x', bounds.x - getConfig().state.padding / 2) .attr('x', bounds.x - getConfig().state.padding / 2)
.attr('y', bounds.y - getConfig().state.padding / 2) .attr('y', y - titleHeight)
.attr('width', bounds.width + getConfig().state.padding) .attr('width', bounds.width + getConfig().state.padding)
.attr('height', bounds.height + getConfig().state.padding); .attr('height', titleHeight + getConfig().state.padding);
logger.info(bounds);
//label.attr('transform', '0 -' + (bounds.y / 2)); //label.attr('transform', '0 -' + (bounds.y / 2));