@ozen-ui/kit 0.55.0 → 0.56.0

package/__inner__/cjs/components/Autocomplete/helper.d.ts

@@ -69,7 +69,7 @@ export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTI
 }) & (OPTION extends {
     disabled: boolean | undefined;
 } ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionKey<OPTION> | undefined;
+    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
 }) & {
     getOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption> | AutocompletePropGetOptionLabel<OPTION>;
     getOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption> | AutocompletePropGetOptionKey<OPTION>;
@@ -140,7 +140,7 @@ export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTI
 }) & (OPTION extends {
     disabled: boolean | undefined;
 } ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionKey<OPTION> | undefined;
+    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
 }) & {
     getOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption> | AutocompletePropGetOptionLabel<OPTION>;
     getOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption> | AutocompletePropGetOptionKey<OPTION>;

package/__inner__/cjs/components/Autocomplete/types.d.ts

@@ -99,7 +99,7 @@ export type AutocompleteProps<OPTION = AutocompleteDefaultOption> = {
 }) & (OPTION extends {
     disabled: AutocompleteDefaultOption['disabled'];
 } ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionKey<OPTION>;
+    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION>;
 });
 export type AutocompleteComponent = <OPTION = AutocompleteDefaultOption>(props: AutocompleteProps<OPTION>) => ReactElement | null;
 export {};

package/__inner__/cjs/components/ButtonBase/ButtonBase.js

@@ -14,17 +14,22 @@ exports.ButtonBase = (0, polymorphicComponentWithRef_1.polymorphicComponentWithR
         props: inProps,
         name: 'Button',
     });
-    var _a = props.as, Tag = _a === void 0 ? constants_1.BUTTON_BASE_DEFAULT_TAG : _a, loading = props.loading, children = props.children, disabled = props.disabled, className = props.className, onClick = props.onClick, unstyled = props.unstyled, other = tslib_1.__rest(props, ["as", "loading", "children", "disabled", "className", "onClick", "unstyled"]);
-    var handleClick = function (event) {
-        if (onClick && !disabled && !loading) {
-            onClick(event);
-        }
+    var _a = props.as, Tag = _a === void 0 ? constants_1.BUTTON_BASE_DEFAULT_TAG : _a, loadingProp = props.loading, disabledProp = props.disabled, children = props.children, className = props.className, onClick = props.onClick, unstyled = props.unstyled, other = tslib_1.__rest(props, ["as", "loading", "disabled", "children", "className", "onClick", "unstyled"]);
+    var loading = Boolean(loadingProp);
+    var disabled = Boolean(disabledProp || loadingProp);
+    // TODO: подумать на тем, чтобы не блокировать кнопку в «заблокированном состоянии»,
+    //  чтобы не терять установленный на неё фокус
+    var onDisabledClick = function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+        event.nativeEvent.stopImmediatePropagation();
     };
-    var isInteractionPrevented = disabled || loading;
-    return (react_1.default.createElement(Tag, tslib_1.__assign({ disabled: isInteractionPrevented, onClick: handleClick, type: "button", className: (0, exports.cnButtonBase)({
+    return (react_1.default.createElement(Tag, tslib_1.__assign({ disabled: disabled, onClick: disabled ? onDisabledClick : onClick }, (disabled && {
+        'aria-disabled': true,
+    }), { type: "button", className: (0, exports.cnButtonBase)({
             disabled: disabled,
             loading: loading,
             unstyled: unstyled,
-        }, [className]) }, (isInteractionPrevented && { tabIndex: -1 }), other, { ref: ref }), children));
+        }, [className]) }, (disabled && { tabIndex: -1 }), other, { ref: ref }), children));
 });
 exports.ButtonBase.displayName = 'ButtonBase';

package/__inner__/cjs/components/Calendar/components/CalendarGridItem/types.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentRef } from 'react';
-import type { DPDayRange } from '@rehookify/datepicker/dist/types/day';
+import type { DPDayRange } from '@rehookify/datepicker';
 import type { ExtendableComponentPropsWithRef } from '../../../../types/ExtendableComponentPropsWithRef';
 import type { CalendarSizeVariant } from '../../index';
 export type CalendarGridItemRef = ComponentRef<'button'>;

package/__inner__/cjs/components/DataList/components/DataListOption/DataListOption.css

@@ -19,7 +19,6 @@
   .DataListOption_disabled:hover,
   .DataListOption_disabled:active {
     cursor: not-allowed;
-
     background-color: unset;
   }
 

package/__inner__/cjs/components/FieldInput/FieldInput.js

@@ -20,7 +20,7 @@ exports.FieldInput = (0, polymorphicComponentWithRef_1.polymorphicComponentWithR
         name: 'FieldInput',
         state: 'value',
         defaultValue: defaultValue,
-    }), 2), valueState = _e[0], setValueState = _e[1];
+    }), 3), valueState = _e[0], setValueState = _e[1], isControlled = _e[2];
     var filled = !!valueState || valueState === 0;
     var required = requiredProp;
     var disabled = disabledProp;
@@ -50,6 +50,6 @@ exports.FieldInput = (0, polymorphicComponentWithRef_1.polymorphicComponentWithR
         setFocused(false);
         onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
     }, [onBlur]);
-    return (react_1.default.createElement(Tag, tslib_1.__assign({ className: (0, exports.cnFieldInput)({}, [className]), required: required, disabled: disabled, onFocus: handleFocus, onBlur: handleBlur, onChange: handleChange, value: valueState }, other, { ref: ref }), children));
+    return (react_1.default.createElement(Tag, tslib_1.__assign({ className: (0, exports.cnFieldInput)({}, [className]), required: required, disabled: disabled, onFocus: handleFocus, onBlur: handleBlur, onChange: handleChange }, (isControlled ? { value: valueState } : { defaultValue: defaultValue }), other, { ref: ref }), children));
 });
 exports.FieldInput.displayName = 'FieldInput';

package/__inner__/cjs/components/Select/types.d.ts

@@ -2,7 +2,7 @@ import type { ReactElement, ReactNode, SyntheticEvent } from 'react';
 import type { ExtendableComponentPropsWithRef } from '../../types/ExtendableComponentPropsWithRef';
 import type { FormElementSizeVariant } from '../../types/FormElementSizeVariant';
 import type { DataListBaseProps, DataListSelected } from '../DataList';
-import type { SelectInputProps } from './components';
+import type { SelectInputProps, SelectInputRef } from './components';
 export type SelectSizeVariant = FormElementSizeVariant;
 export type SelectLabel = string | number | undefined;
 export type SelectPropLabel<MULTIPLE extends boolean> = (MULTIPLE extends true ? SelectLabel[] : SelectLabel) | undefined;
@@ -47,6 +47,7 @@ type SelectPropsDeprecated<MULTIPLE extends boolean = false> = {
      * */
     menuProps?: Partial<Omit<DataListBaseProps<MULTIPLE>, 'onClose' | 'open' | 'anchorRef' | 'multiple' | 'selected' | 'onSelect'>>;
 };
+export type SelectRef = SelectInputRef;
 export type SelectProps<MULTIPLE extends boolean = false> = ExtendableComponentPropsWithRef<{
     /** Если {true} устанавливает автофокус */
     autoFocus?: boolean;

package/__inner__/cjs/components/Snackbar/SnackbarContext.js

@@ -3,10 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSnackbar = exports.SnackbarContext = void 0;
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
-exports.SnackbarContext = react_1.default.createContext({
-    pushMessage: function () { return ''; },
-    closeMessage: function () { return undefined; },
-});
+exports.SnackbarContext = react_1.default.createContext({});
 var useSnackbar = function () { return (0, react_1.useContext)(exports.SnackbarContext); };
 exports.useSnackbar = useSnackbar;
 // Именованный провайдер

package/__inner__/cjs/hooks/useControlled/useControlled.js

@@ -38,6 +38,6 @@ var useControlled = function (_a) {
             setValue(newValue);
         }
     }, []);
-    return [value, setValueIfUncontrolled, valueProp !== undefined];
+    return [value, setValueIfUncontrolled, isControlled];
 };
 exports.useControlled = useControlled;

package/__inner__/esm/components/Autocomplete/helper.d.ts

@@ -69,7 +69,7 @@ export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTI
 }) & (OPTION extends {
     disabled: boolean | undefined;
 } ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionKey<OPTION> | undefined;
+    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
 }) & {
     getOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption> | AutocompletePropGetOptionLabel<OPTION>;
     getOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption> | AutocompletePropGetOptionKey<OPTION>;
@@ -140,7 +140,7 @@ export declare function withDefaultGetters<OPTION>(props: AutocompleteProps<OPTI
 }) & (OPTION extends {
     disabled: boolean | undefined;
 } ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionKey<OPTION> | undefined;
+    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION> | undefined;
 }) & {
     getOptionLabel: AutocompletePropGetOptionLabel<AutocompleteDefaultOption> | AutocompletePropGetOptionLabel<OPTION>;
     getOptionKey: AutocompletePropGetOptionKey<AutocompleteDefaultOption> | AutocompletePropGetOptionKey<OPTION>;

package/__inner__/esm/components/Autocomplete/types.d.ts

@@ -99,7 +99,7 @@ export type AutocompleteProps<OPTION = AutocompleteDefaultOption> = {
 }) & (OPTION extends {
     disabled: AutocompleteDefaultOption['disabled'];
 } ? Record<string, unknown> : {
-    getOptionDisabled?: AutocompletePropGetOptionKey<OPTION>;
+    getOptionDisabled?: AutocompletePropGetOptionDisabled<OPTION>;
 });
 export type AutocompleteComponent = <OPTION = AutocompleteDefaultOption>(props: AutocompleteProps<OPTION>) => ReactElement | null;
 export {};

package/__inner__/esm/components/ButtonBase/ButtonBase.js

@@ -11,17 +11,22 @@ export var ButtonBase = polymorphicComponentWithRef(function (inProps, ref) {
         props: inProps,
         name: 'Button',
     });
-    var _a = props.as, Tag = _a === void 0 ? BUTTON_BASE_DEFAULT_TAG : _a, loading = props.loading, children = props.children, disabled = props.disabled, className = props.className, onClick = props.onClick, unstyled = props.unstyled, other = __rest(props, ["as", "loading", "children", "disabled", "className", "onClick", "unstyled"]);
-    var handleClick = function (event) {
-        if (onClick && !disabled && !loading) {
-            onClick(event);
-        }
+    var _a = props.as, Tag = _a === void 0 ? BUTTON_BASE_DEFAULT_TAG : _a, loadingProp = props.loading, disabledProp = props.disabled, children = props.children, className = props.className, onClick = props.onClick, unstyled = props.unstyled, other = __rest(props, ["as", "loading", "disabled", "children", "className", "onClick", "unstyled"]);
+    var loading = Boolean(loadingProp);
+    var disabled = Boolean(disabledProp || loadingProp);
+    // TODO: подумать на тем, чтобы не блокировать кнопку в «заблокированном состоянии»,
+    //  чтобы не терять установленный на неё фокус
+    var onDisabledClick = function (event) {
+        event.preventDefault();
+        event.stopPropagation();
+        event.nativeEvent.stopImmediatePropagation();
     };
-    var isInteractionPrevented = disabled || loading;
-    return (React.createElement(Tag, __assign({ disabled: isInteractionPrevented, onClick: handleClick, type: "button", className: cnButtonBase({
+    return (React.createElement(Tag, __assign({ disabled: disabled, onClick: disabled ? onDisabledClick : onClick }, (disabled && {
+        'aria-disabled': true,
+    }), { type: "button", className: cnButtonBase({
             disabled: disabled,
             loading: loading,
             unstyled: unstyled,
-        }, [className]) }, (isInteractionPrevented && { tabIndex: -1 }), other, { ref: ref }), children));
+        }, [className]) }, (disabled && { tabIndex: -1 }), other, { ref: ref }), children));
 });
 ButtonBase.displayName = 'ButtonBase';

package/__inner__/esm/components/Calendar/components/CalendarGridItem/types.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentRef } from 'react';
-import type { DPDayRange } from '@rehookify/datepicker/dist/types/day';
+import type { DPDayRange } from '@rehookify/datepicker';
 import type { ExtendableComponentPropsWithRef } from '../../../../types/ExtendableComponentPropsWithRef';
 import type { CalendarSizeVariant } from '../../index';
 export type CalendarGridItemRef = ComponentRef<'button'>;

package/__inner__/esm/components/DataList/components/DataListOption/DataListOption.css

@@ -19,7 +19,6 @@
   .DataListOption_disabled:hover,
   .DataListOption_disabled:active {
     cursor: not-allowed;
-
     background-color: unset;
   }
 

package/__inner__/esm/components/FieldInput/FieldInput.js

@@ -17,7 +17,7 @@ export var FieldInput = polymorphicComponentWithRef(function (_a, ref) {
         name: 'FieldInput',
         state: 'value',
         defaultValue: defaultValue,
-    }), 2), valueState = _e[0], setValueState = _e[1];
+    }), 3), valueState = _e[0], setValueState = _e[1], isControlled = _e[2];
     var filled = !!valueState || valueState === 0;
     var required = requiredProp;
     var disabled = disabledProp;
@@ -47,6 +47,6 @@ export var FieldInput = polymorphicComponentWithRef(function (_a, ref) {
         setFocused(false);
         onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
     }, [onBlur]);
-    return (React.createElement(Tag, __assign({ className: cnFieldInput({}, [className]), required: required, disabled: disabled, onFocus: handleFocus, onBlur: handleBlur, onChange: handleChange, value: valueState }, other, { ref: ref }), children));
+    return (React.createElement(Tag, __assign({ className: cnFieldInput({}, [className]), required: required, disabled: disabled, onFocus: handleFocus, onBlur: handleBlur, onChange: handleChange }, (isControlled ? { value: valueState } : { defaultValue: defaultValue }), other, { ref: ref }), children));
 });
 FieldInput.displayName = 'FieldInput';

package/__inner__/esm/components/Select/types.d.ts

@@ -2,7 +2,7 @@ import type { ReactElement, ReactNode, SyntheticEvent } from 'react';
 import type { ExtendableComponentPropsWithRef } from '../../types/ExtendableComponentPropsWithRef';
 import type { FormElementSizeVariant } from '../../types/FormElementSizeVariant';
 import type { DataListBaseProps, DataListSelected } from '../DataList';
-import type { SelectInputProps } from './components';
+import type { SelectInputProps, SelectInputRef } from './components';
 export type SelectSizeVariant = FormElementSizeVariant;
 export type SelectLabel = string | number | undefined;
 export type SelectPropLabel<MULTIPLE extends boolean> = (MULTIPLE extends true ? SelectLabel[] : SelectLabel) | undefined;
@@ -47,6 +47,7 @@ type SelectPropsDeprecated<MULTIPLE extends boolean = false> = {
      * */
     menuProps?: Partial<Omit<DataListBaseProps<MULTIPLE>, 'onClose' | 'open' | 'anchorRef' | 'multiple' | 'selected' | 'onSelect'>>;
 };
+export type SelectRef = SelectInputRef;
 export type SelectProps<MULTIPLE extends boolean = false> = ExtendableComponentPropsWithRef<{
     /** Если {true} устанавливает автофокус */
     autoFocus?: boolean;

package/__inner__/esm/components/Snackbar/SnackbarContext.js

@@ -1,8 +1,5 @@
 import React, { useContext } from 'react';
-export var SnackbarContext = React.createContext({
-    pushMessage: function () { return ''; },
-    closeMessage: function () { return undefined; },
-});
+export var SnackbarContext = React.createContext({});
 export var useSnackbar = function () { return useContext(SnackbarContext); };
 // Именованный провайдер
 if (process.env.NODE_ENV !== 'production') {

package/__inner__/esm/hooks/useControlled/useControlled.js

@@ -35,5 +35,5 @@ export var useControlled = function (_a) {
             setValue(newValue);
         }
     }, []);
-    return [value, setValueIfUncontrolled, valueProp !== undefined];
+    return [value, setValueIfUncontrolled, isControlled];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozen-ui/kit",
-  "version": "0.55.0",
+  "version": "0.56.0",
   "description": "React component library",
   "files": [
     "*"
@@ -27,9 +27,9 @@
     "react-popper": "^2.3.0",
     "react-transition-group": "^4.4.5",
     "tslib": "^2.6.2",
-    "@ozen-ui/fonts": "0.55.0",
-    "@ozen-ui/icons": "0.55.0",
-    "@ozen-ui/logger": "0.55.0"
+    "@ozen-ui/fonts": "0.56.0",
+    "@ozen-ui/logger": "0.56.0",
+    "@ozen-ui/icons": "0.56.0"
   },
   "peerDependencies": {
     "react": ">=17.0.2 <19.0.0",