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 branch 'master' into 6.0.0

Browse Source 
# Conflicts:
#	elements/TextPath.js
#	package.json
This commit is contained in:
Horcrux
2017-11-08 12:27:41 +08:00
parent 7474c90957 e1a576fd29
commit e1380828f0
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -35,7 +35,7 @@
- react-native-svg >= 5.2.0 only supports react-native >= 0.45.0 and react == 16.0.0-alpha.12 - react-native-svg >= 5.2.0 only supports react-native >= 0.45.0 and react == 16.0.0-alpha.12
- react-native-svg >= 5.3.0 only supports react-native >= 0.46.0 and react == 16.0.0-alpha.12 - react-native-svg >= 5.3.0 only supports react-native >= 0.46.0 and react == 16.0.0-alpha.12
- react-native-svg >= 5.4.1 only supports react-native >= 0.47.0 and react == 16.0.0-alpha.12 - react-native-svg >= 5.4.1 only supports react-native >= 0.47.0 and react == 16.0.0-alpha.12
- react-native-svg >= 5.5.0 only supports react-native >= 0.50.0 and react == 16.0.0 - react-native-svg >= 5.5.1 only supports react-native >= 0.50.0 and react == 16.0.0
2. Link native code 2. Link native code

3
elements/TextPath.js
View File

@@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shims/createReactNativeComponentClass';
import createReactNativeComponentClass from '../lib/createReactNativeComponentClass';
import {TextPathAttributes} from '../lib/attributes'; import {TextPathAttributes} from '../lib/attributes';
import extractText from '../lib/extract/extractText'; import extractText from '../lib/extract/extractText';
import Shape from './Shape'; import Shape from './Shape';

2
lib/createReactNativeComponentClass.js
View File

@@ -3,4 +3,4 @@ import createReactNativeComponentClass from 'react-native/Libraries/Renderer/shi
export default (uiViewClassName, getViewConfig) => export default (uiViewClassName, getViewConfig) =>
createReactNativeComponentClass.length >= 2 createReactNativeComponentClass.length >= 2
? createReactNativeComponentClass(uiViewClassName, getViewConfig) ? createReactNativeComponentClass(uiViewClassName, getViewConfig)
: createReactNativeComponentClass(getViewConfig) : createReactNativeComponentClass(getViewConfig())

2
package.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "6.0.0-rc12", "version": "6.0.0-rc13",
"name": "react-native-svg", "name": "react-native-svg",
"description": "SVG library for react-native", "description": "SVG library for react-native",
"repository": { "repository": {