Implement support for em in dx and dy attributes and font props for G element

This commit is contained in:
Mikael Sand
2017-06-20 03:15:01 +03:00
parent b094bc80f0
commit 155fa4b6ae
6 changed files with 117 additions and 64 deletions

View File

@@ -47,7 +47,7 @@ function parseFontString(font) {
return cachedFontObjectsFromString[font];
}
function extractFont(props) {
export function extractFont(props) {
let font = props.font;
let fontSize = +props.fontSize;
@@ -68,8 +68,11 @@ function extractFont(props) {
function parseDelta(delta) {
if (typeof delta === 'string') {
if (isNaN(+delta)) {
return delta.trim().replace(commaReg, ' ').split(spaceReg).map(d => +d || 0);
const trim = delta.trim();
if (trim.slice(-2) === 'em') {
return [trim];
} else if (isNaN(+delta)) {
return trim.replace(commaReg, ' ').split(spaceReg).map(d => +d || 0);
} else {
return [+delta];
}