dtable-statistic 5.3.47-beta.2 → 5.3.47-beta.4

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.
Files changed (4) hide show
  1. package/es/assets/css/dashboard.css +0 -45
  2. package/es/components/dropdown-menu/statistic-dropdown-menu.js +62 -88
  3. package/es/tabs/tab.js +20 -15
  4. package/package.json +3 -3
package/es/assets/css/dashboard.css CHANGED
@@ -577,48 +577,3 @@
577
577
  .statistic-chart-container .collaborators-formatter .collaborator {
578
578
  margin-right: 0 !important;
579
579
  }
580
-
581
- .btn-move-to-statistic-view {
582
- display: flex;
583
- align-items: center;
584
- }
585
-
586
- .statistic-views-dropdown {
587
- width: 100%;
588
- }
589
-
590
- .statistic-views-dropdown-toggle {
591
- display: flex;
592
- align-items: center;
593
- }
594
-
595
- .statistic-views-dropdown .item-text {
596
- flex: 1;
597
- }
598
-
599
- .statistic-views-dropdown .icon-dropdown-toggle {
600
- display: inline-flex;
601
- align-items: center;
602
- width: 12px;
603
- height: 12px;
604
- margin-right: 12px;
605
- }
606
-
607
- .move-to-statistic-views-toggle {
608
- opacity: 0;
609
- width: 0;
610
- min-width: 0;
611
- margin-left: -12px;
612
- padding: 0;
613
- }
614
-
615
- .dropdown-item .statistic-views-dropdown .icon-dropdown-toggle .dtable-icon-down3 {
616
- display: inline-flex;
617
- -webkit-transform: rotate(-90deg);
618
- transform: rotate(-90deg);
619
- }
620
-
621
- .statistic-views-dropdown-menu {
622
- margin-top: -16px !important;
623
- margin-left: 8px !important;
624
- }
package/es/components/dropdown-menu/statistic-dropdown-menu.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
4
3
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
8
  exports.default = void 0;
9
+ var _DTableDropdownMenu2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableDropdownMenu"));
10
+ var _DTableSubDropdownMenu2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSubDropdownMenu"));
11
+ var _DTableSubDropdownToggle2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableSubDropdownToggle"));
12
+ var _DTableDropdownItem2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableDropdownItem"));
9
13
  var _react = _interopRequireWildcard(require("react"));
10
14
  var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
11
15
  var _classnames = _interopRequireDefault(require("classnames"));
@@ -21,9 +25,6 @@ class StatisticDropdownMenu extends _react.default.Component {
21
25
  event.stopPropagation();
22
26
  };
23
27
  this.onDropdownToggleClick = e => {
24
- if (e.target && this.viewsDropdownToggle && this.viewsDropdownToggle.contains(e.target)) {
25
- return;
26
- }
27
28
  e.preventDefault();
28
29
  e.stopPropagation();
29
30
  this.setState({
@@ -78,101 +79,74 @@ class StatisticDropdownMenu extends _react.default.Component {
78
79
  "aria-expanded": this.state.isItemMenuShow
79
80
  }, /*#__PURE__*/_react.default.createElement("i", {
80
81
  className: "toggle-icon dtable-font dtable-icon-more-level"
81
- })), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
82
- className: (0, _classnames.default)('dtable-dropdown-menu', {
82
+ })), /*#__PURE__*/_react.default.createElement(_DTableDropdownMenu2.default, {
83
+ className: (0, _classnames.default)({
83
84
  'statistic-dropdown-dark': theme === _constants.THEME_NAME_MAP.DARK
85
+ })
86
+ }, !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
87
+ onClick: this.editStatItem,
88
+ icon: /*#__PURE__*/_react.default.createElement("i", {
89
+ className: "dtable-font dtable-icon-rename"
84
90
  }),
85
- end: true
86
- }, !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
87
- onMouseDown: this.editStatItem
88
- }, /*#__PURE__*/_react.default.createElement("i", {
89
- className: "item-icon dtable-font dtable-icon-rename"
90
- }), /*#__PURE__*/_react.default.createElement("span", {
91
- className: "item-text"
92
- }, _reactIntlUniversal.default.get('Edit'))), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
93
- onMouseDown: this.props.copyStatItem
94
- }, /*#__PURE__*/_react.default.createElement("i", {
95
- className: "item-icon dtable-font dtable-icon-copy"
96
- }), /*#__PURE__*/_react.default.createElement("span", {
97
- className: "item-text"
98
- }, _reactIntlUniversal.default.get('Duplicate')))), chartType === _seaChart.CHART_TYPE.TABLE && !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
99
- onClick: this.props.onNewTableDialogToggle
100
- }, /*#__PURE__*/_react.default.createElement("i", {
101
- className: "item-icon dtable-font dtable-icon-export"
102
- }), /*#__PURE__*/_react.default.createElement("span", {
103
- className: "item-text"
104
- }, _reactIntlUniversal.default.get('Export_to_a_new_table'))), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
105
- onClick: this.props.onUpdateTableDialogToggle
106
- }, /*#__PURE__*/_react.default.createElement("i", {
107
- className: "item-icon dtable-font dtable-icon-update"
108
- }), /*#__PURE__*/_react.default.createElement("span", {
109
- className: "item-text"
110
- }, _reactIntlUniversal.default.get('Update_to_a_table')))), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
111
- onMouseDown: this.props.onExportChart
112
- }, /*#__PURE__*/_react.default.createElement("i", {
113
- className: "item-icon dtable-font dtable-icon-download"
114
- }), /*#__PURE__*/_react.default.createElement("span", {
115
- className: "item-text"
116
- }, _reactIntlUniversal.default.get('Export_as_picture'))), !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, hasOtherViews && /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
117
- className: "pr-2 btn-move-to-statistic-view",
118
- tag: "div",
119
- onClick: evt => {
120
- evt.stopPropagation();
121
- evt.nativeEvent.stopImmediatePropagation();
122
- this.onShowViewsMenu();
123
- },
124
- onMouseEnter: this.onShowViewsMenu,
125
- onMouseLeave: this.onHideViewsMenu
126
- }, /*#__PURE__*/_react.default.createElement(_reactstrap.Dropdown, {
91
+ content: _reactIntlUniversal.default.get('Edit')
92
+ }), /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
93
+ onClick: this.props.copyStatItem,
94
+ icon: /*#__PURE__*/_react.default.createElement("i", {
95
+ className: "dtable-font dtable-icon-copy"
96
+ }),
97
+ content: _reactIntlUniversal.default.get('Duplicate')
98
+ })), chartType === _seaChart.CHART_TYPE.TABLE && !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
99
+ onClick: this.props.onNewTableDialogToggle,
100
+ icon: /*#__PURE__*/_react.default.createElement("i", {
101
+ className: "dtable-font dtable-icon-export"
102
+ }),
103
+ content: _reactIntlUniversal.default.get('Export_to_a_new_table')
104
+ }), /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
105
+ onClick: this.props.onUpdateTableDialogToggle,
106
+ icon: /*#__PURE__*/_react.default.createElement("i", {
107
+ className: "dtable-font dtable-icon-update"
108
+ }),
109
+ content: _reactIntlUniversal.default.get('Update_to_a_table')
110
+ })), /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
111
+ onClick: this.props.onExportChart,
112
+ icon: /*#__PURE__*/_react.default.createElement("i", {
113
+ className: "dtable-font dtable-icon-download"
114
+ }),
115
+ content: _reactIntlUniversal.default.get('Export_as_picture')
116
+ }), !isTableReadOnly && /*#__PURE__*/_react.default.createElement(_react.Fragment, null, hasOtherViews && /*#__PURE__*/_react.default.createElement(_reactstrap.Dropdown, {
127
117
  className: "statistic-views-dropdown",
128
- direction: "right",
118
+ direction: "end",
129
119
  isOpen: this.state.isShowViewsMenu,
130
- toggle: this.onToggleViewsMenu
131
- }, /*#__PURE__*/_react.default.createElement("div", {
132
- className: "statistic-views-dropdown-toggle",
133
- ref: ref => this.viewsDropdownToggle = ref
134
- }, /*#__PURE__*/_react.default.createElement(_icon.default, {
135
- symbol: "move-to",
136
- className: "statistic-type-move-to item-icon"
137
- }), /*#__PURE__*/_react.default.createElement("span", {
138
- className: "item-text"
139
- }, _reactIntlUniversal.default.get('Move_to')), /*#__PURE__*/_react.default.createElement("span", {
140
- className: "icon-dropdown-toggle"
141
- }, /*#__PURE__*/_react.default.createElement("i", {
142
- className: "item-icon dtable-font dtable-icon-down3"
143
- })), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
144
- className: "move-to-statistic-views-toggle"
145
- })), this.state.isShowViewsMenu && /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
146
- className: (0, _classnames.default)('statistic-views-dropdown-menu dtable-dropdown-menu', {
147
- 'statistic-dropdown-dark': theme === _constants.THEME_NAME_MAP.DARK
120
+ toggle: this.onToggleViewsMenu,
121
+ onMouseEnter: this.onShowViewsMenu,
122
+ onMouseLeave: this.onHideViewsMenu
123
+ }, /*#__PURE__*/_react.default.createElement(_DTableSubDropdownToggle2.default, {
124
+ ariaExpanded: this.state.isShowViewsMenu,
125
+ icon: /*#__PURE__*/_react.default.createElement(_icon.default, {
126
+ symbol: "move-to"
148
127
  }),
149
- flip: false,
150
- positionFixed: true,
151
- modifiers: [{
152
- name: 'preventOverflow',
153
- options: {
154
- boundary: document.body
155
- }
156
- }]
128
+ text: _reactIntlUniversal.default.get('Move_to')
129
+ }), this.state.isShowViewsMenu && /*#__PURE__*/_react.default.createElement(_DTableSubDropdownMenu2.default, {
130
+ className: (0, _classnames.default)({
131
+ 'statistic-dropdown-dark': theme === _constants.THEME_NAME_MAP.DARK
132
+ })
157
133
  }, otherViews.map(view => {
158
134
  const {
159
135
  _id,
160
136
  name
161
137
  } = view;
162
- return /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
138
+ return /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
163
139
  key: `move-to-statistic-view-${_id}`,
164
- onClick: this.onMoveChartToView.bind(this, _id)
165
- }, /*#__PURE__*/_react.default.createElement("span", {
166
- className: "statistic-view-name text-truncate",
167
- title: name
168
- }, name));
169
- })))), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownItem, {
170
- onMouseDown: this.deleteStatItem
171
- }, /*#__PURE__*/_react.default.createElement("i", {
172
- className: "item-icon dtable-font dtable-icon-delete"
173
- }), /*#__PURE__*/_react.default.createElement("span", {
174
- className: "item-text"
175
- }, _reactIntlUniversal.default.get('Delete')))))));
140
+ onClick: this.onMoveChartToView.bind(this, _id),
141
+ content: name
142
+ });
143
+ }))), /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
144
+ onClick: this.deleteStatItem,
145
+ icon: /*#__PURE__*/_react.default.createElement("i", {
146
+ className: "dtable-font dtable-icon-delete"
147
+ }),
148
+ content: _reactIntlUniversal.default.get('Delete')
149
+ })))));
176
150
  }
177
151
  }
178
152
  var _default = exports.default = StatisticDropdownMenu;
package/es/tabs/tab.js CHANGED
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
  var _ModalPortal2 = _interopRequireDefault(require("dtable-ui-component/lib/ModalPortal"));
10
+ var _DTableDropdownItem2 = _interopRequireDefault(require("dtable-ui-component/lib/DTableDropdownItem"));
10
11
  var _react = _interopRequireWildcard(require("react"));
11
12
  var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
12
13
  var _utils = require("../utils");
@@ -148,21 +149,25 @@ class DashBoardTab extends _react.Component {
148
149
  ...dropdownMenuPosition,
149
150
  zIndex: 1500
150
151
  }
151
- }, /*#__PURE__*/_react.default.createElement("button", {
152
- className: "dropdown-item",
153
- onClick: this.props.onToggleRenameView
154
- }, /*#__PURE__*/_react.default.createElement("i", {
155
- className: "item-icon dtable-font dtable-icon-rename"
156
- }), /*#__PURE__*/_react.default.createElement("span", {
157
- className: "item-text"
158
- }, _reactIntlUniversal.default.get('Rename'))), canDelete && /*#__PURE__*/_react.default.createElement("button", {
159
- className: "dropdown-item",
160
- onClick: this.props.onDeleteDashboard
161
- }, /*#__PURE__*/_react.default.createElement("i", {
162
- className: "item-icon dtable-font dtable-icon-delete"
163
- }), /*#__PURE__*/_react.default.createElement("span", {
164
- className: "item-text"
165
- }, _reactIntlUniversal.default.get('Delete'))))))));
152
+ }, /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
153
+ onClick: this.props.onToggleRenameView,
154
+ icon: /*#__PURE__*/_react.default.createElement("i", {
155
+ className: "dtable-font dtable-icon-rename"
156
+ }),
157
+ content: _reactIntlUniversal.default.get('Rename'),
158
+ itemProps: {
159
+ toggle: false
160
+ }
161
+ }), canDelete && /*#__PURE__*/_react.default.createElement(_DTableDropdownItem2.default, {
162
+ onClick: this.props.onDeleteDashboard,
163
+ icon: /*#__PURE__*/_react.default.createElement("i", {
164
+ className: "dtable-font dtable-icon-delete"
165
+ }),
166
+ content: _reactIntlUniversal.default.get('Delete'),
167
+ itemProps: {
168
+ toggle: false
169
+ }
170
+ }))))));
166
171
  }
167
172
  }
168
173
  var _default = exports.default = DashBoardTab;
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "5.3.47-beta.2",
2
+ "version": "5.3.47-beta.4",
3
3
  "name": "dtable-statistic",
4
4
  "description": "statistics",
5
5
  "main": "dist/dtable-statistic.js",
@@ -16,7 +16,7 @@
16
16
  "react-grid-layout": "^1.2.5",
17
17
  "react-intl-universal": "^2.4.8",
18
18
  "reactstrap": "9.2.3",
19
- "sea-chart": "1.1.130-beta.2"
19
+ "sea-chart": "1.1.130-beta.3"
20
20
  },
21
21
  "peerDependencies": {
22
22
  "dtable-ui-component": "~6.0.*",
@@ -50,7 +50,7 @@
50
50
  "dotenv": "^10.0.0",
51
51
  "dotenv-expand": "^5.1.0",
52
52
  "dtable-store": "6.0.11",
53
- "dtable-ui-component": "^6.0.110",
53
+ "dtable-ui-component": "6.0.117-beta.2",
54
54
  "dtable-utils": "^5.0.23",
55
55
  "eslint": "^8.3.0",
56
56
  "eslint-config-react-app": "^7.0.1",