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

package/styled-components/cjs/examples/plasma_web/components/Tabs/Tabs.stories.tsx

@@ -1,26 +1,54 @@
 import React, { useState } from 'react';
 import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
-import styled from 'styled-components';
+import { disableProps } from '@salutejs/plasma-sb-utils';
 
 import { tabsConfig } from '../../../../components/Tabs';
 import { mergeConfig } from '../../../../engines';
 import { argTypesFromConfig, WithTheme } from '../../../_helpers';
 import { IconMic } from '../../../../components/_Icon';
+import { Dropdown } from '../Dropdown/Dropdown';
+import { Counter } from '../Counter/Counter';
 
 import { config } from './Tabs.config';
 import { Tabs } from './Tabs';
 import { TabItem } from './TabItem';
 
-const tabItemViews = ['clear', 'default', 'divider', 'secondary'];
+const clips = ['none', 'scroll', 'showAll'];
+const sizes = ['xs', 's', 'm', 'l'] as const;
+const headerSizes = ['h5', 'h4', 'h3', 'h2', 'h1'] as const;
+
+type Size = typeof sizes[number];
 
 type CustomStoryTabsProps = {
-    tabItemView: string;
-    itemsNumber?: number;
-    animated?: boolean;
-    label?: string;
-    showLeftContent: boolean;
-    showRightContent: boolean;
+    hasDivider: boolean;
+    itemQuantity: number;
+    contentLeft: string;
+    contentRight: string;
+};
+
+const contentLeftOptions = ['none', 'icon'];
+const contentRightOptions = ['none', 'text', 'counter', 'icon'];
+
+const getContentLeft = (contentLeftOption: string, size: Size) => {
+    const iconSize = size === 'xs' ? 'xs' : 's';
+    return contentLeftOption === 'icon' ? <IconMic size={iconSize} color="inherit" /> : undefined;
+};
+
+const getContentRight = (contentRightOption: string, size: Size) => {
+    const iconSize = size === 'xs' ? 'xs' : 's';
+    const counterSize = size === 'xs' ? 'xxs' : 'xs';
+
+    switch (contentRightOption) {
+        case 'icon':
+            return <IconMic size={iconSize} color="inherit" />;
+        case 'counter':
+            return <Counter size={counterSize} count={1} view="positive" />;
+        case 'text':
+            return <div>Text</div>;
+        default:
+            return undefined;
+    }
 };
 
 type StoryTabsProps = ComponentProps<typeof Tabs> & CustomStoryTabsProps;
@@ -31,12 +59,19 @@ const meta: Meta<StoryTabsProps> = {
     decorators: [WithTheme],
     argTypes: {
         ...argTypesFromConfig(mergeConfig(tabsConfig, config)),
-        tabItemView: {
-            options: tabItemViews,
+        contentLeft: {
+            options: contentLeftOptions,
+            control: {
+                type: 'select',
+            },
+        },
+        contentRight: {
+            options: contentRightOptions,
             control: {
                 type: 'select',
             },
         },
+        ...disableProps(['itemsNumber', 'pilled', 'animated', 'view']),
     },
 };
 
@@ -44,219 +79,225 @@ export default meta;
 
 const StoryDefault = (props: StoryTabsProps) => {
     const {
-        itemsNumber,
-        label,
-        view,
         disabled,
+        itemQuantity,
+        size,
+        contentLeft: contentLeftOption,
+        contentRight: contentRightOption,
+        hasDivider,
         stretch,
-        pilled,
-        animated,
-        tabItemView,
+    } = props;
+    const items = Array(itemQuantity).fill(0);
+    const [index, setIndex] = useState(0);
+
+    return (
+        <Tabs view={hasDivider ? 'divider' : 'clear'} stretch={stretch} disabled={disabled} size={size}>
+            {items.map((_, i) => (
+                <TabItem
+                    key={`item:${i}`}
+                    view="divider"
+                    selected={i === index}
+                    onClick={() => !disabled && setIndex(i)}
+                    tabIndex={!disabled ? 0 : -1}
+                    disabled={disabled}
+                    contentLeft={getContentLeft(contentLeftOption, size as Size)}
+                    contentRight={getContentRight(contentRightOption, size as Size)}
+                    size={size}
+                >
+                    {`Label${i + 1}`}
+                </TabItem>
+            ))}
+        </Tabs>
+    );
+};
+
+const StoryScroll = (props: StoryTabsProps) => {
+    const {
+        disabled,
+        itemQuantity,
+        clip,
         size,
-        showLeftContent,
-        showRightContent,
+        contentLeft: contentLeftOption,
+        contentRight: contentRightOption,
+        hasDivider,
     } = props;
-    const items = Array(itemsNumber).fill(0);
-    const secondItems = Array(10).fill(0);
+    const items = Array(itemQuantity).fill(0);
     const [index, setIndex] = useState(0);
-    const [secondIndex, setSecondIndex] = useState(0);
-    const [thirdIndex, setThirdIndex] = useState(0);
 
     return (
-        <>
-            <h3>Tabs with auto width</h3>
-            <Tabs view={view} stretch={stretch} pilled={pilled} disabled={disabled} size={size}>
-                {items.map((_, i) => (
-                    <TabItem
-                        key={`item:${i}`}
-                        view={tabItemView}
-                        selected={i === index}
-                        onClick={() => !disabled && setIndex(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        disabled={disabled}
-                        pilled={pilled}
-                        animated={animated}
-                        contentLeft={showLeftContent && <IconMic size="xs" color="inherit" />}
-                        contentRight={showRightContent && <div>Text</div>}
-                        size={size}
-                    >
-                        {label}
-                    </TabItem>
-                ))}
-            </Tabs>
+        <Tabs
+            clip={clip}
+            view={hasDivider ? 'divider' : 'clear'}
+            disabled={disabled}
+            size={size}
+            style={{ width: '15rem' }}
+        >
+            {items.map((_, i) => (
+                <TabItem
+                    key={`item:${i}`}
+                    view="divider"
+                    selected={i === index}
+                    onClick={() => !disabled && setIndex(i)}
+                    tabIndex={!disabled ? 0 : -1}
+                    disabled={disabled}
+                    contentLeft={getContentLeft(contentLeftOption, size as Size)}
+                    contentRight={getContentRight(contentRightOption, size as Size)}
+                    size={size}
+                >
+                    {`Label${i + 1}`}
+                </TabItem>
+            ))}
+        </Tabs>
+    );
+};
 
-            <h3>Tabs with fixed width</h3>
-            <Tabs
-                view={view}
-                stretch={stretch}
-                pilled={pilled}
-                disabled={disabled}
-                size={size}
-                style={{ width: '28.5rem' }}
-            >
-                {secondItems.map((_, i) => (
-                    <TabItem
-                        key={`item:${i}`}
-                        view={tabItemView}
-                        selected={i === secondIndex}
-                        onClick={() => !disabled && setSecondIndex(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        disabled={disabled}
-                        pilled={pilled}
-                        animated={animated}
-                        contentLeft={showLeftContent && <IconMic size="xs" color="inherit" />}
-                        contentRight={showRightContent && <div>Text</div>}
-                        size={size}
-                    >
-                        {label}
-                    </TabItem>
-                ))}
-            </Tabs>
+const StoryShowAll = (props: StoryTabsProps) => {
+    const {
+        disabled,
+        itemQuantity,
+        clip,
+        size,
+        contentLeft: contentLeftOption,
+        contentRight: contentRightOption,
+        hasDivider,
+    } = props;
+    const maxItemQuantity = 3;
+    const items = Array(itemQuantity).fill(0);
+    const [index, setIndex] = useState(0);
+
+    const visibleItems = items.slice(0, maxItemQuantity);
+    const otherItems = items.slice(maxItemQuantity);
 
-            <h3>Tabs with arrow navigation</h3>
-            <Tabs view={view} index={thirdIndex} stretch={stretch} pilled={pilled} disabled={disabled} size={size}>
-                {items.map((_, i) => (
-                    <TabItem
-                        key={`item:${i}`}
-                        view={tabItemView}
-                        selected={i === thirdIndex}
-                        itemIndex={i}
-                        onIndexChange={(i) => setThirdIndex(i)}
-                        onClick={() => !disabled && setThirdIndex(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        disabled={disabled}
-                        pilled={pilled}
-                        animated={animated}
-                        contentLeft={showLeftContent && <IconMic size="xs" color="inherit" />}
-                        contentRight={showRightContent && <div>Text</div>}
-                        size={size}
+    const dropdownItems = otherItems.map((_, i) => {
+        const itemIndex = maxItemQuantity + i;
+
+        return {
+            label: `Label${itemIndex + 1}`,
+            value: itemIndex,
+        };
+    });
+
+    return (
+        <Tabs clip={clip} view={hasDivider ? 'divider' : 'clear'} disabled={disabled} size={size}>
+            {visibleItems.map((_, i) => (
+                <TabItem
+                    key={`item:${i}`}
+                    view="divider"
+                    selected={i === index}
+                    onClick={() => !disabled && setIndex(i)}
+                    tabIndex={!disabled ? 0 : -1}
+                    disabled={disabled}
+                    contentLeft={getContentLeft(contentLeftOption, size as Size)}
+                    contentRight={getContentRight(contentRightOption, size as Size)}
+                    size={size}
+                >
+                    {`Label${i + 1}`}
+                </TabItem>
+            ))}
+            {dropdownItems.length > 0 && (
+                <div style={{ marginLeft: '1.75rem' }}>
+                    <Dropdown
+                        size={size as Size}
+                        items={dropdownItems}
+                        onItemSelect={(item) => setIndex(item.value as number)}
                     >
-                        {label}
-                    </TabItem>
-                ))}
-            </Tabs>
-        </>
+                        <TabItem
+                            key="item:ShowAll"
+                            view="divider"
+                            tabIndex={!disabled ? 0 : -1}
+                            disabled={disabled}
+                            size={size}
+                        >
+                            ShowAll
+                        </TabItem>
+                    </Dropdown>
+                </div>
+            )}
+        </Tabs>
     );
 };
 
 export const Default: StoryObj<StoryTabsProps> = {
     args: {
         size: 'xs',
-        itemsNumber: 4,
-        tabItemView: 'divider',
         disabled: false,
-        stretch: false,
-        pilled: false,
-        animated: true,
-        view: 'divider',
-        label: 'Label',
-        showLeftContent: false,
-        showRightContent: false,
+        hasDivider: true,
+        itemQuantity: 8,
+    },
+    argTypes: {
+        clip: {
+            options: clips,
+            control: {
+                type: 'select',
+            },
+            if: { arg: 'stretch', truthy: false },
+        },
+        size: {
+            options: sizes,
+            control: {
+                type: 'select',
+            },
+        },
+    },
+    render: (args) => {
+        switch (args.clip) {
+            case 'scroll':
+                return <StoryScroll {...args} />;
+            case 'showAll':
+                return <StoryShowAll {...args} />;
+            default:
+                return <StoryDefault {...args} />;
+        }
     },
-    render: (args) => <StoryDefault {...args} />,
 };
 
-const StyledMultipleContainer = styled.div`
-    display: flex;
-    align-items: center;
-    column-gap: 1rem;
-`;
-
-const StoryMultiple = ({
-    itemsNumber,
-    label,
-    view,
-    disabled,
-    stretch,
-    pilled,
-    animated,
-    tabItemView,
-    size,
-    showLeftContent,
-    showRightContent,
-}: StoryTabsProps) => {
-    const items = Array(itemsNumber).fill(0);
-
-    const [index1, setIndex1] = useState(0);
-    const [index2, setIndex2] = useState(0);
+const StoryHeaderTabs = (props: StoryTabsProps) => {
+    const {
+        disabled,
+        itemQuantity,
+        size,
+        contentLeft: contentLeftOption,
+        contentRight: contentRightOption,
+        hasDivider,
+    } = props;
+    const items = Array(itemQuantity).fill(0);
+    const [index, setIndex] = useState(0);
 
     return (
-        <StyledMultipleContainer>
-            <Tabs
-                view={view}
-                index={index1}
-                stretch={stretch}
-                pilled={pilled}
-                disabled={disabled}
-                size={size}
-                style={{ width: '12rem' }}
-            >
-                {items.map((_, i) => (
-                    <TabItem
-                        key={`item:${i}`}
-                        view={tabItemView}
-                        selected={i === index1}
-                        itemIndex={i}
-                        onIndexChange={(i) => setIndex1(i)}
-                        onClick={() => !disabled && setIndex1(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        disabled={disabled}
-                        pilled={pilled}
-                        animated={animated}
-                        contentLeft={showLeftContent && <IconMic size="xs" color="inherit" />}
-                        contentRight={showRightContent && <div>Text</div>}
-                        size={size}
-                    >
-                        {label}
-                    </TabItem>
-                ))}
-            </Tabs>
-            <Tabs
-                view={view}
-                index={index2}
-                stretch={stretch}
-                pilled={pilled}
-                disabled={disabled}
-                size={size}
-                style={{ width: '12rem' }}
-            >
-                {items.map((_, i) => (
-                    <TabItem
-                        key={`item:${i}`}
-                        view={tabItemView}
-                        selected={i === index2}
-                        itemIndex={i}
-                        onIndexChange={(i) => setIndex2(i)}
-                        onClick={() => !disabled && setIndex2(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        disabled={disabled}
-                        pilled={pilled}
-                        animated={animated}
-                        contentLeft={showLeftContent && <IconMic size="xs" color="inherit" />}
-                        contentRight={showRightContent && <div>Text</div>}
-                        size={size}
-                    >
-                        {label}
-                    </TabItem>
-                ))}
-            </Tabs>
-        </StyledMultipleContainer>
+        <Tabs view={hasDivider ? 'divider' : 'clear'} disabled={disabled} size={size}>
+            {items.map((_, i) => (
+                <TabItem
+                    key={`item:${i}`}
+                    view="divider"
+                    selected={i === index}
+                    onClick={() => !disabled && setIndex(i)}
+                    tabIndex={!disabled ? 0 : -1}
+                    disabled={disabled}
+                    contentLeft={getContentLeft(contentLeftOption, size as Size)}
+                    contentRight={getContentRight(contentRightOption, size as Size)}
+                    size={size}
+                >
+                    {`Label${i + 1}`}
+                </TabItem>
+            ))}
+        </Tabs>
     );
 };
 
-export const Multiple: StoryObj<StoryTabsProps> = {
+export const HeaderTabs: StoryObj<StoryTabsProps> = {
     args: {
-        size: 'xs',
-        itemsNumber: 6,
-        tabItemView: 'divider',
+        size: 'h5',
         disabled: false,
-        stretch: false,
-        pilled: false,
-        animated: true,
-        view: 'divider',
-        label: 'Label',
-        showLeftContent: false,
-        showRightContent: false,
+        hasDivider: true,
+        itemQuantity: 4,
+    },
+    argTypes: {
+        size: {
+            options: headerSizes,
+            control: {
+                type: 'select',
+            },
+        },
     },
-    render: (args) => <StoryMultiple {...args} />,
+    render: (args) => <StoryHeaderTabs {...args} />,
 };

package/styled-components/es/components/Notification/NotificationsPortal.js

@@ -4,6 +4,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useMemo } from 'react';
 import { useStoreon } from 'storeon/react';
+import styled from 'styled-components';
+import { popupBaseRootClass } from '@salutejs/plasma-core';
 import { PopupProvider, popupConfig } from '../Popup';
 import { component } from '../../engines';
 import { cx } from '../../utils';
@@ -13,6 +15,9 @@ import { classes } from './Notification.tokens';
 
 // issue #823
 var Popup = /*#__PURE__*/component(popupConfig);
+var StyledPopup = /*#__PURE__*/styled(Popup).withConfig({
+  componentId: "plasma-new-hope__sc-9pvo2x-0"
+})(["& > .", "{overflow:hidden;}"], popupBaseRootClass);
 
 /**
  * Обертка для визуального представления уведомлений.
@@ -25,7 +30,7 @@ export var NotificationsPortal = function NotificationsPortal(_ref) {
   var Notification = useMemo(function () {
     return component(config);
   }, []);
-  return /*#__PURE__*/React.createElement(PopupProvider, null, notifications.length > 0 && /*#__PURE__*/React.createElement(Popup, {
+  return /*#__PURE__*/React.createElement(PopupProvider, null, notifications.length > 0 && /*#__PURE__*/React.createElement(StyledPopup, {
     isOpen: true,
     frame: frame,
     placement: "bottom-right",

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

@@ -51,7 +51,7 @@ export function App() {
                         contentLeft={<IconClock size="xs" color="inherit" />}
                         onClick={() => setIndex(i)}
                     >
-                        Label
+                        {`Label${i + 1}`}
                     </TabItem>
                 ))}
             </Tabs>
@@ -60,6 +60,92 @@ export function App() {
 }
 ```
 
+### Пример с прокруткой
+
+```tsx live
+import React, { useState } from 'react';
+import { Tabs, TabItem } from '@salutejs/{{ package }}';
+import { IconClock } from '@salutejs/plasma-icons';
+
+export function App() {
+    const items = Array(8).fill(0);
+    const [index, setIndex] = useState(0);
+
+    return (
+        <div>
+            <Tabs view="divider" size="xs" style={{ width: '15rem' }}>
+                {items.map((_, i) => (
+                    <TabItem
+                        view="divider"
+                        key={`item:${i}`}
+                        size="xs"
+                        selected={i === index}
+                        tabIndex={0}
+                        contentLeft={<IconClock size="xs" color="inherit" />}
+                        onClick={() => setIndex(i)}
+                    >
+                        {`Label${i + 1}`}
+                    </TabItem>
+                ))}
+            </Tabs>
+        </div>
+    );
+}
+```
+
+### Пример с Dropdown
+
+```tsx live
+import React, { useState } from 'react';
+import { Tabs, TabItem, Dropdown } from '@salutejs/{{ package }}';
+
+export function App() {
+    const items = Array(8).fill(0);
+    const [index, setIndex] = useState(0);
+
+    const maxItemQuantity = 3;
+    const visibleItems = items.slice(0, maxItemQuantity);
+    const otherItems = items.slice(maxItemQuantity);
+
+    const dropdownItems = otherItems.map((_, i) => {
+        const itemIndex = maxItemQuantity + i;
+
+        return {
+            label: `Label${itemIndex + 1}`,
+            value: itemIndex,
+        };
+    });
+
+    return (
+        <div style={{ height: '15rem', alignItems: 'flex-start' }}>
+            <Tabs clip="showAll" view="divider" size="xs">
+                {visibleItems.map((_, i) => (
+                    <TabItem
+                        key={`item:${i}`}
+                        view="divider"
+                        selected={i === index}
+                        onClick={() => setIndex(i)}
+                        tabIndex={0}
+                        size="xs"
+                    >
+                        {`Label${i + 1}`}
+                    </TabItem>
+                ))}
+                {dropdownItems.length > 0 && (
+                    <div style={{ marginLeft: '1.75rem' }}>
+                        <Dropdown size="xs" items={dropdownItems} onItemSelect={(item) => setIndex(item.value)}>
+                            <TabItem key="item:ShowAll" view="divider" tabIndex={0} size="xs">
+                                ShowAll
+                            </TabItem>
+                        </Dropdown>
+                    </div>
+                )}
+            </Tabs>
+        </div>
+    );
+}
+```
+
 ### Подключение клавиатурной навигации
 Для этого необходимо дополнительно прокинуть свойства `index, itemIndex, onIndexChange`.
 Клавиши ArrowLeft, ArrowRight, Home, End для навигации по вкладкам.
@@ -88,11 +174,11 @@ export function App() {
                         contentLeft={<IconClock size="xs" color="inherit" />}
                         onClick={() => setIndex(i)}
                     >
-                        Label
+                        {`Label${i + 1}`}
                     </TabItem>
                 ))}
             </Tabs>
         </div>
     );
 }
-```
+```

package/styled-components/es/components/Tabs/tokens.js

@@ -9,7 +9,9 @@ export var classes = {
   tabRightContent: 'tab-item-right-content',
   tabLeftContent: 'tab-item-left-content',
   tabsHasLeftArrow: 'tabs-has-left-arrow',
-  tabsHasRightArrow: 'tabs-has-right-arrow'
+  tabsHasRightArrow: 'tabs-has-right-arrow',
+  tabsClipScroll: 'tabs-clip-scroll',
+  tabsClipShowAll: 'tabs-clip-show-all'
 };
 export var tokens = {
   disabledOpacity: '--plasma-tabs-disabled-opacity',
@@ -26,7 +28,7 @@ export var tokens = {
   outlineFocusColor: '--plasma-tabs-outline-focus-color',
   arrowColor: '--plasma-tabs-arrow-color',
   tabsFilledBackgroundColor: '--plasma-tabs-filled-background-color',
-  tabsBackgroundColor: '--plasma-tabs-backgorund-color',
+  tabsBackgroundColor: '--plasma-tabs-background-color',
   tabsBorderRadius: '--plasma-tabs-border-radius',
   tabsWidth: '--plasma-tabs-width',
   tabsHeight: '--plasma-tabs-height',
@@ -50,6 +52,7 @@ export var tokens = {
   itemColor: '--plasma-tab-item-color',
   itemBackgroundColor: '--plasma-tab-item-background-color',
   itemColorHover: '--plasma-tab-item-color-hover',
+  itemColorActive: '--plasma-tab-item-color-active',
   itemBackgroundColorHover: '--plasma-tab-item-background-color-hover',
   itemSelectedColor: '--plasma-tab-item-selected-color',
   itemSelectedBackgroundColor: '--plasma-tab-item-selected-background-color',