@koobiq/react-primitives 0.0.1-beta.21 → 0.0.1-beta.23

package/dist/behaviors/useButton.d.ts

@@ -2,11 +2,11 @@ import type { RefObject } from 'react';
 import type { ButtonOptions } from '../types';
 export type UseButtonProps = ButtonOptions;
 export declare function useButton(props: UseButtonProps, ref: RefObject<Element | null>): {
-    pressed: boolean;
-    hovered: boolean;
-    focused: boolean;
-    disabled: boolean | undefined;
+    isPressed: boolean;
+    isHovered: boolean;
+    isFocused: boolean;
+    isDisabled: boolean | undefined;
     buttonProps: import("@react-types/shared").DOMAttributes<import("@react-types/shared").FocusableElement>;
-    focusVisible: boolean;
+    isFocusVisible: boolean;
 };
 export type UseButtonReturn = ReturnType<typeof useButton>;

package/dist/behaviors/useButton.js

@@ -2,33 +2,23 @@
 import { useFocusRing, useHover, mergeProps } from "@koobiq/react-core";
 import { useButton as useButton$1 } from "@react-aria/button";
 function useButton(props, ref) {
-  const { disabled, ...otherProps } = props;
-  const {
-    focusProps,
-    isFocused: focused,
-    isFocusVisible: focusVisible
-  } = useFocusRing({
+  const { isDisabled } = props;
+  const { focusProps, isFocused, isFocusVisible } = useFocusRing({
     within: true
   });
-  const { hoverProps, isHovered: hovered } = useHover({
-    ...props,
-    isDisabled: disabled
-  });
-  const { buttonProps: commonButtonProps, isPressed: pressed } = useButton$1(
-    {
-      ...otherProps,
-      isDisabled: disabled
-    },
+  const { hoverProps, isHovered } = useHover(props);
+  const { buttonProps: commonButtonProps, isPressed } = useButton$1(
+    props,
     ref
   );
   const buttonProps = mergeProps(commonButtonProps, focusProps, hoverProps);
   return {
-    pressed,
-    hovered,
-    focused,
-    disabled,
+    isPressed,
+    isHovered,
+    isFocused,
+    isDisabled,
     buttonProps,
-    focusVisible
+    isFocusVisible
   };
 }
 export {

package/dist/behaviors/useLink.d.ts

@@ -1,14 +1,11 @@
 import type { RefObject } from 'react';
-import type { ExtendableProps } from '@koobiq/react-core';
 import type { AriaLinkOptions } from '@react-aria/link';
-export type UseLinkProps = ExtendableProps<{
-    disabled?: boolean;
-}, Omit<AriaLinkOptions, 'isDisabled'>>;
+export type UseLinkProps = AriaLinkOptions;
 export declare function useLink(props: UseLinkProps, ref: RefObject<HTMLElement | null>): {
     linkProps: import("@react-types/shared").DOMAttributes<import("@react-types/shared").FocusableElement>;
-    pressed: boolean;
-    hovered: boolean;
-    focused: boolean;
-    focusVisible: boolean;
+    isPressed: boolean;
+    isHovered: boolean;
+    isFocused: boolean;
+    isFocusVisible: boolean;
 };
 export type UseLinkReturn = ReturnType<typeof useLink>;

package/dist/behaviors/useLink.js

@@ -2,31 +2,23 @@
 import { useHover, useFocusRing, mergeProps } from "@koobiq/react-core";
 import { useLink as useLink$1 } from "@react-aria/link";
 function useLink(props, ref) {
-  const { disabled, ...otherProps } = props;
-  const { hoverProps, isHovered } = useHover({
-    ...otherProps,
-    isDisabled: disabled
-  });
+  const { hoverProps, isHovered } = useHover(props);
   const { focusProps, isFocused, isFocusVisible } = useFocusRing();
   const { linkProps: commonLinkProps, isPressed } = useLink$1(
-    {
-      ...otherProps,
-      isDisabled: disabled
-    },
+    props,
     ref
   );
   const linkProps = mergeProps(
-    { disabled },
+    commonLinkProps,
     focusProps,
-    hoverProps,
-    commonLinkProps
+    hoverProps
   );
   return {
     linkProps,
-    pressed: isPressed,
-    hovered: isHovered,
-    focused: isFocused,
-    focusVisible: isFocusVisible
+    isPressed,
+    isHovered,
+    isFocused,
+    isFocusVisible
   };
 }
 export {

package/dist/components/Button/Button.js

@@ -11,8 +11,8 @@ const Button = polymorphicForwardRef(
     const Tag = as || "button";
     const commonProps = useSlottedContext(props, ButtonContext, slot);
     const {
-      loading,
-      disabled,
+      isLoading,
+      isDisabled,
       value,
       name,
       form,
@@ -23,10 +23,10 @@ const Button = polymorphicForwardRef(
       formTarget
     } = commonProps;
     const domRef = useDOMRef(ref);
-    const { hovered, pressed, focused, focusVisible, buttonProps } = useButton(
+    const { isHovered, isPressed, isFocused, isFocusVisible, buttonProps } = useButton(
       {
         ...commonProps,
-        ...(loading || disabled) && {
+        ...(isLoading || isDisabled) && {
           onPress: void 0,
           onPressStart: void 0,
           onPressEnd: void 0,
@@ -37,18 +37,17 @@ const Button = polymorphicForwardRef(
           onClick: void 0,
           href: void 0
         },
-        disabled,
         elementType: as
       },
       domRef
     );
     const renderValues = {
-      hovered,
-      pressed,
-      focused,
-      focusVisible,
-      loading: loading || false,
-      disabled: disabled || false
+      isHovered,
+      isPressed,
+      isFocused,
+      isFocusVisible,
+      isLoading: isLoading || false,
+      isDisabled: isDisabled || false
     };
     const renderProps = useRenderProps({
       ...props,
@@ -69,14 +68,14 @@ const Button = polymorphicForwardRef(
         },
         ...buttonProps,
         ...renderProps,
-        "data-hovered": hovered,
-        "data-pressed": pressed,
-        "data-focused": focused,
-        "data-disabled": disabled,
-        "data-focus-visible": focusVisible,
+        "data-hovered": isHovered,
+        "data-pressed": isPressed,
+        "data-focused": isFocused,
+        "data-disabled": isDisabled,
+        "data-focus-visible": isFocusVisible,
         tabIndex: tabIndex || buttonProps.tabIndex,
-        "aria-disabled": loading ? "true" : buttonProps["aria-disabled"],
-        "aria-busy": loading,
+        "aria-disabled": isLoading ? "true" : buttonProps["aria-disabled"],
+        "aria-busy": isLoading,
         ref: domRef,
         children: renderProps.children
       }

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

@@ -3,12 +3,12 @@ import type { HoverEvent } from '@react-types/shared';
 import type { ButtonOptions } from '../../types';
 import type { RenderProps } from '../../utils';
 export type ButtonRenderProps = {
-    hovered: boolean;
-    focused: boolean;
-    pressed: boolean;
-    loading: boolean;
-    disabled: boolean;
-    focusVisible: boolean;
+    isHovered: boolean;
+    isFocused: boolean;
+    isPressed: boolean;
+    isLoading: boolean;
+    isDisabled: boolean;
+    isFocusVisible: boolean;
 };
 export type ButtonBaseProps = ExtendableProps<RenderProps<ButtonRenderProps>, ButtonOptions & {
     /** Handler that is called when a hover interaction starts. */
@@ -39,5 +39,5 @@ export type ButtonBaseProps = ExtendableProps<RenderProps<ButtonRenderProps>, Bu
     formTarget?: string;
     tabIndex?: number;
     slot?: string;
-    loading?: boolean;
+    isLoading?: boolean;
 }>;

package/dist/components/Link/Link.js

@@ -4,13 +4,12 @@ import { polymorphicForwardRef, useDOMRef, mergeProps } from "@koobiq/react-core
 import { useRenderProps } from "../../utils/index.js";
 import { useLink } from "../../behaviors/useLink.js";
 const Link = polymorphicForwardRef((props, ref) => {
-  const { as: Tag = "a", ...commonProps } = props;
-  const { disabled } = commonProps;
+  const { as: Tag = "a", ...other } = props;
   const domRef = useDOMRef(ref);
-  const { hovered, pressed, focused, focusVisible, linkProps } = useLink(
+  const { isHovered, isPressed, isFocusVisible, isFocused, linkProps } = useLink(
     {
-      ...commonProps,
-      ...disabled && {
+      ...other,
+      ...other.isDisabled && {
         onPress: void 0,
         onPressStart: void 0,
         onPressEnd: void 0,
@@ -20,17 +19,16 @@ const Link = polymorphicForwardRef((props, ref) => {
         onKeyUp: void 0,
         onClick: void 0,
         href: void 0
-      },
-      disabled
+      }
     },
     domRef
   );
   const renderValues = {
-    hovered,
-    pressed,
-    focused,
-    focusVisible,
-    disabled: props.disabled || false
+    isHovered,
+    isPressed,
+    isFocused,
+    isFocusVisible,
+    isDisabled: props.isDisabled || false
   };
   const renderProps = useRenderProps({
     ...props,

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

@@ -2,11 +2,11 @@ import type { ExtendableProps } from '@koobiq/react-core';
 import type { UseLinkProps } from '../../behaviors';
 import type { RenderProps } from '../../utils';
 export type LinkRenderProps = {
-    hovered: boolean;
-    focused: boolean;
-    pressed: boolean;
-    disabled: boolean;
-    focusVisible: boolean;
+    isHovered: boolean;
+    isFocused: boolean;
+    isPressed: boolean;
+    isDisabled: boolean;
+    isFocusVisible: boolean;
 };
 export type LinkBaseProps = ExtendableProps<RenderProps<LinkRenderProps> & {
     tabIndex?: number;

package/dist/types.d.ts

@@ -1,11 +1,5 @@
 import type { ElementType } from 'react';
 import type { AriaButtonOptions } from '@react-aria/button';
 import type { AriaLinkOptions } from '@react-aria/link';
-export type ButtonOptions = Omit<AriaButtonOptions<ElementType>, 'isDisabled'> & {
-    /** Whether the button is disabled. */
-    disabled?: boolean;
-};
-export type LinkOptions = Omit<AriaLinkOptions, 'isDisabled'> & {
-    /** Whether the button is disabled. */
-    disabled?: boolean;
-};
+export type ButtonOptions = AriaButtonOptions<ElementType>;
+export type LinkOptions = AriaLinkOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koobiq/react-primitives",
-  "version": "0.0.1-beta.21",
+  "version": "0.0.1-beta.23",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -52,8 +52,8 @@
     "@react-stately/toggle": "^3.7.0",
     "@react-stately/tooltip": "^3.4.13",
     "@react-stately/tree": "^3.8.9",
-    "@koobiq/logger": "0.0.1-beta.21",
-    "@koobiq/react-core": "0.0.1-beta.21"
+    "@koobiq/logger": "0.0.1-beta.23",
+    "@koobiq/react-core": "0.0.1-beta.23"
   },
   "peerDependencies": {
     "react": "18.x || 19.x",