From bbf3e61e7e4da1847e5edf1a36e5cd1c8ab95ef5 Mon Sep 17 00:00:00 2001 From: Jonathan Zempel Date: Thu, 22 Jul 2021 10:36:50 -0400 Subject: [PATCH 1/3] Correct cursor style handling --- .../pagination/src/styled/Pagination/StyledPageBase.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/pagination/src/styled/Pagination/StyledPageBase.ts b/packages/pagination/src/styled/Pagination/StyledPageBase.ts index 1c8971ec4e1..087247ef6c8 100644 --- a/packages/pagination/src/styled/Pagination/StyledPageBase.ts +++ b/packages/pagination/src/styled/Pagination/StyledPageBase.ts @@ -89,7 +89,7 @@ export const StyledPageBase = styled.li.attrs({ transition: box-shadow 0.1s ease-in-out, color 0.25s ease-in-out; visibility: ${props => props.hidden && 'hidden'}; border-radius: ${props => props.theme.borderRadii.md}; - cursor: ${props => !(props as any).disabled && 'pointer'}; + cursor: pointer; overflow: hidden; text-align: center; text-overflow: ellipsis; @@ -109,6 +109,11 @@ export const StyledPageBase = styled.li.attrs({ font-weight: ${props => props.theme.fontWeights.semibold}; } + :disabled, + [aria-disabled='true'] { + cursor: default; + } + ${props => colorStyles(props)}; ${props => retrieveComponentStyles(COMPONENT_ID, props)}; From 76b68fc94914955dcf08b7b566907db5c56f6a3e Mon Sep 17 00:00:00 2001 From: Jonathan Zempel Date: Thu, 22 Jul 2021 10:43:59 -0400 Subject: [PATCH 2/3] Fix background color transition --- packages/pagination/.size-snapshot.json | 16 ++++++++-------- .../src/styled/Pagination/StyledPageBase.ts | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/pagination/.size-snapshot.json b/packages/pagination/.size-snapshot.json index ff740b6a558..3b8c198e6d2 100644 --- a/packages/pagination/.size-snapshot.json +++ b/packages/pagination/.size-snapshot.json @@ -1,20 +1,20 @@ { "index.cjs.js": { - "bundled": 27107, - "minified": 17989, - "gzipped": 4538 + "bundled": 27098, + "minified": 17998, + "gzipped": 4535 }, "index.esm.js": { - "bundled": 25072, - "minified": 16368, - "gzipped": 4340, + "bundled": 25063, + "minified": 16377, + "gzipped": 4337, "treeshaked": { "rollup": { - "code": 13342, + "code": 13351, "import_statements": 490 }, "webpack": { - "code": 15142 + "code": 15151 } } } diff --git a/packages/pagination/src/styled/Pagination/StyledPageBase.ts b/packages/pagination/src/styled/Pagination/StyledPageBase.ts index 087247ef6c8..d322d014657 100644 --- a/packages/pagination/src/styled/Pagination/StyledPageBase.ts +++ b/packages/pagination/src/styled/Pagination/StyledPageBase.ts @@ -86,7 +86,11 @@ export const StyledPageBase = styled.li.attrs({ })` box-sizing: border-box; display: inline-block; - transition: box-shadow 0.1s ease-in-out, color 0.25s ease-in-out; + /* prettier-ignore */ + transition: + box-shadow 0.1s ease-in-out, + background-color 0.25s ease-in-out, + color 0.25s ease-in-out; visibility: ${props => props.hidden && 'hidden'}; border-radius: ${props => props.theme.borderRadii.md}; cursor: pointer; @@ -97,10 +101,6 @@ export const StyledPageBase = styled.li.attrs({ ${props => sizeStyles(props)}; - &:hover { - transition: background-color 0.25s ease-in-out; - } - &:focus { outline: none; } From 38c3b78c5e7c52e57f73286ee309561ecba7c6f3 Mon Sep 17 00:00:00 2001 From: Jonathan Zempel Date: Thu, 22 Jul 2021 10:46:26 -0400 Subject: [PATCH 3/3] Update size snapshot --- packages/pagination/.size-snapshot.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/pagination/.size-snapshot.json b/packages/pagination/.size-snapshot.json index 3b8c198e6d2..8c354c913f7 100644 --- a/packages/pagination/.size-snapshot.json +++ b/packages/pagination/.size-snapshot.json @@ -1,20 +1,20 @@ { "index.cjs.js": { - "bundled": 27098, - "minified": 17998, - "gzipped": 4535 + "bundled": 27078, + "minified": 17978, + "gzipped": 4529 }, "index.esm.js": { - "bundled": 25063, - "minified": 16377, - "gzipped": 4337, + "bundled": 25043, + "minified": 16357, + "gzipped": 4331, "treeshaked": { "rollup": { - "code": 13351, + "code": 13331, "import_statements": 490 }, "webpack": { - "code": 15151 + "code": 15131 } } }