Merge branch 'feat-support-mobile-menu-in-file-preview' of github.com…

…:gravity-ui/uikit into feat-support-mobile-menu-in-file-preview
gravity-ui · Feb 11, 2025 · fe3a281 · fe3a281
2 parents 9e73745 + 3b8cb4c
commit fe3a281
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 29 deletions.
diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -12,7 +12,7 @@ const config: StorybookConfig = {
             options: {
                 rules: [
                     {
-                        test: /\.scss$/i,
+                        test: /\.(css|scss)$/i,
                         use: ['style-loader', 'css-loader', 'sass-loader'],
                     },
                 ],

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [7.1.1](https://github.com/gravity-ui/uikit/compare/v7.1.0...v7.1.1) (2025-02-10)
+
+
+### Bug Fixes
+
+* **Tab:** click on tabs should not generate 'submit' event ([#2103](https://github.com/gravity-ui/uikit/issues/2103)) ([dd35766](https://github.com/gravity-ui/uikit/commit/dd3576647b4a1e16b154e07c0105ba8ddc65e2a1))
+
+## [7.1.0](https://github.com/gravity-ui/uikit/compare/v7.0.0...v7.1.0) (2025-02-07)
+
+
+### Features
+
+* **Table:** add `interactive` descriptor ([#2090](https://github.com/gravity-ui/uikit/issues/2090)) ([09906b2](https://github.com/gravity-ui/uikit/commit/09906b21070863cda3f706a24a252d29dd5e3696))
+
+
+### Bug Fixes
+
+* fix esm build ([#2099](https://github.com/gravity-ui/uikit/issues/2099)) ([e3e702c](https://github.com/gravity-ui/uikit/commit/e3e702ca7683d92fd56245fcc6b7c5547f8159fa))
+* **i18n:** use correct keyset type ([#2085](https://github.com/gravity-ui/uikit/issues/2085)) ([5d34c33](https://github.com/gravity-ui/uikit/commit/5d34c338356d5bb6e84654ab8529ed354e48549c))
+
 ## [7.0.0](https://github.com/gravity-ui/uikit/compare/v6.42.0...v7.0.0) (2025-02-04)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@gravity-ui/uikit",
-    "version": "7.0.0",
+    "version": "7.1.1",
     "description": "Gravity UI base styling and components",
     "keywords": [
         "component",
@@ -149,7 +149,7 @@
         "@commitlint/config-conventional": "^19.6.0",
         "@faker-js/faker": "^9.4.0",
         "@gravity-ui/eslint-config": "^3.3.0",
-        "@gravity-ui/gulp-utils": "^1.0.0",
+        "@gravity-ui/gulp-utils": "^1.0.1",
         "@gravity-ui/prettier-config": "^1.1.0",
         "@gravity-ui/stylelint-config": "^4.0.1",
         "@gravity-ui/tsconfig": "^1.0.0",

diff --git a/src/components/Select/README.md b/src/components/Select/README.md
@@ -25,14 +25,15 @@ You can define options as an array of objects or as the children of a component.
 <ExampleBlock
     code={`
 <Select
+  placeholder="value"
   options={[
     {value: 'val_1', content: 'Value 1'},
     {value: 'val_2', content: 'Value 2'},
     {value: 'val_3', content: 'Value 3'},
     {value: 'val_4', content: 'Value 4'},
   ]}
 />
-<Select>
+<Select placeholder="value">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
@@ -42,7 +43,7 @@ You can define options as an array of objects or as the children of a component.
 >
   <div>
     Array of objects
-    <UIKit.Select
+    <UIKit.Select placeholder="value"
       options={[
         {value: 'val_1', content: 'Value 1'},
         {value: 'val_2', content: 'Value 2'},
@@ -53,7 +54,7 @@ You can define options as an array of objects or as the children of a component.
   </div>
   <div>
     Child nodes
-    <UIKit.Select>
+    <UIKit.Select placeholder="value">
       <UIKit.Select.Option value="val_1">Value 1</UIKit.Select.Option>
       <UIKit.Select.Option value="val_2">Value 2</UIKit.Select.Option>
       <UIKit.Select.Option value="val_3">Value 3</UIKit.Select.Option>
@@ -69,6 +70,7 @@ LANDING_BLOCK-->
 ```tsx
 // Array of objects
 <Select
+  placeholder="value"
   options={[
     {value: 'val_1', content: 'Value 1'},
     {value: 'val_2', content: 'Value 2'},
@@ -77,7 +79,7 @@ LANDING_BLOCK-->
   ]}
 />
 // Child nodes
-<Select>
+<Select placeholder="value">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
@@ -94,6 +96,7 @@ LANDING_BLOCK-->
 <ExampleBlock
     code={`
 <Select
+  placeholder="value"
   options={[
     {
       label: 'Group 1',
@@ -111,7 +114,7 @@ LANDING_BLOCK-->
     },
   ]}
 />
-<Select>
+<Select placeholder="value">
   <Select.OptionGroup label="Group 1">
     <Select.Option value="val_1" content="Value 1" />
     <Select.Option value="val_2" content="Value 2" />
@@ -126,6 +129,7 @@ LANDING_BLOCK-->
   <div>
     Array of objects
     <UIKit.Select
+      placeholder="value"
       options={[
         {
           label: 'Group 1',
@@ -146,7 +150,7 @@ LANDING_BLOCK-->
   </div>
   <div>
     Child nodes
-    <UIKit.Select>
+    <UIKit.Select placeholder="value">
       <UIKit.Select.OptionGroup label="Group 1">
         <UIKit.Select.Option value="val_1" content="Value 1" />
         <UIKit.Select.Option value="val_2" content="Value 2" />
@@ -166,6 +170,7 @@ LANDING_BLOCK-->
 ```tsx
 // Array of objects
 <Select
+  placeholder="value"
   options={[
     {
       label: 'Group 1',
@@ -184,7 +189,7 @@ LANDING_BLOCK-->
   ]}
 />
 // Child nodes
-<Select>
+<Select placeholder="value">
   <Select.OptionGroup label="Group 1">
     <Select.Option value="val_1" content="Value 1" />
     <Select.Option value="val_2" content="Value 2" />
@@ -210,15 +215,15 @@ To enable multiple selection, use the `multiple` property. Its default value is
 
 <ExampleBlock
     code={`
-<Select multiple={true}>
+<Select multiple={true} placeholder="values">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
   <Select.Option value="val_4">Value 4</Select.Option>
 </Select>
 `}
 >
-  <UIKit.Select multiple={true}>
+  <UIKit.Select multiple={true} placeholder="values">
     <UIKit.Select.Option value="val_1">Value 1</UIKit.Select.Option>
     <UIKit.Select.Option value="val_2">Value 2</UIKit.Select.Option>
     <UIKit.Select.Option value="val_3">Value 3</UIKit.Select.Option>
@@ -231,7 +236,7 @@ LANDING_BLOCK-->
 <!--GITHUB_BLOCK-->
 
 ```tsx
-<Select multiple={true}>
+<Select multiple={true} placeholder="values">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
@@ -249,15 +254,15 @@ You can add a counter of the selected items to the component using the `hasCount
 
 <ExampleBlock
     code={`
-<Select multiple={true} hasCounter={true}>
+<Select multiple={true} hasCounter={true} placeholder="values">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
   <Select.Option value="val_4">Value 4</Select.Option>
 </Select>
 `}
 >
-  <UIKit.Select multiple={true} hasCounter={true}>
+  <UIKit.Select multiple={true} hasCounter={true} placeholder="values">
     <UIKit.Select.Option value="val_1">Value 1</UIKit.Select.Option>
     <UIKit.Select.Option value="val_2">Value 2</UIKit.Select.Option>
     <UIKit.Select.Option value="val_3">Value 3</UIKit.Select.Option>
@@ -270,7 +275,7 @@ LANDING_BLOCK-->
 <!--GITHUB_BLOCK-->
 
 ```tsx
-<Select multiple={true} hasCounter={true}>
+<Select multiple={true} hasCounter={true} placeholder="values">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
@@ -288,7 +293,7 @@ To enable filter section, use the `filterable` property. Its default value is `f
 
 <ExampleBlock
     code={`
-<Select filterable={true}>
+<Select filterable={true} placeholder="Filterable">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
@@ -309,7 +314,7 @@ LANDING_BLOCK-->
 <!--GITHUB_BLOCK-->
 
 ```tsx
-<Select filterable={true}>
+<Select filterable={true} placeholder="Filterable">
   <Select.Option value="val_1">Value 1</Select.Option>
   <Select.Option value="val_2">Value 2</Select.Option>
   <Select.Option value="val_3">Value 3</Select.Option>
@@ -1108,12 +1113,32 @@ You can change this with the `errorPlacement` property.
 <!--LANDING_BLOCK
 <ExampleBlock
     code={`
-<Select placeholder="Placeholder" errorMessage="Error message" validationState="invalid" />
-<Select placeholder="Placeholder" errorPlacement="inside" errorMessage="Error message" validationState="invalid" />
+<Select placeholder="Placeholder" errorMessage="Error message" validationState="invalid">
+    <Select.Option value="val_1">Value 1</Select.Option>
+    <Select.Option value="val_2">Value 2</Select.Option>
+    <Select.Option value="val_3">Value 3</Select.Option>
+    <Select.Option value="val_4">Value 4</Select.Option>
+</Select>
+<Select placeholder="Placeholder" errorPlacement="inside" errorMessage="Error message" validationState="invalid">
+    <Select.Option value="val_1">Value 1</Select.Option>
+    <Select.Option value="val_2">Value 2</Select.Option>
+    <Select.Option value="val_3">Value 3</Select.Option>
+    <Select.Option value="val_4">Value 4</Select.Option>
+</Select>
 `}
 >
-    <UIKit.Select placeholder="Placeholder" errorMessage="Error message" validationState="invalid" />
+    <UIKit.Select placeholder="Placeholder" errorMessage="Error message" validationState="invalid">
+        <UIKit.Select.Option value="val_1">Value 1</UIKit.Select.Option>
+        <UIKit.Select.Option value="val_2">Value 2</UIKit.Select.Option>
+        <UIKit.Select.Option value="val_3">Value 3</UIKit.Select.Option>
+        <UIKit.Select.Option value="val_4">Value 4</UIKit.Select.Option>
+    </UIKit.Select>
     <UIKit.Select placeholder="Placeholder" errorPlacement="inside" errorMessage="Error message" validationState="invalid" />
+        <UIKit.Select.Option value="val_1">Value 1</UIKit.Select.Option>
+        <UIKit.Select.Option value="val_2">Value 2</UIKit.Select.Option>
+        <UIKit.Select.Option value="val_3">Value 3</UIKit.Select.Option>
+        <UIKit.Select.Option value="val_4">Value 4</UIKit.Select.Option>
+    </UIKit.Select>
 </ExampleBlock>
 LANDING_BLOCK-->
 

diff --git a/src/components/tabs/Tab.tsx b/src/components/tabs/Tab.tsx
@@ -38,7 +38,7 @@ export const Tab = React.forwardRef<HTMLAnchorElement | HTMLButtonElement, TabPr
         }
 
         return (
-            <button {...tabProps} ref={ref as React.Ref<HTMLButtonElement>}>
+            <button {...tabProps} type="button" ref={ref as React.Ref<HTMLButtonElement>}>
                 {content}
             </button>
         );