Skip to content

feat: adds an internal getColorV8 utility #1754

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 25, 2024
Merged

feat: adds an internal getColorV8 utility #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7e7c07
Rename `getColor` => `getColorV8`
jzempel Mar 21, 2024
4947267
Retain `getColor` export
jzempel Mar 21, 2024
dc4c594
Revert demo updates
jzempel Mar 22, 2024
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
98 changes: 98 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/.template/src/styled/Styled{{capitalize component}}.ts
View file
Open in desktop
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, getColor } from '@zendeskgarden/react-theming';
import { retrieveComponentStyles, DEFAULT_THEME, getColorV8 } from '@zendeskgarden/react-theming';

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

Expand All @@ -15,12 +15,12 @@ export interface IStyled{{capitalize component}}Props extends ThemeProps<Default
}

const colorStyles = (props: IStyled{{capitalize component}}Props) => {
const backgroundColor = getColor('primaryHue', 600, props.theme, 0.08);
const borderColor = getColor('primaryHue', 600, props.theme);
const backgroundColor = getColorV8('primaryHue', 600, props.theme, 0.08);
const borderColor = getColorV8('primaryHue', 600, props.theme);
const foregroundColor = props.theme.colors.foreground;
const hoverBackgroundColor = getColor('primaryHue', 600, props.theme, 0.2);
const hoverBackgroundColor = getColorV8('primaryHue', 600, props.theme, 0.2);
const focusBoxShadow = props.theme.shadows.md(
getColor('primaryHue', 600, props.theme, 0.35) as string
getColorV8('primaryHue', 600, props.theme, 0.35) as string
);

return css`
Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledButton.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import { render, renderRtl } from 'garden-test-utils';
import { getColor, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { getColorV8, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { StyledButton } from './StyledButton';

describe('StyledButton', () => {
Expand Down Expand Up @@ -37,7 +37,7 @@ describe('StyledButton', () => {

expect(container.firstChild).toHaveStyleRule(
'color',
getColor('primaryHue', 600, DEFAULT_THEME)
getColorV8('primaryHue', 600, DEFAULT_THEME)
);

expect(container.firstChild).toHaveStyleRule('cursor', 'pointer', {
Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledButton.ts
View file
Open in desktop
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,
getColor,
getColorV8,
retrieveComponentStyles,
DEFAULT_THEME
} from '@zendeskgarden/react-theming';
Expand All @@ -27,7 +27,7 @@ const colorStyles = (props: ThemeProps<DefaultTheme> & IStyledButton) => {
let color = props.theme.colors.foreground;

if (showColor && props.isHovered) {
color = getColor('primaryHue', 600, props.theme)!;
color = getColorV8('primaryHue', 600, props.theme)!;
}

return css`
Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledPanel.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import { render } from 'garden-test-utils';
import { getColor, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { getColorV8, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { StyledPanel } from './StyledPanel';

describe('StyledPanel', () => {
Expand All @@ -19,7 +19,7 @@ describe('StyledPanel', () => {
expect(container.firstChild).toHaveStyleRule('border-bottom', `${DEFAULT_THEME.borders.sm}`);
expect(container.firstChild).toHaveStyleRule(
'border-bottom-color',
`${getColor('neutralHue', 300, DEFAULT_THEME)}`
`${getColorV8('neutralHue', 300, DEFAULT_THEME)}`
);
expect(container.firstChild).toHaveStyleRule(
'transition',
Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/accordion/StyledPanel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import styled, { css, ThemeProps, DefaultTheme } from 'styled-components';
import {
getColor,
getColorV8,
getLineHeight,
retrieveComponentStyles,
DEFAULT_THEME
Expand All @@ -27,7 +27,7 @@ const colorStyles = (props: IStyledPanel & ThemeProps<DefaultTheme>) => {
const { theme, isBare } = props;

return css`
border-bottom-color: ${isBare ? 'transparent' : getColor('neutralHue', 300, theme)};
border-bottom-color: ${isBare ? 'transparent' : getColorV8('neutralHue', 300, theme)};
`;
};

Expand Down
6 changes: 3 additions & 3 deletions packages/accordions/src/styled/accordion/StyledRotateIcon.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import React from 'react';
import { render, renderRtl } from 'garden-test-utils';
import { getColor, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { getColorV8, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { StyledRotateIcon } from './StyledRotateIcon';

describe('StyledRotateIcon', () => {
Expand All @@ -22,7 +22,7 @@ describe('StyledRotateIcon', () => {
expect(container.firstChild).toHaveStyleRule('padding', '20px');
expect(container.firstChild).toHaveStyleRule(
'color',
getColor('neutralHue', 600, DEFAULT_THEME)
getColorV8('neutralHue', 600, DEFAULT_THEME)
);
});

Expand Down Expand Up @@ -65,7 +65,7 @@ describe('StyledRotateIcon', () => {

expect(container.firstChild).toHaveStyleRule(
'color',
getColor('primaryHue', 600, DEFAULT_THEME)
getColorV8('primaryHue', 600, DEFAULT_THEME)
);
});
});
6 changes: 3 additions & 3 deletions packages/accordions/src/styled/accordion/StyledRotateIcon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

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

const COMPONENT_ID = 'accordions.rotate_icon';

Expand All @@ -17,10 +17,10 @@ interface IStyledRotateIcon {

const colorStyles = (props: ThemeProps<DefaultTheme> & any) => {
const showColor = props.isCollapsible || !props.isRotated;
let color = getColor('neutralHue', 600, props.theme);
let color = getColorV8('neutralHue', 600, props.theme);

if (showColor && props.isHovered) {
color = getColor('primaryHue', 600, props.theme);
color = getColorV8('primaryHue', 600, props.theme);
}

return css`
Expand Down
6 changes: 3 additions & 3 deletions packages/accordions/src/styled/stepper/StyledIcon.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { render } from 'garden-test-utils';
import { StyledIcon } from './StyledIcon';
import { getColor, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { getColorV8, DEFAULT_THEME } from '@zendeskgarden/react-theming';

describe('StyledIcon', () => {
it('renders default styles', () => {
Expand All @@ -17,7 +17,7 @@ describe('StyledIcon', () => {
expect(container.firstChild).toHaveStyleRule('color', DEFAULT_THEME.colors.foreground);
expect(container.firstChild).toHaveStyleRule(
'background',
getColor('neutralHue', 200, DEFAULT_THEME)
getColorV8('neutralHue', 200, DEFAULT_THEME)
);
expect(container.firstChild).toHaveStyleRule('margin-right', '12px');
expect(container.firstChild).not.toHaveStyleRule('margin-bottom');
Expand All @@ -28,7 +28,7 @@ describe('StyledIcon', () => {
expect(container.firstChild).toHaveStyleRule('color', DEFAULT_THEME.colors.background);
expect(container.firstChild).toHaveStyleRule(
'background',
getColor('neutralHue', 600, DEFAULT_THEME)
getColorV8('neutralHue', 600, DEFAULT_THEME)
);
});

Expand Down
6 changes: 3 additions & 3 deletions packages/accordions/src/styled/stepper/StyledIcon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import styled, { css, ThemeProps, DefaultTheme } from 'styled-components';
import {
getColor,
getColorV8,
getLineHeight,
retrieveComponentStyles,
DEFAULT_THEME
Expand Down Expand Up @@ -49,8 +49,8 @@ const sizeStyles = (props: IStyledIcon & ThemeProps<DefaultTheme>) => {
const colorStyles = (props: IStyledIcon & ThemeProps<DefaultTheme>) => {
return css`
background: ${props.isActive
? getColor('neutralHue', 600, props.theme)
: getColor('neutralHue', 200, props.theme)};
? getColorV8('neutralHue', 600, props.theme)
: getColorV8('neutralHue', 200, props.theme)};
color: ${props.isActive ? props.theme.colors.background : props.theme.colors.foreground};
`;
};
Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledLabel.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { render } from 'garden-test-utils';
import { StyledLabel } from './StyledLabel';
import { getColor, DEFAULT_THEME } from '@zendeskgarden/react-theming';
import { getColorV8, DEFAULT_THEME } from '@zendeskgarden/react-theming';

describe('StyledLabel', () => {
it('renders default styles', () => {
Expand All @@ -20,7 +20,7 @@ describe('StyledLabel', () => {
expect(container.firstChild).toHaveStyleRule('align-items', 'center');
expect(container.firstChild).toHaveStyleRule(
'color',
getColor('neutralHue', 600, DEFAULT_THEME)
getColorV8('neutralHue', 600, DEFAULT_THEME)
);
});

Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledLabel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import styled from 'styled-components';
import {
getColor,
getColorV8,
getLineHeight,
retrieveComponentStyles,
DEFAULT_THEME
Expand All @@ -32,7 +32,7 @@ export const StyledLabel = styled.div.attrs<IStyledLabelProps>({
text-align: ${props => props.isHorizontal && 'center'};
line-height: ${props => getLineHeight(props.theme.space.base * 5, props.theme.fontSizes.md)};
color: ${props =>
props.isActive ? props.theme.colors.foreground : getColor('neutralHue', 600, props.theme)};
props.isActive ? props.theme.colors.foreground : getColorV8('neutralHue', 600, props.theme)};
font-size: ${props => props.theme.fontSizes.md};
font-weight: ${props => props.isActive && 600};

Expand Down
4 changes: 2 additions & 2 deletions packages/accordions/src/styled/stepper/StyledLine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

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

const COMPONENT_ID = 'accordions.step_line';

Expand All @@ -21,7 +21,7 @@ export const StyledLine = styled.div.attrs({
left: ${props => `calc(-50% + ${props.theme.space.base * 6}px)`};
flex: 1;
border-top: ${props => props.theme.borders.sm};
border-color: ${props => getColor('neutralHue', 300, props.theme)};
border-color: ${props => getColorV8('neutralHue', 300, props.theme)};
`;

StyledLine.defaultProps = {
Expand Down
Loading