@jetbrains/ring-ui 6.0.3-beta.0 → 6.0.3

package/components/table-legacy/table-legacy.css

@@ -1,7 +1,5 @@
 @import "./table-legacy__toolbar.css";
 
-@value unit from "../global/global.css";
-
 :global(.ring-table) {
   width: 100%;
 
@@ -32,7 +30,7 @@
 
   display: table-cell;
 
-  padding: 0 unit;
+  padding: 0 var(--ring-unit);
 
   text-align: left;
   white-space: nowrap;
@@ -51,7 +49,7 @@
 }
 
 :global(.ring-table__title:first-child) {
-  padding-left: calc(unit * 4);
+  padding-left: calc(var(--ring-unit) * 4);
 }
 
 /* Have to emulate right border because of Fx weird bug —
@@ -79,7 +77,7 @@
 }
 
 :global(.ring-table__title_nested) {
-  padding-left: calc(unit * 5);
+  padding-left: calc(var(--ring-unit) * 5);
 }
 
 /* fix header checkbox position in nested table */
@@ -96,7 +94,7 @@
   width: 12px;
   height: 9px;
 
-  margin-left: calc(unit * 2);
+  margin-left: calc(var(--ring-unit) * 2);
   padding-bottom: 21px;
 
   cursor: pointer;
@@ -129,7 +127,7 @@
 }
 
 :global(.ring-table__column_selector) {
-  min-width: calc(3 * unit);
+  min-width: calc(3 * var(--ring-unit));
   padding: 0 !important;
 
   text-align: center;
@@ -138,13 +136,13 @@
 :global(.ring-table__selector) {
   display: inline-block;
 
-  margin: 0 0 0 calc(unit / 2);
+  margin: 0 0 0 calc(var(--ring-unit) / 2);
 }
 
 :global(.ring-table__column) {
   display: table-cell;
 
-  padding: calc(unit - 2px) unit;
+  padding: calc(var(--ring-unit) - 2px) var(--ring-unit);
 
   vertical-align: middle;
   white-space: nowrap;
@@ -162,7 +160,7 @@
 }
 
 :global(.ring-table__column:first-child) {
-  padding-left: calc(4 * unit);
+  padding-left: calc(4 * var(--ring-unit));
 }
 
 :global(.ring-table__column.ring-table__column_gap) {
@@ -172,7 +170,7 @@
 
 /* Combined class is required here for specificity */
 :global(.ring-table__column.ring-table__column_toggle) {
-  width: calc(unit * 2);
+  width: calc(var(--ring-unit) * 2);
   padding: 0;
 
   text-align: right;
@@ -201,7 +199,7 @@
 }
 
 :global(.ring-table__column_gap) {
-  padding-left: calc(unit * 2) !important;
+  padding-left: calc(var(--ring-unit) * 2) !important;
 }
 
 :global(.ring-table__column-title) {
@@ -209,13 +207,13 @@
 }
 
 :global(.ring-table__column_wide) {
-  min-width: calc(10 * unit);
+  min-width: calc(10 * var(--ring-unit));
 }
 
 :global(.ring-table__column_limited) {
   overflow: hidden;
 
-  max-width: calc(50 * unit);
+  max-width: calc(50 * var(--ring-unit));
 
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -232,7 +230,7 @@
 }
 
 :global(.ring-table__column_narrow) {
-  min-width: calc(3 * unit);
+  min-width: calc(3 * var(--ring-unit));
   padding: 0 !important;
 }
 
@@ -244,7 +242,7 @@
   display: table-row;
 
   width: 100%;
-  height: calc(5 * unit);
+  height: calc(5 * var(--ring-unit));
 }
 
 :global(.ring-table__row .ring-table__row_ghost) {
@@ -294,7 +292,7 @@
 }
 
 :global(.ring-table__description) {
-  margin-left: unit;
+  margin-left: var(--ring-unit);
 
   color: var(--ring-secondary-color);
 
@@ -302,13 +300,13 @@
 }
 
 :global(.ring-table__avatar) {
-  width: calc(3 * unit);
-  height: calc(3 * unit + 3px); /* If avatar is missing */
+  width: calc(3 * var(--ring-unit));
+  height: calc(3 * var(--ring-unit) + 3px); /* If avatar is missing */
 }
 
 :global(.ring-table__avatar-img) {
-  width: calc(3 * unit);
-  height: calc(3 * unit);
+  width: calc(3 * var(--ring-unit));
+  height: calc(3 * var(--ring-unit));
 }
 
 :global(.ring-table__header_sticky) {
@@ -325,17 +323,17 @@
 }
 
 :global(.table__pager) {
-  padding: calc(4 * unit) calc(4 * unit);
+  padding: calc(4 * var(--ring-unit)) calc(4 * var(--ring-unit));
 }
 
 :global(.table__pager-links) {
-  margin-bottom: calc(2 * unit);
+  margin-bottom: calc(2 * var(--ring-unit));
 }
 
 :global(.table__pager-link) {
   display: inline-block;
 
-  margin-right: calc(4 * unit);
+  margin-right: calc(4 * var(--ring-unit));
 }
 
 :global(.table__pager-link_disabled) {

package/components/table-legacy/table-legacy__toolbar.css

@@ -1,5 +1,3 @@
-@value unit from "../global/global.css";
-
 :global(.ring-table__toolbar) {
   background: inherit;
 }
@@ -9,9 +7,9 @@
 
   display: block;
 
-  min-height: calc(unit * 3);
+  min-height: calc(var(--ring-unit) * 3);
 
-  padding: calc(unit * 2) calc(unit * 4);
+  padding: calc(var(--ring-unit) * 2) calc(var(--ring-unit) * 4);
 
   white-space: initial;
 

package/components/tabs/collapsible-more.js

@@ -12,7 +12,7 @@ import getTabTitles from './collapsible-tab';
 import { CustomItem } from './custom-item';
 export const AnchorLink = ({ hasActiveChildren, moreClassName, moreActiveClassName, ...restProps }) => {
     const classnames = classNames(styles.title, hasActiveChildren && styles.selected, hasActiveChildren && moreActiveClassName, moreClassName);
-    return (<Link title={'More'} innerClassName={classnames} className={classnames} {...restProps}>
+    return (<Link title={'More'} className={classnames} {...restProps}>
       {'More'}
       <Icon glyph={chevronDownIcon} className={styles.chevron}/></Link>);
 };

package/components/tabs/collapsible-tab.js

@@ -17,7 +17,7 @@ const TabTitle = React.memo(function TabTitle({ selected, child, handleSelect =
         [collapsedClassName ?? '']: collapsed,
         [collapsedActiveClassName ?? '']: collapsed && selected
     });
-    return (<TabLink title={title} isSelected={selected} active href={href} innerClassName={titleClasses} className={titleClasses} disabled={disabled} onPlainLeftClick={handleSelect} tabIndex={tabIndex} collapsed={collapsed} {...titleProps}/>);
+    return (<TabLink title={title} isSelected={selected} active href={href} className={titleClasses} disabled={disabled} onPlainLeftClick={handleSelect} tabIndex={tabIndex} collapsed={collapsed} {...titleProps}/>);
 });
 TabTitle.propTypes = {
     child: PropTypes.element,

package/components/tabs/collapsible-tabs.js

@@ -132,8 +132,8 @@ export const CollapsibleTabs = ({ children, selected, onSelect, moreClassName, m
             const container = measureRef.current;
             const descendants = [...container?.children ?? []];
             const moreButton = descendants.pop();
-            let moreButtonWidth = moreButton.offsetWidth;
-            const { marginLeft: moreButtonMarginLeft, marginRight: moreButtonMarginRight } = getComputedStyle(moreButton);
+            let moreButtonWidth = moreButton?.offsetWidth ?? 0;
+            const { marginLeft: moreButtonMarginLeft = '0', marginRight: moreButtonMarginRight = '0' } = moreButton ? getComputedStyle(moreButton) : {};
             moreButtonWidth += +moreButtonMarginLeft.replace('px', '') + +moreButtonMarginRight.replace('px', '');
             const tabsWidth = descendants.map(node => {
                 const { marginLeft, marginRight } = getComputedStyle(node);

package/components/tabs/dumb-tabs.js

@@ -34,7 +34,7 @@ class Tabs extends PureComponent {
         const titleClasses = classNames(styles.title, className, isSelected && activeClassName, {
             [styles.selected]: isSelected
         });
-        return (<TabLink title={title} isSelected={isSelected} key={key} href={href} innerClassName={titleClasses} className={titleClasses} disabled={disabled} onPlainLeftClick={this.handleSelect(key)} {...titleProps}/>);
+        return (<TabLink title={title} isSelected={isSelected} key={key} href={href} className={titleClasses} disabled={disabled} onPlainLeftClick={this.handleSelect(key)} {...titleProps}/>);
     };
     render() {
         const { className, tabContainerClassName, children, selected, autoCollapse, 'data-test': dataTest, ...restProps } = this.props;

package/components/tabs/tab-link.js

@@ -7,13 +7,13 @@ function TabLink({ isSelected, title, collapsed, ...restProps }) {
         ? title(isSelected, collapsed)
         : title;
     return (<Link {...restProps}>
-      {() => (<div className={styles.container}>
-          <span className={styles.visible}>{renderedTitle}</span>
-          {/* hack for preserving constant tab width*/}
-          <span className={styles.hidden}>{renderedTitle}</span>
-          <span className={styles.hiddenBold}>{renderedTitle}</span>
-          <span className={styles.hiddenRegular}>{renderedTitle}</span>
-        </div>)}
+      <div className={styles.container}>
+        <span className={styles.visible}>{renderedTitle}</span>
+        {/* hack for preserving constant tab width*/}
+        <span className={styles.hidden}>{renderedTitle}</span>
+        <span className={styles.hiddenBold}>{renderedTitle}</span>
+        <span className={styles.hiddenRegular}>{renderedTitle}</span>
+      </div>
     </Link>);
 }
 TabLink.propTypes = {

package/components/tabs/tabs.css

@@ -4,7 +4,6 @@
 @import "../link/link.css";
 
 @value dark from "../global/variables_dark.css";
-@value unit from "../global/global.css";
 @value line-shadow: inset 0 -1px 0 0;
 @value selected-line-shadow: inset 0 -2px 0 0;
 
@@ -24,7 +23,7 @@
 .titles {
   display: inline-block;
 
-  margin-bottom: calc(unit * 2);
+  margin-bottom: calc(var(--ring-unit) * 2);
 }
 
 .titles {
@@ -48,7 +47,7 @@
   border-radius: 0;
   background: none;
 
-  line-height: calc(unit * 4);
+  line-height: calc(var(--ring-unit) * 4);
 
   &:hover,
   &:active {
@@ -82,7 +81,7 @@
 }
 
 .title + .title {
-  margin-left: calc(unit * 3);
+  margin-left: calc(var(--ring-unit) * 3);
 }
 
 .title[disabled] {

package/components/tag/tag.css

@@ -1,6 +1,5 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
 @value max-height: 20px;
 
 .tag {
@@ -15,7 +14,7 @@
   max-width: 100%;
   height: max-height;
 
-  padding: 0 unit;
+  padding: 0 var(--ring-unit);
 
   cursor: pointer;
 
@@ -46,9 +45,9 @@
 
   display: inline-block;
 
-  max-width: calc(100% - unit / 2);
+  max-width: calc(100% - var(--ring-unit) / 2);
 
-  margin-right: calc(unit / 2);
+  margin-right: calc(var(--ring-unit) / 2);
 
   white-space: nowrap;
 }
@@ -77,8 +76,8 @@
 
   margin-bottom: -5px !important;
 
-  margin-left: unit;
-  padding-left: calc(unit / 2);
+  margin-left: var(--ring-unit);
+  padding-left: calc(var(--ring-unit) / 2);
 
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
@@ -131,9 +130,9 @@
   right: 0;
 
   height: auto;
-  padding: 0 calc(unit / 2);
+  padding: 0 calc(var(--ring-unit) / 2);
 
-  line-height: calc(unit * 2);
+  line-height: calc(var(--ring-unit) * 2);
 }
 
 .removeIcon.removeIcon {
@@ -157,8 +156,8 @@
   box-sizing: border-box;
   width: max-height;
   height: max-height;
-  margin-right: calc(unit / 2);
-  margin-left: calc(0 - unit);
+  margin-right: calc(var(--ring-unit) / 2);
+  margin-left: calc(var(--ring-unit) * -1);
 
   vertical-align: top;
 
@@ -167,10 +166,10 @@
 }
 
 .customIcon {
-  max-width: calc(unit * 2);
-  max-height: calc(unit * 2);
+  max-width: calc(var(--ring-unit) * 2);
+  max-height: calc(var(--ring-unit) * 2);
 
-  margin-right: calc(unit / 2);
+  margin-right: calc(var(--ring-unit) / 2);
 
   vertical-align: bottom;
 }

package/components/tags-input/tags-input.css

@@ -1,10 +1,9 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
 @value outerContainer, container, input from "../input/input.css";
 
 .tagsInput {
-  --ring-input-icon-offset: calc(unit * 2.5);
+  --ring-input-icon-offset: calc(var(--ring-unit) * 2.5);
   --ring-input-padding-inline: 3px;
 
   box-sizing: border-box;

package/components/tags-input/tags-input.d.ts

@@ -133,33 +133,6 @@ export default class TagsInput extends PureComponent<TagsInputProps, TagsInputSt
     selectRef: (el: Select | null) => void;
     render(): React.JSX.Element;
 }
-export declare const RerenderableTagsInput: {
-    new (props: TagsInputProps): {
-        _propsCache: TagsInputProps & React.RefAttributes<unknown>;
-        rerender(props?: Partial<TagsInputProps>, callback?: (() => void) | undefined): void;
-        node?: HTMLElement | null | undefined;
-        context: unknown;
-        setState<K extends keyof TagsInputState>(state: TagsInputState | ((prevState: Readonly<TagsInputState>, props: Readonly<TagsInputProps>) => TagsInputState | Pick<TagsInputState, K> | null) | Pick<TagsInputState, K> | null, callback?: (() => void) | undefined): void;
-        forceUpdate(callback?: (() => void) | undefined): void;
-        render(): React.ReactNode;
-        readonly props: Readonly<TagsInputProps>;
-        state: Readonly<TagsInputState>;
-        refs: {
-            [key: string]: React.ReactInstance;
-        };
-        componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<TagsInputProps>, nextState: Readonly<TagsInputState>, nextContext: any): boolean;
-        componentWillUnmount?(): void;
-        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<TagsInputProps>, prevState: Readonly<TagsInputState>): any;
-        componentDidUpdate?(prevProps: Readonly<TagsInputProps>, prevState: Readonly<TagsInputState>, snapshot?: any): void;
-        componentWillMount?(): void;
-        UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<TagsInputProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<TagsInputProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<TagsInputProps>, nextState: Readonly<TagsInputState>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<TagsInputProps>, nextState: Readonly<TagsInputState>, nextContext: any): void;
-    };
-};
+export declare const RerenderableTagsInput: React.ForwardRefExoticComponent<TagsInputProps & React.RefAttributes<TagsInput>>;
 export type TagsInputAttrs = JSX.LibraryManagedAttributes<typeof TagsInput, TagsInputProps>;
 export {};

package/components/toggle/toggle.css

@@ -1,6 +1,5 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
 @value padding: 2px;
 @value disabled-line-color: rgba(255, 255, 255, 0.9);
 @value duration: 300ms;
@@ -21,11 +20,11 @@
 }
 
 .label {
-  margin-left: unit;
+  margin-left: var(--ring-unit);
 }
 
 .leftLabel {
-  margin-right: unit;
+  margin-right: var(--ring-unit);
 }
 
 .switchWrapper {
@@ -70,8 +69,8 @@
     top: padding;
     left: 0;
 
-    width: calc(unit * 1.5);
-    height: calc(unit * 1.5);
+    width: calc(var(--ring-unit) * 1.5);
+    height: calc(var(--ring-unit) * 1.5);
 
     content: "";
 
@@ -79,7 +78,7 @@
 
     transform: translateX(padding);
 
-    border-radius: calc(unit * 0.75);
+    border-radius: calc(var(--ring-unit) * 0.75);
     background-color: var(--ring-toggle-item-color);
   }
 }
@@ -94,32 +93,32 @@
 
 .size16 {
   & .switchWrapper {
-    width: calc(unit * 3);
-    height: calc(unit * 2);
+    width: calc(var(--ring-unit) * 3);
+    height: calc(var(--ring-unit) * 2);
 
     vertical-align: -3px;
   }
 
   & .switch {
-    border-radius: unit;
+    border-radius: var(--ring-unit);
 
     &::before {
-      width: calc(unit * 1.5);
-      height: calc(unit * 1.5);
+      width: calc(var(--ring-unit) * 1.5);
+      height: calc(var(--ring-unit) * 1.5);
 
-      border-radius: calc(unit * 0.75);
+      border-radius: calc(var(--ring-unit) * 0.75);
     }
   }
 
   /* stylelint-disable-next-line selector-max-specificity */
   & .input:checked + ::before {
-    transform: translateX(calc(unit * 1.5 - padding));
+    transform: translateX(calc(var(--ring-unit) * 1.5 - padding));
   }
 }
 
 .size14 {
   & .switchWrapper {
-    width: calc(unit * 3);
+    width: calc(var(--ring-unit) * 3);
     height: 14px;
 
     vertical-align: -2px;
@@ -144,26 +143,26 @@
 
 .size20 {
   & .switchWrapper {
-    width: calc(unit * 4);
-    height: calc(unit * 2.5);
+    width: calc(var(--ring-unit) * 4);
+    height: calc(var(--ring-unit) * 2.5);
 
     vertical-align: -5px;
   }
 
   & .switch {
-    border-radius: calc(unit * 1.25);
+    border-radius: calc(var(--ring-unit) * 1.25);
 
     &::before {
-      width: calc(unit * 2);
-      height: calc(unit * 2);
+      width: calc(var(--ring-unit) * 2);
+      height: calc(var(--ring-unit) * 2);
 
-      border-radius: calc(unit);
+      border-radius: calc(var(--ring-unit));
     }
   }
 
   /* stylelint-disable-next-line selector-max-specificity */
   & .input:checked + ::before {
-    transform: translateX(calc(unit * 2 - padding));
+    transform: translateX(calc(var(--ring-unit) * 2 - padding));
   }
 }
 
@@ -181,7 +180,7 @@
 
   content: "";
 
-  border-radius: unit;
+  border-radius: var(--ring-unit);
   background-image:
     linear-gradient(
       45deg,

package/components/tooltip/tooltip.css

@@ -1,10 +1,8 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
-
 .tooltip {
-  max-width: calc(unit * 50);
-  padding: unit;
+  max-width: calc(var(--ring-unit) * 50);
+  padding: var(--ring-unit);
 
   text-align: left;
 
@@ -12,7 +10,7 @@
 }
 
 .long {
-  padding: unit calc(unit * 1.5);
+  padding: var(--ring-unit) calc(var(--ring-unit) * 1.5);
 
   font-size: var(--ring-font-size-smaller);
   line-height: var(--ring-line-height-lowest);

package/components/user-agreement/service.d.ts

@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 import { UserAgreementAttrs, UserAgreementTranslations } from './user-agreement';
 export declare const showMessage = "userAgreementShow";
 export declare const hideMessage = "userAgreementHide";
@@ -11,7 +12,7 @@ export interface ConsentResponse {
     endUserAgreementConsent?: Consent | null | undefined;
 }
 export interface Agreement {
-    text: string;
+    content: ReactNode;
     enabled?: boolean | null | undefined;
     majorVersion?: number | null | undefined;
     minorVersion?: number | null | undefined;
@@ -40,6 +41,7 @@ export default class UserAgreementService {
     tabId: number;
     interval: number;
     container: HTMLDivElement;
+    reactRoot: import("react-dom/client").Root;
     storage: import("../storage/storage").StorageInterface;
     checkingPromise: Promise<[Agreement, Consent]> | null;
     guest: boolean | null | undefined;

package/components/user-agreement/service.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, unmountComponentAtNode } from '../global/react-render-adapter';
+import { createRoot } from 'react-dom/client';
 import Storage from '../storage/storage';
 import alertService from '../alert-service/alert-service';
 import Link from '../link/link';
@@ -22,7 +22,7 @@ const DEFAULT_AGREEMENT = {
     majorVersion: 0,
     minorVersion: 0,
     requiredForREST: false,
-    text: ''
+    content: ''
 };
 export default class UserAgreementService {
     config;
@@ -47,6 +47,7 @@ export default class UserAgreementService {
     tabId = Math.random();
     interval = ONE_HOUR;
     container = document.createElement('div');
+    reactRoot = createRoot(this.container);
     storage = new Storage();
     checkingPromise = null;
     guest = false;
@@ -160,7 +161,7 @@ export default class UserAgreementService {
     };
     showDialog = (withoutNotifications, preview = false, restOptions) => {
         const { translations, onDialogShow } = this.config;
-        const { text } = this.userAgreement;
+        const { content } = this.userAgreement;
         const show = true;
         if (!this._dialogPromise) {
             this._dialogPromise = new Promise((resolve, reject) => {
@@ -174,7 +175,7 @@ export default class UserAgreementService {
                 };
                 const onClose = this.hideDialogAndAlert;
                 const props = {
-                    text,
+                    children: content,
                     show,
                     onAccept,
                     onDecline,
@@ -182,9 +183,9 @@ export default class UserAgreementService {
                     translations,
                     preview, ...restOptions
                 };
-                render((<ControlsHeightContext.Provider value={getGlobalControlsHeight()}>
+                this.reactRoot.render((<ControlsHeightContext.Provider value={getGlobalControlsHeight()}>
               <UserAgreement {...props}/>
-            </ControlsHeightContext.Provider>), this.container);
+            </ControlsHeightContext.Provider>));
                 if (onDialogShow) {
                     onDialogShow();
                 }
@@ -197,7 +198,7 @@ export default class UserAgreementService {
     };
     hideDialog = (withoutNotifications) => {
         const { onDialogHide } = this.config;
-        unmountComponentAtNode(this.container);
+        this.reactRoot.unmount();
         if (onDialogHide) {
             onDialogHide();
             this._dialogPromise = null;

package/components/user-agreement/user-agreement.css

@@ -1,6 +1,6 @@
 @import "../global/variables.css";
 
-@value unit, extra-small-screen-media from "../global/global.css";
+@value extra-small-screen-media from "../global/global.css";
 
 .agreementDialog {
   padding-bottom: 80px;
@@ -17,7 +17,7 @@
 }
 
 .suggestion {
-  padding-bottom: unit;
+  padding-bottom: var(--ring-unit);
 
   white-space: nowrap;