From ae36704b667a43d8bc59e76bf91e0a385b8713c5 Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Mon, 3 May 2021 16:16:18 +0200 Subject: [PATCH 1/6] #2017 Fix for missing docRef --- src/diagrams/requirement/requirementRenderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diagrams/requirement/requirementRenderer.js b/src/diagrams/requirement/requirementRenderer.js index dca8fd6a8..f98add412 100644 --- a/src/diagrams/requirement/requirementRenderer.js +++ b/src/diagrams/requirement/requirementRenderer.js @@ -271,7 +271,7 @@ export const drawElements = (els, graph, svgNode) => { let bodyNode = newBodyNode( groupNode, textId + '_body', - [`Type: ${el.type || 'Not Specified'}`, `Doc Ref: ${el.docref || 'None'}`], + [`Type: ${el.type || 'Not Specified'}`, `Doc Ref: ${el.docRef || 'None'}`], titleNodeInfo.y ); From 83754410f32e013414b3767ad8294a13919fd418 Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Mon, 3 May 2021 16:17:38 +0200 Subject: [PATCH 2/6] #2017 Fix for clearing diagram data (helpful for live editor) --- src/diagrams/requirement/requirementRenderer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diagrams/requirement/requirementRenderer.js b/src/diagrams/requirement/requirementRenderer.js index f98add412..53a6c94aa 100644 --- a/src/diagrams/requirement/requirementRenderer.js +++ b/src/diagrams/requirement/requirementRenderer.js @@ -323,6 +323,7 @@ const elementString = str => { export const draw = (text, id) => { parser.yy = requirementDb; + parser.yy.clear(); parser.parse(text); const svg = select(`[id='${id}']`); From 34bd9b58e841cda7f18a8a6969b3212fea817491 Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Mon, 3 May 2021 16:19:00 +0200 Subject: [PATCH 3/6] #2017 Fix for theme variable border size for requirement box --- src/diagrams/requirement/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/diagrams/requirement/styles.js b/src/diagrams/requirement/styles.js index 52423f4a8..14c354d55 100644 --- a/src/diagrams/requirement/styles.js +++ b/src/diagrams/requirement/styles.js @@ -19,6 +19,7 @@ const getStyles = options => ` fill-opacity: 100%; stroke: ${options.requirementBorderColor}; stroke-size: ${options.requirementBorderSize}; + stroke-width: ${options.requirementBorderSize}; } .reqLabelBox { fill: ${options.relationLabelBackground}; From ea12f5b2ecfdf9136368747de5fae83fea9db613 Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Mon, 3 May 2021 16:21:47 +0200 Subject: [PATCH 4/6] #2017 Fix for theme variable border size for requirement box --- src/diagrams/requirement/styles.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/diagrams/requirement/styles.js b/src/diagrams/requirement/styles.js index 14c354d55..84616cb58 100644 --- a/src/diagrams/requirement/styles.js +++ b/src/diagrams/requirement/styles.js @@ -18,7 +18,6 @@ const getStyles = options => ` fill: ${options.requirementBackground}; fill-opacity: 100%; stroke: ${options.requirementBorderColor}; - stroke-size: ${options.requirementBorderSize}; stroke-width: ${options.requirementBorderSize}; } .reqLabelBox { From 257ed8dc92b6561c34251f9db074a65de50fa6fa Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Mon, 3 May 2021 16:22:25 +0200 Subject: [PATCH 5/6] #2017 Added useage of theme variable requirementTextColor --- src/diagrams/requirement/styles.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/diagrams/requirement/styles.js b/src/diagrams/requirement/styles.js index 84616cb58..7cb57662b 100644 --- a/src/diagrams/requirement/styles.js +++ b/src/diagrams/requirement/styles.js @@ -20,6 +20,10 @@ const getStyles = options => ` stroke: ${options.requirementBorderColor}; stroke-width: ${options.requirementBorderSize}; } + + .reqTitle, .reqLabel{ + fill: ${options.requirementTextColor}; + } .reqLabelBox { fill: ${options.relationLabelBackground}; fill-opacity: 100%; From 5157b2eff42e64734512a5302d35fe72125751bb Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Mon, 3 May 2021 16:22:54 +0200 Subject: [PATCH 6/6] #2017 Fix for theme variable border size for requirement title line --- src/diagrams/requirement/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diagrams/requirement/styles.js b/src/diagrams/requirement/styles.js index 7cb57662b..0ce52314c 100644 --- a/src/diagrams/requirement/styles.js +++ b/src/diagrams/requirement/styles.js @@ -31,7 +31,7 @@ const getStyles = options => ` .req-title-line { stroke: ${options.requirementBorderColor}; - stroke-width: 1; + stroke-width: ${options.requirementBorderSize}; } .relationshipLine { stroke: ${options.relationColor};