Organize imports. (ios) Fix numeric font size handling.

elements/Circle.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Circle";

elements/Ellipse.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Ellipse";

elements/G.js

@@ -1,9 +1,9 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
 import { extractFont } from "../lib/extract/extractText";
 import extractTransform from "../lib/extract/extractTransform";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "G";

elements/Image.js

@@ -1,8 +1,8 @@
 import React from "react";
 import { Image, requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import { meetOrSliceTypes, alignEnum } from "../lib/extract/extractViewBox";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 const spacesRegExp = /\s+/;
 

elements/Line.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Line";

elements/LinearGradient.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import extractGradient from "../lib/extract/extractGradient";
 import { requireNativeComponent } from "react-native";
+import extractGradient from "../lib/extract/extractGradient";
 
 export default class extends Component {
     static displayName = "LinearGradient";

elements/Mask.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
-import units from "../lib/units";
 import extractTransform from "../lib/extract/extractTransform";
+import units from "../lib/units";
 
 export default class extends Component {
     static displayName = "Mask";

elements/Path.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import Shape from "./Shape";
 import extractProps from "../lib/extract/extractProps";
+import Shape from "./Shape";
 
 export default class extends Shape {
     static displayName = "Path";

elements/Pattern.js

@@ -1,8 +1,8 @@
 import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
-import units from "../lib/units";
 import extractTransform from "../lib/extract/extractTransform";
 import extractViewBox from "../lib/extract/extractViewBox";
+import units from "../lib/units";
 
 export default class extends Component {
     static displayName = "Pattern";

elements/Polygon.js

@@ -1,7 +1,7 @@
 import React from "react";
 import Path from "./Path";
-import extractPolyPoints from "../lib/extract/extractPolyPoints";
 import Shape from "./Shape";
+import extractPolyPoints from "../lib/extract/extractPolyPoints";
 
 export default class extends Shape {
     static displayName = "Polygon";

elements/Polyline.js

@@ -1,7 +1,7 @@
 import React from "react";
 import Path from "./Path";
-import extractPolyPoints from "../lib/extract/extractPolyPoints";
 import Shape from "./Shape";
+import extractPolyPoints from "../lib/extract/extractPolyPoints";
 
 export default class extends Shape {
     static displayName = "Polyline";

elements/RadialGradient.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import extractGradient from "../lib/extract/extractGradient";
 import { requireNativeComponent } from "react-native";
+import extractGradient from "../lib/extract/extractGradient";
 
 export default class extends Component {
     static displayName = "RadialGradient";

elements/Rect.js

@@ -1,5 +1,4 @@
 import React from "react";
-import "./Path"; // must import Path first, don`t know why. without this will throw an `Super expression must either be null or a function, not undefined`
 import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";

elements/Symbol.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import extractViewBox from "../lib/extract/extractViewBox";
 import { requireNativeComponent } from "react-native";
+import extractViewBox from "../lib/extract/extractViewBox";
 
 export default class extends Component {
     static displayName = "Symbol";

elements/TSpan.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { requireNativeComponent } from "react-native";
-import extractText, { setTSpan } from "../lib/extract/extractText";
 import extractProps from "../lib/extract/extractProps";
 import extractTransform from "../lib/extract/extractTransform";
-import Shape from "./Shape";
+import extractText, { setTSpan } from "../lib/extract/extractText";
 import { pickNotNil } from "../lib/util";
+import Shape from "./Shape";
 
 export default class TSpan extends Shape {
     static displayName = "TSpan";

elements/TextPath.js

@@ -1,5 +1,4 @@
 import React from "react";
-
 import { requireNativeComponent } from "react-native";
 import extractText from "../lib/extract/extractText";
 import extractProps from "../lib/extract/extractProps";

ios/Text/RNSVGFontData.m

@@ -56,10 +56,15 @@ RNSVGFontData *RNSVGFontData_Defaults;
     RNSVGFontData *data = [RNSVGFontData alloc];
     CGFloat parentFontSize = parent->fontSize;
     if ([font objectForKey:FONT_SIZE]) {
-        NSString *string = [font objectForKey:FONT_SIZE];
+        id fontSize = [font objectForKey:FONT_SIZE];
-        data->fontSize = [RNSVGPropHelper fromRelativeWithNSString:string
+        if ([fontSize isKindOfClass:NSNumber.class]) {
+            NSNumber* fs = fontSize;
+            data->fontSize = (CGFloat)[fs doubleValue];
+        } else {
+            data->fontSize = [RNSVGPropHelper fromRelativeWithNSString:fontSize
                                                        relative:parentFontSize
                                                        fontSize:parentFontSize];
+        }
     }
     else {
         data->fontSize = parentFontSize;

lib/extract/extractViewBox.js

@@ -1,10 +1,10 @@
-const meetOrSliceTypes = {
+export const meetOrSliceTypes = {
     meet: 0,
     slice: 1,
     none: 2,
 };
 
-const alignEnum = [
+export const alignEnum = [
     "xMinYMin",
     "xMidYMin",
     "xMaxYMin",
@@ -56,5 +56,3 @@ export default function(props) {
         meetOrSlice,
     };
 }
-
-export { meetOrSliceTypes, alignEnum };