@salutejs/plasma-new-hope 0.336.0-canary.2228.17672900057.0 → 0.336.0-canary.2231.17732581275.0

package/styled-components/cjs/components/Combobox/ComboboxNew/Combobox.js

@@ -41,9 +41,6 @@ function _array_like_to_array(arr, len) {
 function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -98,9 +95,6 @@ function _interop_require_wildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
 function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -128,9 +122,6 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     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 _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -200,9 +191,6 @@ function _object_without_properties_loose(source, excluded) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
 function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
@@ -275,10 +263,11 @@ var comboboxRoot = function(Root) {
             return (0, _getPathMaps.getTreeMaps)(transformedItems);
         }, [
             items
-        ]), 3), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1], labelToItemMap = _useMemo[2];
+        ]), 2), valueToCheckedMap = _useMemo[0], valueToItemMap = _useMemo[1];
         var _useState = _sliced_to_array((0, _react.useState)((0, _utils2.getTextValue)(multiple, outerValue, valueToItemMap, renderValue)), 2), textValue = _useState[0], setTextValue = _useState[1];
         var _useState1 = _sliced_to_array((0, _react.useState)(multiple ? [] : ''), 2), internalValue = _useState1[0], setInternalValue = _useState1[1];
         var value = outerValue !== null && outerValue !== undefined ? outerValue : internalValue;
+        var rootRef = (0, _react.useRef)(null);
         var inputRef = (0, _react.useRef)(null);
         var floatingPopoverRef = (0, _react.useRef)(null);
         var inputForkRef = (0, _plasmacore.useForkRef)(inputRef, ref);
@@ -313,15 +302,7 @@ var comboboxRoot = function(Root) {
             if (!isCurrentListOpen || alwaysOpened) {
                 return;
             }
-            dispatchPath({
-                type: 'reset'
-            });
-            dispatchFocusedPath({
-                type: 'reset'
-            });
-            if (onToggle) {
-                onToggle(false);
-            }
+            handleListToggle(false);
             // Возвращаем актуальное значение поля ввода после закрытия выпадающего списка.
             setTextValue((0, _utils2.getTextValue)(multiple, value, valueToItemMap, renderValue));
         }, floatingPopoverRef);
@@ -363,39 +344,18 @@ var comboboxRoot = function(Root) {
             }
         };
         // Обработчик чипов
-        var handleChipsChange = function(chipLabels) {
+        var handleChipClick = function(chip) {
             if (!Array.isArray(value)) return;
-            // TODO: #1564
-            // Из лейблов чипов получаем value у item и далее прокидываем его в onChange.
-            if (renderValue && !isTargetAmount) {
-                var resultValues = _to_consumable_array(value);
-                value.forEach(function(_, index) {
+            if (isTargetAmount) {
+                // При закрытии чипа в режиме isTargetAmount в value оставляем только disabled-элементы
+                onChange(value.filter(function(val) {
                     var _valueToItemMap_get;
-                    var stringValue = value[index];
-                    var label = (_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label;
-                    var labelAfterRenderValue = renderValue(label ? labelToItemMap.get(label) : {
-                        value: stringValue,
-                        label: stringValue.toString()
-                    });
-                    if (!chipLabels.includes(labelAfterRenderValue)) {
-                        resultValues.splice(index, 1);
-                    }
-                });
-                var removedItemValue = (0, _utils2.getRemovedElement)(value, resultValues, isTargetAmount);
-                onChange(resultValues, removedItemValue ? valueToItemMap.get(removedItemValue) || {
-                    value: removedItemValue,
-                    label: removedItemValue.toString()
-                } : null);
+                    return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                }));
             } else {
-                var newValues = chipLabels.map(function(chipLabel) {
-                    var _labelToItemMap_get;
-                    return ((_labelToItemMap_get = labelToItemMap.get(chipLabel)) === null || _labelToItemMap_get === void 0 ? void 0 : _labelToItemMap_get.value) || chipLabel;
-                });
-                var removedItemValue1 = (0, _utils2.getRemovedElement)(value, newValues, isTargetAmount);
-                onChange(newValues, removedItemValue1 ? valueToItemMap.get(removedItemValue1) || {
-                    value: removedItemValue1,
-                    label: removedItemValue1.toString()
-                } : null);
+                onChange(value.filter(function(val) {
+                    return val !== chip.value;
+                }), valueToItemMap.get(chip.value) || null);
             }
         };
         // Обработчик открытия/закрытия выпадающего списка
@@ -408,12 +368,18 @@ var comboboxRoot = function(Root) {
                     type: 'opened_first_level'
                 });
             } else {
+                var _rootRef_current;
                 dispatchFocusedPath({
                     type: 'reset'
                 });
                 dispatchPath({
                     type: 'reset'
                 });
+                // Скроллим чипы к левому краю при закрытии компонента
+                var el = rootRef === null || rootRef === void 0 ? void 0 : (_rootRef_current = rootRef.current) === null || _rootRef_current === void 0 ? void 0 : _rootRef_current.querySelector('.input-scrollable-wrapper');
+                if (multiple && value.length > 0 && el) {
+                    el.scrollLeft = 0;
+                }
             }
             if (onToggle) {
                 onToggle(opened);
@@ -425,14 +391,32 @@ var comboboxRoot = function(Root) {
                 return;
             }
             var checkedCopy = new Map(checked);
-            if (!checkedCopy.get(item.value)) {
-                checkedCopy.set(item.value, true);
-                (0, _utils2.updateDescendants)(item, checkedCopy, true, valueToItemMap);
-            } else {
-                checkedCopy.set(item.value, false);
-                (0, _utils2.updateDescendants)(item, checkedCopy, false);
+            switch(checkedCopy.get(item.value)){
+                // Если чекбокс в состоянии indeterminate
+                case 'indeterminate':
+                    {
+                        (0, _utils2.updateDescendants)(item, checkedCopy, true, valueToItemMap);
+                        break;
+                    }
+                // Если чекбокс в состоянии checked
+                case true:
+                    {
+                        (0, _utils2.updateDescendants)(item, checkedCopy, false, valueToItemMap);
+                        checkedCopy.set(item.value, false);
+                        break;
+                    }
+                // Если чекбокс в состоянии unchecked
+                case false:
+                    {
+                        (0, _utils2.updateDescendants)(item, checkedCopy, true, valueToItemMap);
+                        checkedCopy.set(item.value, true);
+                        break;
+                    }
+                default:
+                    {
+                        break;
+                    }
             }
-            (0, _utils2.updateAncestors)(item, checkedCopy);
             var newValues = [];
             valueToItemMap.forEach(function(item, key) {
                 if (checkedCopy.get(key)) {
@@ -499,20 +483,28 @@ var comboboxRoot = function(Root) {
                 if (value.length === 0) return [];
                 if (isTargetAmount) {
                     return [
-                        "Выбрано ".concat(targetAmount || value.length)
+                        {
+                            value: '_removeAll',
+                            label: "Выбрано ".concat(targetAmount || value.length),
+                            disabled: value.every(function(val) {
+                                var _valueToItemMap_get;
+                                return valueToItemMap === null || valueToItemMap === void 0 ? void 0 : (_valueToItemMap_get = valueToItemMap.get(val)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.disabled;
+                            })
+                        }
                     ];
                 }
-                var renderValueMapper = renderValue && function(stringValue) {
-                    return renderValue(valueToItemMap.get(stringValue) || {
-                        value: stringValue,
-                        label: stringValue.toString()
-                    });
-                };
-                var valueToItemMapper = function(stringValue) {
-                    var _valueToItemMap_get;
-                    return ((_valueToItemMap_get = valueToItemMap.get(stringValue)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || stringValue.toString();
-                };
-                return value.map(renderValueMapper || valueToItemMapper);
+                return value.map(function(value) {
+                    var _valueToItemMap_get, _valueToItemMap_get1;
+                    var currentLabel = renderValue ? renderValue(valueToItemMap.get(value) || {
+                        value: value,
+                        label: value
+                    }) : ((_valueToItemMap_get = valueToItemMap.get(value)) === null || _valueToItemMap_get === void 0 ? void 0 : _valueToItemMap_get.label) || value.toString();
+                    return {
+                        value: value,
+                        label: currentLabel,
+                        disabled: ((_valueToItemMap_get1 = valueToItemMap.get(value)) === null || _valueToItemMap_get1 === void 0 ? void 0 : _valueToItemMap_get1.disabled) || false
+                    };
+                });
             }
             return [];
         };
@@ -598,7 +590,8 @@ var comboboxRoot = function(Root) {
             readOnly: readOnly,
             name: name,
             hintView: hintView,
-            hintSize: hintSize
+            hintSize: hintSize,
+            ref: rootRef
         }, name && /*#__PURE__*/ _react.default.createElement(_SelectNative.SelectNative, {
             items: valueToItemMap,
             name: name,
@@ -669,8 +662,8 @@ var comboboxRoot = function(Root) {
                     keepPlaceholder: keepPlaceholder
                 }, multiple ? {
                     enumerationType: 'chip',
-                    chips: getChips(),
-                    onChangeChips: handleChipsChange
+                    _chips: getChips(),
+                    _onChipClick: handleChipClick
                 } : {
                     enumerationType: 'plain'
                 }, rest), {

package/styled-components/cjs/components/Combobox/ComboboxNew/hooks/getPathMaps.js

@@ -42,16 +42,14 @@ var getPathMap = function(items) {
 var getTreeMaps = function(items) {
     var valueToCheckedMap = new Map();
     var valueToItemMap = new Map();
-    var labelToItemMap = new Map();
     var rec = function(items) {
         var prevIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
         items === null || items === void 0 ? void 0 : items.forEach(function(item, index) {
-            var value = item.value, label = item.label, innerItems = item.items;
+            var value = item.value, innerItems = item.items;
             var currIndex = "".concat(prevIndex, "/").concat(index).replace(/^(\/)/, '');
             valueToCheckedMap.set(value, false);
             if ((0, _utils.isEmpty)(innerItems) || !innerItems) {
                 valueToItemMap.set(value, item);
-                labelToItemMap.set(label, item);
             } else {
                 rec(innerItems, currIndex);
             }
@@ -60,7 +58,6 @@ var getTreeMaps = function(items) {
     rec(items);
     return [
         valueToCheckedMap,
-        valueToItemMap,
-        labelToItemMap
+        valueToItemMap
     ];
 };

package/styled-components/cjs/components/Combobox/ComboboxNew/utils/index.js

@@ -15,9 +15,6 @@ _export(exports, {
     get getItemId () {
         return _getItemId.getItemId;
     },
-    get getRemovedElement () {
-        return _getRemovedElement.getRemovedElement;
-    },
     get getTextValue () {
         return _getTextValue.getTextValue;
     },
@@ -44,5 +41,4 @@ var _updateSingleAncestors = require("./updateSingleAncestors");
 var _sizeToIconSize = require("./sizeToIconSize");
 var _filterItems = require("./filterItems");
 var _getItemId = require("./getItemId");
-var _getRemovedElement = require("./getRemovedElement");
 var _getTextValue = require("./getTextValue");

package/styled-components/cjs/components/DatePicker/RangeDate/RangeDate.js

@@ -389,16 +389,6 @@ var datePickerRangeRoot = function(Root) {
                 return;
             }
             var isCalendarOpen = ((firstInputRef === null || firstInputRef === void 0 ? void 0 : (_firstInputRef_current = firstInputRef.current) === null || _firstInputRef_current === void 0 ? void 0 : _firstInputRef_current.contains((event === null || event === void 0 ? void 0 : event.target) || null)) || (secondInputRef === null || secondInputRef === void 0 ? void 0 : (_secondInputRef_current = secondInputRef.current) === null || _secondInputRef_current === void 0 ? void 0 : _secondInputRef_current.contains((event === null || event === void 0 ? void 0 : event.target) || null))) && (event === null || event === void 0 ? void 0 : event.code) !== _useKeyboardNavigation.keys.Escape ? true : currentOpened;
-            if (!isCalendarOpen) {
-                if (calendarFirstValue && !calendarSecondValue) {
-                    var _secondInputRef_current1;
-                    secondInputRef === null || secondInputRef === void 0 ? void 0 : (_secondInputRef_current1 = secondInputRef.current) === null || _secondInputRef_current1 === void 0 ? void 0 : _secondInputRef_current1.focus();
-                }
-                if (calendarSecondValue && !calendarFirstValue) {
-                    var _firstInputRef_current1;
-                    firstInputRef === null || firstInputRef === void 0 ? void 0 : (_firstInputRef_current1 = firstInputRef.current) === null || _firstInputRef_current1 === void 0 ? void 0 : _firstInputRef_current1.focus();
-                }
-            }
             if (!isCalendarOpen) {
                 setSecondTextFieldClicked(false);
             }
@@ -437,28 +427,40 @@ var datePickerRangeRoot = function(Root) {
             }, commonArgs)), endOriginalDate = _getFormattedDates1.originalDate;
             if (!calendarFirstValue && correctStartDates.calendar) {
                 startOriginalDate = new Date(correctStartDates.calendar);
+            }
+            if (!calendarSecondValue && correctEndDates.calendar) {
+                endOriginalDate = new Date(correctEndDates.calendar);
+            }
+            var _getSortedValues = _sliced_to_array((0, _utils1.getSortedValues)([
+                startOriginalDate,
+                endOriginalDate
+            ]), 2), startValue = _getSortedValues[0], endValue = _getSortedValues[1];
+            var _getFormattedDates2 = (0, _utils2.getFormattedDates)(_object_spread({
+                value: startValue,
+                delimiter: dateFormatDelimiter
+            }, commonArgs)), formattedFirstDate = _getFormattedDates2.formattedDate, originalFirstDate = _getFormattedDates2.originalDate, isoFirstDate = _getFormattedDates2.isoDate;
+            var _getFormattedDates3 = (0, _utils2.getFormattedDates)(_object_spread({
+                value: endValue,
+                delimiter: dateFormatDelimiter
+            }, commonArgs)), formattedSecondDate = _getFormattedDates3.formattedDate, originalSecondDate = _getFormattedDates3.originalDate, isoSecondDate = _getFormattedDates3.isoDate;
+            if (formattedFirstDate !== inputFirstValue) {
                 if (onChangeFirstValue) {
-                    onChangeFirstValue(event, correctStartDates.input, correctStartDates.calendar, correctStartDates.calendar.toISOString());
+                    onChangeFirstValue(event, formattedFirstDate, originalFirstDate, isoFirstDate);
                 }
                 if (onCommitFirstDate) {
-                    var dateInfo = getFirstQuarterInfo(correctStartDates.calendar);
-                    onCommitFirstDate(correctStartDates.input, false, true, dateInfo, correctStartDates.calendar, correctStartDates.calendar.toISOString());
+                    var dateInfo = originalFirstDate ? getFirstQuarterInfo(originalFirstDate) : undefined;
+                    onCommitFirstDate(formattedFirstDate, false, true, dateInfo, originalFirstDate, isoFirstDate);
                 }
             }
-            if (!calendarSecondValue && correctEndDates.calendar) {
-                endOriginalDate = new Date(correctEndDates.calendar);
+            if (formattedSecondDate !== inputSecondValue) {
                 if (onChangeSecondValue) {
-                    onChangeSecondValue(event, correctEndDates.input, correctEndDates.calendar, correctEndDates.calendar.toISOString());
+                    onChangeSecondValue(event, formattedSecondDate, originalSecondDate, isoSecondDate);
                 }
                 if (onCommitSecondDate) {
-                    var dateInfo1 = getSecondQuarterInfo(correctEndDates.calendar);
-                    onCommitSecondDate(correctEndDates.input, false, true, dateInfo1, correctEndDates.calendar, correctEndDates.calendar.toISOString());
+                    var dateInfo1 = originalSecondDate ? getSecondQuarterInfo(originalSecondDate) : undefined;
+                    onCommitSecondDate(formattedSecondDate, false, true, dateInfo1, originalSecondDate, isoSecondDate);
                 }
             }
-            var _getSortedValues = _sliced_to_array((0, _utils1.getSortedValues)([
-                startOriginalDate,
-                endOriginalDate
-            ]), 2), startValue = _getSortedValues[0], endValue = _getSortedValues[1];
             setFirstInputValue(startValue);
             setSecondInputValue(endValue);
             outerHandler === null || outerHandler === void 0 ? void 0 : outerHandler(event);

package/styled-components/cjs/components/Pagination/Pagination.js

@@ -17,6 +17,7 @@ _export(exports, {
     }
 });
 var _react = /*#__PURE__*/ _interop_require_wildcard(require("react"));
+var _plasmacore = require("@salutejs/plasma-core");
 var _utils = require("../../utils");
 var _Paginationstyles = require("./Pagination.styles");
 var _utils1 = require("./utils");
@@ -170,9 +171,11 @@ function _unsupported_iterable_to_array(o, minLen) {
 }
 var paginationRoot = function(Root) {
     return /*#__PURE__*/ (0, _react.forwardRef)(function(_param, ref) {
-        var outerValue = _param.value, defaultValue = _param.defaultValue, outerPerPage = _param.perPage, defaultPerPage = _param.defaultPerPage, _param_slots = _param.slots, slots = _param_slots === void 0 ? _utils1.defaultValues.slots : _param_slots, view = _param.view, viewCurrentPage = _param.viewCurrentPage, _param_type = _param.type, type = _param_type === void 0 ? _utils1.defaultValues.type : _param_type, size = _param.size, _param_pilled = _param.pilled, pilled = _param_pilled === void 0 ? _utils1.defaultValues.pilled : _param_pilled, _param_square = _param.square, square = _param_square === void 0 ? _utils1.defaultValues.square : _param_square, _param_disabledPages = _param.disabledPages, disabledPages = _param_disabledPages === void 0 ? _utils1.defaultValues.disabledPages : _param_disabledPages, _param_count = _param.count, count = _param_count === void 0 ? _utils1.defaultValues.value : _param_count, _param_hasQuickJump = _param.hasQuickJump, hasQuickJump = _param_hasQuickJump === void 0 ? _utils1.defaultValues.hasQuickJump : _param_hasQuickJump, _param_hasPerPage = _param.hasPerPage, hasPerPage = _param_hasPerPage === void 0 ? _utils1.defaultValues.hasPerPage : _param_hasPerPage, _param_perPageList = _param.perPageList, perPageList = _param_perPageList === void 0 ? _utils1.defaultValues.perPageList : _param_perPageList, _param_isCommonButtonStyles = _param.isCommonButtonStyles, isCommonButtonStyles = _param_isCommonButtonStyles === void 0 ? _utils1.defaultValues.isCommonButtonStyles : _param_isCommonButtonStyles, _param_placeholderQuickJump = _param.placeholderQuickJump, placeholderQuickJump = _param_placeholderQuickJump === void 0 ? _utils1.defaultValues.placeholderQuickJump : _param_placeholderQuickJump, _param_textQuickJump = _param.textQuickJump, textQuickJump = _param_textQuickJump === void 0 ? _utils1.defaultValues.textQuickJump : _param_textQuickJump, _param_textPerPage = _param.textPerPage, textPerPage = _param_textPerPage === void 0 ? _utils1.defaultValues.textPerPage : _param_textPerPage, leftContent = _param.leftContent, rightContent = _param.rightContent, _param_listWidth = _param.listWidth, listWidth = _param_listWidth === void 0 ? 'fit-content' : _param_listWidth, onChangePageValue = _param.onChangePageValue, onChangePerPageValue = _param.onChangePerPageValue, onChange = _param.onChange, rest = _object_without_properties(_param, [
+        var outerValue = _param.value, defaultValue = _param.defaultValue, helperText = _param.helperText, singleLine = _param.singleLine, outerPerPage = _param.perPage, defaultPerPage = _param.defaultPerPage, _param_slots = _param.slots, slots = _param_slots === void 0 ? _utils1.defaultValues.slots : _param_slots, view = _param.view, viewCurrentPage = _param.viewCurrentPage, _param_type = _param.type, type = _param_type === void 0 ? _utils1.defaultValues.type : _param_type, size = _param.size, _param_pilled = _param.pilled, pilled = _param_pilled === void 0 ? _utils1.defaultValues.pilled : _param_pilled, _param_square = _param.square, square = _param_square === void 0 ? _utils1.defaultValues.square : _param_square, _param_disabledPages = _param.disabledPages, disabledPages = _param_disabledPages === void 0 ? _utils1.defaultValues.disabledPages : _param_disabledPages, _param_count = _param.count, count = _param_count === void 0 ? _utils1.defaultValues.value : _param_count, _param_hasQuickJump = _param.hasQuickJump, hasQuickJump = _param_hasQuickJump === void 0 ? _utils1.defaultValues.hasQuickJump : _param_hasQuickJump, _param_hasPerPage = _param.hasPerPage, hasPerPage = _param_hasPerPage === void 0 ? _utils1.defaultValues.hasPerPage : _param_hasPerPage, _param_perPageList = _param.perPageList, perPageList = _param_perPageList === void 0 ? _utils1.defaultValues.perPageList : _param_perPageList, _param_isCommonButtonStyles = _param.isCommonButtonStyles, isCommonButtonStyles = _param_isCommonButtonStyles === void 0 ? _utils1.defaultValues.isCommonButtonStyles : _param_isCommonButtonStyles, _param_placeholderQuickJump = _param.placeholderQuickJump, placeholderQuickJump = _param_placeholderQuickJump === void 0 ? _utils1.defaultValues.placeholderQuickJump : _param_placeholderQuickJump, _param_textQuickJump = _param.textQuickJump, textQuickJump = _param_textQuickJump === void 0 ? _utils1.defaultValues.textQuickJump : _param_textQuickJump, _param_textPerPage = _param.textPerPage, textPerPage = _param_textPerPage === void 0 ? _utils1.defaultValues.textPerPage : _param_textPerPage, leftContent = _param.leftContent, rightContent = _param.rightContent, _param_listWidth = _param.listWidth, listWidth = _param_listWidth === void 0 ? 'fit-content' : _param_listWidth, onChangePageValue = _param.onChangePageValue, onChangePerPageValue = _param.onChangePerPageValue, onChange = _param.onChange, rest = _object_without_properties(_param, [
             "value",
             "defaultValue",
+            "helperText",
+            "singleLine",
             "perPage",
             "defaultPerPage",
             "slots",
@@ -202,11 +205,16 @@ var paginationRoot = function(Root) {
         var pageValue = outerValue !== null && outerValue !== void 0 ? outerValue : pageInner;
         var _useState1 = _sliced_to_array((0, _react.useState)(hasPerPage ? defaultPerPage || _utils1.defaultValues.perPage : undefined), 2), perPageInner = _useState1[0], setPerPageInner = _useState1[1];
         var perPageValue = outerPerPage !== null && outerPerPage !== void 0 ? outerPerPage : perPageInner;
+        var pagesRef = (0, _react.useRef)(null);
+        var _useState2 = _sliced_to_array((0, _react.useState)(0), 2), pagesWidth = _useState2[0], setPagesWidth = _useState2[1];
+        var _useState3 = _sliced_to_array((0, _react.useState)(0), 2), rootWidth = _useState3[0], setRootWidth = _useState3[1];
+        var rootRef = (0, _react.useRef)(null);
+        var forkRef = (0, _plasmacore.useForkRef)(rootRef, ref);
         var pages = Math.ceil(count / (perPageValue || 1));
         var sections = (0, _utils1.getSections)(pageValue, pages, slots);
         var typeClass = _Paginationtokens.classes["".concat(type, "Type")];
         var roundedClass = pilled ? 'circle-circle' : 'square-square';
-        var withHasPerPageSelect = hasPerPage ? _Paginationtokens.classes.withHasPerPageSelect : undefined;
+        var withHasPerPageSelect = hasPerPage && !helperText ? _Paginationtokens.classes.withHasPerPageSelect : undefined;
         var withHasQuickJump = hasQuickJump ? _Paginationtokens.classes.withHasQuickJump : undefined;
         var disabled = disabledPages.map(function(el) {
             return (0, _utils.isNumber)(el) ? Number(el) : null;
@@ -244,15 +252,43 @@ var paginationRoot = function(Root) {
         var isActiveButton = function(checkPage) {
             return pageValue === checkPage ? _Paginationtokens.classes.paginationPageButtonActive : '';
         };
+        (0, _react.useEffect)(function() {
+            var observers = [];
+            if (pagesRef.current) {
+                var pagesObserver = new ResizeObserver(function(entries) {
+                    var newWidth = entries[0].contentRect.width;
+                    setPagesWidth(newWidth);
+                });
+                pagesObserver.observe(pagesRef.current);
+                observers.push(pagesObserver);
+            }
+            if (rootRef.current) {
+                var rootObserver = new ResizeObserver(function(entries) {
+                    var newWidth = entries[0].contentRect.width;
+                    setRootWidth(newWidth);
+                });
+                rootObserver.observe(rootRef.current);
+                observers.push(rootObserver);
+            }
+            return function() {
+                observers.forEach(function(observer) {
+                    return observer.disconnect();
+                });
+            };
+        }, [
+            type
+        ]);
         return /*#__PURE__*/ _react.default.createElement(Root, _object_spread({
             size: size,
             view: view,
             viewCurrentPage: viewCurrentPage,
             className: (0, _utils.cx)(_Paginationtokens.classes.wrapper, typeClass),
-            ref: ref
+            ref: forkRef
         }, rest), /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationRoot, {
             className: typeClass
-        }, /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationPages, null, leftContent && /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationButtonGroup, {
+        }, /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationPages, {
+            ref: pagesRef
+        }, leftContent && /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationButtonGroup, {
             isCommonButtonStyles: isCommonButtonStyles
         }, leftContent), sections && sections.map(function(section, indexSection) {
             return /*#__PURE__*/ _react.default.createElement(_react.Fragment, {
@@ -276,12 +312,24 @@ var paginationRoot = function(Root) {
         }), rightContent && /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationButtonGroup, {
             isCommonButtonStyles: isCommonButtonStyles
         }, rightContent)), /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationActions, {
+            style: type === 'compact' ? {
+                minWidth: '0px'
+            } : {
+                width: "calc(100% - ".concat(pagesWidth, "px)")
+            },
             className: (0, _utils.cx)(_Paginationtokens.classes.actions, typeClass, withHasPerPageSelect, withHasQuickJump)
+        }, /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationActionsLeft, {
+            className: typeClass
         }, hasQuickJump && /*#__PURE__*/ _react.default.createElement(_PaginationQuickJumpToPage.PaginationQuickJumpToPage, {
             placeholderQuickJump: placeholderQuickJump,
             textQuickJump: textQuickJump,
             onChangeValue: handleSetPage
-        }), hasPerPage && /*#__PURE__*/ _react.default.createElement(_PaginationSelectPerPage.PaginationSelectPerPage, {
+        }), helperText && /*#__PURE__*/ _react.default.createElement(_Paginationstyles.PaginationHelperText, {
+            className: (0, _utils.cx)(typeClass, singleLine ? _Paginationtokens.classes.ellipsisText : ''),
+            style: {
+                maxWidth: rootWidth
+            }
+        }, helperText)), hasPerPage && /*#__PURE__*/ _react.default.createElement(_PaginationSelectPerPage.PaginationSelectPerPage, {
             textPerPage: textPerPage,
             perPageValue: perPageValue,
             perPageList: perPageList,

package/styled-components/cjs/components/Pagination/Pagination.styles.js

@@ -12,12 +12,18 @@ _export(exports, {
     get PaginationActions () {
         return PaginationActions;
     },
+    get PaginationActionsLeft () {
+        return PaginationActionsLeft;
+    },
     get PaginationButton () {
         return PaginationButton;
     },
     get PaginationButtonGroup () {
         return PaginationButtonGroup;
     },
+    get PaginationHelperText () {
+        return PaginationHelperText;
+    },
     get PaginationPages () {
         return PaginationPages;
     },
@@ -48,37 +54,39 @@ var mergedButtonGroupConfig = (0, _engines.mergeConfig)(_ButtonGroup.buttonGroup
 var ButtonGroup = (0, _engines.component)(mergedButtonGroupConfig);
 var PaginationRoot = _styledcomponents.default.div.withConfig({
     displayName: "Pagination.styles__PaginationRoot",
-    componentId: "sc-123175d4-0"
+    componentId: "sc-ec0762a3-0"
 })([
     "display:flex;color:var(",
     ");&.",
-    "{display:flex;flex-direction:column;gap:0.5rem;}&.",
-    "{display:flex;justify-content:space-between;flex:0 0 100%;gap:1rem;flex-wrap:wrap;}"
+    "{flex-direction:column;gap:0.5rem;justify-content:flex-start;}&.",
+    "{width:100%;justify-content:space-between;flex:0 0 100%;gap:1rem;flex-wrap:nowrap;}"
 ], _Paginationtokens.tokens.paginationColor, _Paginationtokens.classes.compactType, _Paginationtokens.classes.defaultType);
 var PaginationPages = _styledcomponents.default.div.withConfig({
     displayName: "Pagination.styles__PaginationPages",
-    componentId: "sc-123175d4-1"
+    componentId: "sc-ec0762a3-1"
 })([
-    "display:flex;align-items:center;gap:0.25rem;margin:0 auto;"
+    "display:flex;align-items:center;gap:0.25rem;flex-shrink:0;"
 ]);
 var PaginationActions = _styledcomponents.default.div.withConfig({
     displayName: "Pagination.styles__PaginationActions",
-    componentId: "sc-123175d4-2"
+    componentId: "sc-ec0762a3-2"
 })([
-    "display:flex;justify-content:space-between;flex-grow:1;gap:0.625rem;&.",
+    "display:flex;justify-content:space-between;flex-grow:1;align-items:center;gap:var(",
+    ");flex-shrink:1;&.",
+    "{flex-direction:row;width:100%;flex-wrap:wrap;}&.",
     "{flex-direction:row;}&.",
     "{flex-direction:row-reverse;}&.",
     "{flex-direction:row;}"
-], _Paginationtokens.classes.compactType, _Paginationtokens.classes.withHasPerPageSelect, _Paginationtokens.classes.withHasQuickJump);
+], _Paginationtokens.tokens.paginationHelperTextGap, _Paginationtokens.classes.compactType, _Paginationtokens.classes.defaultType, _Paginationtokens.classes.withHasPerPageSelect, _Paginationtokens.classes.withHasQuickJump);
 var PaginationSection = _styledcomponents.default.div.withConfig({
     displayName: "Pagination.styles__PaginationSection",
-    componentId: "sc-123175d4-3"
+    componentId: "sc-ec0762a3-3"
 })([
     "display:flex;gap:0.125rem;"
 ]);
 var PaginationButtonGroup = (0, _styledcomponents.default)(ButtonGroup).withConfig({
     displayName: "Pagination.styles__PaginationButtonGroup",
-    componentId: "sc-123175d4-4"
+    componentId: "sc-ec0762a3-4"
 })([
     "",
     ":var(",
@@ -120,7 +128,7 @@ var PaginationButtonGroup = (0, _styledcomponents.default)(ButtonGroup).withConf
 ], _ButtonGroup.buttonGroupTokens.buttonColor, _Paginationtokens.tokens.buttonColor, _ButtonGroup.buttonGroupTokens.buttonBackgroundColor, _Paginationtokens.tokens.buttonBackgroundColor, _ButtonGroup.buttonGroupTokens.buttonColorHover, _Paginationtokens.tokens.buttonHoverColor, _ButtonGroup.buttonGroupTokens.buttonBackgroundColorHover, _Paginationtokens.tokens.buttonBackgroundColorHover, _ButtonGroup.buttonGroupTokens.buttonColorActive, _Paginationtokens.tokens.buttonActiveColor, _ButtonGroup.buttonGroupTokens.buttonBackgroundColorActive, _Paginationtokens.tokens.buttonBackgroundColorActive, _ButtonGroup.buttonGroupTokens.buttonFontFamily, _Paginationtokens.tokens.paginationFontFamily, _ButtonGroup.buttonGroupTokens.buttonFontSize, _Paginationtokens.tokens.paginationFontSize, _ButtonGroup.buttonGroupTokens.buttonFontStyle, _Paginationtokens.tokens.paginationFontStyle, _ButtonGroup.buttonGroupTokens.buttonFontWeight, _Paginationtokens.tokens.paginationFontWeight, _ButtonGroup.buttonGroupTokens.buttonLetterSpacing, _Paginationtokens.tokens.paginationLetterSpacing, _ButtonGroup.buttonGroupTokens.buttonLineHeight, _Paginationtokens.tokens.paginationLineHeight, _ButtonGroup.buttonGroupTokens.buttonWidth, _Paginationtokens.tokens.buttonWidth, _ButtonGroup.buttonGroupTokens.buttonHeight, _Paginationtokens.tokens.buttonHeight, _ButtonGroup.buttonGroupTokens.buttonDefaultRadius, _Paginationtokens.tokens.buttonRadius, _ButtonGroup.buttonGroupTokens.buttonSideRadius, _Paginationtokens.tokens.buttonRadius, _ButtonGroup.buttonGroupTokens.buttonSegmentedRadius, _Paginationtokens.tokens.buttonRadius, _ButtonGroup.buttonGroupTokens.buttonRadiusCircle, _Paginationtokens.tokens.buttonRadius);
 var PaginationButton = (0, _styledcomponents.default)(Button).withConfig({
     displayName: "Pagination.styles__PaginationButton",
-    componentId: "sc-123175d4-5"
+    componentId: "sc-ec0762a3-5"
 })([
     "",
     ":var(",
@@ -186,10 +194,29 @@ var PaginationButton = (0, _styledcomponents.default)(Button).withConfig({
 }));
 var PaginationShorter = (0, _styledcomponents.default)(PaginationButton).withConfig({
     displayName: "Pagination.styles__PaginationShorter",
-    componentId: "sc-123175d4-6"
+    componentId: "sc-ec0762a3-6"
 })([
     "",
     ":var(",
     ");",
     ":0;"
 ], _Button.buttonTokens.buttonWidth, _Paginationtokens.tokens.buttonWidthShorter, _Button.buttonTokens.buttonPadding);
+var PaginationActionsLeft = _styledcomponents.default.div.withConfig({
+    displayName: "Pagination.styles__PaginationActionsLeft",
+    componentId: "sc-ec0762a3-7"
+})([
+    "display:flex;align-items:center;flex-wrap:wrap;gap:var(",
+    ");.",
+    " &{min-width:0;flex-wrap:nowrap;flex-shrink:1;}"
+], _Paginationtokens.tokens.paginationHelperTextGap, _Paginationtokens.classes.defaultType);
+var PaginationHelperText = _styledcomponents.default.div.withConfig({
+    displayName: "Pagination.styles__PaginationHelperText",
+    componentId: "sc-ec0762a3-8"
+})([
+    "color:var(",
+    ");&.",
+    "{min-width:0;",
+    " flex-shrink:1;}&.",
+    "{",
+    "}"
+], _Paginationtokens.tokens.paginationHelperTextColor, _Paginationtokens.classes.defaultType, (0, _mixins.applyEllipsis)(), _Paginationtokens.classes.ellipsisText, (0, _mixins.applyEllipsis)());

package/styled-components/cjs/components/Pagination/Pagination.tokens.js

@@ -22,6 +22,7 @@ var classes = {
     actions: 'pagination-actions',
     perPage: 'pagination-perpage-select',
     quickJump: 'pagination-quick-jump-page',
+    ellipsisText: 'pagination-ellipsis-text',
     selectWrapper: 'pagination-select-wrapper',
     defaultType: 'pagination-type-default',
     compactType: 'pagination-type-compact',
@@ -35,6 +36,8 @@ var classes = {
 var tokens = {
     paginationWidth: '--plasma-pagination-width',
     paginationColor: '--plasma-pagination-color',
+    paginationHelperTextColor: '--plasma-pagination-helper-text-color',
+    paginationHelperTextGap: '--plasma-pagination-helper-text-gap',
     buttonBackgroundColor: '--plasma-pagination-button-bg-color',
     buttonBackgroundColorHover: '--plasma-pagination-button-bg-color-hover',
     buttonBackgroundColorActive: '--plasma-pagination-button-bg-color-active',

package/styled-components/cjs/components/Pagination/ui/PaginationQuickJumpToPage/PaginationQuickJumpToPage.styles.js

@@ -28,9 +28,9 @@ function _interop_require_default(obj) {
 }
 var QuickJumpToPageRoot = _styledcomponents.default.div.withConfig({
     displayName: "PaginationQuickJumpToPage.styles__QuickJumpToPageRoot",
-    componentId: "sc-baf7e727-0"
+    componentId: "sc-d437c7e1-0"
 })([
-    "display:flex;align-items:center;gap:0.5rem;font-family:var(",
+    "display:flex;align-items:center;gap:0.5rem;flex-shrink:0;font-family:var(",
     ");font-size:var(",
     ");font-style:var(",
     ");font-weight:var(",
@@ -40,13 +40,13 @@ var QuickJumpToPageRoot = _styledcomponents.default.div.withConfig({
 ], _Paginationtokens.tokens.paginationFontFamily, _Paginationtokens.tokens.paginationFontSize, _Paginationtokens.tokens.paginationFontStyle, _Paginationtokens.tokens.paginationFontWeight, _Paginationtokens.tokens.paginationLetterSpacing, _Paginationtokens.tokens.paginationLineHeight);
 var QuickJumpToPageTypography = _styledcomponents.default.div.withConfig({
     displayName: "PaginationQuickJumpToPage.styles__QuickJumpToPageTypography",
-    componentId: "sc-baf7e727-1"
+    componentId: "sc-d437c7e1-1"
 })([
-    ""
+    "white-space:nowrap;"
 ]);
 var QuickJumpToPageInput = _styledcomponents.default.input.withConfig({
     displayName: "PaginationQuickJumpToPage.styles__QuickJumpToPageInput",
-    componentId: "sc-baf7e727-2"
+    componentId: "sc-d437c7e1-2"
 })([
     "background:var(",
     ");color:var(",