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

Add support for abstract methods

Browse Source 
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
This commit is contained in:
Justin Greywolf
2019-12-09 18:13:06 -08:00
parent 6fdf30357c
commit 5b2f9351c7
5 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/diagrams/class/classDb.js
View File

@@ -72,7 +72,7 @@ export const addMember = function(className, member) {
if (memberString.startsWith('<<') && memberString.endsWith('>>')) {
// Remove leading and trailing brackets
theClass.annotations.push(memberString.substring(2, memberString.length - 2));
} else if (memberString.endsWith(')')) {
} else if (memberString.indexOf(')') > 0) {
theClass.methods.push(memberString);
} else if (memberString) {
theClass.members.push(memberString);

8
src/diagrams/class/classDiagram.spec.js
View File

@@ -402,25 +402,25 @@ describe('class diagram, ', function () {
});
it('should handle abstract methods', function () {
const str = 'classDiagram\n' + 'class Class1\n' + 'Class1 : |someMethod()';
const str = 'classDiagram\n' + 'class Class1\n' + 'Class1 : someMethod()*';
parser.parse(str);
const testClass = parser.yy.getClass('Class1');
expect(testClass.annotations.length).toBe(0);
expect(testClass.members.length).toBe(0);
expect(testClass.methods.length).toBe(1);
expect(testClass.methods[0]).toBe('|someMethod()');
expect(testClass.methods[0]).toBe('someMethod()*');
});
it('should handle static methods', function () {
const str = 'classDiagram\n' + 'class Class1\n' + 'Class1 : $someMethod()';
const str = 'classDiagram\n' + 'class Class1\n' + 'Class1 : someMethod()$';
parser.parse(str);
const testClass = parser.yy.getClass('Class1');
expect(testClass.annotations.length).toBe(0);
expect(testClass.members.length).toBe(0);
expect(testClass.methods.length).toBe(1);
expect(testClass.methods[0]).toBe('$someMethod()');
expect(testClass.methods[0]).toBe('someMethod()$');
});
});
});

30
src/diagrams/class/classRenderer.js
View File

@@ -283,24 +283,28 @@ const drawClass = function(elem, classDef) {
const addTspan = function(textEl, txt, isFirst) {
let displayText = txt;
let cssStyle = '';
let classifier = txt.substring(0 , 1);
switch (classifier) {
case '|':
cssStyle = 'font-style:italic;';
displayText = txt.substring(1);
break;
case '$':
cssStyle = 'text-decoration:underline;';
displayText = txt.substring(1);
break;
let methodEnd = txt.indexOf(')') + 1;
if (methodEnd > 1 && methodEnd <= txt.length) {
let classifier = txt.substring(methodEnd);
switch (classifier) {
case '*':
cssStyle = 'font-style:italic;';
break;
case '$':
cssStyle = 'text-decoration:underline;';
break;
}
displayText = txt.substring(0, methodEnd);
}
const tSpan = textEl
.append('tspan')
.attr('x', conf.padding)
.text(displayText);
if (cssStyle !== '') {
tSpan.attr('style', cssStyle);
}