@jetbrains/ring-ui 6.0.66 → 6.0.68

package/components/table/simple-table.d.ts

@@ -45,6 +45,7 @@ declare class SimpleTable<T extends SelectionItem> extends PureComponent<SimpleT
         stickyHeaderOffset?: import("react").Validator<string | null | undefined> | undefined;
         renderEmpty?: import("react").Validator<(() => import("react").ReactNode) | null | undefined> | undefined;
         RowComponent?: import("react").Validator<typeof import("./row-with-focus-sensor").default | null | undefined> | undefined;
+        customLoader?: import("react").Validator<((loaderClassName?: string) => import("react").ReactNode) | null | undefined> | undefined;
         shortcuts?: import("react").Validator<import("../shortcuts/core").ShortcutsMap | null | undefined> | undefined;
     };
     static defaultProps: {

package/components/table/smart-table.d.ts

@@ -49,6 +49,7 @@ declare class SmartTable<T extends SelectionItem> extends PureComponent<SmartTab
         stickyHeaderOffset?: import("react").Validator<string | null | undefined> | undefined;
         renderEmpty?: import("react").Validator<(() => import("react").ReactNode) | null | undefined> | undefined;
         RowComponent?: import("react").Validator<typeof import("./row-with-focus-sensor").default | null | undefined> | undefined;
+        customLoader?: import("react").Validator<((loaderClassName?: string) => import("react").ReactNode) | null | undefined> | undefined;
         selectable?: import("react").Validator<boolean | null | undefined> | undefined;
         shortcuts?: import("react").Validator<import("../shortcuts/core").ShortcutsMap | null | undefined> | undefined;
         onSelectionChange: PropTypes.Requireable<(...args: any[]) => any>;

package/components/table/table.d.ts

@@ -50,6 +50,7 @@ export interface TableProps<T extends SelectionItem> extends FocusSensorAddProps
     stickyHeaderOffset?: string | undefined;
     renderEmpty?: (() => ReactNode) | null | undefined;
     RowComponent: typeof Row;
+    customLoader?: ((loaderClassName?: string) => ReactNode) | null | undefined;
 }
 /**
  * Interactive table with selection and keyboard navigation support.

package/components/table/table.js

@@ -111,7 +111,7 @@ export class Table extends PureComponent {
         window.scrollTo(scrollX, scrollY);
     };
     render() {
-        const { data, selection, columns, caption, getItemKey, selectable, focused, isItemSelectable, getItemLevel, getItemClassName, getMetaColumnClassName, getItemDataTest, draggable, alwaysShowDragHandle, dragHandleTitle, loading, onSort, sortKey, sortOrder, loaderClassName, stickyHeader, stickyHeaderOffset, isItemCollapsible, isParentCollapsible, isItemCollapsed, onItemCollapse, onItemExpand, isDisabledSelectionVisible, getCheckboxTooltip, onItemDoubleClick, onItemClick, renderEmpty, RowComponent } = this.props;
+        const { data, selection, columns, caption, getItemKey, selectable, focused, isItemSelectable, getItemLevel, getItemClassName, getMetaColumnClassName, getItemDataTest, draggable, alwaysShowDragHandle, dragHandleTitle, loading, onSort, sortKey, sortOrder, loaderClassName, stickyHeader, stickyHeaderOffset, isItemCollapsible, isParentCollapsible, isItemCollapsed, onItemCollapse, onItemExpand, isDisabledSelectionVisible, getCheckboxTooltip, onItemDoubleClick, onItemClick, renderEmpty, RowComponent, customLoader } = this.props;
         // NOTE: Do not construct new object per render because it causes all rows rerendering
         const columnsArray = typeof columns === 'function' ? columns(null) : columns;
         const headerProps = {
@@ -176,7 +176,7 @@ export class Table extends PureComponent {
         </div>
 
         {loading && (<div className={style.loadingOverlay}>
-            <Loader className={loaderClassName}/>
+            {customLoader ? customLoader(loaderClassName) : <Loader className={loaderClassName}/>}
           </div>)}
       </div>);
     }

package/components/tooltip/tooltip.d.ts

@@ -56,6 +56,7 @@ export default class Tooltip extends Component<TooltipProps> {
     showPopup: () => void;
     hidePopup: () => void;
     addListeners(): void;
+    hideIfMovedOutsidePopup: (ev: React.SyntheticEvent<HTMLElement>) => void;
     popup?: Popup | null;
     popupRef: (el: Popup | null) => void;
     onNestedTooltipShow: () => void;

package/components/tooltip/tooltip.js

@@ -106,6 +106,13 @@ export default class Tooltip extends Component {
         }
         this.listeners.add(document, 'scroll', () => scheduleScroll(this.hidePopup), { passive: true });
     }
+    hideIfMovedOutsidePopup = (ev) => {
+        if (!('relatedTarget' in ev) ||
+            this.popup?.container?.contains(ev.relatedTarget)) {
+            return;
+        }
+        this.hidePopup();
+    };
     popup;
     popupRef = (el) => {
         this.popup = el;
@@ -125,7 +132,7 @@ export default class Tooltip extends Component {
         return (<TooltipContext.Provider value={{ onNestedTooltipShow, onNestedTooltipHide }}>
         <span {...ariaProps} {...restProps} ref={this.containerRef} data-test={dataTests('ring-tooltip', dataTest)} data-test-title={typeof title === 'string' ? title : undefined}>
           {children}
-          <Popup trapFocus={false} hidden={!this.state.showPopup || this.state.showNestedPopup} onCloseAttempt={this.hidePopup} maxHeight={400} className={classNames(styles.tooltip, { [styles.long]: long })} attached={false} onMouseOut={this.hidePopup} top={4} dontCloseOnAnchorClick ref={this.popupRef} {...popupProps}>{title}</Popup>
+          <Popup trapFocus={false} hidden={!this.state.showPopup || this.state.showNestedPopup} onCloseAttempt={this.hidePopup} maxHeight={400} className={classNames(styles.tooltip, { [styles.long]: long })} attached={false} onMouseOut={this.hideIfMovedOutsidePopup} top={4} dontCloseOnAnchorClick ref={this.popupRef} {...popupProps}>{title}</Popup>
         </span>
       </TooltipContext.Provider>);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "6.0.66",
+  "version": "6.0.68",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",