intelicoreact 0.2.38 → 0.2.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,6 +21,7 @@ var CheckboxInput = function CheckboxInput(_ref) {
21
21
  var _cn2;
22
22
 
23
23
  var label = _ref.label,
24
+ key = _ref.key,
24
25
  id = _ref.id,
25
26
  value = _ref.value,
26
27
  _onChange = _ref.onChange,
@@ -28,11 +29,14 @@ var CheckboxInput = function CheckboxInput(_ref) {
28
29
  className = _ref.className,
29
30
  isStark = _ref.isStark;
30
31
  return /*#__PURE__*/_react.default.createElement("label", {
32
+ key: id || key,
31
33
  className: (0, _classnames.default)('checkbox-input', className, (0, _defineProperty2.default)({}, "checkbox-input_disabled", disabled)),
32
34
  htmlFor: id
33
35
  }, /*#__PURE__*/_react.default.createElement("div", {
34
36
  className: (0, _classnames.default)("checkbox-input__input", (_cn2 = {}, (0, _defineProperty2.default)(_cn2, "checkbox-input__input_checked", value), (0, _defineProperty2.default)(_cn2, "checkbox-input__input_indeterminate", isStark), _cn2))
35
- }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, id ? (0, _defineProperty2.default)({
37
+ }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
38
+ key: id || key
39
+ }, id ? (0, _defineProperty2.default)({
36
40
  id: id
37
41
  }, 'data-id', id) : {}, {
38
42
  type: "checkbox",
@@ -0,0 +1,73 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
7
+ Object.defineProperty(exports, "__esModule", {
8
+ value: true
9
+ });
10
+ exports.default = void 0;
11
+
12
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
+
14
+ var _react = _interopRequireWildcard(require("react"));
15
+
16
+ var _classnames = _interopRequireDefault(require("classnames"));
17
+
18
+ var _Switcher = _interopRequireDefault(require("../Switcher/Switcher"));
19
+
20
+ require("./SwitcherCheckbox.scss");
21
+
22
+ var _CheckboxesLine = _interopRequireDefault(require("../CheckboxesLine/CheckboxesLine"));
23
+
24
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
25
+
26
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
27
+
28
+ var RC = 'switcher-hide';
29
+
30
+ var SwitcherCheckbox = function SwitcherCheckbox(_ref) {
31
+ var _cn;
32
+
33
+ var label = _ref.label,
34
+ hint = _ref.hint,
35
+ _ref$items = _ref.items,
36
+ items = _ref$items === void 0 ? [] : _ref$items,
37
+ _ref$value = _ref.value,
38
+ value = _ref$value === void 0 ? [] : _ref$value,
39
+ className = _ref.className,
40
+ isLabelBold = _ref.isLabelBold,
41
+ isActive = _ref.isActive,
42
+ hintSide = _ref.hintSide,
43
+ disabled = _ref.disabled,
44
+ _ref$onSwitcherChange = _ref.onSwitcherChange,
45
+ onSwitcherChange = _ref$onSwitcherChange === void 0 ? function () {} : _ref$onSwitcherChange,
46
+ _ref$onChange = _ref.onChange,
47
+ onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
48
+
49
+ var renderCheckboxes = function renderCheckboxes() {
50
+ return /*#__PURE__*/_react.default.createElement(_CheckboxesLine.default, {
51
+ items: items,
52
+ value: value,
53
+ onChange: onChange
54
+ });
55
+ };
56
+
57
+ return /*#__PURE__*/_react.default.createElement("div", {
58
+ className: (0, _classnames.default)(RC, className, (_cn = {}, (0, _defineProperty2.default)(_cn, "".concat(RC, "_closed"), !isActive), (0, _defineProperty2.default)(_cn, "".concat(RC, "_disabled"), disabled), _cn))
59
+ }, /*#__PURE__*/_react.default.createElement(_Switcher.default, {
60
+ className: "".concat(RC, "__switcher"),
61
+ hintSide: hintSide,
62
+ label: label,
63
+ isActive: isActive,
64
+ onChange: function onChange(value) {
65
+ return onSwitcherChange(value);
66
+ },
67
+ isLabelBold: isLabelBold,
68
+ hint: hint
69
+ }), isActive && renderCheckboxes());
70
+ };
71
+
72
+ var _default = SwitcherCheckbox;
73
+ exports.default = _default;
@@ -0,0 +1,31 @@
1
+ // @import '../../scss/main.scss';
2
+
3
+ .switcher-hide {
4
+ width: 100%;
5
+ display: inline-block;
6
+
7
+ &__switcher, &__content {
8
+ margin-bottom: 8px;
9
+ }
10
+
11
+ &__switcher {
12
+ font-family: inherit;
13
+ font-style: inherit;
14
+ font-weight:inherit;
15
+ font-size: inherit;
16
+ line-height: inherit;
17
+ }
18
+
19
+ &_closed {
20
+ height: 16px !important;
21
+ }
22
+
23
+ &_disabled {
24
+ opacity: 0.5;
25
+ pointer-events: none;
26
+
27
+ // & * {
28
+ // pointer-events: none;
29
+ // }
30
+ }
31
+ }
@@ -0,0 +1,6 @@
1
+ .any-outer-class__switcher-hide {
2
+ font-style: normal;
3
+ font-size: 12px;
4
+ line-height: 20px;
5
+ color: #1E1E2D;
6
+ }
@@ -43,6 +43,7 @@ var TagsDropdown = function TagsDropdown(_ref) {
43
43
  className = _ref.className,
44
44
  tagClassname = _ref.tagClassname,
45
45
  onKeyPress = _ref.onKeyPress,
46
+ placeholder = _ref.placeholder,
46
47
  label = _ref.label,
47
48
  isLabelBold = _ref.isLabelBold,
48
49
  hint = _ref.hint,
@@ -155,7 +156,7 @@ var TagsDropdown = function TagsDropdown(_ref) {
155
156
  onChange: function onChange(e) {
156
157
  return onSearchHandler(e.target.value);
157
158
  },
158
- placeholder: "Select from list",
159
+ placeholder: placeholder || "Select from list",
159
160
  onKeyDown: function onKeyDown(e) {
160
161
  return onKeyPress(e, searchValue);
161
162
  }
@@ -41,7 +41,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
41
41
 
42
42
  var RC = 'chart';
43
43
 
44
- _chart.Chart.register(_chart.CategoryScale, _chart.LinearScale, _chart.BarElement, _chart.PointElement, _chart.LineElement, _chart.Filler);
44
+ _chart.Chart.register(_chart.CategoryScale, _chart.LinearScale, _chart.BarElement, _chart.PointElement, _chart.LineElement, _chart.Filler, _chart.Tooltip);
45
45
 
46
46
  var Chart = function Chart(_ref) {
47
47
  var className = _ref.className,
@@ -3,7 +3,10 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.COMPONENT_OPTIONS = exports.ICON_MODELS = exports.GRADIENTS_OBJECTS = exports.FINTURF_ADD_GRADIENT_COLORS_NEGATIVE = exports.FINTURF_ADD_GRADIENT_COLORS_POSITIVE = exports.DEFAULT_CHART_MODEL = exports.CHART_TYPES = void 0;
6
+ exports.COMPONENT_OPTIONS = exports.ICON_MODELS = exports.FINTURF_TOOLTIP_OPTIONS = exports.GRADIENTS_OBJECTS = exports.FINTURF_ADD_GRADIENT_COLORS_NEGATIVE = exports.FINTURF_ADD_GRADIENT_COLORS_POSITIVE = exports.DEFAULT_CHART_MODEL = exports.CHART_TYPES = void 0;
7
+
8
+ var _fieldValueFormatters = require("../../../../Functions/fieldValueFormatters");
9
+
7
10
  var CHART_TYPES = ['Bar', 'Line'];
8
11
  exports.CHART_TYPES = CHART_TYPES;
9
12
  var DEFAULT_CHART_MODEL = 'emptyLayout';
@@ -45,6 +48,40 @@ var GRADIENTS_OBJECTS = {
45
48
  }
46
49
  };
47
50
  exports.GRADIENTS_OBJECTS = GRADIENTS_OBJECTS;
51
+ var FINTURF_TOOLTIP_OPTIONS = {
52
+ enabled: true,
53
+ mode: 'index',
54
+ intersect: false,
55
+ padding: 8,
56
+ backgroundColor: '#FFFFFF',
57
+ titleColor: '#757F8C',
58
+ titleFont: {
59
+ family: 'Sarabun',
60
+ style: 'normal',
61
+ weight: 500,
62
+ size: 12 // line-height: 18px;
63
+
64
+ },
65
+ titleAlign: 'center',
66
+ bodyColor: '#1E1E2D',
67
+ bodyFont: {
68
+ family: 'Sarabun',
69
+ style: 'normal',
70
+ weight: 400,
71
+ size: 14
72
+ },
73
+ bodyAlign: 'center',
74
+ caretSize: 0,
75
+ displayColors: false,
76
+ borderWidth: 1,
77
+ borderRadius: 6,
78
+ callbacks: {
79
+ label: function label(context) {
80
+ return (0, _fieldValueFormatters.formatDollarSign)((0, _fieldValueFormatters.formatToAddBitDepthPoints)(context.raw));
81
+ }
82
+ }
83
+ };
84
+ exports.FINTURF_TOOLTIP_OPTIONS = FINTURF_TOOLTIP_OPTIONS;
48
85
  var ICON_MODELS = ['lineIconLayout', 'finturfPositiveLineIcon', 'finturfNegativeLineIcon'];
49
86
  exports.ICON_MODELS = ICON_MODELS;
50
87
  var COMPONENT_OPTIONS = {
@@ -5,12 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.addNotLibraryAnimation = exports.addGradientsObject = exports.createGradient = exports.addDatasetsObjects = void 0;
8
+ exports.default = exports.addNotLibraryAnimation = exports.addGradientsObject = exports.createGradient = exports.addDatasetsObjects = void 0;
9
9
 
10
10
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
11
11
 
12
12
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
13
 
14
+ var _utils = require("../../../../Functions/utils");
15
+
14
16
  var _excluded = ["type"];
15
17
 
16
18
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -89,11 +91,11 @@ var createGradient = function createGradient(_ref) {
89
91
 
90
92
  exports.createGradient = createGradient;
91
93
 
92
- var addGradientsObject = function addGradientsObject(currentData, gradientSettingsObj, chart) {
94
+ var addGradientsObject = function addGradientsObject(currentData, gradientSettingsObj, chartInstance) {
93
95
  return addDatasetsObjects(currentData, function (dataset) {
94
96
  return _objectSpread((0, _defineProperty2.default)({}, gradientSettingsObj.gradientTargetPropertyName, createGradient({
95
- ctx: chart.ctx,
96
- area: chart.chartArea,
97
+ ctx: chartInstance.ctx,
98
+ area: chartInstance.chartArea,
97
99
  colors: gradientSettingsObj.colors,
98
100
  direction: gradientSettingsObj.direction,
99
101
  correctionFactors: gradientSettingsObj.typeDistributionOfGradientPoints === 'personalBase' ? dataset.data.map(function (value) {
@@ -108,7 +110,7 @@ var addGradientsObject = function addGradientsObject(currentData, gradientSettin
108
110
 
109
111
  exports.addGradientsObject = addGradientsObject;
110
112
 
111
- var addNotLibraryAnimation = function addNotLibraryAnimation(currentData, animationObj, chart) {
113
+ var addNotLibraryAnimation = function addNotLibraryAnimation(currentData, animationObj, chartInstance) {
112
114
  var _ref2 = animationObj || {},
113
115
  type = _ref2.type,
114
116
  restAnimationObj = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
@@ -139,6 +141,40 @@ var addNotLibraryAnimation = function addNotLibraryAnimation(currentData, animat
139
141
  default:
140
142
  return currentData;
141
143
  }
142
- };
144
+ }; // must be last function in file
145
+
146
+
147
+ exports.addNotLibraryAnimation = addNotLibraryAnimation;
148
+
149
+ function changeData(currentData, iterationKey, settingsForChange, chartInstance) {
150
+ // console.log('iterationKey - ', iterationKey);
151
+ // console.log('settingsForChange - ', settingsForChange);
152
+ switch (iterationKey) {
153
+ case 'setMaxBarThickness':
154
+ return addDatasetsObjects(currentData, {
155
+ maxBarThickness: settingsForChange
156
+ });
157
+
158
+ case 'addGradientsObjects':
159
+ return settingsForChange.reduce(function (acc, gradientSettingsObj) {
160
+ return addGradientsObject(acc, gradientSettingsObj, chartInstance);
161
+ }, (0, _utils.clone)(currentData));
162
+
163
+ case 'addNotLibraryAnimations':
164
+ return settingsForChange.reduce(function (acc, animationObj) {
165
+ return addNotLibraryAnimation(acc, animationObj, chartInstance);
166
+ }, currentData);
167
+ // ToDo - после выпилить кейс
168
+
169
+ case 'consoleCurrentData':
170
+ console.log(currentData);
171
+ return currentData;
172
+
173
+ default:
174
+ return currentData;
175
+ }
176
+ }
143
177
 
144
- exports.addNotLibraryAnimation = addNotLibraryAnimation;
178
+ ;
179
+ var _default = changeData;
180
+ exports.default = _default;
@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
11
11
 
12
12
  var _Chart = require("./Chart.constants");
13
13
 
14
+ var _optionsSetters = _interopRequireDefault(require("./optionsSetters"));
15
+
14
16
  var _finturfChartLayouts$, _finturfChartLayouts$2, _finturfChartLayouts$3, _finturfChartLayouts$4, _finturfChartLayouts$5, _finturfChartLayouts$6, _finturfChartLayouts$7, _finturfChartLayouts$8, _finturfChartBar$opti, _finturfChartBar$opti2, _finturfChartBar$opti3, _finturfChartBar$notL, _finturfChartLine$opt, _finturfChartLine$opt2, _finturfChartLine$opt3, _finturfChartLine$opt4, _finturfChartLine$opt5, _finturfChartLine$opt6, _finturfChartLine$not;
15
17
 
16
18
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -125,7 +127,7 @@ var reactChartJsOptionsLayouts = {
125
127
  notLibraryOptions: {
126
128
  // Этот ключ должен быть в любой итоговой конфигурации для нормальной работы компонента именно в такой вложенности
127
129
  // На основании этого ключа будет приниматься решение какой компонет будет использован (<Line />, <Bar /> и т.д.)
128
- // => Файл Chart.js => определение ChartComponent
130
+ // => Файл Chart.js => определение подкомпонента ChartComponent => строка const Component = ...
129
131
  chartTypeKey: 'Line'
130
132
  }
131
133
  }
@@ -134,7 +136,7 @@ exports.reactChartJsOptionsLayouts = reactChartJsOptionsLayouts;
134
136
 
135
137
  var finturfChartLayouts = function () {
136
138
  return ['barLayout', 'lineLayout'].reduce(function (acc, key) {
137
- var _reactChartJsOptionsL, _reactChartJsOptionsL2, _reactChartJsOptionsL3, _reactChartJsOptionsL4, _reactChartJsOptionsL5, _reactChartJsOptionsL6, _reactChartJsOptionsL7, _reactChartJsOptionsL8, _reactChartJsOptionsL9, _reactChartJsOptionsL10, _reactChartJsOptionsL11;
139
+ var _reactChartJsOptionsL, _reactChartJsOptionsL2, _reactChartJsOptionsL3, _reactChartJsOptionsL4, _reactChartJsOptionsL5, _reactChartJsOptionsL6, _reactChartJsOptionsL7, _reactChartJsOptionsL8, _reactChartJsOptionsL9, _reactChartJsOptionsL10, _reactChartJsOptionsL11, _reactChartJsOptionsL12, _reactChartJsOptionsL13, _reactChartJsOptionsL14, _reactChartJsOptionsL15, _reactChartJsOptionsL16, _reactChartJsOptionsL17;
138
140
 
139
141
  return _objectSpread(_objectSpread({}, acc), {}, (0, _defineProperty2.default)({}, key, _objectSpread(_objectSpread({}, reactChartJsOptionsLayouts[key]), {}, {
140
142
  options: _objectSpread(_objectSpread({}, reactChartJsOptionsLayouts[key].options), {}, {
@@ -143,18 +145,51 @@ var finturfChartLayouts = function () {
143
145
  grid: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL4 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL4 === void 0 ? void 0 : (_reactChartJsOptionsL5 = _reactChartJsOptionsL4.scales) === null || _reactChartJsOptionsL5 === void 0 ? void 0 : (_reactChartJsOptionsL6 = _reactChartJsOptionsL5.x) === null || _reactChartJsOptionsL6 === void 0 ? void 0 : _reactChartJsOptionsL6.grid), {}, {
144
146
  display: false,
145
147
  offset: true
148
+ }),
149
+ ticks: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL7 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL7 === void 0 ? void 0 : (_reactChartJsOptionsL8 = _reactChartJsOptionsL7.scales) === null || _reactChartJsOptionsL8 === void 0 ? void 0 : (_reactChartJsOptionsL9 = _reactChartJsOptionsL8.y) === null || _reactChartJsOptionsL9 === void 0 ? void 0 : _reactChartJsOptionsL9.ticks), {}, {
150
+ autoSkipPadding: 10,
151
+ align: 'center',
152
+ color: '#757F8C',
153
+ lineHeight: 18,
154
+ font: {
155
+ family: 'Sarabun',
156
+ style: 'normal',
157
+ weight: 400,
158
+ size: 8
159
+ } // callback: (value, index, ticks) => {
160
+ // console.log(value);
161
+ // console.log(index);
162
+ // console.log(ticks);
163
+ // console.log('***********');
164
+ // return value;
165
+ // },
166
+
146
167
  })
147
168
  }),
148
- y: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL7 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL7 === void 0 ? void 0 : (_reactChartJsOptionsL8 = _reactChartJsOptionsL7.scales) === null || _reactChartJsOptionsL8 === void 0 ? void 0 : _reactChartJsOptionsL8.y), {}, {
169
+ y: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL10 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL10 === void 0 ? void 0 : (_reactChartJsOptionsL11 = _reactChartJsOptionsL10.scales) === null || _reactChartJsOptionsL11 === void 0 ? void 0 : _reactChartJsOptionsL11.y), {}, {
149
170
  min: 0,
171
+ // grace: '5%',
150
172
  bounds: 'data',
151
- grid: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL9 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL9 === void 0 ? void 0 : (_reactChartJsOptionsL10 = _reactChartJsOptionsL9.scales) === null || _reactChartJsOptionsL10 === void 0 ? void 0 : (_reactChartJsOptionsL11 = _reactChartJsOptionsL10.y) === null || _reactChartJsOptionsL11 === void 0 ? void 0 : _reactChartJsOptionsL11.grid), {}, {
173
+ grid: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL12 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL12 === void 0 ? void 0 : (_reactChartJsOptionsL13 = _reactChartJsOptionsL12.scales) === null || _reactChartJsOptionsL13 === void 0 ? void 0 : (_reactChartJsOptionsL14 = _reactChartJsOptionsL13.y) === null || _reactChartJsOptionsL14 === void 0 ? void 0 : _reactChartJsOptionsL14.grid), {}, {
152
174
  borderColor: '#E1E8F1',
153
175
  color: '#E1E8F1',
154
176
  borderDash: [5],
155
177
  // borderDashOffset: 12,
156
178
  drawTicks: false,
157
179
  z: -1
180
+ }),
181
+ ticks: _objectSpread(_objectSpread({}, (_reactChartJsOptionsL15 = reactChartJsOptionsLayouts[key].options) === null || _reactChartJsOptionsL15 === void 0 ? void 0 : (_reactChartJsOptionsL16 = _reactChartJsOptionsL15.scales) === null || _reactChartJsOptionsL16 === void 0 ? void 0 : (_reactChartJsOptionsL17 = _reactChartJsOptionsL16.y) === null || _reactChartJsOptionsL17 === void 0 ? void 0 : _reactChartJsOptionsL17.ticks), {}, {
182
+ autoSkipPadding: 10,
183
+ align: 'center',
184
+ color: '#A0A4B0',
185
+ lineHeight: 18,
186
+ padding: 6,
187
+ font: {
188
+ family: 'Sarabun',
189
+ style: 'normal',
190
+ weight: 400,
191
+ size: 10
192
+ }
158
193
  })
159
194
  })
160
195
  })
@@ -190,23 +225,13 @@ var finturfChartLine = _objectSpread(_objectSpread({}, finturfChartLayouts.lineL
190
225
  })
191
226
  })
192
227
  })
193
- }); // gradientsSettings is Array of objects
194
-
195
-
196
- var addGradientsSettings = function addGradientsSettings(currentOptions, gradientsSettings) {
197
- var _currentOptions$notLi;
198
-
199
- return _objectSpread(_objectSpread({}, currentOptions), {}, {
200
- notLibraryOptions: _objectSpread(_objectSpread({}, currentOptions.notLibraryOptions), {}, {
201
- changeData: _objectSpread(_objectSpread({}, (_currentOptions$notLi = currentOptions.notLibraryOptions) === null || _currentOptions$notLi === void 0 ? void 0 : _currentOptions$notLi.changeData), {}, {
202
- addGradientsObjects: gradientsSettings
203
- })
204
- })
205
- });
206
- };
228
+ });
207
229
 
208
230
  var finturfReactChartJsOptions = {
209
- finturfChartBar: _objectSpread({}, addGradientsSettings(finturfChartBar, _Chart.GRADIENTS_OBJECTS.finturf.bar)),
231
+ finturfChartBar: (0, _optionsSetters.default)(finturfChartBar, {
232
+ addGradientsSettings: _Chart.GRADIENTS_OBJECTS.finturf.bar,
233
+ addTooltipOptions: _Chart.FINTURF_TOOLTIP_OPTIONS
234
+ }),
210
235
  finturfLoadingModeBar: _objectSpread(_objectSpread({}, finturfChartBar), {}, {
211
236
  options: _objectSpread(_objectSpread({}, finturfChartBar.options), {}, {
212
237
  animations: _objectSpread(_objectSpread({}, (_finturfChartBar$opti = finturfChartBar.options) === null || _finturfChartBar$opti === void 0 ? void 0 : _finturfChartBar$opti.animations), {}, {
@@ -231,7 +256,11 @@ var finturfReactChartJsOptions = {
231
256
  })
232
257
  })
233
258
  }),
234
- finturfChartLine: _objectSpread({}, addGradientsSettings(finturfChartLine, _Chart.GRADIENTS_OBJECTS.finturf.line)),
259
+ finturfChartLine: (0, _optionsSetters.default)(finturfChartLine, {
260
+ addGradientsSettings: _Chart.GRADIENTS_OBJECTS.finturf.line,
261
+ addTooltipOptions: _Chart.FINTURF_TOOLTIP_OPTIONS // consoleCurrentData: true,
262
+
263
+ }),
235
264
  finturfLoadingModeLine: _objectSpread(_objectSpread({}, finturfChartLine), {}, {
236
265
  options: _objectSpread(_objectSpread({}, finturfChartLine.options), {}, {
237
266
  elements: _objectSpread(_objectSpread({}, (_finturfChartLine$opt = finturfChartLine.options) === null || _finturfChartLine$opt === void 0 ? void 0 : _finturfChartLine$opt.elements), {}, {
@@ -261,8 +290,12 @@ var finturfReactChartJsOptions = {
261
290
  })
262
291
  })
263
292
  }),
264
- finturfPositiveLineIcon: _objectSpread({}, addGradientsSettings(reactChartJsOptionsLayouts.lineIconLayout, _Chart.GRADIENTS_OBJECTS.finturf.positiveLineIcon)),
265
- finturfNegativeLineIcon: _objectSpread({}, addGradientsSettings(reactChartJsOptionsLayouts.lineIconLayout, _Chart.GRADIENTS_OBJECTS.finturf.negativeLineIcon))
293
+ finturfPositiveLineIcon: (0, _optionsSetters.default)(reactChartJsOptionsLayouts.lineIconLayout, {
294
+ addGradientsSettings: _Chart.GRADIENTS_OBJECTS.finturf.positiveLineIcon
295
+ }),
296
+ finturfNegativeLineIcon: (0, _optionsSetters.default)(reactChartJsOptionsLayouts.lineIconLayout, {
297
+ addGradientsSettings: _Chart.GRADIENTS_OBJECTS.finturf.negativeLineIcon
298
+ })
266
299
  };
267
300
  exports.finturfReactChartJsOptions = finturfReactChartJsOptions;
268
301
 
@@ -0,0 +1,70 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.default = exports.addTooltipOptions = exports.addGradientsSettings = void 0;
9
+
10
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
+
12
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
13
+
14
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
15
+
16
+ // gradientsSettings is Array of objects
17
+ var addGradientsSettings = function addGradientsSettings(currentOptions, gradientsSettings) {
18
+ var _currentOptions$notLi;
19
+
20
+ return _objectSpread(_objectSpread({}, currentOptions), {}, {
21
+ notLibraryOptions: _objectSpread(_objectSpread({}, currentOptions.notLibraryOptions), {}, {
22
+ changeData: _objectSpread(_objectSpread({}, (_currentOptions$notLi = currentOptions.notLibraryOptions) === null || _currentOptions$notLi === void 0 ? void 0 : _currentOptions$notLi.changeData), {}, {
23
+ addGradientsObjects: gradientsSettings
24
+ })
25
+ })
26
+ });
27
+ };
28
+
29
+ exports.addGradientsSettings = addGradientsSettings;
30
+
31
+ var addTooltipOptions = function addTooltipOptions(currentOptions, tooltipOptions) {
32
+ return _objectSpread(_objectSpread({}, currentOptions), {}, {
33
+ options: _objectSpread(_objectSpread({}, currentOptions.options), {}, {
34
+ plugins: _objectSpread(_objectSpread({}, currentOptions.options.plugins), {}, {
35
+ tooltip: tooltipOptions
36
+ })
37
+ })
38
+ });
39
+ }; // must be last function in file
40
+
41
+
42
+ exports.addTooltipOptions = addTooltipOptions;
43
+
44
+ var addAdditionalOptions = function addAdditionalOptions(currentOptions, optionsToAdd) {
45
+ var addOption = function addOption(currentOptions, optionKey, optionData) {
46
+ switch (optionKey) {
47
+ case 'addGradientsSettings':
48
+ return addGradientsSettings(currentOptions, optionData);
49
+
50
+ case 'addTooltipOptions':
51
+ return addTooltipOptions(currentOptions, optionData);
52
+ // ToDo - после выпилить кейс
53
+
54
+ case 'consoleCurrentData':
55
+ console.log(currentOptions);
56
+ return currentOptions;
57
+
58
+ default:
59
+ return currentOptions;
60
+ }
61
+ };
62
+
63
+ var iterator = Object.keys(optionsToAdd);
64
+ return iterator.reduce(function (acc, key) {
65
+ return addOption(acc, key, optionsToAdd[key]);
66
+ }, currentOptions);
67
+ };
68
+
69
+ var _default = addAdditionalOptions;
70
+ exports.default = _default;
@@ -13,7 +13,7 @@ var _Chart = require("./Chart.constants");
13
13
 
14
14
  var _utils = require("../../../../Functions/utils");
15
15
 
16
- var _datasetSetters = require("./datasetSetters");
16
+ var _datasetSetters = _interopRequireDefault(require("./datasetSetters"));
17
17
 
18
18
  var getChartTypeKey = function getChartTypeKey(model) {
19
19
  var _optionsConstructor$m, _optionsConstructor$m2;
@@ -44,58 +44,13 @@ var getNotLibraryOptionsOptions = function getNotLibraryOptionsOptions(model) {
44
44
 
45
45
  exports.getNotLibraryOptionsOptions = getNotLibraryOptionsOptions;
46
46
 
47
- var prepareData = function prepareData(model, data, chart) {
48
- if (!chart) return data;
47
+ var prepareData = function prepareData(model, data, chartInstance) {
48
+ if (!chartInstance) return data;
49
49
  var notLibraryOptions = getNotLibraryOptionsOptions(model);
50
- var dataPreparationIterationsKeys = notLibraryOptions !== null && notLibraryOptions !== void 0 && notLibraryOptions.changeData ? Object.keys(notLibraryOptions.changeData) : [];
51
- return dataPreparationIterationsKeys.reduce(function (acc, iterationKey) {
52
- return changeData(acc, iterationKey);
50
+ var iterator = notLibraryOptions !== null && notLibraryOptions !== void 0 && notLibraryOptions.changeData ? Object.keys(notLibraryOptions.changeData) : [];
51
+ return iterator.reduce(function (acc, dataChangeKey) {
52
+ return (0, _datasetSetters.default)(acc, dataChangeKey, notLibraryOptions.changeData[dataChangeKey], chartInstance);
53
53
  }, (0, _utils.clone)(data));
54
-
55
- function changeData(currentData, iterationKey) {
56
- switch (iterationKey) {
57
- case 'setMaxBarThickness':
58
- var _ref2 = notLibraryOptions.changeData || {},
59
- setMaxBarThickness = _ref2.setMaxBarThickness;
60
-
61
- return (0, _datasetSetters.addDatasetsObjects)(currentData, {
62
- maxBarThickness: setMaxBarThickness
63
- });
64
-
65
- case 'addGradientsObjects':
66
- var _ref3 = notLibraryOptions.changeData || {},
67
- addGradientsObjects = _ref3.addGradientsObjects;
68
-
69
- return addGradientsObjects.reduce(function (acc, gradientSettingsObj) {
70
- return (0, _datasetSetters.addGradientsObject)(acc, gradientSettingsObj, chart);
71
- }, (0, _utils.clone)(currentData));
72
-
73
- case 'addNotLibraryAnimations':
74
- var _ref4 = (notLibraryOptions === null || notLibraryOptions === void 0 ? void 0 : notLibraryOptions.changeData) || {},
75
- addNotLibraryAnimations = _ref4.addNotLibraryAnimations;
76
-
77
- return addNotLibraryAnimations.reduce(function (acc, animationObj) {
78
- return (0, _datasetSetters.addNotLibraryAnimation)(acc, animationObj, chart);
79
- }, currentData);
80
-
81
- case 'changeScaleSize':
82
- var _ref5 = (notLibraryOptions === null || notLibraryOptions === void 0 ? void 0 : notLibraryOptions.changeData) || {},
83
- changeScaleSize = _ref5.changeScaleSize;
84
-
85
- console.log(changeScaleSize);
86
- return currentData;
87
- // ToDo - после выпилить кейс
88
-
89
- case 'consoleCurrentData':
90
- console.log(currentData);
91
- return currentData;
92
-
93
- default:
94
- return currentData;
95
- }
96
- }
97
-
98
- ;
99
54
  };
100
55
 
101
56
  exports.prepareData = prepareData;
@@ -35,61 +35,62 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
35
35
 
36
36
  var ExampleChartIntegration = function ExampleChartIntegration(props) {
37
37
  var _ref = props || {},
38
- dateRange = _ref.dateRange,
39
- chart = _ref.chart;
38
+ inputDateRangeProps = _ref.inputDateRangeProps,
39
+ chartProps = _ref.chartProps;
40
40
 
41
- var _ref2 = chart || {},
42
- initialChartType = _ref2.initialChartType;
41
+ var _ref2 = inputDateRangeProps || {},
42
+ outerDateRange = _ref2.value,
43
+ changeDateRange = _ref2.onChange;
43
44
 
44
- var _useState = (0, _react.useState)({
45
- intervalKey: 'thisMonth'
46
- }),
45
+ var _ref3 = chartProps || {},
46
+ initialChartType = _ref3.initialChartType;
47
+
48
+ var dateRange = (0, _react.useMemo)(function () {
49
+ return (0, _utils.getSafelyDateRange)(outerDateRange);
50
+ }, [outerDateRange]);
51
+
52
+ var _useState = (0, _react.useState)(initialChartType || 'Bar'),
47
53
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
48
- range = _useState2[0],
49
- setRange = _useState2[1];
54
+ chartType = _useState2[0],
55
+ setChartType = _useState2[1];
50
56
 
51
- var _useState3 = (0, _react.useState)(initialChartType || 'Bar'),
57
+ var _useState3 = (0, _react.useState)('tab1'),
52
58
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
53
- chartType = _useState4[0],
54
- setChartType = _useState4[1];
59
+ tab = _useState4[0],
60
+ setTab = _useState4[1];
55
61
 
56
- var _useState5 = (0, _react.useState)('tab1'),
62
+ var _useState5 = (0, _react.useState)(chartType === 'Bar' ? 'finturfLoadingModeBar' : 'finturfLoadingModeLine'),
57
63
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
58
- tab = _useState6[0],
59
- setTab = _useState6[1];
64
+ initialModel = _useState6[0],
65
+ setInitialModel = _useState6[1];
60
66
 
61
- var _useState7 = (0, _react.useState)(chartType === 'Bar' ? 'finturfLoadingModeBar' : 'finturfLoadingModeLine'),
67
+ var _useState7 = (0, _react.useState)(null),
62
68
  _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
63
- initialModel = _useState8[0],
64
- setInitialModel = _useState8[1];
69
+ tab1 = _useState8[0],
70
+ setTab1 = _useState8[1];
65
71
 
66
72
  var _useState9 = (0, _react.useState)(null),
67
73
  _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
68
- tab1 = _useState10[0],
69
- setTab1 = _useState10[1];
74
+ tab2 = _useState10[0],
75
+ setTab2 = _useState10[1];
70
76
 
71
77
  var _useState11 = (0, _react.useState)(null),
72
78
  _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
73
- tab2 = _useState12[0],
74
- setTab2 = _useState12[1];
79
+ tab3 = _useState12[0],
80
+ setTab3 = _useState12[1];
75
81
 
76
82
  var _useState13 = (0, _react.useState)(null),
77
83
  _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
78
- tab3 = _useState14[0],
79
- setTab3 = _useState14[1];
84
+ tab4 = _useState14[0],
85
+ setTab4 = _useState14[1];
80
86
 
81
87
  var _useState15 = (0, _react.useState)(null),
82
88
  _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
83
- tab4 = _useState16[0],
84
- setTab4 = _useState16[1];
85
-
86
- var _useState17 = (0, _react.useState)(null),
87
- _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
88
- dataForRender = _useState18[0],
89
- setDataForRender = _useState18[1];
89
+ dataForRender = _useState16[0],
90
+ setDataForRender = _useState16[1];
90
91
 
91
92
  var getMockData = function getMockData() {
92
- var labels = (0, _utils.getLabels)(range);
93
+ var labels = (0, _utils.getLabels)(dateRange);
93
94
 
94
95
  var mock = function mock() {
95
96
  return labels.map(function (label) {
@@ -124,6 +125,25 @@ var ExampleChartIntegration = function ExampleChartIntegration(props) {
124
125
  }
125
126
  };
126
127
 
128
+ var getDescription = function getDescription(tabId) {
129
+ switch (tabId) {
130
+ case 'tab1':
131
+ return 'Tab 1';
132
+
133
+ case 'tab2':
134
+ return 'Tab 2';
135
+
136
+ case 'tab3':
137
+ return 'Tab 3';
138
+
139
+ case 'tab4':
140
+ return 'Tab 4';
141
+
142
+ default:
143
+ return null;
144
+ }
145
+ };
146
+
127
147
  var selectData = function selectData() {
128
148
  return getTabData(tab) ? getTabData(tab) : getMockData();
129
149
  };
@@ -174,17 +194,17 @@ var ExampleChartIntegration = function ExampleChartIntegration(props) {
174
194
  // вся логика происходит в самих входящих промисах
175
195
  // Promise.all добавлен для расширения на случай надобности описания эффектов по завершении всех запросов
176
196
 
177
- Promise.all([(0, _utils.getTab)('tab1', range, processResponse), (0, _utils.getTab)('tab2', range, processResponse), (0, _utils.getTab)('tab3', range, processResponse), (0, _utils.getTab)('tab4', range, processResponse)]);
178
- }, [range]);
197
+ Promise.all([(0, _utils.getTab)('tab1', dateRange, processResponse), (0, _utils.getTab)('tab2', dateRange, processResponse), (0, _utils.getTab)('tab3', dateRange, processResponse), (0, _utils.getTab)('tab4', dateRange, processResponse)]);
198
+ }, [dateRange]);
179
199
  (0, _react.useLayoutEffect)(function () {
180
200
  setInitialModel(getModel());
181
201
  setDataForRender(selectData());
182
202
  }, [!!getTabData(tab), tab, chartType]);
183
203
  return /*#__PURE__*/_react.default.createElement("div", {
184
204
  className: "example-wrapper"
185
- }, /*#__PURE__*/_react.default.createElement(_InputDateRange.default, (0, _extends2.default)({}, dateRange, {
186
- value: range,
187
- onChange: setRange
205
+ }, /*#__PURE__*/_react.default.createElement(_InputDateRange.default, (0, _extends2.default)({}, inputDateRangeProps, {
206
+ value: outerDateRange,
207
+ onChange: changeDateRange
188
208
  })), /*#__PURE__*/_react.default.createElement("div", {
189
209
  className: "buttons-block"
190
210
  }, /*#__PURE__*/_react.default.createElement("button", {
@@ -215,12 +235,15 @@ var ExampleChartIntegration = function ExampleChartIntegration(props) {
215
235
  onClick: function onClick() {
216
236
  return setTab('tab4');
217
237
  }
218
- }, "Tab 4")), /*#__PURE__*/_react.default.createElement(_Chart.default, (0, _extends2.default)({}, chart, {
238
+ }, "Tab 4")), /*#__PURE__*/_react.default.createElement(_Chart.default, (0, _extends2.default)({}, chartProps, {
219
239
  key: JSON.stringify(dataForRender),
220
240
  data: dataForRender,
221
241
  setModelExternalValue: handleChangeChartType,
222
242
  initialModel: initialModel,
223
- modelsForSwitch: modelsForSwitch
243
+ modelsForSwitch: modelsForSwitch,
244
+ description: {
245
+ label: getDescription(tab)
246
+ }
224
247
  })));
225
248
  };
226
249
 
@@ -1,3 +1,5 @@
1
+ @import url('https://fonts.googleapis.com/css2?family=Sarabun&display=swap');
2
+
1
3
  .example-wrapper {
2
4
  max-width: 850px;
3
5
 
@@ -39,6 +41,7 @@
39
41
  line-height: 24px;
40
42
  letter-spacing: 0.1px;
41
43
  color: #3B414B;
44
+ font-family: 'Sarabun';
42
45
  }
43
46
 
44
47
  .chart__description-value {
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.getTab = exports.getMockValue = exports.getLabels = void 0;
8
+ exports.getTab = exports.getMockValue = exports.getLabels = exports.getSafelyDateRange = void 0;
9
9
 
10
10
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
11
 
@@ -17,6 +17,15 @@ var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
17
17
 
18
18
  var _dependencies = require("../../../FormElements/InputDateRange/dependencies");
19
19
 
20
+ var getSafelyDateRange = function getSafelyDateRange(dateRange) {
21
+ return (!(dateRange !== null && dateRange !== void 0 && dateRange.start) || !(dateRange !== null && dateRange !== void 0 && dateRange.end)) && (!(dateRange !== null && dateRange !== void 0 && dateRange.intervalKey) || (dateRange === null || dateRange === void 0 ? void 0 : dateRange.intervalKey) === 'allTime') ? (0, _dependencies.getActualDateRange)({
22
+ start: '2022-01-01T00:00:00',
23
+ end: (0, _momentTimezone.default)().endOf('day').format('YYYY-MM-DDTHH:mm:ss')
24
+ }) : (0, _dependencies.getActualDateRange)(dateRange);
25
+ };
26
+
27
+ exports.getSafelyDateRange = getSafelyDateRange;
28
+
20
29
  var getLabels = function getLabels(range) {
21
30
  var MINIMUM_INTERVAL = 'hour';
22
31
  var NO_MORE_THAN_THREE_HOURS = 3; // this is hours
@@ -75,7 +84,7 @@ var getLabels = function getLabels(range) {
75
84
  exports.getLabels = getLabels;
76
85
 
77
86
  var getMockValue = function getMockValue() {
78
- return Math.trunc(Math.random() * 1000);
87
+ return Math.trunc(Math.random() * 1000000);
79
88
  };
80
89
 
81
90
  exports.getMockValue = getMockValue;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "intelicoreact",
3
- "version": "0.2.38",
3
+ "version": "0.2.41",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "files": [
@@ -22,6 +22,7 @@
22
22
  "classnames": "^2.3.1",
23
23
  "moment": "^2.29.1",
24
24
  "moment-timezone": "^0.5.34",
25
+ "node-fetch": "^3.2.6",
25
26
  "react": "^17.0.2",
26
27
  "react-chartjs-2": "^4.1.0",
27
28
  "react-feather": "^2.0.9",