@invoicebox/ui 0.1.0-alpha.322 → 0.1.0-alpha.325

package/dist/components/form/CountrySelect/components/CountryItem/index.js

@@ -27,7 +27,9 @@ var CountryItem = exports.CountryItem = function CountryItem(_ref) {
   return /*#__PURE__*/_react["default"].createElement(S.Wrapper, {
     $palette: palette,
     onClick: handleSelect,
-    type: "button"
+    type: "button",
+    role: "option",
+    "aria-selected": isSelected
   }, /*#__PURE__*/_react["default"].createElement(S.Title, {
     $isSelected: isSelected,
     $palette: palette

package/dist/components/form/CountrySelect/index.d.ts

@@ -17,6 +17,12 @@ type TFieldProps = {
 type TControlProps<T> = Pick<TSearchInputProps, 'placeholder'> & Pick<TCountryItemProps<T>, 'selectedLabel'> & {
     options: TOption[];
     disabled?: boolean;
+    /**
+     * Только для скринридеров, на экране не выводится: начало aria-label кнопки выбора страны.
+     * Итоговое имя — «<buttonAriaLabelPrefix>: <название выбранной страны>», например
+     * «Код страны: Россия». Кнопка показывает только флаг, без имени её не понять (WCAG 4.1.2).
+     */
+    buttonAriaLabelPrefix?: string;
 } & Pick<TDropdownProps, 'positionVertical' | 'positionLeft' | 'positionRight' | 'minWidth' | 'width' | 'isAutoPosition' | 'isTopPosition'>;
 export type TProps = TFieldProps & TControlProps<string>;
 export declare const CountrySelect: FC<TProps>;

package/dist/components/form/CountrySelect/index.js

@@ -16,7 +16,7 @@ var _Arrow = require("../../common/Arrow");
 var _Dropdown = require("../../common/Dropdown");
 var _Scrollbar = require("../../common/Scrollbar");
 var _palette = require("../../../palette");
-var _excluded = ["value", "onChange", "options", "placeholder", "disabled", "selectedLabel"];
+var _excluded = ["value", "onChange", "options", "placeholder", "disabled", "selectedLabel", "buttonAriaLabelPrefix"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
@@ -40,7 +40,10 @@ var CountrySelect = exports.CountrySelect = function CountrySelect(_ref) {
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     selectedLabel = _ref.selectedLabel,
+    _ref$buttonAriaLabelP = _ref.buttonAriaLabelPrefix,
+    buttonAriaLabelPrefix = _ref$buttonAriaLabelP === void 0 ? 'Код страны' : _ref$buttonAriaLabelP,
     dropdownPositionProps = _objectWithoutProperties(_ref, _excluded);
+  var listboxId = (0, _react.useId)();
   var palette = (0, _palette.useComponentPalette)('countrySelect');
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -87,8 +90,12 @@ var CountrySelect = exports.CountrySelect = function CountrySelect(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(S.HeaderWrapper, {
     type: "button",
     onClick: handleDropdownTrigger,
-    disabled: disabled
-  }, selectedOption.flag && /*#__PURE__*/_react["default"].createElement(_Flag.Flag, {
+    disabled: disabled,
+    "aria-label": selectedOption ? "".concat(buttonAriaLabelPrefix, ": ").concat(selectedOption.label) : buttonAriaLabelPrefix,
+    "aria-haspopup": "listbox",
+    "aria-expanded": isOpen,
+    "aria-controls": isOpen ? listboxId : undefined
+  }, (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.flag) && /*#__PURE__*/_react["default"].createElement(_Flag.Flag, {
     isSmall: false,
     flag: selectedOption.flag
   }), !disabled && /*#__PURE__*/_react["default"].createElement(_Arrow.Arrow, {
@@ -108,6 +115,10 @@ var CountrySelect = exports.CountrySelect = function CountrySelect(_ref) {
     value: search
   })), /*#__PURE__*/_react["default"].createElement(_Scrollbar.Scrollbar, {
     maxHeight: 192
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    role: "listbox",
+    id: listboxId,
+    "aria-label": buttonAriaLabelPrefix
   }, filtredOptions.map(function (option) {
     return /*#__PURE__*/_react["default"].createElement(_CountryItem.CountryItem, {
       key: option.value,
@@ -121,5 +132,5 @@ var CountrySelect = exports.CountrySelect = function CountrySelect(_ref) {
       hint: option.hint,
       flag: option.flag
     });
-  })))));
+  }))))));
 };

package/dist/components/form/CountrySelect/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/components/form/CountrySelect/index.test.js

@@ -0,0 +1,85 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+var _server = require("react-dom/server");
+var _ = require(".");
+var _PhoneInput = require("../PhoneInput");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+var options = [{
+  label: 'Россия',
+  value: 'RUS',
+  description: '+7',
+  flag: 'RUS'
+}, {
+  label: 'Казахстан',
+  value: 'KAZ',
+  description: '+7',
+  flag: 'KAZ'
+}];
+
+// Серверный рендер: предупреждения про useLayoutEffect (Dropdown) ожидаемы и к проверке не относятся
+// eslint-disable-next-line no-console
+var originalError = console.error;
+beforeAll(function () {
+  jest.spyOn(console, 'error').mockImplementation(function (message) {
+    if (typeof message === 'string' && message.includes('useLayoutEffect does nothing on the server')) return;
+    // eslint-disable-next-line no-console
+    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      rest[_key - 1] = arguments[_key];
+    }
+    originalError.apply(void 0, [message].concat(rest));
+  });
+});
+afterAll(function () {
+  return jest.restoreAllMocks();
+});
+var noop = jest.fn();
+var renderButton = function renderButton(markup) {
+  var match = markup.match(/<button[^>]*aria-haspopup[^>]*>/);
+  if (!match) throw new Error("\u041A\u043D\u043E\u043F\u043A\u0430 \u0432\u044B\u0431\u043E\u0440\u0430 \u0441\u0442\u0440\u0430\u043D\u044B \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430: ".concat(markup));
+  return match[0];
+};
+describe('CountrySelect: доступное имя и состояние кнопки (A11Y-12)', function () {
+  test('имя по умолчанию — «Код страны: <страна>», свёрнут, раскрывает listbox', function () {
+    var button = renderButton((0, _server.renderToStaticMarkup)(/*#__PURE__*/_react["default"].createElement(_.CountrySelect, {
+      value: "KAZ",
+      onChange: noop,
+      options: options,
+      selectedLabel: ""
+    })));
+    expect(button).toContain('aria-label="Код страны: Казахстан"');
+    expect(button).toContain('aria-haspopup="listbox"');
+    expect(button).toContain('aria-expanded="false"');
+    expect(button).not.toContain('aria-controls');
+  });
+  test('префикс имени задаётся пропом buttonAriaLabelPrefix', function () {
+    var button = renderButton((0, _server.renderToStaticMarkup)(/*#__PURE__*/_react["default"].createElement(_.CountrySelect, {
+      value: "RUS",
+      onChange: noop,
+      options: options,
+      selectedLabel: "",
+      buttonAriaLabelPrefix: "Country code"
+    })));
+    expect(button).toContain('aria-label="Country code: Россия"');
+  });
+  test('PhoneInput пробрасывает buttonAriaLabelPrefix из countrySelectProps', function () {
+    var button = renderButton((0, _server.renderToStaticMarkup)(/*#__PURE__*/_react["default"].createElement(_PhoneInput.PhoneInput, {
+      label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D",
+      value: "",
+      onChange: noop,
+      countries: [{
+        label: 'Russia',
+        value: 'RUS'
+      }, {
+        label: 'Belarus',
+        value: 'BLR'
+      }],
+      countrySelectProps: {
+        selectedLabel: '',
+        placeholder: '',
+        buttonAriaLabelPrefix: 'Country code'
+      }
+    })));
+    expect(button).toContain('aria-label="Country code: Russia"');
+  });
+});

package/dist/components/form/DateInput/index.d.ts

@@ -11,7 +11,7 @@ export type TProps = {
     dropdownProps?: Pick<TDropdownProps, 'isAutoPosition' | 'positionLeft' | 'positionRight' | 'positionVertical'>;
     useModernStyles?: boolean;
     required?: boolean;
-} & Pick<TPureInputProps, 'hasError' | 'name' | 'onBlur' | 'onFocus' | 'id'> & Pick<TInputLabelProps, 'label'> & Pick<TCalendarProps, 'maxDate' | 'minDate'> & {
+} & Pick<TPureInputProps, 'hasError' | 'name' | 'onBlur' | 'onFocus' | 'id' | 'inputMode'> & Pick<TInputLabelProps, 'label'> & Pick<TCalendarProps, 'maxDate' | 'minDate'> & {
     size?: TSizes;
 };
 export declare const DateInput: FC<TProps>;

package/dist/components/form/DateInput/index.js

@@ -46,12 +46,17 @@ var DateInput = exports.DateInput = function DateInput(_ref) {
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles,
     _ref$required = _ref.required,
     required = _ref$required === void 0 ? false : _ref$required,
-    id = _ref.id;
+    id = _ref.id,
+    inputMode = _ref.inputMode;
   var palette = (0, _palette.useComponentPalette)('dateInput');
   var inputRef = (0, _react.useRef)(null);
   var fallbackId = (0, _react.useId)();
   var inputId = id !== null && id !== void 0 ? id : fallbackId;
   var isMobile = (0, _index.useMobile)();
+  // На мобильном тап по полю открывает календарь в шторке — экранная клавиатура поверх него
+  // не нужна (MOB-8). Ввод с клавиатуры остаётся (физическая клавиатура, вставка); проп
+  // inputMode переопределяет значение, например 'none' для всех тач-экранов
+  var fieldInputMode = inputMode !== null && inputMode !== void 0 ? inputMode : isMobile ? 'none' : undefined;
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOpen = _useState2[0],
@@ -142,6 +147,7 @@ var DateInput = exports.DateInput = function DateInput(_ref) {
     onBlur: handleBlur,
     value: stringValue,
     onChange: handleStringValueChange,
+    inputMode: fieldInputMode,
     paddingRight: 44,
     useModernStyles: useModernStyles
   }, paddingAndVariantOptions)), /*#__PURE__*/_react["default"].createElement(S.Icon, {

package/dist/components/form/DateInput/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/components/form/DateInput/index.test.js

@@ -0,0 +1,71 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+var _server = require("react-dom/server");
+var _ = require(".");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+// Серверный рендер: предупреждения про useLayoutEffect (Dropdown) ожидаемы и к проверке не относятся
+// eslint-disable-next-line no-console
+var originalError = console.error;
+beforeAll(function () {
+  jest.spyOn(console, 'error').mockImplementation(function (message) {
+    if (typeof message === 'string' && message.includes('useLayoutEffect does nothing on the server')) return;
+    // eslint-disable-next-line no-console
+    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      rest[_key - 1] = arguments[_key];
+    }
+    originalError.apply(void 0, [message].concat(rest));
+  });
+});
+afterAll(function () {
+  return jest.restoreAllMocks();
+});
+var noop = jest.fn();
+
+// useMobile читает window.matchMedia при первом рендере
+var withViewport = function withViewport(isMobile, render) {
+  var globalWithWindow = globalThis;
+  var previous = globalWithWindow.window;
+  globalWithWindow.window = {
+    matchMedia: function matchMedia() {
+      return {
+        matches: isMobile
+      };
+    }
+  };
+  try {
+    return render();
+  } finally {
+    globalWithWindow.window = previous;
+  }
+};
+var renderInput = function renderInput(isMobile) {
+  var _markup$match$, _markup$match;
+  var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var markup = withViewport(isMobile, function () {
+    return (0, _server.renderToStaticMarkup)(/*#__PURE__*/_react["default"].createElement(_.DateInput, _extends({
+      id: "date",
+      label: "\u0414\u0430\u0442\u0430",
+      value: null,
+      onChange: noop
+    }, props)));
+  });
+  return (_markup$match$ = (_markup$match = markup.match(/<input[^>]*>/)) === null || _markup$match === void 0 ? void 0 : _markup$match[0]) !== null && _markup$match$ !== void 0 ? _markup$match$ : '';
+};
+describe('DateInput: экранная клавиатура (MOB-8)', function () {
+  test('на мобильном — inputmode="none": тап открывает только календарь', function () {
+    expect(renderInput(true)).toContain('inputMode="none"');
+  });
+  test('на десктопе inputmode не задан', function () {
+    expect(renderInput(false)).not.toContain('inputMode');
+  });
+  test('проп inputMode переопределяет значение по умолчанию', function () {
+    expect(renderInput(false, {
+      inputMode: 'none'
+    })).toContain('inputMode="none"');
+    expect(renderInput(true, {
+      inputMode: 'numeric'
+    })).toContain('inputMode="numeric"');
+  });
+});

package/dist/components/form/PhoneInput/index.d.ts

@@ -10,7 +10,7 @@ type TFieldProps = Pick<TPureInputProps, 'name' | 'onBlur' | 'onFocus'> & {
 };
 type TControlProps = Pick<TPureInputProps, 'disabled' | 'id' | 'autoFocus' | 'useModernStyles'> & {
     label: string;
-    countrySelectProps?: Pick<TCountrySelectProps, 'selectedLabel' | 'placeholder'>;
+    countrySelectProps?: Pick<TCountrySelectProps, 'selectedLabel' | 'placeholder' | 'buttonAriaLabelPrefix'>;
     onCountryChange?: (countryCode: string) => void;
     countries?: Array<{
         label: string;

package/dist/components/form/PhoneInput/index.js

@@ -212,7 +212,8 @@ var PhoneInput = exports.PhoneInput = function PhoneInput(_ref) {
     positionRight: "0",
     positionLeft: "-20px",
     disabled: disabled,
-    selectedLabel: (countrySelectProps === null || countrySelectProps === void 0 ? void 0 : countrySelectProps.selectedLabel) || ''
+    selectedLabel: (countrySelectProps === null || countrySelectProps === void 0 ? void 0 : countrySelectProps.selectedLabel) || '',
+    buttonAriaLabelPrefix: countrySelectProps === null || countrySelectProps === void 0 ? void 0 : countrySelectProps.buttonAriaLabelPrefix
   }))), /*#__PURE__*/_react["default"].createElement(_reactInputMask["default"], {
     value: inputValue,
     onFocus: focusHandler,

package/dist/components/form/PositiveIntegerInput/index.d.ts

@@ -7,6 +7,10 @@ export type TProps = {
     onChange: (value: number | null) => void;
     max?: number;
     upAndDown?: boolean;
+    /** Только для скринридеров и голосового управления, на экране не выводится: aria-label кнопки «вверх» */
+    incrementButtonAriaLabel?: string;
+    /** Только для скринридеров и голосового управления, на экране не выводится: aria-label кнопки «вниз» */
+    decrementButtonAriaLabel?: string;
 } & Pick<TInputLabelProps, 'label'> & Pick<TPureInputProps, 'placeholder' | 'hasError' | 'onFocus' | 'onBlur' | 'disabled' | 'name' | 'useModernStyles' | 'id'> & {
     size?: TSizes;
 };

package/dist/components/form/PositiveIntegerInput/index.js

@@ -35,7 +35,13 @@ var PositiveIntegerInput = exports.PositiveIntegerInput = function PositiveInteg
     size = _ref.size,
     _ref$useModernStyles = _ref.useModernStyles,
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles,
-    id = _ref.id;
+    id = _ref.id,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$incrementButtonA = _ref.incrementButtonAriaLabel,
+    incrementButtonAriaLabel = _ref$incrementButtonA === void 0 ? 'Увеличить' : _ref$incrementButtonA,
+    _ref$decrementButtonA = _ref.decrementButtonAriaLabel,
+    decrementButtonAriaLabel = _ref$decrementButtonA === void 0 ? 'Уменьшить' : _ref$decrementButtonA;
   var _useInputFocus = (0, _useInputFocus2.useInputFocus)({
       onFocus: onFocus,
       onBlur: onBlur
@@ -85,12 +91,32 @@ var PositiveIntegerInput = exports.PositiveIntegerInput = function PositiveInteg
   var handleDown = (0, _react.useCallback)(function () {
     onChange(decrement(value));
   }, [decrement, value, onChange]);
+  var isUpDisabled = disabled || isIncrementDisabled;
+  var isDownDisabled = disabled || isDecrementDisabled;
+
+  // Стрелки клавиатуры в поле — как кнопки «вверх»/«вниз» (кнопки вне порядка Tab)
+  var handleKeyDown = (0, _react.useCallback)(function (event) {
+    if (!upAndDown) return;
+    if (event.key === 'ArrowUp') {
+      event.preventDefault();
+      if (!isUpDisabled) handleUp();
+    } else if (event.key === 'ArrowDown') {
+      event.preventDefault();
+      if (!isDownDisabled) handleDown();
+    }
+  }, [handleDown, handleUp, isDownDisabled, isUpDisabled, upAndDown]);
+
+  // Клик по кнопке не забирает фокус у поля: иначе срабатывал бы onBlur поля
+  var preventFocusLoss = (0, _react.useCallback)(function (event) {
+    return event.preventDefault();
+  }, []);
   return /*#__PURE__*/_react["default"].createElement(_InputLabel.InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
     useModernStyles: useModernStyles,
     size: fieldSize,
-    htmlFor: inputId
+    htmlFor: inputId,
+    disabled: disabled
   }, /*#__PURE__*/_react["default"].createElement(S.ControlWrapper, null, modernPlaceholder, /*#__PURE__*/_react["default"].createElement(_PureInput.PureInput, _extends({
     id: inputId,
     "aria-label": label && !inputLabel ? label : undefined,
@@ -102,18 +128,32 @@ var PositiveIntegerInput = exports.PositiveIntegerInput = function PositiveInteg
     onBlur: handleBlur,
     value: normalizeFrom(value),
     onChange: handleChange,
+    onKeyDown: handleKeyDown,
+    disabled: disabled,
+    inputMode: "numeric",
+    pattern: "[0-9]*",
     paddingRight: upAndDown ? 44 : undefined
   }, paddingAndVariantOptions, {
     useModernStyles: useModernStyles
   })), upAndDown && /*#__PURE__*/_react["default"].createElement(S.Arrows, null, /*#__PURE__*/_react["default"].createElement(S.Arrow, {
-    onClick: handleUp,
-    $disabled: isIncrementDisabled
+    type: "button",
+    tabIndex: -1,
+    "aria-label": incrementButtonAriaLabel,
+    "aria-controls": inputId,
+    disabled: isUpDisabled,
+    onMouseDown: preventFocusLoss,
+    onClick: handleUp
   }, /*#__PURE__*/_react["default"].createElement(_Arrow.Arrow, {
     isOpen: true,
     outterSize: 12
   })), /*#__PURE__*/_react["default"].createElement(S.Arrow, {
-    onClick: handleDown,
-    $disabled: isDecrementDisabled
+    type: "button",
+    tabIndex: -1,
+    "aria-label": decrementButtonAriaLabel,
+    "aria-controls": inputId,
+    disabled: isDownDisabled,
+    onMouseDown: preventFocusLoss,
+    onClick: handleDown
   }, /*#__PURE__*/_react["default"].createElement(_Arrow.Arrow, {
     isOpen: false,
     outterSize: 12

package/dist/components/form/PositiveIntegerInput/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/components/form/PositiveIntegerInput/index.test.js

@@ -0,0 +1,81 @@
+"use strict";
+
+var _react = _interopRequireDefault(require("react"));
+var _server = require("react-dom/server");
+var _ = require(".");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+var noop = jest.fn();
+var render = function render() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return (0, _server.renderToStaticMarkup)(/*#__PURE__*/_react["default"].createElement(_.PositiveIntegerInput, _extends({
+    id: "count",
+    label: "\u041A\u043E\u043B-\u0432\u043E",
+    value: 2,
+    onChange: noop,
+    max: 5,
+    upAndDown: true
+  }, props)));
+};
+var buttons = function buttons(markup) {
+  var _markup$match;
+  return (_markup$match = markup.match(/<button[^>]*>/g)) !== null && _markup$match !== void 0 ? _markup$match : [];
+};
+var input = function input(markup) {
+  var _markup$match$, _markup$match2;
+  return (_markup$match$ = (_markup$match2 = markup.match(/<input[^>]*>/)) === null || _markup$match2 === void 0 ? void 0 : _markup$match2[0]) !== null && _markup$match$ !== void 0 ? _markup$match$ : '';
+};
+describe('PositiveIntegerInput: стрелки «вверх/вниз» (A11Y-16)', function () {
+  test('стрелки — кнопки с именами вне порядка Tab', function () {
+    var _buttons = buttons(render()),
+      _buttons2 = _slicedToArray(_buttons, 2),
+      up = _buttons2[0],
+      down = _buttons2[1];
+    expect(up).toContain('type="button"');
+    expect(up).toContain('tabindex="-1"');
+    expect(up).toContain('aria-label="Увеличить"');
+    expect(up).toContain('aria-controls="count"');
+    expect(up).not.toContain('disabled');
+    expect(down).toContain('aria-label="Уменьшить"');
+    expect(down).not.toContain('disabled');
+  });
+  test('имена кнопок задаются пропами', function () {
+    var _buttons3 = buttons(render({
+        incrementButtonAriaLabel: 'Увеличить количество',
+        decrementButtonAriaLabel: 'Уменьшить количество'
+      })),
+      _buttons4 = _slicedToArray(_buttons3, 2),
+      up = _buttons4[0],
+      down = _buttons4[1];
+    expect(up).toContain('aria-label="Увеличить количество"');
+    expect(down).toContain('aria-label="Уменьшить количество"');
+  });
+  test('на границах недоступна соответствующая кнопка', function () {
+    expect(buttons(render({
+      value: 5
+    }))[0]).toContain('disabled');
+    expect(buttons(render({
+      value: 0
+    }))[1]).toContain('disabled');
+  });
+  test('disabled блокирует поле и обе кнопки', function () {
+    var markup = render({
+      disabled: true
+    });
+    expect(input(markup)).toContain('disabled');
+    buttons(markup).forEach(function (button) {
+      return expect(button).toContain('disabled');
+    });
+  });
+  test('цифровая клавиатура на телефоне', function () {
+    var field = input(render());
+    expect(field).toContain('inputMode="numeric"');
+    expect(field).toContain('pattern="[0-9]*"');
+  });
+});

package/dist/components/form/PositiveIntegerInput/styles.d.ts

@@ -1,6 +1,4 @@
 /// <reference types="react" />
 export declare const Arrows: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
-export declare const Arrow: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {
-    $disabled: boolean;
-}>> & string;
+export declare const Arrow: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never>> & string;
 export declare const ControlWrapper: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;

package/dist/components/form/PositiveIntegerInput/styles.js

@@ -1,24 +1,22 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ControlWrapper = exports.Arrows = exports.Arrow = void 0;
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 var Arrows = exports.Arrows = _styledComponents["default"].div.withConfig({
   displayName: "styles__Arrows",
   componentId: "sc-ctutr8-0"
-})(["display:flex;flex-direction:column;position:absolute;height:100%;justify-content:center;top:0;right:18px;"]);
-var Arrow = exports.Arrow = _styledComponents["default"].div.withConfig({
+})(["display:flex;flex-direction:column;position:absolute;height:100%;justify-content:center;top:0;right:12px;"]);
+
+// Кнопка 24×24 (WCAG 2.5.8) со стрелкой 12 px по центру; в низком поле кнопки сжимаются по высоте,
+// чтобы не вылезать за его границы
+var Arrow = exports.Arrow = _styledComponents["default"].button.withConfig({
   displayName: "styles__Arrow",
   componentId: "sc-ctutr8-1"
-})(["cursor:pointer;display:flex;user-select:none;", ""], function (_ref) {
-  var $disabled = _ref.$disabled;
-  return $disabled && (0, _styledComponents.css)(["opacity:0.4;pointer-events:none;"]);
-});
+})(["flex:0 1 24px;min-height:0;width:24px;display:flex;align-items:center;justify-content:center;padding:0;border:0;background:transparent;color:inherit;cursor:pointer;user-select:none;&:disabled{opacity:0.4;cursor:default;}"]);
 var ControlWrapper = exports.ControlWrapper = _styledComponents["default"].div.withConfig({
   displayName: "styles__ControlWrapper",
   componentId: "sc-ctutr8-2"

package/dist/components/form/Select/index.js

@@ -158,13 +158,20 @@ var SelectInner = function SelectInner(props) {
   }, [activeIndex, baseId]);
   var dropdownRef = (0, _react.useRef)(null);
   var wrapperRef = (0, _useOutsideClick.useOutsideClick)(handleHide, [dropdownRef]);
-  var handleFocus = (0, _react.useCallback)(function (event) {
-    handleShow();
-    focusHandler(event);
-  }, [focusHandler, handleShow]);
+
+  // Список не открывается на фокус (WCAG 2.4.11): иначе при переходе по Tab он перекрывает
+  // следующие элементы. Открытие — кликом, Enter, пробелом или стрелками
+  var handleFocus = focusHandler;
   var handleBlur = (0, _react.useCallback)(function (event) {
+    var _wrapperRef$current, _dropdownRef$current;
     var relatedTarget = event.relatedTarget;
     var isOptionClick = (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.dataset.optionIdentifier) === OPTION_IDENTIFIER;
+
+    // Фокус ушёл на другой элемент вне поля и списка — закрываем список. Без relatedTarget
+    // (клик по неактивной области списка, уход из окна) не закрываем: клик снаружи
+    // обрабатывает useOutsideClick
+    var isFocusOutside = !!relatedTarget && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(relatedTarget)) && !((_dropdownRef$current = dropdownRef.current) !== null && _dropdownRef$current !== void 0 && _dropdownRef$current.contains(relatedTarget));
+    if (isFocusOutside) handleHide();
     if (!isOptionClick) {
       blurHandler(event);
       return;
@@ -172,7 +179,7 @@ var SelectInner = function SelectInner(props) {
     delayBlur.current = function () {
       return blurHandler(event);
     };
-  }, [blurHandler]);
+  }, [blurHandler, handleHide, wrapperRef]);
   var selectValue = (0, _react.useCallback)(function (newValue) {
     if (isMultiple) {
       var next = multipleValue.includes(newValue) ? multipleValue.filter(function (item) {
@@ -224,6 +231,10 @@ var SelectInner = function SelectInner(props) {
           handleHide();
         }
         break;
+      case 'Tab':
+        // фокус уходит дальше по странице — список не должен оставаться поверх
+        if (isOpen) handleHide();
+        break;
       default:
         break;
     }
@@ -241,6 +252,12 @@ var SelectInner = function SelectInner(props) {
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.blur();
     handleShow();
   };
+
+  // Раньше список открывался фокусом, который ставит и клик; теперь клик открывает его сам.
+  // Повторный клик по полю закрывает список, как у нативного select
+  var handleToggleClick = function handleToggleClick() {
+    if (isOpen) handleHide();else handleShow();
+  };
   var handleOptionRender = function handleOptionRender(option) {
     if (renderOption) {
       if (!option.entity) {
@@ -367,7 +384,7 @@ var SelectInner = function SelectInner(props) {
     isOpen: isOpen,
     onReset: isResetButtonEnabled ? handleReset : undefined,
     size: fieldSize,
-    onClick: isDrawerOptions || !!renderedValue ? handleInputClick : undefined,
+    onClick: isDrawerOptions || !!renderedValue ? handleInputClick : handleToggleClick,
     required: required,
     useModernStyles: useModernStyles,
     comboboxProps: {

package/dist/esm/components/form/CountrySelect/components/CountryItem/index.js

@@ -18,7 +18,9 @@ export var CountryItem = function CountryItem(_ref) {
   return /*#__PURE__*/React.createElement(S.Wrapper, {
     $palette: palette,
     onClick: handleSelect,
-    type: "button"
+    type: "button",
+    role: "option",
+    "aria-selected": isSelected
   }, /*#__PURE__*/React.createElement(S.Title, {
     $isSelected: isSelected,
     $palette: palette

package/dist/esm/components/form/CountrySelect/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "options", "placeholder", "disabled", "selectedLabel"];
+var _excluded = ["value", "onChange", "options", "placeholder", "disabled", "selectedLabel", "buttonAriaLabelPrefix"];
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -12,7 +12,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useId, useMemo, useRef, useState } from 'react';
 import * as S from './stlyes';
 import { CountryItem } from './components/CountryItem';
 import { SearchInput } from '../SearchInput';
@@ -31,7 +31,10 @@ export var CountrySelect = function CountrySelect(_ref) {
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     selectedLabel = _ref.selectedLabel,
+    _ref$buttonAriaLabelP = _ref.buttonAriaLabelPrefix,
+    buttonAriaLabelPrefix = _ref$buttonAriaLabelP === void 0 ? 'Код страны' : _ref$buttonAriaLabelP,
     dropdownPositionProps = _objectWithoutProperties(_ref, _excluded);
+  var listboxId = useId();
   var palette = useComponentPalette('countrySelect');
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -78,8 +81,12 @@ export var CountrySelect = function CountrySelect(_ref) {
   }, /*#__PURE__*/React.createElement(S.HeaderWrapper, {
     type: "button",
     onClick: handleDropdownTrigger,
-    disabled: disabled
-  }, selectedOption.flag && /*#__PURE__*/React.createElement(Flag, {
+    disabled: disabled,
+    "aria-label": selectedOption ? "".concat(buttonAriaLabelPrefix, ": ").concat(selectedOption.label) : buttonAriaLabelPrefix,
+    "aria-haspopup": "listbox",
+    "aria-expanded": isOpen,
+    "aria-controls": isOpen ? listboxId : undefined
+  }, (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.flag) && /*#__PURE__*/React.createElement(Flag, {
     isSmall: false,
     flag: selectedOption.flag
   }), !disabled && /*#__PURE__*/React.createElement(Arrow, {
@@ -99,6 +106,10 @@ export var CountrySelect = function CountrySelect(_ref) {
     value: search
   })), /*#__PURE__*/React.createElement(Scrollbar, {
     maxHeight: 192
+  }, /*#__PURE__*/React.createElement("div", {
+    role: "listbox",
+    id: listboxId,
+    "aria-label": buttonAriaLabelPrefix
   }, filtredOptions.map(function (option) {
     return /*#__PURE__*/React.createElement(CountryItem, {
       key: option.value,
@@ -112,5 +123,5 @@ export var CountrySelect = function CountrySelect(_ref) {
       hint: option.hint,
       flag: option.flag
     });
-  })))));
+  }))))));
 };

package/dist/esm/components/form/CountrySelect/index.test.js

@@ -0,0 +1,82 @@
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { CountrySelect } from '.';
+import { PhoneInput } from '../PhoneInput';
+var options = [{
+  label: 'Россия',
+  value: 'RUS',
+  description: '+7',
+  flag: 'RUS'
+}, {
+  label: 'Казахстан',
+  value: 'KAZ',
+  description: '+7',
+  flag: 'KAZ'
+}];
+
+// Серверный рендер: предупреждения про useLayoutEffect (Dropdown) ожидаемы и к проверке не относятся
+// eslint-disable-next-line no-console
+var originalError = console.error;
+beforeAll(function () {
+  jest.spyOn(console, 'error').mockImplementation(function (message) {
+    if (typeof message === 'string' && message.includes('useLayoutEffect does nothing on the server')) return;
+    // eslint-disable-next-line no-console
+    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      rest[_key - 1] = arguments[_key];
+    }
+    originalError.apply(void 0, [message].concat(rest));
+  });
+});
+afterAll(function () {
+  return jest.restoreAllMocks();
+});
+var noop = jest.fn();
+var renderButton = function renderButton(markup) {
+  var match = markup.match(/<button[^>]*aria-haspopup[^>]*>/);
+  if (!match) throw new Error("\u041A\u043D\u043E\u043F\u043A\u0430 \u0432\u044B\u0431\u043E\u0440\u0430 \u0441\u0442\u0440\u0430\u043D\u044B \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430: ".concat(markup));
+  return match[0];
+};
+describe('CountrySelect: доступное имя и состояние кнопки (A11Y-12)', function () {
+  test('имя по умолчанию — «Код страны: <страна>», свёрнут, раскрывает listbox', function () {
+    var button = renderButton(renderToStaticMarkup(/*#__PURE__*/React.createElement(CountrySelect, {
+      value: "KAZ",
+      onChange: noop,
+      options: options,
+      selectedLabel: ""
+    })));
+    expect(button).toContain('aria-label="Код страны: Казахстан"');
+    expect(button).toContain('aria-haspopup="listbox"');
+    expect(button).toContain('aria-expanded="false"');
+    expect(button).not.toContain('aria-controls');
+  });
+  test('префикс имени задаётся пропом buttonAriaLabelPrefix', function () {
+    var button = renderButton(renderToStaticMarkup(/*#__PURE__*/React.createElement(CountrySelect, {
+      value: "RUS",
+      onChange: noop,
+      options: options,
+      selectedLabel: "",
+      buttonAriaLabelPrefix: "Country code"
+    })));
+    expect(button).toContain('aria-label="Country code: Россия"');
+  });
+  test('PhoneInput пробрасывает buttonAriaLabelPrefix из countrySelectProps', function () {
+    var button = renderButton(renderToStaticMarkup(/*#__PURE__*/React.createElement(PhoneInput, {
+      label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D",
+      value: "",
+      onChange: noop,
+      countries: [{
+        label: 'Russia',
+        value: 'RUS'
+      }, {
+        label: 'Belarus',
+        value: 'BLR'
+      }],
+      countrySelectProps: {
+        selectedLabel: '',
+        placeholder: '',
+        buttonAriaLabelPrefix: 'Country code'
+      }
+    })));
+    expect(button).toContain('aria-label="Country code: Russia"');
+  });
+});

package/dist/esm/components/form/DateInput/index.js

@@ -37,12 +37,17 @@ export var DateInput = function DateInput(_ref) {
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles,
     _ref$required = _ref.required,
     required = _ref$required === void 0 ? false : _ref$required,
-    id = _ref.id;
+    id = _ref.id,
+    inputMode = _ref.inputMode;
   var palette = useComponentPalette('dateInput');
   var inputRef = useRef(null);
   var fallbackId = useId();
   var inputId = id !== null && id !== void 0 ? id : fallbackId;
   var isMobile = useMobile();
+  // На мобильном тап по полю открывает календарь в шторке — экранная клавиатура поверх него
+  // не нужна (MOB-8). Ввод с клавиатуры остаётся (физическая клавиатура, вставка); проп
+  // inputMode переопределяет значение, например 'none' для всех тач-экранов
+  var fieldInputMode = inputMode !== null && inputMode !== void 0 ? inputMode : isMobile ? 'none' : undefined;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isOpen = _useState2[0],
@@ -133,6 +138,7 @@ export var DateInput = function DateInput(_ref) {
     onBlur: handleBlur,
     value: stringValue,
     onChange: handleStringValueChange,
+    inputMode: fieldInputMode,
     paddingRight: 44,
     useModernStyles: useModernStyles
   }, paddingAndVariantOptions)), /*#__PURE__*/React.createElement(S.Icon, {

package/dist/esm/components/form/DateInput/index.test.js

@@ -0,0 +1,69 @@
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { DateInput } from '.';
+
+// Серверный рендер: предупреждения про useLayoutEffect (Dropdown) ожидаемы и к проверке не относятся
+// eslint-disable-next-line no-console
+var originalError = console.error;
+beforeAll(function () {
+  jest.spyOn(console, 'error').mockImplementation(function (message) {
+    if (typeof message === 'string' && message.includes('useLayoutEffect does nothing on the server')) return;
+    // eslint-disable-next-line no-console
+    for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      rest[_key - 1] = arguments[_key];
+    }
+    originalError.apply(void 0, [message].concat(rest));
+  });
+});
+afterAll(function () {
+  return jest.restoreAllMocks();
+});
+var noop = jest.fn();
+
+// useMobile читает window.matchMedia при первом рендере
+var withViewport = function withViewport(isMobile, render) {
+  var globalWithWindow = globalThis;
+  var previous = globalWithWindow.window;
+  globalWithWindow.window = {
+    matchMedia: function matchMedia() {
+      return {
+        matches: isMobile
+      };
+    }
+  };
+  try {
+    return render();
+  } finally {
+    globalWithWindow.window = previous;
+  }
+};
+var renderInput = function renderInput(isMobile) {
+  var _markup$match$, _markup$match;
+  var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var markup = withViewport(isMobile, function () {
+    return renderToStaticMarkup(/*#__PURE__*/React.createElement(DateInput, _extends({
+      id: "date",
+      label: "\u0414\u0430\u0442\u0430",
+      value: null,
+      onChange: noop
+    }, props)));
+  });
+  return (_markup$match$ = (_markup$match = markup.match(/<input[^>]*>/)) === null || _markup$match === void 0 ? void 0 : _markup$match[0]) !== null && _markup$match$ !== void 0 ? _markup$match$ : '';
+};
+describe('DateInput: экранная клавиатура (MOB-8)', function () {
+  test('на мобильном — inputmode="none": тап открывает только календарь', function () {
+    expect(renderInput(true)).toContain('inputMode="none"');
+  });
+  test('на десктопе inputmode не задан', function () {
+    expect(renderInput(false)).not.toContain('inputMode');
+  });
+  test('проп inputMode переопределяет значение по умолчанию', function () {
+    expect(renderInput(false, {
+      inputMode: 'none'
+    })).toContain('inputMode="none"');
+    expect(renderInput(true, {
+      inputMode: 'numeric'
+    })).toContain('inputMode="numeric"');
+  });
+});

package/dist/esm/components/form/PhoneInput/index.js

@@ -202,7 +202,8 @@ export var PhoneInput = function PhoneInput(_ref) {
     positionRight: "0",
     positionLeft: "-20px",
     disabled: disabled,
-    selectedLabel: (countrySelectProps === null || countrySelectProps === void 0 ? void 0 : countrySelectProps.selectedLabel) || ''
+    selectedLabel: (countrySelectProps === null || countrySelectProps === void 0 ? void 0 : countrySelectProps.selectedLabel) || '',
+    buttonAriaLabelPrefix: countrySelectProps === null || countrySelectProps === void 0 ? void 0 : countrySelectProps.buttonAriaLabelPrefix
   }))), /*#__PURE__*/React.createElement(InputMask, {
     value: inputValue,
     onFocus: focusHandler,

package/dist/esm/components/form/PositiveIntegerInput/index.js

@@ -26,7 +26,13 @@ export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
     size = _ref.size,
     _ref$useModernStyles = _ref.useModernStyles,
     useModernStyles = _ref$useModernStyles === void 0 ? false : _ref$useModernStyles,
-    id = _ref.id;
+    id = _ref.id,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$incrementButtonA = _ref.incrementButtonAriaLabel,
+    incrementButtonAriaLabel = _ref$incrementButtonA === void 0 ? 'Увеличить' : _ref$incrementButtonA,
+    _ref$decrementButtonA = _ref.decrementButtonAriaLabel,
+    decrementButtonAriaLabel = _ref$decrementButtonA === void 0 ? 'Уменьшить' : _ref$decrementButtonA;
   var _useInputFocus = useInputFocus({
       onFocus: onFocus,
       onBlur: onBlur
@@ -76,12 +82,32 @@ export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
   var handleDown = useCallback(function () {
     onChange(decrement(value));
   }, [decrement, value, onChange]);
+  var isUpDisabled = disabled || isIncrementDisabled;
+  var isDownDisabled = disabled || isDecrementDisabled;
+
+  // Стрелки клавиатуры в поле — как кнопки «вверх»/«вниз» (кнопки вне порядка Tab)
+  var handleKeyDown = useCallback(function (event) {
+    if (!upAndDown) return;
+    if (event.key === 'ArrowUp') {
+      event.preventDefault();
+      if (!isUpDisabled) handleUp();
+    } else if (event.key === 'ArrowDown') {
+      event.preventDefault();
+      if (!isDownDisabled) handleDown();
+    }
+  }, [handleDown, handleUp, isDownDisabled, isUpDisabled, upAndDown]);
+
+  // Клик по кнопке не забирает фокус у поля: иначе срабатывал бы onBlur поля
+  var preventFocusLoss = useCallback(function (event) {
+    return event.preventDefault();
+  }, []);
   return /*#__PURE__*/React.createElement(InputLabel, {
     inFocus: inFocus,
     label: inputLabel,
     useModernStyles: useModernStyles,
     size: fieldSize,
-    htmlFor: inputId
+    htmlFor: inputId,
+    disabled: disabled
   }, /*#__PURE__*/React.createElement(S.ControlWrapper, null, modernPlaceholder, /*#__PURE__*/React.createElement(PureInput, _extends({
     id: inputId,
     "aria-label": label && !inputLabel ? label : undefined,
@@ -93,18 +119,32 @@ export var PositiveIntegerInput = function PositiveIntegerInput(_ref) {
     onBlur: handleBlur,
     value: normalizeFrom(value),
     onChange: handleChange,
+    onKeyDown: handleKeyDown,
+    disabled: disabled,
+    inputMode: "numeric",
+    pattern: "[0-9]*",
     paddingRight: upAndDown ? 44 : undefined
   }, paddingAndVariantOptions, {
     useModernStyles: useModernStyles
   })), upAndDown && /*#__PURE__*/React.createElement(S.Arrows, null, /*#__PURE__*/React.createElement(S.Arrow, {
-    onClick: handleUp,
-    $disabled: isIncrementDisabled
+    type: "button",
+    tabIndex: -1,
+    "aria-label": incrementButtonAriaLabel,
+    "aria-controls": inputId,
+    disabled: isUpDisabled,
+    onMouseDown: preventFocusLoss,
+    onClick: handleUp
   }, /*#__PURE__*/React.createElement(Arrow, {
     isOpen: true,
     outterSize: 12
   })), /*#__PURE__*/React.createElement(S.Arrow, {
-    onClick: handleDown,
-    $disabled: isDecrementDisabled
+    type: "button",
+    tabIndex: -1,
+    "aria-label": decrementButtonAriaLabel,
+    "aria-controls": inputId,
+    disabled: isDownDisabled,
+    onMouseDown: preventFocusLoss,
+    onClick: handleDown
   }, /*#__PURE__*/React.createElement(Arrow, {
     isOpen: false,
     outterSize: 12

package/dist/esm/components/form/PositiveIntegerInput/index.test.js

@@ -0,0 +1,78 @@
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+import React from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { PositiveIntegerInput } from '.';
+var noop = jest.fn();
+var render = function render() {
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return renderToStaticMarkup(/*#__PURE__*/React.createElement(PositiveIntegerInput, _extends({
+    id: "count",
+    label: "\u041A\u043E\u043B-\u0432\u043E",
+    value: 2,
+    onChange: noop,
+    max: 5,
+    upAndDown: true
+  }, props)));
+};
+var buttons = function buttons(markup) {
+  var _markup$match;
+  return (_markup$match = markup.match(/<button[^>]*>/g)) !== null && _markup$match !== void 0 ? _markup$match : [];
+};
+var input = function input(markup) {
+  var _markup$match$, _markup$match2;
+  return (_markup$match$ = (_markup$match2 = markup.match(/<input[^>]*>/)) === null || _markup$match2 === void 0 ? void 0 : _markup$match2[0]) !== null && _markup$match$ !== void 0 ? _markup$match$ : '';
+};
+describe('PositiveIntegerInput: стрелки «вверх/вниз» (A11Y-16)', function () {
+  test('стрелки — кнопки с именами вне порядка Tab', function () {
+    var _buttons = buttons(render()),
+      _buttons2 = _slicedToArray(_buttons, 2),
+      up = _buttons2[0],
+      down = _buttons2[1];
+    expect(up).toContain('type="button"');
+    expect(up).toContain('tabindex="-1"');
+    expect(up).toContain('aria-label="Увеличить"');
+    expect(up).toContain('aria-controls="count"');
+    expect(up).not.toContain('disabled');
+    expect(down).toContain('aria-label="Уменьшить"');
+    expect(down).not.toContain('disabled');
+  });
+  test('имена кнопок задаются пропами', function () {
+    var _buttons3 = buttons(render({
+        incrementButtonAriaLabel: 'Увеличить количество',
+        decrementButtonAriaLabel: 'Уменьшить количество'
+      })),
+      _buttons4 = _slicedToArray(_buttons3, 2),
+      up = _buttons4[0],
+      down = _buttons4[1];
+    expect(up).toContain('aria-label="Увеличить количество"');
+    expect(down).toContain('aria-label="Уменьшить количество"');
+  });
+  test('на границах недоступна соответствующая кнопка', function () {
+    expect(buttons(render({
+      value: 5
+    }))[0]).toContain('disabled');
+    expect(buttons(render({
+      value: 0
+    }))[1]).toContain('disabled');
+  });
+  test('disabled блокирует поле и обе кнопки', function () {
+    var markup = render({
+      disabled: true
+    });
+    expect(input(markup)).toContain('disabled');
+    buttons(markup).forEach(function (button) {
+      return expect(button).toContain('disabled');
+    });
+  });
+  test('цифровая клавиатура на телефоне', function () {
+    var field = input(render());
+    expect(field).toContain('inputMode="numeric"');
+    expect(field).toContain('pattern="[0-9]*"');
+  });
+});

package/dist/esm/components/form/PositiveIntegerInput/styles.js

@@ -1,15 +1,15 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 export var Arrows = styled.div.withConfig({
   displayName: "styles__Arrows",
   componentId: "sc-ctutr8-0"
-})(["display:flex;flex-direction:column;position:absolute;height:100%;justify-content:center;top:0;right:18px;"]);
-export var Arrow = styled.div.withConfig({
+})(["display:flex;flex-direction:column;position:absolute;height:100%;justify-content:center;top:0;right:12px;"]);
+
+// Кнопка 24×24 (WCAG 2.5.8) со стрелкой 12 px по центру; в низком поле кнопки сжимаются по высоте,
+// чтобы не вылезать за его границы
+export var Arrow = styled.button.withConfig({
   displayName: "styles__Arrow",
   componentId: "sc-ctutr8-1"
-})(["cursor:pointer;display:flex;user-select:none;", ""], function (_ref) {
-  var $disabled = _ref.$disabled;
-  return $disabled && css(["opacity:0.4;pointer-events:none;"]);
-});
+})(["flex:0 1 24px;min-height:0;width:24px;display:flex;align-items:center;justify-content:center;padding:0;border:0;background:transparent;color:inherit;cursor:pointer;user-select:none;&:disabled{opacity:0.4;cursor:default;}"]);
 export var ControlWrapper = styled.div.withConfig({
   displayName: "styles__ControlWrapper",
   componentId: "sc-ctutr8-2"

package/dist/esm/components/form/Select/index.js

@@ -148,13 +148,20 @@ var SelectInner = function SelectInner(props) {
   }, [activeIndex, baseId]);
   var dropdownRef = useRef(null);
   var wrapperRef = useOutsideClick(handleHide, [dropdownRef]);
-  var handleFocus = useCallback(function (event) {
-    handleShow();
-    focusHandler(event);
-  }, [focusHandler, handleShow]);
+
+  // Список не открывается на фокус (WCAG 2.4.11): иначе при переходе по Tab он перекрывает
+  // следующие элементы. Открытие — кликом, Enter, пробелом или стрелками
+  var handleFocus = focusHandler;
   var handleBlur = useCallback(function (event) {
+    var _wrapperRef$current, _dropdownRef$current;
     var relatedTarget = event.relatedTarget;
     var isOptionClick = (relatedTarget === null || relatedTarget === void 0 ? void 0 : relatedTarget.dataset.optionIdentifier) === OPTION_IDENTIFIER;
+
+    // Фокус ушёл на другой элемент вне поля и списка — закрываем список. Без relatedTarget
+    // (клик по неактивной области списка, уход из окна) не закрываем: клик снаружи
+    // обрабатывает useOutsideClick
+    var isFocusOutside = !!relatedTarget && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(relatedTarget)) && !((_dropdownRef$current = dropdownRef.current) !== null && _dropdownRef$current !== void 0 && _dropdownRef$current.contains(relatedTarget));
+    if (isFocusOutside) handleHide();
     if (!isOptionClick) {
       blurHandler(event);
       return;
@@ -162,7 +169,7 @@ var SelectInner = function SelectInner(props) {
     delayBlur.current = function () {
       return blurHandler(event);
     };
-  }, [blurHandler]);
+  }, [blurHandler, handleHide, wrapperRef]);
   var selectValue = useCallback(function (newValue) {
     if (isMultiple) {
       var next = multipleValue.includes(newValue) ? multipleValue.filter(function (item) {
@@ -214,6 +221,10 @@ var SelectInner = function SelectInner(props) {
           handleHide();
         }
         break;
+      case 'Tab':
+        // фокус уходит дальше по странице — список не должен оставаться поверх
+        if (isOpen) handleHide();
+        break;
       default:
         break;
     }
@@ -231,6 +242,12 @@ var SelectInner = function SelectInner(props) {
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.blur();
     handleShow();
   };
+
+  // Раньше список открывался фокусом, который ставит и клик; теперь клик открывает его сам.
+  // Повторный клик по полю закрывает список, как у нативного select
+  var handleToggleClick = function handleToggleClick() {
+    if (isOpen) handleHide();else handleShow();
+  };
   var handleOptionRender = function handleOptionRender(option) {
     if (renderOption) {
       if (!option.entity) {
@@ -357,7 +374,7 @@ var SelectInner = function SelectInner(props) {
     isOpen: isOpen,
     onReset: isResetButtonEnabled ? handleReset : undefined,
     size: fieldSize,
-    onClick: isDrawerOptions || !!renderedValue ? handleInputClick : undefined,
+    onClick: isDrawerOptions || !!renderedValue ? handleInputClick : handleToggleClick,
     required: required,
     useModernStyles: useModernStyles,
     comboboxProps: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@invoicebox/ui",
-    "version": "0.1.0-alpha.322",
+    "version": "0.1.0-alpha.325",
     "description": "Invoicebox UI",
     "license": "Apache License 2.0",
     "scripts": {