reshaped 3.8.0-canary.2 → 3.8.0-canary.4

package/dist/components/Actionable/Actionable.js

@@ -1,11 +1,11 @@
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef } from "react";
 import { classNames } from "../../utilities/props.js";
 import * as keys from "../../constants/keys.js";
 import s from "./Actionable.module.css";
 const Actionable = forwardRef((props, ref) => {
-    const { children, href, onClick, type, disabled, insetFocus, disableFocusRing, borderRadius, as, stopPropagation, fullWidth, touchHitbox, className, attributes, } = props;
+    const { children, render, href, onClick, type, disabled, insetFocus, disableFocusRing, borderRadius, as, stopPropagation, fullWidth, touchHitbox, className, attributes, } = props;
     const rootClassNames = classNames(s.root, className, disabled && s["--disabled"], borderRadius && s[`--radius-${borderRadius}`], insetFocus && s["--inset"], disableFocusRing && s["--disabled-focus-ring"], fullWidth && s["--full-width"]);
     const rootAttributes = { ...attributes };
     const hasClickHandler = onClick || attributes?.onClick;
@@ -57,7 +57,20 @@ const Actionable = forwardRef((props, ref) => {
         event.preventDefault();
         handlePress(event);
     };
-    return (_jsxs(TagName, { ref: ref, ...rootAttributes, "aria-disabled": disabled ? true : undefined, className: rootClassNames, onClick: handlePress, onKeyDown: handleKeyDown, children: [touchHitbox && (isLink || isButton) && !disabled && _jsx("span", { className: s.touch }), children] }));
+    const childrenNode = (_jsxs(_Fragment, { children: [touchHitbox && (isLink || isButton) && !disabled && _jsx("span", { className: s.touch }), children] }));
+    const tagAttributes = {
+        ref: ref,
+        // rootAttributes can receive ref from Flyout
+        ...rootAttributes,
+        className: rootClassNames,
+        onClick: handlePress,
+        onKeyDown: handleKeyDown,
+        "aria-disabled": disabled ? true : undefined,
+        children: childrenNode,
+    };
+    if (render)
+        return render(tagAttributes);
+    return _jsx(TagName, { ...tagAttributes });
 });
 Actionable.displayName = "Actionable";
 export default Actionable;

package/dist/components/Actionable/Actionable.types.d.ts

@@ -1,8 +1,21 @@
 import type React from "react";
 import type * as G from "../../types/global";
+export type AttributesRef = React.RefObject<HTMLButtonElement | null>;
+type Attributes = G.Attributes<"button"> & Omit<React.JSX.IntrinsicElements["a"], keyof G.Attributes<"button">> & {
+    ref?: AttributesRef;
+};
 export type Props = {
     /** Node for inserting the content */
     children?: React.ReactNode;
+    /** Render a custom root element, useful for integrating with routers */
+    render?: (attributes: Attributes & {
+        ref: AttributesRef;
+        className: string;
+        onClick: (e: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>) => void;
+        onKeyDown: (e: React.KeyboardEvent<HTMLElement>) => void;
+        "aria-disabled"?: boolean;
+        children: React.ReactNode;
+    }) => React.ReactNode;
     /** Callback when clicked, renders it as a button tag if href is not provided */
     onClick?: (e: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>) => void;
     /** URL, renders it as an anchor tag */
@@ -28,8 +41,7 @@ export type Props = {
     /** Additional classname for the root element */
     className?: G.ClassName;
     /** Additional attributes for the root element */
-    attributes?: G.Attributes<"button"> & Omit<React.JSX.IntrinsicElements["a"], keyof G.Attributes<"button">> & {
-        ref?: React.RefObject<HTMLButtonElement | HTMLAnchorElement | null>;
-    };
+    attributes?: Attributes;
 };
 export type Ref = React.Ref<HTMLButtonElement | HTMLAnchorElement>;
+export {};

package/dist/components/Actionable/tests/Actionable.stories.d.ts

@@ -1,4 +1,5 @@
 import { StoryObj } from "@storybook/react-vite";
+import { fn } from "storybook/test";
 declare const _default: {
     title: string;
     component: import("react").ForwardRefExoticComponent<import("./..").ActionableProps & import("react").RefAttributes<import("./..").ActionableRef>>;
@@ -9,7 +10,10 @@ declare const _default: {
     };
 };
 export default _default;
-export declare const base: StoryObj;
+export declare const base: StoryObj<{
+    handleClick: ReturnType<typeof fn>;
+    handleSecondClick: ReturnType<typeof fn>;
+}>;
 export declare const disabled: StoryObj;
 export declare const fullWidth: StoryObj;
 export declare const insetFocus: {
@@ -27,3 +31,11 @@ export declare const borderRadius: {
     render: () => import("react").JSX.Element;
     play: () => Promise<void>;
 };
+export declare const type: StoryObj<{
+    handleSubmit: ReturnType<typeof fn>;
+}>;
+export declare const as: StoryObj;
+export declare const stopPropagation: StoryObj<{
+    handleParentClick: ReturnType<typeof fn>;
+}>;
+export declare const className: StoryObj;

package/dist/components/Actionable/tests/Actionable.stories.js

@@ -1,4 +1,4 @@
-import { userEvent, expect } from "storybook/test";
+import { userEvent, expect, fn } from "storybook/test";
 import { Example } from "../../../utilities/storybook/index.js";
 import Actionable from "../index.js";
 import View from "../../View/index.js";
@@ -12,17 +12,64 @@ export default {
     },
 };
 export const base = {
-    name: "base",
-    render: () => (<Example>
-			<Example.Item title="link">
+    name: "href, onClick",
+    args: {
+        handleClick: fn(),
+        handleSecondClick: fn(),
+    },
+    render: (args) => (<Example>
+			<Example.Item title="span">
+				<Actionable>Span</Actionable>
+			</Example.Item>
+			<Example.Item title="onClick">
+				<Actionable onClick={args.handleClick}>Button</Actionable>
+			</Example.Item>
+			<Example.Item title="href">
 				<Actionable href="https://reshaped.so" attributes={{ target: "_blank" }}>
 					Link
 				</Actionable>
 			</Example.Item>
-			<Example.Item title="button">
-				<Actionable onClick={() => { }}>Button</Actionable>
+
+			<Example.Item title="attributes.href">
+				<Actionable attributes={{ href: "https://reshaped.so" }}>Link with attributes</Actionable>
+			</Example.Item>
+
+			<Example.Item title="href, onClick">
+				<Actionable onClick={(e) => {
+            e.preventDefault();
+            args.handleSecondClick(e);
+        }} href="https://reshaped.so">
+					Link with onClick
+				</Actionable>
 			</Example.Item>
 		</Example>),
+    play: async ({ canvas, args }) => {
+        const span = canvas.getByText("Span");
+        const link = canvas.getByText("Link");
+        const button = canvas.getByText("Button");
+        const linkWithAttributes = canvas.getByText("Link with attributes");
+        const linkWithOnClick = canvas.getByText("Link with onClick");
+        expect(span).toBeInTheDocument();
+        expect(span.tagName).toBe("SPAN");
+        expect(link).toBeInTheDocument();
+        expect(link).toHaveRole("link");
+        expect(link).toHaveAttribute("href", "https://reshaped.so");
+        await userEvent.click(button);
+        expect(button).toBeInTheDocument();
+        expect(button).toHaveRole("button");
+        expect(button).toHaveAttribute("type", "button");
+        expect(args.handleClick).toHaveBeenCalledTimes(1);
+        expect(args.handleClick).toHaveBeenCalledWith(expect.objectContaining({ target: button }));
+        expect(linkWithAttributes).toBeInTheDocument();
+        expect(linkWithAttributes).toHaveRole("link");
+        expect(linkWithAttributes).toHaveAttribute("href", "https://reshaped.so");
+        await userEvent.click(linkWithOnClick);
+        expect(linkWithOnClick).toBeInTheDocument();
+        expect(linkWithOnClick).toHaveRole("link");
+        expect(linkWithOnClick).toHaveAttribute("href", "https://reshaped.so");
+        expect(args.handleSecondClick).toHaveBeenCalledTimes(1);
+        expect(args.handleSecondClick).toHaveBeenCalledWith(expect.objectContaining({ target: linkWithOnClick }));
+    },
 };
 export const disabled = {
     name: "disabled",
@@ -88,7 +135,7 @@ export const disableFocusRing = {
 export const borderRadius = {
     name: "borderRadius",
     render: () => (<Example>
-			<Example.Item title="radius: inherit">
+			<Example.Item title="borderRadius: inherit">
 				<Actionable borderRadius="inherit" onClick={() => { }}>
 					<View borderRadius="large">Actionable</View>
 				</Actionable>
@@ -98,3 +145,76 @@ export const borderRadius = {
         await userEvent.keyboard("{Tab/}");
     },
 };
+export const type = {
+    name: "type",
+    args: {
+        handleSubmit: fn(),
+    },
+    render: (args) => (<Example>
+			<Example.Item title="type: submit">
+				<form onSubmit={(e) => {
+            e.preventDefault();
+            args.handleSubmit();
+        }}>
+					<Actionable onClick={() => { }} type="submit">
+						Submit
+					</Actionable>
+				</form>
+			</Example.Item>
+		</Example>),
+    play: async ({ canvas, args }) => {
+        const button = canvas.getAllByRole("button")[0];
+        await userEvent.click(button);
+        expect(args.handleSubmit).toHaveBeenCalledTimes(1);
+    },
+};
+export const as = {
+    name: "as, render",
+    render: () => (<Example>
+			<Example.Item title="as: span">
+				<Actionable onClick={() => { }} as="span">
+					Trigger
+				</Actionable>
+			</Example.Item>
+			<Example.Item title="render, disabled">
+				<Actionable disabled onClick={() => { }} render={(props) => <section {...props}/>}>
+					Trigger
+				</Actionable>
+			</Example.Item>
+		</Example>),
+    play: ({ canvas }) => {
+        const [asEl, renderEl] = canvas.getAllByText("Trigger");
+        expect(asEl.tagName).toBe("SPAN");
+        expect(renderEl.tagName).toBe("SECTION");
+        expect(renderEl).toHaveAttribute("aria-disabled", "true");
+    },
+};
+export const stopPropagation = {
+    name: "stopPropagation",
+    args: {
+        handleParentClick: fn(),
+    },
+    render: (args) => (<div onClick={args.handleParentClick}>
+			<Actionable stopPropagation onClick={() => { }}>
+				Trigger
+			</Actionable>
+		</div>),
+    play: async ({ canvas, args }) => {
+        const button = canvas.getAllByRole("button")[0];
+        await userEvent.click(button);
+        expect(args.handleParentClick).not.toHaveBeenCalled();
+    },
+};
+export const className = {
+    name: "className, attributes",
+    render: () => (<div data-testid="root">
+			<Actionable className="test-classname" attributes={{ id: "test-id" }}>
+				Trigger
+			</Actionable>
+		</div>),
+    play: async ({ canvas }) => {
+        const root = canvas.getByTestId("root").firstChild;
+        expect(root).toHaveClass("test-classname");
+        expect(root).toHaveAttribute("id", "test-id");
+    },
+};

package/dist/components/Button/Button.js

@@ -8,7 +8,7 @@ import ButtonGroup from "./ButtonGroup.js";
 import ButtonAligner from "./ButtonAligner.js";
 import s from "./Button.module.css";
 const Button = forwardRef((props, ref) => {
-    const { variant = "solid", color = "neutral", elevated, highlighted, fullWidth, loading, loadingAriaLabel, disabled, type, href, size = "medium", children, rounded, onClick, icon, endIcon, stopPropagation, as, className, attributes, } = props;
+    const { variant = "solid", color = "neutral", elevated, highlighted, fullWidth, loading, loadingAriaLabel, disabled, type, href, size = "medium", children, rounded, onClick, icon, endIcon, stopPropagation, as, render, className, attributes, } = props;
     const iconOnly = (icon || endIcon) && !children;
     const rootClassName = classNames(s.root, className, color && s[`--color-${color}`], variant && s[`--variant-${variant}`], responsiveClassNames(s, "--size", size), responsiveClassNames(s, "--full-width", fullWidth), elevated && variant !== "ghost" && s["--elevated"], rounded && s["--rounded"], disabled && s["--disabled"], loading && s["--loading"], highlighted && s["--highlighted"], iconOnly && s["--icon-only"]);
     const renderIcon = (position) => {
@@ -30,7 +30,7 @@ const Button = forwardRef((props, ref) => {
     return (_jsxs(Actionable, { disabled: disabled || loading, className: rootClassName, attributes: {
             ...attributes,
             "data-rs-aligner-target": true,
-        }, type: type, onClick: onClick, href: href, ref: ref, as: as, stopPropagation: stopPropagation, children: [loading && (_jsx("div", { className: s.loader, children: _jsx(Loader, { color: "inherit", attributes: { "aria-label": loadingAriaLabel } }) })), renderIcon("start"), children && _jsx("span", { className: s.text, children: children }), renderIcon("end")] }));
+        }, type: type, onClick: onClick, href: href, ref: ref, as: as, stopPropagation: stopPropagation, render: render, children: [loading && (_jsx("div", { className: s.loader, children: _jsx(Loader, { color: "inherit", attributes: { "aria-label": loadingAriaLabel } }) })), renderIcon("start"), children && _jsx("span", { className: s.text, children: children }), renderIcon("end")] }));
 });
 Button.Group = ButtonGroup;
 Button.Aligner = ButtonAligner;

package/dist/components/Button/Button.types.d.ts

@@ -4,7 +4,7 @@ import type { ActionableProps, ActionableRef } from "../Actionable";
 import type { AlignerProps as BaseAlignerProps } from "../_private/Aligner";
 import type * as G from "../../types/global";
 export type Size = "xlarge" | "large" | "medium" | "small";
-export type Props = Pick<ActionableProps, "attributes" | "className" | "disabled" | "children" | "href" | "onClick" | "type" | "as" | "stopPropagation"> & {
+export type Props = Pick<ActionableProps, "attributes" | "className" | "disabled" | "children" | "href" | "onClick" | "type" | "as" | "stopPropagation" | "render"> & {
     /** Component color scheme
      * @default "neutral"
      */

package/dist/components/Button/tests/Button.test.stories.d.ts

@@ -22,6 +22,7 @@ export declare const hrefOnClick: StoryObj<{
     handleClick: ReturnType<typeof fn>;
 }>;
 export declare const disabled: StoryObj;
+export declare const as: StoryObj;
 export declare const className: StoryObj;
 export declare const group: StoryObj;
 export declare const groupClassName: StoryObj;

package/dist/components/Button/tests/Button.test.stories.js

@@ -1,5 +1,6 @@
 import { userEvent, expect, fn } from "storybook/test";
 import Button from "../index.js";
+import Example from "../../../utilities/storybook/Example.js";
 export default {
     title: "Components/Button/tests",
     component: Button,
@@ -72,6 +73,28 @@ export const disabled = {
         expect(el).toBeDisabled();
     },
 };
+export const as = {
+    name: "as, render",
+    render: () => (<Example>
+			<Example.Item title="as: span">
+				<Button onClick={() => { }} as="span">
+					Trigger
+				</Button>
+			</Example.Item>
+			<Example.Item title="render, disabled">
+				<Button disabled onClick={() => { }} render={(props) => <section {...props}/>} attributes={{ "data-testid": "render-el" }}>
+					Trigger
+				</Button>
+			</Example.Item>
+		</Example>),
+    play: ({ canvas }) => {
+        const [asEl] = canvas.getAllByText("Trigger");
+        const renderEl = canvas.getByTestId("render-el");
+        expect(asEl.tagName).toBe("SPAN");
+        expect(renderEl.tagName).toBe("SECTION");
+        expect(renderEl).toHaveAttribute("aria-disabled", "true");
+    },
+};
 export const className = {
     name: "className, attributes",
     render: () => (<div data-testid="root">

package/dist/components/Card/Card.d.ts

@@ -10,7 +10,7 @@ declare const Card: React.ForwardRefExoticComponent<{
     as?: keyof React.JSX.IntrinsicElements | undefined;
     className?: import("../../types/global").ClassName;
     attributes?: (import("../..").Attributes<keyof React.JSX.IntrinsicElements> & ((import("../..").Attributes<"button"> & Omit<React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, "form" | "slot" | "style" | "title" | "disabled" | "key" | "value" | "hidden" | "color" | "content" | "children" | "className" | "ref" | "aria-orientation" | "role" | "suppressHydrationWarning" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dir" | "name" | "type" | "translate" | "accessKey" | "autoCapitalize" | "autoFocus" | "contentEditable" | "contextMenu" | "draggable" | "enterKeyHint" | "id" | "lang" | "nonce" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "rel" | "resource" | "rev" | "typeof" | "vocab" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "popover" | "popoverTargetAction" | "popoverTarget" | "inert" | "inputMode" | "is" | "exportparts" | "part" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-braillelabel" | "aria-brailleroledescription" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colindextext" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-description" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowindextext" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerLeave" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onScrollEnd" | "onScrollEndCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onToggle" | "onBeforeToggle" | "onTransitionCancel" | "onTransitionCancelCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "onTransitionRun" | "onTransitionRunCapture" | "onTransitionStart" | "onTransitionStartCapture"> & {
-        ref?: React.RefObject<HTMLButtonElement | HTMLAnchorElement | null>;
+        ref?: import("../Actionable/Actionable.types").AttributesRef;
     }) | undefined)) | undefined;
 } & Pick<import("../View").ViewProps, "height"> & React.RefAttributes<HTMLElement>>;
 export default Card;

package/dist/components/Card/tests/Card.stories.d.ts

@@ -12,7 +12,7 @@ declare const _default: {
         as?: keyof React.JSX.IntrinsicElements | undefined;
         className?: import("../../../types/global").ClassName;
         attributes?: (import("../../../types/global").Attributes<keyof React.JSX.IntrinsicElements> & ((import("../../../types/global").Attributes<"button"> & Omit<React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, "children" | "ref" | "style" | "form" | "slot" | "title" | "disabled" | "key" | "value" | "hidden" | "color" | "content" | "className" | "aria-orientation" | "role" | "suppressHydrationWarning" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dir" | "name" | "accessKey" | "autoCapitalize" | "autoFocus" | "contentEditable" | "contextMenu" | "draggable" | "enterKeyHint" | "nonce" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "rel" | "resource" | "rev" | "typeof" | "vocab" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "popover" | "popoverTargetAction" | "popoverTarget" | "inert" | "inputMode" | "is" | "exportparts" | "part" | "onToggle" | "type" | "id" | "lang" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-braillelabel" | "aria-brailleroledescription" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colindextext" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-description" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowindextext" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerLeave" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onScrollEnd" | "onScrollEndCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onBeforeToggle" | "onTransitionCancel" | "onTransitionCancelCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "onTransitionRun" | "onTransitionRunCapture" | "onTransitionStart" | "onTransitionStartCapture"> & {
-            ref?: React.RefObject<HTMLButtonElement | HTMLAnchorElement | null>;
+            ref?: import("../../Actionable/Actionable.types").AttributesRef;
         }) | undefined)) | undefined;
     } & Pick<import("../../View").ViewProps, "height"> & React.RefAttributes<HTMLElement>>;
     parameters: {

package/dist/components/Card/tests/Card.test.stories.d.ts

@@ -14,7 +14,7 @@ declare const _default: {
         as?: keyof React.JSX.IntrinsicElements | undefined;
         className?: import("../../../types/global").ClassName;
         attributes?: (import("../../../types/global").Attributes<keyof React.JSX.IntrinsicElements> & ((import("../../../types/global").Attributes<"button"> & Omit<React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>, "children" | "ref" | "style" | "form" | "slot" | "title" | "disabled" | "key" | "value" | "hidden" | "color" | "content" | "className" | "aria-orientation" | "role" | "suppressHydrationWarning" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "dir" | "name" | "accessKey" | "autoCapitalize" | "autoFocus" | "contentEditable" | "contextMenu" | "draggable" | "enterKeyHint" | "nonce" | "spellCheck" | "translate" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "property" | "rel" | "resource" | "rev" | "typeof" | "vocab" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "popover" | "popoverTargetAction" | "popoverTarget" | "inert" | "inputMode" | "is" | "exportparts" | "part" | "onToggle" | "type" | "id" | "lang" | "tabIndex" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-braillelabel" | "aria-brailleroledescription" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colindextext" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-description" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowindextext" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerLeave" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onScrollEnd" | "onScrollEndCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onBeforeToggle" | "onTransitionCancel" | "onTransitionCancelCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "onTransitionRun" | "onTransitionRunCapture" | "onTransitionStart" | "onTransitionStartCapture"> & {
-            ref?: React.RefObject<HTMLButtonElement | HTMLAnchorElement | null>;
+            ref?: import("../../Actionable/Actionable.types").AttributesRef;
         }) | undefined)) | undefined;
     } & Pick<import("../../View").ViewProps, "height"> & React.RefAttributes<HTMLElement>>;
     parameters: {

package/dist/components/Link/Link.d.ts

@@ -1,5 +1,5 @@
 import { type ActionableRef } from "../Actionable";
-declare const Link: import("react").ForwardRefExoticComponent<Pick<import("../Actionable").ActionableProps, "disabled" | "children" | "className" | "attributes" | "type" | "href" | "onClick" | "stopPropagation"> & {
+declare const Link: import("react").ForwardRefExoticComponent<Pick<import("../Actionable").ActionableProps, "disabled" | "children" | "className" | "attributes" | "render" | "type" | "href" | "onClick" | "stopPropagation"> & {
     icon?: import("../Icon").IconProps["svg"];
     color?: "inherit" | "critical" | "primary" | "positive" | "warning";
     variant?: "plain" | "underline";

package/dist/components/Link/Link.js

@@ -5,9 +5,9 @@ import Actionable from "../Actionable/index.js";
 import Icon from "../Icon/index.js";
 import s from "./Link.module.css";
 const Link = forwardRef((props, ref) => {
-    const { icon, disabled, href, color = "primary", variant = "underline", className, children, attributes, type, onClick, stopPropagation, } = props;
+    const { icon, disabled, href, color = "primary", variant = "underline", className, children, attributes, type, onClick, stopPropagation, render, } = props;
     const rootClassNames = classNames(s.root, className, disabled && s["--disabled"], variant && s[`--variant-${variant}`], color && s[`--color-${color}`], icon && s["--with-icon"]);
-    return (_jsxs(Actionable, { href: href, disabled: disabled, className: rootClassNames, attributes: attributes, type: type, onClick: onClick, ref: ref, stopPropagation: stopPropagation, children: [icon && _jsx(Icon, { svg: icon }), children] }));
+    return (_jsxs(Actionable, { href: href, disabled: disabled, className: rootClassNames, attributes: attributes, type: type, onClick: onClick, ref: ref, stopPropagation: stopPropagation, render: render, children: [icon && _jsx(Icon, { svg: icon }), children] }));
 });
 Link.displayName = "Link";
 export default Link;

package/dist/components/Link/Link.types.d.ts

@@ -1,6 +1,6 @@
 import type { ActionableProps } from "../Actionable";
 import type { IconProps } from "../Icon";
-export type Props = Pick<ActionableProps, "attributes" | "className" | "disabled" | "children" | "href" | "onClick" | "type" | "stopPropagation"> & {
+export type Props = Pick<ActionableProps, "attributes" | "className" | "disabled" | "children" | "href" | "onClick" | "type" | "stopPropagation" | "render"> & {
     /** Icon at the start position */
     icon?: IconProps["svg"];
     /** Link color, based on the color tokens

package/dist/components/Link/tests/Link.stories.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
     title: string;
-    component: import("react").ForwardRefExoticComponent<Pick<import("../../Actionable").ActionableProps, "children" | "disabled" | "className" | "attributes" | "type" | "onClick" | "href" | "stopPropagation"> & {
+    component: import("react").ForwardRefExoticComponent<Pick<import("../../Actionable").ActionableProps, "children" | "disabled" | "className" | "attributes" | "render" | "type" | "onClick" | "href" | "stopPropagation"> & {
         icon?: import("../../Icon").IconProps["svg"];
         color?: "inherit" | "critical" | "primary" | "positive" | "warning";
         variant?: "plain" | "underline";

package/dist/components/Link/tests/Link.test.stories.d.ts

@@ -2,7 +2,7 @@ import { StoryObj } from "@storybook/react-vite";
 import { fn } from "storybook/test";
 declare const _default: {
     title: string;
-    component: import("react").ForwardRefExoticComponent<Pick<import("../../Actionable").ActionableProps, "children" | "disabled" | "className" | "attributes" | "type" | "onClick" | "href" | "stopPropagation"> & {
+    component: import("react").ForwardRefExoticComponent<Pick<import("../../Actionable").ActionableProps, "children" | "disabled" | "className" | "attributes" | "render" | "type" | "onClick" | "href" | "stopPropagation"> & {
         icon?: import("../../Icon").IconProps["svg"];
         color?: "inherit" | "critical" | "primary" | "positive" | "warning";
         variant?: "plain" | "underline";
@@ -26,4 +26,5 @@ export declare const hrefOnClick: StoryObj<{
     handleClick: ReturnType<typeof fn>;
 }>;
 export declare const disabled: StoryObj;
+export declare const render: StoryObj;
 export declare const className: StoryObj;

package/dist/components/Link/tests/Link.test.stories.js

@@ -72,6 +72,15 @@ export const disabled = {
         expect(el).toBeDisabled();
     },
 };
+export const render = {
+    name: "render",
+    render: () => <Link render={(props) => <section {...props}/>}>Trigger</Link>,
+    play: async ({ canvas }) => {
+        const el = canvas.getByText("Trigger");
+        expect(el).toBeInTheDocument();
+        expect(el.tagName).toBe("SECTION");
+    },
+};
 export const className = {
     name: "className, attributes",
     render: () => (<div data-testid="root">

package/dist/components/MenuItem/MenuItem.js

@@ -7,11 +7,11 @@ import View from "../View/index.js";
 import MenuItemAligner from "./MenuItemAligner.js";
 import s from "./MenuItem.module.css";
 const MenuItem = forwardRef((props, ref) => {
-    const { icon, startSlot, endSlot, children, color = "primary", selected, highlighted, disabled, onClick, href, size = "medium", roundedCorners, stopPropagation, as, className, attributes, } = props;
+    const { icon, startSlot, endSlot, children, color = "primary", selected, highlighted, disabled, onClick, href, size = "medium", roundedCorners, stopPropagation, as, render, className, attributes, } = props;
     const rootClassNames = classNames(s.root, className, responsiveClassNames(s, "--size", size), responsiveClassNames(s, "--rounded-corners", roundedCorners), color && s[`--color-${color}`], selected && s["--selected"], disabled && s["--disabled"], highlighted && s["--highlighted"]);
     const gapSize = responsivePropDependency(size, (size) => (size === "large" ? 3 : 2));
     const iconSize = responsivePropDependency(size, (size) => (size === "large" ? 5 : 4));
-    return (_jsx(Actionable, { disabled: disabled, className: rootClassNames, attributes: { ...attributes, "data-rs-aligner-target": true }, onClick: onClick, href: href, ref: ref, as: as, stopPropagation: stopPropagation, children: _jsxs(View, { direction: "row", gap: gapSize, align: "center", children: [icon && _jsx(Icon, { svg: icon, className: s.icon, size: iconSize }), !icon && startSlot, children && (_jsx(View.Item, { grow: true, className: s.content, children: children })), endSlot] }) }));
+    return (_jsx(Actionable, { disabled: disabled, className: rootClassNames, attributes: { ...attributes, "data-rs-aligner-target": true }, onClick: onClick, href: href, ref: ref, as: as, stopPropagation: stopPropagation, render: render, children: _jsxs(View, { direction: "row", gap: gapSize, align: "center", children: [icon && _jsx(Icon, { svg: icon, className: s.icon, size: iconSize }), !icon && startSlot, children && (_jsx(View.Item, { grow: true, className: s.content, children: children })), endSlot] }) }));
 });
 MenuItem.Aligner = MenuItemAligner;
 MenuItem.displayName = "MenuItem";

package/dist/components/MenuItem/MenuItem.types.d.ts

@@ -3,7 +3,7 @@ import type { IconProps } from "../Icon";
 import type { ActionableProps, ActionableRef } from "../Actionable";
 import type * as G from "../../types/global";
 export type Size = "small" | "medium" | "large";
-export type Props = Pick<ActionableProps, "attributes" | "className" | "disabled" | "children" | "href" | "onClick" | "as" | "stopPropagation"> & {
+export type Props = Pick<ActionableProps, "attributes" | "className" | "disabled" | "children" | "href" | "onClick" | "as" | "stopPropagation" | "render"> & {
     /** Component color, based on the color tokens */
     color?: "neutral" | "critical" | "primary";
     /** Icon at the start position */

package/dist/components/MenuItem/tests/MenuItem.test.stories.d.ts

@@ -22,5 +22,6 @@ export declare const hrefOnClick: StoryObj<{
     handleClick: ReturnType<typeof fn>;
 }>;
 export declare const disabled: StoryObj;
+export declare const as: StoryObj;
 export declare const className: StoryObj;
 export declare const alignerClassName: StoryObj;

package/dist/components/MenuItem/tests/MenuItem.test.stories.js

@@ -1,5 +1,6 @@
 import { userEvent, expect, fn } from "storybook/test";
 import MenuItem from "../index.js";
+import Example from "../../../utilities/storybook/Example.js";
 export default {
     title: "Components/MenuItem/tests",
     component: MenuItem,
@@ -72,6 +73,21 @@ export const disabled = {
         expect(el).toBeDisabled();
     },
 };
+export const as = {
+    name: "as, render",
+    render: () => (<Example>
+			<Example.Item title="render, disabled">
+				<MenuItem disabled onClick={() => { }} render={(props) => <section {...props}/>} attributes={{ "data-testid": "render-el" }}>
+					Trigger
+				</MenuItem>
+			</Example.Item>
+		</Example>),
+    play: ({ canvas }) => {
+        const renderEl = canvas.getByTestId("render-el");
+        expect(renderEl.tagName).toBe("SECTION");
+        expect(renderEl).toHaveAttribute("aria-disabled", "true");
+    },
+};
 export const className = {
     name: "className, attributes",
     render: () => (<div data-testid="root">

package/dist/components/Modal/tests/Modal.stories.js

@@ -166,6 +166,7 @@ export const containerRef = () => {
 };
 export const edgeCases = () => {
     const menuModalToggle = useToggle();
+    const menuModalToggleInner = useToggle();
     const scrollModalToggle = useToggle();
     const inputRef = React.useRef(null);
     return (<Example>
@@ -233,7 +234,11 @@ export const edgeCases = () => {
 								<DropdownMenu.Item>Item 2</DropdownMenu.Item>
 							</DropdownMenu.Content>
 						</DropdownMenu>
+						<Button onClick={menuModalToggleInner.activate}>Open dialog</Button>
 						<Button onClick={menuModalToggle.deactivate}>Close</Button>
+						<Modal active={menuModalToggleInner.active} onClose={menuModalToggleInner.deactivate}>
+							<Button onClick={menuModalToggleInner.deactivate}>Close</Button>
+						</Modal>
 					</View>
 				</Modal>
 			</Example.Item>

package/dist/hooks/_private/useIsDismissible.js

@@ -4,7 +4,6 @@
  */
 import React from "react";
 import useElementId from "../useElementId.js";
-import { onNextFrame } from "../../utilities/animation.js";
 let queue = {};
 let latestId = null;
 const removeFromQueue = (id) => {
@@ -28,19 +27,12 @@ const useIsDismissible = (args) => {
     React.useEffect(() => {
         if (!active)
             return;
-        onNextFrame(() => addToQueue(id, contentRef, triggerRef));
+        addToQueue(id, contentRef, triggerRef);
         return () => removeFromQueue(id);
     }, [active, id, contentRef, triggerRef]);
     return React.useCallback(() => {
         if (!active)
             return true;
-        const latest = latestId ? queue[latestId] : undefined;
-        const latestTrigger = latest?.triggerRef?.current;
-        const prev = latest?.parentId ? queue[latest.parentId] : undefined;
-        const prevContent = prev?.contentRef.current;
-        // Don't block independently rendered components that are not nested in each other
-        if (!prevContent || !latestTrigger || !prevContent.contains(latestTrigger))
-            return true;
         return latestId === id;
     }, [id, active]);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "reshaped",
 	"description": "Professionally crafted design system in React & Figma for building products of any scale and complexity",
-	"version": "3.8.0-canary.2",
+	"version": "3.8.0-canary.4",
 	"license": "MIT",
 	"email": "hello@reshaped.so",
 	"homepage": "https://reshaped.so",
@@ -89,7 +89,7 @@
 		"release:minor": "node bin/release.js minor",
 		"release:major": "node bin/release.js major",
 		"release:lib": "pnpm build && pnpm publish",
-		"release:canary": "pnpm build && yarn publish --tag canary",
+		"release:canary": "pnpm build && yarn publish --tag canary && git push --tags",
 		"release:test": "pnpm build && pnpm pack --filename reshaped-test.tgz",
 		"release:copy": "sh ./bin/release-copy.sh",
 		"chromatic": "chromatic -b build:chromatic --project-token=$(cat .chromatic)",