Skip to content

Commit 7af687a

Browse files
committed
Merge branch 'release/3.0.1'
2 parents 2b75c1b + 1207dcc commit 7af687a

File tree

11 files changed

+564
-214
lines changed

11 files changed

+564
-214
lines changed

README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,36 @@ For general instructions, refer to this [developer docs page](https://www.fusion
6262

6363
### Usage
6464

65+
#### If you have created your app using `create-react-app`
66+
6567
Import React, `react-fusioncharts` and FusionCharts in your app:
6668

6769
```
6870
import React from 'react';
6971
import ReactDOM from 'react-dom';
7072
import FusionCharts from 'fusioncharts';
73+
import Charts from 'fusioncharts/fusioncharts.charts';
74+
import ReactFC from 'react-fusioncharts';
75+
76+
ReactFC.fcRoot(FusionCharts, Charts);
77+
```
78+
79+
#### If you have created your app using tools like `webpack` or `parcel`
80+
81+
Import React, `react-fusioncharts` and FusionCharts in your app:
82+
83+
```
84+
import React from 'react';
85+
import ReactDOM from 'react-dom';
86+
import FusionCharts from 'fusioncharts/core';
87+
import Column2d from 'fusioncharts/viz/column2d';
7188
import ReactFC from 'react-fusioncharts';
7289
73-
ReactFC.fcRoot(FusionCharts);
90+
ReactFC.fcRoot(FusionCharts, Column2d);
7491
```
7592

93+
Note: This way of import will not work in IE11 and below.
94+
7695
## Quick Start
7796

7897
Here is a basic sample that shows how to create a chart using `react-fusioncharts`:
@@ -276,7 +295,7 @@ Learn more about FusionTime [here](https://www.fusioncharts.com/fusiontime).
276295
import React from 'react';
277296
import FusionCharts from 'fusioncharts';
278297
import TimeSeries from 'fusioncharts/fusioncharts.timeseries';
279-
import ReactFC from '../lib/ReactFC';
298+
import ReactFC from 'react-fusioncharts';
280299

281300
ReactFC.fcRoot(FusionCharts, TimeSeries);
282301

components/DrillDown.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
6-
exports.default = void 0;
6+
exports["default"] = void 0;
77

88
var _react = _interopRequireDefault(require("react"));
99

1010
var _propTypes = _interopRequireDefault(require("prop-types"));
1111

1212
var _ReactFC = _interopRequireDefault(require("../lib/ReactFC"));
1313

14-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
1515

1616
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
1717

@@ -33,6 +33,8 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
3333

3434
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
3535

36+
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
37+
3638
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
3739

3840
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -41,8 +43,6 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
4143

4244
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
4345

44-
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
45-
4646
var DrillDown =
4747
/*#__PURE__*/
4848
function (_React$Component) {
@@ -56,7 +56,7 @@ function (_React$Component) {
5656
modules[_key - 1] = arguments[_key];
5757
}
5858

59-
_ReactFC.default.fcRoot.apply(_ReactFC.default, [core].concat(modules));
59+
_ReactFC["default"].fcRoot.apply(_ReactFC["default"], [core].concat(modules));
6060
}
6161
}]);
6262

@@ -85,10 +85,10 @@ function (_React$Component) {
8585
};
8686
/* Function Bindings */
8787

88-
_this.plotClicked = _this.plotClicked.bind(_assertThisInitialized(_assertThisInitialized(_this)));
89-
_this.onChildRendered = _this.onChildRendered.bind(_assertThisInitialized(_assertThisInitialized(_this)));
90-
_this.toggleParentBtnVisibility = _this.toggleParentBtnVisibility.bind(_assertThisInitialized(_assertThisInitialized(_this)));
91-
_this.onBtnClick = _this.onBtnClick.bind(_assertThisInitialized(_assertThisInitialized(_this)));
88+
_this.plotClicked = _this.plotClicked.bind(_assertThisInitialized(_this));
89+
_this.onChildRendered = _this.onChildRendered.bind(_assertThisInitialized(_this));
90+
_this.toggleParentBtnVisibility = _this.toggleParentBtnVisibility.bind(_assertThisInitialized(_this));
91+
_this.onBtnClick = _this.onBtnClick.bind(_assertThisInitialized(_this));
9292
/* Default styles */
9393

9494
_this.wrapperStyle = {
@@ -174,7 +174,7 @@ function (_React$Component) {
174174
}, {
175175
key: "cloneReactFCChild",
176176
value: function cloneReactFCChild(reactFCElem, customProps) {
177-
return _react.default.cloneElement(reactFCElem, customProps);
177+
return _react["default"].cloneElement(reactFCElem, customProps);
178178
}
179179
}, {
180180
key: "onChildRendered",
@@ -220,14 +220,14 @@ function (_React$Component) {
220220
};
221221

222222
if (!this.state.isDrilledDown) {
223-
component = _react.default.createElement(_ReactFC.default, _extends({}, this.props, {
223+
component = _react["default"].createElement(_ReactFC["default"], _extends({}, this.props, {
224224
"fcEvent-dataplotClick": this.plotClicked
225225
}));
226226
} else {
227227
var propChildren = Array.isArray(children) ? children : [children];
228-
component = _react.default.createElement("div", {
228+
component = _react["default"].createElement("div", {
229229
style: this.wrapperStyle
230-
}, this.cloneReactFCChild(propChildren[selectedChild], clonedElemConfig), isBtnVisible ? _react.default.createElement("button", {
230+
}, this.cloneReactFCChild(propChildren[selectedChild], clonedElemConfig), isBtnVisible ? _react["default"].createElement("button", {
231231
style: this.finBtnStyle,
232232
onClick: this.onBtnClick
233233
}, this.finalBtnConfig.text) : null);
@@ -238,7 +238,7 @@ function (_React$Component) {
238238
}]);
239239

240240
return DrillDown;
241-
}(_react.default.Component);
241+
}(_react["default"].Component);
242242

243243
DrillDown.defaultProps = {
244244
plotChildMap: [],
@@ -262,28 +262,28 @@ DrillDown.defaultProps = {
262262
width: ''
263263
};
264264
DrillDown.propTypes = {
265-
plotChildMap: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.shape({
266-
plotPosition: _propTypes.default.number,
267-
childPosition: _propTypes.default.number
268-
})), _propTypes.default.arrayOf(_propTypes.default.number)]),
269-
btnConfig: _propTypes.default.shape({
270-
text: _propTypes.default.string,
271-
color: _propTypes.default.string,
272-
backgroundColor: _propTypes.default.string,
273-
borderColor: _propTypes.default.string,
274-
fontSize: _propTypes.default.string,
275-
fontWeight: _propTypes.default.string,
276-
padding: _propTypes.default.string,
277-
fontFamily: _propTypes.default.string,
278-
placement: _propTypes.default.oneOf(['top-left', 'top-right', 'bottom-left', 'bottom-right']),
279-
margin: _propTypes.default.string
265+
plotChildMap: _propTypes["default"].oneOfType([_propTypes["default"].arrayOf(_propTypes["default"].shape({
266+
plotPosition: _propTypes["default"].number,
267+
childPosition: _propTypes["default"].number
268+
})), _propTypes["default"].arrayOf(_propTypes["default"].number)]),
269+
btnConfig: _propTypes["default"].shape({
270+
text: _propTypes["default"].string,
271+
color: _propTypes["default"].string,
272+
backgroundColor: _propTypes["default"].string,
273+
borderColor: _propTypes["default"].string,
274+
fontSize: _propTypes["default"].string,
275+
fontWeight: _propTypes["default"].string,
276+
padding: _propTypes["default"].string,
277+
fontFamily: _propTypes["default"].string,
278+
placement: _propTypes["default"].oneOf(['top-left', 'top-right', 'bottom-left', 'bottom-right']),
279+
margin: _propTypes["default"].string
280280
}),
281-
btnStyle: _propTypes.default.object,
282-
dataSource: _propTypes.default.object,
283-
dataFormat: _propTypes.default.string,
284-
type: _propTypes.default.string,
285-
height: _propTypes.default.string,
286-
width: _propTypes.default.string
281+
btnStyle: _propTypes["default"].object,
282+
dataSource: _propTypes["default"].object,
283+
dataFormat: _propTypes["default"].string,
284+
type: _propTypes["default"].string,
285+
height: _propTypes["default"].string,
286+
width: _propTypes["default"].string
287287
};
288288
var _default = DrillDown;
289-
exports.default = _default;
289+
exports["default"] = _default;

0 commit comments

Comments
 (0)