first step of TSpan

lib/extract/extractText.js

@@ -1,93 +1,43 @@
-import SerializablePath from '../SerializablePath';
-import _ from 'lodash';
-const newLine = /\n/g;
-const defaultFontFamily = '"Helvetica Neue", "Helvetica", Arial';
-const fontRegExp = /^\s*((?:(?:normal|bold|italic)\s+)*)(?:(\d+(?:\.\d+)?)[ptexm%]*(?:\s*\/.*?)?\s+)?\s*"?([^"]*)/i;
-const fontFamilyPrefix = /^[\s"']*/;
-const fontFamilySuffix = /[\s"']*$/;
-let cachedFontObjectsFromString = {};
+import extractTextContent from './extractTextContent';
+import extractSpan from './extractSpan';
 
-function childrenAsString(children) {
-    if (!children) {
-        return '';
-    }
-    if (typeof children === 'string') {
-        return children;
-    }
-    if (children.length) {
-        return children.join('\n');
-    }
-    return '';
-}
-
-function extractFontAndLines(font, text) {
-    return {
-        font: extractFont(font),
-        lines: text.split(newLine)
-    };
-}
-
-function extractSingleFontFamily(fontFamilyString = defaultFontFamily) {
-    // SVG on the web allows for multiple font-families to be specified.
-    // For compatibility, we extract the first font-family, hoping
-    // we'll get a match.
-    return fontFamilyString.split(',')[0]
-        .replace(fontFamilyPrefix, '')
-        .replace(fontFamilySuffix, '');
-}
-
-function parseFontString(font) {
-    if (cachedFontObjectsFromString.hasOwnProperty(font)) {
-        return cachedFontObjectsFromString[font];
-    }
-    let match = fontRegExp.exec(font);
-    if (!match) {
-        return null;
-    }
-    let fontFamily = extractSingleFontFamily(match[3]);
-    let fontSize = +match[2] || 12;
-    let isBold = /bold/.exec(match[1]);
-    let isItalic = /italic/.exec(match[1]);
-    cachedFontObjectsFromString[font] = {
-        fontFamily: fontFamily,
-        fontSize: fontSize,
-        fontWeight: isBold ? 'bold' : 'normal',
-        fontStyle: isItalic ? 'italic' : 'normal'
-    };
-    return cachedFontObjectsFromString[font];
-}
-
-function extractFont(font) {
-    if (_.isNil(font)) {
-        return null;
-    }
-    if (typeof font === 'string') {
-        return parseFontString(font);
-    }
-    let fontFamily = extractSingleFontFamily(font.fontFamily);
-    let fontSize = +font.fontSize || 12;
-
-    return {
-        fontFamily: fontFamily,
-        fontSize: fontSize,
-        fontWeight: font.fontWeight,
-        fontStyle: font.fontStyle
-    };
-}
-
-const anchord = {
+const anchors = {
     end: 1,
     middle: 2,
     start: 0
 };
 
 export default function(props) {
+    let children = extractTextContent(props.children);
+    let extractedProps = extractSpan(props);
+    let firstSpan = children[0];
+    let alignment;
+    let {dx, dy} = extractedProps;
+    let maxDeltaLength = Math.max(dx.length, dy.length);
+
+    if (firstSpan && firstSpan.props.hasOwnProperty('textAnchor')) {
+        alignment = anchors[firstSpan.props.textAnchor];
+    } else if (anchors[props.textAnchor]) {
+        alignment = anchors[props.textAnchor];
+    }
+
+    if (!alignment) {
+        alignment = 0;
+    }
+
+    for (let i = 0; i < maxDeltaLength; i++) {
+        console.log(i);
+    }
+
+    console.log(extractedProps);
+
     return {
-        alignment: anchord[props.textAnchor] || 0,
-        frame: extractFontAndLines(
-            props,
-            childrenAsString(props.children)
-        ),
-        path: props.path ? new SerializablePath(props.path).toJSON() : undefined
-    };
+        alignment,
+        children,
+        fontFamily: 'Helvetica Neue',
+        fontSize: 12,
+        fontStyle: 'normal',
+        fontWeight: 'normal',
+        ...extractedProps
+    }
 }