@salutejs/plasma-new-hope 0.170.0-dev.0 → 0.171.0-canary.1484.11400899769.0

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

@@ -135,6 +135,38 @@ import TabItem from '@theme/TabItem';
     </TabItem>
 </Tabs>
 
+### Использование Accordion в Controlled варианте
+
+```tsx live
+    import React, { useState } from 'react';
+    import { Accordion, AccordionItem, IconButton } from '@salutejs/{{ package }}';
+    import { IconPlus } from '@salutejs/plasma-icons';
+
+    export function App() {
+        const [activeFirst, setActiveFirst] = useState(false);
+        const [activeSecond, setActiveSecond] = useState(false);
+        const [activeThree, setActiveThree] = useState(false);
+
+        const contentRight = (active, setActive) => {
+            return (
+                <IconButton view="secondary" size="s" onClick={() => setActive(!active)}>
+                    <IconPlus size="xs" />
+                </IconButton>
+            )
+        }
+
+        return (
+            <div>
+                <Accordion size="s" singleActive={true}>
+                    <AccordionItem opened={activeFirst} contentRight={contentRight(activeFirst, setActiveFirst)} type="arrow" title="Как оплатить заправку бонусами СберСпасибо?">После указания деталей заправки нажмите кнопку «К оплате». Откроется окно оплаты, где вы сможете списать бонусы и оплатить ими до 99% стоимости топлива</AccordionItem>
+                    <AccordionItem opened={activeSecond} contentRight={contentRight(activeSecond, setActiveSecond)} type="arrow" title="Как оплатить заправку бонусами СберСпасибо?">После указания деталей заправки нажмите кнопку «К оплате». Откроется окно оплаты, где вы сможете списать бонусы и оплатить ими до 99% стоимости топлива</AccordionItem>
+                    <AccordionItem opened={activeThree} contentRight={contentRight(activeThree, setActiveThree)} type="arrow" title="Как оплатить заправку бонусами СберСпасибо?">После указания деталей заправки нажмите кнопку «К оплате». Откроется окно оплаты, где вы сможете списать бонусы и оплатить ими до 99% стоимости топлива</AccordionItem>
+                </Accordion>
+            </div>
+        );
+    }
+    ```
+
 ### Использование Accordion SingleActive
 
 ```tsx live

package/styled-components/es/components/Accordion/ui/AccordionItem/AccordionItem.js

@@ -11,12 +11,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useRef, forwardRef, useEffect } from 'react';
 import { convertRoundnessMatrix } from '../../../../utils/roundness';
 import { classes, tokens } from '../../Accordion.tokens';
 import { cx } from '../../../../utils';
 import { StyledAccordionItem, StyledAccordionHeader, StyledAccordionBody, StyledAccordionTitle, StyledAccordionContentLeft, StyledAccordionHeaderLeft, StyledAccordionContentRight, StyledArrow, StyledMinus, StyledPlus, StyledAccordionBodyAnimate } from './AccordionItem.styles';
-export var AccordionItem = function AccordionItem(_ref) {
+export var AccordionItem = /*#__PURE__*/forwardRef(function (_ref, outerRef) {
   var _ref2;
   var value = _ref.value,
     contentRight = _ref.contentRight,
@@ -34,8 +34,10 @@ export var AccordionItem = function AccordionItem(_ref) {
     disabled = _ref.disabled,
     _ref$alignWithTitle = _ref.alignWithTitle,
     alignWithTitle = _ref$alignWithTitle === void 0 ? true : _ref$alignWithTitle,
+    opened = _ref.opened,
     view = _ref.view,
-    onChange = _ref.onChange;
+    onChange = _ref.onChange,
+    onClick = _ref.onClick;
   var key = (_ref2 = eventKey !== null && eventKey !== void 0 ? eventKey : index) !== null && _ref2 !== void 0 ? _ref2 : 0;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -48,6 +50,9 @@ export var AccordionItem = function AccordionItem(_ref) {
     if (onChange) {
       onChange(key, !value);
     }
+    if (onClick) {
+      onClick(key, !value);
+    }
   };
   var leftContentRef = useRef(null);
   useEffect(function () {
@@ -56,11 +61,11 @@ export var AccordionItem = function AccordionItem(_ref) {
     var leftPaddingBody = leftContentWidth && (alignWithTitle || view === 'clear') ? "calc(".concat(leftContentWidth, "px + var(").concat(tokens.accordionItemGap, "))") : 0;
     setLeftPadding(leftPaddingBody);
   }, [value, type, leftContentRef, setLeftPadding]);
-  var openedBodyClass = value ? classes.accordionItemShowBody : undefined;
-  var StyledAnimationPLus = function StyledAnimationPLus() {
+  var openedBodyClass = (opened !== null && opened !== void 0 ? opened : value) ? classes.accordionItemShowBody : undefined;
+  var StyledAnimationPlus = function StyledAnimationPlus() {
     return /*#__PURE__*/React.createElement(StyledPlus, null, _StyledMinus || (_StyledMinus = /*#__PURE__*/React.createElement(StyledMinus, {
       size: "xs",
-      color: "inhert"
+      color: "inherit"
     })), /*#__PURE__*/React.createElement(StyledMinus, {
       size: "xs",
       color: "inhert",
@@ -71,14 +76,15 @@ export var AccordionItem = function AccordionItem(_ref) {
   var disabledClass = disabled ? classes.accordionDisabled : '';
   var leftContent = contentLeft !== null && contentLeft !== void 0 ? contentLeft : type === 'arrow' ? _StyledArrow || (_StyledArrow = /*#__PURE__*/React.createElement(StyledArrow, {
     size: "xs",
-    color: "inhert"
+    color: "inherit"
   })) : undefined;
-  var leftContentRotate = type === 'arrow' && value ? classes.accordionItemShowBody : undefined;
-  var rightContent = contentRight !== null && contentRight !== void 0 ? contentRight : type === 'sign' ? /*#__PURE__*/React.createElement(StyledAnimationPLus, null) : undefined;
-  var rightContentRotate = type === 'sign' && value ? classes.accordionItemShowBody : undefined;
+  var leftContentRotate = type === 'arrow' && (opened !== null && opened !== void 0 ? opened : value) ? classes.accordionItemShowBody : undefined;
+  var rightContent = contentRight !== null && contentRight !== void 0 ? contentRight : type === 'sign' ? /*#__PURE__*/React.createElement(StyledAnimationPlus, null) : undefined;
+  var rightContentRotate = type === 'sign' && (opened !== null && opened !== void 0 ? opened : value) ? classes.accordionItemShowBody : undefined;
   return /*#__PURE__*/React.createElement(StyledAccordionItem, {
     className: cx(classes.accordionItem, className, disabledClass),
     key: key,
+    ref: outerRef,
     style: _objectSpread({
       borderRadius: accordionBorderRadius
     }, style)
@@ -86,17 +92,17 @@ export var AccordionItem = function AccordionItem(_ref) {
     role: "tab",
     tabIndex: 0,
     onClick: handleOpen,
-    "aria-expanded": value,
+    "aria-expanded": opened !== null && opened !== void 0 ? opened : value,
     "aria-controls": "accordion-item-section".concat(key),
     id: "accordion-item-".concat(key)
   }, /*#__PURE__*/React.createElement(StyledAccordionHeaderLeft, null, leftContent && /*#__PURE__*/React.createElement(StyledAccordionContentLeft, {
     ref: leftContentRef,
     className: leftContentRotate
-  }, leftContent), /*#__PURE__*/React.createElement(StyledAccordionTitle, null, title)), /*#__PURE__*/React.createElement(StyledAccordionContentRight, {
+  }, leftContent), /*#__PURE__*/React.createElement(StyledAccordionTitle, null, title)), contentRight || /*#__PURE__*/React.createElement(StyledAccordionContentRight, {
     className: rightContentRotate
   }, rightContent && rightContent)), /*#__PURE__*/React.createElement(StyledAccordionBodyAnimate, {
     "aria-labelledby": "accordion-item-".concat(key),
-    "aria-hidden": !value,
+    "aria-hidden": !(opened !== null && opened !== void 0 ? opened : value),
     id: "accordion-item-section".concat(key),
     className: cx(openedBodyClass),
     style: {
@@ -105,4 +111,4 @@ export var AccordionItem = function AccordionItem(_ref) {
   }, /*#__PURE__*/React.createElement(StyledAccordionBody, {
     className: classes.accordionItemBody
   }, children)));
-};
+});

package/styled-components/es/examples/plasma_b2c/components/Accordion/Accordion.stories.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import type { ComponentProps, ReactNode } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
 import { disableProps } from '@salutejs/plasma-sb-utils';
@@ -7,6 +7,8 @@ import { mergeConfig } from '../../../../engines';
 import { WithTheme, argTypesFromConfig } from '../../../_helpers';
 import { accordionConfig } from '../../../../components/Accordion';
 import { Pin } from '../../../../utils/roundness';
+import { IconButton } from '../IconButton/IconButton';
+import { IconPlus } from '../../../../components/_Icon';
 
 import { config } from './Accordion.config';
 import { Accordion, AccordionItem } from './Accordion';
@@ -91,3 +93,63 @@ export const Default: StoryObj<AccordionProps> = {
         );
     },
 };
+
+const getSizeForIcon = (size) => (size === 'xs' ? 'xs' : 's');
+
+const ControlledAccordion = (props: AccordionProps) => {
+    const args = { ...props, text: undefined };
+    const [activeFirst, setActiveFirst] = useState(false);
+    const [activeSecond, setActiveSecond] = useState(false);
+    const [activeThree, setActiveThree] = useState(false);
+
+    return (
+        <Accordion {...args}>
+            <AccordionItem
+                contentRight={
+                    <IconButton view="secondary" size={args.size} onClick={() => setActiveFirst(!activeFirst)}>
+                        <IconPlus size={getSizeForIcon(args.size)} />
+                    </IconButton>
+                }
+                alignWithTitle={args.alignWithTitle}
+                type={args.type}
+                pin={args.pin}
+                title={args.title}
+                opened={activeFirst}
+            >
+                {args.body}
+            </AccordionItem>
+            <AccordionItem
+                contentRight={
+                    <IconButton view="secondary" size={args.size} onClick={() => setActiveSecond(!activeSecond)}>
+                        <IconPlus size={getSizeForIcon(args.size)} />
+                    </IconButton>
+                }
+                alignWithTitle={args.alignWithTitle}
+                type={args.type}
+                pin={args.pin}
+                title={args.title}
+                opened={activeSecond}
+            >
+                {args.body}
+            </AccordionItem>
+            <AccordionItem
+                contentRight={
+                    <IconButton view="secondary" size={args.size} onClick={() => setActiveThree(!activeThree)}>
+                        <IconPlus size={getSizeForIcon(args.size)} />
+                    </IconButton>
+                }
+                alignWithTitle={args.alignWithTitle}
+                type={args.type}
+                pin={args.pin}
+                title={args.title}
+                opened={activeThree}
+            >
+                {args.body}
+            </AccordionItem>
+        </Accordion>
+    );
+};
+
+export const Controlled: StoryObj<AccordionProps> = {
+    render: (props: AccordionProps) => ControlledAccordion(props),
+};

package/styled-components/es/examples/plasma_web/components/Accordion/Accordion.stories.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import type { ComponentProps, ReactNode } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
 import { disableProps } from '@salutejs/plasma-sb-utils';
@@ -7,6 +7,8 @@ import { mergeConfig } from '../../../../engines';
 import { WithTheme, argTypesFromConfig } from '../../../_helpers';
 import { accordionConfig } from '../../../../components/Accordion';
 import { Pin } from '../../../../utils/roundness';
+import { IconButton } from '../IconButton/IconButton';
+import { IconPlus } from '../../../../components/_Icon';
 
 import { config } from './Accordion.config';
 import { Accordion, AccordionItem } from './Accordion';
@@ -91,3 +93,63 @@ export const Default: StoryObj<AccordionProps> = {
         );
     },
 };
+
+const getSizeForIcon = (size) => (size === 'xs' ? 'xs' : 's');
+
+const ControlledAccordion = (props: AccordionProps) => {
+    const args = { ...props, text: undefined };
+    const [activeFirst, setActiveFirst] = useState(false);
+    const [activeSecond, setActiveSecond] = useState(false);
+    const [activeThree, setActiveThree] = useState(false);
+
+    return (
+        <Accordion {...args}>
+            <AccordionItem
+                contentRight={
+                    <IconButton view="secondary" size={args.size} onClick={() => setActiveFirst(!activeFirst)}>
+                        <IconPlus size={getSizeForIcon(args.size)} />
+                    </IconButton>
+                }
+                alignWithTitle={args.alignWithTitle}
+                type={args.type}
+                pin={args.pin}
+                title={args.title}
+                opened={activeFirst}
+            >
+                {args.body}
+            </AccordionItem>
+            <AccordionItem
+                contentRight={
+                    <IconButton view="secondary" size={args.size} onClick={() => setActiveSecond(!activeSecond)}>
+                        <IconPlus size={getSizeForIcon(args.size)} />
+                    </IconButton>
+                }
+                alignWithTitle={args.alignWithTitle}
+                type={args.type}
+                pin={args.pin}
+                title={args.title}
+                opened={activeSecond}
+            >
+                {args.body}
+            </AccordionItem>
+            <AccordionItem
+                contentRight={
+                    <IconButton view="secondary" size={args.size} onClick={() => setActiveThree(!activeThree)}>
+                        <IconPlus size={getSizeForIcon(args.size)} />
+                    </IconButton>
+                }
+                alignWithTitle={args.alignWithTitle}
+                type={args.type}
+                pin={args.pin}
+                title={args.title}
+                opened={activeThree}
+            >
+                {args.body}
+            </AccordionItem>
+        </Accordion>
+    );
+};
+
+export const Controlled: StoryObj<AccordionProps> = {
+    render: (props: AccordionProps) => ControlledAccordion(props),
+};

package/types/components/Accordion/ui/AccordionItem/AccordionItem.d.ts

@@ -1,4 +1,19 @@
 import React from 'react';
-import type { AccordionItemProps } from './AccordionItem.types';
-export declare const AccordionItem: React.FC<AccordionItemProps>;
+export declare const AccordionItem: React.ForwardRefExoticComponent<Omit<React.HTMLAttributes<HTMLElement>, "title" | "onChange"> & {
+    value?: boolean | undefined;
+    type?: "arrow" | "clear" | "sign" | undefined;
+    contentLeft?: React.ReactNode;
+    alignWithTitle?: boolean | undefined;
+    contentRight?: React.ReactNode;
+    pin?: "square-square" | "square-clear" | "clear-square" | "clear-clear" | "clear-circle" | "circle-clear" | "circle-circle" | undefined;
+    title?: React.ReactNode;
+    children: React.ReactNode;
+    onChange?: ((index: number, value: boolean) => void) | undefined;
+    onClick?: ((index: number, value: boolean) => void) | undefined;
+    disabled?: boolean | undefined;
+    opened?: boolean | undefined;
+    eventKey?: number | undefined;
+    index?: number | undefined;
+    view?: string | undefined;
+} & React.RefAttributes<HTMLDivElement>>;
 //# sourceMappingURL=AccordionItem.d.ts.map

package/types/components/Accordion/ui/AccordionItem/AccordionItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccordionItem.d.ts","sourceRoot":"","sources":["../../../../../src/components/Accordion/ui/AccordionItem/AccordionItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAmB3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAqGtD,CAAC"}
+{"version":3,"file":"AccordionItem.d.ts","sourceRoot":"","sources":["../../../../../src/components/Accordion/ui/AccordionItem/AccordionItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAqBvE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;wCAkHzB,CAAC"}

package/types/components/Accordion/ui/AccordionItem/AccordionItem.types.d.ts

@@ -2,7 +2,7 @@ import type { ReactNode, HTMLAttributes } from 'react';
 import type { Pin } from '../../../../utils/roundness';
 declare type Props = {
     /**
-     * Значение раскрытия accordion
+     * Значение раскрытия элемента accordion
      */
     value?: boolean;
     /**
@@ -22,31 +22,39 @@ declare type Props = {
      */
     contentRight?: ReactNode;
     /**
-     * Скругление accordion
+     * Скругление элемента accordion
      */
     pin?: Pin;
     /**
-     * Заголовок accordion
+     * Заголовок элемента accordion
      */
-    title: ReactNode;
+    title?: ReactNode | string;
     /**
-     * Контент аккордеона
+     * Контент элемента accordion
      */
     children: ReactNode;
     /**
-     * @deprecated Внутренняя функция при открытии accordion (будет удалена в ближайшее время)
+     * @deprecated Внутренняя функция при открытии accordion (будет удалена в ближайшее время), использовать onClick
      */
     onChange?: (index: number, value: boolean) => void;
     /**
-     * Блокировка элемента
+     * Функция при открытии accordion
+     */
+    onClick?: (index: number, value: boolean) => void;
+    /**
+     * Блокировка элемента accordion
      */
     disabled?: boolean;
     /**
-     * Индекс элемента, который необходимо автоматически открыть
+     * Контроль элемента accordion из вне
+     */
+    opened?: boolean;
+    /**
+     * Индекс элемента accordion, который необходимо автоматически открыть
      */
     eventKey?: number;
     /**
-     * @deprecated Внутреннее свойство индекс элемента (будет удалено в ближайшее время)
+     * @deprecated Внутреннее свойство индекс элемента accordion (будет удалено в ближайшее время)
      */
     index?: number;
     /**

package/types/components/Accordion/ui/AccordionItem/AccordionItem.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccordionItem.types.d.ts","sourceRoot":"","sources":["../../../../../src/components/Accordion/ui/AccordionItem/AccordionItem.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAEvD,aAAK,KAAK,GAAG;IACT;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;IAElC;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IAExB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IAEzB;;OAEG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,SAAS,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAMnB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC"}
+{"version":3,"file":"AccordionItem.types.d.ts","sourceRoot":"","sources":["../../../../../src/components/Accordion/ui/AccordionItem/AccordionItem.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAEvD,aAAK,KAAK,GAAG;IACT;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;IAElC;;OAEG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IAExB;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IAEzB;;OAEG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAE3B;;OAEG;IACH,QAAQ,EAAE,SAAS,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAEnD;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAElD;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAMjB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC"}