@jetbrains/ring-ui 8.0.0-beta.1 → 8.0.0-beta.10

package/components/avatar/avatar.js

@@ -1,15 +1,12 @@
 import { PureComponent } from 'react';
 import classNames from 'classnames';
-import deprecate from 'util-deprecate';
 import { encodeURL, isDataURI, parseQueryString } from '../global/url';
 import { getPixelRatio } from '../global/dom';
-import memoize from '../global/memoize';
 import FallbackAvatar from './fallback-avatar';
 import { Size } from './avatar-size';
 import AvatarInfo from './avatar-info';
 import styles from './avatar.css';
 export { Size };
-const warnSize = memoize((size) => deprecate(() => { }, `Avatar: Size${size} is deprecated and will be removed in 8.0. The supported sizes are: Size20, Size24, Size28, Size32, Size40.`));
 export default class Avatar extends PureComponent {
     static defaultProps = {
         dpr: getPixelRatio(),
@@ -28,9 +25,6 @@ export default class Avatar extends PureComponent {
     };
     render() {
         const { size, url, dpr, style, round, subavatar, subavatarSize, username, info, skipParams, ...restProps } = this.props;
-        if ([Size.Size18, Size.Size48].includes(size)) {
-            warnSize(size)();
-        }
         const sizeString = `${size}px`;
         const subavatarSizeString = `${subavatarSize}px`;
         const styleObj = {

package/components/avatar/fallback-avatar.js

@@ -31,12 +31,6 @@ const SizesSquare = {
         fontSize: '8px',
         textAnchor: 'middle',
     },
-    [Size.Size18]: {
-        radius: 4,
-        text: { x: 9, y: 13 },
-        fontSize: '11px',
-        textAnchor: 'middle',
-    },
     [Size.Size20]: {
         radius: 4,
         text: { x: 2, y: 10 },
@@ -69,13 +63,6 @@ const SizesSquare = {
         letterSpacing: 1,
         underscore: { x: 5, y: 32, width: 15, height: 2.5 },
     },
-    [Size.Size48]: {
-        radius: 4,
-        text: { x: 3, y: 21 },
-        fontSize: '19px',
-        letterSpacing: 1,
-        underscore: { x: 5, y: 32, width: 15, height: 2.5 },
-    },
     [Size.Size56]: {
         radius: 4,
         text: { x: 4, y: 28 },
@@ -92,13 +79,6 @@ const SizesRound = {
         textAnchor: 'middle',
         dominantBaseline: 'middle',
     },
-    [Size.Size18]: {
-        radius: 4,
-        fontSize: '11px',
-        text: { x: '50%', y: '54%' },
-        textAnchor: 'middle',
-        dominantBaseline: 'middle',
-    },
     [Size.Size20]: {
         radius: 4,
         fontSize: '9px',
@@ -136,14 +116,6 @@ const SizesRound = {
         textAnchor: 'middle',
         dominantBaseline: 'middle',
     },
-    [Size.Size48]: {
-        radius: 4,
-        fontSize: '19px',
-        letterSpacing: 1,
-        text: { x: '50%', y: '54%' },
-        textAnchor: 'middle',
-        dominantBaseline: 'middle',
-    },
     [Size.Size56]: {
         radius: 4,
         fontSize: '26px',

package/components/avatar-stack/avatar-stack.js

@@ -6,7 +6,7 @@ import { fontSizes } from '../avatar/avatar-info';
 import styles from './avatar-stack.css';
 export default function AvatarStack({ children, className, size = Size.Size20, extraItems, dropdownMenuProps, ...restProps }) {
     const [dropdownOpen, setDropdownOpen] = useState(false);
-    const sizeClass = size !== Size.Size16 && size !== Size.Size18 && size !== Size.Size48 ? styles[`size${size}`] : undefined;
+    const sizeClass = size !== Size.Size16 ? styles[`size${size}`] : undefined;
     return (<div className={classNames(styles.avatarStack, className, sizeClass, {
             [styles.hovered]: dropdownOpen,
         })} {...restProps} style={{ height: size, ...restProps.style }}>

package/components/banner/banner.css

@@ -32,7 +32,7 @@
     background-color: var(--ring-error-container-light-color);
 
     .icon {
-      color: var(--ring-main-error-color);
+      color: var(--ring-icon-error-color);
     }
   }
 
@@ -41,7 +41,7 @@
     background-color: var(--ring-success-container-light-color);
 
     .icon {
-      color: var(--ring-main-success-color);
+      color: var(--ring-icon-success-color);
     }
   }
 
@@ -50,7 +50,7 @@
     background-color: var(--ring-warning-container-light-color);
 
     .icon {
-      color: var(--ring-main-warning-color);
+      color: var(--ring-icon-warning-color);
     }
   }
 

package/components/button/button.css

@@ -235,12 +235,12 @@
 }
 
 .primaryBlock {
-  --ring-button-default-background-color: var(--ring-button-primary-background-color);
+  --ring-button-default-background-color: var(--ring-main-color);
   --ring-button-hover-background-color: var(--ring-main-hover-color);
-  --ring-button-pressed-background-color: var(--ring-button-primary-background-color);
-  --ring-button-active-background-color: var(--ring-button-primary-background-color);
+  --ring-button-pressed-background-color: var(--ring-main-color);
+  --ring-button-active-background-color: var(--ring-main-color);
   --ring-button-active-hover-background-color: var(--ring-main-hover-color);
-  --ring-button-active-pressed-background-color: var(--ring-button-primary-background-color);
+  --ring-button-active-pressed-background-color: var(--ring-main-color);
   --ring-button-disabled-background-color: var(--ring-border-hover-color);
   --ring-button-pressed-border-color: var(--ring-button-primary-border-color);
   --ring-button-active-border-color: var(--ring-button-primary-border-color);

package/components/button/button.d.ts

@@ -15,10 +15,6 @@ export interface ButtonBaseProps {
     secondary?: boolean | null | undefined;
     ghost?: boolean | null | undefined;
     short?: boolean | null | undefined;
-    /**
-     * @deprecated Use inline instead
-     */
-    text?: boolean | null | undefined;
     inline?: boolean | null | undefined;
     dropdown?: boolean | null | undefined;
     disabled?: boolean | undefined;

package/components/button/button.js

@@ -3,13 +3,11 @@ import * as React from 'react';
 import classNames from 'classnames';
 import chevronDown from '@jetbrains/icons/chevron-down';
 import chevron12pxDown from '@jetbrains/icons/chevron-12px-down';
-import deprecate from 'util-deprecate';
 import Icon, { Size } from '../icon/icon';
 import ClickableLink from '../link/clickable-link';
 import { ControlsHeightContext } from '../global/controls-height';
 import { getButtonClasses } from './button.classes';
 import styles from './button.css';
-const warnText = deprecate(() => { }, 'Button: "text" prop is deprecated and will be removed in 8.0. Use inline instead.');
 function removeLinkProps(props) {
     const { download, href, hrefLang, media, ping, target, type, referrerPolicy, onConditionalClick, onPlainLeftClick, activeClassName, ...restProps } = props;
     return restProps;
@@ -30,13 +28,10 @@ export class Button extends PureComponent {
     render() {
         const { 
         // Modifiers
-        active, danger, delayed, loader, primary, success, error, secondary, ghost, short, text, dropdown, height, 
+        active, danger, delayed, loader, primary, success, error, secondary, ghost, short, dropdown, height, 
         // Props
         icon, iconRight, iconSize, iconClassName, iconRightClassName, iconSuppressSizeWarning, className, children, inline, disabled, ...props } = this.props;
-        const isInline = inline ?? text ?? !!icon;
-        if (text) {
-            warnText();
-        }
+        const isInline = inline ?? !!icon;
         const classes = getButtonClasses({
             ...this.props,
             inline: isInline,

package/components/button-group/button-group.css

@@ -1,6 +1,6 @@
 @import '../global/variables.css';
 
-@value button, active, flat from '../button/button.css';
+@value button, active as buttonActive, flat from '../button/button.css';
 
 :root,
 :host {
@@ -133,14 +133,14 @@
     0 0 0 1px var(--ring-border-hover-color);
 }
 
-.buttonGroup .button.button.active {
+.buttonGroup .button.button.buttonActive {
   --ring-button-border-radius-left: var(--ring-border-radius);
   --ring-button-border-radius-right: var(--ring-border-radius);
 
   box-shadow: var(--ring-button-shadow) var(--ring-button-border-color);
 }
 
-.buttonGroup .button:focus-visible.active {
+.buttonGroup .button:focus-visible.buttonActive {
   --ring-button-border-radius-left: var(--ring-border-radius);
   --ring-button-border-radius-right: var(--ring-border-radius);
 
@@ -149,7 +149,7 @@
     0 0 0 1px var(--ring-border-hover-color);
 }
 
-.buttonGroup .button.active[disabled] {
+.buttonGroup .button.buttonActive[disabled] {
   box-shadow: var(--ring-button-shadow) var(--ring-border-hover-color);
 }
 /* stylelint-enable */
@@ -240,7 +240,7 @@
     }
   }
 
-  & .active {
+  & .buttonActive {
     z-index: var(--ring-button-group-active-z-index);
 
     &[disabled] {

package/components/checkbox/checkbox.d.ts

@@ -24,6 +24,6 @@ export default class Checkbox extends PureComponent<CheckboxProps> {
     componentDidUpdate(prevProps: CheckboxProps): void;
     input?: HTMLInputElement | null;
     inputRef: (el: HTMLInputElement | null) => void;
-    composedInputRef: import("memoize-one").MemoizedFn<(...refs: (Ref<HTMLInputElement> | undefined)[]) => (value: T | null) => void>;
+    composedInputRef: import("memoize-one").MemoizedFn<(...refs: (Ref<HTMLInputElement> | undefined)[]) => (value: T | null) => () => void>;
     render(): import("react").JSX.Element;
 }

package/components/collapse/collapse-content.d.ts

@@ -1,5 +1,12 @@
 import React, { type PropsWithChildren } from 'react';
 interface Props {
+    /**
+     * Height of the always-visible preview of the collapsed content.
+     * The collapsed subtree is inert until expanded, matching `aria-expanded`.
+     * The preview is only a visual clip of that subtree, so it is inert too and
+     * assistive technology will not perceive it — if the preview carries essential
+     * information, expose an accessible summary outside the collapsed content.
+     */
     minHeight?: number;
     className?: string;
     'data-test'?: string | null | undefined;

package/components/collapse/collapse-content.js

@@ -1,20 +1,23 @@
-import React, { useState, useEffect, useRef, useContext } from 'react';
+import React, { useState, useEffect, useRef, use } from 'react';
 import classNames from 'classnames';
 import dataTests from '../global/data-tests';
 import { getRect } from '../global/dom';
+import { parseCssDuration } from '../global/parse-css-duration';
 import { toPx } from './utils';
 import CollapseContext from './collapse-context';
 import { COLLAPSE_CONTENT_TEST_ID, COLLAPSE_CONTENT_CONTAINER_TEST_ID } from './consts';
 import styles from './collapse.css';
-const DURATION_FACTOR = 0.5;
 const DEFAULT_HEIGHT = 0;
 const VISIBLE = 1;
 const HIDDEN = 0;
+// margin for the hide fallback timer, so it fires only if transitionend never did
+const HIDE_FALLBACK_EXTRA_DELAY = 100;
+const isFullyCollapsed = (collapsed, initialContentHeight) => collapsed && initialContentHeight <= DEFAULT_HEIGHT;
 /**
  * @name CollapseContent
  */
 export const CollapseContent = ({ children, minHeight = DEFAULT_HEIGHT, 'data-test': dataTest, }) => {
-    const { collapsed, duration, id, disableAnimation } = useContext(CollapseContext);
+    const { collapsed, duration, id, animate, disableAnimation, keepMounted } = use(CollapseContext);
     const containerRef = useRef(null);
     const contentRef = useRef(null);
     const [initialContentHeight] = useState(minHeight);
@@ -23,20 +26,41 @@ export const CollapseContent = ({ children, minHeight = DEFAULT_HEIGHT, 'data-te
     const height = toPx(nextHeight);
     const [shouldHideContent, setShouldHideContent] = useState(collapsed && minHeight <= DEFAULT_HEIGHT);
     useEffect(() => {
-        function onTransitionEnd() {
+        const container = containerRef.current;
+        function finalizeCollapse() {
             if (initialContentHeight <= DEFAULT_HEIGHT) {
                 setShouldHideContent(collapsed);
             }
         }
-        const container = containerRef.current;
+        function onTransitionEnd(event) {
+            // transitionend bubbles: only the container's own height transition finalizes the collapse
+            if (event.target === container && event.propertyName === 'height') {
+                finalizeCollapse();
+            }
+        }
         container?.addEventListener('transitionend', onTransitionEnd);
+        // fallback for suppressed or cancelled transitions (e.g. `transition: none` overrides),
+        // which emit no transitionend and would otherwise leave the content interactive forever.
+        // Armed once per collapse toggle from the --duration committed to the DOM — the value
+        // the running transition actually uses — so it can neither undercut a transition started
+        // from a stale height nor be restarted by content resizes or duration changes mid-collapse
+        const cssDuration = parseCssDuration(container?.style.getPropertyValue('--duration') || '');
+        const fallbackTimeout = window.setTimeout(finalizeCollapse, cssDuration + HIDE_FALLBACK_EXTRA_DELAY);
         return () => {
             container?.removeEventListener('transitionend', onTransitionEnd);
+            window.clearTimeout(fallbackTimeout);
         };
     }, [collapsed, initialContentHeight]);
+    // render-phase state adjustments (not effects): the React Compiler lint forbids
+    // setState-in-effect, and https://react.dev/learn/you-might-not-need-an-effect
+    // documents this pattern for resetting state when props change
     if (!collapsed && shouldHideContent) {
         setShouldHideContent(false);
     }
+    // without a transition there is no transitionend to wait for, so hide immediately
+    if (disableAnimation && !shouldHideContent && isFullyCollapsed(collapsed, initialContentHeight)) {
+        setShouldHideContent(true);
+    }
     useEffect(() => {
         if (contentRef.current) {
             const observer = new ResizeObserver(() => {
@@ -45,17 +69,26 @@ export const CollapseContent = ({ children, minHeight = DEFAULT_HEIGHT, 'data-te
             observer.observe(contentRef.current);
         }
     }, []);
-    const calculatedDuration = duration + contentHeight * DURATION_FACTOR;
     const style = {
-        '--duration': `${calculatedDuration}ms`,
+        '--duration': `${duration}ms`,
         height,
         opacity: collapsed && !minHeight ? HIDDEN : VISIBLE,
     };
     const fadeShouldBeVisible = Boolean(minHeight && collapsed);
-    const shouldRenderContent = disableAnimation ? !collapsed : !shouldHideContent;
-    return (<div ref={containerRef} id={`collapse-content-${id}`} data-test={dataTests(COLLAPSE_CONTENT_CONTAINER_TEST_ID)} className={classNames(styles.container, { [styles.transition]: !disableAnimation })} style={style}>
-      <div ref={contentRef} data-test={dataTests(COLLAPSE_CONTENT_TEST_ID, dataTest)}>
-        {shouldRenderContent ? children : null}
+    const contentVisible = !shouldHideContent;
+    const contentHidden = Boolean(keepMounted) && !contentVisible;
+    // interaction is blocked as soon as the panel collapses (matching aria-expanded), while
+    // visibility waits for the animation to finish so the content stays painted meanwhile.
+    // This includes a minHeight preview: content clipped below it must not take focus,
+    // and inert cannot be applied any more granularly than to the whole subtree
+    const contentInert = collapsed;
+    return (<div ref={containerRef} id={`collapse-content-${id}`} data-test={dataTests(COLLAPSE_CONTENT_CONTAINER_TEST_ID)} className={classNames(styles.container, { [styles.transition]: animate && !disableAnimation })} style={style}>
+      <div ref={contentRef} data-test={dataTests(COLLAPSE_CONTENT_TEST_ID, dataTest)} 
+    // visibility: hidden removes the fully collapsed content from the tab order and accessibility
+    // tree, but descendants can override it with visibility: visible — inert cannot be escaped.
+    // Both are rendered in JSX so server-rendered collapsed markup is protected before hydration.
+    style={contentHidden ? { visibility: 'hidden' } : undefined} inert={contentInert}>
+        {keepMounted || contentVisible ? children : null}
       </div>
       {fadeShouldBeVisible && <div className={styles.fade}/>}
     </div>);

package/components/collapse/collapse-context.d.ts

@@ -1,7 +1,9 @@
 interface CollapseContextInterface {
     collapsed: boolean;
     duration: number;
+    animate: boolean;
     disableAnimation: boolean;
+    keepMounted?: boolean;
     setCollapsed: () => void;
     id: string;
 }

package/components/collapse/collapse-context.js

@@ -3,7 +3,9 @@ import { BASE_ANIMATION_DURATION } from './consts';
 export const CollapseContext = createContext({
     collapsed: true,
     duration: BASE_ANIMATION_DURATION,
+    animate: false,
     disableAnimation: false,
+    keepMounted: false,
     setCollapsed: () => { },
     id: '',
 });

package/components/collapse/collapse-control.js

@@ -1,4 +1,4 @@
-import { useContext, cloneElement } from 'react';
+import { use, cloneElement } from 'react';
 import * as React from 'react';
 import dataTests from '../global/data-tests';
 import { CollapseContext } from './collapse-context';
@@ -7,7 +7,7 @@ import { COLLAPSE_CONTROL_TEST_ID } from './consts';
  * @name CollapseControl
  */
 export const CollapseControl = ({ children, 'data-test': dataTest }) => {
-    const { setCollapsed, collapsed, id } = useContext(CollapseContext);
+    const { setCollapsed, collapsed, id } = use(CollapseContext);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const child = typeof children === 'function' ? children(collapsed) : children;
     return (<p data-test={dataTests(COLLAPSE_CONTROL_TEST_ID, dataTest)}>

package/components/collapse/collapse.css

@@ -7,8 +7,14 @@
 
 .transition {
   transition:
-    height var(--duration) ease-in-out 0s,
-    opacity var(--duration) ease-in-out 0s;
+    height var(--duration) cubic-bezier(0.2, 0, 0, 1) 0s,
+    opacity var(--duration) cubic-bezier(0.2, 0, 0, 1) 0s;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .transition {
+    transition: none;
+  }
 }
 
 .summary {

package/components/collapse/collapse.d.ts

@@ -4,6 +4,15 @@ interface Props {
     onChange?: (collapsed: boolean) => void;
     duration?: number;
     disableAnimation?: boolean;
+    /**
+     * Keep children mounted while collapsed (hidden via `visibility: hidden`
+     * and the `inert` attribute) instead of unmounting them, preserving their state.
+     * Note: hidden form controls still participate in form validation
+     * and submission — disable them while collapsed if needed.
+     * Content rendered through portals (e.g. Popup) escapes the hidden
+     * wrapper and is not hidden — close overlays on collapse.
+     */
+    keepMounted?: boolean;
     className?: string;
     defaultCollapsed?: boolean;
     collapsed?: boolean | null;

package/components/collapse/collapse.js

@@ -5,24 +5,33 @@ import { BASE_ANIMATION_DURATION } from './consts';
 /**
  * @name Collapse
  */
-export const Collapse = ({ children, duration = BASE_ANIMATION_DURATION, disableAnimation = false, className = '', onChange = () => { }, defaultCollapsed = true, collapsed = null, }) => {
+export const Collapse = ({ children, duration = BASE_ANIMATION_DURATION, disableAnimation = false, keepMounted = false, className = '', onChange = () => { }, defaultCollapsed = true, collapsed = null, }) => {
     const [innerCollapsed, setInnerCollapsed] = useState(defaultCollapsed);
     const id = useId();
     const finalCollapsedValue = collapsed ?? innerCollapsed;
+    const [previousCollapsedValue, setPreviousCollapsedValue] = useState(finalCollapsedValue);
+    const [animate, setAnimate] = useState(false);
+    if (previousCollapsedValue !== finalCollapsedValue) {
+        setPreviousCollapsedValue(finalCollapsedValue);
+        setAnimate(true);
+    }
     const setCollapsed = () => {
+        setAnimate(true);
         setInnerCollapsed(!finalCollapsedValue);
         onChange(!finalCollapsedValue);
     };
     return (<div className={className}>
-      <CollapseContext.Provider value={{
+      <CollapseContext value={{
             collapsed: finalCollapsedValue,
             setCollapsed,
             duration,
+            animate,
             disableAnimation,
+            keepMounted,
             id,
         }}>
         {children}
-      </CollapseContext.Provider>
+      </CollapseContext>
     </div>);
 };
 export default Collapse;

package/components/{expand → collapsible-group}/collapsible-group.css

@@ -25,7 +25,7 @@
   box-shadow: var(--ring-popup-shadow);
 }
 
-.focused {
+.expand:has(.headerButton:focus-visible) {
   box-shadow: 0 0 0 2px var(--ring-border-hover-color), var(--ring-popup-shadow);
 }
 
@@ -37,6 +37,12 @@
   height: 28px;
 }
 
+.heading {
+  margin: 0;
+
+  font: inherit;
+}
+
 .headerButton {
   display: block;
 

package/components/collapsible-group/collapsible-group.d.ts

@@ -0,0 +1,33 @@
+import React from 'react';
+export interface CollapsibleGroupProps {
+    ref?: React.Ref<HTMLDivElement>;
+    avatar?: React.ReactNode;
+    title: React.ReactNode;
+    subtitle?: React.ReactNode;
+    children?: React.ReactNode;
+    className?: string | null | undefined;
+    defaultExpanded?: boolean;
+    expanded?: boolean | null | undefined;
+    onChange?: (expanded: boolean) => void;
+    disableAnimation?: boolean;
+    interactive?: boolean;
+    /**
+     * Keep children mounted while collapsed (hidden via `visibility: hidden`
+     * and the `inert` attribute) instead of unmounting them, preserving their state.
+     * Note: hidden form controls still participate in form validation
+     * and submission — disable them while collapsed if needed.
+     * Content rendered through portals (e.g. Popup) escapes the hidden
+     * wrapper and is not hidden — close overlays on collapse.
+     */
+    keepMounted?: boolean;
+    /**
+     * Wraps the header in an <h2>–<h6> to keep the document outline.
+     */
+    headingLevel?: 2 | 3 | 4 | 5 | 6;
+    'data-test'?: string | null | undefined;
+}
+declare const CollapsibleGroup: {
+    ({ ref, avatar, title, subtitle, children, className, defaultExpanded, expanded, onChange, disableAnimation, interactive, keepMounted, headingLevel, "data-test": dataTest, }: CollapsibleGroupProps): React.JSX.Element;
+    displayName: string;
+};
+export default CollapsibleGroup;

package/components/{expand → collapsible-group}/collapsible-group.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useContext, useState } from 'react';
+import React, { use, useState } from 'react';
 import classNames from 'classnames';
 import chevronRightIcon from '@jetbrains/icons/chevron-12px-right';
 import chevronDownIcon from '@jetbrains/icons/chevron-12px-down';
@@ -8,7 +8,7 @@ import CollapseContent from '../collapse/collapse-content';
 import { CollapseContext } from '../collapse/collapse-context';
 import styles from './collapsible-group.css';
 function CollapsibleGroupHeaderContent({ avatar, titleContent, subtitle }) {
-    const { collapsed } = useContext(CollapseContext);
+    const { collapsed } = use(CollapseContext);
     return (<span className={styles.header}>
       <span className={styles.headerContent}>
         <span className={styles.avatarGroup}>
@@ -26,7 +26,7 @@ function CollapsibleGroupHeaderContent({ avatar, titleContent, subtitle }) {
     </span>);
 }
 function CollapsibleGroupHeader({ avatar, titleContent, subtitle, ...buttonProps }) {
-    const { setCollapsed, collapsed, id } = useContext(CollapseContext);
+    const { setCollapsed, collapsed, id } = use(CollapseContext);
     return (<button type='button' {...buttonProps} className={styles.headerButton} onClick={setCollapsed} aria-controls={`collapse-content-${id}`} aria-expanded={!collapsed}>
       <CollapsibleGroupHeaderContent avatar={avatar} titleContent={titleContent} subtitle={subtitle}/>
     </button>);
@@ -36,10 +36,9 @@ function CollapsibleGroupHeaderStatic({ avatar, titleContent, subtitle }) {
       <CollapsibleGroupHeaderContent avatar={avatar} titleContent={titleContent} subtitle={subtitle}/>
     </span>);
 }
-const CollapsibleGroup = forwardRef(({ avatar, title, subtitle, children, className, defaultExpanded = false, expanded = null, onChange = () => { }, disableAnimation = false, interactive = true, 'data-test': dataTest, }, ref) => {
+const CollapsibleGroup = ({ ref, avatar, title, subtitle, children, className, defaultExpanded = false, expanded = null, onChange = () => { }, disableAnimation = false, interactive = true, keepMounted = false, headingLevel, 'data-test': dataTest, }) => {
     const [innerExpanded, setInnerExpanded] = useState(defaultExpanded);
     const [hovered, setHovered] = useState(false);
-    const [focused, setFocused] = useState(false);
     const isExpanded = expanded ?? innerExpanded;
     const handleChange = (collapsed) => {
         const nextExpanded = !collapsed;
@@ -48,26 +47,19 @@ const CollapsibleGroup = forwardRef(({ avatar, title, subtitle, children, classN
         }
         onChange(nextExpanded);
     };
-    const onBlur = (event) => {
-        const nextTarget = event.relatedTarget;
-        if (nextTarget instanceof Node && event.currentTarget.contains(nextTarget)) {
-            return;
-        }
-        setFocused(false);
-    };
     const classes = classNames(styles.expand, className, {
         [styles.hovered]: hovered,
         [styles.expanded]: isExpanded,
-        [styles.focused]: focused,
     });
+    const header = interactive ? (<CollapsibleGroupHeader avatar={avatar} titleContent={title} subtitle={subtitle} onMouseEnter={() => setHovered(true)} onMouseLeave={() => setHovered(false)}/>) : (<CollapsibleGroupHeaderStatic avatar={avatar} titleContent={title} subtitle={subtitle}/>);
     return (<div ref={ref} className={classes} data-test={dataTest}>
-        <Collapse defaultCollapsed={!defaultExpanded} collapsed={expanded == null ? null : !expanded} onChange={handleChange} disableAnimation={disableAnimation} className={styles.collapseRoot}>
-          {interactive ? (<CollapsibleGroupHeader avatar={avatar} titleContent={title} subtitle={subtitle} onMouseEnter={() => setHovered(true)} onMouseLeave={() => setHovered(false)} onFocus={() => setFocused(true)} onBlur={onBlur}/>) : (<CollapsibleGroupHeaderStatic avatar={avatar} titleContent={title} subtitle={subtitle}/>)}
-          <CollapseContent>
-            <div className={styles.body}>{children}</div>
-          </CollapseContent>
-        </Collapse>
-      </div>);
-});
+      <Collapse defaultCollapsed={!defaultExpanded} collapsed={expanded == null ? null : !expanded} onChange={handleChange} disableAnimation={disableAnimation} keepMounted={keepMounted} className={styles.collapseRoot}>
+        {headingLevel != null ? React.createElement(`h${headingLevel}`, { className: styles.heading }, header) : header}
+        <CollapseContent>
+          <div className={styles.body}>{children}</div>
+        </CollapseContent>
+      </Collapse>
+    </div>);
+};
 CollapsibleGroup.displayName = 'CollapsibleGroup';
 export default CollapsibleGroup;

package/components/confirm-service/confirm-service.js

@@ -8,9 +8,9 @@ export const reactRoot = createRoot(containerElement);
  */
 function renderConfirm(props) {
     const { buttonsHeight = getGlobalControlsHeight(), ...restProps } = props;
-    reactRoot.render(<ControlsHeightContext.Provider value={buttonsHeight}>
+    reactRoot.render(<ControlsHeightContext value={buttonsHeight}>
       <Confirm {...restProps}/>
-    </ControlsHeightContext.Provider>);
+    </ControlsHeightContext>);
 }
 export default function confirm({ text, description, confirmLabel = 'OK', rejectLabel = 'Cancel', cancelIsDefault, onBeforeConfirm, buttonsHeight, }) {
     return new Promise((resolve, reject) => {

package/components/data-list/data-list.d.ts

@@ -5,7 +5,7 @@ import { Component } from 'react';
 import { type FocusSensorOuterProps } from '../global/focus-sensor-hoc';
 import { type SelectionShortcutsAddProps, type SelectionShortcutsOuterProps } from '../legacy-table/selection-shortcuts-hoc';
 import { type DisableHoverAddProps } from '../legacy-table/disable-hover-hoc';
-import { type SelectionItem } from '../legacy-table/selection';
+import { type SelectionItem } from '../global/table-selection';
 import { type FormattedItem, moreLessButtonStates } from './item';
 export interface DataListBaseProps<T extends SelectionItem> {
     data: readonly T[];

package/components/data-list/data-list.mock.d.ts

@@ -1,5 +1,5 @@
 import { type ReactNode } from 'react';
-import { type SelectionItem } from '../legacy-table/selection';
+import { type SelectionItem } from '../global/table-selection';
 export interface Item extends SelectionItem {
     title: ReactNode;
     collapsible?: boolean;

package/components/data-list/item.d.ts

@@ -1,5 +1,5 @@
 import { PureComponent, type ReactNode } from 'react';
-import { type SelectionItem } from '../legacy-table/selection';
+import { type SelectionItem } from '../global/table-selection';
 import type Selection from './selection';
 export declare enum moreLessButtonStates {
     UNUSED = 0,

package/components/data-list/selection.d.ts

@@ -1,4 +1,4 @@
-import TableSelection, { type CloneWithConfig, type SelectionItem, type TableSelectionConfig } from '../legacy-table/selection';
+import TableSelection, { type CloneWithConfig, type SelectionItem, type TableSelectionConfig } from '../global/table-selection';
 interface DataListSelectionConfig<T extends SelectionItem> extends TableSelectionConfig<T> {
     partialSelected?: Set<T> | undefined;
 }

package/components/data-list/selection.js

@@ -1,4 +1,4 @@
-import TableSelection from '../legacy-table/selection';
+import TableSelection from '../global/table-selection';
 export default class Selection extends TableSelection {
     _partialSelected;
     constructor({ partialSelected = new Set(), ...props }) {