Merge branch 'main' into feat/outline-for-text-input-and-select

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [6.1.1](https://github.com/gravity-ui/uikit/compare/v6.1.0...v6.1.1) (2024-02-26)
+
+
+### Bug Fixes
+
+* **breadcrumbs:** fix adaptive more view and define ResizeObserver in ssr apps ([#1364](https://github.com/gravity-ui/uikit/issues/1364)) ([dc6e514](https://github.com/gravity-ui/uikit/commit/dc6e514d058268f2ea482e4d78383a44e400d5e2))
+* **controls:** allow disable input via controlProps ([#1371](https://github.com/gravity-ui/uikit/issues/1371)) ([3228dca](https://github.com/gravity-ui/uikit/commit/3228dcab413a5dff9e3dc2353f1ddfa6235643e8))
+* **CopyToClipboard:** return CopyToClipboardProps type ([#1367](https://github.com/gravity-ui/uikit/issues/1367)) ([43599c2](https://github.com/gravity-ui/uikit/commit/43599c2d435b51e73bd581b73ac9ab3d72584adb))
+
 ## [6.1.0](https://github.com/gravity-ui/uikit/compare/v6.0.0...v6.1.0) (2024-02-21)
 
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gravity-ui/uikit",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "description": "Gravity UI base styling and components",
     "license": "MIT",
     "repository": {

src/components/CopyToClipboard/index.ts

@@ -1,2 +1,2 @@
 export * from './CopyToClipboard';
-export type {CopyToClipboardStatus} from './types';
+export type {CopyToClipboardStatus, CopyToClipboardProps} from './types';

src/components/Tabs/__stories__/Tabs.stories.tsx

@@ -68,7 +68,7 @@ WithWrapTo.args = {
     wrapTo(_item: TabsItemProps, node: React.ReactNode) {
         return (
             // eslint-disable-next-line jsx-a11y/anchor-is-valid
-            <a key={_item.id} href="#">
+            <a key={_item.id} href="#" style={{textDecoration: 'none'}}>
                 {node}
             </a>
         );

src/components/controls/TextArea/README.md

@@ -203,7 +203,7 @@ LANDING_BLOCK-->
 | onFocus         | Fires when the control gets focus. Provides focus event as a callback's argument                                                  |                     `function`                      |                 |
 | onKeyDown       | Fires when a key is pressed. Provides keyboard event as a callback's argument                                                     |                     `function`                      |                 |
 | onKeyUp         | Fires when a key is released. Provides keyboard event as a callback's argument                                                    |                     `function`                      |                 |
-| onUpdate        | Fires when the input’s value is changed by the user. Provides new value as ancallback's argument                                  |                     `function`                      |                 |
+| onUpdate        | Fires when the input’s value is changed by the user. Provides new value as a callback's argument                                  |                     `function`                      |                 |
 | pin             | The control's border view                                                                                                         |                      `string`                       | `"round-round"` |
 | placeholder     | Text that appears in the control when no value is set                                                                             |                      `string`                       |                 |
 | qa              | Test id attribute (`data-qa`)                                                                                                     |                      `string`                       |                 |

src/components/controls/TextArea/TextAreaControl.tsx

@@ -5,9 +5,10 @@ import {block} from '../../utils/cn';
 
 import type {TextAreaProps} from './TextArea';
 
-type Props = Omit<TextAreaProps, 'autoComplete' | 'onChange'> & {
+type Props = Omit<TextAreaProps, 'autoComplete' | 'onChange' | 'controlProps'> & {
     onChange: NonNullable<TextAreaProps['onChange']>;
     autoComplete?: React.TextareaHTMLAttributes<HTMLTextAreaElement>['autoComplete'];
+    controlProps: NonNullable<TextAreaProps['controlProps']>;
 };
 
 const b = block('text-area');
@@ -86,13 +87,13 @@ export function TextAreaControl(props: Props) {
 
     return (
         <textarea
-            {...(controlProps as React.InputHTMLAttributes<HTMLTextAreaElement>)}
-            ref={handleRef as React.Ref<HTMLTextAreaElement>}
+            {...controlProps}
+            ref={handleRef}
             style={{
-                ...(controlProps as React.InputHTMLAttributes<HTMLTextAreaElement>)?.style,
+                ...controlProps.style,
                 height: rows ? 'auto' : undefined,
             }}
-            className={b('control', controlProps?.className)}
+            className={b('control', controlProps.className)}
             name={name}
             id={id}
             tabIndex={tabIndex}
@@ -108,7 +109,7 @@ export function TextAreaControl(props: Props) {
             onKeyDown={onKeyDown}
             onKeyUp={onKeyUp}
             onKeyPress={onKeyPress}
-            disabled={disabled}
+            disabled={disabled ?? controlProps.disabled}
         />
     );
 }

src/components/controls/TextInput/TextInputControl.tsx

@@ -4,8 +4,9 @@ import {block} from '../../utils/cn';
 
 import type {TextInputProps} from './TextInput';
 
-type Props = Omit<TextInputProps, 'autoComplete'> & {
+type Props = Omit<TextInputProps, 'autoComplete' | 'controlProps'> & {
     autoComplete?: React.TextareaHTMLAttributes<HTMLInputElement>['autoComplete'];
+    controlProps: NonNullable<TextInputProps['controlProps']>;
 };
 
 const b = block('text-input');
@@ -36,7 +37,7 @@ export function TextInputControl(props: Props) {
         <input
             {...controlProps}
             ref={controlRef}
-            className={b('control', {type: 'input'}, controlProps?.className)}
+            className={b('control', {type: 'input'}, controlProps.className)}
             type={type}
             name={name}
             id={id}
@@ -52,7 +53,7 @@ export function TextInputControl(props: Props) {
             onKeyDown={onKeyDown}
             onKeyUp={onKeyUp}
             onKeyPress={onKeyPress}
-            disabled={disabled}
+            disabled={disabled ?? controlProps.disabled}
         />
     );
 }

src/components/index.ts

@@ -36,6 +36,7 @@ export * from './RadioGroup';
 export * from './Select';
 export * from './Sheet';
 export * from './Skeleton';
+export * from './Slider';
 export * from './Spin';
 export * from './Switch';
 export * from './Table';