@uxf/core-react 11.32.0 → 11.35.0

package/hooks/_use-simulated-button.d.ts

@@ -6,9 +6,9 @@ interface Props<T extends HTMLElement> {
     onClick?: MouseEventHandler<T>;
     onKeyDown?: KeyboardEventHandler<T>;
     onKeyUp?: KeyboardEventHandler<T>;
-    submit?: boolean;
+    isSubmitType?: boolean;
 }
-export declare function _useSimulatedButton<T extends HTMLElement>({ analyticsCallback, isClickable, isHyperlink, onClick, onKeyDown, onKeyUp, submit, }: Props<T>): {
+export declare function _useSimulatedButton<T extends HTMLElement>({ analyticsCallback, isClickable, isHyperlink, onClick, onKeyDown, onKeyUp, isSubmitType, }: Props<T>): {
     onClick: MouseEventHandler<T>;
     onKeyDown: KeyboardEventHandler<T>;
     onKeyUp: KeyboardEventHandler<T>;

package/hooks/_use-simulated-button.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._useSimulatedButton = _useSimulatedButton;
 const react_1 = require("react");
-function _useSimulatedButton({ analyticsCallback, isClickable, isHyperlink, onClick, onKeyDown, onKeyUp, submit, }) {
+function _useSimulatedButton({ analyticsCallback, isClickable, isHyperlink, onClick, onKeyDown, onKeyUp, isSubmitType, }) {
     const _onClick = (0, react_1.useCallback)((e) => {
         var _a;
         if ((isClickable || isHyperlink) && analyticsCallback) {
             analyticsCallback();
         }
         if (isClickable) {
-            if (submit) {
+            if (isSubmitType) {
                 const closestForm = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.closest("form");
                 if (closestForm) {
                     closestForm.dispatchEvent(new Event("submit", { bubbles: true, cancelable: true }));
@@ -22,7 +22,7 @@ function _useSimulatedButton({ analyticsCallback, isClickable, isHyperlink, onCl
         else {
             e.preventDefault();
         }
-    }, [analyticsCallback, isClickable, isHyperlink, onClick, submit]);
+    }, [analyticsCallback, isClickable, isHyperlink, onClick, isSubmitType]);
     const _onKeyUp = (0, react_1.useCallback)((e) => {
         if (isClickable && (e.key === "Enter" || e.key === " ")) {
             e.target.dispatchEvent(new MouseEvent("click", {

package/hooks/use-anchor-props.d.ts

@@ -1,8 +1,8 @@
 import { AnchorHTMLAttributes } from "react";
 export interface UseAnchorProps {
     analyticsCallback?: () => void;
-    disabled?: boolean;
-    loading?: boolean;
+    isDisabled?: boolean;
+    isLoading?: boolean;
     type?: "submit";
 }
-export declare function useAnchorProps<T extends AnchorHTMLAttributes<HTMLAnchorElement>>({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, disabled, download, href, hrefLang, loading, media, onClick, onKeyDown, onKeyUp, ping, referrerPolicy, rel, role, tabIndex, target, type, ...restProps }: UseAnchorProps & T): T;
+export declare function useAnchorProps<T extends AnchorHTMLAttributes<HTMLAnchorElement>>({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, isDisabled, download, href, hrefLang, isLoading, media, onClick, onKeyDown, onKeyUp, ping, referrerPolicy, rel, role, tabIndex, target, type, ...restProps }: UseAnchorProps & T): T;

package/hooks/use-anchor-props.js

@@ -5,14 +5,14 @@ const classes_1 = require("@uxf/core/constants/classes");
 const cx_1 = require("@uxf/core/utils/cx");
 const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
 const _use_simulated_button_1 = require("./_use-simulated-button");
-function useAnchorProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, disabled, download, href, hrefLang, loading, media, onClick, onKeyDown, onKeyUp, ping, referrerPolicy, rel, role, tabIndex, target, type, ...restProps }) {
-    const isBusy = loading ? loading : Boolean(ariaBusy);
-    const isDisabled = disabled ? disabled : Boolean(ariaDisabled);
-    const isBusyOrDisabled = isBusy || isDisabled;
-    const submit = type === "submit";
-    const isButton = submit || (0, is_not_nil_1.isNotNil)(onClick);
+function useAnchorProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, isDisabled, download, href, hrefLang, isLoading, media, onClick, onKeyDown, onKeyUp, ping, referrerPolicy, rel, role, tabIndex, target, type, ...restProps }) {
+    const isBusy = Boolean(isLoading || ariaBusy);
+    const isDisabledOrAriaDisabled = Boolean(isDisabled || ariaDisabled);
+    const isBusyOrDisabled = isBusy || isDisabledOrAriaDisabled;
+    const isSubmitType = type === "submit";
+    const isButton = isSubmitType || (0, is_not_nil_1.isNotNil)(onClick);
     const tabIndexInteractive = isBusyOrDisabled ? -1 : tabIndex;
-    const _className = [isBusy && classes_1.CLASSES.IS_LOADING, disabled && classes_1.CLASSES.IS_DISABLED, className];
+    const _className = [isBusy && classes_1.CLASSES.IS_LOADING, isDisabledOrAriaDisabled && classes_1.CLASSES.IS_DISABLED, className];
     const simulatedButton = (0, _use_simulated_button_1._useSimulatedButton)({
         analyticsCallback,
         isClickable: !isBusyOrDisabled || isButton,
@@ -20,12 +20,12 @@ function useAnchorProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabl
         onClick,
         onKeyDown,
         onKeyUp,
-        submit,
+        isSubmitType,
     });
     if (href) {
         return {
             "aria-busy": isBusy,
-            "aria-disabled": isDisabled,
+            "aria-disabled": isDisabledOrAriaDisabled,
             className: (0, cx_1.cx)(classes_1.CLASSES.IS_HOVERABLE, ..._className),
             download,
             href,
@@ -46,7 +46,7 @@ function useAnchorProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabl
     if (isButton) {
         return {
             "aria-busy": isBusy,
-            "aria-disabled": isDisabled,
+            "aria-disabled": isDisabledOrAriaDisabled,
             className: (0, cx_1.cx)(classes_1.CLASSES.IS_HOVERABLE, ..._className),
             onClick: simulatedButton.onClick,
             onKeyDown: simulatedButton.onKeyDown,

package/hooks/use-clickable-props.d.ts

@@ -1,8 +1,8 @@
 import { HTMLAttributes } from "react";
 export interface UseClickableProps {
     analyticsCallback?: () => void;
-    disabled?: boolean;
-    loading?: boolean;
+    isDisabled?: boolean;
+    isLoading?: boolean;
     type?: "submit";
 }
-export declare function useClickableProps<T extends HTMLAttributes<HTMLElement>>({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, disabled, loading, onClick, onKeyDown, onKeyUp, role, tabIndex, type, ...restProps }: UseClickableProps & T): T;
+export declare function useClickableProps<T extends HTMLAttributes<HTMLElement>>({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, isDisabled, isLoading, onClick, onKeyDown, onKeyUp, role, tabIndex, type, ...restProps }: UseClickableProps & T): T;

package/hooks/use-clickable-props.js

@@ -5,13 +5,13 @@ const classes_1 = require("@uxf/core/constants/classes");
 const cx_1 = require("@uxf/core/utils/cx");
 const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
 const _use_simulated_button_1 = require("./_use-simulated-button");
-function useClickableProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, disabled, loading, onClick, onKeyDown, onKeyUp, role, tabIndex, type, ...restProps }) {
-    const isBusy = loading ? loading : Boolean(ariaBusy);
-    const isDisabled = disabled ? disabled : Boolean(ariaDisabled);
-    const isBusyOrDisabled = isBusy || isDisabled;
-    const submit = type === "submit";
-    const isButton = submit || (0, is_not_nil_1.isNotNil)(onClick);
-    const _className = [isBusy && classes_1.CLASSES.IS_LOADING, isDisabled && classes_1.CLASSES.IS_DISABLED, className];
+function useClickableProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDisabled, analyticsCallback, className, isDisabled, isLoading, onClick, onKeyDown, onKeyUp, role, tabIndex, type, ...restProps }) {
+    const isBusy = Boolean(isLoading || ariaBusy);
+    const isDisabledOrAriaDisabled = Boolean(isDisabled || ariaDisabled);
+    const isBusyOrDisabled = isBusy || isDisabledOrAriaDisabled;
+    const isSubmitType = type === "submit";
+    const isButton = isSubmitType || (0, is_not_nil_1.isNotNil)(onClick);
+    const _className = [isBusy && classes_1.CLASSES.IS_LOADING, isDisabledOrAriaDisabled && classes_1.CLASSES.IS_DISABLED, className];
     const simulatedButton = (0, _use_simulated_button_1._useSimulatedButton)({
         analyticsCallback,
         isClickable: !isBusyOrDisabled || isButton,
@@ -19,12 +19,12 @@ function useClickableProps({ ["aria-busy"]: ariaBusy, ["aria-disabled"]: ariaDis
         onClick,
         onKeyDown,
         onKeyUp,
-        submit,
+        isSubmitType,
     });
     if (isButton) {
         return {
             "aria-busy": isBusy,
-            "aria-disabled": isDisabled,
+            "aria-disabled": isDisabledOrAriaDisabled,
             className: (0, cx_1.cx)(classes_1.CLASSES.IS_HOVERABLE, ..._className),
             onClick: simulatedButton.onClick,
             onKeyDown: simulatedButton.onKeyDown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/core-react",
-  "version": "11.32.0",
+  "version": "11.35.0",
   "description": "UXF Core",
   "author": "UX Fans s.r.o",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "typecheck": "tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@uxf/core": "11.32.0"
+    "@uxf/core": "11.35.0"
   },
   "peerDependencies": {
     "react": ">=18.2.0"