Skip to content

merge v2 into main #208

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
johnykei merged 6 commits into from
Jun 25, 2025
Merged

merge v2 into main #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8929fc2
feat: update the table sample according to the latest Figma design
johnykei Jun 25, 2025
d7a9fb4
feat: enable to work indeterminate checkbox story
johnykei Jun 25, 2025
ab7b7f3
feat: fix the icon color of NotificationBanner icons on forced color …
johnykei Jun 25, 2025
55dd06f
doc: update accessibility description in Introduction story
johnykei Jun 25, 2025
574f528
feat: update version to 2.5.0
johnykei Jun 25, 2025
c0d252e
Merge pull request #207 from digital-go-jp/update-v2-20250625
johnykei Jun 25, 2025
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
4 changes: 2 additions & 2 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.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@digital-go-jp/design-system-example-components",
"version": "2.4.0",
"version": "2.5.0",
"type": "module",
"main": "dist/index.cjs.js",
"typings": "dist/index.d.ts",
Expand Down
6 changes: 3 additions & 3 deletions src/components/Checkbox/Checkbox.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ export const Indeterminate: Story = {
const noneChecked = checks.every((v) => !v);
checkAll.current.checked = allChecked;
checkAll.current.indeterminate = !allChecked && !noneChecked;
});
}, [checks]);

const handleCheckAllChange = (e) => {
const handleCheckAllChange = () => {
if (!checkAll.current) return;
const checked = checkAll.current.indeterminate || e.target.checked;
const checked = checkAll.current.indeterminate || checkAll.current.checked;
checkAll.current.checked = checked;
setChecks(checks.map(() => checked));
};
Expand Down
10 changes: 5 additions & 5 deletions src/components/NotificationBanner/parts/Icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const InfoIcon = (props: IconProps) => {
width='36'
{...rest}
>
<circle cx='18' cy='18' fill='white' r='18' />
<circle cx='18' cy='18' fill='Canvas' r='18' />
<path
d='M18 0C8.064 0 0 8.064 0 18C0 27.936 8.064 36 18 36C27.936 36 36 27.936 36 18C36 8.064 27.936 0 18 0ZM19.8 27H16.2V16.2H19.8V27ZM19.8 12.6H16.2V9H19.8V12.6Z'
fill='currentColor'
Expand All @@ -36,7 +36,7 @@ const WarningIcon = (props: IconProps) => {
width='36'
{...rest}
>
<path d='M18 3.00098L36 34.091H0L18 3.00098Z' fill='white' />
<path d='M18 3.00098L36 34.091H0L18 3.00098Z' fill='Canvas' />
<path
d='M0 34.0909H36L18 3L0 34.0909ZM19.6364 29.1818H16.3636V25.9091H19.6364V29.1818ZM19.6364 22.6364H16.3636V16.0909H19.6364V22.6364Z'
fill='currentColor'
Expand Down Expand Up @@ -68,13 +68,13 @@ const ErrorIcon = (props: IconProps) => {
width='2'
height='18.5341'
transform='matrix(0.7071, -0.707113, 0.7071, 0.707113, 11, 12.4142)'
fill='white'
fill='Canvas'
/>
<rect
width='2'
height='18.5341'
transform='matrix(-0.7071, -0.707113, 0.7071, -0.707113, 12.4141, 25.52)'
fill='white'
fill='Canvas'
/>
</g>
</svg>
Expand All @@ -94,7 +94,7 @@ const SuccessIcon = (props: IconProps) => {
{...rest}
>
<g>
<circle cx='18' cy='18' r='18' fill='white' />
<circle cx='18' cy='18' r='18' fill='Canvas' />
<path
d='M18 0C8.064 0 0 8.064 0 18C0 27.936 8.064 36 18 36C27.936 36 36 27.936 36 18C36 8.064 27.936 0 18 0ZM14.4 27L5.4 18L7.938 15.462L14.4 21.906L28.062 8.244L30.6 10.8L14.4 27Z'
fill='currentColor'
Expand Down
Loading