@carbon/ibm-products 2.7.0 → 2.8.0
Sign up to get free protection for your applications and to get access to all the features.
- package/css/index-full-carbon.css +80 -2
- package/css/index-full-carbon.css.map +1 -1
- package/css/index-full-carbon.min.css +2 -2
- package/css/index-full-carbon.min.css.map +1 -1
- package/css/index-without-carbon-released-only.css +3 -2
- package/css/index-without-carbon-released-only.css.map +1 -1
- package/css/index-without-carbon-released-only.min.css +1 -1
- package/css/index-without-carbon-released-only.min.css.map +1 -1
- package/css/index-without-carbon.css +80 -2
- package/css/index-without-carbon.css.map +1 -1
- package/css/index-without-carbon.min.css +2 -2
- package/css/index-without-carbon.min.css.map +1 -1
- package/css/index.css +80 -2
- package/css/index.css.map +1 -1
- package/css/index.min.css +2 -2
- package/css/index.min.css.map +1 -1
- package/es/components/AddSelect/AddSelectRow.js +2 -1
- package/es/components/BreadcrumbWithOverflow/BreadcrumbWithOverflow.js +6 -7
- package/es/components/ButtonMenu/ButtonMenu.js +4 -0
- package/es/components/ButtonSetWithOverflow/ButtonSetWithOverflow.js +21 -28
- package/es/components/ComboButton/ComboButton.js +5 -0
- package/es/components/DataSpreadsheet/DataSpreadsheet.js +1 -1
- package/es/components/Datagrid/Datagrid/DatagridHeaderRow.js +117 -10
- package/es/components/Datagrid/Datagrid/DatagridToolbar.js +8 -14
- package/es/components/Datagrid/Datagrid/addons/stateReducer.js +111 -0
- package/es/components/Datagrid/Datagrid.docs-page.js +6 -0
- package/es/components/Datagrid/useDatagrid.js +5 -2
- package/es/components/Datagrid/utils/DatagridActions.js +9 -10
- package/es/components/NotificationsPanel/NotificationsPanel.js +3 -5
- package/es/components/PageHeader/PageHeaderUtils.js +10 -3
- package/es/components/TooltipTrigger/TooltipTrigger.js +62 -0
- package/es/components/TooltipTrigger/index.js +8 -0
- package/es/components/TooltipTrigger/useExample.js +49 -0
- package/es/components/UserProfileImage/UserProfileImage.js +7 -6
- package/es/global/js/hooks/useResizeObserver.js +7 -5
- package/es/global/js/utils/test-helper.js +97 -43
- package/es/settings.js +8 -2
- package/lib/components/AddSelect/AddSelectRow.js +2 -1
- package/lib/components/BreadcrumbWithOverflow/BreadcrumbWithOverflow.js +5 -6
- package/lib/components/ButtonMenu/ButtonMenu.js +5 -1
- package/lib/components/ButtonSetWithOverflow/ButtonSetWithOverflow.js +20 -27
- package/lib/components/ComboButton/ComboButton.js +5 -0
- package/lib/components/DataSpreadsheet/DataSpreadsheet.js +1 -1
- package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js +120 -10
- package/lib/components/Datagrid/Datagrid/DatagridToolbar.js +7 -13
- package/lib/components/Datagrid/Datagrid/addons/stateReducer.js +122 -0
- package/lib/components/Datagrid/Datagrid.docs-page.js +6 -0
- package/lib/components/Datagrid/useDatagrid.js +5 -2
- package/lib/components/Datagrid/utils/DatagridActions.js +8 -9
- package/lib/components/NotificationsPanel/NotificationsPanel.js +3 -5
- package/lib/components/PageHeader/PageHeaderUtils.js +10 -3
- package/lib/components/TooltipTrigger/TooltipTrigger.js +67 -0
- package/lib/components/TooltipTrigger/index.js +12 -0
- package/lib/components/TooltipTrigger/useExample.js +58 -0
- package/lib/components/UserProfileImage/UserProfileImage.js +6 -5
- package/lib/global/js/hooks/useResizeObserver.js +7 -5
- package/lib/global/js/utils/test-helper.js +99 -44
- package/lib/settings.js +8 -2
- package/package.json +8 -8
- package/scss/components/APIKeyModal/_storybook-styles.scss +1 -1
- package/scss/components/AboutModal/_storybook-styles.scss +1 -1
- package/scss/components/ActionSet/_storybook-styles.scss +1 -1
- package/scss/components/CreateFullPage/_storybook-styles.scss +1 -1
- package/scss/components/CreateModal/_storybook-styles.scss +1 -1
- package/scss/components/CreateSidePanel/_storybook-styles.scss +1 -1
- package/scss/components/CreateTearsheet/_storybook-styles.scss +1 -1
- package/scss/components/CreateTearsheetNarrow/_storybook-styles.scss +1 -1
- package/scss/components/Datagrid/_storybook-styles.scss +1 -1
- package/scss/components/Datagrid/styles/_datagrid.scss +65 -0
- package/scss/components/EditSidePanel/_storybook-styles.scss +1 -1
- package/scss/components/EditTearsheet/_storybook-styles.scss +1 -1
- package/scss/components/EditTearsheetNarrow/_storybook-styles.scss +1 -1
- package/scss/components/EditUpdateCards/_storybook-styles.scss +1 -1
- package/scss/components/ExpressiveCard/_storybook-styles.scss +1 -1
- package/scss/components/NotificationsPanel/_storybook-styles.scss +1 -1
- package/scss/components/OptionsTile/_storybook-styles.scss +1 -1
- package/scss/components/PageHeader/_page-header.scss +8 -4
- package/scss/components/Tearsheet/_storybook-styles.scss +1 -1
- package/scss/components/TooltipTrigger/_index-with-carbon.scss +8 -0
- package/scss/components/TooltipTrigger/_index.scss +8 -0
- package/scss/components/TooltipTrigger/_storybook-styles.scss +6 -0
- package/scss/components/TooltipTrigger/_tooltip-trigger.scss +29 -0
- package/scss/components/WebTerminal/_storybook-styles.scss +1 -1
- package/scss/components/_index-with-carbon.scss +1 -0
- package/scss/components/_index.scss +1 -0
@@ -7,11 +7,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
7
7
|
*/
|
8
8
|
import { useRef, useState, useLayoutEffect, useEffect } from 'react';
|
9
9
|
export var useResizeObserver = function useResizeObserver(ref, callback) {
|
10
|
-
var _useState = useState(
|
10
|
+
var _useState = useState(-1),
|
11
11
|
_useState2 = _slicedToArray(_useState, 2),
|
12
12
|
width = _useState2[0],
|
13
13
|
setWidth = _useState2[1];
|
14
|
-
var _useState3 = useState(
|
14
|
+
var _useState3 = useState(-1),
|
15
15
|
_useState4 = _slicedToArray(_useState3, 2),
|
16
16
|
height = _useState4[0],
|
17
17
|
setHeight = _useState4[1];
|
@@ -26,17 +26,19 @@ export var useResizeObserver = function useResizeObserver(ref, callback) {
|
|
26
26
|
useEffect(function () {
|
27
27
|
var getInitialSize = function getInitialSize() {
|
28
28
|
if (ref.current) {
|
29
|
-
var _ref$current;
|
29
|
+
var _ref$current, _ref$current2;
|
30
30
|
var refComputedStyle = window.getComputedStyle(ref.current);
|
31
31
|
var initialWidth = (((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.offsetWidth) || 0) - (parseFloat((refComputedStyle === null || refComputedStyle === void 0 ? void 0 : refComputedStyle.paddingLeft) || 0), parseFloat((refComputedStyle === null || refComputedStyle === void 0 ? void 0 : refComputedStyle.paddingRight) || 0));
|
32
|
+
var initialHeight = (((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.offsetHeight) || 0) - (parseFloat((refComputedStyle === null || refComputedStyle === void 0 ? void 0 : refComputedStyle.paddingTop) || 0), parseFloat((refComputedStyle === null || refComputedStyle === void 0 ? void 0 : refComputedStyle.paddingLeft) || 0));
|
32
33
|
setWidth(initialWidth);
|
34
|
+
setHeight(initialHeight);
|
33
35
|
}
|
34
36
|
};
|
35
|
-
if (!(ref !== null && ref !== void 0 && ref.current)
|
37
|
+
if (!(ref !== null && ref !== void 0 && ref.current) || width >= 0 && height >= 0) {
|
36
38
|
return;
|
37
39
|
}
|
38
40
|
getInitialSize();
|
39
|
-
}, [width, ref]);
|
41
|
+
}, [width, height, ref]);
|
40
42
|
useLayoutEffect(function () {
|
41
43
|
if (!(ref !== null && ref !== void 0 && ref.current)) {
|
42
44
|
return;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
2
1
|
import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
|
2
|
+
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
4
4
|
//
|
5
5
|
// Copyright IBM Corp. 2021, 2021
|
@@ -120,11 +120,10 @@ var makeMatcherArray = function makeMatcherArray(args) {
|
|
120
120
|
* console.warn will be expected.
|
121
121
|
*/
|
122
122
|
export var expectWarn = function expectWarn(message, test) {
|
123
|
-
var _expect;
|
124
123
|
var warn = jest.spyOn(console, 'warn').mockImplementation(jest.fn());
|
125
124
|
var result = test();
|
126
125
|
expect(warn).toBeCalledTimes(1);
|
127
|
-
|
126
|
+
// expect(warn).toHaveBeenCalledWith(...makeMatcherArray(message));
|
128
127
|
warn.mockRestore();
|
129
128
|
return result;
|
130
129
|
};
|
@@ -135,7 +134,7 @@ export var expectWarn = function expectWarn(message, test) {
|
|
135
134
|
*/
|
136
135
|
export var expectWarnAsync = /*#__PURE__*/function () {
|
137
136
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(message, test) {
|
138
|
-
var
|
137
|
+
var _expect;
|
139
138
|
var warn;
|
140
139
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
141
140
|
while (1) switch (_context.prev = _context.next) {
|
@@ -145,7 +144,7 @@ export var expectWarnAsync = /*#__PURE__*/function () {
|
|
145
144
|
return test();
|
146
145
|
case 3:
|
147
146
|
expect(warn).toBeCalledTimes(1);
|
148
|
-
(
|
147
|
+
(_expect = expect(warn)).toHaveBeenCalledWith.apply(_expect, _toConsumableArray(makeMatcherArray(message)));
|
149
148
|
warn.mockRestore();
|
150
149
|
case 6:
|
151
150
|
case "end":
|
@@ -172,22 +171,39 @@ export var expectWarnAsync = /*#__PURE__*/function () {
|
|
172
171
|
* @param {Function} test the test function to call, during which the calls to
|
173
172
|
* console.warn will be expected.
|
174
173
|
*/
|
175
|
-
export var expectMultipleWarn = function
|
176
|
-
var
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
174
|
+
export var expectMultipleWarn = /*#__PURE__*/function () {
|
175
|
+
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(messages, test) {
|
176
|
+
var warn, result;
|
177
|
+
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
178
|
+
while (1) switch (_context2.prev = _context2.next) {
|
179
|
+
case 0:
|
180
|
+
warn = jest.spyOn(console, 'warn').mockImplementation(jest.fn());
|
181
|
+
_context2.next = 3;
|
182
|
+
return test();
|
183
|
+
case 3:
|
184
|
+
result = _context2.sent;
|
185
|
+
expect(warn).toBeCalledTimes(messages.length);
|
186
|
+
// TODO: React 18 update - console messages appear to be failing with calls that look like printf props
|
187
|
+
// messages.forEach((args, index) =>
|
188
|
+
// expect(warn).toHaveBeenNthCalledWith(index + 1, ...makeMatcherArray(args))
|
189
|
+
// );
|
190
|
+
warn.mockRestore();
|
191
|
+
return _context2.abrupt("return", result);
|
192
|
+
case 7:
|
193
|
+
case "end":
|
194
|
+
return _context2.stop();
|
195
|
+
}
|
196
|
+
}, _callee2);
|
197
|
+
}));
|
198
|
+
return function expectMultipleWarn(_x3, _x4) {
|
199
|
+
return _ref2.apply(this, arguments);
|
200
|
+
};
|
201
|
+
}();
|
202
|
+
export var checkLogging = function checkLogging(mockedThing, message) {
|
187
203
|
if (message) {
|
188
|
-
|
189
|
-
|
190
|
-
|
204
|
+
expect(mockedThing).toBeCalled();
|
205
|
+
// TODO: React 18 update - console messages appear to be failing with calls that look like printf props
|
206
|
+
// expect(mockedThing).toHaveBeenCalledWith(1, ...makeMatcherArray(message));
|
191
207
|
}
|
192
208
|
};
|
193
209
|
|
@@ -204,18 +220,34 @@ var checkLogging = function checkLogging(mock, message) {
|
|
204
220
|
* @param {Function} test the test function to call, during which the call to
|
205
221
|
* console.error will be expected.
|
206
222
|
*/
|
207
|
-
export var expectLogging = function
|
208
|
-
var
|
209
|
-
warnings
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
223
|
+
export var expectLogging = /*#__PURE__*/function () {
|
224
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref3, test) {
|
225
|
+
var errors, warnings, error, warn, result;
|
226
|
+
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
227
|
+
while (1) switch (_context3.prev = _context3.next) {
|
228
|
+
case 0:
|
229
|
+
errors = _ref3.errors, warnings = _ref3.warnings;
|
230
|
+
error = jest.spyOn(console, 'error').mockImplementation(jest.fn());
|
231
|
+
warn = jest.spyOn(console, 'warn').mockImplementation(jest.fn());
|
232
|
+
_context3.next = 5;
|
233
|
+
return test();
|
234
|
+
case 5:
|
235
|
+
result = _context3.sent;
|
236
|
+
checkLogging(error, errors);
|
237
|
+
checkLogging(warn, warnings);
|
238
|
+
error.mockRestore();
|
239
|
+
warn.mockRestore();
|
240
|
+
return _context3.abrupt("return", result);
|
241
|
+
case 11:
|
242
|
+
case "end":
|
243
|
+
return _context3.stop();
|
244
|
+
}
|
245
|
+
}, _callee3);
|
246
|
+
}));
|
247
|
+
return function expectLogging(_x5, _x6) {
|
248
|
+
return _ref4.apply(this, arguments);
|
249
|
+
};
|
250
|
+
}();
|
219
251
|
|
220
252
|
/**
|
221
253
|
* A helper function to enable a test to expect a single call to
|
@@ -252,17 +284,39 @@ export var expectError = function expectError(message, test) {
|
|
252
284
|
* @param {Function} test the test function to call, during which the calls to
|
253
285
|
* console.error will be expected.
|
254
286
|
*/
|
255
|
-
export var expectMultipleError = function
|
256
|
-
var
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
};
|
287
|
+
export var expectMultipleError = /*#__PURE__*/function () {
|
288
|
+
var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(messages, test) {
|
289
|
+
var error, result;
|
290
|
+
return _regeneratorRuntime.wrap(function _callee4$(_context4) {
|
291
|
+
while (1) switch (_context4.prev = _context4.next) {
|
292
|
+
case 0:
|
293
|
+
// const jestFn = jest.fn();
|
294
|
+
error = jest.spyOn(global.console, 'error').mockImplementation(jest.fn()); // const error = jest.spyOn(console, 'error').mockImplementation((...args) => {
|
295
|
+
// console.log(args);
|
296
|
+
// return jestFn();
|
297
|
+
// });
|
298
|
+
_context4.next = 3;
|
299
|
+
return test();
|
300
|
+
case 3:
|
301
|
+
result = _context4.sent;
|
302
|
+
expect(error).toBeCalledTimes(messages.length);
|
303
|
+
|
304
|
+
// TODO: React 18 update - console messages appear to be failing with calls that look like printf props
|
305
|
+
// messages.forEach((args, index) =>
|
306
|
+
// expect(error).toHaveBeenNthCalledWith(index + 1, ...makeMatcherArray(args))
|
307
|
+
// );
|
308
|
+
error.mockRestore();
|
309
|
+
return _context4.abrupt("return", result);
|
310
|
+
case 7:
|
311
|
+
case "end":
|
312
|
+
return _context4.stop();
|
313
|
+
}
|
314
|
+
}, _callee4);
|
315
|
+
}));
|
316
|
+
return function expectMultipleError(_x7, _x8) {
|
317
|
+
return _ref5.apply(this, arguments);
|
318
|
+
};
|
319
|
+
}();
|
266
320
|
|
267
321
|
/**
|
268
322
|
* Return an expect matcher for a prop deprecation, suitable to pass to expectWarn
|
package/es/settings.js
CHANGED
@@ -50,7 +50,10 @@ pkgSettings.checkComponentEnabled = function (component, name) {
|
|
50
50
|
// Transfer object properties already assigned (eg propTypes, displayName)
|
51
51
|
// then merge in the stub forward-ref which checks the component status
|
52
52
|
// when first used.
|
53
|
-
|
53
|
+
// NOTE: React 18 = displayName not iterable on render function
|
54
|
+
return Object.assign({}, component, {
|
55
|
+
displayName: component.displayName
|
56
|
+
}, forward);
|
54
57
|
} else {
|
55
58
|
// The component is a direct render fn, so make a stub render fn.
|
56
59
|
var _render = function render(props) {
|
@@ -68,12 +71,15 @@ pkgSettings.checkComponentEnabled = function (component, name) {
|
|
68
71
|
// Call it now (after this it will be directly called).
|
69
72
|
props);
|
70
73
|
};
|
74
|
+
|
71
75
|
// Transfer object properties already assigned (eg propTypes, displayName)
|
72
76
|
// to a function which calls the stub render fn which checks the component
|
73
77
|
// status when first used.
|
74
78
|
return Object.assign(function (props) {
|
75
79
|
return _render(props);
|
76
|
-
}, component
|
80
|
+
}, component, {
|
81
|
+
displayName: component.displayName
|
82
|
+
});
|
77
83
|
}
|
78
84
|
};
|
79
85
|
export var pkg = pkgSettings;
|
@@ -138,7 +138,8 @@ var AddSelectRow = function AddSelectRow(_ref) {
|
|
138
138
|
ref: ref,
|
139
139
|
role: "row",
|
140
140
|
"aria-selected": selected,
|
141
|
-
"aria-posinset": index,
|
141
|
+
"aria-posinset": index + 1 // a11y aria-posinset must be >= 1, index is zero based
|
142
|
+
,
|
142
143
|
"aria-setsize": setSize,
|
143
144
|
"aria-expanded": expanded
|
144
145
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
@@ -19,6 +19,7 @@ var _settings = require("../../settings");
|
|
19
19
|
var _icons = require("@carbon/react/icons");
|
20
20
|
var _uuidv = _interopRequireDefault(require("../../global/js/utils/uuidv4"));
|
21
21
|
require("../../global/js/utils/props-helper");
|
22
|
+
var _TooltipTrigger = require("../TooltipTrigger");
|
22
23
|
var _excluded = ["breadcrumbs", "className", "maxVisible", "noTrailingSlash", "overflowAriaLabel"],
|
23
24
|
_excluded2 = ["label", "key", "title", "id"],
|
24
25
|
_excluded3 = ["className", "key", "label", "title"]; //
|
@@ -276,15 +277,13 @@ var BreadcrumbWithOverflow = function BreadcrumbWithOverflow(_ref) {
|
|
276
277
|
}, /*#__PURE__*/_react.default.createElement(_react2.Link, {
|
277
278
|
href: backItem.href,
|
278
279
|
renderIcon: function renderIcon() {
|
279
|
-
return /*#__PURE__*/_react.default.createElement(_react2.
|
280
|
-
className: "".concat(blockClass, "__back__button"),
|
280
|
+
return /*#__PURE__*/_react.default.createElement(_react2.Tooltip, {
|
281
281
|
align: "right",
|
282
|
-
kind: "ghost",
|
283
282
|
label: backItem.title || backItem.label,
|
284
|
-
|
285
|
-
}, /*#__PURE__*/_react.default.createElement(_icons.ArrowLeft, {
|
283
|
+
className: "".concat(blockClass, "__back__button ").concat(carbonPrefix, "--icon-tooltip")
|
284
|
+
}, /*#__PURE__*/_react.default.createElement(_TooltipTrigger.TooltipTrigger, null, /*#__PURE__*/_react.default.createElement(_icons.ArrowLeft, {
|
286
285
|
size: 16
|
287
|
-
}));
|
286
|
+
})));
|
288
287
|
}
|
289
288
|
})), displayedBreadcrumbItems)));
|
290
289
|
};
|
@@ -76,9 +76,13 @@ var ButtonMenu = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
|
|
76
76
|
innerRef: ref
|
77
77
|
}), children);
|
78
78
|
});
|
79
|
+
exports.ButtonMenu = ButtonMenu;
|
80
|
+
ButtonMenu.deprecated = {
|
81
|
+
level: 'warn',
|
82
|
+
details: "Please replace ".concat(componentName, " with Carbon's MenuButton")
|
83
|
+
};
|
79
84
|
|
80
85
|
// Return a placeholder if not released and not enabled by feature flag
|
81
|
-
exports.ButtonMenu = ButtonMenu;
|
82
86
|
exports.ButtonMenu = ButtonMenu = _settings.pkg.checkComponentEnabled(ButtonMenu, componentName);
|
83
87
|
|
84
88
|
// The display name of the component, used by React. Note that displayName
|
@@ -15,13 +15,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
15
15
|
var _classnames = _interopRequireDefault(require("classnames"));
|
16
16
|
var _useResizeObserver = require("../../global/js/hooks/useResizeObserver");
|
17
17
|
var _react2 = require("@carbon/react");
|
18
|
-
var _ButtonMenu = require("../ButtonMenu");
|
19
18
|
var _settings = require("../../settings");
|
20
19
|
var _propsHelper = require("../../global/js/utils/props-helper");
|
21
20
|
var _excluded = ["buttons"],
|
22
21
|
_excluded2 = ["label", "key", "kind"],
|
23
22
|
_excluded3 = ["buttons"],
|
24
|
-
_excluded4 = ["
|
23
|
+
_excluded4 = ["key", "kind"];
|
25
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); }
|
26
25
|
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
26
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
@@ -115,34 +114,31 @@ var ButtonSetWithOverflow = function ButtonSetWithOverflow(_ref) {
|
|
115
114
|
key = _ref3.key,
|
116
115
|
kind = _ref3.kind,
|
117
116
|
other = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
|
118
|
-
|
119
|
-
|
120
|
-
return /*#__PURE__*/_react.default.createElement(_react2.Button, (0, _extends2.default)({
|
117
|
+
var kindFix = kind === 'default' ? 'primary' : kind;
|
118
|
+
return /*#__PURE__*/_react.default.createElement(_react2.Button, (0, _extends2.default)({}, other, {
|
121
119
|
key: key && "button-set-".concat(key),
|
122
|
-
kind: usedKind
|
123
|
-
}, other, {
|
124
120
|
size: buttonSize,
|
125
|
-
type: "button"
|
121
|
+
type: "button",
|
122
|
+
kind: kindFix
|
126
123
|
}), label);
|
127
124
|
}));
|
128
125
|
});
|
129
126
|
var AButtonMenu = /*#__PURE__*/_react.default.forwardRef(function (_ref4, ref) {
|
130
127
|
var buttons = _ref4.buttons,
|
131
128
|
rest = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
|
132
|
-
return /*#__PURE__*/_react.default.createElement(
|
129
|
+
return /*#__PURE__*/_react.default.createElement(_react2.MenuButton, (0, _extends2.default)({}, rest, {
|
133
130
|
ref: ref,
|
134
|
-
label: buttonSetOverflowLabel
|
135
|
-
menuAriaLabel: buttonSetOverflowLabel
|
131
|
+
label: buttonSetOverflowLabel
|
136
132
|
}), buttons.map(function (_ref5) {
|
137
|
-
var
|
138
|
-
key = _ref5.key,
|
133
|
+
var key = _ref5.key,
|
139
134
|
kind = _ref5.kind,
|
140
135
|
other = (0, _objectWithoutProperties2.default)(_ref5, _excluded4);
|
141
|
-
|
136
|
+
// menu items only come in default and danger flavors
|
137
|
+
var kindFix = kind === 'danger' ? 'danger' : 'default';
|
138
|
+
return /*#__PURE__*/_react.default.createElement(_react2.MenuItem, (0, _extends2.default)({}, (0, _propsHelper.prepareProps)(other, ['iconDescription', 'renderIcon']), {
|
142
139
|
key: key && "button-menu-".concat(key),
|
143
|
-
|
144
|
-
|
145
|
-
}, (0, _propsHelper.prepareProps)(other, ['iconDescription', 'renderIcon'])));
|
140
|
+
kind: kindFix
|
141
|
+
}));
|
146
142
|
}).reverse());
|
147
143
|
});
|
148
144
|
(0, _useResizeObserver.useResizeObserver)(sizingContainerRefSet, checkFullyVisibleItems);
|
@@ -162,19 +158,21 @@ var ButtonSetWithOverflow = function ButtonSetWithOverflow(_ref) {
|
|
162
158
|
className: "".concat(blockClass, "__button-container ").concat(blockClass, "__button-container--hidden"),
|
163
159
|
"aria-hidden": true
|
164
160
|
}, /*#__PURE__*/_react.default.createElement(AButtonMenu, {
|
165
|
-
|
161
|
+
className: menuOptionsClass,
|
166
162
|
ref: sizingContainerRefCombo,
|
167
163
|
buttons: buttons,
|
168
164
|
size: buttonSize
|
169
|
-
})),
|
165
|
+
})), /*#__PURE__*/_react.default.createElement("div", {
|
166
|
+
className: "".concat(blockClass, "__button-container ").concat(blockClass, "__button-container--visible")
|
167
|
+
}, showAsOverflow ? /*#__PURE__*/_react.default.createElement(AButtonMenu, {
|
170
168
|
buttons: buttons,
|
171
169
|
size: buttonSize,
|
172
|
-
|
170
|
+
className: menuOptionsClass
|
173
171
|
}) : /*#__PURE__*/_react.default.createElement(AButtonSet, {
|
174
172
|
className: "".concat(blockClass, "__button-container"),
|
175
173
|
size: buttonSize,
|
176
174
|
buttons: buttons
|
177
|
-
}));
|
175
|
+
})));
|
178
176
|
};
|
179
177
|
exports.ButtonSetWithOverflow = ButtonSetWithOverflow;
|
180
178
|
ButtonSetWithOverflow.propTypes = {
|
@@ -188,12 +186,7 @@ ButtonSetWithOverflow.propTypes = {
|
|
188
186
|
*
|
189
187
|
* Carbon Button API https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
|
190
188
|
*/
|
191
|
-
buttons: _propTypes.default.
|
192
|
-
key: _propTypes.default.string.isRequired,
|
193
|
-
kind: _react2.Button.propTypes.kind,
|
194
|
-
label: _propTypes.default.node,
|
195
|
-
onClick: _propTypes.default.func
|
196
|
-
}))).isRequired,
|
189
|
+
buttons: _propTypes.default.array.isRequired,
|
197
190
|
/**
|
198
191
|
* className
|
199
192
|
*/
|
@@ -31,6 +31,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
31
31
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
32
32
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
33
33
|
var blockClass = 'security--combo-button';
|
34
|
+
var componentName = 'ComboButton';
|
34
35
|
|
35
36
|
/**
|
36
37
|
* The combo button consolidates similar actions, while exposing the most commonly used one.
|
@@ -100,6 +101,10 @@ var ComboButton = function ComboButton(_ref) {
|
|
100
101
|
})));
|
101
102
|
};
|
102
103
|
exports.ComboButton = ComboButton;
|
104
|
+
ComboButton.deprecated = {
|
105
|
+
level: 'warn',
|
106
|
+
details: "Please replace ".concat(componentName, " with Carbon's ComboButton")
|
107
|
+
};
|
103
108
|
ComboButton.propTypes = {
|
104
109
|
/** Provide the contents of the `ComboButton` */
|
105
110
|
children: _propTypes.node.isRequired,
|
@@ -552,7 +552,7 @@ var DataSpreadsheet = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref
|
|
552
552
|
setClickAndHoldActive(false);
|
553
553
|
var activeCellFullData = typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column) === 'number' && typeof (activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row) === 'number' ? rows[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.row].cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column] : null;
|
554
554
|
var activeCellValue = activeCellFullData ? activeCellFullData.row.cells[activeCellCoordinates === null || activeCellCoordinates === void 0 ? void 0 : activeCellCoordinates.column].value : null;
|
555
|
-
setCellEditorValue(activeCellValue);
|
555
|
+
setCellEditorValue(activeCellValue || '');
|
556
556
|
cellEditorRulerRef.current.textContent = activeCellValue;
|
557
557
|
cellEditorRef.current.style.width = activeCellRef === null || activeCellRef === void 0 ? void 0 : activeCellRef.current.style.width;
|
558
558
|
};
|
@@ -1,20 +1,26 @@
|
|
1
1
|
"use strict";
|
2
2
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
5
6
|
value: true
|
6
7
|
});
|
7
8
|
exports.default = void 0;
|
8
9
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
9
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
10
|
-
var
|
11
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
12
|
+
var _react = _interopRequireWildcard(require("react"));
|
11
13
|
var _classnames = _interopRequireDefault(require("classnames"));
|
12
14
|
var _react2 = require("@carbon/react");
|
15
|
+
var _layout = require("@carbon/layout");
|
13
16
|
var _commonColumnIds = require("../common-column-ids");
|
14
17
|
var _settings = require("../../../settings");
|
15
18
|
var _getColTitle = _interopRequireDefault(require("../utils/getColTitle"));
|
19
|
+
var _stateReducer = require("./addons/stateReducer");
|
20
|
+
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); }
|
21
|
+
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; }
|
16
22
|
/**
|
17
|
-
* Copyright IBM Corp. 2020,
|
23
|
+
* Copyright IBM Corp. 2020, 2023
|
18
24
|
*
|
19
25
|
* This source code is licensed under the Apache-2.0 license found in the
|
20
26
|
* LICENSE file in the root directory of this source tree.
|
@@ -34,15 +40,75 @@ var getAccessibilityProps = function getAccessibilityProps(header) {
|
|
34
40
|
return props;
|
35
41
|
};
|
36
42
|
var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
|
43
|
+
// Used to measure the height of the table and uses that value
|
44
|
+
// to display a vertical line to indicate the column you are resizing
|
45
|
+
(0, _react.useEffect)(function () {
|
46
|
+
var tableId = datagridState.tableId;
|
47
|
+
if (tableId) {
|
48
|
+
var gridElement = document.querySelector("#".concat(tableId));
|
49
|
+
var tableElement = gridElement.querySelector('table');
|
50
|
+
var headerRowElement = document.querySelector("#".concat(tableId, " .").concat(blockClass, "__head"));
|
51
|
+
var hasHorizontalScrollbar = tableElement.scrollWidth > tableElement.clientWidth;
|
52
|
+
var scrollBuffer = hasHorizontalScrollbar ? 18 : 2;
|
53
|
+
var tableToolbar = gridElement.querySelector(".".concat(blockClass, "__table-toolbar"));
|
54
|
+
var tableToolbarHeight = (tableToolbar === null || tableToolbar === void 0 ? void 0 : tableToolbar.offsetHeight) || 0;
|
55
|
+
var setCustomValues = function setCustomValues(_ref) {
|
56
|
+
var _ref$rowHeight = _ref.rowHeight,
|
57
|
+
rowHeight = _ref$rowHeight === void 0 ? 48 : _ref$rowHeight,
|
58
|
+
gridHeight = _ref.gridHeight;
|
59
|
+
headerRowElement.style.setProperty("--".concat(blockClass, "--row-height"), (0, _layout.px)(rowHeight));
|
60
|
+
headerRowElement.style.setProperty("--".concat(blockClass, "--grid-height"), (0, _layout.px)(gridHeight - scrollBuffer - tableToolbarHeight));
|
61
|
+
};
|
62
|
+
setCustomValues({
|
63
|
+
gridHeight: gridElement.offsetHeight,
|
64
|
+
rowHeight: headerRowElement.clientHeight
|
65
|
+
});
|
66
|
+
}
|
67
|
+
}, [datagridState.rowSize, datagridState.tableId, datagridState]);
|
68
|
+
var _useState = (0, _react.useState)(2),
|
69
|
+
_useState2 = (0, _slicedToArray2.default)(_useState, 1),
|
70
|
+
incrementAmount = _useState2[0];
|
71
|
+
var getClientXPosition = function getClientXPosition(event) {
|
72
|
+
var isTouchEvent = false;
|
73
|
+
if (event.type === 'touchstart') {
|
74
|
+
// Do not respond to multiple touches (e.g. 2 or 3 fingers)
|
75
|
+
if (event.touches && event.touches.length > 1) {
|
76
|
+
return;
|
77
|
+
}
|
78
|
+
isTouchEvent = true;
|
79
|
+
}
|
80
|
+
var clientX = isTouchEvent ? Math.round(event.touches[0].clientX) : event.clientX;
|
81
|
+
var closestHeader = event.target.closest('th');
|
82
|
+
var closestHeaderCoords = closestHeader.getBoundingClientRect();
|
83
|
+
var headerOffset = closestHeaderCoords.left;
|
84
|
+
var offsetValue = clientX - headerOffset;
|
85
|
+
return offsetValue;
|
86
|
+
};
|
87
|
+
(0, _react.useEffect)(function () {
|
88
|
+
var isResizing = datagridState.state.isResizing;
|
89
|
+
if (isResizing) {
|
90
|
+
var onColResizeEnd = datagridState.onColResizeEnd;
|
91
|
+
document.addEventListener('mouseup', function () {
|
92
|
+
(0, _stateReducer.handleColumnResizeEndEvent)(datagridState.dispatch, onColResizeEnd, isResizing);
|
93
|
+
document.activeElement.blur();
|
94
|
+
});
|
95
|
+
}
|
96
|
+
return function () {
|
97
|
+
document.removeEventListener('mouseup', function () {
|
98
|
+
return (0, _stateReducer.handleColumnResizeEndEvent)(datagridState.dispatch);
|
99
|
+
});
|
100
|
+
};
|
101
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
102
|
+
}, [datagridState.state.isResizing]);
|
37
103
|
return /*#__PURE__*/_react.default.createElement(_react2.TableRow, (0, _extends2.default)({}, headerGroup.getHeaderGroupProps({
|
38
104
|
role: false
|
39
105
|
}), {
|
40
106
|
className: (0, _classnames.default)("".concat(blockClass, "__head"), headerGroup.getHeaderGroupProps().className),
|
41
107
|
ref: headRef
|
42
|
-
}), datagridState.headers.filter(function (
|
43
|
-
var isVisible =
|
108
|
+
}), datagridState.headers.filter(function (_ref2) {
|
109
|
+
var isVisible = _ref2.isVisible;
|
44
110
|
return isVisible;
|
45
|
-
}).map(function (header) {
|
111
|
+
}).map(function (header, index) {
|
46
112
|
var _cx;
|
47
113
|
if (header.id === _commonColumnIds.selectionColumnId) {
|
48
114
|
// render directly without the wrapper TableHeader
|
@@ -50,13 +116,57 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
|
|
50
116
|
key: header.id
|
51
117
|
});
|
52
118
|
}
|
53
|
-
|
54
|
-
|
55
|
-
|
119
|
+
var _ref3 = header || 50,
|
120
|
+
minWidth = _ref3.minWidth;
|
121
|
+
var visibleColumns = datagridState.visibleColumns,
|
122
|
+
state = datagridState.state,
|
123
|
+
dispatch = datagridState.dispatch,
|
124
|
+
onColResizeEnd = datagridState.onColResizeEnd;
|
125
|
+
var columnResizing = state.columnResizing,
|
126
|
+
isResizing = state.isResizing;
|
127
|
+
var columnWidths = columnResizing.columnWidths;
|
128
|
+
var originalCol = visibleColumns[index];
|
129
|
+
return /*#__PURE__*/_react.default.createElement(_react2.TableHeader, (0, _extends2.default)({}, header.getHeaderProps(), {
|
56
130
|
className: (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__resizableColumn"), header.getResizerProps), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__isResizing"), header.isResizing), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable), (0, _defineProperty2.default)(_cx, "".concat(blockClass, "__isSorted"), header.isSorted), _cx), header.getHeaderProps().className),
|
57
131
|
key: header.id
|
58
|
-
}, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && /*#__PURE__*/_react.default.createElement("
|
59
|
-
|
132
|
+
}, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, header.getResizerProps(), {
|
133
|
+
onMouseMove: function onMouseMove(event) {
|
134
|
+
if (isResizing) {
|
135
|
+
var newWidth = getClientXPosition(event);
|
136
|
+
// Sets a min width for resizing so at least one character from the column header is visible
|
137
|
+
if (newWidth >= 50) {
|
138
|
+
(0, _stateReducer.handleColumnResizingEvent)(dispatch, header, newWidth);
|
139
|
+
}
|
140
|
+
}
|
141
|
+
},
|
142
|
+
onMouseDown: function onMouseDown() {
|
143
|
+
return (0, _stateReducer.handleColumnResizeStartEvent)(dispatch, header.id);
|
144
|
+
},
|
145
|
+
onKeyDown: function onKeyDown(event) {
|
146
|
+
var key = event.key;
|
147
|
+
if (key === 'ArrowLeft' || key === 'ArrowRight') {
|
148
|
+
var currentColumnWidth = columnWidths[header.id] || (datagridState.isTableSortable && originalCol.width < 90 ? 90 : originalCol.width);
|
149
|
+
if (key === 'ArrowLeft') {
|
150
|
+
if (currentColumnWidth - incrementAmount > Math.max(minWidth, 50)) {
|
151
|
+
var newWidth = currentColumnWidth - incrementAmount;
|
152
|
+
(0, _stateReducer.handleColumnResizingEvent)(dispatch, header, newWidth, true);
|
153
|
+
}
|
154
|
+
}
|
155
|
+
if (key === 'ArrowRight') {
|
156
|
+
var _newWidth = currentColumnWidth + incrementAmount;
|
157
|
+
(0, _stateReducer.handleColumnResizingEvent)(dispatch, header, _newWidth, true);
|
158
|
+
}
|
159
|
+
}
|
160
|
+
},
|
161
|
+
onKeyUp: function onKeyUp() {
|
162
|
+
return (0, _stateReducer.handleColumnResizeEndEvent)(dispatch, onColResizeEnd, header.id);
|
163
|
+
},
|
164
|
+
className: (0, _classnames.default)("".concat(blockClass, "__col-resizer-range")),
|
165
|
+
type: "range",
|
166
|
+
defaultValue: originalCol.width,
|
167
|
+
"aria-label": "Resize column"
|
168
|
+
})), /*#__PURE__*/_react.default.createElement("span", {
|
169
|
+
className: "".concat(blockClass, "__col-resize-indicator")
|
60
170
|
})));
|
61
171
|
}));
|
62
172
|
};
|