Skip to content

Commit c596984

Browse files
feat(accordions, buttons, chrome, colorpickers, drag-drop, dropdowns, forms, grid, modals, notifications, pagination, tables, tabs, tags, typography): apply new focus styles for interactive elements (#1548)
1 parent 22d233b commit c596984

File tree

76 files changed

+788
-640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+788
-640
lines changed
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"index.esm.js": {
3-
"bundled": 35152,
4-
"minified": 25679,
5-
"gzipped": 5699,
3+
"bundled": 35205,
4+
"minified": 25722,
5+
"gzipped": 5727,
66
"treeshaked": {
77
"rollup": {
8-
"code": 19928,
9-
"import_statements": 666
8+
"code": 19976,
9+
"import_statements": 683
1010
},
1111
"webpack": {
12-
"code": 22180
12+
"code": 22211
1313
}
1414
}
1515
},
1616
"index.cjs.js": {
17-
"bundled": 38068,
18-
"minified": 28345,
19-
"gzipped": 5935
17+
"bundled": 38108,
18+
"minified": 28376,
19+
"gzipped": 5959
2020
}
2121
}

packages/accordions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"react-merge-refs": "^1.1.0"
3030
},
3131
"peerDependencies": {
32-
"@zendeskgarden/react-theming": "^8.1.0",
32+
"@zendeskgarden/react-theming": "^8.67.0",
3333
"react": ">=16.8.0",
3434
"react-dom": ">=16.8.0",
3535
"styled-components": "^4.2.0 || ^5.0.0"

packages/accordions/src/styled/accordion/StyledHeader.spec.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import React from 'react';
99
import { render } from 'garden-test-utils';
10-
import { getColor, DEFAULT_THEME } from '@zendeskgarden/react-theming';
1110
import { StyledHeader } from './StyledHeader';
1211

1312
describe('StyledHeader', () => {
@@ -17,14 +16,15 @@ describe('StyledHeader', () => {
1716
expect(container.firstChild).not.toHaveStyleRule('box-shadow');
1817
});
1918

20-
it('renders isFocused styling correctly', () => {
19+
it('renders focus styling correctly', () => {
2120
const { container } = render(<StyledHeader isFocused />);
2221

2322
expect(container.firstChild).toHaveStyleRule(
2423
'box-shadow',
25-
`${DEFAULT_THEME.shadows.md(
26-
getColor('primaryHue', 600, DEFAULT_THEME, 0.35) as string
27-
)} inset`
24+
'inset 0 0 0 1px #fff, inset 0 0 0 3px #1f73b7',
25+
{
26+
modifier: '&:focus-within'
27+
}
2828
);
2929
});
3030
});

packages/accordions/src/styled/accordion/StyledHeader.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import styled from 'styled-components';
9-
import { getColor, retrieveComponentStyles, DEFAULT_THEME } from '@zendeskgarden/react-theming';
9+
import { retrieveComponentStyles, DEFAULT_THEME, focusStyles } from '@zendeskgarden/react-theming';
1010

1111
const COMPONENT_ID = 'accordions.header';
1212

@@ -22,15 +22,21 @@ export const StyledHeader = styled.div.attrs<IStyledHeader>({
2222
})<IStyledHeader>`
2323
display: flex;
2424
align-items: center;
25-
box-shadow: ${props =>
26-
props.isFocused &&
27-
`${props.theme.shadows.md(getColor('primaryHue', 600, props.theme, 0.35) as string)} inset`};
25+
transition: box-shadow 0.1s ease-in-out;
2826
font-size: ${props => props.theme.fontSizes.md};
2927
3028
&:hover {
3129
cursor: ${props => (props.isCollapsible || !props.isExpanded) && 'pointer'};
3230
}
3331
32+
${props =>
33+
focusStyles({
34+
theme: props.theme,
35+
inset: true,
36+
condition: props.isFocused,
37+
selector: '&:focus-within'
38+
})}
39+
3440
${props => retrieveComponentStyles(COMPONENT_ID, props)};
3541
`;
3642

packages/breadcrumbs/demo/stories/BreadcrumbStory.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ export const BreadcrumbStory: Story<IArgs> = ({ children, ...args }) => (
1919
<Breadcrumb {...args}>
2020
{children.map((child, index) =>
2121
index < children.length - 1 ? (
22-
<Anchor key={index}>{child}</Anchor>
22+
<Anchor key={index} href="#">
23+
{child}
24+
</Anchor>
2325
) : (
2426
<span key={index}>{child}</span>
2527
)

packages/buttons/.size-snapshot.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"index.esm.js": {
3-
"bundled": 21655,
4-
"minified": 15523,
5-
"gzipped": 4223,
3+
"bundled": 22437,
4+
"minified": 15858,
5+
"gzipped": 4399,
66
"treeshaked": {
77
"rollup": {
8-
"code": 12552,
9-
"import_statements": 430
8+
"code": 12786,
9+
"import_statements": 498
1010
},
1111
"webpack": {
12-
"code": 13494
12+
"code": 13799
1313
}
1414
}
1515
},
1616
"index.cjs.js": {
17-
"bundled": 23685,
18-
"minified": 17349,
19-
"gzipped": 4467
17+
"bundled": 24510,
18+
"minified": 17730,
19+
"gzipped": 4645
2020
}
2121
}

packages/buttons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"prop-types": "^15.5.7"
2828
},
2929
"peerDependencies": {
30-
"@zendeskgarden/react-theming": "^8.1.0",
30+
"@zendeskgarden/react-theming": "^8.67.0",
3131
"react": ">=16.8.0",
3232
"react-dom": ">=16.8.0",
3333
"styled-components": "^4.2.0 || ^5.0.0"

0 commit comments

Comments
 (0)