@carbon/react 1.50.0 → 1.51.0-rc.0
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.
- package/.playwright/INTERNAL_AVT_REPORT_DO_NOT_USE.json +887 -969
- package/es/components/ComposedModal/ComposedModal.js +32 -8
- package/es/components/Copy/Copy.js +1 -1
- package/es/components/DataTable/DataTable.d.ts +2 -2
- package/es/components/DataTable/TableToolbarSearch.d.ts +11 -38
- package/es/components/DataTable/TableToolbarSearch.js +1 -1
- package/es/components/Modal/Modal.js +25 -6
- package/es/components/MultiSelect/MultiSelect.d.ts +4 -0
- package/es/components/MultiSelect/MultiSelect.js +10 -1
- package/es/components/NumberInput/NumberInput.js +1 -1
- package/es/components/PaginationNav/PaginationNav.d.ts +45 -0
- package/es/components/PaginationNav/PaginationNav.js +24 -25
- package/es/components/PaginationNav/index.d.ts +9 -0
- package/es/components/Tabs/Tabs.js +2 -1
- package/es/components/Tile/Tile.d.ts +2 -2
- package/es/components/Tile/Tile.js +2 -2
- package/es/index.js +1 -1
- package/lib/components/ComposedModal/ComposedModal.js +32 -7
- package/lib/components/Copy/Copy.js +1 -1
- package/lib/components/DataTable/DataTable.d.ts +2 -2
- package/lib/components/DataTable/TableToolbarSearch.d.ts +11 -38
- package/lib/components/DataTable/TableToolbarSearch.js +1 -1
- package/lib/components/Modal/Modal.js +25 -5
- package/lib/components/MultiSelect/MultiSelect.d.ts +4 -0
- package/lib/components/MultiSelect/MultiSelect.js +10 -1
- package/lib/components/NumberInput/NumberInput.js +1 -1
- package/lib/components/PaginationNav/PaginationNav.d.ts +45 -0
- package/lib/components/PaginationNav/PaginationNav.js +24 -25
- package/lib/components/PaginationNav/index.d.ts +9 -0
- package/lib/components/Tabs/Tabs.js +2 -1
- package/lib/components/Tile/Tile.d.ts +2 -2
- package/lib/components/Tile/Tile.js +2 -2
- package/lib/index.js +2 -2
- package/package.json +4 -4
|
@@ -15,6 +15,9 @@ var reactIs = require('react-is');
|
|
|
15
15
|
var PropTypes = require('prop-types');
|
|
16
16
|
var ModalHeader = require('./ModalHeader.js');
|
|
17
17
|
var ModalFooter = require('./ModalFooter.js');
|
|
18
|
+
var debounce = require('lodash.debounce');
|
|
19
|
+
var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
|
|
20
|
+
var mergeRefs = require('../../tools/mergeRefs.js');
|
|
18
21
|
var cx = require('classnames');
|
|
19
22
|
var toggleClass = require('../../tools/toggleClass.js');
|
|
20
23
|
var requiredIfGivenPropIsTruthy = require('../../prop-types/requiredIfGivenPropIsTruthy.js');
|
|
@@ -27,6 +30,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
27
30
|
|
|
28
31
|
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
29
32
|
var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
|
|
33
|
+
var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
|
|
30
34
|
var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
|
|
31
35
|
|
|
32
36
|
const ModalBody = /*#__PURE__*/React__default["default"].forwardRef(function ModalBody(_ref, ref) {
|
|
@@ -38,18 +42,39 @@ const ModalBody = /*#__PURE__*/React__default["default"].forwardRef(function Mod
|
|
|
38
42
|
...rest
|
|
39
43
|
} = _ref;
|
|
40
44
|
const prefix = usePrefix.usePrefix();
|
|
41
|
-
const
|
|
42
|
-
const
|
|
45
|
+
const contentRef = React.useRef(null);
|
|
46
|
+
const [isScrollable, setIsScrollable] = React.useState(false);
|
|
47
|
+
const contentClass = cx__default["default"]({
|
|
48
|
+
[`${prefix}--modal-content`]: true,
|
|
49
|
+
[`${prefix}--modal-content--with-form`]: hasForm,
|
|
50
|
+
[`${prefix}--modal-scroll-content`]: hasScrollingContent || isScrollable,
|
|
51
|
+
customClassName
|
|
52
|
+
});
|
|
53
|
+
useIsomorphicEffect["default"](() => {
|
|
54
|
+
if (contentRef.current) {
|
|
55
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
56
|
+
}
|
|
57
|
+
function handler() {
|
|
58
|
+
if (contentRef.current) {
|
|
59
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const debouncedHandler = debounce__default["default"](handler, 200);
|
|
63
|
+
window.addEventListener('resize', debouncedHandler);
|
|
64
|
+
return () => {
|
|
65
|
+
debouncedHandler.cancel();
|
|
66
|
+
window.removeEventListener('resize', debouncedHandler);
|
|
67
|
+
};
|
|
68
|
+
}, []);
|
|
69
|
+
const hasScrollingContentProps = hasScrollingContent || isScrollable ? {
|
|
43
70
|
tabIndex: 0,
|
|
44
71
|
role: 'region'
|
|
45
72
|
} : {};
|
|
46
|
-
return /*#__PURE__*/React__default["default"].createElement(
|
|
73
|
+
return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
|
|
47
74
|
className: contentClass
|
|
48
75
|
}, hasScrollingContentProps, rest, {
|
|
49
|
-
ref: ref
|
|
50
|
-
}), children)
|
|
51
|
-
className: `${prefix}--modal-content--overflow-indicator`
|
|
52
|
-
}));
|
|
76
|
+
ref: mergeRefs["default"](contentRef, ref)
|
|
77
|
+
}), children);
|
|
53
78
|
});
|
|
54
79
|
ModalBody.propTypes = {
|
|
55
80
|
/**
|
|
@@ -53,7 +53,7 @@ export interface DataTableRow<ColTypes extends any[]> {
|
|
|
53
53
|
export interface DataTableHeader {
|
|
54
54
|
key: string;
|
|
55
55
|
header: React.ReactNode;
|
|
56
|
-
slug
|
|
56
|
+
slug?: React.ReactElement;
|
|
57
57
|
}
|
|
58
58
|
export interface DataTableRenderProps<RowType, ColTypes extends any[]> {
|
|
59
59
|
headers: Array<DataTableHeader>;
|
|
@@ -341,7 +341,7 @@ declare class DataTable<RowType, ColTypes extends any[]> extends React.Component
|
|
|
341
341
|
sortDirection: DataTableSortState;
|
|
342
342
|
isSortable: boolean | undefined;
|
|
343
343
|
isSortHeader: boolean;
|
|
344
|
-
slug: React.ReactElement<any, string | React.JSXElementConstructor<any
|
|
344
|
+
slug: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
|
|
345
345
|
onClick: (event: any) => void;
|
|
346
346
|
};
|
|
347
347
|
/**
|
|
@@ -6,12 +6,12 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import PropTypes from 'prop-types';
|
|
8
8
|
import { ChangeEvent, FocusEvent, ReactNode } from 'react';
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
import { SearchProps } from '../Search';
|
|
10
|
+
import { InternationalProps } from '../../types/common';
|
|
11
|
+
export type TableToolbarTranslationKey = 'carbon.table.toolbar.search.label' | 'carbon.table.toolbar.search.placeholder';
|
|
12
|
+
type ExcludedInheritedProps = 'defaultValue' | 'labelText' | 'onBlur' | 'onChange' | 'onExpand' | 'onFocus' | 'tabIndex';
|
|
13
|
+
export type TableToolbarSearchHandleExpand = (event: FocusEvent<HTMLInputElement>, newValue?: boolean) => void;
|
|
14
|
+
export interface TableToolbarSearchProps extends Omit<SearchProps, ExcludedInheritedProps>, InternationalProps<TableToolbarTranslationKey> {
|
|
15
15
|
/**
|
|
16
16
|
* Specifies if the search should initially render in an expanded state
|
|
17
17
|
*/
|
|
@@ -20,70 +20,43 @@ export interface TableToolbarSearchProps {
|
|
|
20
20
|
* Provide an optional default value for the Search component
|
|
21
21
|
*/
|
|
22
22
|
defaultValue?: string;
|
|
23
|
-
/**
|
|
24
|
-
* Specifies if the search should be disabled
|
|
25
|
-
*/
|
|
26
|
-
disabled?: boolean;
|
|
27
23
|
/**
|
|
28
24
|
* Specifies if the search should expand
|
|
29
25
|
*/
|
|
30
26
|
expanded?: boolean;
|
|
31
|
-
/**
|
|
32
|
-
* Provide an optional id for the search container
|
|
33
|
-
*/
|
|
34
|
-
id?: string;
|
|
35
27
|
/**
|
|
36
28
|
* Provide an optional label text for the Search component icon
|
|
37
29
|
*/
|
|
38
|
-
labelText?:
|
|
30
|
+
labelText?: ReactNode;
|
|
39
31
|
/**
|
|
40
32
|
* Provide an optional function to be called when the search input loses focus, this will be
|
|
41
33
|
* passed the event as the first parameter and a function to handle the expanding of the search
|
|
42
34
|
* input as the second
|
|
43
35
|
*/
|
|
44
|
-
onBlur
|
|
36
|
+
onBlur?(event: FocusEvent<HTMLInputElement>, handleExpand: TableToolbarSearchHandleExpand): void;
|
|
45
37
|
/**
|
|
46
38
|
* Provide an optional hook that is called each time the input is updated
|
|
47
39
|
*/
|
|
48
40
|
onChange?: (event: '' | ChangeEvent<HTMLInputElement>, value?: string) => void;
|
|
49
|
-
/**
|
|
50
|
-
* Optional callback called when the search value is cleared.
|
|
51
|
-
*/
|
|
52
|
-
onClear?: () => void;
|
|
53
41
|
/**
|
|
54
42
|
* Provide an optional hook that is called each time the input is expanded
|
|
55
43
|
*/
|
|
56
|
-
onExpand
|
|
44
|
+
onExpand?(event: FocusEvent<HTMLInputElement>, newExpand: boolean): void;
|
|
57
45
|
/**
|
|
58
46
|
* Provide an optional function to be called when the search input gains focus, this will be
|
|
59
47
|
* passed the event as the first parameter and a function to handle the expanding of the search
|
|
60
48
|
* input as the second.
|
|
61
49
|
*/
|
|
62
|
-
onFocus
|
|
50
|
+
onFocus?(event: FocusEvent<HTMLInputElement>, handleExpand: TableToolbarSearchHandleExpand): void;
|
|
63
51
|
/**
|
|
64
|
-
* Whether the search should be allowed to expand
|
|
52
|
+
* Whether the search should be allowed to expand.
|
|
65
53
|
*/
|
|
66
54
|
persistent?: boolean;
|
|
67
|
-
/**
|
|
68
|
-
* Provide an optional placeholder text for the Search component
|
|
69
|
-
*/
|
|
70
|
-
placeholder?: string;
|
|
71
55
|
/**
|
|
72
56
|
* Provide an optional className for the overall container of the Search
|
|
73
57
|
*/
|
|
74
58
|
searchContainerClass?: string;
|
|
75
|
-
/**
|
|
76
|
-
* Specify the size of the Search
|
|
77
|
-
*/
|
|
78
|
-
size?: 'sm' | 'md' | 'lg';
|
|
79
|
-
/**
|
|
80
|
-
* Optional prop to specify the tabIndex of the <Search> (in expanded state) or the container (in collapsed state)
|
|
81
|
-
*/
|
|
82
59
|
tabIndex?: number | string;
|
|
83
|
-
/**
|
|
84
|
-
* Provide custom text for the component for each translation id
|
|
85
|
-
*/
|
|
86
|
-
translateWithId?: (id: string) => string;
|
|
87
60
|
}
|
|
88
61
|
declare const TableToolbarSearch: {
|
|
89
62
|
({ className, searchContainerClass, onChange: onChangeProp, onClear, translateWithId: t, placeholder, labelText, expanded: expandedProp, defaultExpanded, defaultValue, disabled, onExpand, persistent, id, onBlur, onFocus, size, tabIndex, ...rest }: TableToolbarSearchProps): import("react/jsx-runtime").JSX.Element;
|
|
@@ -58,7 +58,7 @@ const TableToolbarSearch = _ref => {
|
|
|
58
58
|
const {
|
|
59
59
|
current: controlled
|
|
60
60
|
} = React.useRef(expandedProp !== undefined);
|
|
61
|
-
const [expandedState, setExpandedState] = React.useState(defaultExpanded || defaultValue);
|
|
61
|
+
const [expandedState, setExpandedState] = React.useState(Boolean(defaultExpanded || defaultValue));
|
|
62
62
|
const expanded = controlled ? expandedProp : expandedState;
|
|
63
63
|
const [value, setValue] = React.useState(defaultValue || '');
|
|
64
64
|
const uniqueId = React.useMemo(getInstanceId, []);
|
|
@@ -21,6 +21,8 @@ var ButtonSet = require('../ButtonSet/ButtonSet.js');
|
|
|
21
21
|
var InlineLoading = require('../InlineLoading/InlineLoading.js');
|
|
22
22
|
var requiredIfGivenPropIsTruthy = require('../../prop-types/requiredIfGivenPropIsTruthy.js');
|
|
23
23
|
var wrapFocus = require('../../internal/wrapFocus.js');
|
|
24
|
+
var debounce = require('lodash.debounce');
|
|
25
|
+
var useIsomorphicEffect = require('../../internal/useIsomorphicEffect.js');
|
|
24
26
|
var setupGetInstanceId = require('../../tools/setupGetInstanceId.js');
|
|
25
27
|
var usePrefix = require('../../internal/usePrefix.js');
|
|
26
28
|
var index = require('../IconButton/index.js');
|
|
@@ -35,6 +37,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
|
|
|
35
37
|
var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
|
|
36
38
|
var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
|
|
37
39
|
var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
|
|
40
|
+
var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
|
|
38
41
|
|
|
39
42
|
const getInstanceId = setupGetInstanceId["default"]();
|
|
40
43
|
const ModalSizes = ['xs', 'sm', 'md', 'lg'];
|
|
@@ -76,9 +79,11 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
|
|
|
76
79
|
const prefix = usePrefix.usePrefix();
|
|
77
80
|
const button = React.useRef(null);
|
|
78
81
|
const secondaryButton = React.useRef();
|
|
82
|
+
const contentRef = React.useRef(null);
|
|
79
83
|
const innerModal = React.useRef(null);
|
|
80
84
|
const startTrap = React.useRef(null);
|
|
81
85
|
const endTrap = React.useRef(null);
|
|
86
|
+
const [isScrollable, setIsScrollable] = React.useState(false);
|
|
82
87
|
const modalInstanceId = `modal-${getInstanceId()}`;
|
|
83
88
|
const modalLabelId = `${prefix}--modal-header__label--${modalInstanceId}`;
|
|
84
89
|
const modalHeadingId = `${prefix}--modal-header__heading--${modalInstanceId}`;
|
|
@@ -144,7 +149,7 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
|
|
|
144
149
|
[`${prefix}--modal-container--full-width`]: isFullWidth
|
|
145
150
|
});
|
|
146
151
|
const contentClasses = cx__default["default"](`${prefix}--modal-content`, {
|
|
147
|
-
[`${prefix}--modal-scroll-content`]: hasScrollingContent
|
|
152
|
+
[`${prefix}--modal-scroll-content`]: hasScrollingContent || isScrollable
|
|
148
153
|
});
|
|
149
154
|
const footerClasses = cx__default["default"](`${prefix}--modal-footer`, {
|
|
150
155
|
[`${prefix}--modal-footer--three-button`]: Array.isArray(secondaryButtons) && secondaryButtons.length === 2
|
|
@@ -156,7 +161,7 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
|
|
|
156
161
|
const modalHeadingStr = asStringOrUndefined(modalHeading);
|
|
157
162
|
const ariaLabel = modalLabelStr || ariaLabelProp || modalAriaLabel || modalHeadingStr;
|
|
158
163
|
const getAriaLabelledBy = modalLabel ? modalLabelId : modalHeadingId;
|
|
159
|
-
const hasScrollingContentProps = hasScrollingContent ? {
|
|
164
|
+
const hasScrollingContentProps = hasScrollingContent || isScrollable ? {
|
|
160
165
|
tabIndex: 0,
|
|
161
166
|
role: 'region',
|
|
162
167
|
'aria-label': ariaLabel,
|
|
@@ -204,6 +209,22 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
|
|
|
204
209
|
focusButton(innerModal.current);
|
|
205
210
|
}
|
|
206
211
|
}, [open, selectorPrimaryFocus, danger, prefix]);
|
|
212
|
+
useIsomorphicEffect["default"](() => {
|
|
213
|
+
if (contentRef.current) {
|
|
214
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
215
|
+
}
|
|
216
|
+
function handler() {
|
|
217
|
+
if (contentRef.current) {
|
|
218
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
const debouncedHandler = debounce__default["default"](handler, 200);
|
|
222
|
+
window.addEventListener('resize', debouncedHandler);
|
|
223
|
+
return () => {
|
|
224
|
+
debouncedHandler.cancel();
|
|
225
|
+
window.removeEventListener('resize', debouncedHandler);
|
|
226
|
+
};
|
|
227
|
+
}, []);
|
|
207
228
|
|
|
208
229
|
// Slug is always size `lg`
|
|
209
230
|
let normalizedSlug;
|
|
@@ -247,11 +268,10 @@ const Modal = /*#__PURE__*/React__default["default"].forwardRef(function Modal(_
|
|
|
247
268
|
id: modalHeadingId,
|
|
248
269
|
className: `${prefix}--modal-header__heading`
|
|
249
270
|
}, modalHeading), normalizedSlug, !passiveModal && modalButton), /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
|
|
271
|
+
ref: contentRef,
|
|
250
272
|
id: modalBodyId,
|
|
251
273
|
className: contentClasses
|
|
252
|
-
}, hasScrollingContentProps), children),
|
|
253
|
-
className: `${prefix}--modal-content--overflow-indicator`
|
|
254
|
-
}), !passiveModal && /*#__PURE__*/React__default["default"].createElement(ButtonSet["default"], {
|
|
274
|
+
}, hasScrollingContentProps), children), !passiveModal && /*#__PURE__*/React__default["default"].createElement(ButtonSet["default"], {
|
|
255
275
|
className: footerClasses,
|
|
256
276
|
"aria-busy": loadingActive
|
|
257
277
|
}, Array.isArray(secondaryButtons) && secondaryButtons.length <= 2 ? secondaryButtons.map((_ref3, i) => {
|
|
@@ -51,6 +51,10 @@ interface MultiSelectSortingProps<ItemType> {
|
|
|
51
51
|
}
|
|
52
52
|
export interface MultiSelectProps<ItemType> extends MultiSelectSortingProps<ItemType>, InternationalProps<'close.menu' | 'open.menu' | 'clear.all' | 'clear.selection'> {
|
|
53
53
|
className?: string;
|
|
54
|
+
/**
|
|
55
|
+
* Specify the text that should be read for screen readers that describes that all items are deleted
|
|
56
|
+
*/
|
|
57
|
+
clearAnnouncement?: string;
|
|
54
58
|
/**
|
|
55
59
|
* Specify the text that should be read for screen readers that describes total items selected
|
|
56
60
|
*/
|
|
@@ -82,6 +82,7 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
|
|
|
82
82
|
sortItems = sorting.defaultSortItems,
|
|
83
83
|
compareItems = sorting.defaultCompareItems,
|
|
84
84
|
clearSelectionText = 'To clear selection, press Delete or Backspace',
|
|
85
|
+
clearAnnouncement = 'all items have been cleared',
|
|
85
86
|
clearSelectionDescription = 'Total items selected: ',
|
|
86
87
|
light,
|
|
87
88
|
invalid,
|
|
@@ -113,6 +114,7 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
|
|
|
113
114
|
const [isOpen, setIsOpen] = React.useState(open || false);
|
|
114
115
|
const [prevOpenProp, setPrevOpenProp] = React.useState(open);
|
|
115
116
|
const [topItems, setTopItems] = React.useState([]);
|
|
117
|
+
const [itemsCleared, setItemsCleared] = React.useState(false);
|
|
116
118
|
const {
|
|
117
119
|
selectedItems: controlledSelectedItems,
|
|
118
120
|
onItemChange,
|
|
@@ -159,7 +161,11 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
|
|
|
159
161
|
clearSelection();
|
|
160
162
|
e.stopPropagation();
|
|
161
163
|
}
|
|
164
|
+
if (!isOpen && match.match(e, keys.Delete) && selectedItems.length > 0) {
|
|
165
|
+
setItemsCleared(true);
|
|
166
|
+
}
|
|
162
167
|
if ((match.match(e, keys.Space) || match.match(e, keys.ArrowDown) || match.match(e, keys.Enter)) && !isOpen) {
|
|
168
|
+
setItemsCleared(false);
|
|
163
169
|
setIsOpenWrapper(true);
|
|
164
170
|
}
|
|
165
171
|
}
|
|
@@ -394,7 +400,10 @@ const MultiSelect = /*#__PURE__*/React__default["default"].forwardRef((_ref, ref
|
|
|
394
400
|
}, itemToElement ? /*#__PURE__*/React__default["default"].createElement(ItemToElement, _rollupPluginBabelHelpers["extends"]({
|
|
395
401
|
key: itemProps.id
|
|
396
402
|
}, item)) : itemText)));
|
|
397
|
-
}))
|
|
403
|
+
})), itemsCleared && /*#__PURE__*/React__default["default"].createElement("span", {
|
|
404
|
+
"aria-live": "assertive",
|
|
405
|
+
"aria-label": clearAnnouncement
|
|
406
|
+
})), !inline && !invalid && !warn && helperText && /*#__PURE__*/React__default["default"].createElement("div", {
|
|
398
407
|
id: helperId,
|
|
399
408
|
className: helperClasses
|
|
400
409
|
}, helperText));
|
|
@@ -140,7 +140,7 @@ const NumberInput = /*#__PURE__*/React__default["default"].forwardRef(function N
|
|
|
140
140
|
return;
|
|
141
141
|
}
|
|
142
142
|
const state = {
|
|
143
|
-
value: event.target.value,
|
|
143
|
+
value: Number(event.target.value),
|
|
144
144
|
direction: value < event.target.value ? 'up' : 'down'
|
|
145
145
|
};
|
|
146
146
|
setValue(state.value);
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright IBM Corp. 2020
|
|
3
|
+
*
|
|
4
|
+
* This source code is licensed under the Apache-2.0 license found in the
|
|
5
|
+
* LICENSE file in the root directory of this source tree.
|
|
6
|
+
*/
|
|
7
|
+
import React from 'react';
|
|
8
|
+
interface PaginationNavProps extends Omit<React.HTMLAttributes<HTMLElement>, 'onChange'> {
|
|
9
|
+
/**
|
|
10
|
+
* Additional CSS class names.
|
|
11
|
+
*/
|
|
12
|
+
className?: string;
|
|
13
|
+
/**
|
|
14
|
+
* If true, the '...' pagination overflow will not render page links between the first and last rendered buttons.
|
|
15
|
+
* Set this to true if you are having performance problems with large data sets.
|
|
16
|
+
*/
|
|
17
|
+
disableOverflow?: boolean;
|
|
18
|
+
/**
|
|
19
|
+
* The number of items to be shown.
|
|
20
|
+
*/
|
|
21
|
+
itemsShown?: number;
|
|
22
|
+
/**
|
|
23
|
+
* Whether user should be able to loop through the items when reaching first / last.
|
|
24
|
+
*/
|
|
25
|
+
loop?: boolean;
|
|
26
|
+
/**
|
|
27
|
+
* The callback function called when the current page changes.
|
|
28
|
+
*/
|
|
29
|
+
onChange?: (data: number) => void;
|
|
30
|
+
/**
|
|
31
|
+
* The index of current page.
|
|
32
|
+
*/
|
|
33
|
+
page?: number;
|
|
34
|
+
/**
|
|
35
|
+
* The total number of items.
|
|
36
|
+
*/
|
|
37
|
+
totalItems?: number;
|
|
38
|
+
/**
|
|
39
|
+
* Specify a custom translation function that takes in a message identifier
|
|
40
|
+
* and returns the localized string for the message
|
|
41
|
+
*/
|
|
42
|
+
translateWithId?: (id: string) => string;
|
|
43
|
+
}
|
|
44
|
+
declare const PaginationNav: React.ForwardRefExoticComponent<PaginationNavProps & React.RefAttributes<HTMLElement>>;
|
|
45
|
+
export default PaginationNav;
|
|
@@ -37,23 +37,23 @@ function translateWithId(messageId) {
|
|
|
37
37
|
|
|
38
38
|
// https://reactjs.org/docs/hooks-faq.html#how-to-get-the-previous-props-or-state
|
|
39
39
|
function usePrevious(value) {
|
|
40
|
-
const ref = React.useRef();
|
|
40
|
+
const ref = React.useRef(null);
|
|
41
41
|
React.useEffect(() => {
|
|
42
42
|
ref.current = value;
|
|
43
43
|
});
|
|
44
44
|
return ref.current;
|
|
45
45
|
}
|
|
46
|
-
function
|
|
46
|
+
function calculateCuts(page, totalItems, itemsDisplayedOnPage) {
|
|
47
47
|
let splitPoint = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
|
|
48
|
-
if (
|
|
48
|
+
if (itemsDisplayedOnPage >= totalItems) {
|
|
49
49
|
return {
|
|
50
50
|
front: 0,
|
|
51
51
|
back: 0
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
|
-
const split = splitPoint || Math.ceil(
|
|
54
|
+
const split = splitPoint || Math.ceil(itemsDisplayedOnPage / 2) - 1;
|
|
55
55
|
let frontHidden = page + 1 - split;
|
|
56
|
-
let backHidden = totalItems - page - (
|
|
56
|
+
let backHidden = totalItems - page - (itemsDisplayedOnPage - split) + 1;
|
|
57
57
|
if (frontHidden <= 1) {
|
|
58
58
|
backHidden -= frontHidden <= 0 ? Math.abs(frontHidden) + 1 : 0;
|
|
59
59
|
frontHidden = 0;
|
|
@@ -103,15 +103,15 @@ function PaginationItem(_ref2) {
|
|
|
103
103
|
}),
|
|
104
104
|
onClick: onClick,
|
|
105
105
|
"data-page": page,
|
|
106
|
-
"aria-current": isActive ? 'page' :
|
|
106
|
+
"aria-current": isActive ? 'page' : undefined
|
|
107
107
|
}, /*#__PURE__*/React__default["default"].createElement("span", {
|
|
108
108
|
className: `${prefix}--pagination-nav__accessibility-label`
|
|
109
109
|
}, isActive ? `${t('carbon.pagination-nav.active')}, ${itemLabel}` : itemLabel), page));
|
|
110
110
|
}
|
|
111
111
|
function PaginationOverflow(_ref3) {
|
|
112
112
|
let {
|
|
113
|
-
fromIndex,
|
|
114
|
-
count,
|
|
113
|
+
fromIndex = NaN,
|
|
114
|
+
count = NaN,
|
|
115
115
|
onSelect,
|
|
116
116
|
// eslint-disable-next-line react/prop-types
|
|
117
117
|
disableOverflow,
|
|
@@ -145,7 +145,7 @@ function PaginationOverflow(_ref3) {
|
|
|
145
145
|
"aria-label": `Select ${t('carbon.pagination-nav.item')} number`,
|
|
146
146
|
onChange: e => {
|
|
147
147
|
const index = Number(e.target.value);
|
|
148
|
-
onSelect(index);
|
|
148
|
+
onSelect?.(index);
|
|
149
149
|
}
|
|
150
150
|
}, _option || (_option = /*#__PURE__*/React__default["default"].createElement("option", {
|
|
151
151
|
value: "",
|
|
@@ -165,7 +165,7 @@ function PaginationOverflow(_ref3) {
|
|
|
165
165
|
page: fromIndex + 1,
|
|
166
166
|
translateWithId: t,
|
|
167
167
|
onClick: () => {
|
|
168
|
-
onSelect(fromIndex);
|
|
168
|
+
onSelect?.(fromIndex);
|
|
169
169
|
}
|
|
170
170
|
});
|
|
171
171
|
}
|
|
@@ -175,7 +175,7 @@ const PaginationNav = /*#__PURE__*/React__default["default"].forwardRef(function
|
|
|
175
175
|
let {
|
|
176
176
|
className,
|
|
177
177
|
onChange = () => {},
|
|
178
|
-
totalItems,
|
|
178
|
+
totalItems = NaN,
|
|
179
179
|
disableOverflow,
|
|
180
180
|
itemsShown = 10,
|
|
181
181
|
page = 0,
|
|
@@ -184,8 +184,8 @@ const PaginationNav = /*#__PURE__*/React__default["default"].forwardRef(function
|
|
|
184
184
|
...rest
|
|
185
185
|
} = _ref4;
|
|
186
186
|
const [currentPage, setCurrentPage] = React.useState(page);
|
|
187
|
-
const [
|
|
188
|
-
const [cuts, setCuts] = React.useState(
|
|
187
|
+
const [itemsDisplayedOnPage, setItemsDisplayedOnPage] = React.useState(itemsShown >= 4 ? itemsShown : 4);
|
|
188
|
+
const [cuts, setCuts] = React.useState(calculateCuts(currentPage, totalItems, itemsDisplayedOnPage));
|
|
189
189
|
const prevPage = usePrevious(currentPage);
|
|
190
190
|
const prefix = usePrefix.usePrefix();
|
|
191
191
|
const [isOverflowDisabled, setIsOverFlowDisabled] = React.useState(disableOverflow);
|
|
@@ -216,7 +216,7 @@ const PaginationNav = /*#__PURE__*/React__default["default"].forwardRef(function
|
|
|
216
216
|
}
|
|
217
217
|
}
|
|
218
218
|
function pageWouldBeHidden(page) {
|
|
219
|
-
const startOffset =
|
|
219
|
+
const startOffset = itemsDisplayedOnPage <= 4 && page > 1 ? 0 : 1;
|
|
220
220
|
const wouldBeHiddenInFront = page >= startOffset && page <= cuts.front;
|
|
221
221
|
const wouldBeHiddenInBack = page >= totalItems - cuts.back - 1 && page <= totalItems - 2;
|
|
222
222
|
return wouldBeHiddenInFront || wouldBeHiddenInBack;
|
|
@@ -229,20 +229,20 @@ const PaginationNav = /*#__PURE__*/React__default["default"].forwardRef(function
|
|
|
229
229
|
|
|
230
230
|
// re-calculate cuts if props.totalItems or props.itemsShown change
|
|
231
231
|
React.useEffect(() => {
|
|
232
|
-
|
|
233
|
-
setCuts(
|
|
232
|
+
setItemsDisplayedOnPage(itemsShown >= 4 ? itemsShown : 4);
|
|
233
|
+
setCuts(calculateCuts(currentPage, totalItems, itemsShown));
|
|
234
234
|
}, [totalItems, itemsShown]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
235
235
|
|
|
236
236
|
// update cuts if necessary whenever currentPage changes
|
|
237
237
|
React.useEffect(() => {
|
|
238
238
|
if (pageWouldBeHidden(currentPage)) {
|
|
239
|
-
const delta = currentPage - prevPage || 0;
|
|
239
|
+
const delta = currentPage - (prevPage || 0);
|
|
240
240
|
if (delta > 0) {
|
|
241
|
-
const splitPoint =
|
|
242
|
-
setCuts(
|
|
241
|
+
const splitPoint = itemsDisplayedOnPage - 3;
|
|
242
|
+
setCuts(calculateCuts(currentPage, totalItems, itemsDisplayedOnPage, splitPoint));
|
|
243
243
|
} else {
|
|
244
|
-
const splitPoint =
|
|
245
|
-
setCuts(
|
|
244
|
+
const splitPoint = itemsDisplayedOnPage > 4 ? 2 : 1;
|
|
245
|
+
setCuts(calculateCuts(currentPage, totalItems, itemsDisplayedOnPage, splitPoint));
|
|
246
246
|
}
|
|
247
247
|
}
|
|
248
248
|
}, [currentPage]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
@@ -253,7 +253,7 @@ const PaginationNav = /*#__PURE__*/React__default["default"].forwardRef(function
|
|
|
253
253
|
const classNames = cx__default["default"](`${prefix}--pagination-nav`, className);
|
|
254
254
|
const backwardButtonDisabled = !loop && currentPage === 0;
|
|
255
255
|
const forwardButtonDisabled = !loop && currentPage === totalItems - 1;
|
|
256
|
-
const startOffset =
|
|
256
|
+
const startOffset = itemsDisplayedOnPage <= 4 && currentPage > 1 ? 0 : 1;
|
|
257
257
|
return /*#__PURE__*/React__default["default"].createElement("nav", _rollupPluginBabelHelpers["extends"]({
|
|
258
258
|
className: classNames,
|
|
259
259
|
ref: ref
|
|
@@ -269,7 +269,7 @@ const PaginationNav = /*#__PURE__*/React__default["default"].forwardRef(function
|
|
|
269
269
|
}),
|
|
270
270
|
// render first item if at least 5 items can be displayed or
|
|
271
271
|
// 4 items can be displayed and the current page is either 0 or 1
|
|
272
|
-
(
|
|
272
|
+
(itemsDisplayedOnPage >= 5 || itemsDisplayedOnPage <= 4 && currentPage <= 1) && /*#__PURE__*/React__default["default"].createElement(PaginationItem, {
|
|
273
273
|
page: 1,
|
|
274
274
|
translateWithId: t,
|
|
275
275
|
isActive: currentPage === 0,
|
|
@@ -411,6 +411,5 @@ PaginationNav.propTypes = {
|
|
|
411
411
|
*/
|
|
412
412
|
translateWithId: PropTypes__default["default"].func
|
|
413
413
|
};
|
|
414
|
-
var PaginationNav$1 = PaginationNav;
|
|
415
414
|
|
|
416
|
-
exports["default"] = PaginationNav
|
|
415
|
+
exports["default"] = PaginationNav;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright IBM Corp. 2020
|
|
3
|
+
*
|
|
4
|
+
* This source code is licensed under the Apache-2.0 license found in the
|
|
5
|
+
* LICENSE file in the root directory of this source tree.
|
|
6
|
+
*/
|
|
7
|
+
import PaginationNav from './PaginationNav';
|
|
8
|
+
export default PaginationNav;
|
|
9
|
+
export { PaginationNav };
|
|
@@ -239,7 +239,8 @@ function TabList(_ref2) {
|
|
|
239
239
|
function onKeyDown(event) {
|
|
240
240
|
if (match.matches(event, [keys.ArrowRight, keys.ArrowLeft, keys.Home, keys.End])) {
|
|
241
241
|
event.preventDefault();
|
|
242
|
-
const
|
|
242
|
+
const filtredTabs = tabs.current.filter(tab => tab !== null);
|
|
243
|
+
const activeTabs = filtredTabs.filter(tab => !tab.disabled);
|
|
243
244
|
const currentIndex = activeTabs.indexOf(tabs.current[activation === 'automatic' ? selectedIndex : activeIndex]);
|
|
244
245
|
const nextIndex = tabs.current.indexOf(activeTabs[getNextIndex(event, activeTabs.length, currentIndex)]);
|
|
245
246
|
if (activation === 'automatic') {
|
|
@@ -180,11 +180,11 @@ export interface TileAboveTheFoldContentProps {
|
|
|
180
180
|
*/
|
|
181
181
|
children?: ReactNode;
|
|
182
182
|
}
|
|
183
|
-
export declare const TileAboveTheFoldContent: React.ForwardRefExoticComponent<TileAboveTheFoldContentProps & React.RefAttributes<
|
|
183
|
+
export declare const TileAboveTheFoldContent: React.ForwardRefExoticComponent<TileAboveTheFoldContentProps & React.RefAttributes<HTMLDivElement>>;
|
|
184
184
|
export interface TileBelowTheFoldContentProps {
|
|
185
185
|
/**
|
|
186
186
|
* The child nodes.
|
|
187
187
|
*/
|
|
188
188
|
children?: ReactNode;
|
|
189
189
|
}
|
|
190
|
-
export declare const TileBelowTheFoldContent: React.ForwardRefExoticComponent<TileBelowTheFoldContentProps & React.RefAttributes<
|
|
190
|
+
export declare const TileBelowTheFoldContent: React.ForwardRefExoticComponent<TileBelowTheFoldContentProps & React.RefAttributes<HTMLDivElement>>;
|
|
@@ -614,7 +614,7 @@ const TileAboveTheFoldContent = /*#__PURE__*/React__default["default"].forwardRe
|
|
|
614
614
|
children
|
|
615
615
|
} = _ref5;
|
|
616
616
|
const prefix = usePrefix.usePrefix();
|
|
617
|
-
return /*#__PURE__*/React__default["default"].createElement("
|
|
617
|
+
return /*#__PURE__*/React__default["default"].createElement("div", {
|
|
618
618
|
ref: ref,
|
|
619
619
|
className: `${prefix}--tile-content__above-the-fold`
|
|
620
620
|
}, children);
|
|
@@ -631,7 +631,7 @@ const TileBelowTheFoldContent = /*#__PURE__*/React__default["default"].forwardRe
|
|
|
631
631
|
children
|
|
632
632
|
} = _ref6;
|
|
633
633
|
const prefix = usePrefix.usePrefix();
|
|
634
|
-
return /*#__PURE__*/React__default["default"].createElement("
|
|
634
|
+
return /*#__PURE__*/React__default["default"].createElement("div", {
|
|
635
635
|
ref: ref,
|
|
636
636
|
className: `${prefix}--tile-content__below-the-fold`
|
|
637
637
|
}, children);
|
package/lib/index.js
CHANGED
|
@@ -76,6 +76,7 @@ var OrderedList = require('./components/OrderedList/OrderedList.js');
|
|
|
76
76
|
var index$9 = require('./components/OverflowMenu/index.js');
|
|
77
77
|
var OverflowMenuItem = require('./components/OverflowMenuItem/OverflowMenuItem.js');
|
|
78
78
|
var Pagination_Skeleton = require('./components/Pagination/Pagination.Skeleton.js');
|
|
79
|
+
var PaginationNav = require('./components/PaginationNav/PaginationNav.js');
|
|
79
80
|
var PrimaryButton = require('./components/PrimaryButton/PrimaryButton.js');
|
|
80
81
|
var ProgressIndicator_Skeleton = require('./components/ProgressIndicator/ProgressIndicator.Skeleton.js');
|
|
81
82
|
var ProgressIndicator = require('./components/ProgressIndicator/ProgressIndicator.js');
|
|
@@ -222,7 +223,6 @@ var TableToolbarMenu = require('./components/DataTable/TableToolbarMenu.js');
|
|
|
222
223
|
var FilterableMultiSelect = require('./components/MultiSelect/FilterableMultiSelect.js');
|
|
223
224
|
var MultiSelect = require('./components/MultiSelect/MultiSelect.js');
|
|
224
225
|
var Pagination$1 = require('./components/Pagination/Pagination.js');
|
|
225
|
-
var PaginationNav = require('./components/PaginationNav/PaginationNav.js');
|
|
226
226
|
var ControlledPasswordInput = require('./components/TextInput/ControlledPasswordInput.js');
|
|
227
227
|
var PasswordInput = require('./components/TextInput/PasswordInput.js');
|
|
228
228
|
var RadioTile = require('./components/RadioTile/RadioTile.js');
|
|
@@ -310,6 +310,7 @@ exports.OrderedList = OrderedList["default"];
|
|
|
310
310
|
exports.OverflowMenu = index$9["default"];
|
|
311
311
|
exports.OverflowMenuItem = OverflowMenuItem["default"];
|
|
312
312
|
exports.PaginationSkeleton = Pagination_Skeleton["default"];
|
|
313
|
+
exports.PaginationNav = PaginationNav["default"];
|
|
313
314
|
exports.PrimaryButton = PrimaryButton["default"];
|
|
314
315
|
exports.ProgressIndicatorSkeleton = ProgressIndicator_Skeleton["default"];
|
|
315
316
|
exports.ProgressIndicator = ProgressIndicator.ProgressIndicator;
|
|
@@ -488,7 +489,6 @@ exports.TableToolbarMenu = TableToolbarMenu["default"];
|
|
|
488
489
|
exports.FilterableMultiSelect = FilterableMultiSelect["default"];
|
|
489
490
|
exports.MultiSelect = MultiSelect["default"];
|
|
490
491
|
exports.Pagination = Pagination$1["default"];
|
|
491
|
-
exports.PaginationNav = PaginationNav["default"];
|
|
492
492
|
exports.ControlledPasswordInput = ControlledPasswordInput["default"];
|
|
493
493
|
exports.PasswordInput = PasswordInput["default"];
|
|
494
494
|
exports.RadioTile = RadioTile["default"];
|