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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (51) hide show
  1. package/cjs/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js +10 -4
  2. package/cjs/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js.map +1 -1
  3. package/cjs/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js +21 -28
  4. package/cjs/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js.map +1 -1
  5. package/cjs/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js +10 -4
  6. package/cjs/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js.map +1 -1
  7. package/cjs/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js +21 -28
  8. package/cjs/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js.map +1 -1
  9. package/cjs/components/Tabs/utils/index.js +26 -0
  10. package/cjs/components/Tabs/utils/index.js.map +1 -0
  11. package/emotion/cjs/components/Tabs/Tabs.template-doc.mdx +7 -2
  12. package/emotion/cjs/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js +10 -4
  13. package/emotion/cjs/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js +11 -18
  14. package/emotion/cjs/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js +10 -4
  15. package/emotion/cjs/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js +11 -18
  16. package/emotion/cjs/components/Tabs/utils/index.js +24 -0
  17. package/emotion/es/components/Tabs/Tabs.template-doc.mdx +7 -2
  18. package/emotion/es/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js +11 -5
  19. package/emotion/es/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js +12 -19
  20. package/emotion/es/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js +11 -5
  21. package/emotion/es/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js +12 -19
  22. package/emotion/es/components/Tabs/utils/index.js +18 -0
  23. package/es/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js +11 -5
  24. package/es/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js.map +1 -1
  25. package/es/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js +12 -19
  26. package/es/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js.map +1 -1
  27. package/es/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js +11 -5
  28. package/es/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js.map +1 -1
  29. package/es/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js +12 -19
  30. package/es/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js.map +1 -1
  31. package/es/components/Tabs/utils/index.js +21 -0
  32. package/es/components/Tabs/utils/index.js.map +1 -0
  33. package/package.json +2 -2
  34. package/styled-components/cjs/components/Tabs/Tabs.template-doc.mdx +7 -2
  35. package/styled-components/cjs/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js +10 -4
  36. package/styled-components/cjs/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js +11 -18
  37. package/styled-components/cjs/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js +10 -4
  38. package/styled-components/cjs/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js +11 -18
  39. package/styled-components/cjs/components/Tabs/utils/index.js +24 -0
  40. package/styled-components/es/components/Tabs/Tabs.template-doc.mdx +7 -2
  41. package/styled-components/es/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.js +11 -5
  42. package/styled-components/es/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.js +12 -19
  43. package/styled-components/es/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.js +11 -5
  44. package/styled-components/es/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.js +12 -19
  45. package/styled-components/es/components/Tabs/utils/index.js +18 -0
  46. package/types/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.d.ts.map +1 -1
  47. package/types/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.d.ts.map +1 -1
  48. package/types/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.d.ts.map +1 -1
  49. package/types/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.d.ts.map +1 -1
  50. package/types/components/Tabs/utils/index.d.ts +4 -0
  51. package/types/components/Tabs/utils/index.d.ts.map +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salutejs/plasma-new-hope",
3
- "version": "0.268.1-dev.0",
3
+ "version": "0.268.2-canary.1780.13373736245.0",
4
4
  "description": "Salute Design System blueprint",
5
5
  "main": "cjs/index.js",
6
6
  "module": "es/index.js",
@@ -132,5 +132,5 @@
132
132
  "sideEffects": [
133
133
  "*.css"
134
134
  ],
135
- "gitHead": "767dbfa6c6cdb43f57c4e9b4ace42aeef623b17f"
135
+ "gitHead": "585e27500065b56fd2c91f35bb82eda6e7c59c39"
136
136
  }
@@ -97,18 +97,21 @@ export function App() {
97
97
  ```
98
98
 
99
99
  ### Пример с прокруткой
100
+ При выборе таба происходит прокрутка до выбранного таба.
100
101
 
101
102
  ```tsx live
102
103
  import React, { useState } from 'react';
103
- import { Tabs, TabItem } from '@salutejs/{{ package }}';
104
+ import { Tabs, TabItem, Button } from '@salutejs/plasma-web';
104
105
  import { IconClock } from '@salutejs/plasma-icons';
105
106
 
106
107
  export function App() {
107
108
  const items = Array(8).fill(0);
108
109
  const [index, setIndex] = useState(0);
109
110
 
111
+ const specificIndex = 6;
112
+
110
113
  return (
111
- <div>
114
+ <div style=\{{ display:'flex', flexDirection: 'column', gap: '1rem' }}>
112
115
  <Tabs view="divider" size="xs" style=\{{ width: '15rem' }}>
113
116
  {items.map((_, i) => (
114
117
  <TabItem
@@ -124,6 +127,8 @@ export function App() {
124
127
  </TabItem>
125
128
  ))}
126
129
  </Tabs>
130
+
131
+ <Button onClick={() => setIndex(specificIndex)}>{`Выбрать элемент ${specificIndex + 1}`}</Button>
127
132
  </div>
128
133
  );
129
134
  }
@@ -70,6 +70,16 @@ var horizontalTabItemRoot = exports.horizontalTabItemRoot = function horizontalT
70
70
  return refs.unregister(innerRef);
71
71
  };
72
72
  }, [refs]);
73
+ (0, _react.useLayoutEffect)(function () {
74
+ var _innerRef$current;
75
+ if (!selected) {
76
+ return;
77
+ }
78
+ (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
79
+ block: 'nearest',
80
+ inline: 'nearest'
81
+ });
82
+ }, [selected]);
73
83
  var onItemFocus = (0, _react.useCallback)(function (event) {
74
84
  if (disabled) {
75
85
  return;
@@ -95,10 +105,6 @@ var horizontalTabItemRoot = exports.horizontalTabItemRoot = function horizontalT
95
105
  refs.setCurrent(focusIndex);
96
106
  }, [refs, innerRef, onIndexChange, disabled]);
97
107
  var handleClick = function handleClick(event) {
98
- event.currentTarget.scrollIntoView({
99
- block: 'nearest',
100
- inline: 'nearest'
101
- });
102
108
  if (!onClick) {
103
109
  return;
104
110
  }
@@ -11,6 +11,7 @@ var _Icon = /*#__PURE__*/require("../../../../_Icon");
11
11
  var _tokens = /*#__PURE__*/require("../../../tokens");
12
12
  var _utils = /*#__PURE__*/require("../../../../../utils");
13
13
  var _TabsContext = /*#__PURE__*/require("../../../TabsContext");
14
+ var _utils2 = /*#__PURE__*/require("../../../utils");
14
15
  var _base = /*#__PURE__*/require("./variations/_size/base");
15
16
  var _base2 = /*#__PURE__*/require("./variations/_view/base");
16
17
  var _base3 = /*#__PURE__*/require("./variations/_disabled/base");
@@ -91,13 +92,7 @@ var horizontalTabsRoot = exports.horizontalTabsRoot = function horizontalTabsRoo
91
92
  return;
92
93
  }
93
94
  var scrollLeft = Math.round(scrollRef.current.scrollLeft);
94
- var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
95
- if (!item.current || item.current.offsetLeft === undefined) {
96
- return;
97
- }
98
- var tabStartX = item.current.offsetLeft;
99
- return tabStartX < scrollLeft;
100
- });
95
+ var firstOverflowingTab = (0, _utils2.getFirstOverflowingTab)(refs.items.slice().reverse(), scrollLeft);
101
96
  firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
102
97
  block: 'nearest',
103
98
  inline: 'start'
@@ -109,13 +104,7 @@ var horizontalTabsRoot = exports.horizontalTabsRoot = function horizontalTabsRoo
109
104
  return;
110
105
  }
111
106
  var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
112
- var lastOverflowingTab = refs.items.find(function (item) {
113
- if (!item.current || item.current.offsetLeft === undefined) {
114
- return;
115
- }
116
- var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
117
- return tabEndX > scrollRight;
118
- });
107
+ var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollRight);
119
108
  lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
120
109
  block: 'nearest',
121
110
  inline: 'end'
@@ -190,18 +179,22 @@ var horizontalTabsRoot = exports.horizontalTabsRoot = function horizontalTabsRoo
190
179
  });
191
180
  }
192
181
  }, [index]);
193
- (0, _react.useEffect)(function () {
182
+ (0, _react.useLayoutEffect)(function () {
194
183
  var _scrollRef$current, _scrollRef$current2;
195
184
  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));
196
185
  }, []);
197
186
 
198
187
  // Этот хук компенсирует появление левой стрелки при прокрутке
199
- (0, _react.useEffect)(function () {
188
+ (0, _react.useLayoutEffect)(function () {
189
+ var _lastOverflowingTab$c2;
200
190
  if (firstItemVisible || !scrollRef.current || !leftArrowRef.current) {
201
191
  return;
202
192
  }
203
- scrollRef.current.scrollTo({
204
- left: Math.round(scrollRef.current.scrollLeft + leftArrowRef.current.clientWidth)
193
+ var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
194
+ var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollRight);
195
+ lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
196
+ block: 'nearest',
197
+ inline: 'end'
205
198
  });
206
199
  }, [firstItemVisible, scrollRef, leftArrowRef]);
207
200
  return /*#__PURE__*/_react["default"].createElement(_TabsContext.TabsContext.Provider, {
@@ -61,6 +61,16 @@ var verticalTabItemRoot = exports.verticalTabItemRoot = function verticalTabItem
61
61
  return refs.unregister(innerRef);
62
62
  };
63
63
  }, [refs]);
64
+ (0, _react.useLayoutEffect)(function () {
65
+ var _innerRef$current;
66
+ if (!selected) {
67
+ return;
68
+ }
69
+ (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
70
+ block: 'nearest',
71
+ inline: 'nearest'
72
+ });
73
+ }, [selected]);
64
74
  var onItemFocus = (0, _react.useCallback)(function (event) {
65
75
  if (disabled) {
66
76
  return;
@@ -85,10 +95,6 @@ var verticalTabItemRoot = exports.verticalTabItemRoot = function verticalTabItem
85
95
  refs.setCurrent(focusIndex);
86
96
  }, [refs, innerRef, onIndexChange, disabled]);
87
97
  var handleClick = function handleClick(event) {
88
- event.currentTarget.scrollIntoView({
89
- block: 'nearest',
90
- inline: 'nearest'
91
- });
92
98
  if (!onClick) {
93
99
  return;
94
100
  }
@@ -11,6 +11,7 @@ var _tokens = /*#__PURE__*/require("../../../tokens");
11
11
  var _utils = /*#__PURE__*/require("../../../../../utils");
12
12
  var _TabsContext = /*#__PURE__*/require("../../../TabsContext");
13
13
  var _Icon = /*#__PURE__*/require("../../../../_Icon");
14
+ var _utils2 = /*#__PURE__*/require("../../../utils");
14
15
  var _VerticalTabs = /*#__PURE__*/require("./VerticalTabs.styles");
15
16
  var _base = /*#__PURE__*/require("./variations/_size/base");
16
17
  var _base2 = /*#__PURE__*/require("./variations/_view/base");
@@ -78,13 +79,7 @@ var verticalTabsRoot = exports.verticalTabsRoot = function verticalTabsRoot(Root
78
79
  return;
79
80
  }
80
81
  var scrollTop = Math.round(scrollRef.current.scrollTop);
81
- var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
82
- if (!item.current || item.current.offsetTop === undefined) {
83
- return;
84
- }
85
- var tabStartY = item.current.offsetTop;
86
- return tabStartY < scrollTop;
87
- });
82
+ var firstOverflowingTab = (0, _utils2.getFirstOverflowingTab)(refs.items.slice().reverse(), scrollTop);
88
83
  firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
89
84
  block: 'start',
90
85
  inline: 'nearest'
@@ -96,13 +91,7 @@ var verticalTabsRoot = exports.verticalTabsRoot = function verticalTabsRoot(Root
96
91
  return;
97
92
  }
98
93
  var scrollBottom = Math.round(scrollRef.current.scrollTop + scrollRef.current.clientHeight);
99
- var lastOverflowingTab = refs.items.find(function (item) {
100
- if (!item.current || item.current.offsetTop === undefined) {
101
- return;
102
- }
103
- var tabEndY = item.current.offsetTop + item.current.offsetHeight;
104
- return tabEndY > scrollBottom;
105
- });
94
+ var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollBottom);
106
95
  lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
107
96
  block: 'end',
108
97
  inline: 'nearest'
@@ -168,18 +157,22 @@ var verticalTabsRoot = exports.verticalTabsRoot = function verticalTabsRoot(Root
168
157
  });
169
158
  }
170
159
  }, [index]);
171
- (0, _react.useEffect)(function () {
160
+ (0, _react.useLayoutEffect)(function () {
172
161
  var _scrollRef$current, _scrollRef$current2;
173
162
  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));
174
163
  }, []);
175
164
 
176
165
  // Этот хук компенсирует появление верхней стрелки при прокрутке
177
- (0, _react.useEffect)(function () {
166
+ (0, _react.useLayoutEffect)(function () {
167
+ var _lastOverflowingTab$c2;
178
168
  if (firstItemVisible || !scrollRef.current || !upArrowRef.current) {
179
169
  return;
180
170
  }
181
- scrollRef.current.scrollTo({
182
- top: Math.round(scrollRef.current.scrollTop + upArrowRef.current.clientHeight)
171
+ var scrollBottom = Math.round(scrollRef.current.scrollTop + scrollRef.current.clientHeight);
172
+ var lastOverflowingTab = (0, _utils2.getLastOverflowingTab)(refs.items, scrollBottom);
173
+ lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
174
+ block: 'end',
175
+ inline: 'nearest'
183
176
  });
184
177
  }, [firstItemVisible, scrollRef, upArrowRef]);
185
178
  return /*#__PURE__*/_react["default"].createElement(_TabsContext.TabsContext.Provider, {
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.getLastOverflowingTab = exports.getFirstOverflowingTab = void 0;
7
+ var getFirstOverflowingTab = exports.getFirstOverflowingTab = function getFirstOverflowingTab(items, maxScroll) {
8
+ return items.find(function (item) {
9
+ if (!item.current || item.current.offsetLeft === undefined) {
10
+ return;
11
+ }
12
+ var tabStartX = item.current.offsetLeft;
13
+ return tabStartX < maxScroll;
14
+ });
15
+ };
16
+ var getLastOverflowingTab = exports.getLastOverflowingTab = function getLastOverflowingTab(items, minScroll) {
17
+ return items.find(function (item) {
18
+ if (!item.current || item.current.offsetLeft === undefined) {
19
+ return;
20
+ }
21
+ var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
22
+ return tabEndX > minScroll;
23
+ });
24
+ };
@@ -97,18 +97,21 @@ export function App() {
97
97
  ```
98
98
 
99
99
  ### Пример с прокруткой
100
+ При выборе таба происходит прокрутка до выбранного таба.
100
101
 
101
102
  ```tsx live
102
103
  import React, { useState } from 'react';
103
- import { Tabs, TabItem } from '@salutejs/{{ package }}';
104
+ import { Tabs, TabItem, Button } from '@salutejs/plasma-web';
104
105
  import { IconClock } from '@salutejs/plasma-icons';
105
106
 
106
107
  export function App() {
107
108
  const items = Array(8).fill(0);
108
109
  const [index, setIndex] = useState(0);
109
110
 
111
+ const specificIndex = 6;
112
+
110
113
  return (
111
- <div>
114
+ <div style=\{{ display:'flex', flexDirection: 'column', gap: '1rem' }}>
112
115
  <Tabs view="divider" size="xs" style=\{{ width: '15rem' }}>
113
116
  {items.map((_, i) => (
114
117
  <TabItem
@@ -124,6 +127,8 @@ export function App() {
124
127
  </TabItem>
125
128
  ))}
126
129
  </Tabs>
130
+
131
+ <Button onClick={() => setIndex(specificIndex)}>{`Выбрать элемент ${specificIndex + 1}`}</Button>
127
132
  </div>
128
133
  );
129
134
  }
@@ -8,7 +8,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
8
8
  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); }
9
9
  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; }
10
10
  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; }
11
- import React, { forwardRef, useRef, useContext, useEffect, useCallback } from 'react';
11
+ import React, { forwardRef, useRef, useContext, useEffect, useCallback, useLayoutEffect } from 'react';
12
12
  import { useForkRef } from '@salutejs/plasma-core';
13
13
  import { classes } from '../../../tokens';
14
14
  import { cx } from '../../../../../utils';
@@ -62,6 +62,16 @@ export var horizontalTabItemRoot = function horizontalTabItemRoot(Root) {
62
62
  return refs.unregister(innerRef);
63
63
  };
64
64
  }, [refs]);
65
+ useLayoutEffect(function () {
66
+ var _innerRef$current;
67
+ if (!selected) {
68
+ return;
69
+ }
70
+ (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
71
+ block: 'nearest',
72
+ inline: 'nearest'
73
+ });
74
+ }, [selected]);
65
75
  var onItemFocus = useCallback(function (event) {
66
76
  if (disabled) {
67
77
  return;
@@ -87,10 +97,6 @@ export var horizontalTabItemRoot = function horizontalTabItemRoot(Root) {
87
97
  refs.setCurrent(focusIndex);
88
98
  }, [refs, innerRef, onIndexChange, disabled]);
89
99
  var handleClick = function handleClick(event) {
90
- event.currentTarget.scrollIntoView({
91
- block: 'nearest',
92
- inline: 'nearest'
93
- });
94
100
  if (!onClick) {
95
101
  return;
96
102
  }
@@ -8,12 +8,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
8
8
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
9
9
  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; }
10
10
  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; }
11
- import React, { forwardRef, useCallback, useMemo, useState, useEffect, useRef } from 'react';
11
+ import React, { forwardRef, useCallback, useMemo, useState, useRef, useLayoutEffect } from 'react';
12
12
  import { safeUseId } from '@salutejs/plasma-core';
13
13
  import { IconDisclosureLeft, IconDisclosureRight } from '../../../../_Icon';
14
14
  import { classes } from '../../../tokens';
15
15
  import { cx } from '../../../../../utils';
16
16
  import { TabItemRefs, TabsContext } from '../../../TabsContext';
17
+ import { getFirstOverflowingTab, getLastOverflowingTab } from '../../../utils';
17
18
  import { base as sizeCSS } from './variations/_size/base';
18
19
  import { base as viewCSS } from './variations/_view/base';
19
20
  import { base as disabledCSS } from './variations/_disabled/base';
@@ -82,13 +83,7 @@ export var horizontalTabsRoot = function horizontalTabsRoot(Root) {
82
83
  return;
83
84
  }
84
85
  var scrollLeft = Math.round(scrollRef.current.scrollLeft);
85
- var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
86
- if (!item.current || item.current.offsetLeft === undefined) {
87
- return;
88
- }
89
- var tabStartX = item.current.offsetLeft;
90
- return tabStartX < scrollLeft;
91
- });
86
+ var firstOverflowingTab = getFirstOverflowingTab(refs.items.slice().reverse(), scrollLeft);
92
87
  firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
93
88
  block: 'nearest',
94
89
  inline: 'start'
@@ -100,13 +95,7 @@ export var horizontalTabsRoot = function horizontalTabsRoot(Root) {
100
95
  return;
101
96
  }
102
97
  var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
103
- var lastOverflowingTab = refs.items.find(function (item) {
104
- if (!item.current || item.current.offsetLeft === undefined) {
105
- return;
106
- }
107
- var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
108
- return tabEndX > scrollRight;
109
- });
98
+ var lastOverflowingTab = getLastOverflowingTab(refs.items, scrollRight);
110
99
  lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
111
100
  block: 'nearest',
112
101
  inline: 'end'
@@ -181,18 +170,22 @@ export var horizontalTabsRoot = function horizontalTabsRoot(Root) {
181
170
  });
182
171
  }
183
172
  }, [index]);
184
- useEffect(function () {
173
+ useLayoutEffect(function () {
185
174
  var _scrollRef$current, _scrollRef$current2;
186
175
  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));
187
176
  }, []);
188
177
 
189
178
  // Этот хук компенсирует появление левой стрелки при прокрутке
190
- useEffect(function () {
179
+ useLayoutEffect(function () {
180
+ var _lastOverflowingTab$c2;
191
181
  if (firstItemVisible || !scrollRef.current || !leftArrowRef.current) {
192
182
  return;
193
183
  }
194
- scrollRef.current.scrollTo({
195
- left: Math.round(scrollRef.current.scrollLeft + leftArrowRef.current.clientWidth)
184
+ var scrollRight = Math.round(scrollRef.current.scrollLeft + scrollRef.current.clientWidth);
185
+ var lastOverflowingTab = getLastOverflowingTab(refs.items, scrollRight);
186
+ lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
187
+ block: 'nearest',
188
+ inline: 'end'
196
189
  });
197
190
  }, [firstItemVisible, scrollRef, leftArrowRef]);
198
191
  return /*#__PURE__*/React.createElement(TabsContext.Provider, {
@@ -8,7 +8,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
8
8
  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); }
9
9
  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; }
10
10
  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; }
11
- import React, { forwardRef, useRef, useContext, useEffect, useCallback } from 'react';
11
+ import React, { forwardRef, useRef, useContext, useEffect, useCallback, useLayoutEffect } from 'react';
12
12
  import { useForkRef } from '@salutejs/plasma-core';
13
13
  import { classes } from '../../../tokens';
14
14
  import { cx } from '../../../../../utils';
@@ -53,6 +53,16 @@ export var verticalTabItemRoot = function verticalTabItemRoot(Root) {
53
53
  return refs.unregister(innerRef);
54
54
  };
55
55
  }, [refs]);
56
+ useLayoutEffect(function () {
57
+ var _innerRef$current;
58
+ if (!selected) {
59
+ return;
60
+ }
61
+ (_innerRef$current = innerRef.current) === null || _innerRef$current === void 0 || _innerRef$current.scrollIntoView({
62
+ block: 'nearest',
63
+ inline: 'nearest'
64
+ });
65
+ }, [selected]);
56
66
  var onItemFocus = useCallback(function (event) {
57
67
  if (disabled) {
58
68
  return;
@@ -77,10 +87,6 @@ export var verticalTabItemRoot = function verticalTabItemRoot(Root) {
77
87
  refs.setCurrent(focusIndex);
78
88
  }, [refs, innerRef, onIndexChange, disabled]);
79
89
  var handleClick = function handleClick(event) {
80
- event.currentTarget.scrollIntoView({
81
- block: 'nearest',
82
- inline: 'nearest'
83
- });
84
90
  if (!onClick) {
85
91
  return;
86
92
  }
@@ -9,12 +9,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
9
9
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
10
10
  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; }
11
11
  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; }
12
- import React, { forwardRef, useCallback, useMemo, useState, useEffect, useRef } from 'react';
12
+ import React, { forwardRef, useCallback, useMemo, useState, useLayoutEffect, useRef } from 'react';
13
13
  import { safeUseId } from '@salutejs/plasma-core';
14
14
  import { classes } from '../../../tokens';
15
15
  import { cx } from '../../../../../utils';
16
16
  import { TabItemRefs, TabsContext } from '../../../TabsContext';
17
17
  import { IconDisclosureLeft, IconDisclosureRight } from '../../../../_Icon';
18
+ import { getFirstOverflowingTab, getLastOverflowingTab } from '../../../utils';
18
19
  import { base, StyledArrow, StyledContent, StyledContentWrapper } from './VerticalTabs.styles';
19
20
  import { base as sizeCSS } from './variations/_size/base';
20
21
  import { base as viewCSS } from './variations/_view/base';
@@ -69,13 +70,7 @@ export var verticalTabsRoot = function verticalTabsRoot(Root) {
69
70
  return;
70
71
  }
71
72
  var scrollTop = Math.round(scrollRef.current.scrollTop);
72
- var firstOverflowingTab = refs.items.slice().reverse().find(function (item) {
73
- if (!item.current || item.current.offsetTop === undefined) {
74
- return;
75
- }
76
- var tabStartY = item.current.offsetTop;
77
- return tabStartY < scrollTop;
78
- });
73
+ var firstOverflowingTab = getFirstOverflowingTab(refs.items.slice().reverse(), scrollTop);
79
74
  firstOverflowingTab === null || firstOverflowingTab === void 0 || (_firstOverflowingTab$ = firstOverflowingTab.current) === null || _firstOverflowingTab$ === void 0 || _firstOverflowingTab$.scrollIntoView({
80
75
  block: 'start',
81
76
  inline: 'nearest'
@@ -87,13 +82,7 @@ export var verticalTabsRoot = function verticalTabsRoot(Root) {
87
82
  return;
88
83
  }
89
84
  var scrollBottom = Math.round(scrollRef.current.scrollTop + scrollRef.current.clientHeight);
90
- var lastOverflowingTab = refs.items.find(function (item) {
91
- if (!item.current || item.current.offsetTop === undefined) {
92
- return;
93
- }
94
- var tabEndY = item.current.offsetTop + item.current.offsetHeight;
95
- return tabEndY > scrollBottom;
96
- });
85
+ var lastOverflowingTab = getLastOverflowingTab(refs.items, scrollBottom);
97
86
  lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c = lastOverflowingTab.current) === null || _lastOverflowingTab$c === void 0 || _lastOverflowingTab$c.scrollIntoView({
98
87
  block: 'end',
99
88
  inline: 'nearest'
@@ -159,18 +148,22 @@ export var verticalTabsRoot = function verticalTabsRoot(Root) {
159
148
  });
160
149
  }
161
150
  }, [index]);
162
- useEffect(function () {
151
+ useLayoutEffect(function () {
163
152
  var _scrollRef$current, _scrollRef$current2;
164
153
  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));
165
154
  }, []);
166
155
 
167
156
  // Этот хук компенсирует появление верхней стрелки при прокрутке
168
- useEffect(function () {
157
+ useLayoutEffect(function () {
158
+ var _lastOverflowingTab$c2;
169
159
  if (firstItemVisible || !scrollRef.current || !upArrowRef.current) {
170
160
  return;
171
161
  }
172
- scrollRef.current.scrollTo({
173
- top: Math.round(scrollRef.current.scrollTop + upArrowRef.current.clientHeight)
162
+ var scrollBottom = Math.round(scrollRef.current.scrollTop + scrollRef.current.clientHeight);
163
+ var lastOverflowingTab = getLastOverflowingTab(refs.items, scrollBottom);
164
+ lastOverflowingTab === null || lastOverflowingTab === void 0 || (_lastOverflowingTab$c2 = lastOverflowingTab.current) === null || _lastOverflowingTab$c2 === void 0 || _lastOverflowingTab$c2.scrollIntoView({
165
+ block: 'end',
166
+ inline: 'nearest'
174
167
  });
175
168
  }, [firstItemVisible, scrollRef, upArrowRef]);
176
169
  return /*#__PURE__*/React.createElement(TabsContext.Provider, {
@@ -0,0 +1,18 @@
1
+ export var getFirstOverflowingTab = function getFirstOverflowingTab(items, maxScroll) {
2
+ return items.find(function (item) {
3
+ if (!item.current || item.current.offsetLeft === undefined) {
4
+ return;
5
+ }
6
+ var tabStartX = item.current.offsetLeft;
7
+ return tabStartX < maxScroll;
8
+ });
9
+ };
10
+ export var getLastOverflowingTab = function getLastOverflowingTab(items, minScroll) {
11
+ return items.find(function (item) {
12
+ if (!item.current || item.current.offsetLeft === undefined) {
13
+ return;
14
+ }
15
+ var tabEndX = item.current.offsetLeft + item.current.offsetWidth;
16
+ return tabEndX > minScroll;
17
+ });
18
+ };
@@ -1 +1 @@
1
- {"version":3,"file":"HorizontalTabItem.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiE,MAAM,OAAO,CAAC;AAGtF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAQhE,eAAO,MAAM,qBAAqB,SAAU,UAAU,cAAc,EAAE,sBAAsB,CAAC,kGAuHvF,CAAC;AAEP,eAAO,MAAM,uBAAuB;;;mBAzHQ,UAAU,cAAc,EAAE,sBAAsB,CAAC;;;;;;;;;;;;;;;;;;;;CAgJ5F,CAAC"}
1
+ {"version":3,"file":"HorizontalTabItem.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/horizontal/HorizontalTabItem/HorizontalTabItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkF,MAAM,OAAO,CAAC;AAGvG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAQhE,eAAO,MAAM,qBAAqB,SAAU,UAAU,cAAc,EAAE,sBAAsB,CAAC,kGA6HvF,CAAC;AAEP,eAAO,MAAM,uBAAuB;;;mBA/HQ,UAAU,cAAc,EAAE,sBAAsB,CAAC;;;;;;;;;;;;;;;;;;;;CAsJ5F,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"HorizontalTabs.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuF,MAAM,OAAO,CAAC;AAI5G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAK9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAqB/D,eAAO,MAAM,kBAAkB,SAAU,UAAU,cAAc,EAAE,mBAAmB,CAAC,+FAuNjF,CAAC;AAEP,eAAO,MAAM,oBAAoB;;;mBAzNQ,UAAU,cAAc,EAAE,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;CAqPtF,CAAC"}
1
+ {"version":3,"file":"HorizontalTabs.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/horizontal/HorizontalTabs/HorizontalTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6F,MAAM,OAAO,CAAC;AAIlH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAK9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAsB/D,eAAO,MAAM,kBAAkB,SAAU,UAAU,cAAc,EAAE,mBAAmB,CAAC,+FAuMjF,CAAC;AAEP,eAAO,MAAM,oBAAoB;;;mBAzMQ,UAAU,cAAc,EAAE,mBAAmB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;CAqOtF,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"VerticalTabItem.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiE,MAAM,OAAO,CAAC;AAGtF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAO9D,eAAO,MAAM,mBAAmB,SAAU,UAAU,iBAAiB,EAAE,oBAAoB,CAAC,mGA8GtF,CAAC;AAEP,eAAO,MAAM,qBAAqB;;;mBAhHQ,UAAU,iBAAiB,EAAE,oBAAoB,CAAC;;;;;;;;;;;;;;;;;CAoI3F,CAAC"}
1
+ {"version":3,"file":"VerticalTabItem.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/vertical/VerticalTabItem/VerticalTabItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkF,MAAM,OAAO,CAAC;AAGvG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAO9D,eAAO,MAAM,mBAAmB,SAAU,UAAU,iBAAiB,EAAE,oBAAoB,CAAC,mGAoHtF,CAAC;AAEP,eAAO,MAAM,qBAAqB;;;mBAtHQ,UAAU,iBAAiB,EAAE,oBAAoB,CAAC;;;;;;;;;;;;;;;;;CA0I3F,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"VerticalTabs.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuF,MAAM,OAAO,CAAC;AAI5G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAgB7D,eAAO,MAAM,gBAAgB,SAAU,UAAU,cAAc,EAAE,iBAAiB,CAAC,+KAiM7E,CAAC;AAEP,eAAO,MAAM,kBAAkB;;;mBAnMQ,UAAU,cAAc,EAAE,iBAAiB,CAAC;;;;;;;;;;;;;;;;;;CAwNlF,CAAC"}
1
+ {"version":3,"file":"VerticalTabs.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Tabs/ui/vertical/VerticalTabs/VerticalTabs.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6F,MAAM,OAAO,CAAC;AAIlH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAI9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAiB7D,eAAO,MAAM,gBAAgB,SAAU,UAAU,cAAc,EAAE,iBAAiB,CAAC,+KAiL7E,CAAC;AAEP,eAAO,MAAM,kBAAkB;;;mBAnLQ,UAAU,cAAc,EAAE,iBAAiB,CAAC;;;;;;;;;;;;;;;;;;CAwMlF,CAAC"}
@@ -0,0 +1,4 @@
1
+ import { MutableRefObject } from 'react';
2
+ export declare const getFirstOverflowingTab: (items: MutableRefObject<HTMLElement | null>[], maxScroll: number) => MutableRefObject<HTMLElement | null> | undefined;
3
+ export declare const getLastOverflowingTab: (items: MutableRefObject<HTMLElement | null>[], minScroll: number) => MutableRefObject<HTMLElement | null> | undefined;
4
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/Tabs/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAEzC,eAAO,MAAM,sBAAsB,UAAW,iBAAiB,WAAW,GAAG,IAAI,CAAC,EAAE,aAAa,MAAM,qDAStG,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,iBAAiB,WAAW,GAAG,IAAI,CAAC,EAAE,aAAa,MAAM,qDASrG,CAAC"}