From a2d420c7e836339e80cdc50de38f520735f1f9a4 Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Sat, 2 Feb 2019 15:57:11 +0200 Subject: [PATCH] Fix handling of react-native style transform arrays on root Svg element Simplify urlIdPattern --- lib/extract/extractBrush.js | 2 +- lib/extract/extractTransform.js | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/extract/extractBrush.js b/lib/extract/extractBrush.js index 2b913650..dc45d733 100644 --- a/lib/extract/extractBrush.js +++ b/lib/extract/extractBrush.js @@ -1,6 +1,6 @@ import extractColor from './extractColor'; -const urlIdPattern = /^url\(#(.+?)\)$/; +const urlIdPattern = /^url\(#(.+)\)$/; const currentColorBrush = [2]; diff --git a/lib/extract/extractTransform.js b/lib/extract/extractTransform.js index 770cb41f..2f073fee 100644 --- a/lib/extract/extractTransform.js +++ b/lib/extract/extractTransform.js @@ -23,14 +23,17 @@ export function transformToMatrix(props, transform) { if (transform) { if (Array.isArray(transform)) { - pooledMatrix.append( - transform[0], - transform[1], - transform[2], - transform[3], - transform[4], - transform[5], - ); + if (typeof transform[0] === 'number') { + pooledMatrix.append( + transform[0], + transform[1], + transform[2], + transform[3], + transform[4], + transform[5], + ); + } + // noop for react-native transform arrays, let animated handle them } else if (typeof transform === 'string') { try { const t = transformParser.parse(transform);