reshaped 3.0.9 → 3.0.10

package/dist/components/_private/Flyout/FlyoutTrigger.js

@@ -3,7 +3,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useFlyoutContext, TriggerProvider } from "./Flyout.context.js";
 const FlyoutTrigger = (props) => {
     const { children } = props;
-    const { id, triggerElRef, triggerType, flyout, handleFocus, handleBlur, handleMouseEnter, handleMouseLeave, handleClick, trapFocusMode, } = useFlyoutContext();
+    const { id, triggerElRef, triggerType, flyout, handleFocus, handleBlur, handleMouseEnter, handleMouseLeave, handleClick, trapFocusMode, isSubmenu, } = useFlyoutContext();
     let childrenAttributes = {
         onBlur: handleBlur,
         ref: triggerElRef,
@@ -15,7 +15,8 @@ const FlyoutTrigger = (props) => {
         childrenAttributes.onMouseEnter = handleMouseEnter;
         childrenAttributes.onMouseLeave = handleMouseLeave;
     }
-    if ((triggerType === "hover" && trapFocusMode !== "action-menu") || triggerType === "focus") {
+    // Submenus open on keypress instead of hover
+    if ((triggerType === "hover" && !isSubmenu) || triggerType === "focus") {
         childrenAttributes.onFocus = handleFocus;
         childrenAttributes["aria-describedby"] = id;
     }

package/dist/components/_private/Flyout/tests/Flyout.stories.d.ts

@@ -5,13 +5,8 @@ declare const _default: {
 export default _default;
 export declare const positions: () => React.JSX.Element;
 export declare const dynamicPosition: () => React.JSX.Element;
-export declare const modeDialogClick: () => React.JSX.Element;
-export declare const modeActionMenuClick: () => React.JSX.Element;
-export declare const modeContentMenuClick: () => React.JSX.Element;
-export declare const modeDialogHover: () => React.JSX.Element;
-export declare const modeActionMenuHover: () => React.JSX.Element;
-export declare const modeContentMenuHover: () => React.JSX.Element;
-export declare const disableContentHover: () => React.JSX.Element;
+export declare const modes: () => React.JSX.Element;
+export declare const disableFlags: () => React.JSX.Element;
 export declare const customPortalTarget: () => React.JSX.Element;
 export declare const testWidthOverflowOnMobile: () => React.JSX.Element;
 export declare const testInsideScrollArea: () => React.JSX.Element;

package/dist/components/_private/Flyout/tests/Flyout.stories.js

@@ -50,39 +50,70 @@ export const positions = () => (<div style={{ paddingTop: 200 }}>
 export const dynamicPosition = () => (<div style={{ position: "absolute", top: 0, left: "50%" }}>
 		<Demo position="top"/>
 	</div>);
-export const modeDialogClick = () => (<Demo position="bottom-start" trapFocusMode="dialog">
-		<button type="button">Item 1</button>
-		<button type="button">Item 2</button>
-		<button type="button">Close</button>
-	</Demo>);
-export const modeActionMenuClick = () => (<Demo position="bottom-start" trapFocusMode="action-menu">
-		<button type="button">Item 1</button>
-		<button type="button">Item 2</button>
-		<button type="button">Close</button>
-	</Demo>);
-export const modeContentMenuClick = () => (<Demo position="bottom-start" trapFocusMode="content-menu">
-		<button type="button">Item 1</button>
-		<button type="button">Item 2</button>
-		<button type="button">Close</button>
-	</Demo>);
-export const modeDialogHover = () => (<Demo position="bottom-start" trapFocusMode="dialog" triggerType="hover">
-		<button type="button">Item 1</button>
-		<button type="button">Item 2</button>
-		<button type="button">Close</button>
-	</Demo>);
-export const modeActionMenuHover = () => (<Demo position="bottom-start" trapFocusMode="action-menu" triggerType="hover">
-		<button type="button">Item 1</button>
-		<button type="button">Item 2</button>
-		<button type="button">Close</button>
-	</Demo>);
-export const modeContentMenuHover = () => (<Demo position="bottom-start" trapFocusMode="content-menu" triggerType="hover">
-		<button type="button">Item 1</button>
-		<button type="button">Item 2</button>
-		<button type="button">Close</button>
-	</Demo>);
-export const disableContentHover = () => (<Demo triggerType="hover" disableContentHover>
-		Content
-	</Demo>);
+export const modes = () => (<Example>
+		<Example.Item title="dialog click">
+			<Demo position="bottom-start" trapFocusMode="dialog">
+				<button type="button">Item 1</button>
+				<button type="button">Item 2</button>
+				<button type="button">Close</button>
+			</Demo>
+		</Example.Item>
+
+		<Example.Item title="action-menu click">
+			<Demo position="bottom-start" trapFocusMode="action-menu">
+				<button type="button">Item 1</button>
+				<button type="button">Item 2</button>
+				<button type="button">Close</button>
+			</Demo>
+		</Example.Item>
+
+		<Example.Item title="content-menu click">
+			<Demo position="bottom-start" trapFocusMode="content-menu">
+				<button type="button">Item 1</button>
+				<button type="button">Item 2</button>
+				<button type="button">Close</button>
+			</Demo>
+		</Example.Item>
+
+		<Example.Item title="dialog hover">
+			<Demo position="bottom-start" trapFocusMode="dialog" triggerType="hover">
+				<button type="button">Item 1</button>
+				<button type="button">Item 2</button>
+				<button type="button">Close</button>
+			</Demo>
+		</Example.Item>
+
+		<Example.Item title="action-menu hover">
+			<Demo position="bottom-start" trapFocusMode="action-menu" triggerType="hover">
+				<button type="button">Item 1</button>
+				<button type="button">Item 2</button>
+				<button type="button">Close</button>
+			</Demo>
+		</Example.Item>
+
+		<Example.Item title="content-menu hover">
+			<Demo position="bottom-start" trapFocusMode="content-menu" triggerType="hover">
+				<button type="button">Item 1</button>
+				<button type="button">Item 2</button>
+				<button type="button">Close</button>
+			</Demo>
+		</Example.Item>
+	</Example>);
+export const disableFlags = () => (<Example>
+		<Example.Item title="disableContentHover">
+			<Demo triggerType="hover" disableContentHover>
+				Content
+			</Demo>
+		</Example.Item>
+
+		<Example.Item title="disableCloseOnOutsideClick">
+			<Demo disableCloseOnOutsideClick>Content</Demo>
+		</Example.Item>
+
+		<Example.Item title="disableHideAnimation">
+			<Demo disableHideAnimation>Content</Demo>
+		</Example.Item>
+	</Example>);
 class CustomElement extends window.HTMLElement {
     constructor() {
         super();
@@ -99,7 +130,9 @@ class CustomElement extends window.HTMLElement {
         root.render(node);
     }
 }
-window.customElements.define("custom-element", CustomElement);
+if (!window.customElements.get("custom-element")) {
+    window.customElements.define("custom-element", CustomElement);
+}
 export const customPortalTarget = () => {
     const portalRef = React.useRef(null);
     return (<Example>
@@ -186,16 +219,32 @@ export const testInsideFixed = () => (<Example>
 export const testDynamicBounds = () => {
     const [left, setLeft] = React.useState("50%");
     const [size, setSize] = React.useState("medium");
+    const flyoutRef = React.useRef();
+    React.useEffect(() => {
+        flyoutRef.current?.updatePosition();
+    }, [left]);
     return (<View gap={4}>
 			<View direction="row" gap={2}>
-				<Button onClick={() => setLeft("0%")}>Left</Button>
-				<Button onClick={() => setLeft("50%")}>Center</Button>
-				<Button onClick={() => setLeft("100%")}>Right</Button>
+				<Button onClick={() => {
+            setLeft("20%");
+        }}>
+					Left
+				</Button>
+				<Button onClick={() => {
+            setLeft("50%");
+        }}>
+					Center
+				</Button>
+				<Button onClick={() => {
+            setLeft("70%");
+        }}>
+					Right
+				</Button>
 				<Button onClick={() => setSize("large")}>Large button</Button>
 				<Button onClick={() => setSize("medium")}>Small button</Button>
 			</View>
 			<View height={100}>
-				<Flyout position="bottom" active>
+				<Flyout position="bottom" active instanceRef={flyoutRef}>
 					<Flyout.Trigger>
 						{(attributes) => (<div style={{ position: "absolute", left, top: "50%" }}>
 								<Button color="primary" attributes={attributes} size={size}>

package/dist/components/_private/Portal/Portal.module.css

@@ -1 +1 @@
-.root{display:contents}
+.root{display:none}

package/dist/hooks/_private/useOnClickOutside.js

@@ -1,7 +1,9 @@
+import useHandlerRef from "../useHandlerRef.js";
 import React from "react";
 const useOnClickOutside = (refs, handler) => {
+    const handlerRef = useHandlerRef(handler);
     React.useEffect(() => {
-        if (!handler)
+        if (!handlerRef.current)
             return;
         const handleClick = (event) => {
             let isInside = false;
@@ -14,7 +16,7 @@ const useOnClickOutside = (refs, handler) => {
             });
             if (isInside)
                 return;
-            handler(event);
+            handlerRef.current?.(event);
         };
         // Using events that happen before click to handle cases when element is hidden on click
         document.addEventListener("mousedown", handleClick);
@@ -24,6 +26,6 @@ const useOnClickOutside = (refs, handler) => {
             document.removeEventListener("touchstart", handleClick);
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [handler, ...refs]);
+    }, [handlerRef, ...refs]);
 };
 export default useOnClickOutside;

package/dist/hooks/tests/useDrag.stories.d.ts

@@ -0,0 +1,6 @@
+import React from "react";
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const state: () => React.JSX.Element;

package/dist/hooks/tests/useDrag.stories.js

@@ -0,0 +1,29 @@
+import React from "react";
+import View from "../../components/View/index.js";
+import useDrag from "../useDrag.js";
+import useToggle from "../useToggle.js";
+import Button from "../../components/Button/index.js";
+export default { title: "Hooks/useDrag" };
+function Example() {
+    const [state, setState] = React.useState({ x: 0, y: 0 });
+    const disabledToggle = useToggle();
+    const { ref, containerRef, active } = useDrag((args) => {
+        setState(args);
+    }, {
+        disabled: disabledToggle.active,
+    });
+    return (<View direction="row" gap={4}>
+			<View backgroundColor="neutral-faded" borderRadius="medium" width="200px" height="200px" attributes={{ ref: containerRef }}>
+				<View height={8} width={8} borderRadius="small" animated backgroundColor={active ? "primary" : "neutral"} attributes={{
+            role: "button",
+            tabIndex: 0,
+            ref,
+            style: { translate: `${state.x}px ${state.y}px`, cursor: active ? "grabbing" : "grab" },
+        }}/>
+			</View>
+			<Button onClick={disabledToggle.toggle}>
+				{disabledToggle.active ? "Enable" : "Disable"}
+			</Button>
+		</View>);
+}
+export const state = () => <Example />;

package/dist/hooks/useDrag.d.ts

@@ -0,0 +1,17 @@
+import React from "react";
+export type UseDragCallbackArgs = {
+    x: number;
+    y: number;
+    triggerX: number;
+    triggerY: number;
+};
+declare const useDrag: <TriggerElement extends HTMLElement = HTMLButtonElement, ContainerElement extends HTMLElement = HTMLDivElement>(cb: (args: UseDragCallbackArgs) => void, options?: {
+    disabled?: boolean;
+    containerRef?: React.RefObject<ContainerElement>;
+    orientation?: "horizontal" | "vertical" | "all";
+}) => {
+    ref: React.MutableRefObject<TriggerElement | null>;
+    containerRef: React.RefObject<ContainerElement>;
+    active: boolean;
+};
+export default useDrag;

package/dist/hooks/useDrag.js

@@ -0,0 +1,116 @@
+"use client";
+import React from "react";
+import { disableUserSelect, enableUserSelect, disableScroll, enableScroll } from "../utilities/dom.js";
+import useToggle from "./useToggle.js";
+import useHotkeys from "./useHotkeys.js";
+import * as keys from "../constants/keys.js";
+import useHandlerRef from "./useHandlerRef.js";
+const useDrag = (cb, options) => {
+    const { disabled, containerRef: passedContainerRef, orientation = "all" } = options || {};
+    const cbRef = useHandlerRef(cb);
+    const toggle = useToggle();
+    const triggerRef = React.useRef(null);
+    const internalContainerRef = React.useRef(null);
+    const containerRef = passedContainerRef || internalContainerRef;
+    const triggerCompensationRef = React.useRef({ x: 0, y: 0 });
+    const isVertical = orientation === "vertical" || orientation === "all";
+    const isHorizontal = orientation === "horizontal" || orientation === "all";
+    const handleKeyboard = (x, y) => {
+        const triggerEl = triggerRef.current;
+        if (!triggerEl)
+            return;
+        const container = containerRef.current ?? document.body;
+        const containerRect = container.getBoundingClientRect();
+        const triggerRect = triggerEl?.getBoundingClientRect();
+        const nextArgs = { x: 0, y: 0, triggerX: 0, triggerY: 0 };
+        if (isVertical) {
+            const relativeY = Math.round(triggerRect.y) - containerRect.y + y;
+            nextArgs.y = Math.max(0, Math.min(relativeY, containerRect.height - triggerRect.height));
+            nextArgs.triggerY = triggerRect.y - containerRect.y;
+        }
+        if (isHorizontal) {
+            const relativeX = Math.round(triggerRect.x) - containerRect.x + x;
+            nextArgs.x = Math.max(0, Math.min(relativeX, containerRect.width - triggerRect.width));
+            nextArgs.triggerX = triggerRect.x - containerRect.x;
+        }
+        cb(nextArgs);
+    };
+    useHotkeys({
+        [keys.LEFT]: () => isHorizontal && handleKeyboard(-20, 0),
+        [keys.RIGHT]: () => isHorizontal && handleKeyboard(20, 0),
+        [keys.UP]: () => isVertical && handleKeyboard(0, -20),
+        [keys.DOWN]: () => isVertical && handleKeyboard(0, 20),
+    }, [], {
+        ref: triggerRef,
+        disabled,
+    });
+    React.useEffect(() => {
+        const triggerEl = triggerRef.current;
+        if (!triggerEl)
+            return;
+        if (!toggle.active)
+            return;
+        const handleDrag = (event) => {
+            const resolvedEvent = event instanceof MouseEvent ? event : event.changedTouches[0];
+            const container = containerRef.current ?? document.body;
+            const containerRect = container.getBoundingClientRect();
+            const triggerRect = triggerEl.getBoundingClientRect();
+            const triggerX = resolvedEvent.clientX - containerRect.x;
+            const triggerY = resolvedEvent.clientY - containerRect.y;
+            // Calculate position relative to the container
+            const relativeX = triggerX - triggerCompensationRef.current.x;
+            const relativeY = triggerY - triggerCompensationRef.current.y;
+            cbRef.current?.({
+                x: isHorizontal
+                    ? Math.max(0, Math.min(relativeX, containerRect.width - triggerRect.width))
+                    : 0,
+                y: isVertical
+                    ? Math.max(0, Math.min(relativeY, containerRect.height - triggerRect.height))
+                    : 0,
+                triggerX: triggerRect.x - containerRect.x,
+                triggerY: triggerRect.y - containerRect.y,
+            });
+        };
+        const handleDragEnd = () => {
+            triggerCompensationRef.current = { x: 0, y: 0 };
+            toggle.deactivate();
+            enableUserSelect();
+            enableScroll();
+        };
+        document.addEventListener("touchmove", handleDrag, { passive: true });
+        document.addEventListener("touchend", handleDragEnd, { passive: true });
+        document.addEventListener("mousemove", handleDrag, { passive: true });
+        document.addEventListener("mouseup", handleDragEnd, { passive: true });
+        return () => {
+            document.removeEventListener("touchmove", handleDrag);
+            document.removeEventListener("touchend", handleDragEnd);
+            document.removeEventListener("mousemove", handleDrag);
+            document.removeEventListener("mouseup", handleDragEnd);
+        };
+    }, [toggle, isHorizontal, isVertical, containerRef, cbRef]);
+    React.useEffect(() => {
+        const triggerEl = triggerRef.current;
+        if (!triggerEl || disabled)
+            return;
+        const handleStart = (event) => {
+            const resolvedEvent = event instanceof MouseEvent ? event : event.changedTouches[0];
+            // Find the coordinate of the event inside the trigger
+            const triggerRect = triggerEl.getBoundingClientRect();
+            triggerCompensationRef.current = {
+                x: resolvedEvent.clientX - triggerRect.x,
+                y: resolvedEvent.clientY - triggerRect.y,
+            };
+            toggle.activate();
+            disableUserSelect();
+            disableScroll();
+        };
+        triggerEl.addEventListener("touchstart", handleStart, { passive: true });
+        triggerEl.addEventListener("mousedown", handleStart, { passive: true });
+        return () => {
+            triggerEl.removeEventListener("touchstart", handleStart);
+            triggerEl.removeEventListener("mousedown", handleStart);
+        };
+    }, [toggle, disabled]);
+    return { ref: triggerRef, containerRef, active: toggle.active };
+};
+export default useDrag;

package/dist/hooks/useHandlerRef.d.ts

@@ -0,0 +1,8 @@
+import React from "react";
+/**
+ * Hook for wrapping event handlers passed as props with a ref
+ * This way we can keep the instance of the ref the same and pass this ref to the effects dependency array
+ * While also making sure that function implementation stays up-to-date
+ */
+declare const useHandlerRef: <T>(cb: T) => React.RefObject<T>;
+export default useHandlerRef;

package/dist/hooks/useHandlerRef.js

@@ -0,0 +1,16 @@
+import React from "react";
+import useIsomorphicLayoutEffect from "./useIsomorphicLayoutEffect.js";
+/**
+ * Hook for wrapping event handlers passed as props with a ref
+ * This way we can keep the instance of the ref the same and pass this ref to the effects dependency array
+ * While also making sure that function implementation stays up-to-date
+ */
+const useHandlerRef = (cb) => {
+    const ref = React.useRef(cb);
+    // Update the callback on every render, keeping the ref instance the same
+    useIsomorphicLayoutEffect(() => {
+        ref.current = cb;
+    });
+    return ref;
+};
+export default useHandlerRef;

package/dist/hooks/useScrollLock.js

@@ -21,8 +21,8 @@ const useScrollLock = () => {
     const [locked, setLocked] = React.useState(false);
     const overflowStyleRef = React.useRef();
     const isOverflowingRef = React.useRef(false);
-    const targetEl = document.body;
     const lockScroll = React.useCallback(() => {
+        const targetEl = document.body;
         const rect = targetEl.getBoundingClientRect();
         isOverflowingRef.current = rect.left + rect.right < window.innerWidth;
         overflowStyleRef.current = targetEl.style.overflow;
@@ -32,13 +32,14 @@ const useScrollLock = () => {
             targetEl.style.paddingRight = `${scrollBarWidth}px`;
         }
         setLocked(true);
-    }, [setLocked, isOverflowingRef, overflowStyleRef, targetEl]);
+    }, [setLocked, isOverflowingRef, overflowStyleRef]);
     const unlockScroll = React.useCallback(() => {
+        const targetEl = document.body;
         targetEl.style.overflow = overflowStyleRef.current || "";
         if (isOverflowingRef.current)
             targetEl.style.paddingRight = "";
         setLocked(false);
-    }, [setLocked, isOverflowingRef, overflowStyleRef, targetEl]);
+    }, [setLocked, isOverflowingRef, overflowStyleRef]);
     return { scrollLocked: locked, lockScroll, unlockScroll };
 };
 export default useScrollLock;

package/dist/hooks/useToggle.js

@@ -11,6 +11,6 @@ const useToggle = (defaultValue) => {
     const toggle = React.useCallback(() => {
         setActive((active) => !active);
     }, []);
-    return { active, activate, deactivate, toggle };
+    return React.useMemo(() => ({ active, activate, deactivate, toggle }), [activate, deactivate, toggle, active]);
 };
 export default useToggle;

package/dist/index.d.ts

@@ -75,6 +75,8 @@ export { default as RadioGroup } from "./components/RadioGroup";
 export type { RadioGroupProps } from "./components/RadioGroup";
 export { default as Reshaped } from "./components/Reshaped";
 export type { ReshapedProps } from "./components/Reshaped";
+export { default as Resizable } from "./components/Resizable";
+export type { ResizableProps, ResizableItemProps, ResizableHandleProps, } from "./components/Resizable";
 export { default as Scrim } from "./components/Scrim";
 export type { ScrimProps } from "./components/Scrim";
 export { default as ScrollArea } from "./components/ScrollArea";
@@ -102,7 +104,7 @@ export type { TextFieldProps } from "./components/TextField";
 export { default as Timeline } from "./components/Timeline";
 export type { TimelineProps, TimelineItemProps } from "./components/Timeline";
 export { useToast, ToastProvider } from "./components/Toast";
-export type { ToastProps, ToastProviderProps } from "./components/Toast";
+export type { ToastProps, ToastProviderProps, ToastShowProps } from "./components/Toast";
 export { default as Tooltip } from "./components/Tooltip";
 export type { TooltipProps } from "./components/Tooltip";
 export { default as View } from "./components/View";

package/dist/index.js

@@ -38,6 +38,7 @@ export { default as Progress } from "./components/Progress/index.js";
 export { default as Radio } from "./components/Radio/index.js";
 export { default as RadioGroup } from "./components/RadioGroup/index.js";
 export { default as Reshaped } from "./components/Reshaped/index.js";
+export { default as Resizable } from "./components/Resizable/index.js";
 export { default as Scrim } from "./components/Scrim/index.js";
 export { default as ScrollArea } from "./components/ScrollArea/index.js";
 export { default as Select } from "./components/Select/index.js";

package/dist/themes/_generator/tests/themes.stories.js

@@ -235,6 +235,20 @@ const onColorsCss = getThemeCSS("on-color", {
         },
     },
 });
+const onColorsCssApca = getThemeCSS("on-color-apca", {
+    color: {
+        backgroundPrimary: { hex: "#1abc9c", hexDark: "#16a085" },
+        backgroundPrimaryHighlighted: { hex: "#16a085", hexDark: "#1abc9c" },
+    },
+}, {
+    colorContrastAlgorithm: "apca",
+    onColorValues: {
+        primary: {
+            hexLight: "#d1fae5",
+            hexDark: "#022c22",
+        },
+    },
+});
 export const onColors = () => (<Example>
 		<Example.Item title="custom on color values">
 			<style>{onColorsCss}</style>
@@ -245,4 +259,13 @@ export const onColors = () => (<Example>
 				</View>
 			</Theme>
 		</Example.Item>
+		<Example.Item title="custom on color values, apca">
+			<style>{onColorsCssApca}</style>
+			<Theme name="on-color-apca">
+				<View gap={2} direction="row">
+					<Button color="primary">Primary button</Button>
+					<Button color="critical">Critical button</Button>
+				</View>
+			</Theme>
+		</Example.Item>
 	</Example>);

package/dist/themes/_generator/utilities/color.d.ts

@@ -81,9 +81,25 @@ export declare const getDarkModeColor: (hsl: HslColor) => {
 };
 export declare const getLuminanceDelta: (luminance: number) => number;
 export declare function getRgbLuminance({ r, g, b }: RgbColor): number;
+export declare const getOnColorWCAG: (args: {
+    bgHexColor: string;
+    lightHexColor?: string;
+    darkHexColor?: string;
+}) => string;
+export declare const getOnColorAPCA: (args: {
+    bgHexColor: string;
+    mode: "light" | "dark";
+    lightHexColor?: string;
+    darkHexColor?: string;
+}) => string;
+/**
+ * On color resolver
+ */
 export declare const getOnColor: (args: {
     bgHexColor: string;
     lightHexColor?: string;
     darkHexColor?: string;
+    mode: "light" | "dark";
+    algorithm?: "wcag" | "apca";
 }) => string;
 export {};

package/dist/themes/_generator/utilities/color.js

@@ -301,29 +301,77 @@ export function getRgbLuminance({ r, g, b }) {
         return Math.pow(y, 1 / 3) * 116 - 16;
     }
 }
+/**
+ * WCAG contrast
+ */
 const RED = 0.2126;
 const GREEN = 0.7152;
 const BLUE = 0.0722;
 const GAMMA = 2.4;
-function luminance(r, g, b) {
+function luminanceWCAG(r, g, b) {
     var a = [r, g, b].map((v) => {
         v /= 255;
         return v <= 0.03928 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, GAMMA);
     });
     return a[0] * RED + a[1] * GREEN + a[2] * BLUE;
 }
-function contrast(rgb1, rgb2) {
-    var lum1 = luminance(...rgb1);
-    var lum2 = luminance(...rgb2);
+function contrastWCAG(rgb1, rgb2) {
+    var lum1 = luminanceWCAG(...rgb1);
+    var lum2 = luminanceWCAG(...rgb2);
     var brightest = Math.max(lum1, lum2);
     var darkest = Math.min(lum1, lum2);
     return (brightest + 0.05) / (darkest + 0.05);
 }
-export const getOnColor = (args) => {
+export const getOnColorWCAG = (args) => {
     const { bgHexColor, lightHexColor = "#ffffff", darkHexColor = "#000000" } = args;
     const bgRgb = hexToRgb(bgHexColor);
     const lightRgb = hexToRgb(lightHexColor);
-    return contrast([bgRgb.r, bgRgb.g, bgRgb.b], [lightRgb.r, lightRgb.g, lightRgb.b]) > 4.5
+    return contrastWCAG([bgRgb.r, bgRgb.g, bgRgb.b], [lightRgb.r, lightRgb.g, lightRgb.b]) > 4.5
         ? lightHexColor
         : darkHexColor;
 };
+/**
+ * APCA contrast
+ */
+function luminanceAPCA({ r, g, b }) {
+    return (0.2126 * Math.pow(r / 255, 2.2) +
+        0.7152 * Math.pow(g / 255, 2.2) +
+        0.0722 * Math.pow(b / 255, 2.2));
+}
+function contrastAPCA(backgroundLuminance, textLuminance) {
+    // Calculate the contrast based on APCA
+    let Lc = textLuminance - backgroundLuminance;
+    return Math.abs(Lc); // Return the absolute value of contrast
+}
+export const getOnColorAPCA = (args) => {
+    const { bgHexColor, mode, lightHexColor = "#ffffff", darkHexColor = "#000000" } = args;
+    const bgHexAlpha = bgHexColor.slice(7);
+    const bgAlpha = bgHexAlpha ? Number((parseInt(bgHexAlpha, 16) / 255).toFixed(2)) : 1;
+    const bgColor = hexToRgb(bgHexColor.slice(0, 7));
+    const baseColor = mode === "light" ? { r: 255, g: 255, b: 255 } : { r: 0, g: 0, b: 0 };
+    const { r, g, b } = {
+        r: (1 - bgAlpha) * baseColor.r + bgAlpha * bgColor.r,
+        g: (1 - bgAlpha) * baseColor.g + bgAlpha * bgColor.g,
+        b: (1 - bgAlpha) * baseColor.b + bgAlpha * bgColor.b,
+    };
+    // Calculate luminance for background and for white & black
+    let backgroundLuminance = luminanceAPCA({ r, g, b });
+    let whiteLuminance = luminanceAPCA({ r: 255, g: 255, b: 255 });
+    let blackLuminance = luminanceAPCA({ r: 0, g: 0, b: 0 });
+    // Calculate contrast
+    let contrastWithWhite = contrastAPCA(backgroundLuminance, whiteLuminance);
+    let contrastWithBlack = contrastAPCA(backgroundLuminance, blackLuminance);
+    // Choose the color with higher contrast
+    return contrastWithWhite > contrastWithBlack ? lightHexColor : darkHexColor;
+};
+/**
+ * On color resolver
+ */
+export const getOnColor = (args) => {
+    if (args.algorithm === "apca") {
+        return getOnColorAPCA(args);
+    }
+    else {
+        return getOnColorWCAG(args);
+    }
+};

package/dist/themes/_generator/utilities/generateBackgroundColors.js

@@ -29,10 +29,14 @@ const generateBackgroundColors = (definition, themeOptions) => {
             };
             const hex = getOnColor({
                 bgHexColor: bgToken.hex,
+                mode: "light",
+                algorithm: themeOptions?.colorContrastAlgorithm,
                 ...onColorHexMap,
             });
             const hexDark = getOnColor({
                 bgHexColor: bgToken.hexDark || bgToken.hex,
+                mode: "dark",
+                algorithm: themeOptions?.colorContrastAlgorithm,
                 ...onColorHexMap,
             });
             // eslint-disable-next-line no-param-reassign