zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2025-12-21 06:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 5.3.0-conformance

Browse Source 
# Conflicts:
#	lib/extract/extractViewBox.js
#	package.json
This commit is contained in:
Mikael Sand
2017-07-15 14:02:40 +03:00
parent c7039588f6 5d6db26afe
commit 7547effd1f
29 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
elements/Text.js
View File

@@ -1,5 +1,6 @@
import React, {PropTypes} from 'react';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass';
import React from 'react';
import PropTypes from 'prop-types';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shims/createReactNativeComponentClass';
import extractText from '../lib/extract/extractText';
import {numberProp, pathProps, fontProps} from '../lib/props';
import {TextAttributes} from '../lib/attributes';