Merge branch 'master' of https://github.com/capitalone/react-native-p…

…athjs-charts

CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
-## [v0.0.30](https://github.com/capitalone/react-native-pathjs-charts/tree/v0.0.30) (2017-07-12)
-[Full Changelog](https://github.com/capitalone/react-native-pathjs-charts/compare/0.0.29...v0.0.30)
+## [0.0.31](https://github.com/capitalone/react-native-pathjs-charts/tree/HEAD)
+
+[Full Changelog](https://github.com/capitalone/react-native-pathjs-charts/compare/0.0.30...HEAD)
+
+**Closed issues:**
+
+- The sort method cannot be invoked on an Immutable data structure. [\#178](https://github.com/capitalone/react-native-pathjs-charts/issues/178)
+- Build failed in RN 0.45.1 \(iOS\) [\#169](https://github.com/capitalone/react-native-pathjs-charts/issues/169)
+
+**Merged pull requests:**
+
+- Upgrade to RN 0.47.2 [\#184](https://github.com/capitalone/react-native-pathjs-charts/pull/184) ([Minishlink](https://github.com/Minishlink))
+- Upgrade to .30 [\#171](https://github.com/capitalone/react-native-pathjs-charts/pull/171) ([marzolfb](https://github.com/marzolfb))
+
+## [0.0.30](https://github.com/capitalone/react-native-pathjs-charts/tree/0.0.30) (2017-07-12)
+[Full Changelog](https://github.com/capitalone/react-native-pathjs-charts/compare/0.0.29...0.0.30)
 
 **Closed issues:**
 

example/ios/example.xcodeproj/project.pbxproj

@@ -878,7 +878,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -892,7 +892,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 /* End PBXShellScriptBuildPhase section */
 

example/ios/project.pbxproj

@@ -531,7 +531,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 			showEnvVarsInLog = 1;
 		};
 /* End PBXShellScriptBuildPhase section */

example/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "moment": "^2.17.1",
     "react": "16.0.0-alpha.12",
-    "react-native": "~0.46.1",
+    "react-native": "0.47.2",
     "react-native-pathjs-charts": "file:../",
     "react-native-side-menu": "^0.20.1",
     "react-navigation": "^1.0.0-beta.9"

example/src/App.js

@@ -30,6 +30,7 @@ import PieChartBasic from './pie/PieChartBasic'
 import StockLineChartBasic from './stockline/StockLineChartBasic'
 import StockLineChartStaticTickLabels from './stockline/StockLineChartStaticTickLabels'
 import StockLineChartDynamicTickLabels from './stockline/StockLineChartDynamicTickLabels'
+import StockLineChartDynamicLineRendering from './stockline/StockLineChartDynamicLineRendering'
 
 import SmoothLineChartBasic from './smoothline/SmoothLineChartBasic'
 import SmoothLineChartRegions from './smoothline/SmoothLineChartRegions'
@@ -82,6 +83,10 @@ class HomeScreen extends React.Component {
           onPress={() => navigate('StockLineChartDynamicTickLabels')}
           title="StockLine - Dynamic Labels"
         />
+        <Button
+          onPress={() => navigate('StockLineChartDynamicLineRendering')}
+          title="StockLine - Dynamic Line Rendering"
+        />
         <Button
           onPress={() => navigate('SmoothLineChartBasic')}
           title="SmoothLine - Basic"
@@ -118,6 +123,7 @@ const App = StackNavigator({
   StockLineChartBasic: { screen: StockLineChartBasic },
   StockLineChartStaticTickLabels: { screen: StockLineChartStaticTickLabels },
   StockLineChartDynamicTickLabels: { screen: StockLineChartDynamicTickLabels },
+  StockLineChartDynamicLineRendering: { screen: StockLineChartDynamicLineRendering },
   SmoothLineChartBasic: { screen: SmoothLineChartBasic },
   SmoothLineChartRegions: { screen: SmoothLineChartRegions },
   SmoothLineChartRegionsExtended: { screen: SmoothLineChartRegionsExtended },

example/src/Menu.js

@@ -118,6 +118,11 @@ class Menu extends Component {
             style={styles.subitem}>
             StockLine w/Dynamic Tick Labels
           </Text>
+          <Text
+            onPress={() => this.props.onItemSelected('StockLineChartDynamicLineRendering')}
+            style={styles.subitem}>
+            StockLine w/Dynamic Line Rendering
+          </Text>
         </View>
         {/*End StockLine Charts*/}
 

example/src/stockline/StockLineChartBasic.js

@@ -16,12 +16,12 @@ SPDX-Copyright: Copyright (c) Capital One Services, LLC
 SPDX-License-Identifier: Apache-2.0
 */
 
-'use strict'
+'use strict';
 
 import React, { Component } from 'react';
-import { View, Text, StyleSheet } from 'react-native';
+import { View, StyleSheet } from 'react-native';
 
-import { StockLine } from 'react-native-pathjs-charts'
+import { StockLine } from 'react-native-pathjs-charts';
 
 const styles = StyleSheet.create({
   container: {
@@ -37,7 +37,7 @@ class StockLineChartBasic extends Component {
     title: `StockLine - Basic`,
   });
   render() {
-    let data = [
+    const data = [
       [{
         "x": 0,
         "y": 47782
@@ -212,8 +212,8 @@ class StockLineChartBasic extends Component {
         "x": 18,
         "y": 153227
       }]
-    ]
-    let options = {
+    ];
+    const options = {
       width: 250,
       height: 250,
       color: '#2980B9',
@@ -257,13 +257,13 @@ class StockLineChartBasic extends Component {
           fill: '#34495E'
         }
       }
-    }
+    };
 
     return (
       <View style={styles.container}>
         <StockLine data={data} options={options} xKey='x' yKey='y' />
       </View>
-    )
+    );
   }
 }