Skip to content

Commit ffbee3b

Browse files
authored
feat: udpate uikit (#69)
1 parent 479f924 commit ffbee3b

File tree

10 files changed

+325
-128
lines changed

10 files changed

+325
-128
lines changed

jest.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module.exports = {
33
moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
44
rootDir: '.',
55
transform: {
6-
'^.+\\.tsx?$': 'ts-jest',
6+
'\\.[jt]sx?$': ['ts-jest', {tsconfig: './tsconfig.test.json'}],
77
},
8-
transformIgnorePatterns: ['node_modules/(?!(@gravity-ui)/)'],
8+
transformIgnorePatterns: ['node_modules/(?!(@gravity-ui|tinygesture))'],
99
coverageDirectory: './coverage',
1010
collectCoverageFrom: ['src/**/*.{ts,tsx}', '!**/__stories__/**/*', '!**/*/*.stories.{ts,tsx}'],
1111
testEnvironment: 'jsdom',

package-lock.json

Lines changed: 301 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"prepublishOnly": "npm run build"
3838
},
3939
"dependencies": {
40+
"@gravity-ui/components": "^2.0.0",
4041
"@gravity-ui/i18n": "^1.0.0",
4142
"@gravity-ui/icons": "^2.1.0",
4243
"bem-cn-lite": "^4.0.0",
@@ -47,11 +48,11 @@
4748
"@babel/preset-typescript": "^7.18.6",
4849
"@commitlint/cli": "^17.0.0",
4950
"@commitlint/config-conventional": "^17.0.0",
50-
"@gravity-ui/eslint-config": "^2.0.0",
51+
"@gravity-ui/eslint-config": "^2.1.1",
5152
"@gravity-ui/prettier-config": "^1.0.1",
5253
"@gravity-ui/stylelint-config": "^2.0.0",
5354
"@gravity-ui/tsconfig": "^1.0.0",
54-
"@gravity-ui/uikit": "^4.10.0",
55+
"@gravity-ui/uikit": "^5.0.2",
5556
"@storybook/addon-essentials": "^7.0.27",
5657
"@storybook/preset-scss": "^1.0.3",
5758
"@storybook/react": "^7.0.27",
@@ -97,7 +98,7 @@
9798
"typescript": "^4.9.5"
9899
},
99100
"peerDependencies": {
100-
"@gravity-ui/uikit": "^4.0.0",
101+
"@gravity-ui/uikit": "^5.0.0",
101102
"final-form": "^4.20.2",
102103
"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
103104
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0",

src/lib/kit/components/Card/Card.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from 'react';
22

3+
import {HelpPopover} from '@gravity-ui/components';
34
import {ChevronDown} from '@gravity-ui/icons';
4-
import {Button, Card as CardBase, HelpPopover, Icon} from '@gravity-ui/uikit';
5+
import {Button, Card as CardBase, Icon} from '@gravity-ui/uikit';
56
import _ from 'lodash';
67

78
import {block} from '../../utils';

src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
justify-content: space-between;
77
padding: 15px;
88
align-items: center;
9-
background-color: var(--yc-color-private-black-50-solid);
9+
background-color: var(--yc-color-base-float-hover);
1010

1111
&_card {
1212
border-bottom: 1px solid var(--yc-color-line-generic);

src/lib/kit/components/Inputs/TextArea/TextArea.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react';
22

3-
import {TextInput as TextInputBase} from '@gravity-ui/uikit';
3+
import {TextArea as TextAreaBase} from '@gravity-ui/uikit';
44

55
import {StringInput} from '../../../../core';
66

77
export const TextArea: StringInput = ({name, input, spec}) => {
88
const {value, onBlur, onChange, onFocus} = input;
99

1010
return (
11-
<TextInputBase
11+
<TextAreaBase
1212
value={value}
1313
onBlur={onBlur}
1414
onFocus={onFocus}
@@ -17,7 +17,6 @@ export const TextArea: StringInput = ({name, input, spec}) => {
1717
minRows={8}
1818
hasClear
1919
disabled={spec.viewSpec.disabled}
20-
multiline
2120
placeholder={spec.viewSpec.placeholder}
2221
qa={name}
2322
/>

src/lib/kit/components/Layouts/Row/Row.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from 'react';
22

3+
import {HelpPopover} from '@gravity-ui/components';
34
import {Xmark} from '@gravity-ui/icons';
4-
import {Button, HelpPopover, Icon} from '@gravity-ui/uikit';
5+
import {Button, Icon} from '@gravity-ui/uikit';
56

67
import {
78
FieldValue,

src/lib/kit/components/Layouts/Section/Section.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22

3-
import {HelpPopover} from '@gravity-ui/uikit';
3+
import {HelpPopover} from '@gravity-ui/components';
44

55
import {GroupIndent} from '../../';
66
import {ErrorWrapper} from '../../../';

src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React from 'react';
22

3+
import {HelpPopover} from '@gravity-ui/components';
34
import {ChevronDown} from '@gravity-ui/icons';
4-
import {Button, HelpPopover, Icon} from '@gravity-ui/uikit';
5+
import {Button, Icon} from '@gravity-ui/uikit';
56

67
import {block} from '../../utils';
78

tsconfig.test.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "@gravity-ui/tsconfig",
3+
"compilerOptions": {
4+
"resolveJsonModule": true,
5+
"module": "commonjs",
6+
"jsx": "react"
7+
}
8+
}

0 commit comments

Comments
 (0)