@salutejs/plasma-new-hope 0.119.0-canary.1347.10280706154.0 → 0.119.0-dev.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (117) hide show
  1. package/cjs/components/Accordion/Accordion.tokens.js +1 -0
  2. package/cjs/components/Accordion/Accordion.tokens.js.map +1 -1
  3. package/cjs/components/Accordion/ui/AccordionItem/AccordionItem.styles.js +2 -2
  4. package/cjs/components/Accordion/ui/AccordionItem/AccordionItem.styles.js.map +1 -1
  5. package/cjs/components/Autocomplete/Autocomplete.js +3 -12
  6. package/cjs/components/Autocomplete/Autocomplete.js.map +1 -1
  7. package/cjs/components/Modal/Modal.js +3 -1
  8. package/cjs/components/Modal/Modal.js.map +1 -1
  9. package/cjs/hooks/useFocusTrap.js +97 -0
  10. package/cjs/hooks/useFocusTrap.js.map +1 -0
  11. package/cjs/index.js +2 -0
  12. package/cjs/index.js.map +1 -1
  13. package/cjs/utils/focusManager.js +56 -0
  14. package/cjs/utils/focusManager.js.map +1 -0
  15. package/cjs/utils/scopeTab.js +37 -0
  16. package/cjs/utils/scopeTab.js.map +1 -0
  17. package/cjs/utils/tabbable.js +51 -0
  18. package/cjs/utils/tabbable.js.map +1 -0
  19. package/emotion/cjs/components/Accordion/Accordion.tokens.js +1 -0
  20. package/emotion/cjs/components/Accordion/ui/AccordionItem/AccordionItem.styles.js +2 -2
  21. package/emotion/cjs/components/Autocomplete/Autocomplete.js +3 -12
  22. package/emotion/cjs/components/Modal/Modal.js +4 -3
  23. package/emotion/cjs/examples/plasma_b2c/components/Accordion/Accordion.config.js +6 -6
  24. package/emotion/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  25. package/emotion/cjs/examples/plasma_web/components/Accordion/Accordion.config.js +8 -8
  26. package/emotion/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  27. package/emotion/cjs/hooks/index.js +7 -0
  28. package/emotion/cjs/hooks/useFocusTrap.js +95 -0
  29. package/emotion/cjs/utils/focusManager.js +60 -0
  30. package/emotion/cjs/utils/scopeTab.js +35 -0
  31. package/emotion/cjs/utils/tabbable.js +46 -0
  32. package/emotion/cjs/utils/useFocusTrap.js +95 -0
  33. package/emotion/es/components/Accordion/Accordion.tokens.js +1 -0
  34. package/emotion/es/components/Accordion/ui/AccordionItem/AccordionItem.styles.js +2 -2
  35. package/emotion/es/components/Autocomplete/Autocomplete.js +3 -12
  36. package/emotion/es/components/Modal/Modal.js +3 -2
  37. package/emotion/es/examples/plasma_b2c/components/Accordion/Accordion.config.js +6 -6
  38. package/emotion/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  39. package/emotion/es/examples/plasma_web/components/Accordion/Accordion.config.js +8 -8
  40. package/emotion/es/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  41. package/emotion/es/hooks/index.js +1 -0
  42. package/emotion/es/hooks/useFocusTrap.js +90 -0
  43. package/emotion/es/utils/focusManager.js +55 -0
  44. package/emotion/es/utils/scopeTab.js +30 -0
  45. package/emotion/es/utils/tabbable.js +40 -0
  46. package/emotion/es/utils/useFocusTrap.js +90 -0
  47. package/es/components/Accordion/Accordion.tokens.js +1 -0
  48. package/es/components/Accordion/Accordion.tokens.js.map +1 -1
  49. package/es/components/Accordion/ui/AccordionItem/AccordionItem.styles.js +2 -2
  50. package/es/components/Accordion/ui/AccordionItem/AccordionItem.styles.js.map +1 -1
  51. package/es/components/Autocomplete/Autocomplete.js +3 -12
  52. package/es/components/Autocomplete/Autocomplete.js.map +1 -1
  53. package/es/components/Modal/Modal.js +4 -2
  54. package/es/components/Modal/Modal.js.map +1 -1
  55. package/es/hooks/useFocusTrap.js +93 -0
  56. package/es/hooks/useFocusTrap.js.map +1 -0
  57. package/es/index.js +1 -0
  58. package/es/index.js.map +1 -1
  59. package/es/utils/focusManager.js +52 -0
  60. package/es/utils/focusManager.js.map +1 -0
  61. package/es/utils/scopeTab.js +33 -0
  62. package/es/utils/scopeTab.js.map +1 -0
  63. package/es/utils/tabbable.js +43 -0
  64. package/es/utils/tabbable.js.map +1 -0
  65. package/package.json +4 -4
  66. package/styled-components/cjs/components/Accordion/Accordion.tokens.js +1 -0
  67. package/styled-components/cjs/components/Accordion/ui/AccordionItem/AccordionItem.styles.js +2 -2
  68. package/styled-components/cjs/components/Autocomplete/Autocomplete.js +3 -12
  69. package/styled-components/cjs/components/Modal/Modal.js +4 -3
  70. package/styled-components/cjs/examples/plasma_b2c/components/Accordion/Accordion.config.js +2 -2
  71. package/styled-components/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  72. package/styled-components/cjs/examples/plasma_web/components/Accordion/Accordion.config.js +2 -2
  73. package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  74. package/styled-components/cjs/hooks/index.js +7 -0
  75. package/styled-components/cjs/hooks/useFocusTrap.js +95 -0
  76. package/styled-components/cjs/utils/focusManager.js +60 -0
  77. package/styled-components/cjs/utils/scopeTab.js +35 -0
  78. package/styled-components/cjs/utils/tabbable.js +46 -0
  79. package/styled-components/cjs/utils/useFocusTrap.js +95 -0
  80. package/styled-components/es/components/Accordion/Accordion.tokens.js +1 -0
  81. package/styled-components/es/components/Accordion/ui/AccordionItem/AccordionItem.styles.js +2 -2
  82. package/styled-components/es/components/Autocomplete/Autocomplete.js +3 -12
  83. package/styled-components/es/components/Modal/Modal.js +3 -2
  84. package/styled-components/es/examples/plasma_b2c/components/Accordion/Accordion.config.js +2 -2
  85. package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +113 -1
  86. package/styled-components/es/examples/plasma_web/components/Accordion/Accordion.config.js +2 -2
  87. package/styled-components/es/examples/plasma_web/components/Modal/Modal.stories.tsx +113 -1
  88. package/styled-components/es/hooks/index.js +1 -0
  89. package/styled-components/es/hooks/useFocusTrap.js +90 -0
  90. package/styled-components/es/utils/focusManager.js +55 -0
  91. package/styled-components/es/utils/scopeTab.js +30 -0
  92. package/styled-components/es/utils/tabbable.js +40 -0
  93. package/styled-components/es/utils/useFocusTrap.js +90 -0
  94. package/types/components/Accordion/Accordion.tokens.d.ts +1 -0
  95. package/types/components/Accordion/Accordion.tokens.d.ts.map +1 -1
  96. package/types/components/Autocomplete/Autocomplete.d.ts.map +1 -1
  97. package/types/components/Autocomplete/Autocomplete.types.d.ts +0 -4
  98. package/types/components/Autocomplete/Autocomplete.types.d.ts.map +1 -1
  99. package/types/components/Modal/Modal.d.ts.map +1 -1
  100. package/types/examples/plasma_b2c/components/Accordion/Accordion.config.d.ts.map +1 -1
  101. package/types/examples/plasma_web/components/Accordion/Accordion.config.d.ts.map +1 -1
  102. package/types/hooks/index.d.ts +1 -0
  103. package/types/hooks/index.d.ts.map +1 -1
  104. package/types/hooks/useFocusTrap.d.ts +6 -0
  105. package/types/hooks/useFocusTrap.d.ts.map +1 -0
  106. package/types/utils/focusManager.d.ts +15 -0
  107. package/types/utils/focusManager.d.ts.map +1 -0
  108. package/types/utils/scopeTab.d.ts +7 -0
  109. package/types/utils/scopeTab.d.ts.map +1 -0
  110. package/types/utils/tabbable.d.ts +6 -0
  111. package/types/utils/tabbable.d.ts.map +1 -0
  112. package/types/utils/useFocusTrap.d.ts +6 -0
  113. package/types/utils/useFocusTrap.d.ts.map +1 -0
  114. package/emotion/cjs/components/Autocomplete/Autocomplete.template-doc.mdx +0 -561
  115. package/emotion/es/components/Autocomplete/Autocomplete.template-doc.mdx +0 -561
  116. package/styled-components/cjs/components/Autocomplete/Autocomplete.template-doc.mdx +0 -561
  117. package/styled-components/es/components/Autocomplete/Autocomplete.template-doc.mdx +0 -561
@@ -1,4 +1,4 @@
1
- var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch"];
1
+ var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch"];
2
2
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
3
3
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
4
4
  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."); }
@@ -39,7 +39,6 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
39
39
  onScroll = _ref.onScroll,
40
40
  listMaxHeight = _ref.listMaxHeight,
41
41
  listWidth = _ref.listWidth,
42
- portal = _ref.portal,
43
42
  filter = _ref.filter,
44
43
  onSuggestionSelect = _ref.onSuggestionSelect,
45
44
  _ref$threshold = _ref.threshold,
@@ -120,8 +119,6 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
120
119
  offset: [0, 0],
121
120
  placement: getPlacements('bottom'),
122
121
  isFocusTrapped: false,
123
- usePortal: Boolean(portal),
124
- frame: portal,
125
122
  target: /*#__PURE__*/React.createElement(StyledTextField, _extends({
126
123
  value: value,
127
124
  onChange: handleChange,
@@ -149,13 +146,7 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
149
146
  preventOverflow: false,
150
147
  ref: targetRef,
151
148
  listWidth: listWidth
152
- }, renderList && renderList(finalResults) || Boolean(finalResults.length) && /*#__PURE__*/React.createElement(Root, {
153
- view: view,
154
- size: size,
155
- labelPlacement: labelPlacement,
156
- disabled: disabled,
157
- readOnly: readOnly
158
- }, /*#__PURE__*/React.createElement(Ul, {
149
+ }, renderList && renderList(finalResults) || Boolean(finalResults.length) && /*#__PURE__*/React.createElement(Ul, {
159
150
  id: listId,
160
151
  role: "listbox",
161
152
  "aria-label": label,
@@ -169,7 +160,7 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
169
160
  id: "".concat(listId, "/").concat(index),
170
161
  focused: focused === index
171
162
  });
172
- }), renderListEnd && /*#__PURE__*/React.createElement(InfiniteLoaderWrapper, null, renderListEnd())))), leftHelper && /*#__PURE__*/React.createElement(LeftHelper, {
163
+ }), renderListEnd && /*#__PURE__*/React.createElement(InfiniteLoaderWrapper, null, renderListEnd()))), leftHelper && /*#__PURE__*/React.createElement(LeftHelper, {
173
164
  id: helperTextId,
174
165
  disabled: disabled,
175
166
  readOnly: readOnly
@@ -3,11 +3,12 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
3
3
  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; }
4
4
  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; }
5
5
  import React, { forwardRef, useCallback, useMemo } from 'react';
6
- import { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';
6
+ import { useForkRef, safeUseId } from '@salutejs/plasma-core';
7
7
  import { component } from '../../engines';
8
8
  import { popupConfig, usePopupContext } from '../Popup';
9
9
  import { Overlay } from '../Overlay';
10
10
  import { DEFAULT_Z_INDEX } from '../Popup/utils';
11
+ import { useFocusTrap } from '../../hooks';
11
12
  import { classes, tokens } from './Modal.tokens';
12
13
  import { useModal } from './hooks';
13
14
  import { base as viewCSS } from './variations/_view/base';
@@ -40,7 +41,7 @@ export var modalRoot = function modalRoot(Root) {
40
41
  view = _ref.view,
41
42
  isOpen = _ref.isOpen,
42
43
  rest = _objectWithoutProperties(_ref, _excluded);
43
- var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);
44
+ var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
44
45
  var popupController = usePopupContext();
45
46
  var innerRef = useForkRef(trapRef, outerRootRef);
46
47
  var uniqId = safeUseId();
@@ -7,8 +7,8 @@ export var config = {
7
7
  },
8
8
  variations: {
9
9
  view: {
10
- "default": /*#__PURE__*/css(["", ":0.125rem;", ":20rem;", ":var(", ") var(", ");", ":var(--surface-solid-card);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":var(--surface-clear);", ":none;", ":0;", ":var(", ");"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemPaddingHorizontal, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemFocus, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft, accordionTokens.accordionItemPaddingHorizontal),
11
- clear: /*#__PURE__*/css(["", ":0;", ":20rem;", ":var(", ") 0rem;", ":var(--surface-clear);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":0rem !important;", ":var(--surface-clear);", ":none;", ":0.125rem solid var(--surface-solid-tertiary);", ":0;"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemFocus, accordionTokens.accordionItemBorderRadius, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft)
10
+ "default": /*#__PURE__*/css(["", ":0.125rem;", ":20rem;", ":var(", ") var(", ");", ":var(--surface-solid-card);", ":var(--text-primary);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":var(--surface-clear);", ":none;", ":0;", ":var(", ");"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemPaddingHorizontal, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemIconColor, accordionTokens.accordionItemFocus, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft, accordionTokens.accordionItemPaddingHorizontal),
11
+ clear: /*#__PURE__*/css(["", ":0;", ":20rem;", ":var(", ") 0rem;", ":var(--surface-clear);", ":var(--text-primary);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":0rem !important;", ":var(--surface-clear);", ":none;", ":0.125rem solid var(--surface-solid-tertiary);", ":0;"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemIconColor, accordionTokens.accordionItemFocus, accordionTokens.accordionItemBorderRadius, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft)
12
12
  },
13
13
  size: {
14
14
  l: /*#__PURE__*/css(["", ":1.0625rem;", ":1.25rem;", ":0.5rem;", ":0.875rem;", ":var(--plasma-typo-body-l-font-family);", ":var(--plasma-typo-body-l-font-size);", ":var(--plasma-typo-body-l-font-style);", ":var(--plasma-typo-body-l-bold-font-weight);", ":var(--plasma-typo-body-l-letter-spacing);", ":var(--plasma-typo-body-l-line-height);", ":var(--plasma-typo-body-l-font-family);", ":var(--plasma-typo-body-l-font-size);", ":var(--plasma-typo-body-l-font-style);", ":var(--plasma-typo-body-l-font-weight);", ":var(--plasma-typo-body-l-letter-spacing);", ":var(--plasma-typo-body-l-line-height);"], accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemPaddingHorizontal, accordionTokens.accordionItemGap, accordionTokens.accordionItemBorderRadius, accordionTokens.accordionItemTitleFontFamily, accordionTokens.accordionItemTitleFontSize, accordionTokens.accordionItemTitleFontStyle, accordionTokens.accordionItemTitleFontWeight, accordionTokens.accordionItemTitleLetterSpacing, accordionTokens.accordionItemTitleLineHeight, accordionTokens.accordionItemTextFontFamily, accordionTokens.accordionItemTextFontSize, accordionTokens.accordionItemTextFontStyle, accordionTokens.accordionItemTextFontWeight, accordionTokens.accordionItemTextLetterSpacing, accordionTokens.accordionItemTextLineHeight),
@@ -1,4 +1,4 @@
1
- import React, { useState } from 'react';
1
+ import React, { useCallback, useRef, useState } from 'react';
2
2
  import styled from 'styled-components';
3
3
  import type { ComponentProps } from 'react';
4
4
  import type { StoryObj, Meta } from '@storybook/react';
@@ -6,6 +6,7 @@ import { SSRProvider } from '@salutejs/plasma-core';
6
6
 
7
7
  import { PopupProvider, popupClasses } from '../Popup/Popup';
8
8
  import { Button } from '../Button/Button';
9
+ import { TextField } from '../TextField/TextField';
9
10
  import { WithTheme } from '../../../_helpers';
10
11
 
11
12
  import { Modal, modalClasses } from './Modal';
@@ -206,3 +207,114 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
206
207
  },
207
208
  render: (args) => <StoryModalDemo {...args} />,
208
209
  };
210
+
211
+ const StyledModalAnimation = styled(Modal)`
212
+ /* stylelint-disable */
213
+ && .${popupClasses.root} {
214
+ animation: fadeIn 1s forwards;
215
+ }
216
+
217
+ &&.${popupClasses.endAnimation} .${popupClasses.root} {
218
+ animation: fadeOut 1s forwards;
219
+ }
220
+
221
+ && .${modalClasses.overlay} {
222
+ animation: overlayFadeIn 1s forwards;
223
+ }
224
+
225
+ &&.${popupClasses.endAnimation} .${modalClasses.overlay} {
226
+ animation: overlayFadeOut 1s forwards;
227
+ }
228
+ /* stylelint-enable */
229
+
230
+ @keyframes overlayFadeIn {
231
+ from {
232
+ opacity: 0;
233
+ }
234
+
235
+ to {
236
+ opacity: 1;
237
+ }
238
+ }
239
+
240
+ @keyframes overlayFadeOut {
241
+ from {
242
+ opacity: 1;
243
+ }
244
+
245
+ to {
246
+ opacity: 0;
247
+ }
248
+ }
249
+
250
+ @keyframes fadeIn {
251
+ from {
252
+ opacity: 0;
253
+ transform: translate(-50%, 100%);
254
+ }
255
+
256
+ to {
257
+ opacity: 1;
258
+ transform: translate(-50%, -50%);
259
+ }
260
+ }
261
+
262
+ @keyframes fadeOut {
263
+ from {
264
+ opacity: 1;
265
+ transform: translate(-50%, -50%);
266
+ }
267
+
268
+ to {
269
+ opacity: 0;
270
+ transform: translate(-50%, 100%);
271
+ }
272
+ }
273
+ `;
274
+
275
+ const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
276
+ const ref = useRef(null);
277
+ const [isOpen, setIsOpen] = useState(false);
278
+
279
+ const close = useCallback(() => {
280
+ setIsOpen(false);
281
+ }, []);
282
+
283
+ return (
284
+ <SSRProvider>
285
+ <PopupProvider>
286
+ <Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
287
+ <StyledModalAnimation
288
+ id="modal"
289
+ frame="theme-root"
290
+ withAnimation
291
+ onClose={() => setIsOpen(false)}
292
+ isOpen={isOpen}
293
+ placement={placement}
294
+ offset={[offsetX, offsetY]}
295
+ initialFocusRef={ref}
296
+ {...rest}
297
+ >
298
+ <Content>
299
+ <TextField value="Text" onChange={() => {}} />
300
+ <TextField ref={ref} value="Text2" onChange={() => {}} />
301
+ <Button text="Закрыть" onClick={close} />
302
+ </Content>
303
+ </StyledModalAnimation>
304
+ </PopupProvider>
305
+ </SSRProvider>
306
+ );
307
+ };
308
+
309
+ export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
310
+ args: {
311
+ placement: 'bottom',
312
+ withAnimation: true,
313
+ withBlur: false,
314
+ closeOnEsc: true,
315
+ closeOnOverlayClick: true,
316
+ offsetX: 0,
317
+ offsetY: 0,
318
+ },
319
+ render: (args) => <StoryModalAnimationDemo {...args} />,
320
+ };
@@ -7,8 +7,8 @@ export var config = {
7
7
  },
8
8
  variations: {
9
9
  view: {
10
- "default": /*#__PURE__*/css(["", ":0.125rem;", ":20rem;", ":var(", ") var(", ");", ":var(--surface-solid-card);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":var(--surface-clear);", ":none;", ":0;", ":var(", ");"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemPaddingHorizontal, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemFocus, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft, accordionTokens.accordionItemPaddingHorizontal),
11
- clear: /*#__PURE__*/css(["", ":0.125rem;", ":20rem;", ":var(", ") 0rem;", ":var(--surface-clear);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":0rem !important;", ":var(--surface-clear);", ":none;", ":0.125rem solid var(--surface-solid-tertiary);", ":0;"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemFocus, accordionTokens.accordionItemBorderRadius, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft)
10
+ "default": /*#__PURE__*/css(["", ":0.125rem;", ":20rem;", ":var(", ") var(", ");", ":var(--surface-solid-card);", ":var(--text-primary);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":var(--surface-clear);", ":none;", ":0;", ":var(", ");"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemPaddingHorizontal, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemIconColor, accordionTokens.accordionItemFocus, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft, accordionTokens.accordionItemPaddingHorizontal),
11
+ clear: /*#__PURE__*/css(["", ":0.125rem;", ":20rem;", ":var(", ") 0rem;", ":var(--surface-clear);", ":var(--text-primary);", ":var(--text-primary);", ":var(--text-primary);", ":var(--surface-accent);", ":0rem !important;", ":var(--surface-clear);", ":none;", ":0.125rem solid var(--surface-solid-tertiary);", ":0;"], accordionTokens.accordionGap, accordionTokens.accordionWidth, accordionTokens.accordionItemPadding, accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemBackground, accordionTokens.accordionItemTitleColor, accordionTokens.accordionItemTextColor, accordionTokens.accordionItemIconColor, accordionTokens.accordionItemFocus, accordionTokens.accordionItemBorderRadius, accordionTokens.accordionBackground, accordionTokens.accordionItemBorder, accordionTokens.accordionItemBorderBottom, accordionTokens.accordionItemPaddingHorizontalLeft)
12
12
  },
13
13
  size: {
14
14
  l: /*#__PURE__*/css(["", ":1.0625rem;", ":1.25rem;", ":0.5rem;", ":0.875rem;", ":var(--plasma-typo-body-l-font-family);", ":var(--plasma-typo-body-l-font-size);", ":var(--plasma-typo-body-l-font-style);", ":var(--plasma-typo-body-l-bold-font-weight);", ":var(--plasma-typo-body-l-letter-spacing);", ":var(--plasma-typo-body-l-line-height);", ":var(--plasma-typo-body-l-font-family);", ":var(--plasma-typo-body-l-font-size);", ":var(--plasma-typo-body-l-font-style);", ":var(--plasma-typo-body-l-font-weight);", ":var(--plasma-typo-body-l-letter-spacing);", ":var(--plasma-typo-body-l-line-height);"], accordionTokens.accordionItemPaddingVertical, accordionTokens.accordionItemPaddingHorizontal, accordionTokens.accordionItemGap, accordionTokens.accordionItemBorderRadius, accordionTokens.accordionItemTitleFontFamily, accordionTokens.accordionItemTitleFontSize, accordionTokens.accordionItemTitleFontStyle, accordionTokens.accordionItemTitleFontWeight, accordionTokens.accordionItemTitleLetterSpacing, accordionTokens.accordionItemTitleLineHeight, accordionTokens.accordionItemTextFontFamily, accordionTokens.accordionItemTextFontSize, accordionTokens.accordionItemTextFontStyle, accordionTokens.accordionItemTextFontWeight, accordionTokens.accordionItemTextLetterSpacing, accordionTokens.accordionItemTextLineHeight),
@@ -1,4 +1,4 @@
1
- import React, { useState } from 'react';
1
+ import React, { useCallback, useRef, useState } from 'react';
2
2
  import styled from 'styled-components';
3
3
  import type { ComponentProps } from 'react';
4
4
  import type { StoryObj, Meta } from '@storybook/react';
@@ -6,6 +6,7 @@ import { SSRProvider } from '@salutejs/plasma-core';
6
6
 
7
7
  import { PopupProvider, popupClasses } from '../Popup/Popup';
8
8
  import { Button } from '../Button/Button';
9
+ import { TextField } from '../TextField/TextField';
9
10
  import { WithTheme } from '../../../_helpers';
10
11
 
11
12
  import { Modal, modalClasses } from './Modal';
@@ -206,3 +207,114 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
206
207
  },
207
208
  render: (args) => <StoryModalDemo {...args} />,
208
209
  };
210
+
211
+ const StyledModalAnimation = styled(Modal)`
212
+ /* stylelint-disable */
213
+ && .${popupClasses.root} {
214
+ animation: fadeIn 1s forwards;
215
+ }
216
+
217
+ &&.${popupClasses.endAnimation} .${popupClasses.root} {
218
+ animation: fadeOut 1s forwards;
219
+ }
220
+
221
+ && .${modalClasses.overlay} {
222
+ animation: overlayFadeIn 1s forwards;
223
+ }
224
+
225
+ &&.${popupClasses.endAnimation} .${modalClasses.overlay} {
226
+ animation: overlayFadeOut 1s forwards;
227
+ }
228
+ /* stylelint-enable */
229
+
230
+ @keyframes overlayFadeIn {
231
+ from {
232
+ opacity: 0;
233
+ }
234
+
235
+ to {
236
+ opacity: 1;
237
+ }
238
+ }
239
+
240
+ @keyframes overlayFadeOut {
241
+ from {
242
+ opacity: 1;
243
+ }
244
+
245
+ to {
246
+ opacity: 0;
247
+ }
248
+ }
249
+
250
+ @keyframes fadeIn {
251
+ from {
252
+ opacity: 0;
253
+ transform: translate(-50%, 100%);
254
+ }
255
+
256
+ to {
257
+ opacity: 1;
258
+ transform: translate(-50%, -50%);
259
+ }
260
+ }
261
+
262
+ @keyframes fadeOut {
263
+ from {
264
+ opacity: 1;
265
+ transform: translate(-50%, -50%);
266
+ }
267
+
268
+ to {
269
+ opacity: 0;
270
+ transform: translate(-50%, 100%);
271
+ }
272
+ }
273
+ `;
274
+
275
+ const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
276
+ const ref = useRef(null);
277
+ const [isOpen, setIsOpen] = useState(false);
278
+
279
+ const close = useCallback(() => {
280
+ setIsOpen(false);
281
+ }, []);
282
+
283
+ return (
284
+ <SSRProvider>
285
+ <PopupProvider>
286
+ <Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
287
+ <StyledModalAnimation
288
+ id="modal"
289
+ frame="theme-root"
290
+ withAnimation
291
+ onClose={() => setIsOpen(false)}
292
+ isOpen={isOpen}
293
+ placement={placement}
294
+ offset={[offsetX, offsetY]}
295
+ initialFocusRef={ref}
296
+ {...rest}
297
+ >
298
+ <Content>
299
+ <TextField value="Text" onChange={() => {}} />
300
+ <TextField ref={ref} value="Text2" onChange={() => {}} />
301
+ <Button text="Закрыть" onClick={close} />
302
+ </Content>
303
+ </StyledModalAnimation>
304
+ </PopupProvider>
305
+ </SSRProvider>
306
+ );
307
+ };
308
+
309
+ export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
310
+ args: {
311
+ placement: 'bottom',
312
+ withAnimation: true,
313
+ withBlur: false,
314
+ closeOnEsc: true,
315
+ closeOnOverlayClick: true,
316
+ offsetX: 0,
317
+ offsetY: 0,
318
+ },
319
+ render: (args) => <StoryModalAnimationDemo {...args} />,
320
+ };
@@ -1,4 +1,5 @@
1
1
  export { useUniqId } from './useUniqId';
2
+ export { useFocusTrap } from './useFocusTrap';
2
3
  export { usePreviousValue } from './usePreviousValue';
3
4
  export { useForceUpdate } from './useForceUpdate';
4
5
  export { useDidMountEffect } from './useDidMountEffect';
@@ -0,0 +1,90 @@
1
+ import { useCallback, useEffect, useRef } from 'react';
2
+ import { FocusManager } from '../utils/focusManager';
3
+ import { focusSelector, isFocusable, isTabble } from '../utils/tabbable';
4
+ import { scopeTab } from '../utils/scopeTab';
5
+
6
+ // Находим элемент для фокуса
7
+ var getFocusElement = function getFocusElement(node, firstFocusSelector) {
8
+ var focusElement = null;
9
+ if (firstFocusSelector) {
10
+ if (typeof firstFocusSelector === 'string') {
11
+ focusElement = node.querySelector(firstFocusSelector);
12
+ } else if (firstFocusSelector.current) {
13
+ focusElement = firstFocusSelector.current;
14
+ }
15
+ }
16
+ if (!focusElement) {
17
+ var children = Array.from(node.querySelectorAll(focusSelector));
18
+ focusElement = children.find(function (el) {
19
+ return isTabble(el);
20
+ }) || null;
21
+ }
22
+
23
+ // Если ничего не нашлось, то может ли сама нода быть под фокусом
24
+ if (!focusElement && isFocusable(node)) {
25
+ focusElement = node;
26
+ }
27
+ return focusElement;
28
+ };
29
+ var processNode = function processNode(node, firstFocusSelector, ref) {
30
+ if (ref !== null && ref !== void 0 && ref.current) {
31
+ ref.current.removeEventListener('animationend', function () {
32
+ processNode(node, firstFocusSelector, ref);
33
+ });
34
+ }
35
+ var focusElement = getFocusElement(node, firstFocusSelector);
36
+ if (focusElement) {
37
+ focusElement.focus();
38
+ }
39
+ };
40
+ var focusManager = /*#__PURE__*/new FocusManager();
41
+
42
+ /**
43
+ * Захватывает фокус внутри DOM node.
44
+ * */
45
+ export var useFocusTrap = function useFocusTrap() {
46
+ var active = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
47
+ var firstFocusSelector = arguments.length > 1 ? arguments[1] : undefined;
48
+ var focusAfterNode = arguments.length > 2 ? arguments[2] : undefined;
49
+ var focusAfterAnimation = arguments.length > 3 ? arguments[3] : undefined;
50
+ var ref = useRef();
51
+ var setRef = useCallback(function (node) {
52
+ if (ref.current) {
53
+ focusManager.teardownScopedFocus();
54
+ focusManager.returnFocus();
55
+ }
56
+ if (active && node) {
57
+ focusManager.setupScopedFocus(node);
58
+ focusManager.markForFocusAfter(focusAfterNode);
59
+
60
+ // Delay processing the HTML node by a frame. This ensures focus is assigned correctly.
61
+ setTimeout(function () {
62
+ if (ref !== null && ref !== void 0 && ref.current && node.ownerDocument && focusAfterAnimation) {
63
+ ref.current.addEventListener('animationend', function () {
64
+ processNode(node, firstFocusSelector, ref);
65
+ });
66
+ } else if (node.ownerDocument) {
67
+ processNode(node, firstFocusSelector);
68
+ }
69
+ });
70
+ ref.current = node;
71
+ return;
72
+ }
73
+ ref.current = null;
74
+ }, [active, firstFocusSelector]);
75
+ useEffect(function () {
76
+ if (!active) {
77
+ return;
78
+ }
79
+ var handleKeyDown = function handleKeyDown(event) {
80
+ if (event.key === 'Tab' && ref.current) {
81
+ scopeTab(ref.current, event);
82
+ }
83
+ };
84
+ document.addEventListener('keydown', handleKeyDown);
85
+ return function () {
86
+ document.removeEventListener('keydown', handleKeyDown);
87
+ };
88
+ }, [active]);
89
+ return setRef;
90
+ };
@@ -0,0 +1,55 @@
1
+ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
3
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
4
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
5
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
6
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
7
+ 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); }
8
+ import { findTabbableDescendants } from './tabbable';
9
+
10
+ /**
11
+ * Менеджер фокуса при открытии и закрытии нод при использовании focus-trap.
12
+ * Также необходим, чтобы фокус всегда должен находиться внутри необходимой ноды.
13
+ * */
14
+ export var FocusManager = /*#__PURE__*/_createClass(function FocusManager() {
15
+ var _this = this;
16
+ _classCallCheck(this, FocusManager);
17
+ // массив с элементами, которые нужно зафокусить после анмаунта
18
+ _defineProperty(this, "focusAfterElements", []);
19
+ // массив с trap нодами
20
+ _defineProperty(this, "focusNodes", []);
21
+ _defineProperty(this, "handleFocus", function () {
22
+ // Фокус всегда должен находиться внутри необходимой ноды
23
+ var focusNode = _this.focusNodes[_this.focusNodes.length - 1];
24
+ if (!focusNode || focusNode.contains(document.activeElement)) {
25
+ return;
26
+ }
27
+
28
+ // Выделяем первый tabbable элемент
29
+ var el = findTabbableDescendants(focusNode)[0] || focusNode;
30
+ el.focus();
31
+ });
32
+ // добавление на фокус после анмаунта
33
+ _defineProperty(this, "markForFocusAfter", function (focusAfterNode) {
34
+ var node = focusAfterNode && focusAfterNode.current ? focusAfterNode.current : document.activeElement;
35
+ _this.focusAfterElements.push(node);
36
+ });
37
+ // фокус на необходимый элемент
38
+ _defineProperty(this, "returnFocus", function () {
39
+ var _this$focusAfterEleme;
40
+ var toFocus = (_this$focusAfterEleme = _this.focusAfterElements.pop()) !== null && _this$focusAfterEleme !== void 0 ? _this$focusAfterEleme : null;
41
+ if (toFocus) {
42
+ toFocus.focus();
43
+ }
44
+ });
45
+ // при маунте ноды
46
+ _defineProperty(this, "setupScopedFocus", function (element) {
47
+ _this.focusNodes.push(element);
48
+ document.addEventListener('focusin', _this.handleFocus, true);
49
+ });
50
+ // при анмаунте
51
+ _defineProperty(this, "teardownScopedFocus", function () {
52
+ _this.focusNodes.pop();
53
+ document.removeEventListener('focusin', _this.handleFocus);
54
+ });
55
+ });
@@ -0,0 +1,30 @@
1
+ import { findTabbableDescendants } from './tabbable';
2
+
3
+ /**
4
+ * Управлление фокусом лишь внутри ноды через tab
5
+ * @param node
6
+ * @param event
7
+ */
8
+ export var scopeTab = function scopeTab(node, event) {
9
+ var tabbable = findTabbableDescendants(node);
10
+ if (!tabbable.length) {
11
+ event.preventDefault();
12
+ return;
13
+ }
14
+
15
+ // смотрим, является ли элемент крайним - первый или последним
16
+ var finalTabbable = tabbable[event.shiftKey ? 0 : tabbable.length - 1];
17
+ var leavingFinalTabbable = finalTabbable === document.activeElement || node === document.activeElement;
18
+
19
+ // если не является, то передаем обработку таба самому браузеру
20
+ if (!leavingFinalTabbable) {
21
+ return;
22
+ }
23
+
24
+ // иначе зацкливаемся
25
+ event.preventDefault();
26
+ var target = tabbable[event.shiftKey ? tabbable.length - 1 : 0];
27
+ if (target) {
28
+ target.focus();
29
+ }
30
+ };
@@ -0,0 +1,40 @@
1
+ var tabbableNode = /input|select|textarea|button|object/;
2
+ export var focusSelector = /*#__PURE__*/['input', 'select', 'textarea', 'a', 'button', 'object', '[tabindex]', 'audio[controls]', 'video[controls]', '[contenteditable]:not([contenteditable="false"])'].join(',');
3
+ var isHidden = function isHidden(el) {
4
+ return el.offsetWidth <= 0 && el.offsetHeight <= 0 || el.style.display === 'none' || el.style.visibility === 'hidden' || el.style.opacity === '0';
5
+ };
6
+ export var isVisible = function isVisible(element, parentContainer) {
7
+ var parentElement = element;
8
+ while (parentElement) {
9
+ if (parentElement === parentContainer || parentElement === document.body) {
10
+ break;
11
+ }
12
+ if (isHidden(parentElement)) {
13
+ return false;
14
+ }
15
+ parentElement = parentElement.parentNode;
16
+ }
17
+ return true;
18
+ };
19
+ var getElementTabIndex = function getElementTabIndex(element) {
20
+ var tabIndex = element.getAttribute('tabindex');
21
+ return tabIndex === null ? NaN : parseInt(tabIndex, 10);
22
+ };
23
+ export var isFocusable = function isFocusable(element, parentContainer) {
24
+ var nodeName = element.nodeName.toLowerCase();
25
+ var isTabIndexNotNaN = !Number.isNaN(getElementTabIndex(element));
26
+ var res = tabbableNode.test(nodeName) && !element.disabled || (element instanceof HTMLAnchorElement ? element.href || isTabIndexNotNaN : isTabIndexNotNaN);
27
+ return Boolean(res) && isVisible(element, parentContainer);
28
+ };
29
+ export var isTabble = function isTabble(element, parentContainer) {
30
+ var tabIndex = getElementTabIndex(element);
31
+ var isTabIndexNaN = Number.isNaN(tabIndex);
32
+ return (isTabIndexNaN || tabIndex >= 0) && isFocusable(element, parentContainer);
33
+ };
34
+
35
+ // Все элементы внутри данной ноды, до которых можно добраться табом
36
+ export var findTabbableDescendants = function findTabbableDescendants(element) {
37
+ return Array.from(element.querySelectorAll(focusSelector)).filter(function (el) {
38
+ return isTabble(el, element);
39
+ });
40
+ };