@jetbrains/ring-ui 7.0.57 → 7.0.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -273,6 +273,12 @@
273
273
 
274
274
  composes: flat;
275
275
 
276
+ &:hover,
277
+ &:active,
278
+ &.active {
279
+ --ring-button-text-color: var(--ring-text-color);
280
+ }
281
+
276
282
  &.inline {
277
283
  &:hover {
278
284
  --ring-button-background-color: var(--ring-tag-background-color);
@@ -4,7 +4,6 @@ import Dialog from '../dialog/dialog';
4
4
  import Button from '../button/button';
5
5
  import { Content, Header } from '../island/island';
6
6
  import Panel from '../panel/panel';
7
- import styles from './confirm.css';
8
7
  /**
9
8
  * @name Confirm
10
9
  */
@@ -28,6 +27,6 @@ export default class Confirm extends PureComponent {
28
27
  };
29
28
  render() {
30
29
  const { show, className, inProgress, cancelIsDefault, text, description, confirmLabel, rejectLabel, onConfirm, onReject, native, } = this.props;
31
- return (_jsxs(Dialog, { label: text || (typeof description === 'string' ? description : undefined), className: className, onEscPress: this.onEscPress, show: show, trapFocus: true, "data-test": "ring-confirm", native: native, children: [text && _jsx(Header, { children: text }), description && (_jsx(Content, { children: _jsx("div", { className: styles.description, children: description }) })), _jsxs(Panel, { children: [_jsx(Button, { "data-test": "confirm-ok-button", primary: !cancelIsDefault, loader: inProgress, disabled: inProgress, onClick: onConfirm, children: confirmLabel }), _jsx(Button, { "data-test": "confirm-reject-button", onClick: onReject, disabled: inProgress, primary: cancelIsDefault, children: rejectLabel })] })] }));
30
+ return (_jsxs(Dialog, { label: text || (typeof description === 'string' ? description : undefined), className: className, onEscPress: this.onEscPress, show: show, trapFocus: true, "data-test": "ring-confirm", native: native, children: [text && _jsx(Header, { children: text }), description && _jsx(Content, { children: description }), _jsxs(Panel, { children: [_jsx(Button, { "data-test": "confirm-ok-button", primary: !cancelIsDefault, loader: inProgress, disabled: inProgress, onClick: onConfirm, children: confirmLabel }), _jsx(Button, { "data-test": "confirm-reject-button", onClick: onReject, disabled: inProgress, primary: cancelIsDefault, children: rejectLabel })] })] }));
32
31
  }
33
32
  }
@@ -153,11 +153,9 @@
153
153
  --ring-disabled-background-color: rgb(var(--ring-disabled-background-components)); /* #F7F8FA */
154
154
  --ring-disabled-selected-background-components: 235, 236, 240;
155
155
  --ring-disabled-selected-background-color: rgb(var(--ring-disabled-selected-background-components)); /* #EBECF0 */
156
- --ring-button-danger-active-components: 250, 212, 216;
157
- --ring-button-danger-active-color: rgb(var(--ring-button-danger-active-components)); /* #FAD4D8 */
156
+ --ring-button-danger-active-color: var(--ring-error-container-light-color); /* #FAD4D8 */
158
157
  --ring-button-loader-background: rgba(var(--ring-white-text-components), 0.4); /* TODO remove in 8.0 */
159
- --ring-button-primary-background-components: 53, 116, 240;
160
- --ring-button-primary-background-color: rgb(var(--ring-button-primary-background-components)); /* #3574F0 */
158
+ --ring-button-primary-background-color: var(--ring-main-color); /* TODO remove in 8.0 */
161
159
  --ring-table-loader-background-color: rgba(var(--ring-content-background-components), 0.5); /* #FFFFFF50 */
162
160
  --ring-removed-subtle-background-components: 255, 235, 236;
163
161
  --ring-removed-subtle-background-color: rgb(var(--ring-removed-subtle-background-components)); /* #FFEBEC */
@@ -114,8 +114,8 @@
114
114
  /* Background */
115
115
  --ring-content-background-components: 30, 31, 34;
116
116
  --ring-content-background-color: rgb(var(--ring-content-background-components)); /* #1E1F22 */
117
- --ring-popup-background-components: 57, 59, 64;
118
- --ring-popup-background-color: rgb(var(--ring-popup-background-components)); /* #393B40 */
117
+ --ring-popup-background-components: 43, 45, 48;
118
+ --ring-popup-background-color: rgb(var(--ring-popup-background-components)); /* #2B2D30 */
119
119
  --ring-sidebar-background-components: 43, 45, 48;
120
120
  --ring-sidebar-background-color: rgb(var(--ring-sidebar-background-components)); /* #2B2D30 */
121
121
  --ring-secondary-background-components: 43, 45, 48;
@@ -142,10 +142,8 @@
142
142
  --ring-disabled-background-color: rgb(var(--ring-disabled-background-components)); /* #393B40 */
143
143
  --ring-disabled-selected-background-components: 67, 69, 74;
144
144
  --ring-disabled-selected-background-color: rgb(var(--ring-disabled-selected-background-components)); /* #43454A */
145
- --ring-button-danger-active-components: 94, 56, 56;
146
- --ring-button-danger-active-color: rgb(var(--ring-button-danger-active-components)); /* #5E3838 */
147
- --ring-button-primary-background-components: 53, 116, 240;
148
- --ring-button-primary-background-color: rgb(var(--ring-button-primary-background-components)); /* #3574F0 */
145
+ --ring-button-danger-active-color: var(--ring-error-container-light-color); /* #5E3838 */
146
+ --ring-button-primary-background-color: var(--ring-main-color); /* TODO remove in 8.0 */
149
147
  --ring-table-loader-background-color: rgba(var(--ring-content-background-components), 0.5); /* #2B2D3050 */
150
148
  --ring-removed-subtle-background-components: 64, 41, 41;
151
149
  --ring-removed-subtle-background-color: rgb(var(--ring-removed-subtle-background-components)); /* #402929 */
@@ -1,5 +1,8 @@
1
1
  @import "../global/variables.css";
2
2
 
3
+ /* ensure style order */
4
+ @import "../link/link.css";
5
+
3
6
  .list {
4
7
  position: relative;
5
8
 
@@ -40,6 +40,8 @@
40
40
 
41
41
  .switchWrapper {
42
42
  position: relative;
43
+
44
+ flex-shrink: 0;
43
45
  }
44
46
 
45
47
  .input {
@@ -6,7 +6,7 @@
6
6
  }
7
7
 
8
8
  :global(.ring-ui-theme-dark) {
9
- --ring-tooltip-background-color: var(--ring-tag-background-color);
9
+ --ring-tooltip-background-color: var(--ring-grey-container-light-color);
10
10
  --ring-tooltip-text-color: var(--ring-white-text-color);
11
11
  }
12
12
 
@@ -28,6 +28,6 @@ export default class UserAgreement extends PureComponent {
28
28
  render() {
29
29
  const { scrolledDown } = this.state;
30
30
  const { translations, onAccept, onDecline, onClose, onRemindLater, children, show, preview, className } = this.props;
31
- return (_jsx(I18nContext.Consumer, { children: ({ translate }) => (_jsxs(Dialog, { label: translations?.userAgreement ?? translate('userAgreement'), show: show, className: classNames(style.agreementDialog, className), contentClassName: style.dialogContent, trapFocus: true, autoFocusFirst: false, "data-test": "user-agreement", children: [_jsx(Header, { children: translations?.userAgreement ?? translate('userAgreement') }), _jsx(Content, { fade: true, onScrollToBottom: this.onScrollToBottom, children: children }), !preview && (_jsxs(Panel, { children: [onRemindLater && !scrolledDown && (_jsx("div", { className: style.suggestion, children: translations?.scrollToAccept ?? translate('scrollToAccept') })), _jsx(Button, { primary: true, disabled: !scrolledDown, onClick: onAccept, "data-test": "accept", children: translations?.accept ?? translate('accept') }), _jsx(Button, { onClick: onDecline, autoFocus: true, "data-test": "decline", children: translations?.decline ?? translate('decline') }), !onRemindLater && !scrolledDown && (_jsx("span", { className: style.suggestion, children: translations?.scrollToAccept ?? translate('scrollToAccept') })), onRemindLater && (_jsx(Button, { className: style.remindLaterButton, onClick: onRemindLater, "data-test": "later", children: translations?.remindLater ?? translate('remindLater') }))] })), preview && (_jsx(Panel, { children: _jsx(Button, { onClick: onClose, autoFocus: true, "data-test": "close", children: translations?.close ?? translate('close') }) }))] })) }));
31
+ return (_jsx(I18nContext.Consumer, { children: ({ translate }) => (_jsxs(Dialog, { label: translations?.userAgreement ?? translate('userAgreement'), show: show, className: classNames(style.agreementDialog, className), contentClassName: style.dialogContent, trapFocus: true, autoFocusFirst: false, "data-test": "user-agreement", children: [_jsx(Header, { children: translations?.userAgreement ?? translate('userAgreement') }), _jsx(Content, { tabIndex: 0, fade: true, onScrollToBottom: this.onScrollToBottom, children: children }), !preview && (_jsxs(Panel, { children: [onRemindLater && !scrolledDown && (_jsx("div", { className: style.suggestion, children: translations?.scrollToAccept ?? translate('scrollToAccept') })), _jsx(Button, { primary: true, disabled: !scrolledDown, onClick: onAccept, "data-test": "accept", children: translations?.accept ?? translate('accept') }), _jsx(Button, { onClick: onDecline, autoFocus: true, "data-test": "decline", children: translations?.decline ?? translate('decline') }), !onRemindLater && !scrolledDown && (_jsx("span", { className: style.suggestion, children: translations?.scrollToAccept ?? translate('scrollToAccept') })), onRemindLater && (_jsx(Button, { className: style.remindLaterButton, onClick: onRemindLater, "data-test": "later", children: translations?.remindLater ?? translate('remindLater') }))] })), preview && (_jsx(Panel, { children: _jsx(Button, { onClick: onClose, autoFocus: true, "data-test": "close", children: translations?.close ?? translate('close') }) }))] })) }));
32
32
  }
33
33
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jetbrains/ring-ui",
3
- "version": "7.0.57",
3
+ "version": "7.0.58",
4
4
  "description": "JetBrains UI library",
5
5
  "author": {
6
6
  "name": "JetBrains"
@@ -50,7 +50,7 @@
50
50
  "postinstall:gitconfig": "git config blame.ignoreRevsFile .git-blame-ignore-revs",
51
51
  "prepare": "webpack -c .storybook/custom-header/webpack.config.js",
52
52
  "prea11y-audit": "playwright install",
53
- "a11y-audit": "test-storybook --url http://localhost:9999",
53
+ "a11y-audit": "test-storybook --url http://localhost:9999 && DARK=true test-storybook --url http://localhost:9999",
54
54
  "a11y-audit-ci": "node a11y-audit-ci.mjs",
55
55
  "console-errors": "jest console-errors.test.js --watchAll",
56
56
  "console-errors-ci": "jest console-errors.test.js --reporters=jest-teamcity",
@@ -110,16 +110,16 @@
110
110
  "@jetbrains/logos": "3.0.0-canary.734b213.0",
111
111
  "@jetbrains/rollup-css-plugin": "./packages/rollup-css-plugin",
112
112
  "@jetbrains/stylelint-config": "^4.0.2",
113
- "@primer/octicons": "^19.15.3",
113
+ "@primer/octicons": "^19.15.4",
114
114
  "@rollup/plugin-babel": "^6.0.4",
115
115
  "@rollup/plugin-json": "^6.1.0",
116
116
  "@rollup/plugin-node-resolve": "^16.0.1",
117
117
  "@rollup/plugin-replace": "^6.0.2",
118
- "@storybook/addon-a11y": "9.0.17",
119
- "@storybook/addon-docs": "^9.0.17",
120
- "@storybook/addon-themes": "^9.0.17",
118
+ "@storybook/addon-a11y": "9.0.18",
119
+ "@storybook/addon-docs": "^9.0.18",
120
+ "@storybook/addon-themes": "^9.0.18",
121
121
  "@storybook/csf": "^0.1.13",
122
- "@storybook/react-webpack5": "9.0.17",
122
+ "@storybook/react-webpack5": "9.0.18",
123
123
  "@storybook/test-runner": "^0.23.0",
124
124
  "@testing-library/dom": "^10.4.0",
125
125
  "@testing-library/react": "^16.3.0",
@@ -135,28 +135,27 @@
135
135
  "@vitejs/plugin-react": "^4.7.0",
136
136
  "@vitest/eslint-plugin": "^1.3.4",
137
137
  "acorn": "^8.15.0",
138
- "axe-playwright": "^2.1.0",
139
138
  "babel-plugin-require-context-hook": "^1.0.0",
140
139
  "caniuse-lite": "^1.0.30001726",
141
140
  "chai": "^5.2.1",
142
141
  "chai-as-promised": "^8.0.1",
143
142
  "chai-dom": "^1.12.1",
144
- "cheerio": "^1.1.0",
143
+ "cheerio": "^1.1.2",
145
144
  "chromatic": "^13.1.2",
146
145
  "core-js": "^3.44.0",
147
146
  "cpy-cli": "^5.0.0",
148
- "dotenv-cli": "^8.0.0",
147
+ "dotenv-cli": "^9.0.0",
149
148
  "eslint": "^9.31.0",
150
- "eslint-config-prettier": "^10.1.5",
149
+ "eslint-config-prettier": "^10.1.8",
151
150
  "eslint-formatter-jslint-xml": "^8.40.0",
152
151
  "eslint-import-resolver-exports": "^1.0.0-beta.5",
153
152
  "eslint-import-resolver-webpack": "^0.13.10",
154
153
  "eslint-plugin-import": "^2.32.0",
155
154
  "eslint-plugin-jsx-a11y": "^6.10.2",
156
- "eslint-plugin-prettier": "^5.5.1",
155
+ "eslint-plugin-prettier": "^5.5.3",
157
156
  "eslint-plugin-react": "^7.37.5",
158
157
  "eslint-plugin-react-hooks": "^5.2.0",
159
- "eslint-plugin-storybook": "^9.0.17",
158
+ "eslint-plugin-storybook": "^9.0.18",
160
159
  "events": "^3.3.0",
161
160
  "glob": "^11.0.3",
162
161
  "globals": "^16.3.0",
@@ -164,8 +163,8 @@
164
163
  "http-server": "^14.1.1",
165
164
  "husky": "^9.1.7",
166
165
  "identity-obj-proxy": "^3.0.0",
167
- "jest": "~30.0.4",
168
- "jest-environment-jsdom": "^30.0.4",
166
+ "jest": "~30.0.5",
167
+ "jest-environment-jsdom": "^30.0.5",
169
168
  "jest-teamcity": "^1.12.0",
170
169
  "lint-staged": "^16.1.2",
171
170
  "markdown-it": "^14.1.0",
@@ -180,13 +179,13 @@
180
179
  "rollup": "^4.45.1",
181
180
  "rollup-plugin-clear": "^2.0.7",
182
181
  "storage-mock": "^2.1.0",
183
- "storybook": "9.0.17",
184
- "stylelint": "^16.21.1",
182
+ "storybook": "9.0.18",
183
+ "stylelint": "^16.22.0",
185
184
  "svg-inline-loader": "^0.8.2",
186
185
  "teamcity-service-messages": "^0.1.14",
187
186
  "terser-webpack-plugin": "^5.3.14",
188
187
  "typescript": "~5.8.3",
189
- "typescript-eslint": "^8.37.0",
188
+ "typescript-eslint": "^8.38.0",
190
189
  "vitest": "^3.2.4",
191
190
  "vitest-teamcity-reporter": "^0.3.1",
192
191
  "wallaby-webpack": "^3.9.16",
@@ -1,7 +0,0 @@
1
- @import "../global/variables.css";
2
-
3
- .description {
4
- margin-top: var(--ring-unit);
5
-
6
- font-size: var(--ring-font-size);
7
- }