@salutejs/plasma-new-hope 0.118.1-canary.1345.10282607319.0 → 0.119.0-canary.1344.10281238925.0

package/emotion/es/examples/plasma_web/components/Modal/Modal.stories.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useState } from 'react';
 import styled from '@emotion/styled';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
@@ -6,7 +6,6 @@ import { SSRProvider } from '@salutejs/plasma-core';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
-import { TextField } from '../TextField/TextField';
 import { WithTheme } from '../../../_helpers';
 
 import { Modal, modalClasses } from './Modal';
@@ -207,114 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
-
-const StyledModalAnimation = styled(Modal)`
-    /* stylelint-disable */
-    && .${popupClasses.root} {
-        animation: fadeIn 1s forwards;
-    }
-
-    &&.${popupClasses.endAnimation} .${popupClasses.root} {
-        animation: fadeOut 1s forwards;
-    }
-
-    && .${modalClasses.overlay} {
-        animation: overlayFadeIn 1s forwards;
-    }
-
-    &&.${popupClasses.endAnimation} .${modalClasses.overlay} {
-        animation: overlayFadeOut 1s forwards;
-    }
-    /* stylelint-enable */
-
-    @keyframes overlayFadeIn {
-        from {
-            opacity: 0;
-        }
-
-        to {
-            opacity: 1;
-        }
-    }
-
-    @keyframes overlayFadeOut {
-        from {
-            opacity: 1;
-        }
-
-        to {
-            opacity: 0;
-        }
-    }
-
-    @keyframes fadeIn {
-        from {
-            opacity: 0;
-            transform: translate(-50%, 100%);
-        }
-
-        to {
-            opacity: 1;
-            transform: translate(-50%, -50%);
-        }
-    }
-
-    @keyframes fadeOut {
-        from {
-            opacity: 1;
-            transform: translate(-50%, -50%);
-        }
-
-        to {
-            opacity: 0;
-            transform: translate(-50%, 100%);
-        }
-    }
-`;
-
-const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
-    const ref = useRef(null);
-    const [isOpen, setIsOpen] = useState(false);
-
-    const close = useCallback(() => {
-        setIsOpen(false);
-    }, []);
-
-    return (
-        <SSRProvider>
-            <PopupProvider>
-                <Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
-                <StyledModalAnimation
-                    id="modal"
-                    frame="theme-root"
-                    withAnimation
-                    onClose={() => setIsOpen(false)}
-                    isOpen={isOpen}
-                    placement={placement}
-                    offset={[offsetX, offsetY]}
-                    initialFocusRef={ref}
-                    {...rest}
-                >
-                    <Content>
-                        <TextField value="Text" onChange={() => {}} />
-                        <TextField ref={ref} value="Text2" onChange={() => {}} />
-                        <Button text="Закрыть" onClick={close} />
-                    </Content>
-                </StyledModalAnimation>
-            </PopupProvider>
-        </SSRProvider>
-    );
-};
-
-export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
-    args: {
-        placement: 'bottom',
-        withAnimation: true,
-        withBlur: false,
-        closeOnEsc: true,
-        closeOnOverlayClick: true,
-        offsetX: 0,
-        offsetY: 0,
-    },
-    render: (args) => <StoryModalAnimationDemo {...args} />,
-};

package/emotion/es/hooks/index.js

@@ -1,5 +1,4 @@
 export { useUniqId } from './useUniqId';
-export { useFocusTrap } from './useFocusTrap';
 export { usePreviousValue } from './usePreviousValue';
 export { useForceUpdate } from './useForceUpdate';
 export { useDidMountEffect } from './useDidMountEffect';

package/es/components/Accordion/Accordion.tokens.js

@@ -23,6 +23,7 @@ var tokens = {
   accordionItemFocus: '--plasma-accordion-item-focus',
   accordionItemBorder: '--plasma-accordion-item-border',
   accordionItemBorderBottom: '--plasma-accordion-item-border-bottom',
+  accordionItemIconColor: '--plasma-accordion-item-color-icon',
   accordionItemTitleColor: '--plasma-accordion-item-title-color',
   accordionItemTitleFontFamily: '--plasma-accordion-item-title-font-family',
   accordionItemTitleFontSize: '--plasma-accordion-item-title-font-size',

package/es/components/Accordion/Accordion.tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"Accordion.tokens.js","sources":["../../../src/components/Accordion/Accordion.tokens.ts"],"sourcesContent":["export const classes = {\n    filledStretching: 'accordion-stretching-filled',\n    fixedStretching: 'accordion-stretching-fixed',\n    accordionRoot: 'accordion-root',\n    accordionItem: 'accordion-item',\n    clearAccordionItem: 'clear-accordion-item',\n    accordionItemShowBody: 'accordion-item-show-body',\n    accordionPlusAnimationElement: 'accordion-plus-animation-element',\n    accordionDisabled: 'accordion-disabled',\n    accordionItemBody: 'accordion-item-body',\n};\n\nexport const tokens = {\n    accordionGap: '--plasma-accordion-gap',\n    accordionWidth: '--plasma-accordion-width',\n    accordionBackground: '--plasma-accordion-background',\n\n    accordionItemBackground: '--plasma-accordion-item-background',\n    accordionItemBorderRadius: '--plasma-accordion-item-border-radius',\n    accordionItemPadding: '--plasma-accordion-item-padding',\n    accordionItemPaddingVertical: '--plasma-accordion-item-padding-vertical',\n    accordionItemPaddingHorizontal: '--plasma-accordion-item-padding-horizontal',\n    accordionItemPaddingHorizontalLeft: '--plasma-accordion-item-padding-horizontal-left',\n    accordionItemGap: '--plasma-accordion-item-gap',\n    accordionItemFocus: '--plasma-accordion-item-focus',\n    accordionItemBorder: '--plasma-accordion-item-border',\n    accordionItemBorderBottom: '--plasma-accordion-item-border-bottom',\n\n    accordionItemTitleColor: '--plasma-accordion-item-title-color',\n    accordionItemTitleFontFamily: '--plasma-accordion-item-title-font-family',\n    accordionItemTitleFontSize: '--plasma-accordion-item-title-font-size',\n    accordionItemTitleFontStyle: '--plasma-accordion-item-title-font-style',\n    accordionItemTitleFontWeight: '--plasma-accordion-item-title-font-weight',\n    accordionItemTitleLetterSpacing: '--plasma-accordion-item-title-letter-spacing',\n    accordionItemTitleLineHeight: '--plasma-accordion-item-title-line-height',\n\n    accordionItemTextColor: '--plasma-accordion-item-text-color',\n    accordionItemTextFontFamily: '--plasma-accordion-item-text-font-family',\n    accordionItemTextFontSize: '--plasma-accordion-item-text-font-size',\n    accordionItemTextFontStyle: '--plasma-accordion-item-text-font-style',\n    accordionItemTextFontWeight: '--plasma-accordion-item-text-font-weight',\n    accordionItemTextLetterSpacing: '--plasma-accordion-item-text-letter-spacing',\n    accordionItemTextLineHeight: '--plasma-accordion-item-text-line-height',\n};\n"],"names":["classes","filledStretching","fixedStretching","accordionRoot","accordionItem","clearAccordionItem","accordionItemShowBody","accordionPlusAnimationElement","accordionDisabled","accordionItemBody","tokens","accordionGap","accordionWidth","accordionBackground","accordionItemBackground","accordionItemBorderRadius","accordionItemPadding","accordionItemPaddingVertical","accordionItemPaddingHorizontal","accordionItemPaddingHorizontalLeft","accordionItemGap","accordionItemFocus","accordionItemBorder","accordionItemBorderBottom","accordionItemTitleColor","accordionItemTitleFontFamily","accordionItemTitleFontSize","accordionItemTitleFontStyle","accordionItemTitleFontWeight","accordionItemTitleLetterSpacing","accordionItemTitleLineHeight","accordionItemTextColor","accordionItemTextFontFamily","accordionItemTextFontSize","accordionItemTextFontStyle","accordionItemTextFontWeight","accordionItemTextLetterSpacing","accordionItemTextLineHeight"],"mappings":"AAAO,IAAMA,OAAO,GAAG;AACnBC,EAAAA,gBAAgB,EAAE,6BAA6B;AAC/CC,EAAAA,eAAe,EAAE,4BAA4B;AAC7CC,EAAAA,aAAa,EAAE,gBAAgB;AAC/BC,EAAAA,aAAa,EAAE,gBAAgB;AAC/BC,EAAAA,kBAAkB,EAAE,sBAAsB;AAC1CC,EAAAA,qBAAqB,EAAE,0BAA0B;AACjDC,EAAAA,6BAA6B,EAAE,kCAAkC;AACjEC,EAAAA,iBAAiB,EAAE,oBAAoB;AACvCC,EAAAA,iBAAiB,EAAE,qBAAA;AACvB,EAAC;AAEM,IAAMC,MAAM,GAAG;AAClBC,EAAAA,YAAY,EAAE,wBAAwB;AACtCC,EAAAA,cAAc,EAAE,0BAA0B;AAC1CC,EAAAA,mBAAmB,EAAE,+BAA+B;AAEpDC,EAAAA,uBAAuB,EAAE,oCAAoC;AAC7DC,EAAAA,yBAAyB,EAAE,uCAAuC;AAClEC,EAAAA,oBAAoB,EAAE,iCAAiC;AACvDC,EAAAA,4BAA4B,EAAE,0CAA0C;AACxEC,EAAAA,8BAA8B,EAAE,4CAA4C;AAC5EC,EAAAA,kCAAkC,EAAE,iDAAiD;AACrFC,EAAAA,gBAAgB,EAAE,6BAA6B;AAC/CC,EAAAA,kBAAkB,EAAE,+BAA+B;AACnDC,EAAAA,mBAAmB,EAAE,gCAAgC;AACrDC,EAAAA,yBAAyB,EAAE,uCAAuC;AAElEC,EAAAA,uBAAuB,EAAE,qCAAqC;AAC9DC,EAAAA,4BAA4B,EAAE,2CAA2C;AACzEC,EAAAA,0BAA0B,EAAE,yCAAyC;AACrEC,EAAAA,2BAA2B,EAAE,0CAA0C;AACvEC,EAAAA,4BAA4B,EAAE,2CAA2C;AACzEC,EAAAA,+BAA+B,EAAE,8CAA8C;AAC/EC,EAAAA,4BAA4B,EAAE,2CAA2C;AAEzEC,EAAAA,sBAAsB,EAAE,oCAAoC;AAC5DC,EAAAA,2BAA2B,EAAE,0CAA0C;AACvEC,EAAAA,yBAAyB,EAAE,wCAAwC;AACnEC,EAAAA,0BAA0B,EAAE,yCAAyC;AACrEC,EAAAA,2BAA2B,EAAE,0CAA0C;AACvEC,EAAAA,8BAA8B,EAAE,6CAA6C;AAC7EC,EAAAA,2BAA2B,EAAE,0CAAA;AACjC;;;;"}
+{"version":3,"file":"Accordion.tokens.js","sources":["../../../src/components/Accordion/Accordion.tokens.ts"],"sourcesContent":["export const classes = {\n    filledStretching: 'accordion-stretching-filled',\n    fixedStretching: 'accordion-stretching-fixed',\n    accordionRoot: 'accordion-root',\n    accordionItem: 'accordion-item',\n    clearAccordionItem: 'clear-accordion-item',\n    accordionItemShowBody: 'accordion-item-show-body',\n    accordionPlusAnimationElement: 'accordion-plus-animation-element',\n    accordionDisabled: 'accordion-disabled',\n    accordionItemBody: 'accordion-item-body',\n};\n\nexport const tokens = {\n    accordionGap: '--plasma-accordion-gap',\n    accordionWidth: '--plasma-accordion-width',\n    accordionBackground: '--plasma-accordion-background',\n\n    accordionItemBackground: '--plasma-accordion-item-background',\n    accordionItemBorderRadius: '--plasma-accordion-item-border-radius',\n    accordionItemPadding: '--plasma-accordion-item-padding',\n    accordionItemPaddingVertical: '--plasma-accordion-item-padding-vertical',\n    accordionItemPaddingHorizontal: '--plasma-accordion-item-padding-horizontal',\n    accordionItemPaddingHorizontalLeft: '--plasma-accordion-item-padding-horizontal-left',\n    accordionItemGap: '--plasma-accordion-item-gap',\n    accordionItemFocus: '--plasma-accordion-item-focus',\n    accordionItemBorder: '--plasma-accordion-item-border',\n    accordionItemBorderBottom: '--plasma-accordion-item-border-bottom',\n    accordionItemIconColor: '--plasma-accordion-item-color-icon',\n\n    accordionItemTitleColor: '--plasma-accordion-item-title-color',\n    accordionItemTitleFontFamily: '--plasma-accordion-item-title-font-family',\n    accordionItemTitleFontSize: '--plasma-accordion-item-title-font-size',\n    accordionItemTitleFontStyle: '--plasma-accordion-item-title-font-style',\n    accordionItemTitleFontWeight: '--plasma-accordion-item-title-font-weight',\n    accordionItemTitleLetterSpacing: '--plasma-accordion-item-title-letter-spacing',\n    accordionItemTitleLineHeight: '--plasma-accordion-item-title-line-height',\n\n    accordionItemTextColor: '--plasma-accordion-item-text-color',\n    accordionItemTextFontFamily: '--plasma-accordion-item-text-font-family',\n    accordionItemTextFontSize: '--plasma-accordion-item-text-font-size',\n    accordionItemTextFontStyle: '--plasma-accordion-item-text-font-style',\n    accordionItemTextFontWeight: '--plasma-accordion-item-text-font-weight',\n    accordionItemTextLetterSpacing: '--plasma-accordion-item-text-letter-spacing',\n    accordionItemTextLineHeight: '--plasma-accordion-item-text-line-height',\n};\n"],"names":["classes","filledStretching","fixedStretching","accordionRoot","accordionItem","clearAccordionItem","accordionItemShowBody","accordionPlusAnimationElement","accordionDisabled","accordionItemBody","tokens","accordionGap","accordionWidth","accordionBackground","accordionItemBackground","accordionItemBorderRadius","accordionItemPadding","accordionItemPaddingVertical","accordionItemPaddingHorizontal","accordionItemPaddingHorizontalLeft","accordionItemGap","accordionItemFocus","accordionItemBorder","accordionItemBorderBottom","accordionItemIconColor","accordionItemTitleColor","accordionItemTitleFontFamily","accordionItemTitleFontSize","accordionItemTitleFontStyle","accordionItemTitleFontWeight","accordionItemTitleLetterSpacing","accordionItemTitleLineHeight","accordionItemTextColor","accordionItemTextFontFamily","accordionItemTextFontSize","accordionItemTextFontStyle","accordionItemTextFontWeight","accordionItemTextLetterSpacing","accordionItemTextLineHeight"],"mappings":"AAAO,IAAMA,OAAO,GAAG;AACnBC,EAAAA,gBAAgB,EAAE,6BAA6B;AAC/CC,EAAAA,eAAe,EAAE,4BAA4B;AAC7CC,EAAAA,aAAa,EAAE,gBAAgB;AAC/BC,EAAAA,aAAa,EAAE,gBAAgB;AAC/BC,EAAAA,kBAAkB,EAAE,sBAAsB;AAC1CC,EAAAA,qBAAqB,EAAE,0BAA0B;AACjDC,EAAAA,6BAA6B,EAAE,kCAAkC;AACjEC,EAAAA,iBAAiB,EAAE,oBAAoB;AACvCC,EAAAA,iBAAiB,EAAE,qBAAA;AACvB,EAAC;AAEM,IAAMC,MAAM,GAAG;AAClBC,EAAAA,YAAY,EAAE,wBAAwB;AACtCC,EAAAA,cAAc,EAAE,0BAA0B;AAC1CC,EAAAA,mBAAmB,EAAE,+BAA+B;AAEpDC,EAAAA,uBAAuB,EAAE,oCAAoC;AAC7DC,EAAAA,yBAAyB,EAAE,uCAAuC;AAClEC,EAAAA,oBAAoB,EAAE,iCAAiC;AACvDC,EAAAA,4BAA4B,EAAE,0CAA0C;AACxEC,EAAAA,8BAA8B,EAAE,4CAA4C;AAC5EC,EAAAA,kCAAkC,EAAE,iDAAiD;AACrFC,EAAAA,gBAAgB,EAAE,6BAA6B;AAC/CC,EAAAA,kBAAkB,EAAE,+BAA+B;AACnDC,EAAAA,mBAAmB,EAAE,gCAAgC;AACrDC,EAAAA,yBAAyB,EAAE,uCAAuC;AAClEC,EAAAA,sBAAsB,EAAE,oCAAoC;AAE5DC,EAAAA,uBAAuB,EAAE,qCAAqC;AAC9DC,EAAAA,4BAA4B,EAAE,2CAA2C;AACzEC,EAAAA,0BAA0B,EAAE,yCAAyC;AACrEC,EAAAA,2BAA2B,EAAE,0CAA0C;AACvEC,EAAAA,4BAA4B,EAAE,2CAA2C;AACzEC,EAAAA,+BAA+B,EAAE,8CAA8C;AAC/EC,EAAAA,4BAA4B,EAAE,2CAA2C;AAEzEC,EAAAA,sBAAsB,EAAE,oCAAoC;AAC5DC,EAAAA,2BAA2B,EAAE,0CAA0C;AACvEC,EAAAA,yBAAyB,EAAE,wCAAwC;AACnEC,EAAAA,0BAA0B,EAAE,yCAAyC;AACrEC,EAAAA,2BAA2B,EAAE,0CAA0C;AACvEC,EAAAA,8BAA8B,EAAE,6CAA6C;AAC7EC,EAAAA,2BAA2B,EAAE,0CAAA;AACjC;;;;"}

package/es/components/Accordion/ui/AccordionItem/AccordionItem.styles.js

@@ -37,10 +37,10 @@ var StyledAccordionBody = /*#__PURE__*/styled.div.withConfig({
 })(["color:var(", ");font-family:var(", ");font-size:var(", ");font-weight:var(", ");font-style:var(", ");letter-spacing:var(", ");line-height:var(", ");overflow:hidden;padding-right:var(", ");padding-left:var(", ");text-align:left;"], tokens.accordionItemTextColor, tokens.accordionItemTextFontFamily, tokens.accordionItemTextFontSize, tokens.accordionItemTextFontWeight, tokens.accordionItemTextFontStyle, tokens.accordionItemTextLetterSpacing, tokens.accordionItemTextLineHeight, tokens.accordionItemPaddingHorizontal, tokens.accordionItemPaddingHorizontalLeft);
 var StyledArrow = /*#__PURE__*/styled(IconChevronDownFill).withConfig({
   componentId: "plasma-new-hope__sc-iot32d-8"
-})(["pointer-events:none;user-select:none;color:var(", ");"], tokens.accordionItemTextColor);
+})(["pointer-events:none;user-select:none;color:var(", ");"], tokens.accordionItemIconColor);
 var StyledMinus = /*#__PURE__*/styled(IconMinus).withConfig({
   componentId: "plasma-new-hope__sc-iot32d-9"
-})(["pointer-events:none;user-select:none;color:var(", ");display:flex;align-items:center;position:absolute;top:0;left:0;&.", "{transition:0.2s;transform:rotate(90deg);}&.", "{transition:0.2s;transform:rotate(0deg);}"], tokens.accordionItemTextColor, classes.accordionPlusAnimationElement, classes.accordionItemShowBody);
+})(["pointer-events:none;user-select:none;color:var(", ");display:flex;align-items:center;position:absolute;top:0;left:0;&.", "{transition:0.2s;transform:rotate(90deg);}&.", "{transition:0.2s;transform:rotate(0deg);}"], tokens.accordionItemIconColor, classes.accordionPlusAnimationElement, classes.accordionItemShowBody);
 var StyledPlus = /*#__PURE__*/styled.div.withConfig({
   componentId: "plasma-new-hope__sc-iot32d-10"
 })(["position:relative;height:1rem;display:flex;align-items:center;justify-content:center;width:1rem;"]);

package/es/components/Accordion/ui/AccordionItem/AccordionItem.styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccordionItem.styles.js","sources":["../../../../../src/components/Accordion/ui/AccordionItem/AccordionItem.styles.ts"],"sourcesContent":["import styled from 'styled-components';\n\nimport { IconChevronDownFill, IconMinus } from '../../../_Icon';\nimport { classes, tokens } from '../../Accordion.tokens';\nimport { addFocus } from '../../../../mixins';\n\nexport const StyledAccordionItem = styled.div`\n    background: var(${tokens.accordionItemBackground});\n    border: var(${tokens.accordionItemBorder});\n    border-bottom: var(${tokens.accordionItemBorderBottom});\n\n    &:last-child {\n        border-bottom: var(${tokens.accordionItemBorder});\n    }\n\n    &.${classes.accordionDisabled} {\n        opacity: 0.4;\n        cursor: not-allowed;\n    }\n`;\n\nexport const StyledAccordionHeader = styled.button`\n    width: 100%;\n    border: none;\n    padding: var(${tokens.accordionItemPadding});\n    display: flex;\n    gap: var(${tokens.accordionItemGap});\n    justify-content: space-between;\n    align-items: center;\n    background: none;\n    box-sizing: border-box;\n    cursor: pointer;\n\n    &:focus {\n        outline: none;\n    }\n\n    ${addFocus({\n        outlineOffset: '0.125rem',\n        outlineSize: '0.125rem',\n        outlineRadius: '0',\n        outlineColor: `var(${tokens.accordionItemFocus})`,\n    })}\n`;\n\nexport const StyledAccordionHeaderLeft = styled.div`\n    display: flex;\n    gap: var(${tokens.accordionItemGap});\n    justify-content: space-between;\n    align-items: center;\n`;\n\nexport const StyledAccordionContentRight = styled.div`\n    transition: 0.2s;\n    transform: rotate(90deg);\n\n    &.${classes.accordionItemShowBody} {\n        transition: 0.2s;\n        transform: rotate(0deg);\n    }\n`;\n\nexport const StyledAccordionContentLeft = styled.div`\n    transition: 0.2s;\n    display: flex;\n    align-items: center;\n\n    &.${classes.accordionItemShowBody} {\n        transition: 0.2s;\n        transform: rotate(180deg);\n    }\n`;\n\nexport const StyledAccordionTitle = styled.div`\n    color: var(${tokens.accordionItemTitleColor});\n    font-family: var(${tokens.accordionItemTitleFontFamily});\n    font-size: var(${tokens.accordionItemTitleFontSize});\n    font-weight: var(${tokens.accordionItemTitleFontWeight});\n    font-style: var(${tokens.accordionItemTitleFontStyle});\n    letter-spacing: var(${tokens.accordionItemTitleLetterSpacing});\n    line-height: var(${tokens.accordionItemTitleLineHeight});\n    text-align: left;\n`;\n\nexport const StyledAccordionBodyAnimate = styled.div`\n    display: grid;\n    grid-template-rows: 0fr;\n    transition: grid-template-rows 0.2s ease-out;\n    overflow: hidden;\n\n    &.${classes.accordionItemShowBody} {\n        grid-template-rows: 1fr;\n        padding-bottom: var(${tokens.accordionItemPaddingVertical});\n\n        &.${classes.accordionPlusAnimationElement} {\n            transition: 0.2s;\n            transform: rotate(0deg);\n        }\n    }\n`;\n\nexport const StyledAccordionBody = styled.div`\n    color: var(${tokens.accordionItemTextColor});\n    font-family: var(${tokens.accordionItemTextFontFamily});\n    font-size: var(${tokens.accordionItemTextFontSize});\n    font-weight: var(${tokens.accordionItemTextFontWeight});\n    font-style: var(${tokens.accordionItemTextFontStyle});\n    letter-spacing: var(${tokens.accordionItemTextLetterSpacing});\n    line-height: var(${tokens.accordionItemTextLineHeight});\n    overflow: hidden;\n    padding-right: var(${tokens.accordionItemPaddingHorizontal});\n    padding-left: var(${tokens.accordionItemPaddingHorizontalLeft});\n    text-align: left;\n`;\n\nexport const StyledArrow = styled(IconChevronDownFill)`\n    pointer-events: none;\n    user-select: none;\n    color: var(${tokens.accordionItemTextColor});\n`;\n\nexport const StyledMinus = styled(IconMinus)`\n    pointer-events: none;\n    user-select: none;\n    color: var(${tokens.accordionItemTextColor});\n    display: flex;\n    align-items: center;\n    position: absolute;\n    top: 0;\n    left: 0;\n\n    &.${classes.accordionPlusAnimationElement} {\n        transition: 0.2s;\n        transform: rotate(90deg);\n    }\n\n    &.${classes.accordionItemShowBody} {\n        transition: 0.2s;\n        transform: rotate(0deg);\n    }\n`;\n\nexport const StyledPlus = styled.div`\n    position: relative;\n    height: 1rem;\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    width: 1rem;\n`;\n"],"names":["StyledAccordionItem","styled","div","withConfig","componentId","tokens","accordionItemBackground","accordionItemBorder","accordionItemBorderBottom","classes","accordionDisabled","StyledAccordionHeader","button","accordionItemPadding","accordionItemGap","addFocus","outlineOffset","outlineSize","outlineRadius","outlineColor","concat","accordionItemFocus","StyledAccordionHeaderLeft","StyledAccordionContentRight","accordionItemShowBody","StyledAccordionContentLeft","StyledAccordionTitle","accordionItemTitleColor","accordionItemTitleFontFamily","accordionItemTitleFontSize","accordionItemTitleFontWeight","accordionItemTitleFontStyle","accordionItemTitleLetterSpacing","accordionItemTitleLineHeight","StyledAccordionBodyAnimate","accordionItemPaddingVertical","accordionPlusAnimationElement","StyledAccordionBody","accordionItemTextColor","accordionItemTextFontFamily","accordionItemTextFontSize","accordionItemTextFontWeight","accordionItemTextFontStyle","accordionItemTextLetterSpacing","accordionItemTextLineHeight","accordionItemPaddingHorizontal","accordionItemPaddingHorizontalLeft","StyledArrow","IconChevronDownFill","StyledMinus","IconMinus","StyledPlus"],"mappings":"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"}
+{"version":3,"file":"AccordionItem.styles.js","sources":["../../../../../src/components/Accordion/ui/AccordionItem/AccordionItem.styles.ts"],"sourcesContent":["import styled from 'styled-components';\n\nimport { IconChevronDownFill, IconMinus } from '../../../_Icon';\nimport { classes, tokens } from '../../Accordion.tokens';\nimport { addFocus } from '../../../../mixins';\n\nexport const StyledAccordionItem = styled.div`\n    background: var(${tokens.accordionItemBackground});\n    border: var(${tokens.accordionItemBorder});\n    border-bottom: var(${tokens.accordionItemBorderBottom});\n\n    &:last-child {\n        border-bottom: var(${tokens.accordionItemBorder});\n    }\n\n    &.${classes.accordionDisabled} {\n        opacity: 0.4;\n        cursor: not-allowed;\n    }\n`;\n\nexport const StyledAccordionHeader = styled.button`\n    width: 100%;\n    border: none;\n    padding: var(${tokens.accordionItemPadding});\n    display: flex;\n    gap: var(${tokens.accordionItemGap});\n    justify-content: space-between;\n    align-items: center;\n    background: none;\n    box-sizing: border-box;\n    cursor: pointer;\n\n    &:focus {\n        outline: none;\n    }\n\n    ${addFocus({\n        outlineOffset: '0.125rem',\n        outlineSize: '0.125rem',\n        outlineRadius: '0',\n        outlineColor: `var(${tokens.accordionItemFocus})`,\n    })}\n`;\n\nexport const StyledAccordionHeaderLeft = styled.div`\n    display: flex;\n    gap: var(${tokens.accordionItemGap});\n    justify-content: space-between;\n    align-items: center;\n`;\n\nexport const StyledAccordionContentRight = styled.div`\n    transition: 0.2s;\n    transform: rotate(90deg);\n\n    &.${classes.accordionItemShowBody} {\n        transition: 0.2s;\n        transform: rotate(0deg);\n    }\n`;\n\nexport const StyledAccordionContentLeft = styled.div`\n    transition: 0.2s;\n    display: flex;\n    align-items: center;\n\n    &.${classes.accordionItemShowBody} {\n        transition: 0.2s;\n        transform: rotate(180deg);\n    }\n`;\n\nexport const StyledAccordionTitle = styled.div`\n    color: var(${tokens.accordionItemTitleColor});\n    font-family: var(${tokens.accordionItemTitleFontFamily});\n    font-size: var(${tokens.accordionItemTitleFontSize});\n    font-weight: var(${tokens.accordionItemTitleFontWeight});\n    font-style: var(${tokens.accordionItemTitleFontStyle});\n    letter-spacing: var(${tokens.accordionItemTitleLetterSpacing});\n    line-height: var(${tokens.accordionItemTitleLineHeight});\n    text-align: left;\n`;\n\nexport const StyledAccordionBodyAnimate = styled.div`\n    display: grid;\n    grid-template-rows: 0fr;\n    transition: grid-template-rows 0.2s ease-out;\n    overflow: hidden;\n\n    &.${classes.accordionItemShowBody} {\n        grid-template-rows: 1fr;\n        padding-bottom: var(${tokens.accordionItemPaddingVertical});\n\n        &.${classes.accordionPlusAnimationElement} {\n            transition: 0.2s;\n            transform: rotate(0deg);\n        }\n    }\n`;\n\nexport const StyledAccordionBody = styled.div`\n    color: var(${tokens.accordionItemTextColor});\n    font-family: var(${tokens.accordionItemTextFontFamily});\n    font-size: var(${tokens.accordionItemTextFontSize});\n    font-weight: var(${tokens.accordionItemTextFontWeight});\n    font-style: var(${tokens.accordionItemTextFontStyle});\n    letter-spacing: var(${tokens.accordionItemTextLetterSpacing});\n    line-height: var(${tokens.accordionItemTextLineHeight});\n    overflow: hidden;\n    padding-right: var(${tokens.accordionItemPaddingHorizontal});\n    padding-left: var(${tokens.accordionItemPaddingHorizontalLeft});\n    text-align: left;\n`;\n\nexport const StyledArrow = styled(IconChevronDownFill)`\n    pointer-events: none;\n    user-select: none;\n    color: var(${tokens.accordionItemIconColor});\n`;\n\nexport const StyledMinus = styled(IconMinus)`\n    pointer-events: none;\n    user-select: none;\n    color: var(${tokens.accordionItemIconColor});\n    display: flex;\n    align-items: center;\n    position: absolute;\n    top: 0;\n    left: 0;\n\n    &.${classes.accordionPlusAnimationElement} {\n        transition: 0.2s;\n        transform: rotate(90deg);\n    }\n\n    &.${classes.accordionItemShowBody} {\n        transition: 0.2s;\n        transform: rotate(0deg);\n    }\n`;\n\nexport const StyledPlus = styled.div`\n    position: relative;\n    height: 1rem;\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    width: 1rem;\n`;\n"],"names":["StyledAccordionItem","styled","div","withConfig","componentId","tokens","accordionItemBackground","accordionItemBorder","accordionItemBorderBottom","classes","accordionDisabled","StyledAccordionHeader","button","accordionItemPadding","accordionItemGap","addFocus","outlineOffset","outlineSize","outlineRadius","outlineColor","concat","accordionItemFocus","StyledAccordionHeaderLeft","StyledAccordionContentRight","accordionItemShowBody","StyledAccordionContentLeft","StyledAccordionTitle","accordionItemTitleColor","accordionItemTitleFontFamily","accordionItemTitleFontSize","accordionItemTitleFontWeight","accordionItemTitleFontStyle","accordionItemTitleLetterSpacing","accordionItemTitleLineHeight","StyledAccordionBodyAnimate","accordionItemPaddingVertical","accordionPlusAnimationElement","StyledAccordionBody","accordionItemTextColor","accordionItemTextFontFamily","accordionItemTextFontSize","accordionItemTextFontWeight","accordionItemTextFontStyle","accordionItemTextLetterSpacing","accordionItemTextLineHeight","accordionItemPaddingHorizontal","accordionItemPaddingHorizontalLeft","StyledArrow","IconChevronDownFill","accordionItemIconColor","StyledMinus","IconMinus","StyledPlus"],"mappings":"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"}

package/es/components/Modal/Modal.js

@@ -1,14 +1,12 @@
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React, { forwardRef, useMemo, useCallback } from 'react';
-import { useForkRef, safeUseId } from '@salutejs/plasma-core';
+import { useFocusTrap, useForkRef, safeUseId } from '@salutejs/plasma-core';
 import '@linaria/core';
 import { component } from '../../engines/common.js';
 import { usePopupContext } from '../Popup/PopupContext.js';
 import { popupConfig } from '../Popup/Popup.js';
 import { Overlay } from '../Overlay/Overlay.js';
 import { DEFAULT_Z_INDEX } from '../Popup/utils/index.js';
-import { useFocusTrap } from '../../hooks/useFocusTrap.js';
-import '../../utils/react.js';
 import { classes, tokens } from './Modal.tokens.js';
 import { useModal } from './hooks/useModal.js';
 import { base } from './variations/_view/base.js';
@@ -43,7 +41,7 @@ var modalRoot = function modalRoot(Root) {
       view = _ref.view,
       isOpen = _ref.isOpen,
       rest = _objectWithoutProperties(_ref, _excluded);
-    var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef, true);
+    var trapRef = useFocusTrap(true, initialFocusRef, focusAfterRef);
     var popupController = usePopupContext();
     var innerRef = useForkRef(trapRef, outerRootRef);
     var uniqId = safeUseId();

package/es/components/Modal/Modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"Modal.js","sources":["../../../src/components/Modal/Modal.tsx"],"sourcesContent":["import React, { forwardRef, useCallback, useMemo } from 'react';\nimport { 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';\nimport { useFocusTrap } from '../../hooks';\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, true);\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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"}
+{"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/es/index.js

@@ -11,7 +11,6 @@ export { applySkeletonGradient, getSkeletonColor } from './mixins/applySkeletonG
 export { applyDisabled } from './mixins/applyDisabled.js';
 export { css } from './engines/index.js';
 export { useUniqId } from './hooks/useUniqId.js';
-export { useFocusTrap } from './hooks/useFocusTrap.js';
 export { usePreviousValue } from './hooks/usePreviousValue.js';
 export { useForceUpdate } from './hooks/useForceUpdate.js';
 export { useDidMountEffect } from './hooks/useDidMountEffect.js';

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salutejs/plasma-new-hope",
-  "version": "0.118.1-canary.1345.10282607319.0",
+  "version": "0.119.0-canary.1344.10281238925.0",
   "description": "Salute Design System blueprint",
   "main": "cjs/index.js",
   "module": "es/index.js",
@@ -80,7 +80,7 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.4",
     "@rollup/plugin-node-resolve": "^15.1.0",
-    "@salutejs/plasma-sb-utils": "0.163.1-canary.1345.10282607319.0",
+    "@salutejs/plasma-sb-utils": "0.164.0-canary.1344.10281238925.0",
     "@storybook/addon-docs": "^7.6.17",
     "@storybook/addon-essentials": "^7.6.17",
     "@storybook/addons": "^7.6.17",
@@ -110,7 +110,7 @@
     "@linaria/core": "5.0.2",
     "@linaria/react": "5.0.3",
     "@popperjs/core": "2.11.8",
-    "@salutejs/plasma-core": "1.165.1-canary.1345.10282607319.0",
+    "@salutejs/plasma-core": "1.166.0-canary.1344.10281238925.0",
     "dayjs": "1.11.11",
     "focus-visible": "5.2.0",
     "lodash.throttle": "4.1.1",
@@ -118,5 +118,5 @@
     "react-popper": "2.3.0",
     "storeon": "3.1.5"
   },
-  "gitHead": "ec124a34ebff82bfeca411fca9cf7961df4af595"
+  "gitHead": "b3509f311dd79716de2df8ad765e6d539b366755"
 }

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

@@ -29,6 +29,7 @@ var tokens = exports.tokens = {
   accordionItemFocus: '--plasma-accordion-item-focus',
   accordionItemBorder: '--plasma-accordion-item-border',
   accordionItemBorderBottom: '--plasma-accordion-item-border-bottom',
+  accordionItemIconColor: '--plasma-accordion-item-color-icon',
   accordionItemTitleColor: '--plasma-accordion-item-title-color',
   accordionItemTitleFontFamily: '--plasma-accordion-item-title-font-family',
   accordionItemTitleFontSize: '--plasma-accordion-item-title-font-size',

package/styled-components/cjs/components/Accordion/ui/AccordionItem/AccordionItem.styles.js

@@ -40,10 +40,10 @@ var StyledAccordionBody = exports.StyledAccordionBody = /*#__PURE__*/_styledComp
 })(["color:var(", ");font-family:var(", ");font-size:var(", ");font-weight:var(", ");font-style:var(", ");letter-spacing:var(", ");line-height:var(", ");overflow:hidden;padding-right:var(", ");padding-left:var(", ");text-align:left;"], _Accordion.tokens.accordionItemTextColor, _Accordion.tokens.accordionItemTextFontFamily, _Accordion.tokens.accordionItemTextFontSize, _Accordion.tokens.accordionItemTextFontWeight, _Accordion.tokens.accordionItemTextFontStyle, _Accordion.tokens.accordionItemTextLetterSpacing, _Accordion.tokens.accordionItemTextLineHeight, _Accordion.tokens.accordionItemPaddingHorizontal, _Accordion.tokens.accordionItemPaddingHorizontalLeft);
 var StyledArrow = exports.StyledArrow = /*#__PURE__*/(0, _styledComponents["default"])(_Icon.IconChevronDownFill).withConfig({
   componentId: "plasma-new-hope__sc-20ij9z-8"
-})(["pointer-events:none;user-select:none;color:var(", ");"], _Accordion.tokens.accordionItemTextColor);
+})(["pointer-events:none;user-select:none;color:var(", ");"], _Accordion.tokens.accordionItemIconColor);
 var StyledMinus = exports.StyledMinus = /*#__PURE__*/(0, _styledComponents["default"])(_Icon.IconMinus).withConfig({
   componentId: "plasma-new-hope__sc-20ij9z-9"
-})(["pointer-events:none;user-select:none;color:var(", ");display:flex;align-items:center;position:absolute;top:0;left:0;&.", "{transition:0.2s;transform:rotate(90deg);}&.", "{transition:0.2s;transform:rotate(0deg);}"], _Accordion.tokens.accordionItemTextColor, _Accordion.classes.accordionPlusAnimationElement, _Accordion.classes.accordionItemShowBody);
+})(["pointer-events:none;user-select:none;color:var(", ");display:flex;align-items:center;position:absolute;top:0;left:0;&.", "{transition:0.2s;transform:rotate(90deg);}&.", "{transition:0.2s;transform:rotate(0deg);}"], _Accordion.tokens.accordionItemIconColor, _Accordion.classes.accordionPlusAnimationElement, _Accordion.classes.accordionItemShowBody);
 var StyledPlus = exports.StyledPlus = /*#__PURE__*/_styledComponents["default"].div.withConfig({
   componentId: "plasma-new-hope__sc-20ij9z-10"
 })(["position:relative;height:1rem;display:flex;align-items:center;justify-content:center;width:1rem;"]);

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

@@ -11,9 +11,8 @@ var _engines = /*#__PURE__*/require("../../engines");
 var _Popup = /*#__PURE__*/require("../Popup");
 var _Overlay = /*#__PURE__*/require("../Overlay");
 var _utils = /*#__PURE__*/require("../Popup/utils");
-var _hooks = /*#__PURE__*/require("../../hooks");
 var _Modal = /*#__PURE__*/require("./Modal.tokens");
-var _hooks2 = /*#__PURE__*/require("./hooks");
+var _hooks = /*#__PURE__*/require("./hooks");
 var _base = /*#__PURE__*/require("./variations/_view/base");
 var _ModalContext = /*#__PURE__*/require("./ModalContext");
 var _excluded = ["id", "withAnimation", "onClose", "onOverlayClick", "onEscKeyDown", "closeOnEsc", "closeOnOverlayClick", "withBlur", "initialFocusRef", "focusAfterRef", "zIndex", "popupInfo", "children", "view", "isOpen"];
@@ -49,13 +48,13 @@ var modalRoot = exports.modalRoot = function modalRoot(Root) {
       view = _ref.view,
       isOpen = _ref.isOpen,
       rest = _objectWithoutProperties(_ref, _excluded);
-    var trapRef = (0, _hooks.useFocusTrap)(true, initialFocusRef, focusAfterRef, true);
+    var trapRef = (0, _plasmaCore.useFocusTrap)(true, initialFocusRef, focusAfterRef);
     var popupController = (0, _Popup.usePopupContext)();
     var innerRef = (0, _plasmaCore.useForkRef)(trapRef, outerRootRef);
     var uniqId = (0, _plasmaCore.safeUseId)();
     var innerId = id || uniqId;
     var overlayBackgroundToken = withBlur ? "var(".concat(_Modal.tokens.modalOverlayWithBlurColor, ")") : "var(".concat(_Modal.tokens.modalOverlayColor, ")");
-    var _useModal = (0, _hooks2.useModal)({
+    var _useModal = (0, _hooks.useModal)({
         id: innerId,
         isOpen: isOpen,
         closeOnEsc: closeOnEsc,

package/styled-components/cjs/examples/plasma_b2c/components/Accordion/Accordion.config.js

@@ -13,8 +13,8 @@ var config = exports.config = {
   },
   variations: {
     view: {
-      "default": /*#__PURE__*/(0, _styledComponents.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(", ");"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemPaddingHorizontal, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft, _Accordion.accordionTokens.accordionItemPaddingHorizontal),
-      clear: /*#__PURE__*/(0, _styledComponents.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;"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionItemBorderRadius, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft)
+      "default": /*#__PURE__*/(0, _styledComponents.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(", ");"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemPaddingHorizontal, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemIconColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft, _Accordion.accordionTokens.accordionItemPaddingHorizontal),
+      clear: /*#__PURE__*/(0, _styledComponents.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;"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemIconColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionItemBorderRadius, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft)
     },
     size: {
       l: /*#__PURE__*/(0, _styledComponents.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);"], _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemPaddingHorizontal, _Accordion.accordionTokens.accordionItemGap, _Accordion.accordionTokens.accordionItemBorderRadius, _Accordion.accordionTokens.accordionItemTitleFontFamily, _Accordion.accordionTokens.accordionItemTitleFontSize, _Accordion.accordionTokens.accordionItemTitleFontStyle, _Accordion.accordionTokens.accordionItemTitleFontWeight, _Accordion.accordionTokens.accordionItemTitleLetterSpacing, _Accordion.accordionTokens.accordionItemTitleLineHeight, _Accordion.accordionTokens.accordionItemTextFontFamily, _Accordion.accordionTokens.accordionItemTextFontSize, _Accordion.accordionTokens.accordionItemTextFontStyle, _Accordion.accordionTokens.accordionItemTextFontWeight, _Accordion.accordionTokens.accordionItemTextLetterSpacing, _Accordion.accordionTokens.accordionItemTextLineHeight),

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

@@ -1,4 +1,4 @@
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useState } from 'react';
 import styled from 'styled-components';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
@@ -6,7 +6,6 @@ import { SSRProvider } from '@salutejs/plasma-core';
 
 import { PopupProvider, popupClasses } from '../Popup/Popup';
 import { Button } from '../Button/Button';
-import { TextField } from '../TextField/TextField';
 import { WithTheme } from '../../../_helpers';
 
 import { Modal, modalClasses } from './Modal';
@@ -207,114 +206,3 @@ export const ModalDemo: StoryObj<StoryModalProps> = {
     },
     render: (args) => <StoryModalDemo {...args} />,
 };
-
-const StyledModalAnimation = styled(Modal)`
-    /* stylelint-disable */
-    && .${popupClasses.root} {
-        animation: fadeIn 1s forwards;
-    }
-
-    &&.${popupClasses.endAnimation} .${popupClasses.root} {
-        animation: fadeOut 1s forwards;
-    }
-
-    && .${modalClasses.overlay} {
-        animation: overlayFadeIn 1s forwards;
-    }
-
-    &&.${popupClasses.endAnimation} .${modalClasses.overlay} {
-        animation: overlayFadeOut 1s forwards;
-    }
-    /* stylelint-enable */
-
-    @keyframes overlayFadeIn {
-        from {
-            opacity: 0;
-        }
-
-        to {
-            opacity: 1;
-        }
-    }
-
-    @keyframes overlayFadeOut {
-        from {
-            opacity: 1;
-        }
-
-        to {
-            opacity: 0;
-        }
-    }
-
-    @keyframes fadeIn {
-        from {
-            opacity: 0;
-            transform: translate(-50%, 100%);
-        }
-
-        to {
-            opacity: 1;
-            transform: translate(-50%, -50%);
-        }
-    }
-
-    @keyframes fadeOut {
-        from {
-            opacity: 1;
-            transform: translate(-50%, -50%);
-        }
-
-        to {
-            opacity: 0;
-            transform: translate(-50%, 100%);
-        }
-    }
-`;
-
-const StoryModalAnimationDemo = ({ placement, offsetX, offsetY, ...rest }: StoryModalProps) => {
-    const ref = useRef(null);
-    const [isOpen, setIsOpen] = useState(false);
-
-    const close = useCallback(() => {
-        setIsOpen(false);
-    }, []);
-
-    return (
-        <SSRProvider>
-            <PopupProvider>
-                <Button view="default" text="Открыть новое модальное окно" onClick={() => setIsOpen(!isOpen)} />
-                <StyledModalAnimation
-                    id="modal"
-                    frame="theme-root"
-                    withAnimation
-                    onClose={() => setIsOpen(false)}
-                    isOpen={isOpen}
-                    placement={placement}
-                    offset={[offsetX, offsetY]}
-                    initialFocusRef={ref}
-                    {...rest}
-                >
-                    <Content>
-                        <TextField value="Text" onChange={() => {}} />
-                        <TextField ref={ref} value="Text2" onChange={() => {}} />
-                        <Button text="Закрыть" onClick={close} />
-                    </Content>
-                </StyledModalAnimation>
-            </PopupProvider>
-        </SSRProvider>
-    );
-};
-
-export const ModalBottomAnimation: StoryObj<StoryModalProps> = {
-    args: {
-        placement: 'bottom',
-        withAnimation: true,
-        withBlur: false,
-        closeOnEsc: true,
-        closeOnOverlayClick: true,
-        offsetX: 0,
-        offsetY: 0,
-    },
-    render: (args) => <StoryModalAnimationDemo {...args} />,
-};

package/styled-components/cjs/examples/plasma_web/components/Accordion/Accordion.config.js

@@ -13,8 +13,8 @@ var config = exports.config = {
   },
   variations: {
     view: {
-      "default": /*#__PURE__*/(0, _styledComponents.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(", ");"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemPaddingHorizontal, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft, _Accordion.accordionTokens.accordionItemPaddingHorizontal),
-      clear: /*#__PURE__*/(0, _styledComponents.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;"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionItemBorderRadius, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft)
+      "default": /*#__PURE__*/(0, _styledComponents.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(", ");"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemPaddingHorizontal, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemIconColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft, _Accordion.accordionTokens.accordionItemPaddingHorizontal),
+      clear: /*#__PURE__*/(0, _styledComponents.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;"], _Accordion.accordionTokens.accordionGap, _Accordion.accordionTokens.accordionWidth, _Accordion.accordionTokens.accordionItemPadding, _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemBackground, _Accordion.accordionTokens.accordionItemTitleColor, _Accordion.accordionTokens.accordionItemTextColor, _Accordion.accordionTokens.accordionItemIconColor, _Accordion.accordionTokens.accordionItemFocus, _Accordion.accordionTokens.accordionItemBorderRadius, _Accordion.accordionTokens.accordionBackground, _Accordion.accordionTokens.accordionItemBorder, _Accordion.accordionTokens.accordionItemBorderBottom, _Accordion.accordionTokens.accordionItemPaddingHorizontalLeft)
     },
     size: {
       l: /*#__PURE__*/(0, _styledComponents.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);"], _Accordion.accordionTokens.accordionItemPaddingVertical, _Accordion.accordionTokens.accordionItemPaddingHorizontal, _Accordion.accordionTokens.accordionItemGap, _Accordion.accordionTokens.accordionItemBorderRadius, _Accordion.accordionTokens.accordionItemTitleFontFamily, _Accordion.accordionTokens.accordionItemTitleFontSize, _Accordion.accordionTokens.accordionItemTitleFontStyle, _Accordion.accordionTokens.accordionItemTitleFontWeight, _Accordion.accordionTokens.accordionItemTitleLetterSpacing, _Accordion.accordionTokens.accordionItemTitleLineHeight, _Accordion.accordionTokens.accordionItemTextFontFamily, _Accordion.accordionTokens.accordionItemTextFontSize, _Accordion.accordionTokens.accordionItemTextFontStyle, _Accordion.accordionTokens.accordionItemTextFontWeight, _Accordion.accordionTokens.accordionItemTextLetterSpacing, _Accordion.accordionTokens.accordionItemTextLineHeight),