@itwin/itwinui-react 3.17.0-dev.0 → 3.17.0-dev.2

package/DEV-esm/core/ThemeProvider/ThemeProvider.js

@@ -23,13 +23,14 @@ import { meta } from '../../utils/meta.js';
 let versionWithoutDots = meta.version.replace(/\./g, '');
 let ownerDocumentAtom = atom(void 0);
 export const ThemeProvider = React.forwardRef((props, forwardedRef) => {
-  var _themeOptions, _themeOptions1, _themeOptions2;
+  var _themeOptions, _themeOptions1, _future;
   let {
     theme: themeProp = 'inherit',
     children,
     themeOptions = {},
     portalContainer: portalContainerProp,
     includeCss = 'inherit' === themeProp,
+    future = {},
     ...rest
   } = props;
   useInertPolyfill();
@@ -41,18 +42,16 @@ export const ThemeProvider = React.forwardRef((props, forwardedRef) => {
   (_themeOptions1 = themeOptions).highContrast ??
     (_themeOptions1.highContrast =
       'inherit' === themeProp ? parent.highContrast : void 0);
-  (_themeOptions2 = themeOptions).bridgeToFutureVersions ??
-    (_themeOptions2.bridgeToFutureVersions =
-      'inherit' === themeProp
-        ? parent.context?.themeOptions?.bridgeToFutureVersions
-        : void 0);
+  (_future = future).themeBridge ??
+    (_future.themeBridge = parent.context?.future?.themeBridge);
   let [portalContainerFromParent] = useScopedAtom(portalContainerAtom);
   let contextValue = React.useMemo(
     () => ({
       theme,
       themeOptions,
+      future,
     }),
-    [theme, JSON.stringify(themeOptions)],
+    [theme, JSON.stringify(themeOptions), JSON.stringify(future)],
   );
   return React.createElement(
     ScopeProvider,
@@ -80,6 +79,7 @@ export const ThemeProvider = React.forwardRef((props, forwardedRef) => {
             {
               theme: theme,
               themeOptions: themeOptions,
+              future: future,
               ref: useMergedRefs(forwardedRef, setRootElement, useIuiDebugRef),
               ...rest,
             },
@@ -87,6 +87,7 @@ export const ThemeProvider = React.forwardRef((props, forwardedRef) => {
             React.createElement(PortalContainer, {
               theme: theme,
               themeOptions: themeOptions,
+              future: future,
               portalContainerProp: portalContainerProp,
               portalContainerFromParent: portalContainerFromParent,
               isInheritingTheme: 'inherit' === themeProp,
@@ -113,7 +114,7 @@ let MainRoot = React.forwardRef((props, forwardedRef) => {
   });
 });
 let Root = React.forwardRef((props, forwardedRef) => {
-  let { theme, children, themeOptions, className, ...rest } = props;
+  let { theme, children, themeOptions, className, future, ...rest } = props;
   let prefersDark = useMediaQuery('(prefers-color-scheme: dark)');
   let prefersHighContrast = useMediaQuery('(prefers-contrast: more)');
   let shouldApplyDark = 'dark' === theme || ('os' === theme && prefersDark);
@@ -131,7 +132,7 @@ let Root = React.forwardRef((props, forwardedRef) => {
       ),
       'data-iui-theme': shouldApplyDark ? 'dark' : 'light',
       'data-iui-contrast': shouldApplyHC ? 'high' : 'default',
-      'data-iui-bridge': !!themeOptions?.bridgeToFutureVersions || void 0,
+      'data-iui-bridge': !!future?.themeBridge || void 0,
       ref: forwardedRef,
       ...rest,
     },
@@ -179,6 +180,7 @@ let PortalContainer = React.memo(
     isInheritingTheme,
     theme,
     themeOptions,
+    future,
   }) => {
     let [ownerDocument] = useScopedAtom(ownerDocumentAtom);
     let [portalContainer, setPortalContainer] =
@@ -208,6 +210,7 @@ let PortalContainer = React.memo(
               ...themeOptions,
               applyBackground: false,
             },
+            future: future,
             'data-iui-portal': true,
             style: {
               display: 'contents',

package/DEV-esm/core/Toast/Toast.js

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Transition } from 'react-transition-group';
 import cx from 'classnames';
 import {
   getWindow,
@@ -9,6 +8,7 @@ import {
   useSafeContext,
   ButtonBase,
   useMediaQuery,
+  useLatestRef,
 } from '../../utils/index.js';
 import { IconButton } from '../Buttons/IconButton.js';
 import { ToasterStateContext } from './Toaster.js';
@@ -33,7 +33,6 @@ export const Toast = (props) => {
   let [height, setHeight] = React.useState(0);
   let thisElement = React.useRef(null);
   let [margin, setMargin] = React.useState(0);
-  let motionOk = useMediaQuery('(prefers-reduced-motion: no-preference)');
   let marginStyle = () => {
     if ('top' === placementPosition)
       return {
@@ -73,81 +72,41 @@ export const Toast = (props) => {
       setHeight(height);
     }
   };
-  let calculateOutAnimation = (node) => {
-    let translateX = 0;
-    let translateY = 0;
-    if (animateOutTo && node) {
-      let { x: startX, y: startY } = node.getBoundingClientRect();
-      let { x: endX, y: endY } = animateOutTo.getBoundingClientRect();
-      translateX = endX - startX;
-      translateY = endY - startY;
-    }
-    return {
-      translateX,
-      translateY,
-    };
-  };
-  return React.createElement(
-    Transition,
-    {
-      timeout: {
-        enter: 240,
-        exit: animateOutTo ? 400 : 120,
-      },
-      in: isVisible,
-      appear: true,
-      unmountOnExit: true,
-      onEnter: (node) => {
-        if (motionOk) {
-          node.style.transform = 'translateY(15%)';
-          node.style.transitionTimingFunction = 'ease';
-        }
-      },
-      onEntered: (node) => {
-        if (motionOk) node.style.transform = 'translateY(0)';
-      },
-      onExiting: (node) => {
-        if (motionOk) {
-          let { translateX, translateY } = calculateOutAnimation(node);
-          node.style.transform = animateOutTo
-            ? `scale(0.9) translate(${translateX}px,${translateY}px)`
-            : 'scale(0.9)';
-          node.style.opacity = '0';
-          node.style.transitionDuration = animateOutTo ? '400ms' : '120ms';
-          node.style.transitionTimingFunction = 'cubic-bezier(0.4, 0, 1, 1)';
-        }
-      },
-      onExited: onRemove,
-    },
-    React.createElement(
-      Box,
-      {
-        ref: thisElement,
-        className: 'iui-toast-all',
-        style: {
-          height,
-          ...marginStyle(),
-        },
-      },
-      React.createElement(
-        'div',
+  let shouldBeMounted = useAnimateToastBasedOnVisibility(isVisible, {
+    thisElement,
+    animateOutTo,
+    onRemove,
+  });
+  return shouldBeMounted
+    ? React.createElement(
+        Box,
         {
-          ref: onRef,
+          ref: thisElement,
+          className: 'iui-toast-all',
+          style: {
+            height,
+            ...marginStyle(),
+          },
         },
-        React.createElement(ToastPresentation, {
-          as: 'div',
-          category: category,
-          content: content,
-          link: link,
-          type: type,
-          hasCloseButton: hasCloseButton,
-          onClose: close,
-          ...domProps?.toastProps,
-          contentProps: domProps?.contentProps,
-        }),
-      ),
-    ),
-  );
+        React.createElement(
+          'div',
+          {
+            ref: onRef,
+          },
+          React.createElement(ToastPresentation, {
+            as: 'div',
+            category: category,
+            content: content,
+            link: link,
+            type: type,
+            hasCloseButton: hasCloseButton,
+            onClose: close,
+            ...domProps?.toastProps,
+            contentProps: domProps?.contentProps,
+          }),
+        ),
+      )
+    : null;
 };
 export const ToastPresentation = React.forwardRef((props, forwardedRef) => {
   let {
@@ -212,3 +171,100 @@ export const ToastPresentation = React.forwardRef((props, forwardedRef) => {
       ),
   );
 });
+let useAnimateToastBasedOnVisibility = (isVisible, args) => {
+  let { thisElement, animateOutTo, onRemove } = args;
+  let [shouldBeMounted, setShouldBeMounted] = React.useState(isVisible);
+  let motionOk = useMediaQuery('(prefers-reduced-motion: no-preference)');
+  let onRemoveRef = useLatestRef(onRemove);
+  let [prevIsVisible, setPrevIsVisible] = React.useState(void 0);
+  React.useEffect(() => {
+    if (prevIsVisible !== isVisible) {
+      setPrevIsVisible(isVisible);
+      if (isVisible) safeAnimateIn();
+      else safeAnimateOut();
+    }
+    function calculateOutAnimation(node) {
+      let translateX = 0;
+      let translateY = 0;
+      if (animateOutTo && node) {
+        let { x: startX, y: startY } = node.getBoundingClientRect();
+        let { x: endX, y: endY } = animateOutTo.getBoundingClientRect();
+        translateX = endX - startX;
+        translateY = endY - startY;
+      }
+      return {
+        translateX,
+        translateY,
+      };
+    }
+    function safeAnimateIn() {
+      setShouldBeMounted(true);
+      queueMicrotask(() => {
+        animateIn();
+      });
+    }
+    function safeAnimateOut() {
+      if (motionOk) {
+        let animation = animateOut();
+        animation?.addEventListener('finish', () => {
+          setShouldBeMounted(false);
+          onRemoveRef.current?.();
+        });
+      } else {
+        setShouldBeMounted(false);
+        onRemoveRef.current?.();
+      }
+    }
+    function animateIn() {
+      if (!motionOk) return;
+      thisElement.current?.animate?.(
+        [
+          {
+            transform: 'translateY(15%)',
+          },
+          {
+            transform: 'translateY(0)',
+          },
+        ],
+        {
+          duration: 240,
+          fill: 'forwards',
+        },
+      );
+    }
+    function animateOut() {
+      if (null == thisElement.current || !motionOk) return;
+      let { translateX, translateY } = calculateOutAnimation(
+        thisElement.current,
+      );
+      let animationDuration = animateOutTo ? 400 : 120;
+      let animation = thisElement.current?.animate?.(
+        [
+          {
+            transform: animateOutTo
+              ? `scale(0.9) translate(${translateX}px,${translateY}px)`
+              : 'scale(0.9)',
+            opacity: 0,
+            transitionDuration: `${animationDuration}ms`,
+            transitionTimingFunction: 'cubic-bezier(0.4, 0, 1, 1)',
+          },
+        ],
+        {
+          duration: animationDuration,
+          iterations: 1,
+          fill: 'forwards',
+        },
+      );
+      return animation;
+    }
+  }, [
+    isVisible,
+    prevIsVisible,
+    animateOutTo,
+    motionOk,
+    thisElement,
+    setShouldBeMounted,
+    onRemoveRef,
+  ]);
+  return shouldBeMounted;
+};

package/DEV-esm/core/Toast/Toaster.js

@@ -66,16 +66,24 @@ export const ToastProvider = ({ children, inherit = false }) => {
       placement: 'top',
     },
   });
-  if (React.useContext(ToasterStateContext) && inherit) return children;
+  let toasterDispatchContext = React.useContext(ToasterDispatchContext);
+  let toasterStateContext = React.useContext(ToasterStateContext);
+  let shouldReuse = toasterStateContext && inherit;
+  let toasterDispatchContextValue = shouldReuse
+    ? toasterDispatchContext
+    : dispatch;
+  let toasterStateContextValue = shouldReuse
+    ? toasterStateContext
+    : toasterState;
   return React.createElement(
     ToasterDispatchContext.Provider,
     {
-      value: dispatch,
+      value: toasterDispatchContextValue,
     },
     React.createElement(
       ToasterStateContext.Provider,
       {
-        value: toasterState,
+        value: toasterStateContextValue,
       },
       children,
     ),

package/DEV-esm/styles.js

@@ -1,4 +1,4 @@
-const t = '3.17.0-dev.0';
+const t = '3.17.0-dev.2';
 const u = new Proxy(
   {},
   {

package/DEV-esm/utils/components/index.js

@@ -3,7 +3,6 @@ export * from './FocusTrap.js';
 export * from './InputContainer.js';
 export * from './InputFlexContainer.js';
 export * from './InputWithIcon.js';
-export * from './WithCSSTransition.js';
 export * from './MiddleTextTruncation.js';
 export * from './AutoclearingHiddenLiveRegion.js';
 export * from './Box.js';

package/LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright © 2021-2024 Bentley Systems, Incorporated. All rights reserved.
+Copyright © 2021-2025 Bentley Systems, Incorporated. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/cjs/core/Dialog/Dialog.d.ts

@@ -6,7 +6,7 @@ type DialogProps = {
      * Dialog content.
      */
     children: React.ReactNode;
-} & Omit<DialogContextProps, 'dialogRootRef'>;
+} & DialogContextProps;
 /**
  * Dialog component.
  * @example

package/cjs/core/Dialog/Dialog.js

@@ -19,7 +19,6 @@ const _DialogContext = require('./DialogContext.js');
 const _DialogButtonBar = require('./DialogButtonBar.js');
 const _DialogMain = require('./DialogMain.js');
 const _index = require('../../utils/index.js');
-const _reacttransitiongroup = require('react-transition-group');
 const DialogComponent = _react.forwardRef((props, ref) => {
   let {
     trapFocus = false,
@@ -39,49 +38,43 @@ const DialogComponent = _react.forwardRef((props, ref) => {
     ...rest
   } = props;
   let dialogRootRef = _react.useRef(null);
-  return _react.createElement(
-    _reacttransitiongroup.Transition,
-    {
-      in: isOpen,
-      timeout: {
-        exit: 600,
-      },
-      mountOnEnter: true,
-      unmountOnExit: true,
-    },
-    _react.createElement(
-      _DialogContext.DialogContext.Provider,
-      {
-        value: {
-          isOpen,
-          onClose,
-          closeOnEsc,
-          closeOnExternalClick,
-          isDismissible,
-          preventDocumentScroll,
-          trapFocus,
-          setFocus,
-          isDraggable,
-          isResizable,
-          relativeTo,
-          dialogRootRef,
-          placement,
-        },
-      },
-      _react.createElement(
-        _index.Portal,
+  let mergedRefs = (0, _index.useMergedRefs)(ref, dialogRootRef);
+  return isOpen
+    ? _react.createElement(
+        _DialogContext.DialogContext.Provider,
         {
-          portal: portal,
+          value: {
+            isOpen,
+            onClose,
+            closeOnEsc,
+            closeOnExternalClick,
+            isDismissible,
+            preventDocumentScroll,
+            trapFocus,
+            setFocus,
+            isDraggable,
+            isResizable,
+            relativeTo,
+            placement,
+          },
         },
-        _react.createElement(_index.Box, {
-          className: (0, _classnames.default)('iui-dialog-wrapper', className),
-          'data-iui-relative': 'container' === relativeTo,
-          ref: (0, _index.useMergedRefs)(ref, dialogRootRef),
-          ...rest,
-        }),
-      ),
-    ),
-  );
+        _react.createElement(
+          _index.Portal,
+          {
+            portal: portal,
+          },
+          _react.createElement(_index.Box, {
+            className: (0, _classnames.default)(
+              'iui-dialog-wrapper',
+              className,
+            ),
+            'data-iui-relative': 'container' === relativeTo,
+            ref: mergedRefs,
+            ...rest,
+          }),
+        ),
+      )
+    : null;
 });
 const Dialog = Object.assign(DialogComponent, {
   Backdrop: _DialogBackdrop.DialogBackdrop,

package/cjs/core/Dialog/DialogBackdrop.d.ts

@@ -1,6 +1,6 @@
 import type { BackdropProps } from '../Backdrop/Backdrop.js';
 import type { PolymorphicForwardRefComponent } from '../../utils/index.js';
-import type { DialogContextProps } from './DialogContext.js';
+import { type DialogContextProps } from './DialogContext.js';
 type DialogBackdropProps = BackdropProps & Pick<DialogContextProps, 'onClose' | 'isDismissible' | 'closeOnExternalClick' | 'relativeTo'>;
 /**
  * Backdrop component for dialog. Recommended to be used with `Dialog`

package/cjs/core/Dialog/DialogBackdrop.js

@@ -14,9 +14,11 @@ const _react = _interop_require_wildcard._(require('react'));
 const _Backdrop = require('../Backdrop/Backdrop.js');
 const _index = require('../../utils/index.js');
 const _DialogContext = require('./DialogContext.js');
+const _DialogMainContext = require('./DialogMainContext.js');
 const _classnames = _interop_require_default._(require('classnames'));
 const DialogBackdrop = _react.forwardRef((props, ref) => {
   let dialogContext = (0, _DialogContext.useDialogContext)();
+  let dialogMainContext = (0, _DialogMainContext.useDialogMainContext)();
   let {
     isVisible = dialogContext.isOpen,
     isDismissible = dialogContext.isDismissible,
@@ -33,7 +35,10 @@ const DialogBackdrop = _react.forwardRef((props, ref) => {
   let handleMouseDown = (event) => {
     event.persist();
     if (event.target !== backdropRef.current) return;
-    if (isDismissible && closeOnExternalClick && onClose) onClose(event);
+    if (isDismissible && closeOnExternalClick && onClose) {
+      dialogMainContext?.beforeClose();
+      onClose(event);
+    }
     onMouseDown?.(event);
   };
   return _react.createElement(_Backdrop.Backdrop, {

package/cjs/core/Dialog/DialogMain.js

@@ -14,9 +14,9 @@ const _react = _interop_require_wildcard._(require('react'));
 const _classnames = _interop_require_default._(require('classnames'));
 const _index = require('../../utils/index.js');
 const _DialogContext = require('./DialogContext.js');
-const _reacttransitiongroup = require('react-transition-group');
 const _DialogDragContext = require('./DialogDragContext.js');
 const _useDragAndDrop = require('../../utils/hooks/useDragAndDrop.js');
+const _DialogMainContext = require('./DialogMainContext.js');
 const DialogMain = _react.forwardRef((props, ref) => {
   let dialogContext = (0, _DialogContext.useDialogContext)();
   let {
@@ -37,12 +37,13 @@ const DialogMain = _react.forwardRef((props, ref) => {
     placement = dialogContext.placement,
     ...rest
   } = props;
-  let [style, setStyle] = _react.useState();
+  let { dialogRootRef } = dialogContext;
   let dialogRef = _react.useRef(null);
-  let hasBeenResized = _react.useRef(false);
   let previousFocusedElement = _react.useRef();
+  let [style, setStyle] = _react.useState();
+  let hasBeenResized = _react.useRef(false);
   let originalBodyOverflow = _react.useRef('');
-  _react.useEffect(() => {
+  (0, _index.useLayoutEffect)(() => {
     if (isOpen) originalBodyOverflow.current = document.body.style.overflow;
   }, [isOpen]);
   _react.useEffect(() => {
@@ -58,17 +59,19 @@ const DialogMain = _react.forwardRef((props, ref) => {
     return () => {
       ownerDocument.body.style.overflow = originalBodyOverflow.current;
     };
-  }, [isOpen, preventDocumentScroll]);
+  }, [dialogRef, isOpen, preventDocumentScroll]);
   let handleKeyDown = (event) => {
     if (event.altKey) return;
     event.persist();
-    if (isDismissible && closeOnEsc && 'Escape' === event.key && onClose)
+    if (isDismissible && closeOnEsc && 'Escape' === event.key && onClose) {
+      beforeClose();
       onClose(event);
+    }
     onKeyDown?.(event);
   };
   let { onPointerDown, transform } = (0, _useDragAndDrop.useDragAndDrop)(
     dialogRef,
-    dialogContext.dialogRootRef,
+    dialogRootRef,
     isDraggable,
   );
   let handlePointerDown = _react.useCallback(
@@ -88,13 +91,35 @@ const DialogMain = _react.forwardRef((props, ref) => {
       insetBlockStart: dialogRef.current?.offsetTop,
       transform: `translate(${translateX}px,${translateY}px)`,
     }));
-  }, [isDraggable, isOpen]);
+  }, [dialogRef, isDraggable, isOpen]);
   let setResizeStyle = _react.useCallback((newStyle) => {
     setStyle((oldStyle) => ({
       ...oldStyle,
       ...newStyle,
     }));
   }, []);
+  let onEnter = _react.useCallback(() => {
+    previousFocusedElement.current =
+      dialogRef.current?.ownerDocument.activeElement;
+    if (setFocus)
+      dialogRef.current?.focus({
+        preventScroll: true,
+      });
+  }, [dialogRef, previousFocusedElement, setFocus]);
+  let beforeClose = _react.useCallback(() => {
+    if (
+      dialogRef.current?.contains(
+        dialogRef.current?.ownerDocument.activeElement,
+      )
+    )
+      previousFocusedElement.current?.focus();
+  }, [dialogRef, previousFocusedElement]);
+  let mountRef = _react.useCallback(
+    (element) => {
+      if (element) onEnter();
+    },
+    [onEnter],
+  );
   let content = _react.createElement(
     _index.Box,
     {
@@ -109,7 +134,7 @@ const DialogMain = _react.forwardRef((props, ref) => {
         className,
       ),
       role: 'dialog',
-      ref: (0, _index.useMergedRefs)(dialogRef, ref),
+      ref: (0, _index.useMergedRefs)(dialogRef, mountRef, ref),
       onKeyDown: handleKeyDown,
       tabIndex: -1,
       'data-iui-placement': placement,
@@ -127,7 +152,7 @@ const DialogMain = _react.forwardRef((props, ref) => {
       isResizable &&
         _react.createElement(_index.Resizer, {
           elementRef: dialogRef,
-          containerRef: dialogContext.dialogRootRef,
+          containerRef: dialogRootRef,
           onResizeStart: () => {
             if (!hasBeenResized.current) {
               hasBeenResized.current = true;
@@ -142,31 +167,14 @@ const DialogMain = _react.forwardRef((props, ref) => {
     children,
   );
   return _react.createElement(
-    _reacttransitiongroup.Transition,
+    _DialogMainContext.DialogMainContext.Provider,
     {
-      in: isOpen,
-      appear: true,
-      timeout: {
-        exit: 600,
-      },
-      onEntered: () => {
-        previousFocusedElement.current =
-          dialogRef.current?.ownerDocument.activeElement;
-        setFocus &&
-          dialogRef.current?.focus({
-            preventScroll: true,
-          });
-      },
-      onExit: () => {
-        if (
-          dialogRef.current?.contains(
-            dialogRef.current?.ownerDocument.activeElement,
-          )
-        )
-          previousFocusedElement.current?.focus();
-      },
-      unmountOnExit: true,
-      nodeRef: dialogRef,
+      value: _react.useMemo(
+        () => ({
+          beforeClose,
+        }),
+        [beforeClose],
+      ),
     },
     _react.createElement(
       _DialogDragContext.DialogDragContext.Provider,

package/cjs/core/Dialog/DialogMainContext.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+type DialogMainContextProps = {
+    beforeClose: () => void;
+};
+export declare const DialogMainContext: React.Context<DialogMainContextProps | null>;
+export declare const useDialogMainContext: () => DialogMainContextProps | null;
+export {};