Extracted out the commonly used line break regex

This commit extract the commonly used /br\s*\/?>/gi regex to common.js,
in order to keep the code more DRY.
This commit is contained in:
Danny Shemesh
2020-04-23 07:17:09 +03:00
parent 49f8aac6a9
commit 197d006860
7 changed files with 22 additions and 13 deletions

View File

@@ -1,3 +1,5 @@
import common from '../common/common';
export const drawRect = function(elem, rectData) {
const rectElem = elem.append('rect');
rectElem.attr('x', rectData.x);
@@ -18,7 +20,7 @@ export const drawRect = function(elem, rectData) {
export const drawText = function(elem, textData) {
// Remove and ignore br:s
const nText = textData.text.replace(/<br\s*\/?>/gi, ' ');
const nText = textData.text.replace(common.lineBreakRegex, ' ');
const textElem = elem.append('text');
textElem.attr('x', textData.x);
@@ -324,7 +326,7 @@ const _drawTextCandidateFunc = (function() {
function byTspan(content, g, x, y, width, height, textAttrs, conf) {
const { actorFontSize, actorFontFamily } = conf;
const lines = content.split(/<br\s*\/?>/gi);
const lines = content.split(common.lineBreakRegex);
for (let i = 0; i < lines.length; i++) {
const dy = i * actorFontSize - (actorFontSize * (lines.length - 1)) / 2;
const text = g