@react-fabric/core 1.0.0-beta.4 → 1.0.0-beta.41

package/src/components/avatar/Avatar.tsx

@@ -24,9 +24,9 @@
 import { isSvgPath } from "@react-fabric/utilities";
 import BoringAvatar from "boring-avatars";
 import classNames from "classnames";
-import { useState } from "react";
-import { useMemoDebugger } from "../../hooks/useEffectDebugger";
+import { useMemo, useState } from "react";
 import {
+  type PaletteType,
   type AriaProps,
   type ColorType,
   type CssProp,
@@ -34,8 +34,7 @@ import {
   type SizeType,
   type TestProps,
 } from "../../types";
-import { getBgClass, getColor, getColorClass } from "../../utils";
-import classes from "./Avatar.module.css";
+import { getColor } from "../../utils";
 
 export interface AvatarProps extends CssProp, AriaProps, TestProps, RefProp {
   /**
@@ -57,11 +56,11 @@ export interface AvatarProps extends CssProp, AriaProps, TestProps, RefProp {
   /**
    * background color (CSS color / tailwind color)
    */
-  bg?: ColorType | string;
+  bg?: ColorType | PaletteType | string;
   /**
    * icon color (CSS color / tailwind color)
    */
-  color?: ColorType | string;
+  color?: ColorType | PaletteType | string;
   /**
    * icon size
    */
@@ -109,99 +108,86 @@ export const Avatar = ({
   const [fallback, setFallback] = useState(true);
 
   /** ***************** style map *******************/
-  const styles = useMemoDebugger(
-    () => {
-      const s: KeyValue = {};
-      if (bg) {
-        s.backgroundColor = getColor(bg);
-      }
-      if (color) {
-        s.color = getColor(color);
-      }
-      if (size && !(size in SizeMap)) {
-        s.fontSize = size;
-      }
-      if (size && size in SizeMap) {
-        s.fontSize = SizeMap[size];
-      }
-      return s;
-    },
-    [bg, color, size],
-    "Avatar styles",
-  );
+  const styles = useMemo(() => {
+    const s: KeyValue = {};
+    if (bg) {
+      s.backgroundColor = getColor(bg);
+    }
+    if (color) {
+      s.color = getColor(color);
+    }
+    if (size && !(size in SizeMap)) {
+      s.fontSize = size;
+    }
+    if (size && size in SizeMap) {
+      s.fontSize = SizeMap[size];
+    }
+    return s;
+  }, [bg, color, size]);
 
   /** ***************** render icon *******************/
-  const avatarImage = useMemoDebugger(
-    () => {
-      setFallback(!avatar);
+  const avatarImage = useMemo(() => {
+    setFallback(!avatar);
+    return (
+      avatar && (
+        <div className="contents">
+          <div
+            className={classNames(
+              "fabric-imgPlaceholder",
+              "absolute inset-0 bg-gray animate-pulse",
+            )}
+          />
+          <img
+            src={avatar}
+            alt={avatar}
+            className="align-baseline"
+            onError={() => setFallback(true)}
+            onLoad={(e) => e.currentTarget.previousElementSibling?.remove()}
+          />
+        </div>
+      )
+    );
+  }, [avatar]);
+
+  const fallbackAvatar = useMemo(() => {
+    if (fallbackIcon) {
+      return isSvgPath(fallbackIcon) ? (
+        <svg viewBox={viewBox}>
+          <path fill="currentColor" d={fallbackIcon.toString()} />
+        </svg>
+      ) : (
+        <i className={fallbackIcon} />
+      );
+    }
+    if (variant === "text") {
+      const [, first, second, group] = name.match(
+        /(?=(\w).* (\w).*)|(?=(\w\w).*)/,
+      ) as string[];
       return (
-        avatar && (
-          <div className="contents">
-            <div
-              className={classNames(
-                classes.imgPlaceholder,
-                "absolute inset-0 bg-gray animate-pulse",
-              )}
-            />
-            <img
-              src={avatar}
-              alt={avatar}
-              className="align-baseline"
-              onError={() => setFallback(true)}
-              onLoad={(e) => e.currentTarget.previousElementSibling?.remove()}
-            />
-          </div>
-        )
+        <svg role="img">
+          <text
+            x="50%"
+            y="50%"
+            dy=".1em"
+            dominantBaseline="middle"
+            textAnchor="middle"
+            style={{ fontSize: ".5em", fontWeight: 500 }}
+          >
+            {group ?? `${first}${second}`}
+          </text>
+        </svg>
       );
-    },
-    [avatar],
-    "Avatar icon",
-  );
-
-  const fallbackAvatar = useMemoDebugger(
-    () => {
-      if (fallbackIcon) {
-        return isSvgPath(fallbackIcon) ? (
-          <svg viewBox={viewBox}>
-            <path fill="currentColor" d={fallbackIcon.toString()} />
-          </svg>
-        ) : (
-          <i className={fallbackIcon} />
-        );
-      }
-      if (variant === "text") {
-        const [, first, second, group] =
-          name.match(/(?=(\w).* (\w).*)|(?=(\w\w).*)/) ?? [];
-        return (
-          <svg role="img">
-            <text
-              x="50%"
-              y="50%"
-              dy=".1em"
-              dominantBaseline="middle"
-              textAnchor="middle"
-              style={{ fontSize: ".5em", fontWeight: 500 }}
-            >
-              {group ?? `${first}${second}`}
-            </text>
-          </svg>
-        );
-      }
-      return <BoringAvatar square size={64} variant={variant} name={name} />;
-    },
-    [name, variant, fallbackIcon],
-    "Avatar fallback",
-  );
+    }
+    return <BoringAvatar square size={64} variant={variant} name={name} />;
+  }, [name, variant, fallbackIcon]);
 
   return (
     <dfn
       role="presentation"
       className={classNames(
-        classes.avatar,
+        "fabric-avatar",
         className,
         "select-none relative overflow-hidden inline-block box-content leading-none not-italic text-center",
-        bg && getBgClass(bg),
-        color && getColorClass(color),
         !rounded && "rounded",
         rounded && "rounded-full",
       )}

package/src/components/avatar/AvatarGroup.tsx

@@ -31,7 +31,6 @@ import {
   type SizeType,
 } from "../../types";
 import { type AvatarProps } from "./Avatar";
-import classes from "./Avatar.module.css";
 
 type AvatarChild =
   | ReactElement<Omit<AvatarProps, "size" | "rounded">>
@@ -104,7 +103,7 @@ export const AvatarGroup = ({
       {...aria}
       ref={ref as AnyObject}
       className={classNames(
-        classes.avatarGroup,
+        "fabric-avatarGroup",
         className,
         "inline-flex flex-nowrap",
         !rounded && "rounded",
@@ -115,10 +114,11 @@ export const AvatarGroup = ({
       {avatars}
       {!!diff && (
         <dfn
+          data-ref="avatarCount"
           className={classNames(
-            classes.avatar,
+            "fabric-avatar",
             "select-none relative overflow-hidden inline-block box-content leading-none not-italic text-center",
-            classes.extra,
+            "fabric-avatarGroup--extra",
           )}
         >
           <svg>

package/src/components/badge/Badge.tsx

@@ -32,7 +32,6 @@ import {
   type RefProp,
 } from "../../types";
 import { Icon } from "../icon/Icon";
-import classes from "./Badge.module.css";
 
 export interface BadgeProps
   extends CssProp,
@@ -43,6 +42,10 @@ export interface BadgeProps
    * make wrapper a block element
    */
   block?: boolean;
+  /**
+   * inline badge
+   */
+  inline?: boolean;
   /**
    * badge value
    */
@@ -90,6 +93,7 @@ export const Badge = ({
   max,
   ping,
   block,
+  inline,
   placement = "top-end",
   children,
   // @ts-expect-error ignore
@@ -120,8 +124,8 @@ export const Badge = ({
   return (
     <div
       className={classNames(
-        forButton ? "contents" : "relative",
-        block ? "block" : "inline-block",
+        forButton || inline ? "contents" : block ? "block" : "inline-block",
+        forButton || inline ? "" : "relative",
       )}
     >
       {children &&
@@ -129,16 +133,16 @@ export const Badge = ({
           ...rest,
           ref: innerRef,
         })}
-      {(!!ping || label) && (
+      {(!!ping || (label ?? icon)) && (
         <div
           data-ref="badge"
           data-ping={ping}
           data-placement={placement}
           className={classNames(
-            classes.badge,
+            "fabric-badge",
             className,
-            "inline-block p-px min-w-2 min-h-2 text-center select-none rounded-full leading-none z-5 pointer-events-none",
-            forButton && !placement ? "relative" : "absolute",
+            "inline-block p-px min-w-2 min-h-2 text-center select-none rounded-full leading-none z-2 pointer-events-none",
+            (forButton && !placement) || inline ? "relative" : "absolute",
           )}
         >
           {label && <span className="p-1">{label}</span>}

package/src/components/breadcrumbs/Breadcrumbs.tsx

@@ -24,14 +24,13 @@
 import classNames from "classnames";
 import { Children, useMemo } from "react";
 import { type AriaProps, type ChildrenProp, type CssProp } from "../../types";
-import { Link } from "../../typography/Link";
+import { Anchor } from "../../typography/Anchor";
 import { Dropdown } from "../dropdown/Dropdown";
-import classes from "./Breadcrumbs.module.css";
 
 export interface BreadcrumbProps
   extends CssProp,
     AriaProps,
-    ChildrenProp<typeof Link> {
+    ChildrenProp<typeof Anchor> {
   /**
    * breadcrumb styling
    */
@@ -64,10 +63,11 @@ export const Breadcrumbs = ({
 
   return (
     <nav
+      data-ref="breadcrumbs"
       data-color={color}
       data-variant={variant}
       className={classNames(
-        classes.breadcrumbs,
+        "fabric-breadcrumbs",
         className,
         "flex flex-nowrap items-center",
       )}
@@ -76,7 +76,7 @@ export const Breadcrumbs = ({
       {start.map((link, idx) => (
         <li
           key={idx}
-          className={classes.breadcrumbLink}
+          className={"fabric-breadcrumbLink"}
           data-separator={separator}
         >
           {link}
@@ -84,12 +84,16 @@ export const Breadcrumbs = ({
       ))}
       {overflow && (
         <Dropdown closeOnClick showArrow>
-          <li className={classes.breadcrumbLink} data-separator={separator}>
-            <Link>...</Link>
+          <li
+            className={"fabric-breadcrumbLink"}
+            data-separator={separator}
+            data-ref="breadcrumbOverflow"
+          >
+            <Anchor data->...</Anchor>
           </li>
           <div
             data-color={color}
-            className={classNames(classes.breadcrumbOverflow, "flex flex-col")}
+            className={classNames("fabric-breadcrumbOverflow", "flex flex-col")}
           >
             {overflow}
           </div>
@@ -98,7 +102,7 @@ export const Breadcrumbs = ({
       {end?.map((link, idx) => (
         <li
           key={idx}
-          className={classes.breadcrumbLink}
+          className={"fabric-breadcrumbLink"}
           data-separator={separator}
         >
           {link}

package/src/components/button/Button.tsx

@@ -26,12 +26,12 @@ import classNames from "classnames";
 import {
   Fragment,
   isValidElement,
-  type MouseEventHandler,
   useCallback,
   useEffect,
   useMemo,
   useRef,
   useState,
+  type MouseEventHandler,
   type WheelEventHandler,
 } from "react";
 import { useEffectDebugger } from "../../hooks/useEffectDebugger";
@@ -39,10 +39,10 @@ import { HotKey } from "../../hotkeys/HotKey";
 import { HotKeyLabel } from "../../hotkeys/HotKeyLabel";
 import { Tooltip } from "../../overlays/tooltip/Tooltip";
 import {
+  type ColorState,
   type AriaProps,
   type BadgeType,
   type CallbackReturn,
-  type ColorType,
   type CssProp,
   type IconProps,
   type PolymorphicProps,
@@ -51,10 +51,10 @@ import {
   type TestProps,
   type TooltipType,
 } from "../../types";
+import { getColor } from "../../utils";
 import { AnimationIndicator } from "../animations/Animations";
 import { Badge, getBadgeProps } from "../badge/Badge";
 import { Icon } from "../icon/Icon";
-import classes from "./Button.module.css";
 
 export interface BaseProps
   extends CssProp,
@@ -77,7 +77,7 @@ export interface BaseProps
   /**
    * button color
    */
-  color?: ColorType;
+  color?: ColorState;
   /**
    * button type
    */
@@ -85,7 +85,7 @@ export interface BaseProps
   /**
    * button styling
    */
-  variant?: "outline" | "solid" | "link";
+  variant?: "outline" | "soft" | "solid" | "link";
   /**
    * active state with click disabled
    */
@@ -147,10 +147,14 @@ export interface BaseProps
   onWheel?: WheelEventHandler;
 }
 
-export type ButtonProps =
+type ButtonTypeProps =
   | { children: string | React.ReactElement; "aria-label"?: string }
   | { children?: never; "aria-label": string };
 
+export type ButtonProps<Tag extends React.ElementType = "button"> = BaseProps &
+  ButtonTypeProps &
+  PolymorphicProps<Tag>;
+
 /**
  * Clickable action button
  */
@@ -186,7 +190,7 @@ export const Button = <Tag extends React.ElementType = "button">({
   // @ts-expect-error ignore
   "data-ref": dataRef,
   ...aria
-}: BaseProps & ButtonProps & PolymorphicProps<Tag>) => {
+}: ButtonProps<Tag>) => {
   const refEl = useRef<AnyObject>(null);
   const [busy, setBusy] = useState(false);
   const [actionDone, setActionDone] = useState(false);
@@ -230,7 +234,7 @@ export const Button = <Tag extends React.ElementType = "button">({
       return {
         content: actionMessage,
         placement: "top",
-        color,
+        color: `${color}-100`,
         open: true,
       } as TooltipType;
     }
@@ -240,11 +244,15 @@ export const Button = <Tag extends React.ElementType = "button">({
     return getBadgeProps(badge);
   }, [badge]);
 
+  const hotKeyHandler = useRef(() => {
+    !disabled && refEl.current?.click();
+  });
+
   const E = as ?? "button";
   return (
     <div
       className={classNames(
-        classes.buttonWrapper,
+        "fabric-buttonWrapper",
         className,
         "relative align-text-top select-none focus-within:z-1",
         fullWidth ? "block w-full" : "inline-block",
@@ -254,23 +262,18 @@ export const Button = <Tag extends React.ElementType = "button">({
       data-loading={busy || loading}
       data-disabled={disabled}
     >
-      {hotKey && (
-        <HotKey
-          keyCombo={hotKey}
-          handler={() => !disabled && refEl.current?.click()}
-        />
-      )}
+      {hotKey && <HotKey keyCombo={hotKey} handler={hotKeyHandler.current} />}
       <TooltipWrapper {...tooltipProps}>
         <E
           ref={mergeRefs(ref, refEl)}
           role="button"
           className={classNames(
-            classes.button,
+            "fabric-button",
             "pointer-events-auto cursor-pointer select-none flex flex-nowrap w-full h-full items-center border-0 -outline-offset-1 justify-center max-w-72 p-0 font-sans font-medium appearance-none",
             `focus-visible:ring-2 focus-visible:ring-offset-2 buttonInner`,
             fullWidth && "max-w-full w-full",
             rounded && "rounded-full",
-            spinOnHover && classes.spinOnHover,
+            spinOnHover && "fabric-spinOnHover",
           )}
           type={type}
           disabled={disabled}
@@ -284,7 +287,7 @@ export const Button = <Tag extends React.ElementType = "button">({
         >
           {icon && (
             <Icon
-              className={classes.buttonIcon}
+              className={"fabric-buttonIcon"}
               icon={icon}
               bg={iconBg}
               color={iconColor}
@@ -293,11 +296,11 @@ export const Button = <Tag extends React.ElementType = "button">({
             />
           )}
           {isValidElement(children) && (
-            <div className={classes.buttonChild}>{children}</div>
+            <div className={"fabric-buttonChild"}>{children}</div>
           )}
           {isString(children) && (
             <label
-              className={classNames(classes.buttonLabel, "truncate")}
+              className={classNames("fabric-buttonLabel", "truncate")}
               data-colored-icon={!!iconBg}
             >
               {children}
@@ -306,7 +309,7 @@ export const Button = <Tag extends React.ElementType = "button">({
           {!isNil(badge) && <Badge {...badgeProps} />}
           {hotKey && <HotKeyLabel keyCombo={hotKey} />}
           {altIcon && (
-            <Icon className={classes.altIcon} icon={altIcon} rtlFlip />
+            <Icon className={"fabric-altIcon"} icon={altIcon} rtlFlip />
           )}
         </E>
       </TooltipWrapper>
@@ -314,9 +317,11 @@ export const Button = <Tag extends React.ElementType = "button">({
         <div
           className={classNames(
             "absolute inset-0 overflow-hidden flex justify-center items-center",
-            `bg-${color}-300`,
             rounded ? "rounded-full" : "rounded",
           )}
+          style={{
+            backgroundColor: getColor(`${color}-300`),
+          }}
         >
           <AnimationIndicator type="check" color={color} />
         </div>

package/src/components/button/ButtonGroup.tsx

@@ -22,18 +22,18 @@
  */
 
 import classNames from "classnames";
-import { Children, cloneElement } from "react";
+import { cloneElement } from "react";
 import {
   type AriaProps,
   type ChildrenProp,
-  type ColorType,
+  type ColorState,
   type CssProp,
   type RefProp,
   type SizeType,
   type TestProps,
 } from "../../types";
+import { cloneChildren } from "../../utils";
 import { type Button } from "./Button";
-import classes from "./Button.module.css";
 
 export interface ButtonGroupProps
   extends CssProp,
@@ -56,7 +56,7 @@ export interface ButtonGroupProps
   /**
    * button color
    */
-  color?: ColorType;
+  color?: ColorState;
   /**
    * full rounded edges
    */
@@ -87,16 +87,16 @@ export const ButtonGroup = ({
     <div
       data-ref="buttonGroup"
       className={classNames(
-        classes.buttonGroup,
+        "fabric-buttonGroup",
         className,
         fullWidth ? "flex" : "inline-flex",
         "flex-nowrap align-middle rounded",
-        vertical && classes.vertical,
+        vertical && "vertical",
         vertical && "flex-col items-stretch",
       )}
       {...aria}
     >
-      {Children.map(children, (child: AnyObject) =>
+      {cloneChildren(children, (child: AnyObject) =>
         cloneElement(child, {
           color,
           size,

package/src/components/button/ConfirmButton.tsx

@@ -22,18 +22,19 @@
  */
 
 import {
-  FloatingArrow,
-  FloatingFocusManager,
-  FloatingPortal,
   arrow,
   autoUpdate,
   flip,
+  FloatingArrow,
+  FloatingFocusManager,
+  FloatingPortal,
   offset,
   shift,
   useClick,
   useDismiss,
   useFloating,
   useInteractions,
+  type Placement,
 } from "@floating-ui/react";
 import { mergeRefs } from "@react-fabric/utilities";
 import classNames from "classnames";
@@ -66,6 +67,10 @@ interface ExtendedProps extends Omit<BaseProps, "onClick">, RefProp {
    * ok label
    */
   cancelLabel?: string;
+  /**
+   * dropdown placement
+   */
+  placement?: Placement;
   /**
    * click handler, return Promise to autoset loading state
    */
@@ -85,6 +90,7 @@ export const ConfirmButton = <Tag extends React.ElementType = "button">({
   cancelLabel,
   onClick,
   loading,
+  placement = "bottom",
   actionMessage,
   showActionDone,
   showActionDoneEvent = "click",
@@ -127,7 +133,7 @@ export const ConfirmButton = <Tag extends React.ElementType = "button">({
       }
     },
     strategy: "fixed",
-    placement: "bottom",
+    placement,
     whileElementsMounted: autoUpdate,
     middleware: [
       shift({ padding: 8 }),
@@ -185,11 +191,14 @@ export const ConfirmButton = <Tag extends React.ElementType = "button">({
               {...getFloatingProps()}
             >
               <div className="font-medium ">
-                <p className="py-2 px-4">{message}</p>
+                <p className="py-2 px-4" data-ref="confirmMessage">
+                  {message}
+                </p>
                 <div className="flex justify-end py-2 px-4 gap-2">
                   <Button
                     size="sm"
                     variant="link"
+                    data-ref="confirmCancel"
                     color={color}
                     onClick={() => [clickHandler(false), setIsOpen(false)]}
                   >
@@ -200,6 +209,7 @@ export const ConfirmButton = <Tag extends React.ElementType = "button">({
                     variant="solid"
                     color={color}
                     autoFocus
+                    data-ref="confirmOk"
                     onClick={() => [clickHandler(true), setIsOpen(false)]}
                   >
                     {okLabel ?? t("action.ok")}