Link no href & to props and Button update

xylabs · Oct 15, 2024 · 8aadaab · 8aadaab
1 parent 0367729
commit 8aadaab
Show file tree

Hide file tree

Showing 25 changed files with 182 additions and 134 deletions.
diff --git a/package.json b/package.json
@@ -86,8 +86,8 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@eslint-react/eslint-plugin": "^1.15.0",
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/addon-actions": "^8.3.5",
     "@storybook/addon-docs": "^8.3.5",
     "@storybook/addon-essentials": "^8.3.5",
@@ -111,7 +111,7 @@
     "@xylabs/ts-scripts-yarn3": "^4.2.1",
     "@xylabs/tsconfig": "^4.2.1",
     "@xylabs/tsconfig-react": "^4.2.1",
-    "@xyo-network/react-theme": "^4.0.4",
+    "@xyo-network/react-theme": "^4.1.0",
     "axios": "^1.7.7",
     "buffer": "^6.0.3",
     "eslint": "^9.12.0",

diff --git a/packages/accordion/package.json b/packages/accordion/package.json
@@ -40,8 +40,8 @@
     "@xylabs/react-button": "workspace:^"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/react-flexbox": "workspace:^",

diff --git a/packages/animation/package.json b/packages/animation/package.json
@@ -41,7 +41,7 @@
     "@xylabs/react-flexbox": "workspace:^"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/appbar/package.json b/packages/appbar/package.json
@@ -40,8 +40,8 @@
     "@xylabs/react-flexbox": "workspace:^"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/async-effect/package.json b/packages/async-effect/package.json
@@ -40,7 +40,7 @@
     "@xylabs/react-promise": "workspace:^"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/base-page/package.json b/packages/base-page/package.json
@@ -45,8 +45,8 @@
     "react-helmet": "^6.1.0"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@types/react-helmet": "^6.1.11",

diff --git a/packages/button/package.json b/packages/button/package.json
@@ -42,7 +42,7 @@
     "react-router-dom": "^6.27.0"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/react-flexbox": "workspace:^",

diff --git a/packages/button/src/components/ButtonExProps.tsx b/packages/button/src/components/ButtonExProps.tsx
@@ -2,30 +2,45 @@ import type { ButtonProps } from '@mui/material'
 import type { BoxlikeComponentProps, BusyProps } from '@xylabs/react-shared'
 import type { NavigateOptions, To } from 'react-router-dom'
 
-export interface ButtonBaseExProps extends Omit<ButtonProps, 'ref' | 'href'>, BoxlikeComponentProps, BusyProps {
-  disableUserEvents?: boolean
-  funnel?: string
-  intent?: string
-  placement?: string
-  target?: string
+export interface ButtonOnlyHrefProps {
+  href?: string
+  to?: never
+  toOptions?: never
 }
 
-export interface ButtonToExProps extends ButtonBaseExProps {
+export interface ButtonOnlyToProps {
   href?: never
-  to: To
+  to?: To
   toOptions?: NavigateOptions
 }
 
-export interface ButtonHrefExProps extends ButtonBaseExProps {
-  href: string
+export interface ButtonNoToOrHrefProps {
+  href?: never
   to?: never
   toOptions?: never
 }
 
-export interface ButtonClickExProps extends ButtonBaseExProps {
-  href?: never
-  to?: never
-  toOptions?: never
+export type ButtonHrefOrToOrNoProps = ButtonOnlyHrefProps | ButtonOnlyToProps | ButtonNoToOrHrefProps
+
+export interface ButtonHrefAndToProps {
+  href?: string
+  to?: To
+  toOptions?: NavigateOptions
+}
+
+export const asButtonHrefOrToProps = (props: ButtonHrefAndToProps): ButtonHrefOrToOrNoProps => {
+  if (props.href && (props.to || props.toOptions)) {
+    throw new Error('ButtonExProps: cannot have both href and to')
+  }
+  return props.href ? { href: props.href } : props.to ? { to: props.to, toOptions: props.toOptions } : {}
+}
+
+export interface ButtonBaseExProps extends Omit<ButtonProps, 'ref' | 'href'>, BoxlikeComponentProps, BusyProps {
+  disableUserEvents?: boolean
+  funnel?: string
+  intent?: string
+  placement?: string
+  target?: string
 }
 
-export type ButtonExProps = ButtonToExProps | ButtonHrefExProps | ButtonClickExProps
+export type ButtonExProps = ButtonBaseExProps & ButtonHrefOrToOrNoProps
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -46,7 +46,7 @@
     "react-router-dom": "^6.27.0"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/cookie-consent/package.json b/packages/cookie-consent/package.json
@@ -42,7 +42,7 @@
     "@xylabs/react-shared": "workspace:^"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -52,12 +52,12 @@
     "ethers": "^6.13.4",
     "lru-cache": "^11.0.1",
     "react-router-dom": "^6.27.0",
-    "viem": "^2.21.25",
+    "viem": "^2.21.26",
     "webextension-polyfill": "^0.12.0"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/dialogs/package.json b/packages/dialogs/package.json
@@ -42,7 +42,7 @@
     "axios": "^1.7.7"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/error/package.json b/packages/error/package.json
@@ -40,8 +40,8 @@
     "@xylabs/react-flexbox": "workspace:^"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/experiments/package.json b/packages/experiments/package.json
@@ -45,7 +45,7 @@
     "@xylabs/react-shared": "workspace:^"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -37,7 +37,7 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/identicon/package.json b/packages/identicon/package.json
@@ -41,7 +41,7 @@
     "md5": "^2.3.0"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@types/md5": "^2.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/invertible-theme/package.json b/packages/invertible-theme/package.json
@@ -43,8 +43,8 @@
     "rfdc": "^1.4.1"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/link/src/LinkExProps.tsx b/packages/link/src/LinkExProps.tsx
@@ -1,11 +1,44 @@
 import type { LinkProps } from '@mui/material'
 import type { NavigateOptions, To } from 'react-router-dom'
 
-export interface LinkExProps extends Omit<LinkProps, 'ref'> {
+export interface LinkOnlyHrefProps {
+  href?: string
+  to?: never
+  toOptions?: never
+}
+
+export interface LinkOnlyToProps {
+  href?: never
+  to?: To
+  toOptions?: NavigateOptions
+}
+
+export interface LinkNoToOrHrefProps {
+  href?: never
+  to?: never
+  toOptions?: never
+}
+
+export type LinkHrefOrToOrNoProps = LinkOnlyHrefProps | LinkOnlyToProps | LinkNoToOrHrefProps
+
+export interface LinkHrefAndToProps {
+  href?: string
+  to?: To
+  toOptions?: NavigateOptions
+}
+
+export const asLinkHrefOrToProps = (props: LinkHrefAndToProps): LinkHrefOrToOrNoProps => {
+  if (props.href && (props.to || props.toOptions)) {
+    throw new Error('LinkExProps: cannot have both href and to')
+  }
+  return props.href ? { href: props.href } : props.to ? { to: props.to, toOptions: props.toOptions } : {}
+}
+
+export interface LinkExBaseProps extends Omit<LinkProps, 'ref' | 'href'> {
   disableUserEvents?: boolean
   funnel?: string
   intent?: string
   placement?: string
-  to?: To
-  toOptions?: NavigateOptions
 }
+
+export type LinkExProps = LinkExBaseProps & LinkHrefOrToOrNoProps
diff --git a/packages/number-status/package.json b/packages/number-status/package.json
@@ -42,7 +42,7 @@
     "numeral": "^2.0.6"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/numeral": "^2.0.5",
     "@types/react": "^18.3.11",

diff --git a/packages/pixel-debugger/package.json b/packages/pixel-debugger/package.json
@@ -46,7 +46,7 @@
     "@xylabs/react-shared": "workspace:^"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",

diff --git a/packages/promise/package.json b/packages/promise/package.json
@@ -40,7 +40,7 @@
     "async-mutex": "^0.5.0"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/delay": "^4.2.0",

diff --git a/packages/quick-tip-button/package.json b/packages/quick-tip-button/package.json
@@ -40,8 +40,8 @@
     "@xylabs/react-dialogs": "workspace:^"
   },
   "devDependencies": {
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/react-flexbox": "workspace:^",

diff --git a/packages/select/package.json b/packages/select/package.json
@@ -37,7 +37,7 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",
     "@xylabs/tsconfig-react": "^4.2.1",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -42,7 +42,7 @@
     "@xylabs/react-async-effect": "workspace:^"
   },
   "devDependencies": {
-    "@mui/material": "^6.1.3",
+    "@mui/material": "^6.1.4",
     "@storybook/react": "^8.3.5",
     "@types/react": "^18.3.11",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",