Skip to content

Commit

Permalink
Merge branch 'refs/heads/master' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 18, 2024
2 parents b8d8d5b + cf5ea5f commit 536482e
Show file tree
Hide file tree
Showing 6 changed files with 1,015 additions and 994 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"eslint": "^8.57.0",
"eslint-config-smarthr": "^6.33.0",
"eslint-config-smarthr": "^6.33.2",
"eslint-plugin-storybook": "^0.8.0",
"husky": "^9.1.5",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"prettier-config-smarthr": "^1.0.0",
Expand All @@ -31,7 +31,7 @@
"pnpm": {
"overrides": {
"@babel/helper-compilation-targets": "^7.25.2",
"@types/react": "^18.3.6",
"@types/react": "^18.3.7",
"minimist": "1.2.8",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
42 changes: 21 additions & 21 deletions packages/smarthr-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,32 @@
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@storybook/addon-a11y": "^8.3.0",
"@storybook/addon-actions": "^8.3.0",
"@storybook/addon-essentials": "^8.3.0",
"@storybook/addon-interactions": "^8.3.0",
"@storybook/addon-storysource": "^8.3.0",
"@storybook/addon-a11y": "^8.3.1",
"@storybook/addon-actions": "^8.3.1",
"@storybook/addon-essentials": "^8.3.1",
"@storybook/addon-interactions": "^8.3.1",
"@storybook/addon-storysource": "^8.3.1",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addon-styling-webpack": "^1.0.0",
"@storybook/addon-viewport": "^8.3.0",
"@storybook/addon-viewport": "^8.3.1",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.3.0",
"@storybook/cli": "^8.3.0",
"@storybook/manager-api": "^8.3.0",
"@storybook/react": "^8.3.0",
"@storybook/react-webpack5": "^8.3.0",
"@storybook/source-loader": "^8.3.0",
"@storybook/test": "^8.3.0",
"@storybook/blocks": "^8.3.1",
"@storybook/cli": "^8.3.1",
"@storybook/manager-api": "^8.3.1",
"@storybook/react": "^8.3.1",
"@storybook/react-webpack5": "^8.3.1",
"@storybook/source-loader": "^8.3.1",
"@storybook/test": "^8.3.1",
"@storybook/test-runner": "^0.19.1",
"@storybook/theming": "^8.3.0",
"@swc/core": "^1.7.24",
"@storybook/theming": "^8.3.1",
"@swc/core": "^1.7.26",
"@swc/jest": "^0.2.36",
"@testing-library/react": "^16.0.1",
"@types/jest": "^29.5.12",
"@types/jest": "^29.5.13",
"@types/lodash.merge": "^4.6.9",
"@types/lodash.range": "^3.2.9",
"@types/node": "^20.16.5",
"@types/react": "^18.3.5",
"@types/react": "^18.3.7",
"@types/react-dom": "^18.3.0",
"@types/react-test-renderer": "^17.0.9",
"@types/react-transition-group": "^4.4.11",
Expand All @@ -67,8 +67,8 @@
"jest-styled-components": "^7.2.0",
"memory-fs": "^0.5.0",
"npm-run-all": "^4.1.5",
"playwright": "^1.47.0",
"postcss": "^8.4.45",
"playwright": "^1.47.1",
"postcss": "^8.4.47",
"postcss-loader": "^8.1.1",
"postcss-styled-syntax": "^0.6.4",
"postcss-syntax": "^0.36.2",
Expand All @@ -79,15 +79,15 @@
"react-test-renderer": "^18.3.1",
"rimraf": "^6.0.1",
"standard-version": "^9.3.2",
"storybook": "^8.3.0",
"storybook": "^8.3.1",
"storybook-addon-pseudo-states": "^4.0.2",
"styled-components": "^5.3.11",
"style-loader": "^4.0.0",
"testcafe": "3.6.2",
"ts-loader": "^9.5.1",
"ttypescript": "^1.5.15",
"typescript-plugin-styled-components": "^3.0.0",
"wait-on": "^8.0.0",
"wait-on": "^8.0.1",
"webpack": "^5.94.0"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type Props = PropsWithChildren<

const dialogOverlap = tv({
base: [
'shr-absolute shr-inset-0 shr-z-overlap-base',
'shr-fixed shr-inset-0 shr-z-overlap-base',
'[&.shr-dialog-transition-enter]:shr-opacity-0',
'[&.shr-dialog-transition-enter-active]:shr-transition-opacity',
'[&.shr-dialog-transition-enter-active]:shr-duration-300',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ const _Template: StoryFn = (args) => (
<ul className="shr-list-none shr-space-y-1">
<li>
<FormControl title="時刻">
<TimePicker {...args} />
<TimePicker {...args} name="time" />
</FormControl>
</li>
<li>
<FormControl title="非活性">
<TimePicker {...args} disabled={true} />
<TimePicker {...args} disabled={true} name="time" />
</FormControl>
</li>
<li>
<FormControl title="エラーあり">
<TimePicker {...args} error={true} />
<TimePicker {...args} error={true} name="time" />
</FormControl>
</li>
<li>
<FormControl title="読み取り専用">
<TimePicker {...args} readOnly={true} />
<TimePicker {...args} readOnly={true} name="time" />
</FormControl>
</li>
</ul>
Expand Down
Loading

0 comments on commit 536482e

Please sign in to comment.