@salutejs/plasma-new-hope 0.116.1-canary.1345.10273776051.0 → 0.116.1-canary.1346.10269858402.0
Sign up to get free protection for your applications and to get access to all the features.
- package/cjs/components/Modal/Modal.js +1 -1
- package/cjs/components/Modal/Modal.js.map +1 -1
- package/emotion/cjs/components/Modal/Modal.js +1 -1
- package/emotion/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +1 -115
- package/emotion/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +1 -115
- package/emotion/es/components/Modal/Modal.js +1 -1
- package/emotion/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +1 -115
- package/emotion/es/examples/plasma_web/components/Modal/Modal.stories.tsx +1 -115
- package/es/components/Modal/Modal.js +1 -1
- package/es/components/Modal/Modal.js.map +1 -1
- package/package.json +4 -4
- package/styled-components/cjs/components/Modal/Modal.js +1 -1
- package/styled-components/cjs/examples/plasma_b2c/components/Modal/Modal.stories.tsx +1 -115
- package/styled-components/cjs/examples/plasma_web/components/Modal/Modal.stories.tsx +1 -115
- package/styled-components/es/components/Modal/Modal.js +1 -1
- package/styled-components/es/examples/plasma_b2c/components/Modal/Modal.stories.tsx +1 -115
- package/styled-components/es/examples/plasma_web/components/Modal/Modal.stories.tsx +1 -115
|
@@ -45,7 +45,7 @@ var modalRoot = function modalRoot(Root) {
|
|
|
45
45
|
view = _ref.view,
|
|
46
46
|
isOpen = _ref.isOpen,
|
|
47
47
|
rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
|
|
48
|
-
var trapRef = plasmaCore.useFocusTrap(true, initialFocusRef, focusAfterRef
|
|
48
|
+
var trapRef = plasmaCore.useFocusTrap(true, initialFocusRef, focusAfterRef);
|
|
49
49
|
var popupController = PopupContext.usePopupContext();
|
|
50
50
|
var innerRef = plasmaCore.useForkRef(trapRef, outerRootRef);
|
|
51
51
|
var uniqId = plasmaCore.safeUseId();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n forwardRef<HTMLDivElement, ModalProps>(\n (\n {\n id,\n withAnimation,\n onClose,\n onOverlayClick,\n onEscKeyDown,\n closeOnEsc = true,\n closeOnOverlayClick = true,\n withBlur,\n initialFocusRef,\n focusAfterRef,\n zIndex,\n popupInfo,\n children,\n view,\n isOpen,\n ...rest\n },\n outerRootRef,\n ) => {\n const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef
|
|
1
|
+
{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n forwardRef<HTMLDivElement, ModalProps>(\n (\n {\n id,\n withAnimation,\n onClose,\n onOverlayClick,\n onEscKeyDown,\n closeOnEsc = true,\n closeOnOverlayClick = true,\n withBlur,\n initialFocusRef,\n focusAfterRef,\n zIndex,\n popupInfo,\n children,\n view,\n isOpen,\n ...rest\n },\n outerRootRef,\n ) => {\n const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n const popupController = usePopupContext();\n\n const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n const uniqId = safeUseId();\n const innerId = id || uniqId;\n const overlayBackgroundToken = withBlur\n ? `var(${tokens.modalOverlayWithBlurColor})`\n : `var(${tokens.modalOverlayColor})`;\n\n const { modalInfo } = useModal({ id: innerId, isOpen, closeOnEsc, onEscKeyDown, onClose, popupInfo });\n const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n innerId,\n popupController.items,\n ]);\n\n const onModalOverlayKeyDown = useCallback(\n (event: React.MouseEvent<HTMLDivElement>) => {\n if (onOverlayClick) {\n onOverlayClick(event);\n return;\n }\n\n if (onClose) {\n onClose();\n }\n },\n [closeOnOverlayClick, onOverlayClick, onClose],\n );\n\n return (\n <Popup\n id={innerId}\n isOpen={isOpen}\n ref={innerRef}\n popupInfo={modalInfo}\n withAnimation={withAnimation}\n zIndex={zIndex}\n overlay={\n <Root view={view}>\n <Overlay\n className={classes.overlay}\n zIndex={zIndex || DEFAULT_Z_INDEX}\n backgroundColorProperty={overlayBackgroundToken}\n withBlur={withBlur}\n transparent={transparent}\n isClickable={closeOnOverlayClick}\n onOverlayClick={onModalOverlayKeyDown}\n />\n </Root>\n }\n {...rest}\n >\n {children}\n </Popup>\n );\n },\n );\n\nexport const modalConfig = {\n name: 'Modal',\n tag: 'div',\n layout: modalRoot,\n base: '',\n variations: {\n view: {\n css: viewCSS,\n },\n },\n defaults: {\n view: 'default',\n },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","isOpen","rest","_objectWithoutProperties","_excluded","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","React","createElement","_extends","ref","overlay","Overlay","className","classes","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
|
|
|
48
48
|
view = _ref.view,
|
|
49
49
|
isOpen = _ref.isOpen,
|
|
50
50
|
rest = _objectWithoutProperties(_ref, _excluded);
|
|
51
|
-
var trapRef = (0, _plasmaCore.useFocusTrap)(true, initialFocusRef, focusAfterRef
|
|
51
|
+
var trapRef = (0, _plasmaCore.useFocusTrap)(true, initialFocusRef, focusAfterRef);
|
|
52
52
|
var popupController = (0, _Popup.usePopupContext)();
|
|
53
53
|
var innerRef = (0, _plasmaCore.useForkRef)(trapRef, outerRootRef);
|
|
54
54
|
var uniqId = (0, _plasmaCore.safeUseId)();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useState } from 'react';
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
3
|
import type { ComponentProps } from 'react';
|
|
4
4
|
import type { StoryObj, Meta } from '@storybook/react';
|
|
@@ -6,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useState } from 'react';
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
3
|
import type { ComponentProps } from 'react';
|
|
4
4
|
import type { StoryObj, Meta } from '@storybook/react';
|
|
@@ -6,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -40,7 +40,7 @@ export var modalRoot = function modalRoot(Root) {
|
|
|
40
40
|
view = _ref.view,
|
|
41
41
|
isOpen = _ref.isOpen,
|
|
42
42
|
rest = _objectWithoutProperties(_ref, _excluded);
|
|
43
|
-
var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef
|
|
43
|
+
var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);
|
|
44
44
|
var popupController = usePopupContext();
|
|
45
45
|
var innerRef = useForkRef(trapRef, outerRootRef);
|
|
46
46
|
var uniqId = safeUseId();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useState } from 'react';
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
3
|
import type { ComponentProps } from 'react';
|
|
4
4
|
import type { StoryObj, Meta } from '@storybook/react';
|
|
@@ -6,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useState } from 'react';
|
|
2
2
|
import styled from '@emotion/styled';
|
|
3
3
|
import type { ComponentProps } from 'react';
|
|
4
4
|
import type { StoryObj, Meta } from '@storybook/react';
|
|
@@ -6,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -41,7 +41,7 @@ var modalRoot = function modalRoot(Root) {
|
|
|
41
41
|
view = _ref.view,
|
|
42
42
|
isOpen = _ref.isOpen,
|
|
43
43
|
rest = _objectWithoutProperties(_ref, _excluded);
|
|
44
|
-
var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef
|
|
44
|
+
var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);
|
|
45
45
|
var popupController = usePopupContext();
|
|
46
46
|
var innerRef = useForkRef(trapRef, outerRootRef);
|
|
47
47
|
var uniqId = safeUseId();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n forwardRef<HTMLDivElement, ModalProps>(\n (\n {\n id,\n withAnimation,\n onClose,\n onOverlayClick,\n onEscKeyDown,\n closeOnEsc = true,\n closeOnOverlayClick = true,\n withBlur,\n initialFocusRef,\n focusAfterRef,\n zIndex,\n popupInfo,\n children,\n view,\n isOpen,\n ...rest\n },\n outerRootRef,\n ) => {\n const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef
|
|
1
|
+
{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';\n\nimport { RootProps, component } from '../../engines';\nimport { popupConfig, usePopupContext } from '../Popup';\nimport { Overlay } from '../Overlay';\nimport { DEFAULT_Z_INDEX } from '../Popup/utils';\n\nimport { classes, tokens } from './Modal.tokens';\nimport { ModalProps } from './Modal.types';\nimport { useModal } from './hooks';\nimport { base as viewCSS } from './variations/_view/base';\nimport { getIdLastModal } from './ModalContext';\n\n// issue #823\nconst Popup = component(popupConfig);\n\n/**\n * Modal.\n * Управляет показом/скрытием, подложкой и анимацией визуальной части модального окна.\n */\nexport const modalRoot = (Root: RootProps<HTMLDivElement, ModalProps>) =>\n forwardRef<HTMLDivElement, ModalProps>(\n (\n {\n id,\n withAnimation,\n onClose,\n onOverlayClick,\n onEscKeyDown,\n closeOnEsc = true,\n closeOnOverlayClick = true,\n withBlur,\n initialFocusRef,\n focusAfterRef,\n zIndex,\n popupInfo,\n children,\n view,\n isOpen,\n ...rest\n },\n outerRootRef,\n ) => {\n const trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);\n const popupController = usePopupContext();\n\n const innerRef = useForkRef<HTMLDivElement>(trapRef, outerRootRef);\n\n const uniqId = safeUseId();\n const innerId = id || uniqId;\n const overlayBackgroundToken = withBlur\n ? `var(${tokens.modalOverlayWithBlurColor})`\n : `var(${tokens.modalOverlayColor})`;\n\n const { modalInfo } = useModal({ id: innerId, isOpen, closeOnEsc, onEscKeyDown, onClose, popupInfo });\n const transparent = useMemo(() => getIdLastModal(popupController.items) !== innerId, [\n innerId,\n popupController.items,\n ]);\n\n const onModalOverlayKeyDown = useCallback(\n (event: React.MouseEvent<HTMLDivElement>) => {\n if (onOverlayClick) {\n onOverlayClick(event);\n return;\n }\n\n if (onClose) {\n onClose();\n }\n },\n [closeOnOverlayClick, onOverlayClick, onClose],\n );\n\n return (\n <Popup\n id={innerId}\n isOpen={isOpen}\n ref={innerRef}\n popupInfo={modalInfo}\n withAnimation={withAnimation}\n zIndex={zIndex}\n overlay={\n <Root view={view}>\n <Overlay\n className={classes.overlay}\n zIndex={zIndex || DEFAULT_Z_INDEX}\n backgroundColorProperty={overlayBackgroundToken}\n withBlur={withBlur}\n transparent={transparent}\n isClickable={closeOnOverlayClick}\n onOverlayClick={onModalOverlayKeyDown}\n />\n </Root>\n }\n {...rest}\n >\n {children}\n </Popup>\n );\n },\n );\n\nexport const modalConfig = {\n name: 'Modal',\n tag: 'div',\n layout: modalRoot,\n base: '',\n variations: {\n view: {\n css: viewCSS,\n },\n },\n defaults: {\n view: 'default',\n },\n};\n"],"names":["Popup","component","popupConfig","modalRoot","Root","forwardRef","_ref","outerRootRef","id","withAnimation","onClose","onOverlayClick","onEscKeyDown","_ref$closeOnEsc","closeOnEsc","_ref$closeOnOverlayCl","closeOnOverlayClick","withBlur","initialFocusRef","focusAfterRef","zIndex","popupInfo","children","view","isOpen","rest","_objectWithoutProperties","_excluded","trapRef","useFocusTrap","popupController","usePopupContext","innerRef","useForkRef","uniqId","safeUseId","innerId","overlayBackgroundToken","concat","tokens","modalOverlayWithBlurColor","modalOverlayColor","_useModal","useModal","modalInfo","transparent","useMemo","getIdLastModal","items","onModalOverlayKeyDown","useCallback","event","React","createElement","_extends","ref","overlay","Overlay","className","classes","DEFAULT_Z_INDEX","backgroundColorProperty","isClickable","modalConfig","name","tag","layout","base","variations","css","viewCSS","defaults"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salutejs/plasma-new-hope",
|
|
3
|
-
"version": "0.116.1-canary.
|
|
3
|
+
"version": "0.116.1-canary.1346.10269858402.0",
|
|
4
4
|
"description": "Salute Design System blueprint",
|
|
5
5
|
"main": "cjs/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"@rollup/plugin-babel": "^6.0.4",
|
|
81
81
|
"@rollup/plugin-commonjs": "^25.0.4",
|
|
82
82
|
"@rollup/plugin-node-resolve": "^15.1.0",
|
|
83
|
-
"@salutejs/plasma-sb-utils": "0.163.
|
|
83
|
+
"@salutejs/plasma-sb-utils": "0.163.0-dev.0",
|
|
84
84
|
"@storybook/addon-docs": "^7.6.17",
|
|
85
85
|
"@storybook/addon-essentials": "^7.6.17",
|
|
86
86
|
"@storybook/addons": "^7.6.17",
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
"@linaria/core": "5.0.2",
|
|
111
111
|
"@linaria/react": "5.0.3",
|
|
112
112
|
"@popperjs/core": "2.11.8",
|
|
113
|
-
"@salutejs/plasma-core": "1.165.
|
|
113
|
+
"@salutejs/plasma-core": "1.165.0-dev.0",
|
|
114
114
|
"dayjs": "1.11.11",
|
|
115
115
|
"focus-visible": "5.2.0",
|
|
116
116
|
"lodash.throttle": "4.1.1",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"react-popper": "2.3.0",
|
|
119
119
|
"storeon": "3.1.5"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "5c413a0b41cb4914490896193a912a679669cb40"
|
|
122
122
|
}
|
|
@@ -48,7 +48,7 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
|
|
|
48
48
|
view = _ref.view,
|
|
49
49
|
isOpen = _ref.isOpen,
|
|
50
50
|
rest = _objectWithoutProperties(_ref, _excluded);
|
|
51
|
-
var trapRef = (0, _plasmaCore.useFocusTrap)(true, initialFocusRef, focusAfterRef
|
|
51
|
+
var trapRef = (0, _plasmaCore.useFocusTrap)(true, initialFocusRef, focusAfterRef);
|
|
52
52
|
var popupController = (0, _Popup.usePopupContext)();
|
|
53
53
|
var innerRef = (0, _plasmaCore.useForkRef)(trapRef, outerRootRef);
|
|
54
54
|
var uniqId = (0, _plasmaCore.safeUseId)();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { 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,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { 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,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -40,7 +40,7 @@ export var modalRoot = function modalRoot(Root) {
|
|
|
40
40
|
view = _ref.view,
|
|
41
41
|
isOpen = _ref.isOpen,
|
|
42
42
|
rest = _objectWithoutProperties(_ref, _excluded);
|
|
43
|
-
var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef
|
|
43
|
+
var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);
|
|
44
44
|
var popupController = usePopupContext();
|
|
45
45
|
var innerRef = useForkRef(trapRef, outerRootRef);
|
|
46
46
|
var uniqId = safeUseId();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { 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,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { 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,7 +6,6 @@ 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';
|
|
10
9
|
import { WithTheme } from '../../../_helpers';
|
|
11
10
|
|
|
12
11
|
import { Modal, modalClasses } from './Modal';
|
|
@@ -207,116 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
|
|
|
207
206
|
},
|
|
208
207
|
render: (args) => <StoryModalDemo {...args} />,
|
|
209
208
|
};
|
|
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
|
-
{/* <StyledWrapper> */}
|
|
286
|
-
<PopupProvider>
|
|
287
|
-
<Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
|
|
288
|
-
<StyledModalAnimation
|
|
289
|
-
id="modal"
|
|
290
|
-
frame="theme-root"
|
|
291
|
-
withAnimation
|
|
292
|
-
onClose={() => setIsOpen(false)}
|
|
293
|
-
isOpen={isOpen}
|
|
294
|
-
placement={placement}
|
|
295
|
-
offset={[offsetX, offsetY]}
|
|
296
|
-
initialFocusRef={ref}
|
|
297
|
-
{...rest}
|
|
298
|
-
>
|
|
299
|
-
<Content>
|
|
300
|
-
<TextField value="Text" onChange={() => {}} />
|
|
301
|
-
<TextField ref={ref} value="Text2" onChange={() => {}} />
|
|
302
|
-
<Button text="Закрыть" onClick={close} />
|
|
303
|
-
</Content>
|
|
304
|
-
</StyledModalAnimation>
|
|
305
|
-
</PopupProvider>
|
|
306
|
-
{/* </StyledWrapper> */}
|
|
307
|
-
</SSRProvider>
|
|
308
|
-
);
|
|
309
|
-
};
|
|
310
|
-
|
|
311
|
-
export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
|
|
312
|
-
args: {
|
|
313
|
-
placement: 'bottom',
|
|
314
|
-
withAnimation: true,
|
|
315
|
-
withBlur: false,
|
|
316
|
-
closeOnEsc: true,
|
|
317
|
-
closeOnOverlayClick: true,
|
|
318
|
-
offsetX: 0,
|
|
319
|
-
offsetY: 0,
|
|
320
|
-
},
|
|
321
|
-
render: (args) => <StoryModalAnimationDemo {...args} />,
|
|
322
|
-
};
|