Merge branch 'refs/heads/master' into HEAD

kufu · Nov 13, 2024 · d9ecbc3 · d9ecbc3
2 parents 28256ef + fbc2902
commit d9ecbc3
Show file tree

Hide file tree

Showing 7 changed files with 349 additions and 343 deletions.
diff --git a/packages/smarthr-ui/package.json b/packages/smarthr-ui/package.json
@@ -21,24 +21,24 @@
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.25.9",
     "@babel/preset-typescript": "^7.26.0",
-    "@storybook/addon-a11y": "^8.4.1",
-    "@storybook/addon-actions": "^8.4.1",
-    "@storybook/addon-essentials": "^8.4.1",
-    "@storybook/addon-interactions": "^8.4.1",
-    "@storybook/addon-storysource": "^8.4.1",
+    "@storybook/addon-a11y": "^8.4.2",
+    "@storybook/addon-actions": "^8.4.2",
+    "@storybook/addon-essentials": "^8.4.2",
+    "@storybook/addon-interactions": "^8.4.2",
+    "@storybook/addon-storysource": "^8.4.2",
     "@storybook/addon-styling": "^1.3.7",
     "@storybook/addon-styling-webpack": "^1.0.1",
-    "@storybook/addon-viewport": "^8.4.1",
+    "@storybook/addon-viewport": "^8.4.2",
     "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-    "@storybook/blocks": "^8.4.1",
-    "@storybook/cli": "^8.4.1",
-    "@storybook/manager-api": "^8.4.1",
-    "@storybook/react": "^8.4.1",
-    "@storybook/react-webpack5": "^8.4.1",
-    "@storybook/source-loader": "^8.4.1",
-    "@storybook/test": "^8.4.1",
+    "@storybook/blocks": "^8.4.2",
+    "@storybook/cli": "^8.4.2",
+    "@storybook/manager-api": "^8.4.2",
+    "@storybook/react": "^8.4.2",
+    "@storybook/react-webpack5": "^8.4.2",
+    "@storybook/source-loader": "^8.4.2",
+    "@storybook/test": "^8.4.2",
     "@storybook/test-runner": "^0.19.1",
-    "@storybook/theming": "^8.4.1",
+    "@storybook/theming": "^8.4.2",
     "@swc/core": "^1.8.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.1",
@@ -53,10 +53,10 @@
     "autoprefixer": "^10.4.20",
     "axe-playwright": "^2.0.3",
     "babel-loader": "^9.2.1",
-    "babel-plugin-polyfill-corejs2": "^0.4.11",
+    "babel-plugin-polyfill-corejs2": "^0.4.12",
     "babel-plugin-polyfill-regenerator": "^0.6.3",
     "css-loader": "^7.1.2",
-    "chromatic": "^11.16.3",
+    "chromatic": "^11.16.5",
     "ecma-version-validator-webpack-plugin": "^1.2.1",
     "fs-extra": "^11.2.0",
     "glob": "11.0.0",
@@ -66,7 +66,7 @@
     "npm-run-all": "^4.1.5",
     "playwright": "^1.48.2",
     "plop": "^4.0.1",
-    "postcss": "^8.4.47",
+    "postcss": "^8.4.48",
     "postcss-loader": "^8.1.1",
     "postcss-styled-syntax": "^0.7.0",
     "postcss-syntax": "^0.36.2",
@@ -77,7 +77,7 @@
     "react-test-renderer": "^18.3.1",
     "rimraf": "^6.0.1",
     "standard-version": "^9.3.2",
-    "storybook": "^8.4.1",
+    "storybook": "^8.4.2",
     "storybook-addon-pseudo-states": "^4.0.2",
     "style-loader": "^4.0.0",
     "styled-components": "^5.3.11",

diff --git a/packages/smarthr-ui/src/components/BottomFixedArea/BottomFixedArea.tsx b/packages/smarthr-ui/src/components/BottomFixedArea/BottomFixedArea.tsx
@@ -64,6 +64,9 @@ const bottomFixedArea = tv({
   },
 })
 
+/**
+ * @deprecated BottomFixedArea は非推奨です。FloatArea を使ってください。 https://smarthr.design/products/components/float-area/
+ */
 export const BottomFixedArea: FC<Props & ElementProps> = ({
   description,
   primaryButton,

diff --git a/packages/smarthr-ui/src/components/BottomFixedArea/stories/BottomFixedArea.stories.tsx b/packages/smarthr-ui/src/components/BottomFixedArea/stories/BottomFixedArea.stories.tsx
@@ -27,7 +27,7 @@ export const _tertiaryLinksOptions = {
 }
 
 export default {
-  title: 'Navigation（ナビゲーション）/BottomFixedArea',
+  title: 'Navigation（ナビゲーション）/BottomFixedArea（非推奨）',
   component: BottomFixedArea,
   render: (args) => <BottomFixedArea {...args} />,
   argTypes: {

diff --git a/packages/smarthr-ui/src/components/BottomFixedArea/stories/VRTBottomFixedArea.stories.tsx b/packages/smarthr-ui/src/components/BottomFixedArea/stories/VRTBottomFixedArea.stories.tsx
@@ -11,7 +11,7 @@ import {
 import type { Meta, StoryObj } from '@storybook/react'
 
 export default {
-  title: 'Navigation（ナビゲーション）/BottomFixedArea/VRT',
+  title: 'Navigation（ナビゲーション）/BottomFixedArea（非推奨）/VRT',
   render: (args) => <BottomFixedArea {...args} />,
   args: {
     description: '領域や操作に対する説明を書けます。',

diff --git a/packages/smarthr-ui/src/components/DefinitionList/DefinitionList.tsx b/packages/smarthr-ui/src/components/DefinitionList/DefinitionList.tsx
@@ -43,11 +43,14 @@ export const DefinitionList: FC<Props & ElementProps> = ({
             termStyleType={termStyleType}
           />
         ))}
-      {React.Children.map(children, (child) =>
-        React.cloneElement(child as React.ReactElement, {
-          maxColumns,
-          termStyleType,
-        }),
+      {React.Children.map(
+        children,
+        (child) =>
+          React.isValidElement(child) &&
+          React.cloneElement(child as React.ReactElement, {
+            maxColumns,
+            termStyleType,
+          }),
       )}
     </Cluster>
   )