@salutejs/plasma-new-hope 0.160.1-canary.1454.11161506750.0 → 0.161.0-canary.1466.11175117615.0

package/emotion/cjs/examples/plasma_web/components/Badge/Badge.stories.tsx

@@ -12,7 +12,7 @@ const meta: Meta<typeof Badge> = {
     decorators: [WithTheme],
     argTypes: {
         size: {
-            options: ['s', 'm', 'l'],
+            options: ['l', 'm', 's', 'xs'],
             control: {
                 type: 'select',
             },

package/emotion/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, addSeparator, separator } from './utils';
+import { extractExtension, getFileicon, truncateFilename } from './utils';
 import { classes } from './Attach.tokens';
 import { AttachButton } from './components/AttachButton';
 import { StyledIconButtonCancel } from './ui/IconButton/IconButton.styles';
@@ -76,18 +76,15 @@ export var attachRoot = function attachRoot(Root) {
         cellLeft = _cellRef$current$getB.left;
       var leftDiff = cellLeft - parentLeft;
       var currentTextWidth = textWidth;
-      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) {
+      var currFilename = filename;
+      for (var i = filename.length - 1; i > 0; i -= 1) {
         if (currentTextWidth + emptyTextCellWidth.current + leftDiff <= parentWidth) {
           break;
         }
-        var left = currFilename.slice(0, i);
-        var right = currFilename.slice(i + 1);
-        var newFilename = "".concat(left).concat(right);
+        var newFilename = truncateFilename({
+          filename: inputHelperRef.current.textContent,
+          startNameTruncationIndex: i
+        });
         inputHelperRef.current.textContent = newFilename;
         currentTextWidth = inputHelperRef.current.offsetWidth;
         if (currentTextWidth + emptyTextCellWidth.current < buttonWidth) {

package/emotion/es/components/Attach/utils/index.js

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

package/emotion/es/components/Attach/utils/truncateFilename.js

@@ -0,0 +1,17 @@
+export var truncateFilename = function truncateFilename(_ref) {
+  var filename = _ref.filename,
+    startNameTruncationIndex = _ref.startNameTruncationIndex,
+    _ref$separator = _ref.separator,
+    separator = _ref$separator === void 0 ? '...' : _ref$separator,
+    _ref$minNameLength = _ref.minNameLength,
+    minNameLength = _ref$minNameLength === void 0 ? 5 : _ref$minNameLength;
+  var strings = filename.split('.');
+  var extension = strings.length > 1 ? strings[strings.length - 1] : null;
+  var name = strings.length > 1 ? strings.slice(0, -1).join('.') : strings[0];
+  if (name.length <= minNameLength || startNameTruncationIndex >= name.length - 1) {
+    return filename;
+  }
+  var lastNameLetter = name[name.length - 1];
+  var truncatedName = "".concat(name.substring(0, startNameTruncationIndex)).concat(separator).concat(lastNameLetter);
+  return extension ? "".concat(truncatedName, ".").concat(extension) : truncatedName;
+};

package/emotion/es/components/Badge/Badge.template-doc.mdx

@@ -14,7 +14,7 @@ import { PropsTable, Description } from '@site/src/components';
 ### Размер badge
 Размер задается с помощью свойства `size`.
 
-Возможные значения свойства: `"l"`, `"m"`, `"s"`.
+Возможные значения свойства: `l`, `m`, `s`, `xs`.
 
 ```tsx live 
 import React from 'react';
@@ -26,6 +26,7 @@ export function App() {
             <Badge text="Бейдж" size="l" />
             <Badge text="Бейдж" size="m" />
             <Badge text="Бейдж" size="s" />
+            <Badge text="Бейдж" size="xs" />
         </div>
     );
 }
@@ -44,6 +45,7 @@ export function App() {
             <Badge text="Бейдж" size="l" pilled />
             <Badge text="Бейдж" size="m" pilled />
             <Badge text="Бейдж" size="s" pilled />
+            <Badge text="Бейдж" size="xs" pilled />
         </div>
     );
 }