Skip to content

Commit

Permalink
feat: udpate uikit (#69)
Browse files Browse the repository at this point in the history
  • Loading branch information
bocembocem authored Jul 19, 2023
1 parent 479f924 commit ffbee3b
Show file tree
Hide file tree
Showing 10 changed files with 325 additions and 128 deletions.
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module.exports = {
moduleFileExtensions: ['js', 'json', 'ts', 'tsx'],
rootDir: '.',
transform: {
'^.+\\.tsx?$': 'ts-jest',
'\\.[jt]sx?$': ['ts-jest', {tsconfig: './tsconfig.test.json'}],
},
transformIgnorePatterns: ['node_modules/(?!(@gravity-ui)/)'],
transformIgnorePatterns: ['node_modules/(?!(@gravity-ui|tinygesture))'],
coverageDirectory: './coverage',
collectCoverageFrom: ['src/**/*.{ts,tsx}', '!**/__stories__/**/*', '!**/*/*.stories.{ts,tsx}'],
testEnvironment: 'jsdom',
Expand Down
416 changes: 301 additions & 115 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"prepublishOnly": "npm run build"
},
"dependencies": {
"@gravity-ui/components": "^2.0.0",
"@gravity-ui/i18n": "^1.0.0",
"@gravity-ui/icons": "^2.1.0",
"bem-cn-lite": "^4.0.0",
Expand All @@ -47,11 +48,11 @@
"@babel/preset-typescript": "^7.18.6",
"@commitlint/cli": "^17.0.0",
"@commitlint/config-conventional": "^17.0.0",
"@gravity-ui/eslint-config": "^2.0.0",
"@gravity-ui/eslint-config": "^2.1.1",
"@gravity-ui/prettier-config": "^1.0.1",
"@gravity-ui/stylelint-config": "^2.0.0",
"@gravity-ui/tsconfig": "^1.0.0",
"@gravity-ui/uikit": "^4.10.0",
"@gravity-ui/uikit": "^5.0.2",
"@storybook/addon-essentials": "^7.0.27",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "^7.0.27",
Expand Down Expand Up @@ -97,7 +98,7 @@
"typescript": "^4.9.5"
},
"peerDependencies": {
"@gravity-ui/uikit": "^4.0.0",
"@gravity-ui/uikit": "^5.0.0",
"final-form": "^4.20.2",
"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0",
Expand Down
3 changes: 2 additions & 1 deletion src/lib/kit/components/Card/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from 'react';

import {HelpPopover} from '@gravity-ui/components';
import {ChevronDown} from '@gravity-ui/icons';
import {Button, Card as CardBase, HelpPopover, Icon} from '@gravity-ui/uikit';
import {Button, Card as CardBase, Icon} from '@gravity-ui/uikit';
import _ from 'lodash';

import {block} from '../../utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
justify-content: space-between;
padding: 15px;
align-items: center;
background-color: var(--yc-color-private-black-50-solid);
background-color: var(--yc-color-base-float-hover);

&_card {
border-bottom: 1px solid var(--yc-color-line-generic);
Expand Down
5 changes: 2 additions & 3 deletions src/lib/kit/components/Inputs/TextArea/TextArea.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from 'react';

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

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

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

return (
<TextInputBase
<TextAreaBase
value={value}
onBlur={onBlur}
onFocus={onFocus}
Expand All @@ -17,7 +17,6 @@ export const TextArea: StringInput = ({name, input, spec}) => {
minRows={8}
hasClear
disabled={spec.viewSpec.disabled}
multiline
placeholder={spec.viewSpec.placeholder}
qa={name}
/>
Expand Down
3 changes: 2 additions & 1 deletion src/lib/kit/components/Layouts/Row/Row.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from 'react';

import {HelpPopover} from '@gravity-ui/components';
import {Xmark} from '@gravity-ui/icons';
import {Button, HelpPopover, Icon} from '@gravity-ui/uikit';
import {Button, Icon} from '@gravity-ui/uikit';

import {
FieldValue,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/kit/components/Layouts/Section/Section.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

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

import {GroupIndent} from '../../';
import {ErrorWrapper} from '../../../';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from 'react';

import {HelpPopover} from '@gravity-ui/components';
import {ChevronDown} from '@gravity-ui/icons';
import {Button, HelpPopover, Icon} from '@gravity-ui/uikit';
import {Button, Icon} from '@gravity-ui/uikit';

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

Expand Down
8 changes: 8 additions & 0 deletions tsconfig.test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "@gravity-ui/tsconfig",
"compilerOptions": {
"resolveJsonModule": true,
"module": "commonjs",
"jsx": "react"
}
}

0 comments on commit ffbee3b

Please sign in to comment.