@xylabs/react-button 5.2.0 → 5.2.2

package/dist/browser/components/ButtonExProps.d.ts

@@ -1,27 +1,34 @@
 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;
-    to?: never;
-    toOptions?: never;
-}
-export interface ButtonClickExProps extends ButtonBaseExProps {
+export interface ButtonNoToOrHrefProps {
     href?: never;
     to?: never;
     toOptions?: never;
 }
-export type ButtonExProps = ButtonToExProps | ButtonHrefExProps | ButtonClickExProps;
+export type ButtonHrefOrToOrNoProps = ButtonOnlyHrefProps | ButtonOnlyToProps | ButtonNoToOrHrefProps;
+export interface ButtonHrefAndToProps {
+    href?: string;
+    to?: To;
+    toOptions?: NavigateOptions;
+}
+export declare const asButtonHrefOrToProps: (props: ButtonHrefAndToProps) => ButtonHrefOrToOrNoProps;
+export interface ButtonBaseExProps extends Omit<ButtonProps, 'ref' | 'href'>, BoxlikeComponentProps, BusyProps {
+    disableUserEvents?: boolean;
+    funnel?: string;
+    intent?: string;
+    placement?: string;
+    target?: string;
+}
+export type ButtonExProps = ButtonBaseExProps & ButtonHrefOrToOrNoProps;
 //# sourceMappingURL=ButtonExProps.d.ts.map

package/dist/browser/components/ButtonExProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonExProps.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonExProps.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAE3D,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,WAAW,EAAE,KAAK,GAAG,MAAM,CAAC,EAAE,qBAAqB,EAAE,SAAS;IAC5G,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,EAAE,EAAE,EAAE,CAAA;IACN,SAAS,CAAC,EAAE,eAAe,CAAA;CAC5B;AAED,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAC1D,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,SAAS,CAAC,EAAE,KAAK,CAAA;CAClB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,SAAS,CAAC,EAAE,KAAK,CAAA;CAClB;AAED,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,iBAAiB,GAAG,kBAAkB,CAAA"}
+{"version":3,"file":"ButtonExProps.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonExProps.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAE3D,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,SAAS,CAAC,EAAE,KAAK,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,SAAS,CAAC,EAAE,eAAe,CAAA;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,SAAS,CAAC,EAAE,KAAK,CAAA;CAClB;AAED,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,qBAAqB,CAAA;AAErG,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,SAAS,CAAC,EAAE,eAAe,CAAA;CAC5B;AAED,eAAO,MAAM,qBAAqB,UAAW,oBAAoB,KAAG,uBAKnE,CAAA;AAED,MAAM,WAAW,iBAAkB,SAAQ,IAAI,CAAC,WAAW,EAAE,KAAK,GAAG,MAAM,CAAC,EAAE,qBAAqB,EAAE,SAAS;IAC5G,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,uBAAuB,CAAA"}

package/dist/browser/index.mjs

@@ -97,7 +97,21 @@ var ButtonEx = /* @__PURE__ */ forwardRef3((props, ref) => {
   }
 });
 ButtonEx.displayName = "ButtonExXYLabs";
+
+// src/components/ButtonExProps.tsx
+var asButtonHrefOrToProps = /* @__PURE__ */ __name((props) => {
+  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
+  } : {};
+}, "asButtonHrefOrToProps");
 export {
-  ButtonEx
+  ButtonEx,
+  asButtonHrefOrToProps
 };
 //# sourceMappingURL=index.mjs.map

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/components/ButtonEx.tsx","../../src/components/ButtonExBase.tsx","../../src/components/ButtonExTo.tsx"],"sourcesContent":["import React, { forwardRef } from 'react'\n\nimport { ButtonExBase } from './ButtonExBase.tsx'\nimport type { ButtonExProps } from './ButtonExProps.tsx'\nimport { ButtonToEx } from './ButtonExTo.tsx'\n\nconst ButtonEx = forwardRef<HTMLButtonElement, ButtonExProps>((props, ref) => {\n  if (props.to) {\n    const { to, ...additionalProps } = props\n    return <ButtonToEx to={to} ref={ref} {...additionalProps} />\n  } else {\n    return <ButtonExBase {...props} />\n  }\n})\n\nButtonEx.displayName = 'ButtonExXYLabs'\n\nexport { ButtonEx }\n","import { Button, useTheme } from '@mui/material'\nimport { useUserEvents } from '@xylabs/react-pixel'\nimport {\n  BusyCircularProgress, BusyLinearProgress, mergeBoxlikeStyles,\n} from '@xylabs/react-shared'\nimport type { MouseEvent } from 'react'\nimport React, { forwardRef } from 'react'\n\nimport type { ButtonExProps } from './ButtonExProps.tsx'\n\nconst ButtonExBase = forwardRef<HTMLButtonElement, ButtonExProps>(({\n  funnel, intent, target, placement, disableUserEvents, href, ...props\n}, ref) => {\n  const theme = useTheme()\n  const userEvents = useUserEvents()\n  const {\n    busy, busyVariant = 'linear', busyOpacity, onClick, children, ...rootProps\n  } = mergeBoxlikeStyles<ButtonExProps>(theme, props)\n\n  const localOnClick = (event: MouseEvent<HTMLButtonElement>) => {\n    if (busy) {\n      // If it is busy, do not allow href clicks\n      event.preventDefault()\n    } else {\n      const elementName = props['aria-label'] ?? event.currentTarget.textContent\n      // we do this crazy navigate thing so that we can set it up outside the promise so that safari does not block it\n      const windowToNavigate = () => (target && href) ? window.open('', target) ?? globalThis : globalThis\n      const callOnClickAndFollowHref = (windowToNav = windowToNavigate()) => {\n        onClick?.(event)\n        if (href) {\n          windowToNav.location.href = href\n        }\n      }\n      if (!disableUserEvents && userEvents) {\n        event.preventDefault()\n        const windowToNav = windowToNavigate()\n        if (href) {\n          userEvents.userClick({\n            elementName, intent, funnel, placement,\n          }).then(() => {\n            callOnClickAndFollowHref(windowToNav)\n          }).catch((ex) => {\n            console.error('User event failed', elementName, funnel, placement, ex)\n            callOnClickAndFollowHref(windowToNav)\n          })\n        }\n        onClick?.(event)\n      } else {\n        callOnClickAndFollowHref()\n      }\n    }\n  }\n\n  return (\n    <Button ref={ref} href={href} onClick={localOnClick} target={target} {...rootProps}>\n      {busy && busyVariant === 'linear'\n        ? <BusyLinearProgress rounded opacity={busyOpacity ?? 0} />\n        : null}\n      {busy && busyVariant === 'circular'\n        ? <BusyCircularProgress rounded size={24} opacity={busyOpacity ?? 0.5} />\n        : null}\n      {children}\n    </Button>\n  )\n})\n\nButtonExBase.displayName = 'ButtonExBaseXYLabs'\n\nexport { ButtonExBase }\n","import type { MouseEvent } from 'react'\nimport React, { forwardRef } from 'react'\nimport { useNavigate } from 'react-router-dom'\n\nimport { ButtonExBase } from './ButtonExBase.tsx'\nimport type { ButtonExProps } from './ButtonExProps.tsx'\n\nconst ButtonToEx = forwardRef<HTMLButtonElement, ButtonExProps>(({\n  to, toOptions, onClick, ...props\n}, ref) => {\n  const navigate = useNavigate()\n  const localOnClick = (event: MouseEvent<HTMLButtonElement>) => {\n    onClick?.(event)\n    if (to) {\n      navigate(to, toOptions)\n    }\n  }\n\n  return <ButtonExBase ref={ref} onClick={localOnClick} {...props} />\n})\n\nButtonToEx.displayName = 'ButtonToExXYLabs'\n\nexport { ButtonToEx }\n"],"mappings":";;;;AAAA,OAAOA,UAASC,cAAAA,mBAAkB;;;ACAlC,SAASC,QAAQC,gBAAgB;AACjC,SAASC,qBAAqB;AAC9B,SACEC,sBAAsBC,oBAAoBC,0BACrC;AAEP,OAAOC,SAASC,kBAAkB;AAIlC,IAAMC,eAAeC,2BAA6C,CAAC,EACjEC,QAAQC,QAAQC,QAAQC,WAAWC,mBAAmBC,MAAM,GAAGC,MAAAA,GAC9DC,QAAAA;AACD,QAAMC,QAAQC,SAAAA;AACd,QAAMC,aAAaC,cAAAA;AACnB,QAAM,EACJC,MAAMC,cAAc,UAAUC,aAAaC,SAASC,UAAU,GAAGC,UAAAA,IAC/DC,mBAAkCV,OAAOF,KAAAA;AAE7C,QAAMa,eAAe,wBAACC,UAAAA;AACpB,QAAIR,MAAM;AAERQ,YAAMC,eAAc;IACtB,OAAO;AACL,YAAMC,cAAchB,MAAM,YAAA,KAAiBc,MAAMG,cAAcC;AAE/D,YAAMC,mBAAmB,6BAAOvB,UAAUG,OAAQqB,OAAOC,KAAK,IAAIzB,MAAAA,KAAW0B,aAAaA,YAAjE;AACzB,YAAMC,2BAA2B,wBAACC,cAAcL,iBAAAA,MAAkB;AAChEV,kBAAUK,KAAAA;AACV,YAAIf,MAAM;AACRyB,sBAAYC,SAAS1B,OAAOA;QAC9B;MACF,GALiC;AAMjC,UAAI,CAACD,qBAAqBM,YAAY;AACpCU,cAAMC,eAAc;AACpB,cAAMS,cAAcL,iBAAAA;AACpB,YAAIpB,MAAM;AACRK,qBAAWsB,UAAU;YACnBV;YAAarB;YAAQD;YAAQG;UAC/B,CAAA,EAAG8B,KAAK,MAAA;AACNJ,qCAAyBC,WAAAA;UAC3B,CAAA,EAAGI,MAAM,CAACC,OAAAA;AACRC,oBAAQC,MAAM,qBAAqBf,aAAatB,QAAQG,WAAWgC,EAAAA;AACnEN,qCAAyBC,WAAAA;UAC3B,CAAA;QACF;AACAf,kBAAUK,KAAAA;MACZ,OAAO;AACLS,iCAAAA;MACF;IACF;EACF,GAhCqB;AAkCrB,SACE,sBAAA,cAACS,QAAAA;IAAO/B;IAAUF;IAAYU,SAASI;IAAcjB;IAAiB,GAAGe;KACtEL,QAAQC,gBAAgB,WACrB,sBAAA,cAAC0B,oBAAAA;IAAmBC,SAAAA;IAAQC,SAAS3B,eAAe;OACpD,MACHF,QAAQC,gBAAgB,aACrB,sBAAA,cAAC6B,sBAAAA;IAAqBF,SAAAA;IAAQG,MAAM;IAAIF,SAAS3B,eAAe;OAChE,MACHE,QAAAA;AAGP,CAAA;AAEAlB,aAAa8C,cAAc;;;ACjE3B,OAAOC,UAASC,cAAAA,mBAAkB;AAClC,SAASC,mBAAmB;AAK5B,IAAMC,aAAaC,gBAAAA,YAA6C,CAAC,EAC/DC,IAAIC,WAAWC,SAAS,GAAGC,MAAAA,GAC1BC,QAAAA;AACD,QAAMC,WAAWC,YAAAA;AACjB,QAAMC,eAAe,wBAACC,UAAAA;AACpBN,cAAUM,KAAAA;AACV,QAAIR,IAAI;AACNK,eAASL,IAAIC,SAAAA;IACf;EACF,GALqB;AAOrB,SAAO,gBAAAQ,OAAA,cAACC,cAAAA;IAAaN;IAAUF,SAASK;IAAe,GAAGJ;;AAC5D,CAAA;AAEAL,WAAWa,cAAc;;;AFfzB,IAAMC,WAAWC,gBAAAA,YAA6C,CAACC,OAAOC,QAAAA;AACpE,MAAID,MAAME,IAAI;AACZ,UAAM,EAAEA,IAAI,GAAGC,gBAAAA,IAAoBH;AACnC,WAAO,gBAAAI,OAAA,cAACC,YAAAA;MAAWH;MAAQD;MAAW,GAAGE;;EAC3C,OAAO;AACL,WAAO,gBAAAC,OAAA,cAACE,cAAiBN,KAAAA;EAC3B;AACF,CAAA;AAEAF,SAASS,cAAc;","names":["React","forwardRef","Button","useTheme","useUserEvents","BusyCircularProgress","BusyLinearProgress","mergeBoxlikeStyles","React","forwardRef","ButtonExBase","forwardRef","funnel","intent","target","placement","disableUserEvents","href","props","ref","theme","useTheme","userEvents","useUserEvents","busy","busyVariant","busyOpacity","onClick","children","rootProps","mergeBoxlikeStyles","localOnClick","event","preventDefault","elementName","currentTarget","textContent","windowToNavigate","window","open","globalThis","callOnClickAndFollowHref","windowToNav","location","userClick","then","catch","ex","console","error","Button","BusyLinearProgress","rounded","opacity","BusyCircularProgress","size","displayName","React","forwardRef","useNavigate","ButtonToEx","forwardRef","to","toOptions","onClick","props","ref","navigate","useNavigate","localOnClick","event","React","ButtonExBase","displayName","ButtonEx","forwardRef","props","ref","to","additionalProps","React","ButtonToEx","ButtonExBase","displayName"]}
+{"version":3,"sources":["../../src/components/ButtonEx.tsx","../../src/components/ButtonExBase.tsx","../../src/components/ButtonExTo.tsx","../../src/components/ButtonExProps.tsx"],"sourcesContent":["import React, { forwardRef } from 'react'\n\nimport { ButtonExBase } from './ButtonExBase.tsx'\nimport type { ButtonExProps } from './ButtonExProps.tsx'\nimport { ButtonToEx } from './ButtonExTo.tsx'\n\nconst ButtonEx = forwardRef<HTMLButtonElement, ButtonExProps>((props, ref) => {\n  if (props.to) {\n    const { to, ...additionalProps } = props\n    return <ButtonToEx to={to} ref={ref} {...additionalProps} />\n  } else {\n    return <ButtonExBase {...props} />\n  }\n})\n\nButtonEx.displayName = 'ButtonExXYLabs'\n\nexport { ButtonEx }\n","import { Button, useTheme } from '@mui/material'\nimport { useUserEvents } from '@xylabs/react-pixel'\nimport {\n  BusyCircularProgress, BusyLinearProgress, mergeBoxlikeStyles,\n} from '@xylabs/react-shared'\nimport type { MouseEvent } from 'react'\nimport React, { forwardRef } from 'react'\n\nimport type { ButtonExProps } from './ButtonExProps.tsx'\n\nconst ButtonExBase = forwardRef<HTMLButtonElement, ButtonExProps>(({\n  funnel, intent, target, placement, disableUserEvents, href, ...props\n}, ref) => {\n  const theme = useTheme()\n  const userEvents = useUserEvents()\n  const {\n    busy, busyVariant = 'linear', busyOpacity, onClick, children, ...rootProps\n  } = mergeBoxlikeStyles<ButtonExProps>(theme, props)\n\n  const localOnClick = (event: MouseEvent<HTMLButtonElement>) => {\n    if (busy) {\n      // If it is busy, do not allow href clicks\n      event.preventDefault()\n    } else {\n      const elementName = props['aria-label'] ?? event.currentTarget.textContent\n      // we do this crazy navigate thing so that we can set it up outside the promise so that safari does not block it\n      const windowToNavigate = () => (target && href) ? window.open('', target) ?? globalThis : globalThis\n      const callOnClickAndFollowHref = (windowToNav = windowToNavigate()) => {\n        onClick?.(event)\n        if (href) {\n          windowToNav.location.href = href\n        }\n      }\n      if (!disableUserEvents && userEvents) {\n        event.preventDefault()\n        const windowToNav = windowToNavigate()\n        if (href) {\n          userEvents.userClick({\n            elementName, intent, funnel, placement,\n          }).then(() => {\n            callOnClickAndFollowHref(windowToNav)\n          }).catch((ex) => {\n            console.error('User event failed', elementName, funnel, placement, ex)\n            callOnClickAndFollowHref(windowToNav)\n          })\n        }\n        onClick?.(event)\n      } else {\n        callOnClickAndFollowHref()\n      }\n    }\n  }\n\n  return (\n    <Button ref={ref} href={href} onClick={localOnClick} target={target} {...rootProps}>\n      {busy && busyVariant === 'linear'\n        ? <BusyLinearProgress rounded opacity={busyOpacity ?? 0} />\n        : null}\n      {busy && busyVariant === 'circular'\n        ? <BusyCircularProgress rounded size={24} opacity={busyOpacity ?? 0.5} />\n        : null}\n      {children}\n    </Button>\n  )\n})\n\nButtonExBase.displayName = 'ButtonExBaseXYLabs'\n\nexport { ButtonExBase }\n","import type { MouseEvent } from 'react'\nimport React, { forwardRef } from 'react'\nimport { useNavigate } from 'react-router-dom'\n\nimport { ButtonExBase } from './ButtonExBase.tsx'\nimport type { ButtonExProps } from './ButtonExProps.tsx'\n\nconst ButtonToEx = forwardRef<HTMLButtonElement, ButtonExProps>(({\n  to, toOptions, onClick, ...props\n}, ref) => {\n  const navigate = useNavigate()\n  const localOnClick = (event: MouseEvent<HTMLButtonElement>) => {\n    onClick?.(event)\n    if (to) {\n      navigate(to, toOptions)\n    }\n  }\n\n  return <ButtonExBase ref={ref} onClick={localOnClick} {...props} />\n})\n\nButtonToEx.displayName = 'ButtonToExXYLabs'\n\nexport { ButtonToEx }\n","import type { ButtonProps } from '@mui/material'\nimport type { BoxlikeComponentProps, BusyProps } from '@xylabs/react-shared'\nimport type { NavigateOptions, To } from 'react-router-dom'\n\nexport interface ButtonOnlyHrefProps {\n  href?: string\n  to?: never\n  toOptions?: never\n}\n\nexport interface ButtonOnlyToProps {\n  href?: never\n  to?: To\n  toOptions?: NavigateOptions\n}\n\nexport interface ButtonNoToOrHrefProps {\n  href?: never\n  to?: never\n  toOptions?: never\n}\n\nexport type ButtonHrefOrToOrNoProps = ButtonOnlyHrefProps | ButtonOnlyToProps | ButtonNoToOrHrefProps\n\nexport interface ButtonHrefAndToProps {\n  href?: string\n  to?: To\n  toOptions?: NavigateOptions\n}\n\nexport const asButtonHrefOrToProps = (props: ButtonHrefAndToProps): ButtonHrefOrToOrNoProps => {\n  if (props.href && (props.to || props.toOptions)) {\n    throw new Error('ButtonExProps: cannot have both href and to')\n  }\n  return props.href ? { href: props.href } : props.to ? { to: props.to, toOptions: props.toOptions } : {}\n}\n\nexport interface ButtonBaseExProps extends Omit<ButtonProps, 'ref' | 'href'>, BoxlikeComponentProps, BusyProps {\n  disableUserEvents?: boolean\n  funnel?: string\n  intent?: string\n  placement?: string\n  target?: string\n}\n\nexport type ButtonExProps = ButtonBaseExProps & ButtonHrefOrToOrNoProps\n"],"mappings":"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","names":["React","forwardRef","Button","useTheme","useUserEvents","BusyCircularProgress","BusyLinearProgress","mergeBoxlikeStyles","React","forwardRef","ButtonExBase","forwardRef","funnel","intent","target","placement","disableUserEvents","href","props","ref","theme","useTheme","userEvents","useUserEvents","busy","busyVariant","busyOpacity","onClick","children","rootProps","mergeBoxlikeStyles","localOnClick","event","preventDefault","elementName","currentTarget","textContent","windowToNavigate","window","open","globalThis","callOnClickAndFollowHref","windowToNav","location","userClick","then","catch","ex","console","error","Button","BusyLinearProgress","rounded","opacity","BusyCircularProgress","size","displayName","React","forwardRef","useNavigate","ButtonToEx","forwardRef","to","toOptions","onClick","props","ref","navigate","useNavigate","localOnClick","event","React","ButtonExBase","displayName","ButtonEx","forwardRef","props","ref","to","additionalProps","React","ButtonToEx","ButtonExBase","displayName","asButtonHrefOrToProps","props","href","to","toOptions","Error"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/react-button",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "Common React library for all XY Labs projects that use React",
   "keywords": [
     "utility",
@@ -37,15 +37,16 @@
     "packages/*"
   ],
   "dependencies": {
-    "@xylabs/react-pixel": "^5.2.0",
-    "@xylabs/react-shared": "^5.2.0",
+    "@xylabs/react-pixel": "^5.2.2",
+    "@xylabs/react-shared": "^5.2.2",
     "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": "^5.2.0",
+    "@xylabs/react-flexbox": "^5.2.2",
+    "@xylabs/react-pixel": "^5.2.2",
     "@xylabs/ts-scripts-yarn3": "^4.2.1",
     "@xylabs/tsconfig-react": "^4.2.1",
     "react": "^18.3.1",

package/src/components/ButtonEx.stories.tsx

@@ -1,5 +1,6 @@
 import type { Meta, StoryFn } from '@storybook/react'
 import { FlexCol, FlexRow } from '@xylabs/react-flexbox'
+import { UserEventsProvider, XyoUserEventHandler } from '@xylabs/react-pixel'
 import React from 'react'
 
 import { ButtonEx } from './ButtonEx.tsx'
@@ -29,6 +30,26 @@ const DefaultTemplate: StoryFn<typeof ButtonEx> = args => (
   </FlexRow>
 )
 
+const UserEventTemplate: StoryFn<typeof ButtonEx> = args => (
+  <UserEventsProvider userEvents={XyoUserEventHandler.get()}>
+    <FlexRow justifyContent="flex-start">
+      <FlexCol marginX={1}>
+        <ButtonEx {...args}>Default</ButtonEx>
+      </FlexCol>
+      <FlexCol marginX={1}>
+        <ButtonEx variant="outlined" {...args}>
+          Outlined
+        </ButtonEx>
+      </FlexCol>
+      <FlexCol marginX={1}>
+        <ButtonEx variant="contained" {...args}>
+          Contained
+        </ButtonEx>
+      </FlexCol>
+    </FlexRow>
+  </UserEventsProvider>
+)
+
 const Default = DefaultTemplate.bind({})
 Default.args = {}
 
@@ -49,8 +70,17 @@ HrefTargetOnClick.args = {
   href: 'https://xylabs.com', target: '_blank', onClick: () => console.log('Clicked'),
 }
 
+const HrefTargetWithEvents = UserEventTemplate.bind({})
+HrefTargetWithEvents.args = { href: 'https://xylabs.com', target: '_blank' }
+
+const HrefTargetOnClickWithEvents = UserEventTemplate.bind({})
+HrefTargetOnClickWithEvents.args = {
+  href: 'https://xylabs.com', target: '_blank', onClick: () => console.log('Clicked'),
+}
+
 export {
-  BusyCircular, BusyLinear, Default, Href, HrefTarget, HrefTargetOnClick,
+  BusyCircular, BusyLinear, Default, Href, HrefTarget, HrefTargetOnClick, HrefTargetOnClickWithEvents,
+  HrefTargetWithEvents,
 }
 
 export default StorybookEntry

package/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