diff --git a/packages/components/src/components/list/_list.scss b/packages/components/src/components/list/_list.scss index 047323e410a8..e53a2612b05b 100644 --- a/packages/components/src/components/list/_list.scss +++ b/packages/components/src/components/list/_list.scss @@ -46,8 +46,21 @@ margin-top: 0; } - .#{$prefix}--list--ordered { - list-style-type: decimal; + .#{$prefix}--list--ordered:not(.#{$prefix}--list--nested) { + counter-reset: item; + } + + .#{$prefix}--list--ordered:not(.#{$prefix}--list--nested) + > .#{$prefix}--list__item { + position: relative; + } + + .#{$prefix}--list--ordered:not(.#{$prefix}--list--nested) + > .#{$prefix}--list__item::before { + content: counter(item) '.'; + counter-increment: item; + position: absolute; + left: rem(-24px); } .#{$prefix}--list--ordered.#{$prefix}--list--nested { diff --git a/packages/components/src/components/text-input/_text-input.scss b/packages/components/src/components/text-input/_text-input.scss index 491b3791b9ac..c52f019894b7 100644 --- a/packages/components/src/components/text-input/_text-input.scss +++ b/packages/components/src/components/text-input/_text-input.scss @@ -44,6 +44,14 @@ } } + .#{$prefix}--text-input--large { + height: rem(48px); + } + + .#{$prefix}--text-input--small { + height: rem(32px); + } + .#{$prefix}--password-input { padding-right: $carbon--spacing-08; } diff --git a/packages/react/src/components/Breadcrumb/Breadcrumb.js b/packages/react/src/components/Breadcrumb/Breadcrumb.js index 0b5e01a2d08e..b45948271b69 100644 --- a/packages/react/src/components/Breadcrumb/Breadcrumb.js +++ b/packages/react/src/components/Breadcrumb/Breadcrumb.js @@ -17,6 +17,7 @@ const Breadcrumb = ({ children, className: customClassNameNav, noTrailingSlash, + ...rest }) => { const className = cx({ [`${prefix}--breadcrumb`]: true, @@ -26,7 +27,8 @@ const Breadcrumb = ({ return ( ); diff --git a/packages/react/src/components/DataTable/TableBatchActions.js b/packages/react/src/components/DataTable/TableBatchActions.js index 737ac444c9b3..7b557c8543cf 100644 --- a/packages/react/src/components/DataTable/TableBatchActions.js +++ b/packages/react/src/components/DataTable/TableBatchActions.js @@ -50,6 +50,7 @@ const TableBatchActions = ({ {children} diff --git a/packages/react/src/components/DataTable/TableToolbarSearch.js b/packages/react/src/components/DataTable/TableToolbarSearch.js index 5a6112c3d584..beeba0ef142d 100644 --- a/packages/react/src/components/DataTable/TableToolbarSearch.js +++ b/packages/react/src/components/DataTable/TableToolbarSearch.js @@ -36,6 +36,7 @@ const TableToolbarSearch = ({ persistent, persistant, id, + tabIndex, ...rest }) => { const { current: controlled } = useRef(expandedProp !== undefined); @@ -79,7 +80,7 @@ const TableToolbarSearch = ({ return (
handleExpand(event, true)} @@ -88,6 +89,7 @@ const TableToolbarSearch = ({ className={searchContainerClasses}> (in expanded state) or the container (in collapsed state) + */ + tabIndex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), + /** * Whether the search should be allowed to expand */ @@ -158,6 +165,7 @@ TableToolbarSearch.propTypes = { }; TableToolbarSearch.defaultProps = { + tabIndex: '0', translateWithId, persistent: false, }; diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap index 5655a80b2a38..c8d73a27a9b5 100644 --- a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap +++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap @@ -1818,6 +1818,7 @@ exports[`DataTable should render 1`] = ` id="custom-id" onChange={[Function]} persistent={true} + tabIndex="0" translateWithId={[Function]} /> diff --git a/packages/react/src/components/Pagination/Pagination.js b/packages/react/src/components/Pagination/Pagination.js index a6fa6fba294d..328fce98312f 100644 --- a/packages/react/src/components/Pagination/Pagination.js +++ b/packages/react/src/components/Pagination/Pagination.js @@ -311,7 +311,7 @@ export default class Pagination extends Component {
{pageInputDisabled ? null : ( */ @@ -188,6 +195,7 @@ TextInput.defaultProps = { invalidText: '', helperText: '', light: false, + size: '', }; export default TextInput;