@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
|
@@ -6,11 +6,14 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
|
|
9
|
-
import React__default, {
|
|
9
|
+
import React__default, { useRef, useState, useEffect } from 'react';
|
|
10
10
|
import { isElement } from 'react-is';
|
|
11
11
|
import PropTypes from 'prop-types';
|
|
12
12
|
import { ModalHeader } from './ModalHeader.js';
|
|
13
13
|
import { ModalFooter } from './ModalFooter.js';
|
|
14
|
+
import debounce from 'lodash.debounce';
|
|
15
|
+
import useIsomorphicEffect from '../../internal/useIsomorphicEffect.js';
|
|
16
|
+
import mergeRefs from '../../tools/mergeRefs.js';
|
|
14
17
|
import cx from 'classnames';
|
|
15
18
|
import toggleClass from '../../tools/toggleClass.js';
|
|
16
19
|
import requiredIfGivenPropIsTruthy from '../../prop-types/requiredIfGivenPropIsTruthy.js';
|
|
@@ -28,18 +31,39 @@ const ModalBody = /*#__PURE__*/React__default.forwardRef(function ModalBody(_ref
|
|
|
28
31
|
...rest
|
|
29
32
|
} = _ref;
|
|
30
33
|
const prefix = usePrefix();
|
|
31
|
-
const
|
|
32
|
-
const
|
|
34
|
+
const contentRef = useRef(null);
|
|
35
|
+
const [isScrollable, setIsScrollable] = useState(false);
|
|
36
|
+
const contentClass = cx({
|
|
37
|
+
[`${prefix}--modal-content`]: true,
|
|
38
|
+
[`${prefix}--modal-content--with-form`]: hasForm,
|
|
39
|
+
[`${prefix}--modal-scroll-content`]: hasScrollingContent || isScrollable,
|
|
40
|
+
customClassName
|
|
41
|
+
});
|
|
42
|
+
useIsomorphicEffect(() => {
|
|
43
|
+
if (contentRef.current) {
|
|
44
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
45
|
+
}
|
|
46
|
+
function handler() {
|
|
47
|
+
if (contentRef.current) {
|
|
48
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
const debouncedHandler = debounce(handler, 200);
|
|
52
|
+
window.addEventListener('resize', debouncedHandler);
|
|
53
|
+
return () => {
|
|
54
|
+
debouncedHandler.cancel();
|
|
55
|
+
window.removeEventListener('resize', debouncedHandler);
|
|
56
|
+
};
|
|
57
|
+
}, []);
|
|
58
|
+
const hasScrollingContentProps = hasScrollingContent || isScrollable ? {
|
|
33
59
|
tabIndex: 0,
|
|
34
60
|
role: 'region'
|
|
35
61
|
} : {};
|
|
36
|
-
return /*#__PURE__*/React__default.createElement(
|
|
62
|
+
return /*#__PURE__*/React__default.createElement("div", _extends({
|
|
37
63
|
className: contentClass
|
|
38
64
|
}, hasScrollingContentProps, rest, {
|
|
39
|
-
ref: ref
|
|
40
|
-
}), children)
|
|
41
|
-
className: `${prefix}--modal-content--overflow-indicator`
|
|
42
|
-
}));
|
|
65
|
+
ref: mergeRefs(contentRef, ref)
|
|
66
|
+
}), children);
|
|
43
67
|
});
|
|
44
68
|
ModalBody.propTypes = {
|
|
45
69
|
/**
|
|
@@ -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;
|
|
@@ -48,7 +48,7 @@ const TableToolbarSearch = _ref => {
|
|
|
48
48
|
const {
|
|
49
49
|
current: controlled
|
|
50
50
|
} = useRef(expandedProp !== undefined);
|
|
51
|
-
const [expandedState, setExpandedState] = useState(defaultExpanded || defaultValue);
|
|
51
|
+
const [expandedState, setExpandedState] = useState(Boolean(defaultExpanded || defaultValue));
|
|
52
52
|
const expanded = controlled ? expandedProp : expandedState;
|
|
53
53
|
const [value, setValue] = useState(defaultValue || '');
|
|
54
54
|
const uniqueId = useMemo(getInstanceId, []);
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
|
|
8
8
|
import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
|
|
9
9
|
import PropTypes from 'prop-types';
|
|
10
|
-
import React__default, { useRef, useEffect } from 'react';
|
|
10
|
+
import React__default, { useRef, useState, useEffect } from 'react';
|
|
11
11
|
import cx from 'classnames';
|
|
12
12
|
import { Close } from '@carbon/icons-react';
|
|
13
13
|
import toggleClass from '../../tools/toggleClass.js';
|
|
@@ -17,6 +17,8 @@ import ButtonSet from '../ButtonSet/ButtonSet.js';
|
|
|
17
17
|
import InlineLoading from '../InlineLoading/InlineLoading.js';
|
|
18
18
|
import requiredIfGivenPropIsTruthy from '../../prop-types/requiredIfGivenPropIsTruthy.js';
|
|
19
19
|
import wrapFocus, { elementOrParentIsFloatingMenu } from '../../internal/wrapFocus.js';
|
|
20
|
+
import debounce from 'lodash.debounce';
|
|
21
|
+
import useIsomorphicEffect from '../../internal/useIsomorphicEffect.js';
|
|
20
22
|
import setupGetInstanceId from '../../tools/setupGetInstanceId.js';
|
|
21
23
|
import { usePrefix } from '../../internal/usePrefix.js';
|
|
22
24
|
import { IconButton } from '../IconButton/index.js';
|
|
@@ -66,9 +68,11 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
|
|
|
66
68
|
const prefix = usePrefix();
|
|
67
69
|
const button = useRef(null);
|
|
68
70
|
const secondaryButton = useRef();
|
|
71
|
+
const contentRef = useRef(null);
|
|
69
72
|
const innerModal = useRef(null);
|
|
70
73
|
const startTrap = useRef(null);
|
|
71
74
|
const endTrap = useRef(null);
|
|
75
|
+
const [isScrollable, setIsScrollable] = useState(false);
|
|
72
76
|
const modalInstanceId = `modal-${getInstanceId()}`;
|
|
73
77
|
const modalLabelId = `${prefix}--modal-header__label--${modalInstanceId}`;
|
|
74
78
|
const modalHeadingId = `${prefix}--modal-header__heading--${modalInstanceId}`;
|
|
@@ -134,7 +138,7 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
|
|
|
134
138
|
[`${prefix}--modal-container--full-width`]: isFullWidth
|
|
135
139
|
});
|
|
136
140
|
const contentClasses = cx(`${prefix}--modal-content`, {
|
|
137
|
-
[`${prefix}--modal-scroll-content`]: hasScrollingContent
|
|
141
|
+
[`${prefix}--modal-scroll-content`]: hasScrollingContent || isScrollable
|
|
138
142
|
});
|
|
139
143
|
const footerClasses = cx(`${prefix}--modal-footer`, {
|
|
140
144
|
[`${prefix}--modal-footer--three-button`]: Array.isArray(secondaryButtons) && secondaryButtons.length === 2
|
|
@@ -146,7 +150,7 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
|
|
|
146
150
|
const modalHeadingStr = asStringOrUndefined(modalHeading);
|
|
147
151
|
const ariaLabel = modalLabelStr || ariaLabelProp || modalAriaLabel || modalHeadingStr;
|
|
148
152
|
const getAriaLabelledBy = modalLabel ? modalLabelId : modalHeadingId;
|
|
149
|
-
const hasScrollingContentProps = hasScrollingContent ? {
|
|
153
|
+
const hasScrollingContentProps = hasScrollingContent || isScrollable ? {
|
|
150
154
|
tabIndex: 0,
|
|
151
155
|
role: 'region',
|
|
152
156
|
'aria-label': ariaLabel,
|
|
@@ -194,6 +198,22 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
|
|
|
194
198
|
focusButton(innerModal.current);
|
|
195
199
|
}
|
|
196
200
|
}, [open, selectorPrimaryFocus, danger, prefix]);
|
|
201
|
+
useIsomorphicEffect(() => {
|
|
202
|
+
if (contentRef.current) {
|
|
203
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
204
|
+
}
|
|
205
|
+
function handler() {
|
|
206
|
+
if (contentRef.current) {
|
|
207
|
+
setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
const debouncedHandler = debounce(handler, 200);
|
|
211
|
+
window.addEventListener('resize', debouncedHandler);
|
|
212
|
+
return () => {
|
|
213
|
+
debouncedHandler.cancel();
|
|
214
|
+
window.removeEventListener('resize', debouncedHandler);
|
|
215
|
+
};
|
|
216
|
+
}, []);
|
|
197
217
|
|
|
198
218
|
// Slug is always size `lg`
|
|
199
219
|
let normalizedSlug;
|
|
@@ -237,11 +257,10 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
|
|
|
237
257
|
id: modalHeadingId,
|
|
238
258
|
className: `${prefix}--modal-header__heading`
|
|
239
259
|
}, modalHeading), normalizedSlug, !passiveModal && modalButton), /*#__PURE__*/React__default.createElement("div", _extends({
|
|
260
|
+
ref: contentRef,
|
|
240
261
|
id: modalBodyId,
|
|
241
262
|
className: contentClasses
|
|
242
|
-
}, hasScrollingContentProps), children),
|
|
243
|
-
className: `${prefix}--modal-content--overflow-indicator`
|
|
244
|
-
}), !passiveModal && /*#__PURE__*/React__default.createElement(ButtonSet, {
|
|
263
|
+
}, hasScrollingContentProps), children), !passiveModal && /*#__PURE__*/React__default.createElement(ButtonSet, {
|
|
245
264
|
className: footerClasses,
|
|
246
265
|
"aria-busy": loadingActive
|
|
247
266
|
}, 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
|
*/
|
|
@@ -71,6 +71,7 @@ const MultiSelect = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
|
|
|
71
71
|
sortItems = defaultSortItems,
|
|
72
72
|
compareItems = defaultCompareItems,
|
|
73
73
|
clearSelectionText = 'To clear selection, press Delete or Backspace',
|
|
74
|
+
clearAnnouncement = 'all items have been cleared',
|
|
74
75
|
clearSelectionDescription = 'Total items selected: ',
|
|
75
76
|
light,
|
|
76
77
|
invalid,
|
|
@@ -102,6 +103,7 @@ const MultiSelect = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
|
|
|
102
103
|
const [isOpen, setIsOpen] = useState(open || false);
|
|
103
104
|
const [prevOpenProp, setPrevOpenProp] = useState(open);
|
|
104
105
|
const [topItems, setTopItems] = useState([]);
|
|
106
|
+
const [itemsCleared, setItemsCleared] = useState(false);
|
|
105
107
|
const {
|
|
106
108
|
selectedItems: controlledSelectedItems,
|
|
107
109
|
onItemChange,
|
|
@@ -148,7 +150,11 @@ const MultiSelect = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
|
|
|
148
150
|
clearSelection();
|
|
149
151
|
e.stopPropagation();
|
|
150
152
|
}
|
|
153
|
+
if (!isOpen && match(e, Delete) && selectedItems.length > 0) {
|
|
154
|
+
setItemsCleared(true);
|
|
155
|
+
}
|
|
151
156
|
if ((match(e, Space) || match(e, ArrowDown) || match(e, Enter)) && !isOpen) {
|
|
157
|
+
setItemsCleared(false);
|
|
152
158
|
setIsOpenWrapper(true);
|
|
153
159
|
}
|
|
154
160
|
}
|
|
@@ -383,7 +389,10 @@ const MultiSelect = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
|
|
|
383
389
|
}, itemToElement ? /*#__PURE__*/React__default.createElement(ItemToElement, _extends({
|
|
384
390
|
key: itemProps.id
|
|
385
391
|
}, item)) : itemText)));
|
|
386
|
-
}))
|
|
392
|
+
})), itemsCleared && /*#__PURE__*/React__default.createElement("span", {
|
|
393
|
+
"aria-live": "assertive",
|
|
394
|
+
"aria-label": clearAnnouncement
|
|
395
|
+
})), !inline && !invalid && !warn && helperText && /*#__PURE__*/React__default.createElement("div", {
|
|
387
396
|
id: helperId,
|
|
388
397
|
className: helperClasses
|
|
389
398
|
}, helperText));
|
|
@@ -130,7 +130,7 @@ const NumberInput = /*#__PURE__*/React__default.forwardRef(function NumberInput(
|
|
|
130
130
|
return;
|
|
131
131
|
}
|
|
132
132
|
const state = {
|
|
133
|
-
value: event.target.value,
|
|
133
|
+
value: Number(event.target.value),
|
|
134
134
|
direction: value < event.target.value ? 'up' : 'down'
|
|
135
135
|
};
|
|
136
136
|
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;
|
|
@@ -27,23 +27,23 @@ function translateWithId(messageId) {
|
|
|
27
27
|
|
|
28
28
|
// https://reactjs.org/docs/hooks-faq.html#how-to-get-the-previous-props-or-state
|
|
29
29
|
function usePrevious(value) {
|
|
30
|
-
const ref = useRef();
|
|
30
|
+
const ref = useRef(null);
|
|
31
31
|
useEffect(() => {
|
|
32
32
|
ref.current = value;
|
|
33
33
|
});
|
|
34
34
|
return ref.current;
|
|
35
35
|
}
|
|
36
|
-
function
|
|
36
|
+
function calculateCuts(page, totalItems, itemsDisplayedOnPage) {
|
|
37
37
|
let splitPoint = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
|
|
38
|
-
if (
|
|
38
|
+
if (itemsDisplayedOnPage >= totalItems) {
|
|
39
39
|
return {
|
|
40
40
|
front: 0,
|
|
41
41
|
back: 0
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
|
-
const split = splitPoint || Math.ceil(
|
|
44
|
+
const split = splitPoint || Math.ceil(itemsDisplayedOnPage / 2) - 1;
|
|
45
45
|
let frontHidden = page + 1 - split;
|
|
46
|
-
let backHidden = totalItems - page - (
|
|
46
|
+
let backHidden = totalItems - page - (itemsDisplayedOnPage - split) + 1;
|
|
47
47
|
if (frontHidden <= 1) {
|
|
48
48
|
backHidden -= frontHidden <= 0 ? Math.abs(frontHidden) + 1 : 0;
|
|
49
49
|
frontHidden = 0;
|
|
@@ -93,15 +93,15 @@ function PaginationItem(_ref2) {
|
|
|
93
93
|
}),
|
|
94
94
|
onClick: onClick,
|
|
95
95
|
"data-page": page,
|
|
96
|
-
"aria-current": isActive ? 'page' :
|
|
96
|
+
"aria-current": isActive ? 'page' : undefined
|
|
97
97
|
}, /*#__PURE__*/React__default.createElement("span", {
|
|
98
98
|
className: `${prefix}--pagination-nav__accessibility-label`
|
|
99
99
|
}, isActive ? `${t('carbon.pagination-nav.active')}, ${itemLabel}` : itemLabel), page));
|
|
100
100
|
}
|
|
101
101
|
function PaginationOverflow(_ref3) {
|
|
102
102
|
let {
|
|
103
|
-
fromIndex,
|
|
104
|
-
count,
|
|
103
|
+
fromIndex = NaN,
|
|
104
|
+
count = NaN,
|
|
105
105
|
onSelect,
|
|
106
106
|
// eslint-disable-next-line react/prop-types
|
|
107
107
|
disableOverflow,
|
|
@@ -135,7 +135,7 @@ function PaginationOverflow(_ref3) {
|
|
|
135
135
|
"aria-label": `Select ${t('carbon.pagination-nav.item')} number`,
|
|
136
136
|
onChange: e => {
|
|
137
137
|
const index = Number(e.target.value);
|
|
138
|
-
onSelect(index);
|
|
138
|
+
onSelect?.(index);
|
|
139
139
|
}
|
|
140
140
|
}, _option || (_option = /*#__PURE__*/React__default.createElement("option", {
|
|
141
141
|
value: "",
|
|
@@ -155,7 +155,7 @@ function PaginationOverflow(_ref3) {
|
|
|
155
155
|
page: fromIndex + 1,
|
|
156
156
|
translateWithId: t,
|
|
157
157
|
onClick: () => {
|
|
158
|
-
onSelect(fromIndex);
|
|
158
|
+
onSelect?.(fromIndex);
|
|
159
159
|
}
|
|
160
160
|
});
|
|
161
161
|
}
|
|
@@ -165,7 +165,7 @@ const PaginationNav = /*#__PURE__*/React__default.forwardRef(function Pagination
|
|
|
165
165
|
let {
|
|
166
166
|
className,
|
|
167
167
|
onChange = () => {},
|
|
168
|
-
totalItems,
|
|
168
|
+
totalItems = NaN,
|
|
169
169
|
disableOverflow,
|
|
170
170
|
itemsShown = 10,
|
|
171
171
|
page = 0,
|
|
@@ -174,8 +174,8 @@ const PaginationNav = /*#__PURE__*/React__default.forwardRef(function Pagination
|
|
|
174
174
|
...rest
|
|
175
175
|
} = _ref4;
|
|
176
176
|
const [currentPage, setCurrentPage] = useState(page);
|
|
177
|
-
const [
|
|
178
|
-
const [cuts, setCuts] = useState(
|
|
177
|
+
const [itemsDisplayedOnPage, setItemsDisplayedOnPage] = useState(itemsShown >= 4 ? itemsShown : 4);
|
|
178
|
+
const [cuts, setCuts] = useState(calculateCuts(currentPage, totalItems, itemsDisplayedOnPage));
|
|
179
179
|
const prevPage = usePrevious(currentPage);
|
|
180
180
|
const prefix = usePrefix();
|
|
181
181
|
const [isOverflowDisabled, setIsOverFlowDisabled] = useState(disableOverflow);
|
|
@@ -206,7 +206,7 @@ const PaginationNav = /*#__PURE__*/React__default.forwardRef(function Pagination
|
|
|
206
206
|
}
|
|
207
207
|
}
|
|
208
208
|
function pageWouldBeHidden(page) {
|
|
209
|
-
const startOffset =
|
|
209
|
+
const startOffset = itemsDisplayedOnPage <= 4 && page > 1 ? 0 : 1;
|
|
210
210
|
const wouldBeHiddenInFront = page >= startOffset && page <= cuts.front;
|
|
211
211
|
const wouldBeHiddenInBack = page >= totalItems - cuts.back - 1 && page <= totalItems - 2;
|
|
212
212
|
return wouldBeHiddenInFront || wouldBeHiddenInBack;
|
|
@@ -219,20 +219,20 @@ const PaginationNav = /*#__PURE__*/React__default.forwardRef(function Pagination
|
|
|
219
219
|
|
|
220
220
|
// re-calculate cuts if props.totalItems or props.itemsShown change
|
|
221
221
|
useEffect(() => {
|
|
222
|
-
|
|
223
|
-
setCuts(
|
|
222
|
+
setItemsDisplayedOnPage(itemsShown >= 4 ? itemsShown : 4);
|
|
223
|
+
setCuts(calculateCuts(currentPage, totalItems, itemsShown));
|
|
224
224
|
}, [totalItems, itemsShown]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
225
225
|
|
|
226
226
|
// update cuts if necessary whenever currentPage changes
|
|
227
227
|
useEffect(() => {
|
|
228
228
|
if (pageWouldBeHidden(currentPage)) {
|
|
229
|
-
const delta = currentPage - prevPage || 0;
|
|
229
|
+
const delta = currentPage - (prevPage || 0);
|
|
230
230
|
if (delta > 0) {
|
|
231
|
-
const splitPoint =
|
|
232
|
-
setCuts(
|
|
231
|
+
const splitPoint = itemsDisplayedOnPage - 3;
|
|
232
|
+
setCuts(calculateCuts(currentPage, totalItems, itemsDisplayedOnPage, splitPoint));
|
|
233
233
|
} else {
|
|
234
|
-
const splitPoint =
|
|
235
|
-
setCuts(
|
|
234
|
+
const splitPoint = itemsDisplayedOnPage > 4 ? 2 : 1;
|
|
235
|
+
setCuts(calculateCuts(currentPage, totalItems, itemsDisplayedOnPage, splitPoint));
|
|
236
236
|
}
|
|
237
237
|
}
|
|
238
238
|
}, [currentPage]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
@@ -243,7 +243,7 @@ const PaginationNav = /*#__PURE__*/React__default.forwardRef(function Pagination
|
|
|
243
243
|
const classNames = cx(`${prefix}--pagination-nav`, className);
|
|
244
244
|
const backwardButtonDisabled = !loop && currentPage === 0;
|
|
245
245
|
const forwardButtonDisabled = !loop && currentPage === totalItems - 1;
|
|
246
|
-
const startOffset =
|
|
246
|
+
const startOffset = itemsDisplayedOnPage <= 4 && currentPage > 1 ? 0 : 1;
|
|
247
247
|
return /*#__PURE__*/React__default.createElement("nav", _extends({
|
|
248
248
|
className: classNames,
|
|
249
249
|
ref: ref
|
|
@@ -259,7 +259,7 @@ const PaginationNav = /*#__PURE__*/React__default.forwardRef(function Pagination
|
|
|
259
259
|
}),
|
|
260
260
|
// render first item if at least 5 items can be displayed or
|
|
261
261
|
// 4 items can be displayed and the current page is either 0 or 1
|
|
262
|
-
(
|
|
262
|
+
(itemsDisplayedOnPage >= 5 || itemsDisplayedOnPage <= 4 && currentPage <= 1) && /*#__PURE__*/React__default.createElement(PaginationItem, {
|
|
263
263
|
page: 1,
|
|
264
264
|
translateWithId: t,
|
|
265
265
|
isActive: currentPage === 0,
|
|
@@ -401,6 +401,5 @@ PaginationNav.propTypes = {
|
|
|
401
401
|
*/
|
|
402
402
|
translateWithId: PropTypes.func
|
|
403
403
|
};
|
|
404
|
-
var PaginationNav$1 = PaginationNav;
|
|
405
404
|
|
|
406
|
-
export { PaginationNav
|
|
405
|
+
export { PaginationNav as default };
|
|
@@ -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 };
|
|
@@ -228,7 +228,8 @@ function TabList(_ref2) {
|
|
|
228
228
|
function onKeyDown(event) {
|
|
229
229
|
if (matches(event, [ArrowRight, ArrowLeft, Home, End])) {
|
|
230
230
|
event.preventDefault();
|
|
231
|
-
const
|
|
231
|
+
const filtredTabs = tabs.current.filter(tab => tab !== null);
|
|
232
|
+
const activeTabs = filtredTabs.filter(tab => !tab.disabled);
|
|
232
233
|
const currentIndex = activeTabs.indexOf(tabs.current[activation === 'automatic' ? selectedIndex : activeIndex]);
|
|
233
234
|
const nextIndex = tabs.current.indexOf(activeTabs[getNextIndex(event, activeTabs.length, currentIndex)]);
|
|
234
235
|
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>>;
|
|
@@ -604,7 +604,7 @@ const TileAboveTheFoldContent = /*#__PURE__*/React__default.forwardRef(function
|
|
|
604
604
|
children
|
|
605
605
|
} = _ref5;
|
|
606
606
|
const prefix = usePrefix();
|
|
607
|
-
return /*#__PURE__*/React__default.createElement("
|
|
607
|
+
return /*#__PURE__*/React__default.createElement("div", {
|
|
608
608
|
ref: ref,
|
|
609
609
|
className: `${prefix}--tile-content__above-the-fold`
|
|
610
610
|
}, children);
|
|
@@ -621,7 +621,7 @@ const TileBelowTheFoldContent = /*#__PURE__*/React__default.forwardRef(function
|
|
|
621
621
|
children
|
|
622
622
|
} = _ref6;
|
|
623
623
|
const prefix = usePrefix();
|
|
624
|
-
return /*#__PURE__*/React__default.createElement("
|
|
624
|
+
return /*#__PURE__*/React__default.createElement("div", {
|
|
625
625
|
ref: ref,
|
|
626
626
|
className: `${prefix}--tile-content__below-the-fold`
|
|
627
627
|
}, children);
|
package/es/index.js
CHANGED
|
@@ -72,6 +72,7 @@ export { default as OrderedList } from './components/OrderedList/OrderedList.js'
|
|
|
72
72
|
export { default as OverflowMenu } from './components/OverflowMenu/index.js';
|
|
73
73
|
export { default as OverflowMenuItem } from './components/OverflowMenuItem/OverflowMenuItem.js';
|
|
74
74
|
export { default as PaginationSkeleton } from './components/Pagination/Pagination.Skeleton.js';
|
|
75
|
+
export { default as PaginationNav } from './components/PaginationNav/PaginationNav.js';
|
|
75
76
|
export { default as PrimaryButton } from './components/PrimaryButton/PrimaryButton.js';
|
|
76
77
|
export { default as ProgressIndicatorSkeleton } from './components/ProgressIndicator/ProgressIndicator.Skeleton.js';
|
|
77
78
|
export { ProgressIndicator, ProgressStep } from './components/ProgressIndicator/ProgressIndicator.js';
|
|
@@ -218,7 +219,6 @@ export { default as TableToolbarMenu } from './components/DataTable/TableToolbar
|
|
|
218
219
|
export { default as FilterableMultiSelect } from './components/MultiSelect/FilterableMultiSelect.js';
|
|
219
220
|
export { default as MultiSelect } from './components/MultiSelect/MultiSelect.js';
|
|
220
221
|
export { default as Pagination } from './components/Pagination/Pagination.js';
|
|
221
|
-
export { default as PaginationNav } from './components/PaginationNav/PaginationNav.js';
|
|
222
222
|
export { default as ControlledPasswordInput } from './components/TextInput/ControlledPasswordInput.js';
|
|
223
223
|
export { default as PasswordInput } from './components/TextInput/PasswordInput.js';
|
|
224
224
|
export { default as RadioTile } from './components/RadioTile/RadioTile.js';
|