@carbon/ibm-products 1.70.0 → 1.71.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +8 -4
- package/css/index-full-carbon.css +0 -7
- package/css/index-full-carbon.css.map +1 -1
- package/css/index-full-carbon.min.css.map +1 -1
- package/css/index-without-carbon-released-only.css +0 -7
- package/css/index-without-carbon-released-only.css.map +1 -1
- package/css/index-without-carbon-released-only.min.css.map +1 -1
- package/css/index-without-carbon.css +0 -7
- package/css/index-without-carbon.css.map +1 -1
- package/css/index-without-carbon.min.css.map +1 -1
- package/css/index.css +0 -7
- package/css/index.css.map +1 -1
- package/css/index.min.css.map +1 -1
- package/es/components/CreateTearsheet/preview-components/MultiStepWithIntro.js +6 -3
- package/es/components/Datagrid/Datagrid/DatagridHeaderRow.js +6 -1
- package/es/components/Datagrid/Datagrid/DatagridSelectAll.js +5 -3
- package/es/components/Datagrid/Datagrid/DatagridToolbar.js +11 -4
- package/es/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js +4 -0
- package/es/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js +0 -1
- package/es/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js +34 -10
- package/es/components/Datagrid/Datagrid/addons/Filtering/constants.js +6 -2
- package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilterContext.js +7 -0
- package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js +36 -3
- package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useShouldDisableButtons.js +1 -0
- package/es/components/Datagrid/Datagrid/addons/Filtering/hooks/useSubscribeToEventEmitter.js +1 -0
- package/es/components/Datagrid/Datagrid/addons/Filtering/index.js +1 -0
- package/es/components/Datagrid/Datagrid/addons/stateReducer.js +4 -7
- package/es/components/Datagrid/useFiltering.js +1 -6
- package/es/components/Datagrid/useInfiniteScroll.js +7 -3
- package/es/components/Datagrid/useSelectAllToggle.js +11 -10
- package/es/components/Datagrid/useSelectRows.js +2 -2
- package/es/components/Tearsheet/TearsheetShell.js +6 -4
- package/es/global/js/hooks/index.js +3 -2
- package/es/global/js/hooks/useFocus.js +72 -0
- package/es/global/js/hooks/useIsomorphicEffect.js +12 -0
- package/es/global/js/package-settings.js +0 -1
- package/lib/components/CreateTearsheet/preview-components/MultiStepWithIntro.js +6 -3
- package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js +6 -1
- package/lib/components/Datagrid/Datagrid/DatagridSelectAll.js +4 -2
- package/lib/components/Datagrid/Datagrid/DatagridToolbar.js +11 -4
- package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterFlyout.js +4 -0
- package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterPanel.js +0 -1
- package/lib/components/Datagrid/Datagrid/addons/Filtering/FilterProvider.js +30 -7
- package/lib/components/Datagrid/Datagrid/addons/Filtering/constants.js +8 -3
- package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilterContext.js +7 -0
- package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilters.js +33 -1
- package/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useShouldDisableButtons.js +1 -0
- package/lib/components/Datagrid/Datagrid/addons/stateReducer.js +4 -7
- package/lib/components/Datagrid/useFiltering.js +0 -5
- package/lib/components/Datagrid/useInfiniteScroll.js +7 -3
- package/lib/components/Datagrid/useSelectAllToggle.js +9 -9
- package/lib/components/Datagrid/useSelectRows.js +1 -1
- package/lib/components/Tearsheet/TearsheetShell.js +6 -4
- package/lib/global/js/hooks/index.js +8 -1
- package/lib/global/js/hooks/useFocus.js +79 -0
- package/lib/global/js/hooks/useIsomorphicEffect.js +18 -0
- package/lib/global/js/package-settings.js +0 -1
- package/package.json +6 -5
- package/scss/components/Datagrid/styles/addons/_FilterPanel.scss +6 -7
- package/telemetry.yml +816 -0
@@ -33,7 +33,8 @@ var getAccessibilityProps = function getAccessibilityProps(header) {
|
|
33
33
|
return props;
|
34
34
|
};
|
35
35
|
var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
|
36
|
-
var resizerAriaLabel = datagridState.resizerAriaLabel
|
36
|
+
var resizerAriaLabel = datagridState.resizerAriaLabel,
|
37
|
+
isFetching = datagridState.isFetching;
|
37
38
|
// Used to measure the height of the table and uses that value
|
38
39
|
// to display a vertical line to indicate the column you are resizing
|
39
40
|
(0, _react.useEffect)(function () {
|
@@ -106,9 +107,13 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
|
|
106
107
|
key: header.id,
|
107
108
|
"aria-hidden": header.id === 'spacer' && 'true'
|
108
109
|
}, getAccessibilityProps(header)), header.render('Header'), header.getResizerProps && !header.isAction && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, header.getResizerProps(), {
|
110
|
+
disabled: isFetching,
|
109
111
|
onMouseDown: function onMouseDown(event) {
|
110
112
|
return handleOnMouseDownResize(event, header.getResizerProps);
|
111
113
|
},
|
114
|
+
onMouseUp: function onMouseUp() {
|
115
|
+
return (0, _stateReducer.handleColumnResizeEndEvent)(dispatch, onColResizeEnd, header.id, true);
|
116
|
+
},
|
112
117
|
onKeyDown: function onKeyDown(event) {
|
113
118
|
var key = event.key;
|
114
119
|
if (key === 'ArrowLeft' || key === 'ArrowRight') {
|
@@ -21,7 +21,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
21
21
|
var blockClass = "".concat(_settings.pkg.prefix, "--datagrid");
|
22
22
|
var SelectAll = function SelectAll(datagridState) {
|
23
23
|
var _columns$;
|
24
|
-
var _useState = (0, _react.useState)(window.innerWidth),
|
24
|
+
var _useState = (0, _react.useState)(typeof window !== 'undefined' ? window.innerWidth : ''),
|
25
25
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
26
26
|
windowSize = _useState2[0],
|
27
27
|
setWindowSize = _useState2[1];
|
@@ -30,7 +30,9 @@ var SelectAll = function SelectAll(datagridState) {
|
|
30
30
|
function updateSize() {
|
31
31
|
setWindowSize(window.innerWidth);
|
32
32
|
}
|
33
|
-
window
|
33
|
+
if (typeof window !== 'undefined') {
|
34
|
+
window.addEventListener('resize', updateSize);
|
35
|
+
}
|
34
36
|
return function () {
|
35
37
|
return window.removeEventListener('resize', updateSize);
|
36
38
|
};
|
@@ -109,6 +109,16 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
|
|
109
109
|
}
|
110
110
|
}));
|
111
111
|
};
|
112
|
+
var onCancelHandler = function onCancelHandler() {
|
113
|
+
(0, _stateReducer.handleSelectAllRowData)({
|
114
|
+
dispatch: dispatch,
|
115
|
+
rows: [],
|
116
|
+
getRowId: getRowId,
|
117
|
+
isChecked: false
|
118
|
+
});
|
119
|
+
toggleAllRowsSelected(false);
|
120
|
+
setGlobalFilter(null);
|
121
|
+
};
|
112
122
|
|
113
123
|
// Only display the first two batch actions, the rest are
|
114
124
|
// displayed inside of the ButtonMenu if there are more than
|
@@ -116,10 +126,7 @@ var DatagridBatchActionsToolbar = function DatagridBatchActionsToolbar(datagridS
|
|
116
126
|
return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.TableBatchActions, {
|
117
127
|
shouldShowBatchActions: totalSelected > 0,
|
118
128
|
totalSelected: totalSelected,
|
119
|
-
onCancel:
|
120
|
-
toggleAllRowsSelected(false);
|
121
|
-
setGlobalFilter(null);
|
122
|
-
},
|
129
|
+
onCancel: onCancelHandler,
|
123
130
|
translateWithId: translateWithIdBatchActions
|
124
131
|
}, !displayAllInMenu && toolbarBatchActions && (toolbarBatchActions === null || toolbarBatchActions === void 0 ? void 0 : toolbarBatchActions.map(function (batchAction, index) {
|
125
132
|
if (index < 2 && toolbarBatchActions.length > 3 || index < 3 && toolbarBatchActions.length <= 3) {
|
@@ -194,9 +194,13 @@ var FilterFlyout = function FilterFlyout(_ref) {
|
|
194
194
|
};
|
195
195
|
|
196
196
|
/** Effects */
|
197
|
+
// Close flyout when clicking outside
|
197
198
|
(0, _hooks.useClickOutside)(filterFlyoutRef, function (target) {
|
198
199
|
var hasClickedOnDatePicker = target.closest('.flatpickr-calendar');
|
199
200
|
var hasClickedOnDropdown = target.className === "".concat(_settings.carbon.prefix, "--list-box__menu-item__option");
|
201
|
+
|
202
|
+
// Do not do anything if flyout is closed or if clicking on anything
|
203
|
+
// rendered via a portal
|
200
204
|
if (!open || hasClickedOnDatePicker || hasClickedOnDropdown) {
|
201
205
|
return;
|
202
206
|
}
|
@@ -23,7 +23,6 @@ var _ = require(".");
|
|
23
23
|
var _hooks = require("./hooks");
|
24
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
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; }
|
26
|
-
/* eslint-disable react/jsx-key */
|
27
26
|
/**
|
28
27
|
* Copyright IBM Corp. 2022, 2024
|
29
28
|
*
|
@@ -147,22 +147,45 @@ var prepareFiltersForTags = function prepareFiltersForTags(filters, renderDateLa
|
|
147
147
|
});
|
148
148
|
return tags;
|
149
149
|
};
|
150
|
-
var
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
150
|
+
var filteringReducer = function filteringReducer(state, action) {
|
151
|
+
switch (action.type) {
|
152
|
+
case _constants.SAVED_FILTERS:
|
153
|
+
{
|
154
|
+
var _ref3 = action.payload || {},
|
155
|
+
savedFilters = _ref3.savedFilters;
|
156
|
+
return _objectSpread(_objectSpread({}, state), {}, {
|
157
|
+
savedFilters: savedFilters
|
158
|
+
});
|
159
|
+
}
|
160
|
+
default:
|
161
|
+
return state;
|
162
|
+
}
|
163
|
+
};
|
164
|
+
var FilterProvider = function FilterProvider(_ref4) {
|
165
|
+
var children = _ref4.children,
|
166
|
+
filters = _ref4.filters,
|
167
|
+
filterProps = _ref4.filterProps;
|
168
|
+
var _ref5 = filterProps || {},
|
169
|
+
renderDateLabel = _ref5.renderDateLabel;
|
156
170
|
var filterTags = prepareFiltersForTags(filters, renderDateLabel);
|
157
171
|
var _useState = (0, _react.useState)(false),
|
158
172
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
159
173
|
panelOpen = _useState2[0],
|
160
174
|
setPanelOpen = _useState2[1];
|
175
|
+
var initialState = {
|
176
|
+
savedFilters: []
|
177
|
+
};
|
178
|
+
var _useReducer = (0, _react.useReducer)(filteringReducer, initialState),
|
179
|
+
_useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
|
180
|
+
state = _useReducer2[0],
|
181
|
+
dispatch = _useReducer2[1];
|
161
182
|
var value = {
|
162
183
|
filterTags: filterTags,
|
163
184
|
EventEmitter: EventEmitter,
|
164
185
|
panelOpen: panelOpen,
|
165
|
-
setPanelOpen: setPanelOpen
|
186
|
+
setPanelOpen: setPanelOpen,
|
187
|
+
state: state,
|
188
|
+
dispatch: dispatch
|
166
189
|
};
|
167
190
|
return /*#__PURE__*/_react.default.createElement(FilterContext.Provider, {
|
168
191
|
value: value
|
@@ -3,13 +3,14 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
-
exports.RADIO = exports.PANEL_WIDTH = exports.PANEL = exports.NUMBER = exports.INSTANT = exports.FLYOUT = exports.DROPDOWN = exports.DATE = exports.CLEAR_SINGLE_FILTER = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = exports.ACTION_SET_HEIGHT = void 0;
|
6
|
+
exports.SAVED_FILTERS = exports.RADIO = exports.PANEL_WIDTH = exports.PANEL = exports.NUMBER = exports.INSTANT = exports.FLYOUT = exports.DROPDOWN = exports.DATE = exports.CLEAR_SINGLE_FILTER = exports.CLEAR_FILTERS = exports.CHECKBOX = exports.BATCH = exports.ACTION_SET_HEIGHT = void 0;
|
7
7
|
/**
|
8
|
-
* Copyright IBM Corp. 2022,
|
8
|
+
* Copyright IBM Corp. 2022, 2024
|
9
9
|
*
|
10
10
|
* This source code is licensed under the Apache-2.0 license found in the
|
11
11
|
* LICENSE file in the root directory of this source tree.
|
12
12
|
*/
|
13
|
+
|
13
14
|
/** Constants for update methods can either be batch or instant */
|
14
15
|
var BATCH = 'batch';
|
15
16
|
exports.BATCH = BATCH;
|
@@ -44,4 +45,8 @@ exports.CLEAR_SINGLE_FILTER = CLEAR_SINGLE_FILTER;
|
|
44
45
|
var PANEL_WIDTH = 320;
|
45
46
|
exports.PANEL_WIDTH = PANEL_WIDTH;
|
46
47
|
var ACTION_SET_HEIGHT = 64;
|
47
|
-
|
48
|
+
|
49
|
+
/** Constants for local reducer */
|
50
|
+
exports.ACTION_SET_HEIGHT = ACTION_SET_HEIGHT;
|
51
|
+
var SAVED_FILTERS = 'savedFilters';
|
52
|
+
exports.SAVED_FILTERS = SAVED_FILTERS;
|
@@ -6,6 +6,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.default = void 0;
|
7
7
|
var _FilterProvider = require("../FilterProvider");
|
8
8
|
var _react = require("react");
|
9
|
+
/**
|
10
|
+
* Copyright IBM Corp. 2023, 2024
|
11
|
+
*
|
12
|
+
* This source code is licensed under the Apache-2.0 license found in the
|
13
|
+
* LICENSE file in the root directory of this source tree.
|
14
|
+
*/
|
15
|
+
|
9
16
|
var useFilterContext = function useFilterContext() {
|
10
17
|
// get the context
|
11
18
|
var context = (0, _react.useContext)(_FilterProvider.FilterContext);
|
@@ -15,6 +15,7 @@ var _carbonComponentsReact = require("carbon-components-react");
|
|
15
15
|
var _constants = require("../constants");
|
16
16
|
var _utils = require("../utils");
|
17
17
|
var _hooks = require("../../../../../../global/js/hooks");
|
18
|
+
var _FilterProvider = require("../FilterProvider");
|
18
19
|
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); }
|
19
20
|
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; }
|
20
21
|
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; }
|
@@ -29,6 +30,10 @@ var useFilters = function useFilters(_ref) {
|
|
29
30
|
onCancel = _ref.onCancel,
|
30
31
|
panelOpen = _ref.panelOpen,
|
31
32
|
isFetching = _ref.isFetching;
|
33
|
+
var _useContext = (0, _react.useContext)(_FilterProvider.FilterContext),
|
34
|
+
state = _useContext.state,
|
35
|
+
localDispatch = _useContext.dispatch;
|
36
|
+
var savedFilters = state.savedFilters;
|
32
37
|
/** State */
|
33
38
|
var _useState = (0, _react.useState)((0, _utils.getInitialStateFromFilters)(filters, variation, reactTableFiltersState)),
|
34
39
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
@@ -168,6 +173,16 @@ var useFilters = function useFilters(_ref) {
|
|
168
173
|
}
|
169
174
|
setFiltersObjectArray(filtersObjectArrayCopy);
|
170
175
|
|
176
|
+
// Dispatch action from local filter context to track filters in order
|
177
|
+
// to keep history if `isFetching` becomes true. If so, react-table
|
178
|
+
// clears all filter history
|
179
|
+
localDispatch({
|
180
|
+
type: _constants.SAVED_FILTERS,
|
181
|
+
payload: {
|
182
|
+
savedFilters: filtersObjectArrayCopy
|
183
|
+
}
|
184
|
+
});
|
185
|
+
|
171
186
|
// // Automatically apply the filters if the updateMethod is instant
|
172
187
|
if (updateMethod === _constants.INSTANT) {
|
173
188
|
setAllFilters(filtersObjectArrayCopy);
|
@@ -347,10 +362,27 @@ var useFilters = function useFilters(_ref) {
|
|
347
362
|
setAllFilters(JSON.parse(prevFiltersObjectArrayRef.current));
|
348
363
|
setFetchingReset(true);
|
349
364
|
}
|
365
|
+
if (isFetching && fetchingReset) {
|
366
|
+
var cleanFilters = function cleanFilters(originalFilterState) {
|
367
|
+
var copy = _objectSpread({}, originalFilterState);
|
368
|
+
var updatedFilters = savedFilters.map(function (f) {
|
369
|
+
if (Object.hasOwn(copy, f.id)) {
|
370
|
+
copy[f.id] = f;
|
371
|
+
return copy;
|
372
|
+
}
|
373
|
+
return copy;
|
374
|
+
});
|
375
|
+
return updatedFilters[0];
|
376
|
+
};
|
377
|
+
setFiltersObjectArray(savedFilters);
|
378
|
+
var filterStateCopy = cleanFilters(filtersState);
|
379
|
+
setFiltersState(filterStateCopy);
|
380
|
+
}
|
350
381
|
if (!isFetching) {
|
351
382
|
setFetchingReset(false);
|
352
383
|
}
|
353
|
-
|
384
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
385
|
+
}, [isFetching, reactTableFiltersState, setAllFilters, fetchingReset, savedFilters, filtersObjectArray]);
|
354
386
|
var cancel = function cancel() {
|
355
387
|
// Reverting to previous filters only applies when using batch actions
|
356
388
|
if (updateMethod === _constants.BATCH) {
|
@@ -14,6 +14,7 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
14
14
|
* This source code is licensed under the Apache-2.0 license found in the
|
15
15
|
* LICENSE file in the root directory of this source tree.
|
16
16
|
*/
|
17
|
+
|
17
18
|
/* eslint-disable jsdoc/check-param-names */
|
18
19
|
|
19
20
|
/**
|
@@ -96,7 +96,7 @@ var stateReducer = function stateReducer(newState, action) {
|
|
96
96
|
if (rows) {
|
97
97
|
var newSelectedRowData = {};
|
98
98
|
rows.forEach(function (row) {
|
99
|
-
newSelectedRowData[getRowId(row, row.index)] = row;
|
99
|
+
newSelectedRowData[getRowId(row.original, row.index)] = row.original;
|
100
100
|
});
|
101
101
|
return _objectSpread(_objectSpread({}, newState), {}, {
|
102
102
|
selectedRowData: indeterminate || !isChecked ? {} : newSelectedRowData
|
@@ -115,7 +115,7 @@ var stateReducer = function stateReducer(newState, action) {
|
|
115
115
|
}
|
116
116
|
if (_isChecked) {
|
117
117
|
return _objectSpread(_objectSpread({}, newState), {}, {
|
118
|
-
selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, (0, _defineProperty2.default)({}, _getRowId(rowData, rowData.index), rowData))
|
118
|
+
selectedRowData: _objectSpread(_objectSpread({}, newState.selectedRowData), {}, (0, _defineProperty2.default)({}, _getRowId(rowData.original, rowData.index), rowData.original))
|
119
119
|
});
|
120
120
|
}
|
121
121
|
if (rowData && !_isChecked) {
|
@@ -123,7 +123,7 @@ var stateReducer = function stateReducer(newState, action) {
|
|
123
123
|
var dataWithRemovedRow = Object.fromEntries(Object.entries(newData).filter(function (_ref5) {
|
124
124
|
var _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
|
125
125
|
key = _ref6[0];
|
126
|
-
return parseInt(key) !== parseInt(rowData.index);
|
126
|
+
return parseInt(key) !== parseInt(_getRowId(rowData.original, rowData.index));
|
127
127
|
}));
|
128
128
|
return _objectSpread(_objectSpread({}, newState), {}, {
|
129
129
|
selectedRowData: dataWithRemovedRow
|
@@ -181,10 +181,7 @@ var stateReducer = function stateReducer(newState, action) {
|
|
181
181
|
var currentColumn = {};
|
182
182
|
currentColumn[_headerId2] = newState.columnResizing.columnWidths[_headerId2];
|
183
183
|
var allChangedColumns = newState.columnResizing.columnWidths;
|
184
|
-
|
185
|
-
if (isResizing) {
|
186
|
-
onColResizeEnd === null || onColResizeEnd === void 0 ? void 0 : onColResizeEnd(currentColumn, allChangedColumns);
|
187
|
-
}
|
184
|
+
onColResizeEnd === null || onColResizeEnd === void 0 ? void 0 : onColResizeEnd(currentColumn, allChangedColumns);
|
188
185
|
if (!isKeyEvent) {
|
189
186
|
if (typeof isKeyEvent === 'undefined') {
|
190
187
|
// Blur resizer input if it has focus and is not from a key event resize
|
@@ -9,16 +9,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
9
9
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
11
11
|
var _react = require("react");
|
12
|
-
var _settings = require("../../settings");
|
13
12
|
var _Filtering = require("./Datagrid/addons/Filtering");
|
14
13
|
var _constants = require("./Datagrid/addons/Filtering/constants");
|
15
14
|
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; }
|
16
15
|
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; }
|
17
16
|
var useFiltering = function useFiltering(hooks) {
|
18
|
-
(0, _react.useEffect)(function () {
|
19
|
-
_settings.pkg.checkReportFeatureEnabled('Datagrid.useFiltering');
|
20
|
-
}, []);
|
21
|
-
|
22
17
|
/* istanbul ignore next */
|
23
18
|
var filterTypes = (0, _react.useMemo)(function () {
|
24
19
|
return {
|
@@ -10,7 +10,7 @@ var _debounce = _interopRequireDefault(require("lodash/debounce"));
|
|
10
10
|
var _useParentDimensions = _interopRequireDefault(require("./useParentDimensions"));
|
11
11
|
var _useResizeTable = _interopRequireDefault(require("./useResizeTable"));
|
12
12
|
/**
|
13
|
-
* Copyright IBM Corp. 2020,
|
13
|
+
* Copyright IBM Corp. 2020, 2024
|
14
14
|
*
|
15
15
|
* This source code is licensed under the Apache-2.0 license found in the
|
16
16
|
* LICENSE file in the root directory of this source tree.
|
@@ -20,14 +20,18 @@ var useInfiniteScroll = function useInfiniteScroll(hooks) {
|
|
20
20
|
(0, _useParentDimensions.default)(hooks);
|
21
21
|
(0, _useResizeTable.default)(hooks);
|
22
22
|
var useInstance = function useInstance(instance) {
|
23
|
+
var _tableElement;
|
23
24
|
var isFetching = instance.isFetching,
|
24
25
|
tableHeight = instance.tableHeight,
|
25
26
|
innerListRef = instance.innerListRef,
|
26
27
|
fetchMoreData = instance.fetchMoreData,
|
27
28
|
tableId = instance.tableId,
|
28
29
|
loadMoreThreshold = instance.loadMoreThreshold;
|
29
|
-
var tableElement
|
30
|
-
|
30
|
+
var tableElement;
|
31
|
+
if (typeof document !== 'undefined') {
|
32
|
+
tableElement = document.querySelector("#".concat(tableId));
|
33
|
+
}
|
34
|
+
var totalTableHeight = tableHeight || ((_tableElement = tableElement) === null || _tableElement === void 0 ? void 0 : _tableElement.clientHeight);
|
31
35
|
var loadMoreThresholdValue = typeof loadMoreThreshold === 'number' ? loadMoreThreshold : 200;
|
32
36
|
var emptyFetchData = function emptyFetchData() {};
|
33
37
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
@@ -13,16 +13,15 @@ var _classnames = _interopRequireDefault(require("classnames"));
|
|
13
13
|
var _commonColumnIds = require("./common-column-ids");
|
14
14
|
var _DatagridSelectAllWithToggle = _interopRequireDefault(require("./Datagrid/DatagridSelectAllWithToggle"));
|
15
15
|
var _settings = require("../../settings");
|
16
|
+
var _hooks = require("../../global/js/hooks");
|
16
17
|
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); }
|
17
18
|
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; }
|
18
|
-
|
19
|
-
*
|
20
|
-
*
|
21
|
-
*
|
22
|
-
*
|
23
|
-
* restricted by GSA ADP Schedule Contract with IBM Corp.
|
19
|
+
/**
|
20
|
+
* Copyright IBM Corp. 2021, 2024
|
21
|
+
*
|
22
|
+
* This source code is licensed under the Apache-2.0 license found in the
|
23
|
+
* LICENSE file in the root directory of this source tree.
|
24
24
|
*/
|
25
|
-
// @flow
|
26
25
|
|
27
26
|
var blockClass = "".concat(_settings.pkg.prefix, "--datagrid__select-all");
|
28
27
|
var useSelectAllToggle = function useSelectAllToggle(hooks) {
|
@@ -48,11 +47,12 @@ var useSelectAllWithToggleComponent = function useSelectAllWithToggleComponent(h
|
|
48
47
|
hooks.useInstance.push(useInstance);
|
49
48
|
};
|
50
49
|
var useAddClassNameToSelectRow = function useAddClassNameToSelectRow(hooks) {
|
51
|
-
var _useState = (0, _react.useState)(
|
50
|
+
var _useState = (0, _react.useState)(0),
|
52
51
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
53
52
|
windowSize = _useState2[0],
|
54
53
|
setWindowSize = _useState2[1];
|
55
|
-
(0,
|
54
|
+
(0, _hooks.useIsomorphicEffect)(function () {
|
55
|
+
setWindowSize(window.innerWidth);
|
56
56
|
function updateSize() {
|
57
57
|
setWindowSize(window.innerWidth);
|
58
58
|
}
|
@@ -90,7 +90,7 @@ var SelectRow = function SelectRow(datagridState) {
|
|
90
90
|
withStickyColumn = datagridState.withStickyColumn,
|
91
91
|
dispatch = datagridState.dispatch,
|
92
92
|
getRowId = datagridState.getRowId;
|
93
|
-
var _useState = (0, _react.useState)(window.innerWidth),
|
93
|
+
var _useState = (0, _react.useState)(typeof window !== 'undefined' ? window.innerWidth : ''),
|
94
94
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
95
95
|
windowSize = _useState2[0],
|
96
96
|
setWindowSize = _useState2[1];
|
@@ -20,6 +20,7 @@ var _pconsole = _interopRequireDefault(require("../../global/js/utils/pconsole")
|
|
20
20
|
var _carbonComponentsReact = require("carbon-components-react");
|
21
21
|
var _ActionSet = require("../ActionSet");
|
22
22
|
var _Wrap = require("../../global/js/utils/Wrap");
|
23
|
+
var _useFocus2 = require("../../global/js/hooks/useFocus");
|
23
24
|
var _excluded = ["actions", "children", "className", "closeIconDescription", "description", "hasCloseIcon", "headerActions", "influencer", "influencerPosition", "influencerWidth", "label", "navigation", "onClose", "open", "selectorPrimaryFocus", "size", "portalTarget", "title", "verticalPosition"];
|
24
25
|
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; }
|
@@ -97,6 +98,9 @@ var TearsheetShell = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
|
|
97
98
|
var modalRef = ref || localRef;
|
98
99
|
var _useResizeObserver = (0, _useResizeObserver2.useResizeObserver)(resizer),
|
99
100
|
width = _useResizeObserver.width;
|
101
|
+
var _useFocus = (0, _useFocus2.useFocus)(modalRef),
|
102
|
+
firstElement = _useFocus.firstElement,
|
103
|
+
keyDownListener = _useFocus.keyDownListener;
|
100
104
|
|
101
105
|
// Keep track of the stack depth and our position in it (1-based, 0=closed)
|
102
106
|
var _useState3 = (0, _react.useState)(0),
|
@@ -133,10 +137,7 @@ var TearsheetShell = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
|
|
133
137
|
|
134
138
|
// Callback to give the tearsheet the opportunity to claim focus
|
135
139
|
handleStackChange.claimFocus = function () {
|
136
|
-
|
137
|
-
setTimeout(function () {
|
138
|
-
return element.focus();
|
139
|
-
}, 1);
|
140
|
+
firstElement === null || firstElement === void 0 ? void 0 : firstElement.focus();
|
140
141
|
};
|
141
142
|
(0, _react.useEffect)(function () {
|
142
143
|
var notify = function notify() {
|
@@ -204,6 +205,7 @@ var TearsheetShell = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref)
|
|
204
205
|
open: open,
|
205
206
|
selectorPrimaryFocus: selectorPrimaryFocus,
|
206
207
|
onFocus: handleFocus,
|
208
|
+
onKeyDown: keyDownListener,
|
207
209
|
preventCloseOnClickOutside: !isPassive,
|
208
210
|
ref: modalRef,
|
209
211
|
selectorsFloatingMenus: [".".concat(_settings.carbon.prefix, "--overflow-menu-options"), ".".concat(_settings.carbon.prefix, "--tooltip"), '.flatpickr-calendar', ".".concat(bc, "__container")],
|
@@ -33,6 +33,12 @@ Object.defineProperty(exports, "useCreateComponentStepChange", {
|
|
33
33
|
return _useCreateComponentStepChange.useCreateComponentStepChange;
|
34
34
|
}
|
35
35
|
});
|
36
|
+
Object.defineProperty(exports, "useIsomorphicEffect", {
|
37
|
+
enumerable: true,
|
38
|
+
get: function get() {
|
39
|
+
return _useIsomorphicEffect.useIsomorphicEffect;
|
40
|
+
}
|
41
|
+
});
|
36
42
|
Object.defineProperty(exports, "useNearestScroll", {
|
37
43
|
enumerable: true,
|
38
44
|
get: function get() {
|
@@ -92,4 +98,5 @@ var _useResetCreateComponent = require("./useResetCreateComponent");
|
|
92
98
|
var _useRetrieveStepData = require("./useRetrieveStepData");
|
93
99
|
var _useValidCreateStepCount = require("./useValidCreateStepCount");
|
94
100
|
var _useControllableState = require("./useControllableState");
|
95
|
-
var _usePrefix = require("./usePrefix");
|
101
|
+
var _usePrefix = require("./usePrefix");
|
102
|
+
var _useIsomorphicEffect = require("./useIsomorphicEffect");
|
@@ -0,0 +1,79 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
4
|
+
value: true
|
5
|
+
});
|
6
|
+
exports.useFocus = void 0;
|
7
|
+
var _settings = require("../../../settings");
|
8
|
+
var _react = require("react");
|
9
|
+
/**
|
10
|
+
* Copyright IBM Corp. 2024, 2024
|
11
|
+
*
|
12
|
+
* This source code is licensed under the Apache-2.0 license found in the
|
13
|
+
* LICENSE file in the root directory of this source tree.
|
14
|
+
*/
|
15
|
+
|
16
|
+
var useFocus = function useFocus(modalRef) {
|
17
|
+
var tearsheetBaseClass = "".concat(_settings.pkg.prefix, "--tearsheet");
|
18
|
+
// Querying focusable element in the modal
|
19
|
+
// Query to exclude hidden elements in the modal from querySelectorAll() method
|
20
|
+
// feel free to include more if needed :)
|
21
|
+
var notQuery = ":not(.".concat(_settings.carbon.prefix, "--visually-hidden,.").concat(tearsheetBaseClass, "__header--no-close-icon,.").concat(_settings.carbon.prefix, "--btn--disabled,[aria-hidden=\"true\"],[tabindex=\"-1\"])");
|
22
|
+
// Queries to include element types button, input, select, textarea
|
23
|
+
var queryButton = "button".concat(notQuery);
|
24
|
+
var queryInput = "input".concat(notQuery);
|
25
|
+
var querySelect = "select".concat(notQuery);
|
26
|
+
var queryTextarea = "textarea".concat(notQuery);
|
27
|
+
var queryLink = "[href]".concat(notQuery);
|
28
|
+
// Final query
|
29
|
+
var query = "".concat(queryButton, ",").concat(queryLink, ",").concat(queryInput, ",").concat(querySelect, ",").concat(queryTextarea);
|
30
|
+
var getFocusable = (0, _react.useCallback)(function () {
|
31
|
+
var _modalRef$current, _modalRef$current$inn, _modalRef$current$inn2;
|
32
|
+
// Selecting all focusable elements based on the above conditions
|
33
|
+
var focusableElements = modalRef === null || modalRef === void 0 ? void 0 : (_modalRef$current = modalRef.current) === null || _modalRef$current === void 0 ? void 0 : (_modalRef$current$inn = _modalRef$current.innerModal) === null || _modalRef$current$inn === void 0 ? void 0 : (_modalRef$current$inn2 = _modalRef$current$inn.current) === null || _modalRef$current$inn2 === void 0 ? void 0 : _modalRef$current$inn2.querySelectorAll("".concat(query));
|
34
|
+
var first = focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements[0];
|
35
|
+
var last = focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements[(focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements.length) - 1];
|
36
|
+
var all = focusableElements;
|
37
|
+
return {
|
38
|
+
first: first,
|
39
|
+
last: last,
|
40
|
+
all: all
|
41
|
+
};
|
42
|
+
}, [modalRef, query]);
|
43
|
+
(0, _react.useEffect)(function () {
|
44
|
+
getFocusable();
|
45
|
+
}, [getFocusable]);
|
46
|
+
var handleKeyDown = function handleKeyDown(event) {
|
47
|
+
// Checking whether the key is tab or not
|
48
|
+
if (event.key === 'Tab') {
|
49
|
+
// updating the focusable elements list
|
50
|
+
var _getFocusable = getFocusable(),
|
51
|
+
first = _getFocusable.first,
|
52
|
+
last = _getFocusable.last,
|
53
|
+
all = _getFocusable.all;
|
54
|
+
event.persist();
|
55
|
+
setTimeout(function () {
|
56
|
+
var _document, _document2;
|
57
|
+
if (event.shiftKey && !Array.prototype.includes.call(all, (_document = document) === null || _document === void 0 ? void 0 : _document.activeElement)) {
|
58
|
+
// Prevents the default "Tab" behavior
|
59
|
+
event.preventDefault();
|
60
|
+
// if the user press shift+tab and the current element not in focusable items
|
61
|
+
last === null || last === void 0 ? void 0 : last.focus();
|
62
|
+
} else if (!Array.prototype.includes.call(all, (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.activeElement)) {
|
63
|
+
event.preventDefault();
|
64
|
+
// user pressing tab key only then
|
65
|
+
// focusing the first element if the current element is not in focusable items
|
66
|
+
first === null || first === void 0 ? void 0 : first.focus();
|
67
|
+
}
|
68
|
+
}, 0);
|
69
|
+
}
|
70
|
+
};
|
71
|
+
return {
|
72
|
+
firstElement: getFocusable().first,
|
73
|
+
lastElement: getFocusable().last,
|
74
|
+
allElements: getFocusable().all,
|
75
|
+
keyDownListener: handleKeyDown,
|
76
|
+
getFocusable: getFocusable
|
77
|
+
};
|
78
|
+
};
|
79
|
+
exports.useFocus = useFocus;
|
@@ -0,0 +1,18 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
4
|
+
value: true
|
5
|
+
});
|
6
|
+
exports.useIsomorphicEffect = void 0;
|
7
|
+
var _react = require("react");
|
8
|
+
/**
|
9
|
+
* Copyright IBM Corp. 2024, 2024
|
10
|
+
*
|
11
|
+
* This source code is licensed under the Apache-2.0 license found in the
|
12
|
+
* LICENSE file in the root directory of this source tree.
|
13
|
+
*/
|
14
|
+
|
15
|
+
// Originally from `@carbon/react`, https://github.com/carbon-design-system/carbon/blob/main/packages/react/src/internal/useIsomorphicEffect.js
|
16
|
+
// useLayoutEffect on the client, useEffect on the server
|
17
|
+
var useIsomorphicEffect = typeof window !== 'undefined' ? _react.useLayoutEffect : _react.useEffect;
|
18
|
+
exports.useIsomorphicEffect = useIsomorphicEffect;
|
@@ -101,7 +101,6 @@ var defaults = {
|
|
101
101
|
'a-new-feature': false,
|
102
102
|
'default-portal-target-body': true,
|
103
103
|
'Datagrid.useInlineEdit': false,
|
104
|
-
'Datagrid.useFiltering': false,
|
105
104
|
'Datagrid.useCustomizeColumns': false,
|
106
105
|
'ExampleComponent.secondaryIcon': false,
|
107
106
|
'ExampleComponent.useExample': false
|
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@carbon/ibm-products",
|
3
3
|
"description": "Carbon for IBM Products",
|
4
|
-
"version": "1.
|
4
|
+
"version": "1.71.0",
|
5
5
|
"license": "Apache-2.0",
|
6
6
|
"main": "lib/index.js",
|
7
7
|
"module": "es/index.js",
|
@@ -20,7 +20,8 @@
|
|
20
20
|
"css",
|
21
21
|
"es",
|
22
22
|
"lib",
|
23
|
-
"scss"
|
23
|
+
"scss",
|
24
|
+
"telemetry.yml"
|
24
25
|
],
|
25
26
|
"keywords": [
|
26
27
|
"carbon",
|
@@ -45,7 +46,7 @@
|
|
45
46
|
"ci-check": "node scripts/import",
|
46
47
|
"clean": "rimraf es lib css scss",
|
47
48
|
"generate": "cross-env FORCE_COLOR=1 node scripts/generate",
|
48
|
-
"postinstall": "
|
49
|
+
"postinstall": "ibmtelemetry --config=telemetry.yml",
|
49
50
|
"test": "jest --colors",
|
50
51
|
"//upgrade-dependencies": "# don't upgrade carbon (done globally), react/react-dom (explicit range peer dependency), chalk (issue #1596)",
|
51
52
|
"upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^react$|^react-dom$|^chalk$|^namor)/'"
|
@@ -72,10 +73,10 @@
|
|
72
73
|
},
|
73
74
|
"dependencies": {
|
74
75
|
"@babel/runtime": "^7.20.13",
|
75
|
-
"@carbon/telemetry": "^0.1.0",
|
76
76
|
"@dnd-kit/core": "^6.0.8",
|
77
77
|
"@dnd-kit/sortable": "^7.0.2",
|
78
78
|
"@dnd-kit/utilities": "^3.2.1",
|
79
|
+
"@ibm/telemetry-js": "^1.2.0",
|
79
80
|
"framer-motion": "^6.5.1 <7",
|
80
81
|
"immutability-helper": "^3.1.1",
|
81
82
|
"lodash": "^4.17.21",
|
@@ -97,5 +98,5 @@
|
|
97
98
|
"react": "^16.8.6 || ^17.0.1",
|
98
99
|
"react-dom": "^16.8.6 || ^17.0.1"
|
99
100
|
},
|
100
|
-
"gitHead": "
|
101
|
+
"gitHead": "48db8a26c5e8f33a2f2056e175fee30e7aab2c85"
|
101
102
|
}
|