@xylabs/react-button 6.0.0-rc.1 → 6.0.0-rc.2

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

@@ -1,5 +1,10 @@
 import React from 'react';
 import type { ButtonExProps } from './ButtonExProps.tsx';
-declare const ButtonEx: React.ForwardRefExoticComponent<ButtonExProps & React.RefAttributes<HTMLButtonElement>>;
+declare const ButtonEx: {
+    ({ ref, ...props }: ButtonExProps & {
+        ref?: React.RefObject<HTMLButtonElement | null>;
+    }): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+};
 export { ButtonEx };
 //# sourceMappingURL=ButtonEx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ButtonEx.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonEx.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAGzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGxD,QAAA,MAAM,QAAQ,yFAOZ,CAAA;AAIF,OAAO,EAAE,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"ButtonEx.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonEx.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGxD,QAAA,MAAM,QAAQ;wBAAuB,aAAa,GAAG;QAAE,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;KAAE;;CAOvG,CAAA;AAID,OAAO,EAAE,QAAQ,EAAE,CAAA"}

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

@@ -1,5 +1,10 @@
 import React from 'react';
 import type { ButtonExProps } from './ButtonExProps.tsx';
-declare const ButtonExBase: React.ForwardRefExoticComponent<ButtonExProps & React.RefAttributes<HTMLButtonElement>>;
+declare const ButtonExBase: {
+    ({ ref, funnel, intent, target, placement, disableUserEvents, href, ...props }: ButtonExProps & {
+        ref?: React.RefObject<HTMLButtonElement | null>;
+    }): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+};
 export { ButtonExBase };
 //# sourceMappingURL=ButtonExBase.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ButtonExBase.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonExBase.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,QAAA,MAAM,YAAY,yFAsDhB,CAAA;AAIF,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"ButtonExBase.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonExBase.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,QAAA,MAAM,YAAY;oFAEf,aAAa,GAAG;QAAE,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;KAAE;;CAoDrE,CAAA;AAID,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -1,5 +1,10 @@
 import React from 'react';
 import type { ButtonExProps } from './ButtonExProps.tsx';
-declare const ButtonToEx: React.ForwardRefExoticComponent<ButtonExProps & React.RefAttributes<HTMLButtonElement>>;
+declare const ButtonToEx: {
+    ({ ref, to, toOptions, onClick, ...props }: ButtonExProps & {
+        ref?: React.RefObject<HTMLButtonElement | null>;
+    }): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+};
 export { ButtonToEx };
 //# sourceMappingURL=ButtonExTo.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ButtonExTo.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonExTo.tsx"],"names":[],"mappings":"AACA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAIzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,QAAA,MAAM,UAAU,yFAYd,CAAA;AAIF,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"ButtonExTo.d.ts","sourceRoot":"","sources":["../../../src/components/ButtonExTo.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAExD,QAAA,MAAM,UAAU;gDAEb,aAAa,GAAG;QAAE,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;KAAE;;CAUrE,CAAA;AAID,OAAO,EAAE,UAAU,EAAE,CAAA"}

package/dist/browser/index.mjs

@@ -2,14 +2,14 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/components/ButtonEx.tsx
-import React3, { forwardRef as forwardRef3 } from "react";
+import React3 from "react";
 
 // src/components/ButtonExBase.tsx
 import { Button, useTheme } from "@mui/material";
 import { useUserEvents } from "@xylabs/react-pixel";
 import { BusyCircularProgress, BusyLinearProgress, mergeBoxlikeStyles } from "@xylabs/react-shared";
-import React, { forwardRef } from "react";
-var ButtonExBase = /* @__PURE__ */ forwardRef(({ funnel, intent, target, placement, disableUserEvents, href, ...props }, ref) => {
+import React from "react";
+var ButtonExBase = /* @__PURE__ */ __name(({ ref, funnel, intent, target, placement, disableUserEvents, href, ...props }) => {
   const theme = useTheme();
   const userEvents = useUserEvents();
   const { busy, busyVariant = "linear", busyOpacity, onClick, children, ...rootProps } = mergeBoxlikeStyles(theme, props);
@@ -61,13 +61,13 @@ var ButtonExBase = /* @__PURE__ */ forwardRef(({ funnel, intent, target, placeme
     size: 24,
     opacity: busyOpacity ?? 0.5
   }) : null, children);
-});
+}, "ButtonExBase");
 ButtonExBase.displayName = "ButtonExBaseXYLabs";
 
 // src/components/ButtonExTo.tsx
-import React2, { forwardRef as forwardRef2 } from "react";
+import React2 from "react";
 import { useNavigate } from "react-router-dom";
-var ButtonToEx = /* @__PURE__ */ forwardRef2(({ to, toOptions, onClick, ...props }, ref) => {
+var ButtonToEx = /* @__PURE__ */ __name(({ ref, to, toOptions, onClick, ...props }) => {
   const navigate = useNavigate();
   const localOnClick = /* @__PURE__ */ __name((event) => {
     onClick?.(event);
@@ -80,11 +80,11 @@ var ButtonToEx = /* @__PURE__ */ forwardRef2(({ to, toOptions, onClick, ...props
     onClick: localOnClick,
     ...props
   });
-});
+}, "ButtonToEx");
 ButtonToEx.displayName = "ButtonToExXYLabs";
 
 // src/components/ButtonEx.tsx
-var ButtonEx = /* @__PURE__ */ forwardRef3((props, ref) => {
+var ButtonEx = /* @__PURE__ */ __name(({ ref, ...props }) => {
   if (props.to) {
     const { to, ...additionalProps } = props;
     return /* @__PURE__ */ React3.createElement(ButtonToEx, {
@@ -95,7 +95,7 @@ var ButtonEx = /* @__PURE__ */ forwardRef3((props, ref) => {
   } else {
     return /* @__PURE__ */ React3.createElement(ButtonExBase, props);
   }
-});
+}, "ButtonEx");
 ButtonEx.displayName = "ButtonExXYLabs";
 
 // src/components/ButtonExProps.tsx

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"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      void 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"]}
+{"version":3,"sources":["../../src/components/ButtonEx.tsx","../../src/components/ButtonExBase.tsx","../../src/components/ButtonExTo.tsx","../../src/components/ButtonExProps.tsx"],"sourcesContent":["import React from 'react'\n\nimport { ButtonExBase } from './ButtonExBase.tsx'\nimport type { ButtonExProps } from './ButtonExProps.tsx'\nimport { ButtonToEx } from './ButtonExTo.tsx'\n\nconst ButtonEx = ({ ref, ...props }: ButtonExProps & { ref?: React.RefObject<HTMLButtonElement | null> }) => {\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 from 'react'\n\nimport type { ButtonExProps } from './ButtonExProps.tsx'\n\nconst ButtonExBase = ({\n  ref, funnel, intent, target, placement, disableUserEvents, href, ...props\n}: ButtonExProps & { ref?: React.RefObject<HTMLButtonElement | null> }) => {\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 from 'react'\nimport { useNavigate } from 'react-router-dom'\n\nimport { ButtonExBase } from './ButtonExBase.tsx'\nimport type { ButtonExProps } from './ButtonExProps.tsx'\n\nconst ButtonToEx = ({\n  ref, to, toOptions, onClick, ...props\n}: ButtonExProps & { ref?: React.RefObject<HTMLButtonElement | null> }) => {\n  const navigate = useNavigate()\n  const localOnClick = (event: MouseEvent<HTMLButtonElement>) => {\n    onClick?.(event)\n    if (to) {\n      void 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","Button","useTheme","useUserEvents","BusyCircularProgress","BusyLinearProgress","mergeBoxlikeStyles","React","ButtonExBase","ref","funnel","intent","target","placement","disableUserEvents","href","props","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","useNavigate","ButtonToEx","ref","to","toOptions","onClick","props","navigate","useNavigate","localOnClick","event","React","ButtonExBase","displayName","ButtonEx","ref","props","to","additionalProps","React","ButtonToEx","ButtonExBase","displayName","asButtonHrefOrToProps","props","href","to","toOptions","Error"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/react-button",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.2",
   "description": "Common React library for all XY Labs projects that use React",
   "keywords": [
     "utility",
@@ -37,16 +37,16 @@
     "packages/*"
   ],
   "dependencies": {
-    "@xylabs/react-pixel": "^6.0.0-rc.1",
-    "@xylabs/react-shared": "^6.0.0-rc.1",
+    "@xylabs/react-pixel": "^6.0.0-rc.2",
+    "@xylabs/react-shared": "^6.0.0-rc.2",
     "react-router-dom": "^7.3.0"
   },
   "devDependencies": {
     "@mui/material": "^6.4.7",
     "@storybook/react": "^8.6.4",
     "@types/react": "^19.0.10",
-    "@xylabs/react-flexbox": "^6.0.0-rc.1",
-    "@xylabs/react-pixel": "^6.0.0-rc.1",
+    "@xylabs/react-flexbox": "^6.0.0-rc.2",
+    "@xylabs/react-pixel": "^6.0.0-rc.2",
     "@xylabs/ts-scripts-yarn3": "^5.1.14",
     "@xylabs/tsconfig-react": "^5.1.14",
     "react": "^19.0.0",

package/src/components/ButtonEx.tsx

@@ -1,17 +1,17 @@
-import React, { forwardRef } from 'react'
+import React from 'react'
 
 import { ButtonExBase } from './ButtonExBase.tsx'
 import type { ButtonExProps } from './ButtonExProps.tsx'
 import { ButtonToEx } from './ButtonExTo.tsx'
 
-const ButtonEx = forwardRef<HTMLButtonElement, ButtonExProps>((props, ref) => {
+const ButtonEx = ({ ref, ...props }: ButtonExProps & { ref?: React.RefObject<HTMLButtonElement | null> }) => {
   if (props.to) {
     const { to, ...additionalProps } = props
     return <ButtonToEx to={to} ref={ref} {...additionalProps} />
   } else {
     return <ButtonExBase {...props} />
   }
-})
+}
 
 ButtonEx.displayName = 'ButtonExXYLabs'
 

package/src/components/ButtonExBase.tsx

@@ -4,13 +4,13 @@ import {
   BusyCircularProgress, BusyLinearProgress, mergeBoxlikeStyles,
 } from '@xylabs/react-shared'
 import type { MouseEvent } from 'react'
-import React, { forwardRef } from 'react'
+import React from 'react'
 
 import type { ButtonExProps } from './ButtonExProps.tsx'
 
-const ButtonExBase = forwardRef<HTMLButtonElement, ButtonExProps>(({
-  funnel, intent, target, placement, disableUserEvents, href, ...props
-}, ref) => {
+const ButtonExBase = ({
+  ref, funnel, intent, target, placement, disableUserEvents, href, ...props
+}: ButtonExProps & { ref?: React.RefObject<HTMLButtonElement | null> }) => {
   const theme = useTheme()
   const userEvents = useUserEvents()
   const {
@@ -62,7 +62,7 @@ const ButtonExBase = forwardRef<HTMLButtonElement, ButtonExProps>(({
       {children}
     </Button>
   )
-})
+}
 
 ButtonExBase.displayName = 'ButtonExBaseXYLabs'
 

package/src/components/ButtonExTo.tsx

@@ -1,13 +1,13 @@
 import type { MouseEvent } from 'react'
-import React, { forwardRef } from 'react'
+import React from 'react'
 import { useNavigate } from 'react-router-dom'
 
 import { ButtonExBase } from './ButtonExBase.tsx'
 import type { ButtonExProps } from './ButtonExProps.tsx'
 
-const ButtonToEx = forwardRef<HTMLButtonElement, ButtonExProps>(({
-  to, toOptions, onClick, ...props
-}, ref) => {
+const ButtonToEx = ({
+  ref, to, toOptions, onClick, ...props
+}: ButtonExProps & { ref?: React.RefObject<HTMLButtonElement | null> }) => {
   const navigate = useNavigate()
   const localOnClick = (event: MouseEvent<HTMLButtonElement>) => {
     onClick?.(event)
@@ -17,7 +17,7 @@ const ButtonToEx = forwardRef<HTMLButtonElement, ButtonExProps>(({
   }
 
   return <ButtonExBase ref={ref} onClick={localOnClick} {...props} />
-})
+}
 
 ButtonToEx.displayName = 'ButtonToExXYLabs'