Merge branch 'refs/heads/master' into HEAD

kufu · Sep 25, 2024 · a19a7d5 · a19a7d5
2 parents b2b9337 + 03a7e7b
commit a19a7d5
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 97 deletions.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
     "prettier-config-smarthr": "^1.0.0",
-    "prettier-plugin-tailwindcss": "^0.6.6",
+    "prettier-plugin-tailwindcss": "^0.6.8",
     "stylelint": "^16.9.0",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-smarthr": "^3.0.1",

diff --git a/packages/smarthr-ui/src/components/RadioButton/RadioButton.tsx b/packages/smarthr-ui/src/components/RadioButton/RadioButton.tsx
@@ -73,7 +73,7 @@ export const RadioButton = forwardRef<HTMLInputElement, Props>(
     )
 
     const defaultId = useId()
-    const radioButtonId = defaultId || props.id
+    const radioButtonId = props.id || defaultId
 
     return (
       <span className={wrapperStyle}>