Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: replace deprecated retrieveComponentStyles with componentStyles utility #1989

Merged
merged 3 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { ThemeProps, DefaultTheme, css } from 'styled-components';
import { retrieveComponentStyles, DEFAULT_THEME, getColorV8 } from '@zendeskgarden/react-theming';
import { componentStyles, DEFAULT_THEME, getColorV8 } from '@zendeskgarden/react-theming';

const COMPONENT_ID = '{{pluralize (lowercase component)}}.{{lowercase component}}';

Expand Down Expand Up @@ -63,13 +63,13 @@ export const Styled{{capitalize component}} = styled.div.attrs<IStyled{{capitali
white-space: nowrap;
box-sizing: border-box;

${props => sizeStyles(props)};
${sizeStyles};

&:focus {
outline: none;
}

${props => colorStyles(props)};
${colorStyles};

& > * {
display: block;
Expand All @@ -78,7 +78,7 @@ export const Styled{{capitalize component}} = styled.div.attrs<IStyled{{capitali
text-overflow: ellipsis;
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;

Styled{{capitalize component}}.defaultProps = {
Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledAccordion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.accordion';

export const StyledAccordion = styled.div.attrs({
'data-garden-id': COMPONENT_ID,
'data-garden-version': PACKAGE_VERSION
})`
${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledButton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { css, ThemeProps, DefaultTheme } from 'styled-components';
import { getLineHeight, retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { getLineHeight, componentStyles, getColor } from '@zendeskgarden/react-theming';

export const COMPONENT_ID = 'accordions.button';

Expand Down Expand Up @@ -72,5 +72,5 @@ export const StyledButton = styled.button.attrs<IStyledButton>({
cursor: ${props => (props.$isCollapsible || !props.$isExpanded) && 'pointer'};
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledHeader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles, focusStyles } from '@zendeskgarden/react-theming';
import { componentStyles, focusStyles } from '@zendeskgarden/react-theming';
import { StyledButton } from './StyledButton';

const COMPONENT_ID = 'accordions.header';
Expand Down Expand Up @@ -36,5 +36,5 @@ export const StyledHeader = styled.div.attrs<IStyledHeader>({
selector: `&:has(${StyledButton}:focus-visible)`
})}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';
import { StyledPanel } from './StyledPanel';

const COMPONENT_ID = 'accordions.step_inner_panel';
Expand All @@ -32,5 +32,5 @@ export const StyledInnerPanel = styled.div.attrs({
visibility: visible;
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import styled, { css, ThemeProps, DefaultTheme } from 'styled-components';
import {
getLineHeight,
retrieveComponentStyles,
componentStyles,
DEFAULT_THEME,
getColor
} from '@zendeskgarden/react-theming';
Expand Down Expand Up @@ -70,7 +70,7 @@ export const StyledPanel = styled.section.attrs<IStyledPanel>({
${sizeStyles}
${colorStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;

StyledPanel.defaultProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { css, ThemeProps, DefaultTheme, DataAttributes } from 'styled-components';
import { retrieveComponentStyles, StyledBaseIcon, getColor } from '@zendeskgarden/react-theming';
import { componentStyles, StyledBaseIcon, getColor } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.rotate_icon';

Expand Down Expand Up @@ -58,5 +58,5 @@ export const StyledRotateIcon = styled(StyledBaseIcon).attrs<DataAttributes>({

${colorStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';
import { StyledPanel } from './StyledPanel';

const COMPONENT_ID = 'accordions.section';
Expand All @@ -19,5 +19,5 @@ export const StyledSection = styled.div.attrs({
border: none;
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { css, ThemeProps, DefaultTheme } from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.step_content';

Expand Down Expand Up @@ -42,5 +42,5 @@ export const StyledContent = styled.div.attrs<IStyledContent>({

${sizeStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledIcon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { css, ThemeProps, DefaultTheme } from 'styled-components';
import { getLineHeight, retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { getLineHeight, componentStyles, getColor } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.step_icon';

Expand Down Expand Up @@ -75,5 +75,5 @@ export const StyledIcon = styled.div.attrs<IStyledIcon>({
${sizeStyles}
${colorStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { ThemeProps, DefaultTheme } from 'styled-components';
import { getLineHeight, retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { getLineHeight, componentStyles, getColor } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.step_inner_content';

Expand All @@ -23,5 +23,5 @@ export const StyledInnerContent = styled.div.attrs({
color: ${({ theme }) => getColor({ theme, variable: 'foreground.default' })};
font-size: ${props => props.theme.fontSizes.md};

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledLabel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { getLineHeight, retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { getLineHeight, componentStyles, getColor } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.step_label';

Expand Down Expand Up @@ -34,5 +34,5 @@ export const StyledLabel = styled.div.attrs<IStyledLabelProps>({
font-size: ${props => props.theme.fontSizes.md};
font-weight: ${props => props.$isActive && 600};

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledStep.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { componentStyles, getColor } from '@zendeskgarden/react-theming';
import { StyledContent } from './StyledContent';
import { StyledLine } from './StyledLine';

Expand Down Expand Up @@ -37,5 +37,5 @@ export const StyledStep = styled.li.attrs<IStyledStep>({
border-color: ${({ theme }) => getColor({ theme, variable: 'border.default' })};
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledStepper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'accordions.stepper';

Expand All @@ -26,5 +26,5 @@ export const StyledStepper = styled.ol.attrs<IStyledStepper>({
padding: 0; /* [1] */
list-style: none; /* [1] */

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/timeline/StyledContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'timeline.content';

Expand All @@ -16,5 +16,5 @@ export const StyledTimelineContent = styled.div.attrs({
})`
flex: 1;
padding: ${props => `${props.theme.space.base * 5}px ${props.theme.space.base * 4}px`};
${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/timeline/StyledItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { css } from 'styled-components';
import { getLineHeight, retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { getLineHeight, componentStyles, getColor } from '@zendeskgarden/react-theming';
import { StyledSeparator } from './StyledSeparator';
import { StyledTimelineContent } from './StyledContent';
import { StyledOppositeContent } from './StyledOppositeContent';
Expand Down Expand Up @@ -57,5 +57,5 @@ export const StyledTimelineItem = styled.li.attrs({
}
`}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/timeline/StyledItemIcon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import styled, { DataAttributes, DefaultTheme, ThemeProps, css } from 'styled-components';
import { math } from 'polished';
import { retrieveComponentStyles, StyledBaseIcon, getColor } from '@zendeskgarden/react-theming';
import { componentStyles, StyledBaseIcon, getColor } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'timeline.icon';

Expand Down Expand Up @@ -49,5 +49,5 @@ export const StyledItemIcon = styled(StyledBaseIcon).attrs<DataAttributes>({

${colorStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'timeline.opposite.content';

Expand All @@ -17,5 +17,5 @@ export const StyledOppositeContent = styled.div.attrs({
flex: 1;
padding: ${props => `${props.theme.space.base * 5}px ${props.theme.space.base * 4}px`};
text-align: ${props => (props.theme.rtl ? 'left' : 'right')};
${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/timeline/StyledSeparator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles, getColor } from '@zendeskgarden/react-theming';
import { componentStyles, getColor } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'timeline.content.separator';

Expand All @@ -27,5 +27,5 @@ export const StyledSeparator = styled.div.attrs({
content: '';
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/timeline/StyledTimeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'timeline';

Expand All @@ -20,5 +20,5 @@ export const StyledTimeline = styled.ol.attrs({
margin: 0; /* [1] */
padding: 0; /* [1] */
list-style: none; /* [1] */
${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
4 changes: 2 additions & 2 deletions packages/avatars/src/styled/StyledAvatar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { css, ThemeProps, keyframes, DefaultTheme } from 'styled-components';
import { retrieveComponentStyles, DEFAULT_THEME, getColor } from '@zendeskgarden/react-theming';
import { componentStyles, DEFAULT_THEME, getColor } from '@zendeskgarden/react-theming';
import { math } from 'polished';

import { IAvatarProps, SIZE } from '../types';
Expand Down Expand Up @@ -229,7 +229,7 @@ export const StyledAvatar = styled.figure.attrs({
${badgeStyles};
}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;

StyledAvatar.defaultProps = {
Expand Down
4 changes: 2 additions & 2 deletions packages/avatars/src/styled/StyledStandaloneStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { ThemeProps, DefaultTheme } from 'styled-components';
import { retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { componentStyles } from '@zendeskgarden/react-theming';

import { TRANSITION_DURATION } from './utility';

Expand All @@ -22,5 +22,5 @@ export const StyledStandaloneStatus = styled.figure.attrs({
margin: 0;
box-sizing: content-box;

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import styled, { ThemeProps, DefaultTheme, css } from 'styled-components';
import { getLineHeight, retrieveComponentStyles } from '@zendeskgarden/react-theming';
import { getLineHeight, componentStyles } from '@zendeskgarden/react-theming';

const COMPONENT_ID = 'avatars.status-indicator.caption';

Expand All @@ -28,5 +28,5 @@ export const StyledStandaloneStatusCaption = styled.figcaption.attrs({
})<ThemeProps<DefaultTheme>>`
${sizeStyles}

${props => retrieveComponentStyles(COMPONENT_ID, props)};
${componentStyles};
`;
Loading
Loading