@jetbrains/ring-ui 6.0.37 → 6.0.39

package/components/confirm/confirm.d.ts

@@ -13,6 +13,7 @@ export interface ConfirmProps {
     onConfirm: ((event: React.MouseEvent<HTMLButtonElement>) => void);
     onReject: ((event?: React.MouseEvent<HTMLButtonElement>) => void);
     className?: string | undefined;
+    native?: boolean;
 }
 /**
  * @name Confirm

package/components/confirm/confirm.js

@@ -41,8 +41,8 @@ export default class Confirm extends PureComponent {
         }
     };
     render() {
-        const { show, className, inProgress, cancelIsDefault, text, description, confirmLabel, rejectLabel, onConfirm, onReject } = this.props;
-        return (<Dialog label={text || (typeof description === 'string' ? description : undefined)} className={className} onEscPress={this.onEscPress} show={show} trapFocus data-test="ring-confirm">
+        const { show, className, inProgress, cancelIsDefault, text, description, confirmLabel, rejectLabel, onConfirm, onReject, native } = this.props;
+        return (<Dialog label={text || (typeof description === 'string' ? description : undefined)} className={className} onEscPress={this.onEscPress} show={show} trapFocus data-test="ring-confirm" native={native}>
         {text && <Header>{text}</Header>}
         {description && (<Content>
             <div className={styles.description}>{description}</div>

package/components/date-picker/date-input.d.ts

@@ -35,6 +35,7 @@ export default class DateInput extends React.PureComponent<DateInputProps> {
         onClear: PropTypes.Requireable<(...args: any[]) => any>;
         locale: PropTypes.Requireable<object>;
     };
+    componentDidMount(): void;
     componentDidUpdate(prevProps: DateInputProps): void;
     static contextType: React.Context<import("../i18n/i18n-context").I18nContextProps>;
     context: React.ContextType<typeof DateInput.contextType>;

package/components/date-picker/date-input.js

@@ -26,6 +26,9 @@ export default class DateInput extends React.PureComponent {
         onClear: PropTypes.func,
         locale: PropTypes.object
     };
+    componentDidMount() {
+        this.updateInput(this.props);
+    }
     componentDidUpdate(prevProps) {
         const { text, active } = this.props;
         if (text !== prevProps.text || active !== prevProps.active) {
@@ -36,7 +39,6 @@ export default class DateInput extends React.PureComponent {
     input;
     inputRef = (el) => {
         this.input = el;
-        this.updateInput(this.props);
     };
     updateInput({ text, active }) {
         const el = this.input;

package/components/date-picker/date-picker.js

@@ -28,7 +28,7 @@ const PopupComponent = ({ hidden = false, className, popupRef, onClear, datePopu
         Popup.PopupProps.Directions.BOTTOM_LEFT,
         Popup.PopupProps.Directions.TOP_LEFT,
         Popup.PopupProps.Directions.TOP_RIGHT
-    ]} {...restProps}>
+    ]} {...restProps} trapFocus>
     <DatePopup onClear={onClear} {...datePopupProps} onComplete={onComplete}/>
   </Popup>);
 PopupComponent.propTypes = {

package/components/dialog/dialog.css

@@ -1,6 +1,6 @@
 @import "../global/variables.css";
 
-@value header from "../island/island.css";
+@value header, scrollableWrapper from "../island/island.css";
 
 .container {
   position: fixed;
@@ -16,7 +16,18 @@
   justify-content: center;
 
   padding: calc(var(--ring-unit) * 4) var(--ring-unit);
+}
+
+.nativeDialog {
+  overflow: visible;
+
+  padding: 0;
+
+  border: none;
+}
 
+.container,
+.nativeDialog::backdrop {
   background-color: rgba(var(--ring-dialog-overlay-components), var(--ring-dialog-overlay-opacity));
 }
 
@@ -37,7 +48,7 @@
   cursor: default;
   overflow-wrap: break-word;
 
-  & [data-scrollable-container] {
+  & .scrollableWrapper {
     padding-bottom: var(--ring-unit);
   }
 
@@ -121,7 +132,7 @@
   }
 }
 
-.container .header {
+.innerContainer .header {
   padding-top: calc(var(--ring-unit) * 4);
 
   font-size: 24px;

package/components/dialog/dialog.d.ts

@@ -19,6 +19,8 @@ export interface DialogProps extends Partial<TabTrapProps> {
     portalTarget?: Element | null | undefined;
     'data-test'?: string | null | undefined;
     dense?: boolean | null | undefined;
+    native?: boolean;
+    modal?: boolean;
 }
 export default class Dialog extends PureComponent<DialogProps> {
     static propTypes: {
@@ -52,6 +54,7 @@ export default class Dialog extends PureComponent<DialogProps> {
         reset: () => void;
     };
     uid: string;
+    toggleNativeDialog(): void;
     toggleScrollPreventer(): void;
     handleClick: (event: React.MouseEvent<HTMLElement>) => void;
     onCloseClick: (event: React.MouseEvent<HTMLElement>) => void;
@@ -60,6 +63,7 @@ export default class Dialog extends PureComponent<DialogProps> {
     };
     dialog?: HTMLElement | null;
     dialogRef: (tabTrap: TabTrap | null) => void;
-    render(): false | React.ReactPortal;
+    nativeDialog: React.RefObject<HTMLDialogElement>;
+    render(): false | React.JSX.Element;
 }
 export type DialogAttrs = JSX.LibraryManagedAttributes<typeof Dialog, DialogProps>;

package/components/dialog/dialog.js

@@ -1,4 +1,4 @@
-import { PureComponent } from 'react';
+import { createRef, PureComponent } from 'react';
 import * as React from 'react';
 import { createPortal } from 'react-dom';
 import PropTypes from 'prop-types';
@@ -53,15 +53,24 @@ export default class Dialog extends PureComponent {
         closeButtonInside: false,
         shortcutOptions: { modal: false },
         trapFocus: false,
-        autoFocusFirst: true
+        autoFocusFirst: true,
+        modal: true
     };
     state = {
         shortcutsScope: getUID('ring-dialog-')
     };
     componentDidMount() {
+        const { show, native } = this.props;
+        if (native && show) {
+            this.toggleNativeDialog();
+        }
         this.toggleScrollPreventer();
     }
     componentDidUpdate(prevProps) {
+        const { show, native } = this.props;
+        if (native && show !== prevProps.show) {
+            this.toggleNativeDialog();
+        }
         if (prevProps.show !== this.props.show) {
             this.toggleScrollPreventer();
         }
@@ -71,6 +80,17 @@ export default class Dialog extends PureComponent {
     }
     scrollPreventer = scrollPreventerFactory(getUID('preventer-'));
     uid = getUID('dialog-');
+    toggleNativeDialog() {
+        const { show, modal } = this.props;
+        if (this.nativeDialog.current != null) {
+            if (show) {
+                modal ? this.nativeDialog.current.showModal() : this.nativeDialog.current.show();
+            }
+            else {
+                this.nativeDialog.current.close();
+            }
+        }
+    }
     toggleScrollPreventer() {
         if (this.props.show) {
             this.scrollPreventer.prevent();
@@ -102,26 +122,37 @@ export default class Dialog extends PureComponent {
     dialogRef = (tabTrap) => {
         this.dialog = tabTrap && tabTrap.node;
     };
+    nativeDialog = createRef();
     render() {
-        const { show, showCloseButton, onOverlayClick, onCloseAttempt, onEscPress, onCloseClick, children, className, contentClassName, trapFocus, 'data-test': dataTest, closeButtonInside, portalTarget, label, closeButtonTitle, dense, shortcutOptions, ...restProps } = this.props;
+        const { show, showCloseButton, onOverlayClick, onCloseAttempt, onEscPress, onCloseClick, children, className, contentClassName, trapFocus, 'data-test': dataTest, closeButtonInside, portalTarget, label, closeButtonTitle, dense, shortcutOptions, native, modal, ...restProps } = this.props;
         const classes = classNames(styles.container, className);
         const shortcutsMap = this.getShortcutsMap();
+        const content = (<>
+        <Shortcuts map={shortcutsMap} scope={this.state.shortcutsScope} options={this.props.shortcutOptions}/>
+        {(onOverlayClick !== noop || onCloseAttempt !== noop) && (<div 
+            // click handler is duplicated in close button
+            role="presentation" className={styles.clickableOverlay} onClick={this.handleClick}/>)}
+        <div className={styles.innerContainer}>
+          <AdaptiveIsland className={classNames(styles.content, contentClassName, { [styles.dense]: dense })} data-test="ring-dialog" role="dialog" aria-label={label}>
+            {children}
+            {showCloseButton &&
+                (<Button icon={closeIcon} data-test="ring-dialog-close-button" className={classNames(styles.closeButton, {
+                        [styles.closeButtonOutside]: !closeButtonInside,
+                        [styles.closeButtonInside]: closeButtonInside
+                    })} iconClassName={styles.closeIcon} onClick={this.onCloseClick} title={closeButtonTitle} aria-label={closeButtonTitle || 'close dialog'}/>)}
+          </AdaptiveIsland>
+        </div>
+      </>);
+        if (native) {
+            return (<dialog className={classNames(styles.nativeDialog, className)} ref={this.nativeDialog}>
+          <PopupTarget id={this.uid} className={styles.popupTarget}>
+            {target => <>{content}{target}</>}
+          </PopupTarget>
+        </dialog>);
+        }
         return show && createPortal(<PopupTarget id={this.uid} className={styles.popupTarget}>
         {target => (<TabTrap trapDisabled={!trapFocus} data-test={dataTests('ring-dialog-container', dataTest)} ref={this.dialogRef} className={classes} role="presentation" {...restProps}>
-              <Shortcuts map={shortcutsMap} scope={this.state.shortcutsScope} options={this.props.shortcutOptions}/>
-              {(onOverlayClick !== noop || onCloseAttempt !== noop) && (<div 
-                // click handler is duplicated in close button
-                role="presentation" className={styles.clickableOverlay} onClick={this.handleClick}/>)}
-              <div className={styles.innerContainer}>
-                <AdaptiveIsland className={classNames(styles.content, contentClassName, { [styles.dense]: dense })} data-test="ring-dialog" role="dialog" aria-label={label}>
-                  {children}
-                  {showCloseButton &&
-                    (<Button icon={closeIcon} data-test="ring-dialog-close-button" className={classNames(styles.closeButton, {
-                            [styles.closeButtonOutside]: !closeButtonInside,
-                            [styles.closeButtonInside]: closeButtonInside
-                        })} iconClassName={styles.closeIcon} onClick={this.onCloseClick} title={closeButtonTitle} aria-label={closeButtonTitle || 'close dialog'}/>)}
-                </AdaptiveIsland>
-              </div>
+              {content}
               {target}
             </TabTrap>)}
       </PopupTarget>, portalTarget instanceof HTMLElement ? portalTarget : document.body);

package/components/global/composeRefs.d.ts

@@ -1,3 +1,3 @@
 import { Ref } from 'react';
-declare const _default: <T>(...refs: (Ref<T> | undefined)[]) => (value: T | null) => void;
-export default _default;
+export default function composeRefs<T>(...refs: (Ref<T> | undefined)[]): (value: T | null) => void;
+export declare function createComposedRef<T>(): import("memoize-one").MemoizedFn<(...refs: (Ref<T> | undefined)[]) => (value: T | null) => void>;

package/components/global/composeRefs.js

@@ -1,8 +1,14 @@
-export default (...refs) => (value) => refs.forEach(ref => {
-    if (typeof ref === 'function') {
-        ref(value);
-    }
-    else if (ref != null) {
-        ref.current = value;
-    }
-});
+import memoizeOne from 'memoize-one';
+export default function composeRefs(...refs) {
+    return (value) => refs.forEach(ref => {
+        if (typeof ref === 'function') {
+            ref(value);
+        }
+        else if (ref != null) {
+            ref.current = value;
+        }
+    });
+}
+export function createComposedRef() {
+    return memoizeOne((composeRefs));
+}

package/components/input/input.d.ts

@@ -64,6 +64,7 @@ export declare class Input extends PureComponent<InputProps> {
     stretch(el: HTMLElement | null | undefined): void;
     adapt(): void;
     inputRef: (el: HTMLInputElement | HTMLTextAreaElement | null) => void;
+    composedInputRef: import("memoize-one").MemoizedFn<(...refs: (Ref<HTMLInputElement | HTMLTextAreaElement> | undefined)[]) => (value: HTMLInputElement | HTMLTextAreaElement | null) => void>;
     clear: (e: React.MouseEvent<HTMLButtonElement>) => void;
     handleInputChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
     handleTextareaChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;

package/components/input/input.js

@@ -8,7 +8,7 @@ import Button from '../button/button';
 import getUID from '../global/get-uid';
 import Icon from '../icon/icon';
 import { I18nContext } from '../i18n/i18n-context';
-import composeRefs from '../global/composeRefs';
+import { createComposedRef } from '../global/composeRefs';
 import { ControlsHeightContext } from '../global/controls-height';
 import { ControlLabel } from '../control-label/control-label';
 import ControlHelp from '../control-help/control-help';
@@ -75,6 +75,7 @@ export class Input extends PureComponent {
     inputRef = (el) => {
         this.input = el;
     };
+    composedInputRef = createComposedRef();
     clear = (e) => {
         this.props.onClear && this.props.onClear(e);
     };
@@ -109,7 +110,7 @@ export class Input extends PureComponent {
         const inputClasses = classNames(styles.input, inputClassName);
         const text = value != null ? value : children;
         const commonProps = {
-            ref: composeRefs(this.inputRef, inputRef),
+            ref: this.composedInputRef(this.inputRef, inputRef),
             className: inputClasses,
             value: text,
             disabled,

package/components/island/content.js

@@ -67,7 +67,7 @@ class Content extends Component {
         this.calculateScrollPosition();
     };
     render() {
-        const { children, className, bottomBorder, scrollableWrapperClassName, onScroll, onScrollToBottom, fade, ...restProps } = this.props;
+        const { children, className, bottomBorder, scrollableWrapperClassName, onScroll, onScrollToBottom, fade, tabIndex, ...restProps } = this.props;
         const { scrolledToTop, scrolledToBottom } = this.state;
         const classes = classNames(styles.content, className, {
             [styles.contentWithTopFade]: fade && !scrolledToTop,
@@ -77,10 +77,7 @@ class Content extends Component {
         });
         const scrollableWrapperClasses = classNames(styles.scrollableWrapper, scrollableWrapperClassName);
         return (<div {...restProps} data-test="ring-island-content" className={classes}>
-        <div 
-        // it has to be focusable because it can be scrollable
-        // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
-        tabIndex={0} data-scrollable-container className={scrollableWrapperClasses} ref={this.setScrollableNodeAndCalculatePosition} onScroll={fade ? this.calculateScrollPosition : noop}>
+        <div tabIndex={tabIndex} className={scrollableWrapperClasses} ref={this.setScrollableNodeAndCalculatePosition} onScroll={fade ? this.calculateScrollPosition : noop}>
           {fade && (<div ref={this.setWrapper}>
               {children}
             </div>)}

package/components/tab-trap/tab-trap.d.ts

@@ -1,4 +1,4 @@
-import { Component, ReactNode, HTMLAttributes } from 'react';
+import { Component, HTMLAttributes, ReactNode } from 'react';
 import * as React from 'react';
 import PropTypes from 'prop-types';
 export declare const FOCUSABLE_ELEMENTS = "input, button, select, textarea, a[href], *[tabindex]:not([data-trap-button]):not([data-scrollable-container])";
@@ -26,6 +26,7 @@ export default class TabTrap extends Component<TabTrapProps> {
         focusBackOnClose: boolean;
         focusBackOnExit: boolean;
     };
+    constructor(props: TabTrapProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
     previousFocusedNode?: Element | null;

package/components/tab-trap/tab-trap.js

@@ -21,15 +21,29 @@ export default class TabTrap extends Component {
         focusBackOnClose: true,
         focusBackOnExit: false
     };
-    componentDidMount() {
+    constructor(props) {
+        super(props);
+        // It's the same approach as in focus-trap-react:
+        // https://github.com/focus-trap/focus-trap-react/commit/3b22fca9eebeb883edc89548850fe5a5b9d6d50e
+        // We can't do it in componentDidMount because it's too late, some children might have already
+        // focused itself.
         this.previousFocusedNode = document.activeElement;
+    }
+    componentDidMount() {
         if (this.props.autoFocusFirst) {
             this.focusFirst();
         }
-        else if (!this.props.trapDisabled &&
-            (!this.node || !this.node.contains(this.previousFocusedNode))) {
-            this.trapWithoutFocus = true;
-            this.trapButtonNode?.focus();
+        else if (!this.props.trapDisabled) {
+            const previousFocusedElementIsInContainer = this.previousFocusedNode &&
+                this.node?.contains(this.previousFocusedNode);
+            // The component wrapped in TabTrap can already have a focused element (e.g. Date Picker),
+            // so we need to check if it does. If so, we don't need to focus anything.
+            const currentlyFocusedElementIsInContainer = this.node?.contains(document.activeElement);
+            if (!this.node ||
+                (!previousFocusedElementIsInContainer && !currentlyFocusedElementIsInContainer)) {
+                this.trapWithoutFocus = true;
+                this.trapButtonNode?.focus();
+            }
         }
     }
     componentWillUnmount() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "6.0.37",
+  "version": "6.0.39",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -45,9 +45,9 @@
     "screenshots-test-ci": "npm --prefix packages/screenshots run test-ci",
     "screenshots-gather": "npm --prefix packages/screenshots run gather",
     "build-stories": "storybook build --quiet -c .storybook -o storybook-dist",
-    "prebuild": "rimraf components && tsc --project tsconfig-build.json && cpy '**/*' '!**/*.ts' '!**/*.tsx' '!**/__mocks__/**' ../components --parents --cwd=src/",
+    "prebuild": "rimraf components && tsc --project tsconfig-build.json && cpy './**/*' '!**/*.ts' '!**/*.tsx' '!**/__mocks__/**' ../components --parents --cwd=src/",
     "build": "./node_modules/.bin/rollup -c --bundleConfigAsCjs",
-    "postbuild": "cpy '**/*.d.ts' ../dist --parents --cwd=components/",
+    "postbuild": "cpy './**/*.d.ts' ../dist --parents --cwd=components/",
     "serve": "http-server storybook-dist/ -p 9999",
     "start": "storybook dev -p 9999",
     "storybook-debug": "node --inspect-brk node_modules/@storybook/react/bin -p 9999",
@@ -78,7 +78,7 @@
   "devDependencies": {
     "@babel/cli": "^7.24.7",
     "@babel/eslint-parser": "^7.24.7",
-    "@csstools/css-parser-algorithms": "^2.6.1",
+    "@csstools/css-parser-algorithms": "^2.7.0",
     "@csstools/stylelint-no-at-nest-rule": "^2.0.0",
     "@jetbrains/eslint-config": "^5.4.2",
     "@jetbrains/logos": "3.0.0-canary.734b213.0",
@@ -98,7 +98,7 @@
     "@storybook/react-webpack5": "8.1.10",
     "@storybook/test-runner": "^0.18.2",
     "@storybook/theming": "8.1.10",
-    "@testing-library/dom": "^10.1.0",
+    "@testing-library/dom": "^10.2.0",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/chai": "^4.3.16",
@@ -112,21 +112,21 @@
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
     "@types/webpack-env": "^1.18.5",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
     "@vitejs/plugin-react": "^4.3.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "acorn": "^8.12.0",
     "axe-playwright": "^2.0.1",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "caniuse-lite": "^1.0.30001636",
+    "caniuse-lite": "^1.0.30001639",
     "chai": "^5.1.1",
     "chai-as-promised": "^8.0.0",
     "chai-dom": "^1.10.0",
     "chai-enzyme": "1.0.0-beta.1",
     "cheerio": "^1.0.0-rc.12",
     "core-js": "^3.37.1",
-    "cpy-cli": "^3.1.1",
+    "cpy-cli": "^5.0.0",
     "enzyme": "^3.11.0",
     "eslint": "^8.57.0",
     "eslint-import-resolver-webpack": "^0.13.8",
@@ -143,7 +143,7 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "~29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-teamcity": "^1.10.0",
+    "jest-teamcity": "^1.12.0",
     "lint-staged": "^15.2.7",
     "markdown-it": "^14.1.0",
     "merge-options": "^3.0.4",
@@ -167,7 +167,7 @@
     "svg-inline-loader": "^0.8.2",
     "teamcity-service-messages": "^0.1.14",
     "terser-webpack-plugin": "^5.3.10",
-    "typescript": "~5.5.2",
+    "typescript": "~5.5.3",
     "vitest": "^1.6.0",
     "vitest-teamcity-reporter": "^0.3.0",
     "wallaby-webpack": "^3.9.16",
@@ -226,13 +226,13 @@
     "highlight.js": "^10.7.2",
     "just-debounce-it": "^3.2.0",
     "memoize-one": "^6.0.0",
-    "postcss": "^8.4.38",
+    "postcss": "^8.4.39",
     "postcss-calc": "^10.0.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-font-family-system-ui": "^5.0.0",
     "postcss-loader": "^8.1.1",
     "postcss-modules-values-replace": "^4.2.0",
-    "postcss-preset-env": "^9.5.14",
+    "postcss-preset-env": "^9.5.15",
     "prop-types": "^15.8.1",
     "react-movable": "^3.2.0",
     "react-virtualized": "^9.22.5",