@salutejs/plasma-new-hope 0.158.1-canary.1374.11139248605.0 → 0.158.1-canary.1454.11140695341.0

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

@@ -3,11 +3,14 @@ import type { ComponentProps } from 'react';
 import type { StoryObj, Meta } from '@storybook/react';
 import { disableProps } from '@salutejs/plasma-sb-utils';
 
-import { WithTheme } from '../../../_helpers';
+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';
 
@@ -18,16 +21,14 @@ const headerSizes = ['h5', 'h4', 'h3', 'h2', 'h1'] as const;
 type Size = typeof sizes[number];
 
 type CustomStoryTabsProps = {
-    itemQuantity: number;
     hasDivider: boolean;
+    itemQuantity: number;
     contentLeft: string;
     contentRight: string;
-    stretch: boolean;
-    helperText: string;
 };
 
 const contentLeftOptions = ['none', 'icon'];
-const contentRightOptions = ['none', 'counter', 'icon'];
+const contentRightOptions = ['none', 'text', 'counter', 'icon'];
 
 const getContentLeft = (contentLeftOption: string, size: Size) => {
     const iconSize = size === 'xs' ? 'xs' : 's';
@@ -43,6 +44,8 @@ const getContentRight = (contentRightOption: string, size: Size) => {
             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;
     }
@@ -55,23 +58,26 @@ const meta: Meta<StoryTabsProps> = {
     component: Tabs,
     decorators: [WithTheme],
     argTypes: {
-        ...disableProps([
-            'orientation',
-            'tabItemContentLeft',
-            'pilled',
-            'animated',
-            'view',
-            'as',
-            'forwardedAs',
-            'outsideScroll',
-            'index',
-        ]),
+        ...argTypesFromConfig(mergeConfig(tabsConfig, config)),
+        contentLeft: {
+            options: contentLeftOptions,
+            control: {
+                type: 'select',
+            },
+        },
+        contentRight: {
+            options: contentRightOptions,
+            control: {
+                type: 'select',
+            },
+        },
+        ...disableProps(['itemsNumber', 'pilled', 'animated', 'view']),
     },
 };
 
 export default meta;
 
-const StoryHorizontalDefault = (props: StoryTabsProps) => {
+const StoryDefault = (props: StoryTabsProps) => {
     const {
         disabled,
         itemQuantity,
@@ -80,7 +86,6 @@ const StoryHorizontalDefault = (props: StoryTabsProps) => {
         contentRight: contentRightOption,
         hasDivider,
         stretch,
-        helperText,
     } = props;
     const items = Array(itemQuantity).fill(0);
     const [index, setIndex] = useState(0);
@@ -95,7 +100,6 @@ const StoryHorizontalDefault = (props: StoryTabsProps) => {
                     onClick={() => !disabled && setIndex(i)}
                     tabIndex={!disabled ? 0 : -1}
                     disabled={disabled}
-                    value={helperText}
                     contentLeft={getContentLeft(contentLeftOption, size as Size)}
                     contentRight={getContentRight(contentRightOption, size as Size)}
                     size={size}
@@ -107,7 +111,7 @@ const StoryHorizontalDefault = (props: StoryTabsProps) => {
     );
 };
 
-const StoryHorizontalScroll = (props: StoryTabsProps) => {
+const StoryScroll = (props: StoryTabsProps) => {
     const {
         disabled,
         itemQuantity,
@@ -116,7 +120,6 @@ const StoryHorizontalScroll = (props: StoryTabsProps) => {
         contentLeft: contentLeftOption,
         contentRight: contentRightOption,
         hasDivider,
-        helperText,
     } = props;
     const items = Array(itemQuantity).fill(0);
     const [index, setIndex] = useState(0);
@@ -137,7 +140,6 @@ const StoryHorizontalScroll = (props: StoryTabsProps) => {
                     onClick={() => !disabled && setIndex(i)}
                     tabIndex={!disabled ? 0 : -1}
                     disabled={disabled}
-                    value={helperText}
                     contentLeft={getContentLeft(contentLeftOption, size as Size)}
                     contentRight={getContentRight(contentRightOption, size as Size)}
                     size={size}
@@ -149,7 +151,7 @@ const StoryHorizontalScroll = (props: StoryTabsProps) => {
     );
 };
 
-const StoryHorizontalShowAll = (props: StoryTabsProps) => {
+const StoryShowAll = (props: StoryTabsProps) => {
     const {
         disabled,
         itemQuantity,
@@ -158,7 +160,6 @@ const StoryHorizontalShowAll = (props: StoryTabsProps) => {
         contentLeft: contentLeftOption,
         contentRight: contentRightOption,
         hasDivider,
-        helperText,
     } = props;
     const maxItemQuantity = 3;
     const items = Array(itemQuantity).fill(0);
@@ -189,7 +190,6 @@ const StoryHorizontalShowAll = (props: StoryTabsProps) => {
                     contentLeft={getContentLeft(contentLeftOption, size as Size)}
                     contentRight={getContentRight(contentRightOption, size as Size)}
                     size={size}
-                    value={helperText}
                 >
                     {`Label${i + 1}`}
                 </TabItem>
@@ -217,27 +217,14 @@ const StoryHorizontalShowAll = (props: StoryTabsProps) => {
     );
 };
 
-export const HorizontalTabs: StoryObj<StoryTabsProps> = {
+export const Default: StoryObj<StoryTabsProps> = {
     args: {
         size: 'xs',
         disabled: false,
         hasDivider: true,
-        helperText: '',
         itemQuantity: 8,
     },
     argTypes: {
-        contentLeft: {
-            options: contentLeftOptions,
-            control: {
-                type: 'select',
-            },
-        },
-        contentRight: {
-            options: contentRightOptions,
-            control: {
-                type: 'select',
-            },
-        },
         clip: {
             options: clips,
             control: {
@@ -255,228 +242,11 @@ export const HorizontalTabs: StoryObj<StoryTabsProps> = {
     render: (args) => {
         switch (args.clip) {
             case 'scroll':
-                return <StoryHorizontalScroll {...args} />;
+                return <StoryScroll {...args} />;
             case 'showAll':
-                return <StoryHorizontalShowAll {...args} />;
+                return <StoryShowAll {...args} />;
             default:
-                return <StoryHorizontalDefault {...args} />;
-        }
-    },
-};
-
-const StoryVerticalDefault = (props: StoryTabsProps) => {
-    const {
-        disabled,
-        itemQuantity,
-        stretch,
-        size,
-        contentLeft: contentLeftOption,
-        contentRight: contentRightOption,
-        hasDivider,
-        helperText,
-    } = props;
-    const items = Array(itemQuantity).fill(0);
-    const [index, setIndex] = useState(0);
-
-    return (
-        <div style={{ height: '100vh' }}>
-            <Tabs
-                orientation="vertical"
-                hasDivider={hasDivider}
-                size={size as Size}
-                disabled={disabled}
-                stretch={stretch}
-                contentLeft={getContentLeft(contentLeftOption, size as Size)}
-            >
-                {items.map((_, i) => (
-                    <TabItem
-                        orientation="vertical"
-                        key={`item:${i}`}
-                        view="divider"
-                        selected={i === index}
-                        onClick={() => !disabled && setIndex(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        size={size as Size}
-                        disabled={disabled}
-                        value={helperText}
-                        contentRight={getContentRight(contentRightOption, size as Size)}
-                    >
-                        {`Label${i + 1}`}
-                    </TabItem>
-                ))}
-            </Tabs>
-        </div>
-    );
-};
-
-const StoryVerticalScroll = (props: StoryTabsProps) => {
-    const {
-        disabled,
-        itemQuantity,
-        clip,
-        size,
-        contentLeft: contentLeftOption,
-        contentRight: contentRightOption,
-        hasDivider,
-        helperText,
-    } = props;
-    const items = Array(itemQuantity).fill(0);
-    const [index, setIndex] = useState(0);
-
-    return (
-        <div style={{ height: '100vh' }}>
-            <Tabs
-                orientation="vertical"
-                size={size as Size}
-                disabled={disabled}
-                clip={clip}
-                style={{ height: '10rem' }}
-                contentLeft={getContentLeft(contentLeftOption, size as Size)}
-                hasDivider={hasDivider}
-            >
-                {items.map((_, i) => (
-                    <TabItem
-                        orientation="vertical"
-                        key={`item:${i}`}
-                        view="divider"
-                        selected={i === index}
-                        onClick={() => !disabled && setIndex(i)}
-                        tabIndex={!disabled ? 0 : -1}
-                        size={size as Size}
-                        disabled={disabled}
-                        value={helperText}
-                        contentRight={getContentRight(contentRightOption, size as Size)}
-                    >
-                        {`Label${i + 1}`}
-                    </TabItem>
-                ))}
-            </Tabs>
-        </div>
-    );
-};
-
-const StoryVerticalShowAll = (props: StoryTabsProps) => {
-    const {
-        disabled,
-        itemQuantity,
-        clip,
-        size,
-        contentLeft: contentLeftOption,
-        contentRight: contentRightOption,
-        hasDivider,
-        helperText,
-    } = 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);
-
-    const dropdownItems = otherItems.map((_, i) => {
-        const itemIndex = maxItemQuantity + i;
-
-        return {
-            label: `Label${itemIndex + 1}`,
-            value: itemIndex,
-        };
-    });
-
-    return (
-        <Tabs
-            clip={clip}
-            orientation="vertical"
-            size={size as Size}
-            disabled={disabled}
-            contentLeft={getContentLeft(contentLeftOption, size as Size)}
-            hasDivider={hasDivider}
-        >
-            {visibleItems.map((_, i) => (
-                <TabItem
-                    orientation="vertical"
-                    key={`item:${i}`}
-                    selected={i === index}
-                    onClick={() => !disabled && setIndex(i)}
-                    tabIndex={!disabled ? 0 : -1}
-                    disabled={disabled}
-                    value={helperText}
-                    contentRight={getContentRight(contentRightOption, size as Size)}
-                    size={size as Size}
-                >
-                    {`Label${i + 1}`}
-                </TabItem>
-            ))}
-            {dropdownItems.length > 0 && (
-                <Dropdown
-                    size={size as Size}
-                    items={dropdownItems}
-                    onItemSelect={(item) => setIndex(item.value as number)}
-                    placement="right"
-                >
-                    <TabItem
-                        orientation="vertical"
-                        key="item:ShowAll"
-                        tabIndex={!disabled ? 0 : -1}
-                        disabled={disabled}
-                        size={size as Size}
-                    >
-                        ShowAll
-                    </TabItem>
-                </Dropdown>
-            )}
-        </Tabs>
-    );
-};
-
-export const VerticalTabs: StoryObj<StoryTabsProps> = {
-    args: {
-        size: 'xs',
-        disabled: false,
-        hasDivider: true,
-        itemQuantity: 8,
-        orientation: 'vertical',
-        helperText: '',
-    },
-    argTypes: {
-        contentLeft: {
-            options: contentLeftOptions,
-            control: {
-                type: 'select',
-            },
-        },
-        contentRight: {
-            options: contentRightOptions,
-            control: {
-                type: 'select',
-            },
-        },
-        size: {
-            options: sizes,
-            control: {
-                type: 'select',
-            },
-        },
-        clip: {
-            options: clips,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'stretch', truthy: false },
-        },
-        stretch: {
-            table: {
-                disable: true,
-            },
-        },
-    },
-    render: (args) => {
-        switch (args.clip) {
-            case 'scroll':
-                return <StoryVerticalScroll {...args} />;
-            case 'showAll':
-                return <StoryVerticalShowAll {...args} />;
-            default:
-                return <StoryVerticalDefault {...args} />;
+                return <StoryDefault {...args} />;
         }
     },
 };
@@ -489,13 +259,12 @@ const StoryHeaderTabs = (props: StoryTabsProps) => {
         contentLeft: contentLeftOption,
         contentRight: contentRightOption,
         hasDivider,
-        stretch,
     } = props;
     const items = Array(itemQuantity).fill(0);
     const [index, setIndex] = useState(0);
 
     return (
-        <Tabs view={hasDivider ? 'divider' : 'clear'} disabled={disabled} size={size} stretch={stretch}>
+        <Tabs view={hasDivider ? 'divider' : 'clear'} disabled={disabled} size={size}>
             {items.map((_, i) => (
                 <TabItem
                     key={`item:${i}`}
@@ -529,23 +298,6 @@ export const HeaderTabs: StoryObj<StoryTabsProps> = {
                 type: 'select',
             },
         },
-        contentLeft: {
-            options: contentLeftOptions,
-            control: {
-                type: 'select',
-            },
-        },
-        contentRight: {
-            options: contentRightOptions,
-            control: {
-                type: 'select',
-            },
-        },
-        clip: {
-            table: {
-                disable: true,
-            },
-        },
     },
     render: (args) => <StoryHeaderTabs {...args} />,
 };

package/styled-components/es/components/Attach/Attach.js

@@ -17,7 +17,7 @@ import { base as sizeCSS } from './variations/_size/base';
 import { base as viewCSS } from './variations/_view/base';
 import { base, StyledHiddenInput, StyledHiddenInputHelper } from './Attach.styles';
 import { StyledCell } from './ui/Cell/Cell';
-import { extractExtension, getFileicon, truncateFilename } from './utils';
+import { extractExtension, getFileicon, addSeparator, separator } from './utils';
 import { classes } from './Attach.tokens';
 import { AttachButton } from './components/AttachButton';
 import { StyledIconButtonCancel } from './ui/IconButton/IconButton.styles';
@@ -76,15 +76,18 @@ export var attachRoot = function attachRoot(Root) {
         cellLeft = _cellRef$current$getB.left;
       var leftDiff = cellLeft - parentLeft;
       var currentTextWidth = textWidth;
-      var currFilename = filename;
-      for (var i = filename.length - 1; i > 0; i -= 1) {
+      if (currentTextWidth + emptyTextCellWidth.current + leftDiff <= parentWidth || currentTextWidth + emptyTextCellWidth.current < buttonWidth) {
+        setTruncatedFilename(filename);
+        return;
+      }
+      var currFilename = addSeparator(filename, separator);
+      for (var i = currFilename.indexOf(separator) - 1; i > 0; i -= 1) {
         if (currentTextWidth + emptyTextCellWidth.current + leftDiff <= parentWidth) {
           break;
         }
-        var newFilename = truncateFilename({
-          filename: inputHelperRef.current.textContent,
-          startNameTruncationIndex: i
-        });
+        var left = currFilename.slice(0, i);
+        var right = currFilename.slice(i + 1);
+        var newFilename = "".concat(left).concat(right);
         inputHelperRef.current.textContent = newFilename;
         currentTextWidth = inputHelperRef.current.offsetWidth;
         if (currentTextWidth + emptyTextCellWidth.current < buttonWidth) {

package/styled-components/es/components/Attach/utils/addSeparator.js

@@ -0,0 +1,9 @@
+import { extractExtension } from './extractExtension';
+export var addSeparator = function addSeparator(filename, separator) {
+  var extension = extractExtension(filename);
+  var strings = filename.split('.');
+  var name = strings.length > 1 ? strings.slice(0, -1).join('.') : strings[0];
+  var lastChar = name[name.length - 1];
+  var dotChar = '.';
+  return extension === name ? "".concat(name.slice(0, -1)).concat(separator).concat(lastChar) : "".concat(name.slice(0, -1)).concat(separator).concat(lastChar).concat(dotChar).concat(extension);
+};

package/styled-components/es/components/Attach/utils/index.js

@@ -1,3 +1,4 @@
 export { extractExtension } from './extractExtension';
 export { getFileicon } from './getFileicon';
-export { truncateFilename } from './truncateFilename';
+export { addSeparator } from './addSeparator';
+export var separator = '...';

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

@@ -15,11 +15,6 @@ import { PropsTable, Description } from '@site/src/components';
 <Description name="TabItem" />
 <PropsTable name="TabItem" />
 
-:::caution Взаимоисключающие свойства
-Свойство `value` - это значение таба. Оно отображается справа от основного текста.<br/>
-`value` и `contentRight` взаимоисключающие: если передано одно, второе передать нельзя.
-:::
-
 ## TabsController (deprecated)
 Вместо этого используйте Tabs, TabItem, указав параметры index, itemIndex, onIndexChange.
 
@@ -61,41 +56,6 @@ export function App() {
 }
 ```
 
-### Расположение табов
-Табы могут быть горизонтальными (по умолчанию) и вертикальными. За это отвечает свойство `orientation`.
-
-```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" orientation="vertical" size="xs" style=\{{ width: '15rem' }}>
-                {items.map((_, i) => (
-                    <TabItem
-                        view="divider"
-                        orientation="vertical"
-                        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>
-    );
-}
-```
-
 ### Пример с прокруткой
 
 ```tsx live
@@ -183,9 +143,8 @@ export function App() {
 ```
 
 ### Подключение клавиатурной навигации
-Для этого необходимо дополнительно прокинуть свойства `index, itemIndex, onIndexChange`.<br/>
-Для горизонтальных табов: клавиши ArrowLeft, ArrowRight, Home, End для навигации по вкладкам.<br/>
-Для вертикальных табов: клавиши ArrowUp, ArrowDown, Home, End для навигации по вкладкам.
+Для этого необходимо дополнительно прокинуть свойства `index, itemIndex, onIndexChange`.
+Клавиши ArrowLeft, ArrowRight, Home, End для навигации по вкладкам.
 
 ```tsx live
 import React, { useState } from 'react';
@@ -194,51 +153,27 @@ import { IconClock } from '@salutejs/plasma-icons';
 
 export function App() {
     const items = Array(4).fill(0);
-    const [horizontalIndex, setHorizontalIndex] = useState(0);
-    const [verticalIndex, setVerticalIndex] = useState(0);
+    const [index, setIndex] = useState(0);
 
     return (
-        <div style=\{{ display: "flex", flexDirection: "column", gap: "50px"}}>
-            <div>
-                <Tabs view="divider" stretch size="xs" index={horizontalIndex}>
-                    {items.map((_, i) => (
-                        <TabItem
-                            view="divider"
-                            key={`item:${i}`}
-                            size="xs"
-                            itemIndex={i}
-                            onIndexChange={(i) => setHorizontalIndex(i)}
-                            selected={i === horizontalIndex}
-                            tabIndex={0}
-                            contentLeft={<IconClock size="xs" color="inherit" />}
-                            onClick={() => setHorizontalIndex(i)}
-                        >
-                            {`Label${i + 1}`}
-                        </TabItem>
-                    ))}
-                </Tabs>
-            </div>
-
-            <div>
-                <Tabs orientation="vertical" view="divider" size="xs" index={verticalIndex}>
-                    {items.map((_, i) => (
-                        <TabItem
-                            orientation="vertical"
-                            view="divider"
-                            key={`item:${i}`}
-                            size="xs"
-                            itemIndex={i}
-                            onIndexChange={(i) => setVerticalIndex(i)}
-                            selected={i === verticalIndex}
-                            tabIndex={0}
-                            contentLeft={<IconClock size="xs" color="inherit" />}
-                            onClick={() => setVerticalIndex(i)}
-                        >
-                            {`Label${i + 1}`}
-                        </TabItem>
-                    ))}
-                </Tabs>
-            </div>
+        <div>
+            <Tabs view="filled" stretch size="xs" index={index}>
+                {items.map((_, i) => (
+                    <TabItem
+                        view="secondary"
+                        key={`item:${i}`}
+                        size="xs"
+                        itemIndex={i}
+                        onIndexChange={(i) => setIndex(i)}
+                        selected={i === index}
+                        tabIndex={0}
+                        contentLeft={<IconClock size="xs" color="inherit" />}
+                        onClick={() => setIndex(i)}
+                    >
+                        {`Label${i + 1}`}
+                    </TabItem>
+                ))}
+            </Tabs>
         </div>
     );
 }

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

@@ -1,4 +1,4 @@
-var _excluded = ["items", "index", "autoscroll", "onIndexChange", "orientation"],
+var _excluded = ["items", "index", "autoscroll", "onIndexChange"],
   _excluded2 = ["label"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -18,7 +18,6 @@ export function createTabsController(ListComponent, ItemComponent) {
       index = _ref.index,
       autoscroll = _ref.autoscroll,
       onIndexChange = _ref.onIndexChange,
-      _orientation = _ref.orientation,
       rest = _objectWithoutProperties(_ref, _excluded);
     var disabled = rest.disabled;
     return /*#__PURE__*/React.createElement(ListComponent, _extends({

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

@@ -1,8 +1,5 @@
-export { horizontalTabsRoot, horizontalTabsConfig } from './ui/horizontal/HorizontalTabs/HorizontalTabs';
-export { horizontalTabItemRoot, horizontalTabItemConfig } from './ui/horizontal/HorizontalTabItem/HorizontalTabItem';
-export { verticalTabsRoot, verticalTabsConfig } from './ui/vertical/VerticalTabs/VerticalTabs';
-export { verticalTabItemRoot, verticalTabItemConfig } from './ui/vertical/VerticalTabItem/VerticalTabItem';
-export { VerticalTabsContext } from './ui/vertical/VerticalTabsContext';
+export { tabsRoot, tabsConfig } from './ui/Tabs/Tabs';
+export { tabItemRoot, tabItemConfig } from './ui/TabItem/TabItem';
 export { tokens as tabsTokens } from './tokens';
 export { TabItemRefs, TabsContext } from './TabsContext';
 export { createTabsController } from './createTabsController';