Merge pull request #327 from Enterwell/stage

Stage
Enterwell · Feb 5, 2024 · 66c13e3 · 66c13e3
2 parents 19e97b9 + 7263ace
commit 66c13e3
Show file tree

Hide file tree

Showing 9 changed files with 272 additions and 301 deletions.
diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -26,25 +26,25 @@
     "@enterwell/react-ui": "workspace:*",
     "@mdx-js/mdx": "3.0.0",
     "@mdx-js/react": "3.0.0",
-    "@mui/icons-material": "5.15.6",
-    "@mui/lab": "5.0.0-alpha.162",
-    "@mui/material": "5.15.6",
-    "@mui/system": "5.15.6",
-    "@mui/x-data-grid-pro": "6.19.2",
+    "@mui/icons-material": "5.15.7",
+    "@mui/lab": "5.0.0-alpha.163",
+    "@mui/material": "5.15.7",
+    "@mui/system": "5.15.7",
+    "@mui/x-data-grid-pro": "6.19.3",
     "@mui/x-date-pickers": "5.0.20",
     "@mui/x-date-pickers-pro": "5.0.20",
     "classix": "2.1.36",
     "comment-parser": "1.4.1",
     "next": "14.1.0",
-    "nextra": "2.13.2",
-    "nextra-theme-docs": "2.13.2",
+    "nextra": "2.13.3",
+    "nextra-theme-docs": "2.13.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "tailwindcss-animate": "1.0.7"
   },
   "devDependencies": {
-    "@types/node": "18.19.8",
-    "@types/react": "18.2.48",
+    "@types/node": "18.19.10",
+    "@types/react": "18.2.53",
     "@types/react-dom": "18.2.18",
     "autoprefixer": "10.4.17",
     "postcss": "8.4.33",

diff --git a/package.json b/package.json
@@ -8,9 +8,9 @@
   "devDependencies": {
     "eslint": "8.56.0",
     "tsconfig": "workspace:*",
-    "turbo": "1.11.3",
-    "@turbo/gen": "1.11.3"
+    "turbo": "1.12.2",
+    "@turbo/gen": "1.12.2"
   },
-  "packageManager": "pnpm@8.14.3",
+  "packageManager": "pnpm@8.15.1",
   "name": "ui"
 }
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@vercel/style-guide": "5.1.0",
-    "eslint-config-turbo": "1.11.3"
+    "@vercel/style-guide": "5.2.0",
+    "eslint-config-turbo": "1.12.2"
   }
 }
diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
@@ -24,8 +24,8 @@
   },
   "devDependencies": {
     "@microsoft/api-extractor": "7.39.4",
-    "@types/node": "18.19.8",
-    "@types/react": "18.2.48",
+    "@types/node": "18.19.10",
+    "@types/react": "18.2.53",
     "@types/react-dom": "18.2.18",
     "eslint-config-custom": "workspace:*",
     "react": "18.2.0",

diff --git a/packages/react-mui-hooks/package.json b/packages/react-mui-hooks/package.json
@@ -26,10 +26,10 @@
     "@enterwell/react-hooks": "workspace:*",
     "@enterwell/react-ui": "workspace:*",
     "@microsoft/api-extractor": "7.39.4",
-    "@mui/material": "5.15.6",
-    "@mui/x-data-grid-pro": "6.19.2",
-    "@types/node": "18.19.8",
-    "@types/react": "18.2.48",
+    "@mui/material": "5.15.7",
+    "@mui/x-data-grid-pro": "6.19.3",
+    "@types/node": "18.19.10",
+    "@types/react": "18.2.53",
     "@types/react-dom": "18.2.18",
     "date-fns": "2.30.0",
     "eslint-config-custom": "workspace:*",

diff --git a/packages/react-ui/DropdownButton/DropdownButton.tsx b/packages/react-ui/DropdownButton/DropdownButton.tsx
@@ -27,7 +27,7 @@ export type DropdownButtonProps = Omit<ButtonProps, 'onClick'> & {
  * @public
  */
 export function DropdownButton({
-  options, onClick, icon, ...rest
+  options, onClick, icon, disabled, ...rest
 }: DropdownButtonProps) {
   const id = useId();
   const [open, setOpen] = useState(false);
@@ -60,7 +60,7 @@ export function DropdownButton({
           {...rest}
           aria-describedby={id}
           onClick={handleButtonClick}
-          disabled={!options?.length}
+          disabled={disabled || !options?.length}
         >
           {icon}
         </IconButton>
@@ -69,7 +69,7 @@ export function DropdownButton({
           {...rest}
           aria-describedby={id}
           onClick={handleButtonClick}
-          disabled={!options?.length}
+          disabled={disabled || !options?.length}
         />
       )}
       <Popover

diff --git a/...ges/Fixed [DropdownButton] Properly disabling the button if the disable prop is passed in b/...ges/Fixed [DropdownButton] Properly disabling the button if the disable prop is passed in
diff --git a/packages/react-ui/package.json b/packages/react-ui/package.json
@@ -28,13 +28,13 @@
     "@emotion/styled": "11.11.0",
     "@enterwell/react-hooks": "workspace:*",
     "@microsoft/api-extractor": "7.39.4",
-    "@mui/icons-material": "5.15.6",
-    "@mui/material": "5.15.6",
-    "@mui/system": "5.15.6",
+    "@mui/icons-material": "5.15.7",
+    "@mui/material": "5.15.7",
+    "@mui/system": "5.15.7",
     "@mui/x-date-pickers-pro": "5.0.20",
     "@mui/x-date-pickers": "5.0.20",
-    "@types/node": "18.19.8",
-    "@types/react": "18.2.48",
+    "@types/node": "18.19.10",
+    "@types/react": "18.2.53",
     "@types/react-dom": "18.2.18",
     "date-fns": "2.30.0",
     "eslint-config-custom": "workspace:*",