@salutejs/plasma-new-hope 0.166.0-canary.1459.11345044568.0 → 0.166.0-canary.1470.11343749799.0

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

@@ -4,8 +4,7 @@ import { action } from '@storybook/addon-actions';
 import { IconPlaceholder } from '@salutejs/plasma-sb-utils';
 
 import { WithTheme } from '../../../_helpers';
-import { IconCross } from '../../../../components/_Icon';
-import type { PopoverPlacement } from '../Popover/Popover';
+import { IconChevronLeft } from '../../../../components/_Icon';
 
 import { TextField } from './TextField';
 
@@ -17,29 +16,7 @@ const onChipsChange = action('onChipsChange');
 
 const sizes = ['l', 'm', 's', 'xs'];
 const views = ['default', 'positive', 'warning', 'negative'];
-const hintViews = ['default', 'onDark', 'onLight'];
-const hintSizes = ['m', 's'];
-const hintTriggers = ['hover', 'click'];
 const labelPlacements = ['outer', 'inner'];
-const placements: Array<PopoverPlacement> = [
-    'top',
-    'top-start',
-    'top-end',
-
-    'bottom',
-    'bottom-start',
-    'bottom-end',
-
-    'left',
-    'left-start',
-    'left-end',
-
-    'right',
-    'right-start',
-    'right-end',
-
-    'auto',
-];
 
 const meta: Meta<typeof TextField> = {
     title: 'plasma_web/TextField',
@@ -93,43 +70,6 @@ const meta: Meta<typeof TextField> = {
                 type: 'inline-radio',
             },
         },
-        hintView: {
-            options: hintViews,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintSize: {
-            options: hintSizes,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintTrigger: {
-            options: hintTriggers,
-            control: {
-                type: 'inline-radio',
-            },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintText: {
-            control: { type: 'text' },
-            if: { arg: 'hasHint', truthy: true },
-        },
-        hintPlacement: {
-            options: placements,
-            control: {
-                type: 'select',
-            },
-            if: { arg: 'hasHint', truthy: true },
-            mappers: placements,
-        },
-        hintHasArrow: {
-            control: { type: 'boolean' },
-            if: { arg: 'hasHint', truthy: true },
-        },
     },
 };
 
@@ -165,13 +105,13 @@ const StoryDemo = ({ enableContentLeft, enableContentRight, view, ...rest }: Sto
     const iconSize = rest.size === 'xs' ? 'xs' : 's';
 
     return (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: '2rem', width: '70%', margin: '0 auto' }}>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: '2rem' }}>
             <TextField
                 {...rest}
                 enumerationType="plain"
                 value={text}
-                contentLeft={enableContentLeft ? <IconCross color="inherit" size={iconSize} /> : undefined}
-                contentRight={enableContentRight ? <IconCross color="inherit" size={iconSize} /> : undefined}
+                contentLeft={enableContentLeft ? <IconPlaceholder size={iconSize} /> : undefined}
+                contentRight={enableContentRight ? <IconPlaceholder size={iconSize} /> : undefined}
                 view={view}
                 onChange={(e) => {
                     setText(e.target.value);
@@ -205,28 +145,17 @@ export const Default: StoryObj<StoryPropsDefault> = {
         view: 'default',
         label: 'Лейбл',
         labelPlacement: 'outer',
-        titleCaption: 'Подпись к полю',
-        textBefore: '',
-        textAfter: '',
         placeholder: 'Заполните поле',
         leftHelper: 'Подсказка к полю',
         disabled: false,
         readOnly: false,
+        required: false,
+        requiredPlacement: 'right',
+        optional: false,
         enableContentLeft: true,
         enableContentRight: true,
         clear: false,
         hasDivider: false,
-        optional: false,
-        required: false,
-        requiredPlacement: 'right',
-        hasHint: false,
-        hintTrigger: 'hover',
-        hintText: 'Текст подсказки',
-        hintView: 'default',
-        hintSize: 'm',
-        hintPlacement: 'auto',
-        hintWidth: '10rem',
-        hintHasArrow: true,
     },
     render: (args) => <StoryDemo {...args} />,
 };
@@ -247,6 +176,8 @@ type StoryPropsChips = Omit<
     | 'checked'
     | 'maxLength'
     | 'minLength'
+    | 'required'
+    | 'optional'
     | 'enumerationType'
 > & {
     enableContentLeft: boolean;
@@ -263,7 +194,7 @@ const StoryChips = ({ enableContentLeft, enableContentRight, view, ...rest }: St
             {...rest}
             enumerationType="chip"
             value={text}
-            contentLeft={enableContentLeft ? <IconPlaceholder size={iconSize} /> : undefined}
+            contentLeft={enableContentLeft ? <IconChevronLeft color="inherit" size={iconSize} /> : undefined}
             contentRight={enableContentRight ? <IconPlaceholder size={iconSize} /> : undefined}
             view={view}
             onChange={(e) => {
@@ -273,7 +204,6 @@ const StoryChips = ({ enableContentLeft, enableContentRight, view, ...rest }: St
             onFocus={onFocus}
             onBlur={onBlur}
             onChangeChips={onChipsChange}
-            style={{ width: '70%', margin: '0 auto' }}
         />
     );
 };

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

@@ -1,5 +1,5 @@
 var _IconCloseCircleOutli;
-var _excluded = ["flow", "buttonType", "hasAttachment", "acceptedFileFormats", "size", "view", "className", "style", "isLoading", "disabled", "id", "name", "onChange", "onClear"];
+var _excluded = ["flow", "buttonType", "hasAttachment", "acceptedFileFormats", "size", "view", "className", "style", "isLoading", "disabled"];
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -36,10 +36,6 @@ export var attachRoot = function attachRoot(Root) {
       style = props.style,
       isLoading = props.isLoading,
       disabled = props.disabled,
-      id = props.id,
-      name = props.name,
-      onChange = props.onChange,
-      onClear = props.onClear,
       rest = _objectWithoutProperties(props, _excluded);
     var innerRef = useRef(null);
     var ref = useForkRef(outerRef, innerRef);
@@ -108,22 +104,16 @@ export var attachRoot = function attachRoot(Root) {
       }
       inputRef.current.click();
     };
-    var handleChange = function handleChange(e) {
-      if (!e.target.files) {
+    var handleChange = function handleChange() {
+      if (!inputRef.current || !inputRef.current.files) {
         return;
       }
-      if (onChange) {
-        onChange(e);
-      }
-      setFilename(e.target.files[0].name);
+      setFilename(inputRef.current.files[0].name);
     };
     var handleClear = function handleClear() {
       if (!inputRef.current) {
         return;
       }
-      if (onClear) {
-        onClear();
-      }
       inputRef.current.value = '';
       setFilename('');
       setTruncatedFilename('');
@@ -138,11 +128,12 @@ export var attachRoot = function attachRoot(Root) {
       ref: inputRef,
       accept: accept,
       type: "file",
-      id: id,
-      name: name,
+      id: "attachHiddenInput",
+      name: "attachHiddenInput",
       onChange: handleChange
     }), /*#__PURE__*/React.createElement(StyledHiddenInputHelper, {
-      ref: inputHelperRef
+      ref: inputHelperRef,
+      id: "attachHiddenInputHelper"
     }, filename), /*#__PURE__*/React.createElement(AttachButton, _extends({
       buttonType: buttonType,
       view: view,

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

@@ -61,72 +61,3 @@ export function App() {
     );
 }
 ```
-
-### Пример использования в форме
-
-```tsx live
-import React, { useState } from 'react';
-import { Attach, Button } from '@salutejs/{{ package }}';
-
-function App() {
-    const ids = ['0', '1', '2'];
-    const [isLoading, setIsLoading] = useState(false);
-    const [attachedFiles, setAttachedFiles] = useState([]);
-
-    const handleAttachFile = (e) => {
-        setAttachedFiles((prevAttachedFiles) => [
-            ...prevAttachedFiles,
-            {
-                fileData: e.target.files[0],
-                id: e.target.id,
-            },
-        ]);
-    };
-
-    const handleAttachClear = (id) => {
-        setAttachedFiles(attachedFiles.filter((file) => file.id !== id));
-    };
-
-    const handleSubmit = (e) => {
-        e.preventDefault();
-        setIsLoading(true);
-  
-        const formData = new FormData(e.target);
-        console.log('formData', Object.fromEntries(formData));
-
-        setTimeout(() => {
-            setAttachedFiles([]);
-            setIsLoading(false);
-        }, 2000);
-    };
-
-    return (
-        <>
-            <span>{isLoading ? 'Форма отправляется' : 'Прикрепленные файлы:'}</span>
-            {!isLoading && attachedFiles.length > 0 && (
-                <div style=\{{ display: 'flex', flexDirection: 'column', gap: '0px' }}>
-                    {attachedFiles.map((file) => (
-                        <span>{file.fileData.name}</span>
-                    ))}
-                </div>
-            )}
-
-            {!isLoading && (
-                <form onSubmit={handleSubmit} style=\{{ display: 'flex', flexDirection: 'column', gap: '30px' }}>
-                    {ids.map((id) => (
-                        <Attach
-                            id={id}
-                            name={`attach${id}`}
-                            text={`Загрузить файл ${id}`}
-                            onChange={handleAttachFile}
-                            onClear={() => handleAttachClear(id)}
-                        />
-                    ))}
-
-                    <Button type="submit">Отправить</Button>
-                </form>
-            )}
-        </>
-    );
-}
-```

package/emotion/es/components/Autocomplete/Autocomplete.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch", "hasHint", "hintText"];
+var _excluded = ["value", "onChange", "suggestions", "view", "size", "labelPlacement", "disabled", "readOnly", "label", "leftHelper", "contentLeft", "contentRight", "textBefore", "textAfter", "onScroll", "listMaxHeight", "listWidth", "portal", "filter", "onSuggestionSelect", "threshold", "renderList", "renderListEnd", "onSearch"];
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -47,8 +47,6 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
       renderList = _ref.renderList,
       renderListEnd = _ref.renderListEnd,
       onSearch = _ref.onSearch,
-      hasHint = _ref.hasHint,
-      hintText = _ref.hintText,
       rest = _objectWithoutProperties(_ref, _excluded);
     var _useReducer = useReducer(focusedReducer, null),
       _useReducer2 = _slicedToArray(_useReducer, 2),
@@ -146,9 +144,7 @@ export var autocompleteRoot = function autocompleteRoot(Root) {
         "aria-controls": listId,
         "aria-expanded": isOpen,
         "aria-activedescendant": "".concat(listId, "/").concat(focused),
-        "aria-describedby": helperTextId,
-        hasHint: Boolean(hasHint),
-        hintText: String(hintText || '')
+        "aria-describedby": helperTextId
       }, rest)),
       preventOverflow: false,
       ref: targetRef,

package/emotion/es/components/Combobox/ComboboxNew/utils/filterItems.js

@@ -13,15 +13,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 // Не мутирует исходные данные.
 export var filterItems = function filterItems(items, textValue, currentLabel, customFilter) {
   if (!textValue || textValue === currentLabel) return items;
-  var defaultFilter = function defaultFilter(label, value) {
-    return label.toLowerCase().includes(value.toLowerCase());
+  var defaultFilter = function defaultFilter(item, value) {
+    return item.label.toLowerCase().includes(value.toLowerCase());
   };
   var filter = customFilter || defaultFilter;
   var dfs = function dfs(items) {
     var newItems = [];
     items.forEach(function (item) {
       if (item.items) {
-        if (filter(item.label, textValue)) {
+        if (filter(item, textValue)) {
           newItems.push(item);
           return;
         }
@@ -31,12 +31,11 @@ export var filterItems = function filterItems(items, textValue, currentLabel, cu
             items: res
           }));
         }
-      } else if (filter(item.label, textValue)) {
+      } else if (filter(item, textValue)) {
         newItems.push(item);
       }
     });
     return newItems;
   };
-  dfs(items);
   return dfs(items);
 };