diff --git a/.gitignore b/.gitignore
index bda3a4e..2af2cd6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ coverage.html
# Dependency directory
node_modules
+example/node_modules/
# Example build directory
example/dist
diff --git a/example/.flowconfig b/example/.flowconfig
index a76425e..834765f 100644
--- a/example/.flowconfig
+++ b/example/.flowconfig
@@ -44,4 +44,5 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
unsafe.enable_getters_and_setters=true
[version]
-^0.42.0
+
+^0.42.0
\ No newline at end of file
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index d36e481..5313155 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -115,7 +115,7 @@ android {
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
- def versionCodes = ["armeabi-v7a":1, "x86":2]
+ def versionCodes = ["armeabi-v7a": 1, "x86": 2]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
@@ -128,8 +128,10 @@ android {
dependencies {
compile project(':react-native-svg')
compile fileTree(dir: "libs", include: ["*.jar"])
- compile "com.android.support:appcompat-v7:23.0.1"
- compile "com.facebook.react:react-native:+" // From node_modules
+ // From node_modules
+ compile 'com.android.support:appcompat-v7:23.4.0'
+ compile 'com.facebook.react:react-native:+'
+ compile 'com.android.support:design:23.4.0'
}
// Run this once to be able to run the application with BUCK
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 8275835..a9d2590 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,23 +1,24 @@
+
-
-
-
+
+
+
+
+
+
+
-
@@ -29,4 +30,4 @@
-
+
\ No newline at end of file
diff --git a/example/android/app/src/main/java/com/example/ExampleReactPackage.java b/example/android/app/src/main/java/com/example/ExampleReactPackage.java
new file mode 100644
index 0000000..a3d0931
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/ExampleReactPackage.java
@@ -0,0 +1,39 @@
+package com.example;
+
+/**
+ * Created by young on 2017/5/10.
+ */
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ExampleReactPackage implements ReactPackage {
+
+ @Override
+ public List> createJSModules() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List createViewManagers(ReactApplicationContext reactContext) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List createNativeModules(
+ ReactApplicationContext reactContext) {
+ List modules = new ArrayList<>();
+
+ modules.add(new RNBridge(reactContext));
+
+ return modules;
+ }
+
+}
diff --git a/example/android/app/src/main/java/com/example/HomeActivity.java b/example/android/app/src/main/java/com/example/HomeActivity.java
new file mode 100644
index 0000000..43d566d
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/HomeActivity.java
@@ -0,0 +1,52 @@
+package com.example;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import java.io.IOError;
+
+public class HomeActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_home);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+ .setAction("Action", null).show();
+ }
+ });
+
+ Button bt = (Button) findViewById(R.id.button);
+ bt.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Log.i("匿名内部类", "点击事件");
+
+
+ try {
+ Intent intent = new Intent();
+ intent.setClass(HomeActivity.this, MainActivity.class);
+ startActivity(intent);
+ } catch (IOError error) {
+ error.printStackTrace();
+ }
+
+ }
+ });
+ }
+
+}
diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
index 748986d..0961a20 100644
--- a/example/android/app/src/main/java/com/example/MainApplication.java
+++ b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -14,11 +14,23 @@
public class MainApplication extends Application implements ReactApplication {
- private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
- @Override
- public boolean getUseDeveloperSupport() {
- return BuildConfig.DEBUG;
- }
+// private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+// @Override
+// public boolean getUseDeveloperSupport() {
+// return BuildConfig.DEBUG;
+// }
+//
+// @Override
+// protected List getPackages() {
+// return Arrays.asList(
+// new MainReactPackage(),
+// new RNSvgPackage(),
+// new ExampleReactPackage()
+// );
+// }
+// };
+
+ private final ReactNativeHost mReactNativeHost = new RNHost(this);
@Override
protected List getPackages() {
@@ -29,7 +41,7 @@ protected List getPackages() {
}
};
- @Override
+ @Override
public ReactNativeHost getReactNativeHost() {
return mReactNativeHost;
}
diff --git a/example/android/app/src/main/java/com/example/RNActivity.java b/example/android/app/src/main/java/com/example/RNActivity.java
new file mode 100644
index 0000000..89d88d2
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/RNActivity.java
@@ -0,0 +1,113 @@
+package com.example;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.KeyEvent;
+
+import com.facebook.react.*;
+import com.facebook.react.BuildConfig;
+import com.facebook.react.common.LifecycleState;
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+import com.facebook.react.shell.MainReactPackage;
+
+/**
+ * Created by young on 2017/5/10.
+ */
+
+public class RNActivity extends Activity implements DefaultHardwareBackBtnHandler {
+
+ private ReactRootView rnRootView;
+ private ReactInstanceManager rnInstanceManager;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+// if (!Settings.canDrawOverlays(this)) {
+// Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+// Uri.parse("package:" + getPackageName()));
+// startActivityForResult(intent, OVERLAY_PERMISSION_REQ_CODE);
+// }
+// }
+
+ rnRootView = new ReactRootView(this);
+ Log.i("加载RN模块", "测试");
+ ReactInstanceManagerBuilder builder = ReactInstanceManager.builder().setApplication(getApplication())
+ .setBundleAssetName("index.android.bundle")
+ .setJSMainModuleName("index.android")
+ .addPackage(new MainReactPackage())
+ .setUseDeveloperSupport(true)
+ .setInitialLifecycleState(LifecycleState.RESUMED);
+
+ RNHost host = (RNHost) ((ReactApplication) getApplication()).getReactNativeHost();
+
+ for (ReactPackage reactPackage : host.packages()) {
+ builder.addPackage(reactPackage);
+ }
+
+ rnInstanceManager = builder.build();
+ rnRootView.startReactApplication(rnInstanceManager, "example", null);
+
+ setContentView(rnRootView);
+ }
+
+ @Override
+ public void invokeDefaultOnBackPressed() {
+ super.onBackPressed();
+ }
+
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+
+ if (rnInstanceManager != null) {
+ rnInstanceManager.onHostPause(this);
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ if (rnInstanceManager != null) {
+ rnInstanceManager.onHostResume(this, this);
+ }
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ if (rnInstanceManager != null) {
+ rnInstanceManager.onHostDestroy(this);
+ }
+ }
+
+ @Override
+ public void onBackPressed() {
+
+ if (rnInstanceManager != null) {
+ rnInstanceManager.onBackPressed();
+ } else {
+ super.onBackPressed();
+ }
+ }
+
+
+ @Override
+ public boolean onKeyUp(int keyCode, KeyEvent event) {
+
+ if (keyCode == KeyEvent.KEYCODE_MENU && rnInstanceManager != null) {
+ rnInstanceManager.showDevOptionsDialog();
+ return true;
+ }
+ return super.onKeyUp(keyCode, event);
+ }
+}
diff --git a/example/android/app/src/main/java/com/example/RNBridge.java b/example/android/app/src/main/java/com/example/RNBridge.java
new file mode 100644
index 0000000..16c47a9
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/RNBridge.java
@@ -0,0 +1,40 @@
+package com.example;
+
+/**
+ * Created by young on 2017/5/10.
+ */
+
+
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class RNBridge extends ReactContextBaseJavaModule {
+
+ public RNBridge(ReactApplicationContext reactContext) {
+ super(reactContext);
+ }
+
+ @Override
+ public String getName() {
+ return "RNBridge";
+ }
+
+ @Nullable
+ @Override
+ public Map getConstants() {
+
+ final Map constants = new HashMap<>();
+ constants.put("abc", "ABC");
+ constants.put("bcd", "BCD");
+
+ return constants;
+ }
+}
diff --git a/example/android/app/src/main/java/com/example/RNHost.java b/example/android/app/src/main/java/com/example/RNHost.java
new file mode 100644
index 0000000..80160b9
--- /dev/null
+++ b/example/android/app/src/main/java/com/example/RNHost.java
@@ -0,0 +1,40 @@
+package com.example;
+
+import android.app.Application;
+
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+import com.horcrux.svg.RNSvgPackage;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by young on 2017/5/10.
+ */
+
+public class RNHost extends ReactNativeHost {
+
+ public RNHost(Application application) {
+ super(application);
+ }
+
+ @Override
+ public boolean getUseDeveloperSupport() {
+ return BuildConfig.DEBUG;
+ }
+
+ @Override
+ protected List getPackages() {
+ return Arrays.asList(
+ new MainReactPackage(),
+ new RNSvgPackage(),
+ new ExampleReactPackage()
+ );
+ }
+
+ public List packages() {
+ return this.getPackages();
+ }
+}
diff --git a/example/android/app/src/main/res/layout/activity_home.xml b/example/android/app/src/main/res/layout/activity_home.xml
new file mode 100644
index 0000000..365fef0
--- /dev/null
+++ b/example/android/app/src/main/res/layout/activity_home.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/example/android/app/src/main/res/layout/content_home.xml b/example/android/app/src/main/res/layout/content_home.xml
new file mode 100644
index 0000000..652744f
--- /dev/null
+++ b/example/android/app/src/main/res/layout/content_home.xml
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/example/android/app/src/main/res/values-v21/styles.xml b/example/android/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..7abc06d
--- /dev/null
+++ b/example/android/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1 @@
+
diff --git a/example/android/app/src/main/res/values-w820dp/dimens.xml b/example/android/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..63fc816
--- /dev/null
+++ b/example/android/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 64dp
+
diff --git a/example/android/app/src/main/res/values/dimens.xml b/example/android/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..812cb7b
--- /dev/null
+++ b/example/android/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+
+
+ 16dp
+ 16dp
+ 16dp
+
diff --git a/example/android/app/src/main/res/values/strings.xml b/example/android/app/src/main/res/values/strings.xml
index d75426c..52a18e1 100644
--- a/example/android/app/src/main/res/values/strings.xml
+++ b/example/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
example
+ HomeActivity
diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml
index 319eb0c..ecd885a 100644
--- a/example/android/app/src/main/res/values/styles.xml
+++ b/example/android/app/src/main/res/values/styles.xml
@@ -5,4 +5,8 @@
+
+
+
+
diff --git a/example/index.android.js b/example/index.android.js
index a9fc135..c0657f9 100644
--- a/example/index.android.js
+++ b/example/index.android.js
@@ -18,4 +18,4 @@ See the License for the specific language governing permissions and limitations
import React, { AppRegistry } from 'react-native';
import App from './src/App';
-AppRegistry.registerComponent('example', () => App);
+AppRegistry.registerComponent('example', () => App);
\ No newline at end of file
diff --git a/example/ios/example/Info.plist b/example/ios/example/Info.plist
index 44e178a..2fb6a11 100644
--- a/example/ios/example/Info.plist
+++ b/example/ios/example/Info.plist
@@ -4,8 +4,6 @@
CFBundleDevelopmentRegion
en
- CFBundleDisplayName
- example
CFBundleExecutable
$(EXECUTABLE_NAME)
CFBundleIdentifier
diff --git a/example/package.json b/example/package.json
index 64dcb61..0858060 100644
--- a/example/package.json
+++ b/example/package.json
@@ -8,9 +8,10 @@
},
"dependencies": {
"moment": "^2.17.1",
- "react": "16.0.0-alpha.6",
- "react-native": "0.44.0",
- "react-native-pathjs-charts": "file:../",
+ "react": "^15.4.1",
+ "react-native": "^0.42.0",
+ "react-native-pathjs-charts": "file:///Users/luculent/Documents/Git/react-native-pathjs-charts",
+ "react-native-root-modal": "^1.1.1",
"react-native-side-menu": "^0.20.1",
"react-navigation": "^1.0.0-beta.9"
},
diff --git a/example/src/App.js b/example/src/App.js
index f2bb969..3c982d6 100644
--- a/example/src/App.js
+++ b/example/src/App.js
@@ -21,6 +21,7 @@ SPDX-License-Identifier: Apache-2.0
import React, { Component } from 'react';
import { AppRegistry, Text, StyleSheet, View, Button } from 'react-native'
import { StackNavigator} from 'react-navigation';
+
import SideMenu from 'react-native-side-menu'
import BarChartColumnBasic from './bar/BarChartColumnBasic'
diff --git a/example/src/bar/BarChartColumnBasic.js b/example/src/bar/BarChartColumnBasic.js
index dedc161..b0fab10 100644
--- a/example/src/bar/BarChartColumnBasic.js
+++ b/example/src/bar/BarChartColumnBasic.js
@@ -37,7 +37,7 @@ class BarChartColumnBasic extends Component {
title: `Bar (Column) - Basic`,
});
render() {
- let data = [
+ var data = [
[{
"v": 49,
"name": "apple"
@@ -71,6 +71,7 @@ class BarChartColumnBasic extends Component {
right: 20
},
color: '#2980B9',
+ highlightColor:'#999999',
gutter: 20,
animate: {
type: 'oneByOne',
@@ -99,6 +100,7 @@ class BarChartColumnBasic extends Component {
showTicks: true,
zeroAxis: false,
orient: 'left',
+ // max:80,
label: {
fontFamily: 'Arial',
fontSize: 8,
diff --git a/example/src/pie/PieChartBasic.js b/example/src/pie/PieChartBasic.js
index 28296ba..8074dc4 100644
--- a/example/src/pie/PieChartBasic.js
+++ b/example/src/pie/PieChartBasic.js
@@ -37,7 +37,8 @@ class PieChartBasic extends Component {
title: `Pie - Basic`,
});
render() {
- let data = [{
+ let data = [
+ {
"name": "Washington",
"population": 7694980
}, {
@@ -61,7 +62,7 @@ class PieChartBasic extends Component {
},
width: 350,
height: 350,
- color: '#2980B9',
+ color: '#ff0000',
r: 50,
R: 150,
legendPosition: 'topLeft',
diff --git a/example/src/stockline/StockLineChartBasic.js b/example/src/stockline/StockLineChartBasic.js
index 94a2073..e3e2174 100644
--- a/example/src/stockline/StockLineChartBasic.js
+++ b/example/src/stockline/StockLineChartBasic.js
@@ -217,6 +217,7 @@ class StockLineChartBasic extends Component {
width: 250,
height: 250,
color: '#2980B9',
+ showAreas:0,
margin: {
top: 10,
left: 35,
diff --git a/src/Bar.js b/src/Bar.js
index 0bab4a1..7de2a47 100644
--- a/src/Bar.js
+++ b/src/Bar.js
@@ -34,6 +34,7 @@ export default class BarChart extends Component {
height: 600,
margin: {top: 20, left: 20, bottom: 50, right: 20},
color: '#2980B9',
+ highlightColor:'#666666',
gutter: 20,
animate: {
type: 'oneByOne',
@@ -74,6 +75,14 @@ export default class BarChart extends Component {
}
}
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ hover:-1,
+ };
+ }
+
color(i) {
let color = this.props.options.color
if (!_.isString(this.props.options.color)) color = color.color
@@ -124,20 +133,25 @@ export default class BarChart extends Component {
let textStyle = fontAdapt(options.axisX.label)
let labelOffset = this.props.options.axisX.label.offset || 20
+ let highlightColor = this.props.options.highlightColor == null ? '#999999':this.props.options.highlightColor
let lines = chart.curves.map(function (c, i) {
let numDataGroups = this.props.data.length || 0
let colorVariationVal = numDataGroups > 1 ? numDataGroups : 3
let color = this.color(i % colorVariationVal)
let stroke = Colors.darkenColor(color)
+
return (
-
+
{options.axisX.showLabels ?
+ fill={textStyle.fill} x={c.line.centroid[0]} y={labelOffset + chartArea.y.min} rotate={45} textAnchor="middle">
{c.item.name}
: null}
@@ -152,4 +166,21 @@ export default class BarChart extends Component {
)
}
+
+ _onPressItemOut() {
+ this.setState({
+ hover:-1,
+ });
+ }
+
+ _onPressItem(index, group, rowIndex) {
+ this.setState({
+ hover:index,
+ }, () => {
+ if (this.props.chartCallback != null) {
+ this.props.chartCallback(group, rowIndex);
+ }
+ });
+ }
+
}
diff --git a/src/Line.js b/src/Line.js
index 3046ac1..0b761e1 100755
--- a/src/Line.js
+++ b/src/Line.js
@@ -28,6 +28,9 @@ export default class LineChart extends Component {
constructor(props, chartType) {
super(props)
this.chartType = chartType
+ this.state = {
+ hover:-1,
+ }
}
getMaxAndMin(chart, key, scale, chartMin, chartMax) {
@@ -93,14 +96,30 @@ export default class LineChart extends Component {
let showAreas = typeof(this.props.options.showAreas) !== 'undefined' ? this.props.options.showAreas : true;
let strokeWidth = typeof(this.props.options.strokeWidth) !== 'undefined' ? this.props.options.strokeWidth : '1';
+
+ let highlightColor = this.props.options.highlightColor == null ? '#999999':this.props.options.highlightColor
let lines = _.map(chart.curves, function (c, i) {
- return
+ return
}.bind(this))
let areas = null
if(showAreas){
areas = _.map(chart.curves, function (c, i) {
- return
+ return
}.bind(this))
}
@@ -171,4 +190,20 @@ export default class LineChart extends Component {
return returnValue
}
+
+ _onPressItemOut() {
+ this.setState({
+ hover:-1,
+ })
+ }
+
+ _onPressItem(index) {
+ this.setState({
+ hover:index,
+ }, () => {
+ if (this.props.chartCallback != null) {
+ this.props.chartCallback(index);
+ }
+ })
+ }
}
diff --git a/src/Pie.js b/src/Pie.js
index 2b8df07..03357b0 100755
--- a/src/Pie.js
+++ b/src/Pie.js
@@ -46,6 +46,14 @@ export default class PieChart extends Component {
},
}
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ hover:-1,
+ };
+ }
+
color(i) {
let color = this.props.color || (this.props.options && this.props.options.color)
if (Array.isArray(color)) {
@@ -89,6 +97,7 @@ export default class PieChart extends Component {
let textStyle = fontAdapt(options.label)
let slices
+ let highlightColor = this.props.options.highlightColor == null ? '#999999':this.props.options.highlightColor
if (this.props.data.length === 1) {
let item = this.props.data[0]
@@ -97,7 +106,14 @@ export default class PieChart extends Component {
let stroke = typeof fill === 'string' ? outerFill : Colors.darkenColor(outerFill)
slices = (
-
+
-
+
{
+ if (this.props.chartCallback != null) {
+ this.props.chartCallback(index);
+ }
+ });
+ }
+
}