@salutejs/plasma-new-hope 0.268.0-dev.0 → 0.268.2-canary.1780.13373736245.0

package/styled-components/cjs/components/Tabs/Tabs.template-doc.mdx

@@ -97,18 +97,21 @@ export function App() {
 ```
 
 ### Пример с прокруткой
+При выборе таба происходит прокрутка до выбранного таба.
 
 ```tsx live
 import React, { useState } from 'react';
-import { Tabs, TabItem } from '@salutejs/{{ package }}';
+import { Tabs, TabItem, Button } from '@salutejs/plasma-web';
 import { IconClock } from '@salutejs/plasma-icons';
 
 export function App() {
     const items = Array(8).fill(0);
     const [index, setIndex] = useState(0);
 
+    const specificIndex = 6;
+
     return (
-        <div>
+        <div style=\{{ display:'flex', flexDirection: 'column', gap: '1rem' }}>
             <Tabs view="divider" size="xs" style=\{{ width: '15rem' }}>
                 {items.map((_, i) => (
                     <TabItem
@@ -124,6 +127,8 @@ export function App() {
                     </TabItem>
                 ))}
             </Tabs>
+
+            <Button onClick={() => setIndex(specificIndex)}>{`Выбрать элемент ${specificIndex + 1}`}</Button>
         </div>
     );
 }

package/styled-components/cjs/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js

@@ -70,6 +70,16 @@ var horizontalTabItemRoot = exports.horizontalTabItemRoot = function horizontalT
         return refs.unregister(innerRef);
       };
     }, [refs]);
+    (0, _react.useLayoutEffect)(function () {
+      var _innerRef$current;
+      if (!selected) {
+        return;
+      }
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
+        block: 'nearest',
+        inline: 'nearest'
+      });
+    }, [selected]);
     var onItemFocus = (0, _react.useCallback)(function (event) {
       if (disabled) {
         return;
@@ -95,10 +105,6 @@ var horizontalTabItemRoot = exports.horizontalTabItemRoot = function horizontalT
       refs.setCurrent(focusIndex);
     }, [refs, innerRef, onIndexChange, disabled]);
     var handleClick = function handleClick(event) {
-      event.currentTarget.scrollIntoView({
-        block: 'nearest',
-        inline: 'nearest'
-      });
       if (!onClick) {
         return;
       }

package/styled-components/cjs/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js

@@ -11,6 +11,7 @@ var _Icon = /*#__PURE__*/require("../../../../_Icon");
 var _tokens = /*#__PURE__*/require("../../../tokens");
 var _utils = /*#__PURE__*/require("../../../../../utils");
 var _TabsContext = /*#__PURE__*/require("../../../TabsContext");
+var _utils2 = /*#__PURE__*/require("../../../utils");
 var _base = /*#__PURE__*/require("./variations/_size/base");
 var _base2 = /*#__PURE__*/require("./variations/_view/base");
 var _base3 = /*#__PURE__*/require("./variations/_disabled/base");
@@ -91,13 +92,7 @@ var horizontalTabsRoot = exports.horizontalTabsRoot = function horizontalTabsRoo
         return;
       }
       var scrollLeft = Math.round(scrollRef.current.scrollLeft);
-      var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
-        if (!item.current || item.current.offsetLeft === undefined) {
-          return;
-        }
-        var tabStartX = item.current.offsetLeft;
-        return tabStartX < scrollLeft;
-      });
+      var firstOverflowingTab = (0, _utils2.getFirstOverflowingTab)(refs.items.slice().reverse(), scrollLeft);
       firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
         block: 'nearest',
         inline: 'start'
@@ -109,13 +104,7 @@ var horizontalTabsRoot = exports.horizontalTabsRoot = function horizontalTabsRoo
         return;
       }
       var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
-      var lastOverflowingTab = refs.items.find(function (item) {
-        if (!item.current || item.current.offsetLeft === undefined) {
-          return;
-        }
-        var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
-        return tabEndX > scrollRight;
-      });
+      var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollRight);
       lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
         block: 'nearest',
         inline: 'end'
@@ -190,18 +179,22 @@ var horizontalTabsRoot = exports.horizontalTabsRoot = function horizontalTabsRoo
         });
       }
     }, [index]);
-    (0, _react.useEffect)(function () {
+    (0, _react.useLayoutEffect)(function () {
       var _scrollRef$current, _scrollRef$current2;
       setLastItemVisible(((_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollWidth) === ((_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.clientWidth));
     }, []);
 
     // Этот хук компенсирует появление левой стрелки при прокрутке
-    (0, _react.useEffect)(function () {
+    (0, _react.useLayoutEffect)(function () {
+      var _lastOverflowingTab$c2;
       if (firstItemVisible || !scrollRef.current || !leftArrowRef.current) {
         return;
       }
-      scrollRef.current.scrollTo({
-        left: Math.round(scrollRef.current.scrollLeft + leftArrowRef.current.clientWidth)
+      var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
+      var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollRight);
+      lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
+        block: 'nearest',
+        inline: 'end'
       });
     }, [firstItemVisible, scrollRef, leftArrowRef]);
     return /*#__PURE__*/_react["default"].createElement(_TabsContext.TabsContext.Provider, {

package/styled-components/cjs/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js

@@ -61,6 +61,16 @@ var verticalTabItemRoot = exports.verticalTabItemRoot = function verticalTabItem
         return refs.unregister(innerRef);
       };
     }, [refs]);
+    (0, _react.useLayoutEffect)(function () {
+      var _innerRef$current;
+      if (!selected) {
+        return;
+      }
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
+        block: 'nearest',
+        inline: 'nearest'
+      });
+    }, [selected]);
     var onItemFocus = (0, _react.useCallback)(function (event) {
       if (disabled) {
         return;
@@ -85,10 +95,6 @@ var verticalTabItemRoot = exports.verticalTabItemRoot = function verticalTabItem
       refs.setCurrent(focusIndex);
     }, [refs, innerRef, onIndexChange, disabled]);
     var handleClick = function handleClick(event) {
-      event.currentTarget.scrollIntoView({
-        block: 'nearest',
-        inline: 'nearest'
-      });
       if (!onClick) {
         return;
       }

package/styled-components/cjs/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js

@@ -11,6 +11,7 @@ var _tokens = /*#__PURE__*/require("../../../tokens");
 var _utils = /*#__PURE__*/require("../../../../../utils");
 var _TabsContext = /*#__PURE__*/require("../../../TabsContext");
 var _Icon = /*#__PURE__*/require("../../../../_Icon");
+var _utils2 = /*#__PURE__*/require("../../../utils");
 var _VerticalTabs = /*#__PURE__*/require("./VerticalTabs.styles");
 var _base = /*#__PURE__*/require("./variations/_size/base");
 var _base2 = /*#__PURE__*/require("./variations/_view/base");
@@ -78,13 +79,7 @@ var verticalTabsRoot = exports.verticalTabsRoot = function verticalTabsRoot(Root
         return;
       }
       var scrollTop = Math.round(scrollRef.current.scrollTop);
-      var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
-        if (!item.current || item.current.offsetTop === undefined) {
-          return;
-        }
-        var tabStartY = item.current.offsetTop;
-        return tabStartY < scrollTop;
-      });
+      var firstOverflowingTab = (0, _utils2.getFirstOverflowingTab)(refs.items.slice().reverse(), scrollTop);
       firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
         block: 'start',
         inline: 'nearest'
@@ -96,13 +91,7 @@ var verticalTabsRoot = exports.verticalTabsRoot = function verticalTabsRoot(Root
         return;
       }
       var scrollBottom = Math.round(scrollRef.current.scrollTop + scrollRef.current.clientHeight);
-      var lastOverflowingTab = refs.items.find(function (item) {
-        if (!item.current || item.current.offsetTop === undefined) {
-          return;
-        }
-        var tabEndY = item.current.offsetTop + item.current.offsetHeight;
-        return tabEndY > scrollBottom;
-      });
+      var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollBottom);
       lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
         block: 'end',
         inline: 'nearest'
@@ -168,18 +157,22 @@ var verticalTabsRoot = exports.verticalTabsRoot = function verticalTabsRoot(Root
         });
       }
     }, [index]);
-    (0, _react.useEffect)(function () {
+    (0, _react.useLayoutEffect)(function () {
       var _scrollRef$current, _scrollRef$current2;
       setLastItemVisible(((_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollHeight) === ((_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.clientHeight));
     }, []);
 
     // Этот хук компенсирует появление верхней стрелки при прокрутке
-    (0, _react.useEffect)(function () {
+    (0, _react.useLayoutEffect)(function () {
+      var _lastOverflowingTab$c2;
       if (firstItemVisible || !scrollRef.current || !upArrowRef.current) {
         return;
       }
-      scrollRef.current.scrollTo({
-        top: Math.round(scrollRef.current.scrollTop + upArrowRef.current.clientHeight)
+      var scrollBottom = Math.round(scrollRef.current.scrollTop + scrollRef.current.clientHeight);
+      var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollBottom);
+      lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
+        block: 'end',
+        inline: 'nearest'
       });
     }, [firstItemVisible, scrollRef, upArrowRef]);
     return /*#__PURE__*/_react["default"].createElement(_TabsContext.TabsContext.Provider, {

package/styled-components/cjs/components/Tabs/utils/index.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLastOverflowingTab = exports.getFirstOverflowingTab = void 0;
+var getFirstOverflowingTab = exports.getFirstOverflowingTab = function getFirstOverflowingTab(items, maxScroll) {
+  return items.find(function (item) {
+    if (!item.current || item.current.offsetLeft === undefined) {
+      return;
+    }
+    var tabStartX = item.current.offsetLeft;
+    return tabStartX < maxScroll;
+  });
+};
+var getLastOverflowingTab = exports.getLastOverflowingTab = function getLastOverflowingTab(items, minScroll) {
+  return items.find(function (item) {
+    if (!item.current || item.current.offsetLeft === undefined) {
+      return;
+    }
+    var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
+    return tabEndX > minScroll;
+  });
+};

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

@@ -52,7 +52,7 @@ var tooltipRoot = exports.tooltipRoot = function tooltipRoot(Root) {
       arrow = _ref.arrow,
       animated = _ref.animated,
       _ref$offset = _ref.offset,
-      offset = _ref$offset === void 0 ? [0, 8] : _ref$offset,
+      offset = _ref$offset === void 0 ? [3, 8] : _ref$offset,
       minWidth = _ref.minWidth,
       maxWidth = _ref.maxWidth,
       _ref$placement = _ref.placement,

package/styled-components/cjs/examples/plasma_b2c/components/Popover/Popover.stories.tsx

@@ -5,18 +5,40 @@ import type { StoryObj, Meta } from '@storybook/react';
 
 import { Button } from '../Button/Button';
 import { WithTheme } from '../../../_helpers';
+import { IconDisclosureRight } from '../../../../components/_Icon';
+import { IconButton } from '../IconButton/IconButton';
 
-import { Popover } from './Popover';
+import { Popover, PopoverPlacement } from './Popover';
 
 import './style.css';
 
+const placements: Array<PopoverPlacement> = [
+    'top',
+    'top-start',
+    'top-end',
+
+    'bottom',
+    'bottom-start',
+    'bottom-end',
+
+    'left',
+    'left-start',
+    'left-end',
+
+    'right',
+    'right-start',
+    'right-end',
+
+    'auto',
+];
+
 const meta: Meta<typeof Popover> = {
     title: 'b2c/Overlay/Popover',
     decorators: [WithTheme],
     component: Popover,
     argTypes: {
         placement: {
-            options: ['top', 'bottom', 'right', 'left', 'auto'],
+            options: placements,
             control: {
                 type: 'select',
             },
@@ -116,5 +138,8 @@ const StoryDefault = (args: StoryPopoverProps) => {
 };
 
 export const Default: StoryObj<StoryPopoverProps> = {
+    args: {
+        placement: 'bottom-start',
+    },
     render: (args) => <StoryDefault {...args} />,
 };

package/styled-components/es/components/Popover/Popover.js

@@ -23,6 +23,7 @@ import { Portal } from '../Portal';
 import { base as viewCSS } from './variations/_view/base';
 import { StyledArrow, StyledPopover, StyledRoot, StyledWrapper } from './Popover.styles';
 import { classes } from './Popover.tokens';
+import { usePopoverOffset } from './hooks/usePopoverOffset';
 export var ESCAPE_KEYCODE = 27;
 export var POPOVER_PORTAL_ID = 'plasma-popover-root';
 
@@ -66,6 +67,7 @@ export var popoverRoot = function popoverRoot(Root) {
     var popoverRef = useRef(null);
     var handleRef = useForkRef(rootRef, outerRootRef);
     var portalRef = useRef(null);
+    var targetRef = useRef(null);
     var trapRef = useFocusTrap(innerIsOpen && isFocusTrapped);
     var popoverForkRef = useForkRef(popoverRef, trapRef);
     var _useState = useState(null),
@@ -84,6 +86,11 @@ export var popoverRoot = function popoverRoot(Root) {
     var isAuto = isAutoArray || placement.startsWith('auto');
     var openClass = innerIsOpen && shouldRender ? classes.open : undefined;
     var animatedClass = animated ? classes.animate : undefined;
+    var offsetInner = usePopoverOffset({
+      handleRef: targetRef,
+      placement: placement,
+      offsetOuter: offset
+    });
     var _usePopper = usePopper(rootRef.current, popoverRef.current, {
         // TODO: #1121
         // eslint-disable-next-line no-nested-ternary
@@ -96,7 +103,7 @@ export var popoverRoot = function popoverRoot(Root) {
         }, {
           name: 'offset',
           options: {
-            offset: [offset[0], offset[1]]
+            offset: [offsetInner[0], offsetInner[1]]
           }
         }, {
           name: 'flip',
@@ -227,7 +234,8 @@ export var popoverRoot = function popoverRoot(Root) {
     }, /*#__PURE__*/React.createElement(StyledWrapper, {
       className: cx(classes.wrapper, ! /*#__PURE__*/isValidElement(target) && classes.targetAsRef),
       onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave
+      onMouseLeave: onMouseLeave,
+      ref: targetRef
     }, /*#__PURE__*/React.createElement(StyledRoot, {
       ref: handleRef,
       onClick: onClick,

package/styled-components/es/components/Popover/hooks/usePopoverOffset.js

@@ -0,0 +1,45 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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(arr) { if (Array.isArray(arr)) return arr; }
+import { useEffect, useState } from 'react';
+var allowedPlacements = ['top-start', 'top-end', 'bottom-start', 'bottom-end', 'left-start', 'left-end', 'right-start', 'right-end'];
+var widthThreshold = 28;
+var offsetXStartThreshold = 17;
+var offsetXEndThreshold = 19;
+export var usePopoverOffset = function usePopoverOffset(_ref) {
+  var handleRef = _ref.handleRef,
+    placement = _ref.placement,
+    offsetOuter = _ref.offsetOuter;
+  var _useState = useState(offsetOuter),
+    _useState2 = _slicedToArray(_useState, 2),
+    offset = _useState2[0],
+    setOffset = _useState2[1];
+  useEffect(function () {
+    var refElement = handleRef.current;
+    if (!refElement || !allowedPlacements.includes(placement)) {
+      setOffset(offsetOuter);
+      return;
+    }
+    var _refElement$getBoundi = refElement.getBoundingClientRect(),
+      width = _refElement$getBoundi.width,
+      height = _refElement$getBoundi.height;
+    var isVertical = (placement === null || placement === void 0 ? void 0 : placement.startsWith('top')) || (placement === null || placement === void 0 ? void 0 : placement.startsWith('bottom'));
+    var isEnd = placement === null || placement === void 0 ? void 0 : placement.endsWith('end');
+    var isStart = placement === null || placement === void 0 ? void 0 : placement.endsWith('start');
+    var offsetX = offsetOuter[0];
+    var offsetY = offsetOuter[1];
+    if (isVertical) {
+      if ((isStart || isEnd) && width < widthThreshold) {
+        offsetX = isEnd ? offsetXStartThreshold - width / 2 + offsetOuter[0] : -offsetXStartThreshold + width / 2 - offsetOuter[0];
+      }
+    }
+    if (!isVertical && (isStart || isEnd) && height < widthThreshold) {
+      offsetX = isStart ? -offsetXEndThreshold + height / 2 : offsetXEndThreshold - height / 2;
+    }
+    setOffset([offsetX, offsetY]);
+  }, [handleRef, placement, offsetOuter]);
+  return offset;
+};

package/styled-components/es/components/Tabs/Tabs.template-doc.mdx

@@ -97,18 +97,21 @@ export function App() {
 ```
 
 ### Пример с прокруткой
+При выборе таба происходит прокрутка до выбранного таба.
 
 ```tsx live
 import React, { useState } from 'react';
-import { Tabs, TabItem } from '@salutejs/{{ package }}';
+import { Tabs, TabItem, Button } from '@salutejs/plasma-web';
 import { IconClock } from '@salutejs/plasma-icons';
 
 export function App() {
     const items = Array(8).fill(0);
     const [index, setIndex] = useState(0);
 
+    const specificIndex = 6;
+
     return (
-        <div>
+        <div style=\{{ display:'flex', flexDirection: 'column', gap: '1rem' }}>
             <Tabs view="divider" size="xs" style=\{{ width: '15rem' }}>
                 {items.map((_, i) => (
                     <TabItem
@@ -124,6 +127,8 @@ export function App() {
                     </TabItem>
                 ))}
             </Tabs>
+
+            <Button onClick={() => setIndex(specificIndex)}>{`Выбрать элемент ${specificIndex + 1}`}</Button>
         </div>
     );
 }

package/styled-components/es/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js

@@ -8,7 +8,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef, useRef, useContext, useEffect, useCallback } from 'react';
+import React, { forwardRef, useRef, useContext, useEffect, useCallback, useLayoutEffect } from 'react';
 import { useForkRef } from '@salutejs/plasma-core';
 import { classes } from '../../../tokens';
 import { cx } from '../../../../../utils';
@@ -62,6 +62,16 @@ export var horizontalTabItemRoot = function horizontalTabItemRoot(Root) {
         return refs.unregister(innerRef);
       };
     }, [refs]);
+    useLayoutEffect(function () {
+      var _innerRef$current;
+      if (!selected) {
+        return;
+      }
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
+        block: 'nearest',
+        inline: 'nearest'
+      });
+    }, [selected]);
     var onItemFocus = useCallback(function (event) {
       if (disabled) {
         return;
@@ -87,10 +97,6 @@ export var horizontalTabItemRoot = function horizontalTabItemRoot(Root) {
       refs.setCurrent(focusIndex);
     }, [refs, innerRef, onIndexChange, disabled]);
     var handleClick = function handleClick(event) {
-      event.currentTarget.scrollIntoView({
-        block: 'nearest',
-        inline: 'nearest'
-      });
       if (!onClick) {
         return;
       }

package/styled-components/es/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js

@@ -8,12 +8,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef, useCallback, useMemo, useState, useEffect, useRef } from 'react';
+import React, { forwardRef, useCallback, useMemo, useState, useRef, useLayoutEffect } from 'react';
 import { safeUseId } from '@salutejs/plasma-core';
 import { IconDisclosureLeft, IconDisclosureRight } from '../../../../_Icon';
 import { classes } from '../../../tokens';
 import { cx } from '../../../../../utils';
 import { TabItemRefs, TabsContext } from '../../../TabsContext';
+import { getFirstOverflowingTab, getLastOverflowingTab } from '../../../utils';
 import { base as sizeCSS } from './variations/_size/base';
 import { base as viewCSS } from './variations/_view/base';
 import { base as disabledCSS } from './variations/_disabled/base';
@@ -82,13 +83,7 @@ export var horizontalTabsRoot = function horizontalTabsRoot(Root) {
         return;
       }
       var scrollLeft = Math.round(scrollRef.current.scrollLeft);
-      var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
-        if (!item.current || item.current.offsetLeft === undefined) {
-          return;
-        }
-        var tabStartX = item.current.offsetLeft;
-        return tabStartX < scrollLeft;
-      });
+      var firstOverflowingTab = getFirstOverflowingTab(refs.items.slice().reverse(), scrollLeft);
       firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
         block: 'nearest',
         inline: 'start'
@@ -100,13 +95,7 @@ export var horizontalTabsRoot = function horizontalTabsRoot(Root) {
         return;
       }
       var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
-      var lastOverflowingTab = refs.items.find(function (item) {
-        if (!item.current || item.current.offsetLeft === undefined) {
-          return;
-        }
-        var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
-        return tabEndX > scrollRight;
-      });
+      var lastOverflowingTab = getLastOverflowingTab(refs.items, scrollRight);
       lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
         block: 'nearest',
         inline: 'end'
@@ -181,18 +170,22 @@ export var horizontalTabsRoot = function horizontalTabsRoot(Root) {
         });
       }
     }, [index]);
-    useEffect(function () {
+    useLayoutEffect(function () {
       var _scrollRef$current, _scrollRef$current2;
       setLastItemVisible(((_scrollRef$current = scrollRef.current) === null || _scrollRef$current === void 0 ? void 0 : _scrollRef$current.scrollWidth) === ((_scrollRef$current2 = scrollRef.current) === null || _scrollRef$current2 === void 0 ? void 0 : _scrollRef$current2.clientWidth));
     }, []);
 
     // Этот хук компенсирует появление левой стрелки при прокрутке
-    useEffect(function () {
+    useLayoutEffect(function () {
+      var _lastOverflowingTab$c2;
       if (firstItemVisible || !scrollRef.current || !leftArrowRef.current) {
         return;
       }
-      scrollRef.current.scrollTo({
-        left: Math.round(scrollRef.current.scrollLeft + leftArrowRef.current.clientWidth)
+      var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
+      var lastOverflowingTab = getLastOverflowingTab(refs.items, scrollRight);
+      lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
+        block: 'nearest',
+        inline: 'end'
       });
     }, [firstItemVisible, scrollRef, leftArrowRef]);
     return /*#__PURE__*/React.createElement(TabsContext.Provider, {

package/styled-components/es/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js

@@ -8,7 +8,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef, useRef, useContext, useEffect, useCallback } from 'react';
+import React, { forwardRef, useRef, useContext, useEffect, useCallback, useLayoutEffect } from 'react';
 import { useForkRef } from '@salutejs/plasma-core';
 import { classes } from '../../../tokens';
 import { cx } from '../../../../../utils';
@@ -53,6 +53,16 @@ export var verticalTabItemRoot = function verticalTabItemRoot(Root) {
         return refs.unregister(innerRef);
       };
     }, [refs]);
+    useLayoutEffect(function () {
+      var _innerRef$current;
+      if (!selected) {
+        return;
+      }
+      (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
+        block: 'nearest',
+        inline: 'nearest'
+      });
+    }, [selected]);
     var onItemFocus = useCallback(function (event) {
       if (disabled) {
         return;
@@ -77,10 +87,6 @@ export var verticalTabItemRoot = function verticalTabItemRoot(Root) {
       refs.setCurrent(focusIndex);
     }, [refs, innerRef, onIndexChange, disabled]);
     var handleClick = function handleClick(event) {
-      event.currentTarget.scrollIntoView({
-        block: 'nearest',
-        inline: 'nearest'
-      });
       if (!onClick) {
         return;
       }