@true-engineering/true-react-common-ui-kit 4.0.0-alpha16 → 4.0.0-alpha18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@true-engineering/true-react-common-ui-kit",
-  "version": "4.0.0-alpha16",
+  "version": "4.0.0-alpha18",
   "description": "True Engineering React UI Kit with theming support",
   "author": "True Engineering (https://trueengineering.ru)",
   "keywords": [

package/src/components/FiltersPane/FiltersPane.tsx

@@ -4,7 +4,7 @@ import { addDataAttributes } from '../../helpers';
 import { useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
 import { Button } from '../Button';
-import { Icon } from '../Icon';
+import { IIcon, renderIcon } from '../Icon';
 import { FilterWrapper, IFiltersPaneSearchProps, FiltersPaneSearch } from './components';
 import { getLocale } from './helpers';
 import { ConfigType, IFilterLocaleKey, IPartialFilterLocale } from './types';
@@ -25,6 +25,8 @@ export interface IFiltersPaneProps<Values extends Record<string, unknown>, Conte
   hasClearButton?: boolean;
   /** @default false */
   shouldRenderDataId?: boolean;
+  /** @default 'filter' */
+  settingsIcon?: IIcon;
   onChangeFilters: (values: Partial<Values>) => void;
   onSettingsButtonClick?: () => void;
   onClear?: () => void;
@@ -42,6 +44,7 @@ export function FiltersPane<Values extends Record<string, unknown>, Content = Va
   isDisabled = false,
   hasClearButton = true,
   shouldRenderDataId = false,
+  settingsIcon = 'filter',
   testId,
   onChangeFilters,
   onSettingsButtonClick,
@@ -107,9 +110,7 @@ export function FiltersPane<Values extends Record<string, unknown>, Content = Va
           {...addDataTestId(testId, 'settings-button')}
           onClick={!isDisabled ? onSettingsButtonClick : undefined}
         >
-          <div className={classes.settingsIcon}>
-            <Icon type="filter" />
-          </div>
+          <div className={classes.settingsIcon}>{renderIcon(settingsIcon)}</div>
         </div>
       )}
       {/* Search */}

package/src/components/TextArea/TextArea.tsx

@@ -24,13 +24,14 @@ import { ITextAreaStyles, useStyles } from './TextArea.styles';
 export interface ITextAreaProps
   extends ICommonProps<ITextAreaStyles>,
     Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, 'onChange'>,
-    Pick<IControlWrapperProps, 'label' | 'isInvalid' | 'isRequired' | 'isDisabled' | 'size'>,
+    Pick<
+      IControlWrapperProps,
+      'label' | 'isInvalid' | 'isRequired' | 'isDisabled' | 'size' | 'groupPlacement'
+    >,
     Pick<IWithMessagesProps, 'infoMessage' | 'errorMessage'> {
   value?: string;
   placeholder?: string;
   /** @default false */
-  isDisabled?: boolean;
-  /** @default false */
   isActive?: boolean;
   /**
    * Должна ли высота и ширина textarea подстраиваться под содержимое
@@ -54,7 +55,6 @@ export const TextArea = forwardRef<HTMLTextAreaElement, ITextAreaProps>(
   (
     {
       value = DEFAULT_VALUE,
-      label,
       placeholder,
       name,
       shouldFocusOnMount,
@@ -62,7 +62,6 @@ export const TextArea = forwardRef<HTMLTextAreaElement, ITextAreaProps>(
       shouldTrimAfterMaxLength,
       isAutoSized = true,
       shouldAlwaysShowPlaceholder,
-      isDisabled,
       isActive,
       maxLength,
       rows,
@@ -77,9 +76,12 @@ export const TextArea = forwardRef<HTMLTextAreaElement, ITextAreaProps>(
       infoMessage,
       errorMessage,
       // Пропсы ControlWrapper
+      label,
+      isDisabled,
       isInvalid,
       isRequired,
       size,
+      groupPlacement,
       ...textAreaProps
     },
     ref,
@@ -135,6 +137,7 @@ export const TextArea = forwardRef<HTMLTextAreaElement, ITextAreaProps>(
           hasValue={hasValue}
           isInvalid={isInvalid}
           isRequired={isRequired}
+          groupPlacement={groupPlacement}
           size={size}
           isFullWidth
         >