Skip to content

Commit 3cd699a

Browse files
Merge pull request #148 from fusioncharts/rel/5.1.0
Rel/5.1.0 - Upgraded the fusioncharts scripts from version 3.17.0 to 3.18.0
2 parents 42e89dd + eb2cf99 commit 3cd699a

36 files changed

+26807
-5315
lines changed

bin/fc-builder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ delete file.dependencies["react"];
77
delete file.dependencies["react-native"];
88

99
file.peerDependencies = {
10-
"react": "16.13.1",
11-
"react-native": "^0.63.4",
10+
"react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
11+
"react-native": "^0.64.0",
1212
"react-native-webview": "^11.0.0"
1313
};
1414

package-lock.json

Lines changed: 26685 additions & 5244 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,29 @@
1616
"build:FC": "npm run clean:FC && npm run copy:FC && npm run clean:package && npm run addDep:RN && gulp"
1717
},
1818
"dependencies": {
19-
"expo": "~40.0.0",
20-
"expo-status-bar": "~1.0.3",
21-
"react-dom": "16.13.1",
22-
"react-native-unimodules": "^0.12.0",
23-
"react-native-web": "~0.13.12",
24-
"expo-media-library": "~10.0.0",
25-
"expo-notifications": "^0.8.2",
26-
"expo-sharing": "^8.5.0",
19+
"expo": "^44.0.0",
20+
"expo-asset": "~8.4.6",
21+
"expo-file-system": "~13.1.4",
22+
"expo-media-library": "~14.0.1",
23+
"expo-notifications": "~0.14.0",
24+
"expo-permissions": "~13.1.1",
25+
"expo-sharing": "~10.1.1",
26+
"expo-status-bar": "~1.2.0",
27+
"react-native-web": "0.17.1",
2728
"react-native-webview": "^11.0.0"
2829
},
2930
"devDependencies": {
3031
"@babel/core": "~7.9.0",
3132
"css-loader": "^5.0.1",
32-
"fusioncharts": "^3.17.0",
33+
"fusioncharts": "^3.18.0",
3334
"gulp": "^4.0.2",
3435
"gulp-clean": "^0.4.0",
3536
"gulp-remove-files": "0.0.3",
3637
"gulp-rename": "^2.0.0"
3738
},
3839
"peerDependencies": {
39-
"react": "16.13.1",
40-
"react-native": "^0.63.4",
40+
"react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
41+
"react-native": "^0.64.0 || ^0.65.0 || ^0.66.0 || ^0.67.0",
4142
"react-native-webview": "^11.0.0"
4243
}
43-
}
44+
}

src/FusionCharts.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React, { Component } from "react";
22
import { View, StyleSheet, Platform } from "react-native";
33
import { WebView } from "react-native-webview";
4-
import { Asset, FileSystem } from "react-native-unimodules";
4+
import { Asset } from 'expo-asset';
5+
import * as FileSystem from 'expo-file-system';
56
import * as MediaLibrary from "expo-media-library";
67
import {
78
askAsync,
@@ -224,8 +225,8 @@ export default class ReactNativeFusionCharts extends Component {
224225
if (!utils.isUndefined(currDataFormat) && !utils.isUndefined(currData)) {
225226
this.runInWebView(`
226227
window.chartObj.setChartData(${utils.portValueSafely(
227-
currData
228-
)}, '${String(currDataFormat).toLowerCase()}');
228+
currData
229+
)}, '${String(currDataFormat).toLowerCase()}');
229230
window.chartObj.render();
230231
`);
231232
}
@@ -249,8 +250,8 @@ export default class ReactNativeFusionCharts extends Component {
249250
chartConfigs.dataSource.data = window.dataTable;
250251
} else if(${isJsonChanged}) {
251252
if(${utils.portValueSafely(
252-
this.state.dataJson
253-
)} && ${utils.portValueSafely(this.state.schemaJson)}) {
253+
this.state.dataJson
254+
)} && ${utils.portValueSafely(this.state.schemaJson)}) {
254255
var dataTable = new FusionCharts.DataStore().createDataTable(
255256
${utils.portValueSafely(this.state.dataJson)},
256257
${utils.portValueSafely(this.state.schemaJson)}

src/modules/fusioncharts/fusioncharts.accessibility.fcscript

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

src/modules/fusioncharts/fusioncharts.charts.fcscript

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

src/modules/fusioncharts/fusioncharts.excelexport.fcscript

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

src/modules/fusioncharts/fusioncharts.fcscript

Lines changed: 11 additions & 9 deletions
Large diffs are not rendered by default.

src/modules/fusioncharts/fusioncharts.gantt.fcscript

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

src/modules/fusioncharts/fusioncharts.maps.fcscript

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)