Skip to content
This repository was archived by the owner on Sep 17, 2021. It is now read-only.

Commit 3c428a7

Browse files
authored
Upgrade to latest rn and rnsvg dependencies and general cleanup (#210)
1 parent 3267c55 commit 3c428a7

File tree

18 files changed

+690
-326
lines changed

18 files changed

+690
-326
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tag-version-prefix=""

CHANGELOG.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
# Change Log
22

3-
## [0.0.31](https://github.com/capitalone/react-native-pathjs-charts/tree/HEAD)
3+
## [0.0.32](https://github.com/capitalone/react-native-pathjs-charts/tree/HEAD)
44

5-
[Full Changelog](https://github.com/capitalone/react-native-pathjs-charts/compare/0.0.30...HEAD)
5+
[Full Changelog](https://github.com/capitalone/react-native-pathjs-charts/compare/0.0.31...HEAD)
6+
7+
**Closed issues:**
8+
9+
- Library causes app to crash when using await AsyncStorage.getItem\(STORAGE\_KEY\); [\#202](https://github.com/capitalone/react-native-pathjs-charts/issues/202)
10+
- How do I change the color of the grid? [\#191](https://github.com/capitalone/react-native-pathjs-charts/issues/191)
11+
- Changing default gray background to transparent [\#185](https://github.com/capitalone/react-native-pathjs-charts/issues/185)
12+
- gridColor applied to wrong axis [\#179](https://github.com/capitalone/react-native-pathjs-charts/issues/179)
13+
14+
**Merged pull requests:**
15+
16+
- Fix grid axis appearing on top of the lines [\#197](https://github.com/capitalone/react-native-pathjs-charts/pull/197) ([Minishlink](https://github.com/Minishlink))
17+
- Fix default pointRadius and add parameters to renderPoint [\#196](https://github.com/capitalone/react-native-pathjs-charts/pull/196) ([Minishlink](https://github.com/Minishlink))
18+
- Feature/improve smoothline chart [\#183](https://github.com/capitalone/react-native-pathjs-charts/pull/183) ([AmauryLiet](https://github.com/AmauryLiet))
19+
20+
## [0.0.31](https://github.com/capitalone/react-native-pathjs-charts/tree/0.0.31) (2017-09-02)
21+
[Full Changelog](https://github.com/capitalone/react-native-pathjs-charts/compare/0.0.30...0.0.31)
622

723
**Closed issues:**
824

@@ -11,6 +27,7 @@
1127

1228
**Merged pull requests:**
1329

30+
- New release for .31 [\#187](https://github.com/capitalone/react-native-pathjs-charts/pull/187) ([marzolfb](https://github.com/marzolfb))
1431
- Upgrade to RN 0.47.2 [\#184](https://github.com/capitalone/react-native-pathjs-charts/pull/184) ([Minishlink](https://github.com/Minishlink))
1532
- Upgrade to .30 [\#171](https://github.com/capitalone/react-native-pathjs-charts/pull/171) ([marzolfb](https://github.com/marzolfb))
1633

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ react-native-pathjs-charts
22
=======================
33

44
[![npm version](https://badge.fury.io/js/react-native-pathjs-charts.svg)](https://badge.fury.io/js/react-native-pathjs-charts)
5-
[![](https://img.shields.io/badge/react--native--svg-4.5.0-blue.svg)](https://www.npmjs.com/package/react-native-svg)
6-
[![](https://img.shields.io/badge/react--native-0.41-orange.svg)](https://facebook.github.io/react-native/)
7-
[![](https://img.shields.io/badge/android--ff69b4.svg)](http://developer.android.com/sdk/index.html)
8-
[![](https://img.shields.io/badge/ios--red.svg)](https://developer.apple.com/xcode/)
9-
[![](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
105

116
This library is a cross-platform (iOS/Android) library of charts/graphs using [react-native-svg](https://github.com/magicismight/react-native-svg) and [paths-js](https://github.com/andreaferretti/paths-js) based on the excellent work done by Roman Samec in the [react-pathjs-chart](https://github.com/rsamec/react-pathjs-chart) library. The project is an early attempt at providing a ubiquitous solution for charts & graphs for React Native that offer a unified view across devices.
127

example/.flowconfig

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
; For RN Apps installed via npm, "Libraries" folder is inside
1313
; "node_modules/react-native" but in the source repo it is in the root
1414
.*/Libraries/react-native/React.js
15-
.*/Libraries/react-native/ReactNative.js
15+
16+
; Ignore polyfills
17+
.*/Libraries/polyfills/.*
1618

1719
[include]
1820

1921
[libs]
2022
node_modules/react-native/Libraries/react-native/react-native-interface.js
21-
node_modules/react-native/flow
22-
flow/
23+
node_modules/react-native/flow/
2324

2425
[options]
2526
emoji=true
@@ -34,14 +35,16 @@ module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|we
3435

3536
suppress_type=$FlowIssue
3637
suppress_type=$FlowFixMe
38+
suppress_type=$FlowFixMeProps
39+
suppress_type=$FlowFixMeState
3740
suppress_type=$FixMe
3841

39-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
42+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
43+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4144
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4245
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4346

4447
unsafe.enable_getters_and_setters=true
4548

4649
[version]
47-
^0.45.0
50+
^0.56.0

example/.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ buck-out/
4646
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
4747
# screenshots whenever they are needed.
4848
# For more information about the recommended setup visit:
49-
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
49+
# https://docs.fastlane.tools/best-practices/source-control/
5050

51-
fastlane/report.xml
52-
fastlane/Preview.html
53-
fastlane/screenshots
51+
*/fastlane/report.xml
52+
*/fastlane/Preview.html
53+
*/fastlane/screenshots

example/android/app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ import com.android.build.OutputFile
7272
* ]
7373
*/
7474

75+
project.ext.react = [
76+
entryFile: "index.android.js"
77+
]
78+
7579
apply from: "../../node_modules/react-native/react.gradle"
7680

7781
/**

example/ios/example.xcodeproj/project.pbxproj

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3737
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
3838
8E5C74E99D0643C1B320610D /* libRNSVG.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D4B88FC1FF3840CA85698A5D /* libRNSVG.a */; };
39+
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
3940
/* End PBXBuildFile section */
4041

4142
/* Begin PBXContainerItemProxy section */
@@ -228,6 +229,13 @@
228229
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
229230
remoteInfo = RCTText;
230231
};
232+
ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
233+
isa = PBXContainerItemProxy;
234+
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
235+
proxyType = 2;
236+
remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
237+
remoteInfo = RCTBlob;
238+
};
231239
/* End PBXContainerItemProxy section */
232240

233241
/* Begin PBXFileReference section */
@@ -257,6 +265,7 @@
257265
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
258266
0DEA9A665E834B50980D1256 /* RNSVG.xcodeproj */ = {isa = PBXFileReference; name = "RNSVG.xcodeproj"; path = "../node_modules/react-native-svg/ios/RNSVG.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
259267
D4B88FC1FF3840CA85698A5D /* libRNSVG.a */ = {isa = PBXFileReference; name = "libRNSVG.a"; path = "libRNSVG.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
268+
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
260269
/* End PBXFileReference section */
261270

262271
/* Begin PBXFrameworksBuildPhase section */
@@ -272,6 +281,8 @@
272281
isa = PBXFrameworksBuildPhase;
273282
buildActionMask = 2147483647;
274283
files = (
284+
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
285+
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
275286
146834051AC3E58100842450 /* libReact.a in Frameworks */,
276287
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
277288
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
@@ -414,6 +425,7 @@
414425
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
415426
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
416427
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
428+
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
417429
);
418430
name = Products;
419431
sourceTree = "<group>";
@@ -442,6 +454,7 @@
442454
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
443455
146833FF1AC3E56700842450 /* React.xcodeproj */,
444456
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
457+
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */,
445458
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
446459
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
447460
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
@@ -475,6 +488,7 @@
475488
indentWidth = 2;
476489
sourceTree = "<group>";
477490
tabWidth = 2;
491+
usesTabs = 0;
478492
};
479493
83CBBA001A601CBA00E9B192 /* Products */ = {
480494
isa = PBXGroup;
@@ -487,6 +501,14 @@
487501
name = Products;
488502
sourceTree = "<group>";
489503
};
504+
ADBDB9201DFEBF0600ED6528 /* Products */ = {
505+
isa = PBXGroup;
506+
children = (
507+
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */,
508+
);
509+
name = Products;
510+
sourceTree = "<group>";
511+
};
490512
/* End PBXGroup section */
491513

492514
/* Begin PBXNativeTarget section */
@@ -606,6 +628,10 @@
606628
ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
607629
ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
608630
},
631+
{
632+
ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */;
633+
ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
634+
},
609635
{
610636
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
611637
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -752,10 +778,10 @@
752778
remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
753779
sourceTree = BUILT_PRODUCTS_DIR;
754780
};
755-
3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
781+
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
756782
isa = PBXReferenceProxy;
757783
fileType = archive.ar;
758-
path = libReact.a;
784+
path = "libReact-tvOS.a";
759785
remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
760786
sourceTree = BUILT_PRODUCTS_DIR;
761787
};
@@ -829,6 +855,13 @@
829855
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
830856
sourceTree = BUILT_PRODUCTS_DIR;
831857
};
858+
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
859+
isa = PBXReferenceProxy;
860+
fileType = archive.ar;
861+
path = libRCTBlob.a;
862+
remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
863+
sourceTree = BUILT_PRODUCTS_DIR;
864+
};
832865
/* End PBXReferenceProxy section */
833866

834867
/* Begin PBXResourcesBuildPhase section */
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

example/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
},
99
"dependencies": {
1010
"moment": "^2.17.1",
11-
"react": "16.0.0-alpha.12",
12-
"react-native": "0.47.2",
11+
"react": "16.0.0",
12+
"react-native": "0.50.3",
1313
"react-native-pathjs-charts": "file:../",
14-
"react-native-side-menu": "^0.20.1",
14+
"react-native-side-menu": "^1.0.0",
1515
"react-navigation": "^1.0.0-beta.9"
1616
},
1717
"devDependencies": {

package.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-pathjs-charts",
3-
"version": "0.0.31",
3+
"version": "0.0.32",
44
"description": "Cross platform React Native charting library based on path-js and react-native-svg",
55
"repository": {
66
"type": "git",
@@ -40,20 +40,23 @@
4040
"babel-polyfill": "^6.23.0",
4141
"lodash": "^4.12.0",
4242
"paths-js": "^0.4.5",
43-
"react-native-svg": "~5.4.0"
43+
"react-native-svg": "~5.5.1"
4444
},
4545
"devDependencies": {
4646
"babel-jest": "*",
4747
"babel-preset-react-native": "^1.9.0",
4848
"diff": "^3.1.0",
49-
"jest": "^18.0.0",
49+
"jest": "*",
5050
"jest-react-native": "*",
51-
"react": "16.0.0-alpha.12",
52-
"react-dom": "16.0.0-alpha.12",
53-
"react-native": "0.47.2",
54-
"react-test-renderer": "16.0.0-alpha.12"
51+
"react": "16.0.0",
52+
"react-dom": "16.0.0",
53+
"react-native": "0.50.3",
54+
"react-test-renderer": "16.0.0"
5555
},
5656
"jest": {
57-
"preset": "react-native"
57+
"preset": "react-native",
58+
"modulePathIgnorePatterns": [
59+
"<rootDir>/example"
60+
]
5861
}
5962
}

0 commit comments

Comments
 (0)