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: token migration guide #614

Draft
wants to merge 9 commits into
base: v4.0.0
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@
"packages": [
"packages/*"
],
"version": "4.0.0-beta.13"
"version": "4.0.0-beta.14"
}
2 changes: 1 addition & 1 deletion packages/esbuild-plugin-styled-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/esbuild-plugin-styled-components",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"private": true,
"license": "Apache-2.0",
"main": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/foundation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/foundation",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"license": "Apache-2.0",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/icon-files/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/icon-files",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"license": "Apache-2.0",
"type": "module",
"main": "./src/index.cjs",
Expand Down
2 changes: 1 addition & 1 deletion packages/icons-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/icons-cli",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"license": "Apache-2.0",
"bin": "./dist/index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/icons",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"license": "Apache-2.0",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand Down Expand Up @@ -37,7 +37,7 @@
"vitest": "^2.0.1"
},
"dependencies": {
"@charcoal-ui/icon-files": "^4.0.0-beta.13",
"@charcoal-ui/icon-files": "^4.0.0-beta.14",
"dompurify": "^2.3.6",
"warning": "^4.0.3"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/react-sandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/react-sandbox",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"license": "Apache-2.0",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand All @@ -21,7 +21,7 @@
"test": "vitest run --passWithNoTests"
},
"devDependencies": {
"@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-beta.13",
"@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-beta.14",
"@storybook/addon-actions": "^7.4.1",
"@storybook/addon-knobs": "^7.0.2",
"@storybook/addons": "^7.4.1",
Expand Down Expand Up @@ -54,11 +54,11 @@
"vitest": "^2.0.2"
},
"dependencies": {
"@charcoal-ui/foundation": "^4.0.0-beta.13",
"@charcoal-ui/react": "^4.0.0-beta.13",
"@charcoal-ui/styled": "^4.0.0-beta.13",
"@charcoal-ui/theme": "^4.0.0-beta.13",
"@charcoal-ui/utils": "^4.0.0-beta.13",
"@charcoal-ui/foundation": "^4.0.0-beta.14",
"@charcoal-ui/react": "^4.0.0-beta.14",
"@charcoal-ui/styled": "^4.0.0-beta.14",
"@charcoal-ui/theme": "^4.0.0-beta.14",
"@charcoal-ui/utils": "^4.0.0-beta.14",
"polished": "^4.1.4",
"react-spring": "^9.0.0",
"warning": "^4.0.3"
Expand Down
245 changes: 245 additions & 0 deletions packages/react/docs/v4.0.0.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
import { Meta, Story } from '@storybook/addon-docs'
import { Unstyled } from '@storybook/blocks'

<Meta title="react/docs/v4.0.0" />

# @charcoal-ui/react@v4.0.0

- `v4.0.0`では多くの破壊的な変更があります。
- `styled-components`への依存を無くし、css ファイルを読み込む方式に変更しました。

```tsx
import { CharcoalProvider, Button } from '@charcoal-ui/react'

import '@charcoal-ui/react/dist/index.css'

function App() {
return (
<CharcoalProvider>
<Button>Charcoal</Button>
</CharcoalProvider>
)
}
```

## ComponentAbstraction

- `ComponentAbstraction`が削除されました。
- `useComponentAbstraction`が削除されました。
- `type LinkProps`が削除されました。

## CharcoalProvider

- テーマに関する属性が削除されました。
- `themeMap`, `defaultTheme`, `injectTokens`, `components`, `background`

## Button

- `ComponentAbstraction`と`to`を用いたカスタム要素の設定を、`component`に`React.ElementType`を指定することによって行えるように変更しました。

Before

```tsx
<ComponentAbstraction components={{ Link: RouterLink }}>
<Button to="...">Link</Button>
</ComponentAbstraction>
```

After

```tsx
<Button component="a" href="...">Link</Button>
<Button component={RouterLink} to="...">Link</Button>
<Button component={NextLink} href="...">Link</Button>
```

## Checkbox

- `Checkbox`の`input`要素を`children`がない場合に label で囲わないようにしました。
- `React.HTMLProps<HTMLInputElement>`を継承するように変更しました。
- アイコンを CSS を用いて表示するように変更しました。

## Clickable

- `Button`と同様に`to`による指定を削除し、`component`によってカスタムできるように変更しました。
- `type ClickableElement`が削除されました。

## DropdownSelector

- `aria-labelledby`,`aria-describedby`を適用するように変更しました。

## IconButton

- `Button`と同様に`to`による指定を削除し、`component`によってカスタムできるように変更しました。

## MultiSelect

- コンポーネントが削除されました。
- `overlay`の代替として`Checkbox`の`rounded`が追加されました。

## RadioGroup

- `aria-labelledby`, `aria-orientation`をプロパティに追加しました。
- `label`をオプショナルに変更しました。

## Switch

- `Checkbox`の`input`要素を常に`label`で囲わないようにしました。
- `React.HTMLProps<HTMLInputElement>`を継承するように変更しました。

## TagItem

- `Button`と同様に`to`による指定を削除し、`component`によってカスタムできるように変更しました。

## TextArea

- `textarea`要素の`props`を継承するように変更しました。
- 文字数の計算ロジックを`getCount`プロパティで上書きできるように変更しました。

## TextField

- `input`要素の`props`を継承するように変更しました。
- 文字数の計算ロジックを`getCount`プロパティで上書きできるように変更しました。

## 新トークン移行

新トークンへの移行時に旧トークンも引き続き利用したい場合は、以下のマイグレーション用 CSS を適用してください。特定のカラーだけを新トークンに変更したい場合は、該当するカラーを上書きすることができます。

```css
:root {
--charcoal-background1: var(--charcoal-color-background-default);
--charcoal-background1-hover: var(--charcoal-color-background-hover);
--charcoal-background1-press: var(--charcoal-color-background-press);

--charcoal-background2: var(--charcoal-color-background-secondary-default);
--charcoal-background2-hover: var(
--charcoal-color-background-secondary-hover
);
--charcoal-background2-press: var(
--charcoal-color-background-secondary-press
);

--charcoal-surface1: var(--charcoal-color-container-default);
--charcoal-surface1-hover: var(--charcoal-color-container-hover);
--charcoal-surface1-press: var(--charcoal-color-container-press);

--charcoal-surface2: var(--charcoal-color-container-tertiary-default);
--charcoal-surface2-hover: var(--charcoal-color-container-tertiary-hover);
--charcoal-surface2-press: var(--charcoal-color-container-tertiary-press);

--charcoal-surface3: var(--charcoal-color-container-secondary-default);
--charcoal-surface3-hover: var(--charcoal-color-container-secondary-hover);
--charcoal-surface3-press: var(--charcoal-color-container-secondary-press);

--charcoal-surface4: var(--charcoal-color-container-neutral-default);
--charcoal-surface4-hover: var(--charcoal-color-container-neutral-hover);
--charcoal-surface4-press: var(--charcoal-color-container-neutral-press);

/* 対応無し */
--charcoal-surface5: ;
--charcoal-surface5-hover: ;
--charcoal-surface5-press: ;

--charcoal-surface6: var(--charcoal-color-container-hud-default);
--charcoal-surface6-hover: var(--charcoal-color-container-hud-hover);
--charcoal-surface6-press: var(--charcoal-color-container-hud-press);

--charcoal-surface7: var(--charcoal-color-container-tertiary-default);
--charcoal-surface7-hover: var(--charcoal-color-container-tertiary-hover);
--charcoal-surface7-press: var(--charcoal-color-container-tertiary-press);

--charcoal-surface8: var(--charcoal-color-container-hud-default);
--charcoal-surface8-hover: var(--charcoal-color-container-hud-hover);
--charcoal-surface8-press: var(--charcoal-color-container-hud-press);

--charcoal-surface9: var(--charcoal-color-container-default);
--charcoal-surface9-hover: var(--charcoal-color-container-hover);
--charcoal-surface9-press: var(--charcoal-color-container-press);

/* 対応無し */
--charcoal-surface10: ;
--charcoal-surface10-hover: ;
--charcoal-surface10-press: ;

/* charcoal 内では brand が使用されていたが、figma の導入ガイドには primary が記載されていたので両方記述 */
--charcoal-primary: var(--charcoal-color-container-primary-default);
--charcoal-primary-hover: var(--charcoal-color-container-primary-hover);
--charcoal-primary-press: var(--charcoal-color-container-primary-press);

--charcoal-brand: var(--charcoal-color-container-primary-default);
--charcoal-brand-hover: var(--charcoal-color-container-primary-hover);
--charcoal-brand-press: var(--charcoal-color-container-primary-press);
naporin0624 marked this conversation as resolved.
Show resolved Hide resolved

--charcoal-link1: var(--charcoal-color-text-info-default);
--charcoal-link1-hover: var(--charcoal-color-text-info-hover);
--charcoal-link1-press: var(--charcoal-color-text-info-press);

/* 対応無し */
--charcoal-link2: ;
--charcoal-link2-hover: ;
--charcoal-link2-press: ;

--charcoal-transparent: rgba(0, 0, 0, 0);
--charcoal-transparent-hover: var(--charcoal-color-container-hover-a);
--charcoal-transparent-press: var(--charcoal-color-container-press-a);

--charcoal-border: var(--charcoal-color-border-default);
--charcoal-border-hover: var(--charcoal-color-border-hover);
--charcoal-border-press: var(--charcoal-color-border-press);
--charcoal-border-default: var(--charcoal-border);
--charcoal-border-default-hover: var(--charcoal-border-hover);
--charcoal-border-default-press: var(--charcoal-border-press);

--charcoal-text1: var(--charcoal-color-text-default);
--charcoal-text1-hover: var(--charcoal-color-text-hover);
--charcoal-text1-press: var(--charcoal-color-text-press);

--charcoal-text2: var(--charcoal-color-text-secondary-default);
--charcoal-text2-hover: var(--charcoal-color-text-secondary-hover);
--charcoal-text2-press: var(--charcoal-color-text-secondary-press);

--charcoal-text3: var(--charcoal-color-text-tertiary-default);
--charcoal-text3-hover: var(--charcoal-color-text-tertiary-hover);
--charcoal-text3-press: var(--charcoal-color-text-tertiary-press);

--charcoal-text4: var(--charcoal-color-text-tertiary-default);
--charcoal-text4-hover: var(--charcoal-color-text-tertiary-hover);
--charcoal-text4-press: var(--charcoal-color-text-tertiary-press);

--charcoal-text5: var(--charcoal-color-text-on-primary-default);
--charcoal-text5-hover: var(--charcoal-color-text-on-primary-hover);
--charcoal-text5-press: var(--charcoal-color-text-on-primary-press);

--charcoal-warning: var(--charcoal-color-container-negative-default);
--charcoal-warning-hover: var(--charcoal-color-container-negative-hover);
--charcoal-warning-press: var(--charcoal-color-container-negative-press);

--charcoal-success: var(--charcoal-color-container-positive-default);
--charcoal-success-hover: var(--charcoal-color-container-positive-hover);
--charcoal-success-press: var(--charcoal-color-container-positive-press);
}
```

### カラーの上書き

ライトモードの場合は `:root`、ダークモードの場合は `:root[data-theme='dark']` セレクターに対応しています。`@charcoal-react/dist/index.css` の後に記述することで、トークンを上書きできます。

#### ライトモード

**例**: ブランドカラーを変更する場合

```css
:root {
--charcoal-color-container-primary-default: #0096fa;
}
```

#### ダークモード

**例**: ブランドカラーを変更する場合

```css
:root[data-theme='dark'] {
--charcoal-color-container-primary-default: #0096fa;
}
```
Comment on lines +223 to +245
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

新トークン上書きはここから

16 changes: 10 additions & 6 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@charcoal-ui/react",
"version": "4.0.0-beta.13",
"version": "4.0.0-beta.14",
"license": "Apache-2.0",
"main": "./dist/index.cjs.js",
"module": "./dist/index.esm.js",
Expand All @@ -14,6 +14,10 @@
"./dist/index.css": {
"import": "./dist/index.css",
"require": "./dist/index.css"
},
"./dist/layered.css": {
"import": "./dist/layered.css",
"require": "./dist/layered.css"
}
},
"types": "./dist/index.d.ts",
Expand All @@ -29,7 +33,7 @@
"test": "vitest run --passWithNoTests"
},
"devDependencies": {
"@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-beta.13",
"@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-beta.14",
"@react-types/switch": "^3.1.2",
"@storybook/addon-actions": "^8.0.5",
"@storybook/react": "^8.0.5",
Expand Down Expand Up @@ -58,10 +62,10 @@
"vitest": "^2.0.1"
},
"dependencies": {
"@charcoal-ui/foundation": "^4.0.0-beta.13",
"@charcoal-ui/icons": "^4.0.0-beta.13",
"@charcoal-ui/theme": "^4.0.0-beta.13",
"@charcoal-ui/utils": "^4.0.0-beta.13",
"@charcoal-ui/foundation": "^4.0.0-beta.14",
"@charcoal-ui/icons": "^4.0.0-beta.14",
"@charcoal-ui/theme": "^4.0.0-beta.14",
"@charcoal-ui/utils": "^4.0.0-beta.14",
"@react-aria/button": "^3.9.1",
"@react-aria/checkbox": "^3.13.0",
"@react-aria/dialog": "^3.5.10",
Expand Down
Loading
Loading