From c7ed29b33ad4ec22e28e41185bcad73351f964be Mon Sep 17 00:00:00 2001
From: Mikael Sand <msand@abo.fi>
Date: Tue, 8 Jan 2019 22:53:03 +0200
Subject: [PATCH] Simplify id/url regex matching. Allow mask/clipPath without
 url prefix.

Remove redundant variables.
Unify use of newlines.
---
 elements/Ellipse.js            | 1 -
 elements/G.js                  | 1 -
 elements/Image.js              | 7 ++-----
 elements/Mask.js               | 6 +-----
 elements/Path.js               | 1 -
 elements/Pattern.js            | 6 +-----
 elements/Symbol.js             | 1 -
 elements/Text.js               | 1 -
 elements/TextPath.js           | 7 +++----
 elements/Use.js                | 6 +++---
 lib/extract/extractBrush.js    | 5 +++--
 lib/extract/extractClipPath.js | 4 ++--
 lib/extract/extractGradient.js | 4 +---
 lib/extract/extractProps.js    | 4 ++--
 lib/extract/patternReg.js      | 1 -
 lib/util.js                    | 2 ++
 16 files changed, 20 insertions(+), 37 deletions(-)
 delete mode 100644 lib/extract/patternReg.js

diff --git a/elements/Ellipse.js b/elements/Ellipse.js
index 4e9668a3..2a691c2f 100644
--- a/elements/Ellipse.js
+++ b/elements/Ellipse.js
@@ -20,7 +20,6 @@ export default class extends Shape {
     render() {
         const { props } = this;
         const { cx, cy, rx, ry } = props;
-
         return (
             <RNSVGEllipse
                 ref={ele => {
diff --git a/elements/G.js b/elements/G.js
index 490a52c3..4071b118 100644
--- a/elements/G.js
+++ b/elements/G.js
@@ -18,7 +18,6 @@ export default class extends Shape {
 
     render() {
         const { props } = this;
-
         return (
             <RNSVGGroup
                 {...extractProps(props, this)}
diff --git a/elements/Image.js b/elements/Image.js
index 4a365dd6..27f46b55 100644
--- a/elements/Image.js
+++ b/elements/Image.js
@@ -25,9 +25,6 @@ export default class extends Shape {
         const { props } = this;
         const { preserveAspectRatio, x, y, width, height, href } = props;
         const modes = preserveAspectRatio.trim().split(spacesRegExp);
-        const meetOrSlice = meetOrSliceTypes[modes[1]] || 0;
-        const align = alignEnum[modes[0]] || "xMidYMid";
-
         return (
             <RNSVGImage
                 ref={ele => {
@@ -38,8 +35,8 @@ export default class extends Shape {
                 y={y}
                 width={width}
                 height={height}
-                meetOrSlice={meetOrSlice}
-                align={align}
+                meetOrSlice={meetOrSliceTypes[modes[1]] || 0}
+                align={alignEnum[modes[0]] || "xMidYMid"}
                 src={Image.resolveAssetSource(href)}
             />
         );
diff --git a/elements/Mask.js b/elements/Mask.js
index 66ffad78..a5b21bcf 100644
--- a/elements/Mask.js
+++ b/elements/Mask.js
@@ -24,9 +24,6 @@ export default class extends Component {
             maskContentUnits,
             children,
         } = props;
-
-        const extractedTransform = extractTransform(maskTransform || transform || props);
-
         return (
             <RNSVGMask
                 ref={ele => {
@@ -37,8 +34,7 @@ export default class extends Component {
                 y={y}
                 width={width}
                 height={height}
-                matrix={extractedTransform}
-                maskTransform={extractedTransform}
+                maskTransform={extractTransform(maskTransform || transform || props)}
                 maskUnits={maskUnits !== undefined ? units[maskUnits] : 0}
                 maskContentUnits={
                     maskContentUnits !== undefined ? units[maskContentUnits] : 1
diff --git a/elements/Path.js b/elements/Path.js
index 812ab485..6d640cca 100644
--- a/elements/Path.js
+++ b/elements/Path.js
@@ -12,7 +12,6 @@ export default class extends Shape {
 
     render() {
         const { props } = this;
-
         return (
             <RNSVGPath
                 ref={ele => {
diff --git a/elements/Pattern.js b/elements/Pattern.js
index fd0cab6a..1280cfb0 100644
--- a/elements/Pattern.js
+++ b/elements/Pattern.js
@@ -27,9 +27,6 @@ export default class extends Component {
             viewBox,
             preserveAspectRatio,
         } = props;
-
-        const extractedTransform = extractTransform(patternTransform || transform || props);
-
         return (
             <RNSVGPattern
                 ref={ele => {
@@ -40,8 +37,7 @@ export default class extends Component {
                 y={y}
                 width={width}
                 height={height}
-                matrix={extractedTransform}
-                patternTransform={extractedTransform}
+                patternTransform={extractTransform(patternTransform || transform || props)}
                 patternUnits={units[patternUnits] || 0}
                 patternContentUnits={
                     patternContentUnits ? units[patternContentUnits] : 1
diff --git a/elements/Symbol.js b/elements/Symbol.js
index 805684ac..1cdfde95 100644
--- a/elements/Symbol.js
+++ b/elements/Symbol.js
@@ -8,7 +8,6 @@ export default class extends Component {
     render() {
         const { props } = this;
         const { id, children } = props;
-
         return (
             <RNSVGSymbol name={id} {...extractViewBox(props)}>
                 {children}
diff --git a/elements/Text.js b/elements/Text.js
index 4df4de8e..ac08aadd 100644
--- a/elements/Text.js
+++ b/elements/Text.js
@@ -24,7 +24,6 @@ export default class extends Shape {
 
     render() {
         const props = this.props;
-
         return (
             <RNSVGText
                 ref={ele => {
diff --git a/elements/TextPath.js b/elements/TextPath.js
index 1da703be..b15acf9c 100644
--- a/elements/TextPath.js
+++ b/elements/TextPath.js
@@ -2,11 +2,10 @@ import React from "react";
 import { requireNativeComponent } from "react-native";
 import extractText from "../lib/extract/extractText";
 import extractProps from "../lib/extract/extractProps";
+import { idPattern } from "../lib/util";
 import Shape from "./Shape";
 import TSpan from "./TSpan";
 
-const idExpReg = /^#(.+)$/;
-
 export default class extends Shape {
     static displayName = "TextPath";
 
@@ -22,9 +21,9 @@ export default class extends Shape {
             midLine,
             ...props
         } = this.props;
-        const matched = href && href.match(idExpReg);
+        const matched = href && href.match(idPattern);
         const match = matched && matched[1];
-        if (href && match) {
+        if (match) {
             return (
                 <RNSVGTextPath
                     {...{
diff --git a/elements/Use.js b/elements/Use.js
index 934a40d3..eef04e8e 100644
--- a/elements/Use.js
+++ b/elements/Use.js
@@ -1,9 +1,9 @@
 import React from "react";
-import { requireNativeComponent } from "react-native";
+import {requireNativeComponent} from "react-native";
 import extractProps from "../lib/extract/extractProps";
+import { idPattern } from "../lib/util";
 import Shape from "./Shape";
 
-const idExpReg = /^#(.+)$/;
 export default class extends Shape {
     static displayName = "Use";
 
@@ -21,7 +21,7 @@ export default class extends Shape {
         const { children, width, height, href } = props;
 
         // match "url(#pattern)"
-        const matched = href.match(idExpReg);
+        const matched = href.match(idPattern);
         const match = matched && matched[1];
 
         if (!match) {
diff --git a/lib/extract/extractBrush.js b/lib/extract/extractBrush.js
index e6573143..a089bcc0 100644
--- a/lib/extract/extractBrush.js
+++ b/lib/extract/extractBrush.js
@@ -1,5 +1,6 @@
 import Color from "color";
-import patternReg from "./patternReg";
+
+const urlIdPattern = /^url\(#(.+?)\)$/;
 
 export default function(colorOrBrush) {
     if (colorOrBrush === "none" || !colorOrBrush) {
@@ -10,7 +11,7 @@ export default function(colorOrBrush) {
         return [2];
     }
     try {
-        const matched = colorOrBrush.match(patternReg);
+        const matched = colorOrBrush.match(urlIdPattern);
         // brush
         if (matched) {
             return [1, matched[1]];
diff --git a/lib/extract/extractClipPath.js b/lib/extract/extractClipPath.js
index d2dc2904..33d779c9 100644
--- a/lib/extract/extractClipPath.js
+++ b/lib/extract/extractClipPath.js
@@ -1,4 +1,4 @@
-import clipReg from "./patternReg";
+import { idPattern } from "../util";
 
 const clipRules = {
     evenodd: 0,
@@ -14,7 +14,7 @@ export default function(props) {
     }
 
     if (clipPath) {
-        const matched = clipPath.match(clipReg);
+        const matched = clipPath.match(idPattern);
 
         if (matched) {
             clipPathProps.clipPath = matched[1];
diff --git a/lib/extract/extractGradient.js b/lib/extract/extractGradient.js
index 80508894..297290a9 100644
--- a/lib/extract/extractGradient.js
+++ b/lib/extract/extractGradient.js
@@ -50,12 +50,10 @@ export default function(props) {
         gradient.push(stop[0]);
     }
 
-    const gt = extractTransform(gradientTransform || transform || props);
-
     return {
         gradient,
         name: id,
-        gradientTransform: gt,
         gradientUnits: units[gradientUnits] || 0,
+        gradientTransform: extractTransform(gradientTransform || transform || props),
     };
 }
diff --git a/lib/extract/extractProps.js b/lib/extract/extractProps.js
index eadfd3b4..01428deb 100644
--- a/lib/extract/extractProps.js
+++ b/lib/extract/extractProps.js
@@ -4,7 +4,7 @@ import extractTransform, { props2transform } from "./extractTransform";
 import extractClipPath from "./extractClipPath";
 import extractResponder from "./extractResponder";
 import extractOpacity from "./extractOpacity";
-import urlRegex from "./patternReg";
+import { idPattern } from "../util";
 
 export default function(prop, ref) {
     const props = { ...prop.style, ...prop };
@@ -31,7 +31,7 @@ export default function(prop, ref) {
     }
 
     if (mask) {
-        const matched = mask.match(urlRegex);
+        const matched = mask.match(idPattern);
 
         if (matched) {
             extractedProps.mask = matched[1];
diff --git a/lib/extract/patternReg.js b/lib/extract/patternReg.js
deleted file mode 100644
index b7c30dde..00000000
--- a/lib/extract/patternReg.js
+++ /dev/null
@@ -1 +0,0 @@
-export default /^url\(#(.+?)\)$/;
diff --git a/lib/util.js b/lib/util.js
index efa73465..32dd5947 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -8,3 +8,5 @@ export function pickNotNil(object) {
     }
     return result;
 }
+
+export const idPattern = /^#(.+)$/;