Skip to content

Commit f8e6d06

Browse files
committed
feat(bezier-react): converts cssVar to colorTokenCssVar
1 parent 6f20289 commit f8e6d06

File tree

7 files changed

+19
-16
lines changed

7 files changed

+19
-16
lines changed

packages/bezier-react/src/components/AlphaStatusBadge/StatusBadge.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MoonFilledIcon } from '@channel.io/bezier-icons'
66
import classNames from 'classnames'
77

88
import { type SemanticColor } from '~/src/types/tokens'
9-
import { cssVar } from '~/src/utils/style'
9+
import { colorTokenCssVar } from '~/src/utils/style'
1010

1111
import { Icon } from '~/src/components/Icon'
1212

@@ -54,7 +54,7 @@ export const StatusBadge = forwardRef<HTMLDivElement, StatusBadgeProps>(
5454
ref={forwardedRef}
5555
style={
5656
{
57-
'--b-status-bg-color': cssVar(backgroundColor),
57+
'--b-status-bg-color': colorTokenCssVar(backgroundColor),
5858
...style,
5959
} as CSSProperties
6060
}

packages/bezier-react/src/components/Icon/Icon.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as React from 'react'
55
import classNames from 'classnames'
66

77
import { getMarginStyles, splitByMarginProps } from '~/src/types/props-helpers'
8-
import { tokenCssVar } from '~/src/utils/style'
8+
import { colorTokenCssVar } from '~/src/utils/style'
99

1010
import { type IconProps } from './Icon.types'
1111

@@ -32,7 +32,7 @@ export const Icon = memo(
3232
ref={forwardedRef}
3333
style={
3434
{
35-
'--b-icon-color': tokenCssVar(color),
35+
'--b-icon-color': colorTokenCssVar(color),
3636
...marginStyles.style,
3737
...style,
3838
} as React.CSSProperties

packages/bezier-react/src/components/SmoothCornersBox/SmoothCornersBox.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as React from 'react'
55

66
import classNames from 'classnames'
77

8-
import { cssUrl, cssVar, px } from '~/src/utils/style'
8+
import { colorTokenCssVar, cssUrl, px } from '~/src/utils/style'
99

1010
import { FeatureType, useFeatureFlag } from '~/src/components/FeatureProvider'
1111

@@ -57,14 +57,17 @@ export const SmoothCornersBox = forwardRef<
5757
'--b-smooth-corners-box-shadow-offset-y': px(shadow?.offsetY),
5858
'--b-smooth-corners-box-shadow-blur-radius': `${shadowBlurRadius}px`,
5959
'--b-smooth-corners-box-shadow-spread-radius': `${shadowSpreadRadius}px`,
60-
'--b-smooth-corners-box-shadow-color': cssVar(shadow?.color),
60+
'--b-smooth-corners-box-shadow-color': colorTokenCssVar(
61+
shadow?.color
62+
),
6163
/**
6264
* NOTE: Calculate in javascript because it cannot access calculated values via CSS calc() in the paint worklet.
6365
* @see {@link ~/src/features/SmoothCorners/smoothCornersScript.ts}
6466
*/
6567
'--b-smooth-corners-box-padding': `${Math.max(shadowBlurRadius, shadowSpreadRadius) * 2}px`,
6668
'--b-smooth-corners-box-margin': `${margin ?? 0}px`,
67-
'--b-smooth-corners-box-background-color': cssVar(backgroundColor),
69+
'--b-smooth-corners-box-background-color':
70+
colorTokenCssVar(backgroundColor),
6871
'--b-smooth-corners-box-background-image': cssUrl(backgroundImage),
6972
} as React.CSSProperties
7073
}

packages/bezier-react/src/components/Spinner/Spinner.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as React from 'react'
55

66
import classNames from 'classnames'
77

8-
import { cssVar } from '~/src/utils/style'
8+
import { colorTokenCssVar } from '~/src/utils/style'
99

1010
import { type SpinnerProps } from './Spinner.types'
1111

@@ -24,7 +24,7 @@ export const Spinner = forwardRef<HTMLDivElement, SpinnerProps>(
2424
ref={forwardedRef}
2525
style={
2626
{
27-
'--b-spinner-color': cssVar(color),
27+
'--b-spinner-color': colorTokenCssVar(color),
2828
...style,
2929
} as React.CSSProperties
3030
}

packages/bezier-react/src/components/Status/Status.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { LockIcon, MoonFilledIcon } from '@channel.io/bezier-icons'
66
import classNames from 'classnames'
77

88
import { type SemanticColor } from '~/src/types/tokens'
9-
import { cssVar } from '~/src/utils/style'
9+
import { colorTokenCssVar } from '~/src/utils/style'
1010

1111
import { Icon } from '~/src/components/Icon'
1212

@@ -44,7 +44,7 @@ export const Status = memo(
4444
ref={forwardedRef}
4545
style={
4646
{
47-
'--b-status-bg-color': cssVar(backgroundColor),
47+
'--b-status-bg-color': colorTokenCssVar(backgroundColor),
4848
...style,
4949
} as CSSProperties
5050
}

packages/bezier-react/src/components/Text/Text.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { createElement, forwardRef } from 'react'
55
import classNames from 'classnames'
66

77
import { getMarginStyles, splitByMarginProps } from '~/src/types/props-helpers'
8-
import { tokenCssVar } from '~/src/utils/style'
8+
import { colorTokenCssVar } from '~/src/utils/style'
99
import { isNumber } from '~/src/utils/type'
1010

1111
import { type TextProps } from './Text.types'
@@ -50,7 +50,7 @@ export const Text = forwardRef<HTMLElement, TextProps>(
5050
{
5151
ref: forwardedRef,
5252
style: {
53-
'--b-text-color': tokenCssVar(color),
53+
'--b-text-color': colorTokenCssVar(color),
5454
'--b-text-line-clamp': isMultiLineTruncated ? truncated : undefined,
5555
...marginStyles.style,
5656
...style,

packages/bezier-react/src/types/props-helpers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
type MarginProps,
77
} from '~/src/types/props'
88
import { type Elevation, type Radius, type ZIndex } from '~/src/types/tokens'
9-
import { cssDimension, tokenCssVar } from '~/src/utils/style'
9+
import { colorTokenCssVar, cssDimension } from '~/src/utils/style'
1010

1111
// NOTE: 'typescript-plugin-css-modules' does not support path alias
1212
/* eslint-disable no-restricted-imports */
@@ -210,8 +210,8 @@ export const getLayoutStyles = ({
210210
'--b-basis': cssDimension(basis),
211211
'--b-shrink': shrink,
212212
'--b-grow': grow,
213-
'--b-background-color': tokenCssVar(backgroundColor),
214-
'--b-border-color': tokenCssVar(borderColor),
213+
'--b-background-color': colorTokenCssVar(backgroundColor),
214+
'--b-border-color': colorTokenCssVar(borderColor),
215215
'--b-border-width': cssDimension(borderWidth),
216216
'--b-border-top-width': cssDimension(borderTopWidth),
217217
'--b-border-right-width': cssDimension(borderRightWidth),

0 commit comments

Comments
 (0)