@gravity-ui/blog-constructor 6.4.3 → 6.5.0

package/build/cjs/components/FeedHeader/components/Controls/customRenders.d.ts

@@ -6,7 +6,8 @@ type RenderSwitcherType = ({ initial, list, defaultLabel, }: {
     list: CustomSwitcherProps['list'];
     defaultLabel: string;
 }) => SelectProps['renderControl'];
+type RenderFilterType = SelectProps['renderFilter'];
 export declare const renderSwitcher: RenderSwitcherType;
-export declare const renderFilter: SelectProps['renderFilter'];
+export declare const renderFilter: RenderFilterType;
 export declare const renderOption: (option: SelectOption) => React.JSX.Element;
 export {};

package/build/cjs/components/FeedHeader/components/Controls/customRenders.js

@@ -11,9 +11,15 @@ const CustomSwitcher_1 = require("../CustomSwitcher/CustomSwitcher");
 const b = (0, cn_1.block)('feed-controls');
 const renderSwitcher = ({ initial, list, defaultLabel }) => 
 // eslint-disable-next-line react/display-name
-({ onClick, ref, onKeyDown, open, renderClear, popupId, activeIndex }) => (react_1.default.createElement(CustomSwitcher_1.CustomSwitcher, { initial: initial, defaultLabel: defaultLabel, list: list, controlRef: ref, onClick: onClick, onKeyDown: onKeyDown, renderClear: renderClear, open: open, popupId: popupId, activeIndex: activeIndex }));
+(_a) => {
+    var { ref, renderClear } = _a, _b = _a.triggerProps, { id, disabled, type, onClick, onKeyDown } = _b, a11yProps = tslib_1.__rest(_b, ["id", "disabled", "type", "onClick", "onKeyDown"]);
+    return (react_1.default.createElement(CustomSwitcher_1.CustomSwitcher, { id: id, disabled: disabled, type: type, initial: initial, defaultLabel: defaultLabel, list: list, controlRef: ref, onClick: onClick, onKeyDown: onKeyDown, renderClear: renderClear, a11yProps: a11yProps }));
+};
 exports.renderSwitcher = renderSwitcher;
-const renderFilter = ({ value, onChange, onKeyDown }) => (react_1.default.createElement(uikit_1.TextInput, { controlProps: { size: 1 }, value: value, view: "clear", placeholder: (0, i18n_1.i18n)(i18n_1.Keyset.Search), onUpdate: onChange, onKeyDown: onKeyDown, className: b('popup-filter') }));
+const renderFilter = (_a) => {
+    var { ref, onChange } = _a, _b = _a.inputProps, { value, onKeyDown, onChange: _, size: __, placeholder: ___ } = _b, a11yProps = tslib_1.__rest(_b, ["value", "onKeyDown", "onChange", "size", "placeholder"]);
+    return (react_1.default.createElement(uikit_1.TextInput, { value: value, view: "clear", placeholder: (0, i18n_1.i18n)(i18n_1.Keyset.Search), onUpdate: onChange, onKeyDown: onKeyDown, className: b('popup-filter'), controlRef: ref, controlProps: Object.assign({ size: 1 }, a11yProps) }));
+};
 exports.renderFilter = renderFilter;
 const renderOption = (option) => (react_1.default.createElement(CustomSelectOption_1.CustomSelectOption, { data: option }));
 exports.renderOption = renderOption;

package/build/cjs/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.d.ts

@@ -2,11 +2,17 @@ import React from 'react';
 import { SelectProps } from '@gravity-ui/uikit';
 import { SelectItem } from '../Controls/Controls';
 type RenderControlParameters = Partial<Parameters<Required<SelectProps>['renderControl']>[0]>;
+type TriggerProps = Required<RenderControlParameters>['triggerProps'];
+type A11yKeys = {
+    [K in keyof TriggerProps]-?: K extends `aria-${string}` | 'role' ? K : never;
+}[keyof TriggerProps];
+type RenderControlA11yProps = Pick<TriggerProps, A11yKeys>;
 export type CustomSwitcherProps = {
     initial: (string | number | null)[];
     defaultLabel: string;
     list: SelectItem[];
     controlRef: RenderControlParameters['ref'];
-} & Omit<RenderControlParameters, 'ref'>;
-export declare const CustomSwitcher: ({ initial, defaultLabel, list, onClick, controlRef, onKeyDown, open, renderClear, popupId, activeIndex, }: CustomSwitcherProps) => React.JSX.Element;
+    a11yProps: RenderControlA11yProps;
+} & Omit<RenderControlParameters, 'ref'> & Pick<TriggerProps, 'id' | 'disabled' | 'type'>;
+export declare const CustomSwitcher: ({ id, disabled, type, initial, defaultLabel, list, onClick, controlRef, onKeyDown, renderClear, a11yProps, }: CustomSwitcherProps) => React.JSX.Element;
 export {};

package/build/cjs/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.js

@@ -10,7 +10,7 @@ const cn_1 = require("../../../../utils/cn");
 const b = (0, cn_1.block)('feed-custom-switcher');
 const ICON_SIZE = 12;
 const CLEAR_ICON_SIZE = 11;
-const CustomSwitcher = ({ initial, defaultLabel, list, onClick, controlRef, onKeyDown, open, renderClear, popupId, activeIndex, }) => {
+const CustomSwitcher = ({ id, disabled, type, initial, defaultLabel, list, onClick, controlRef, onKeyDown, renderClear, a11yProps, }) => {
     const itemsNames = (0, react_1.useMemo)(() => {
         const items = list
             .filter((item) => initial.includes(item.value))
@@ -20,7 +20,7 @@ const CustomSwitcher = ({ initial, defaultLabel, list, onClick, controlRef, onKe
     const hasCounter = itemsNames.length > 1;
     const contentElementId = (0, uikit_1.useUniqId)();
     return (react_1.default.createElement("div", { className: b('custom-switcher'), ref: controlRef },
-        react_1.default.createElement("button", { onClick: onClick, className: b('custom-switcher-element', { overlay: true }), onKeyDown: onKeyDown, "aria-expanded": open, "aria-labelledby": contentElementId, "aria-activedescendant": activeIndex === undefined ? undefined : `${popupId}-item-${activeIndex}` }),
+        react_1.default.createElement("button", Object.assign({ id: id, disabled: disabled, type: type, onClick: onClick, className: b('custom-switcher-element', { overlay: true }), onKeyDown: onKeyDown }, a11yProps, { "aria-labelledby": contentElementId })),
         react_1.default.createElement("div", { id: contentElementId, className: b('custom-switcher-element', { content: true }), "aria-hidden": true }, itemsNames === null || itemsNames === void 0 ? void 0 : itemsNames.join(', ')),
         renderClear &&
             renderClear({

package/build/esm/components/FeedHeader/components/Controls/customRenders.d.ts

@@ -7,7 +7,8 @@ type RenderSwitcherType = ({ initial, list, defaultLabel, }: {
     list: CustomSwitcherProps['list'];
     defaultLabel: string;
 }) => SelectProps['renderControl'];
+type RenderFilterType = SelectProps['renderFilter'];
 export declare const renderSwitcher: RenderSwitcherType;
-export declare const renderFilter: SelectProps['renderFilter'];
+export declare const renderFilter: RenderFilterType;
 export declare const renderOption: (option: SelectOption) => React.JSX.Element;
 export {};

package/build/esm/components/FeedHeader/components/Controls/customRenders.js

@@ -1,3 +1,4 @@
+import { __rest } from "tslib";
 import React from 'react';
 import { TextInput } from '@gravity-ui/uikit';
 import { Keyset, i18n } from '../../../../i18n';
@@ -8,6 +9,12 @@ import './Controls.css';
 const b = block('feed-controls');
 export const renderSwitcher = ({ initial, list, defaultLabel }) => 
 // eslint-disable-next-line react/display-name
-({ onClick, ref, onKeyDown, open, renderClear, popupId, activeIndex }) => (React.createElement(CustomSwitcher, { initial: initial, defaultLabel: defaultLabel, list: list, controlRef: ref, onClick: onClick, onKeyDown: onKeyDown, renderClear: renderClear, open: open, popupId: popupId, activeIndex: activeIndex }));
-export const renderFilter = ({ value, onChange, onKeyDown }) => (React.createElement(TextInput, { controlProps: { size: 1 }, value: value, view: "clear", placeholder: i18n(Keyset.Search), onUpdate: onChange, onKeyDown: onKeyDown, className: b('popup-filter') }));
+(_a) => {
+    var { ref, renderClear } = _a, _b = _a.triggerProps, { id, disabled, type, onClick, onKeyDown } = _b, a11yProps = __rest(_b, ["id", "disabled", "type", "onClick", "onKeyDown"]);
+    return (React.createElement(CustomSwitcher, { id: id, disabled: disabled, type: type, initial: initial, defaultLabel: defaultLabel, list: list, controlRef: ref, onClick: onClick, onKeyDown: onKeyDown, renderClear: renderClear, a11yProps: a11yProps }));
+};
+export const renderFilter = (_a) => {
+    var { ref, onChange } = _a, _b = _a.inputProps, { value, onKeyDown, onChange: _, size: __, placeholder: ___ } = _b, a11yProps = __rest(_b, ["value", "onKeyDown", "onChange", "size", "placeholder"]);
+    return (React.createElement(TextInput, { value: value, view: "clear", placeholder: i18n(Keyset.Search), onUpdate: onChange, onKeyDown: onKeyDown, className: b('popup-filter'), controlRef: ref, controlProps: Object.assign({ size: 1 }, a11yProps) }));
+};
 export const renderOption = (option) => (React.createElement(CustomSelectOption, { data: option }));

package/build/esm/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.d.ts

@@ -3,11 +3,17 @@ import { SelectProps } from '@gravity-ui/uikit';
 import { SelectItem } from '../Controls/Controls';
 import './CustomSwitcher.css';
 type RenderControlParameters = Partial<Parameters<Required<SelectProps>['renderControl']>[0]>;
+type TriggerProps = Required<RenderControlParameters>['triggerProps'];
+type A11yKeys = {
+    [K in keyof TriggerProps]-?: K extends `aria-${string}` | 'role' ? K : never;
+}[keyof TriggerProps];
+type RenderControlA11yProps = Pick<TriggerProps, A11yKeys>;
 export type CustomSwitcherProps = {
     initial: (string | number | null)[];
     defaultLabel: string;
     list: SelectItem[];
     controlRef: RenderControlParameters['ref'];
-} & Omit<RenderControlParameters, 'ref'>;
-export declare const CustomSwitcher: ({ initial, defaultLabel, list, onClick, controlRef, onKeyDown, open, renderClear, popupId, activeIndex, }: CustomSwitcherProps) => React.JSX.Element;
+    a11yProps: RenderControlA11yProps;
+} & Omit<RenderControlParameters, 'ref'> & Pick<TriggerProps, 'id' | 'disabled' | 'type'>;
+export declare const CustomSwitcher: ({ id, disabled, type, initial, defaultLabel, list, onClick, controlRef, onKeyDown, renderClear, a11yProps, }: CustomSwitcherProps) => React.JSX.Element;
 export {};

package/build/esm/components/FeedHeader/components/CustomSwitcher/CustomSwitcher.js

@@ -7,7 +7,7 @@ import './CustomSwitcher.css';
 const b = block('feed-custom-switcher');
 const ICON_SIZE = 12;
 const CLEAR_ICON_SIZE = 11;
-export const CustomSwitcher = ({ initial, defaultLabel, list, onClick, controlRef, onKeyDown, open, renderClear, popupId, activeIndex, }) => {
+export const CustomSwitcher = ({ id, disabled, type, initial, defaultLabel, list, onClick, controlRef, onKeyDown, renderClear, a11yProps, }) => {
     const itemsNames = useMemo(() => {
         const items = list
             .filter((item) => initial.includes(item.value))
@@ -17,7 +17,7 @@ export const CustomSwitcher = ({ initial, defaultLabel, list, onClick, controlRe
     const hasCounter = itemsNames.length > 1;
     const contentElementId = useUniqId();
     return (React.createElement("div", { className: b('custom-switcher'), ref: controlRef },
-        React.createElement("button", { onClick: onClick, className: b('custom-switcher-element', { overlay: true }), onKeyDown: onKeyDown, "aria-expanded": open, "aria-labelledby": contentElementId, "aria-activedescendant": activeIndex === undefined ? undefined : `${popupId}-item-${activeIndex}` }),
+        React.createElement("button", Object.assign({ id: id, disabled: disabled, type: type, onClick: onClick, className: b('custom-switcher-element', { overlay: true }), onKeyDown: onKeyDown }, a11yProps, { "aria-labelledby": contentElementId })),
         React.createElement("div", { id: contentElementId, className: b('custom-switcher-element', { content: true }), "aria-hidden": true }, itemsNames === null || itemsNames === void 0 ? void 0 : itemsNames.join(', ')),
         renderClear &&
             renderClear({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/blog-constructor",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "description": "Gravity UI Blog Constructor",
   "license": "MIT",
   "repository": {
@@ -79,7 +79,7 @@
   "peerDependencies": {
     "@diplodoc/transform": "^4.10.7",
     "@gravity-ui/page-constructor": "^5.0.0",
-    "@gravity-ui/uikit": "^6.1.1",
+    "@gravity-ui/uikit": "^6.26.0",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
@@ -93,7 +93,7 @@
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^6.22.0",
+    "@gravity-ui/uikit": "^6.26.0",
     "@jest/environment": "^29.7.0",
     "@playwright/experimental-ct-react": "^1.45.3",
     "@playwright/test": "^1.45.3",