@itwin/itwinui-react 3.0.0-dev.7 → 3.0.0-dev.8

package/esm/core/DatePicker/DatePicker.d.ts

@@ -1,14 +1,14 @@
+import * as React from 'react';
 import type { PolymorphicForwardRefComponent } from '../utils/index.js';
 import type { TimePickerProps } from '../TimePicker/TimePicker.js';
+export type DatePickerLocalizedNames = {
+    [key in 'months' | 'shortDays' | 'days']: string[];
+};
 /**
  * Generate localized months and days strings using `Intl.DateTimeFormat` for passed locale to use in DatePicker component.
  * If locale is not passed, browser locale will be used.
  */
-export declare const generateLocalizedStrings: (locale?: string) => {
-    months: string[];
-    shortDays: string[];
-    days: string[];
-};
+export declare const generateLocalizedStrings: (locale?: string) => DatePickerLocalizedNames;
 export type DateRangePickerProps = {
     /**
      * Enable date range support.
@@ -42,9 +42,7 @@ type DatePickerProps = {
      * Pass localized week days (start from sunday) and months.
      * Use helper function `generateLocalizedStrings` to generate strings using `Intl.DateTimeFormat`.
      */
-    localizedNames?: {
-        [key in 'months' | 'shortDays' | 'days']: string[];
-    };
+    localizedNames?: DatePickerLocalizedNames;
     /**
      * Set focus on selected day or today.
      * @default false
@@ -60,6 +58,30 @@ type DatePickerProps = {
      * @default false
      */
     showYearSelection?: boolean;
+    /**
+     * Allows props to be passed for calendar month year, referring to the div that wraps around the month/year and the next/previous buttons.
+     */
+    monthYearProps?: React.ComponentProps<'div'>;
+    /**
+     * Allows props to be passed for only month, referring to span that wraps around the month title.
+     */
+    monthProps?: React.ComponentProps<'span'>;
+    /**
+     * Allows props to be passed for week days, referring to div that wraps around the week day title.
+     */
+    weekDayProps?: React.ComponentProps<'div'>;
+    /**
+     * Allows props to be passed for individual day , referring to div element the wraps around single day number.
+     */
+    dayProps?: React.ComponentProps<'div'>;
+    /**
+     * Allows props to be passed for calendar, referring to div that is used for listbox for wraping days and weeks.
+     */
+    calendarProps?: React.ComponentProps<'div'>;
+    /**
+     * Allows props to be passed for weeks, referring to div that wraps around weeks.
+     */
+    weekProps?: React.ComponentProps<'div'>;
     /**
      * Will disable dates for which this function returns true.
      * Disabled dates cannot be selected.

package/esm/core/DatePicker/DatePicker.js

@@ -142,6 +142,12 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
     enableRangeSelect = false,
     startDate,
     endDate,
+    monthYearProps,
+    calendarProps,
+    monthProps,
+    weekDayProps,
+    dayProps,
+    weekProps,
     isDateDisabled,
     ...rest
   } = props;
@@ -419,7 +425,11 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
       null,
       React.createElement(
         Box,
-        { className: 'iui-calendar-month-year' },
+        {
+          as: 'div',
+          ...monthYearProps,
+          className: cx('iui-calendar-month-year', monthYearProps?.className),
+        },
         showYearSelection &&
           React.createElement(
             IconButton,
@@ -448,9 +458,10 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
             Box,
             {
               as: 'span',
-              className: 'iui-calendar-month',
               id: dateTableId,
               title: monthNames[displayedMonthIndex],
+              ...monthProps,
+              className: cx('iui-calendar-month', monthProps?.className),
             },
             monthNames[displayedMonthIndex],
           ),
@@ -481,7 +492,11 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
       ),
       React.createElement(
         Box,
-        { className: 'iui-calendar-weekdays' },
+        {
+          as: 'div',
+          ...weekDayProps,
+          className: cx('iui-calendar-weekdays', weekDayProps?.className),
+        },
         shortDays.map((day, index) =>
           React.createElement('div', { key: day, title: longDays[index] }, day),
         ),
@@ -492,13 +507,16 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
           onKeyDown: handleCalendarKeyDown,
           role: 'listbox',
           'aria-labelledby': dateTableId,
+          ...calendarProps,
         },
         weeks.map((weekDays, weekIndex) => {
           return React.createElement(
             Box,
             {
+              as: 'div',
               key: `week-${displayedMonthIndex}-${weekIndex}`,
-              className: 'iui-calendar-week',
+              ...weekProps,
+              className: cx('iui-calendar-week', weekProps?.className),
             },
             weekDays.map((weekDay, dayIndex) => {
               const dateValue = weekDay.getDate();
@@ -506,8 +524,8 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
               return React.createElement(
                 Box,
                 {
+                  as: 'div',
                   key: `day-${displayedMonthIndex}-${dayIndex}`,
-                  className: getDayClass(weekDay),
                   onClick: () => !isDisabled && onDayClick(weekDay),
                   role: 'option',
                   tabIndex: isSameDay(weekDay, focusedDay) ? 0 : -1,
@@ -516,6 +534,8 @@ export const DatePicker = React.forwardRef((props, forwardedRef) => {
                     isSameDay(weekDay, focusedDay) &&
                     needFocus.current &&
                     element?.focus(),
+                  ...dayProps,
+                  className: cx(getDayClass(weekDay), dayProps?.className),
                 },
                 dateValue,
               );

package/esm/core/Dialog/Dialog.js

@@ -3,7 +3,6 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 import cx from 'classnames';
 import { DialogTitleBar } from './DialogTitleBar.js';
 import { DialogContent } from './DialogContent.js';
@@ -11,13 +10,7 @@ import { DialogBackdrop } from './DialogBackdrop.js';
 import { DialogContext } from './DialogContext.js';
 import { DialogButtonBar } from './DialogButtonBar.js';
 import { DialogMain } from './DialogMain.js';
-import {
-  useMergedRefs,
-  Box,
-  useGlobals,
-  getDocument,
-  useIsClient,
-} from '../utils/index.js';
+import { useMergedRefs, Box, Portal } from '../utils/index.js';
 const DialogComponent = React.forwardRef((props, ref) => {
   const {
     trapFocus = false,
@@ -37,20 +30,6 @@ const DialogComponent = React.forwardRef((props, ref) => {
     ...rest
   } = props;
   const dialogRootRef = React.useRef(null);
-  const context = useGlobals();
-  const isClient = useIsClient();
-  const portalTo =
-    typeof portal !== 'boolean'
-      ? portal.to
-      : portal
-      ? context?.portalContainer || getDocument()?.body
-      : null;
-  const dialog = React.createElement(Box, {
-    className: cx('iui-dialog-wrapper', className),
-    'data-iui-relative': relativeTo === 'container',
-    ref: useMergedRefs(ref, dialogRootRef),
-    ...rest,
-  });
   return React.createElement(
     DialogContext.Provider,
     {
@@ -70,7 +49,16 @@ const DialogComponent = React.forwardRef((props, ref) => {
         placement,
       },
     },
-    portalTo && isClient ? ReactDOM.createPortal(dialog, portalTo) : dialog,
+    React.createElement(
+      Portal,
+      { portal: portal },
+      React.createElement(Box, {
+        className: cx('iui-dialog-wrapper', className),
+        'data-iui-relative': relativeTo === 'container',
+        ref: useMergedRefs(ref, dialogRootRef),
+        ...rest,
+      }),
+    ),
   );
 });
 /**

package/esm/core/Dialog/DialogContext.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import type { PortalProps } from '../utils/index.js';
 export type DialogContextProps = {
     /**
      * Flag whether dialog should be shown.
@@ -67,11 +68,9 @@ export type DialogContextProps = {
      *
      * Can be set to an object with a `to` property to portal into a specific element.
      *
-     * @default false
+     * Defaults to false if using `Dialog` and true if using `Modal`.
      */
-    portal?: boolean | {
-        to: HTMLElement;
-    };
+    portal?: PortalProps['portal'];
     /**
      * Dialog root ref. For internal use.
      */

package/esm/core/ExpandableBlock/ExpandableBlock.d.ts

@@ -36,9 +36,11 @@ type ExpandableBlockOwnProps = {
      */
     disabled?: boolean;
 };
-type ExpandableBlockHeaderOwnProps = {
+type ExpandableBlockTriggerOwnProps = {
     label?: React.ReactNode;
+    caption?: React.ReactNode;
     expandIcon?: React.ReactNode;
+    endIcon?: React.ReactNode;
 };
 type ExpandableBlockContentOwnProps = {
     innerProps?: React.ComponentPropsWithoutRef<'div'>;
@@ -46,29 +48,32 @@ type ExpandableBlockContentOwnProps = {
 /**
  * Expandable block with customizable Title, Caption, Content and EndIcon subcomponents.
  * @example
- *  <ExpandableBlock>
- *    <ExpandableBlock.Header>
+ *  <ExpandableBlock.Wrapper>
+ *    <ExpandableBlock.Trigger>
  *      <ExpandableBlock.ExpandIcon/>
  *      <ExpandableBlock.LabelArea>
  *        <ExpandableBlock.Title/>
  *        <ExpandableBlock.Caption/>
  *      </ExpandableBlock.LabelArea>
  *      <ExpandableBlock.EndIcon/>
- *    </ExpandableBlock.Header>
+ *    </ExpandableBlock.Trigger>
  *    <ExpandableBlock.Content/>
- *  </ExpandableBlock>
+ *  </ExpandableBlock.Wrapper>
  */
-export declare const ExpandableBlock: PolymorphicForwardRefComponent<"div", ExpandableBlockOwnProps> & {
+export declare const ExpandableBlock: PolymorphicForwardRefComponent<"div", ExpandableBlockOwnProps & {
+    title?: React.ReactNode;
+} & Pick<ExpandableBlockTriggerOwnProps, "caption" | "endIcon">> & {
+    Wrapper: PolymorphicForwardRefComponent<"div", ExpandableBlockOwnProps>;
     /**
      * `Header` container that contains `ExpandIcon`, `LabelArea` and `EndIcon` subcomponents
      * @example
-     * <ExpandableBlock.Header>
+     * <ExpandableBlock.Trigger>
      *    <ExpandableBlock.ExpandIcon/>
      *    <ExpandableBlock.LabelArea/>
      *    <ExpandableBlock.EndIcon/>
-     * </ExpandableBlock.Header>
+     * </ExpandableBlock.Trigger>
      */
-    Header: PolymorphicForwardRefComponent<"button", ExpandableBlockHeaderOwnProps>;
+    Trigger: PolymorphicForwardRefComponent<"button", ExpandableBlockTriggerOwnProps>;
     /**
      * The expanding icon on the left of header
      */
@@ -94,24 +99,25 @@ export declare const ExpandableBlock: PolymorphicForwardRefComponent<"div", Expa
      * Svg icon displayed at the end of the main text.
      * Will override status icon if specified. Used inside `Header` subcomponent.
      * @example
-     * <ExpandableBlock.Header>
+     * <ExpandableBlock.Trigger>
      *    <ExpandableBlock.EndIcon> <SvgIcon/> </ExpandableBlock.EndIcon>
-     * <ExpandableBlock.Header/>
+     * <ExpandableBlock.Trigger/>
      */
     EndIcon: PolymorphicForwardRefComponent<"span", Omit<Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "ref"> & {
         ref?: ((instance: HTMLSpanElement | null) => void) | React.RefObject<HTMLSpanElement> | null | undefined;
-    }, "fill" | "as" | "key" | "size" | keyof React.HTMLAttributes<HTMLSpanElement>> & {
+    }, "fill" | "as" | "key" | "size" | keyof React.HTMLAttributes<HTMLSpanElement> | "padded"> & {
         size?: "small" | "large" | "auto" | "medium" | import("../utils/types.js").AnyString | undefined;
         fill?: "default" | "informational" | "negative" | "positive" | "warning" | import("../utils/types.js").AnyString | undefined;
+        padded?: boolean | undefined;
     } & Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "ref"> & {
         as?: "span" | undefined;
     }, "ref">>;
     /**
      * Content shown in the block's body when fully expanded.
      * @example
-     * <ExpandableBlock>
+     * <ExpandableBlock.Wrapper>
      *    <ExpandableBlock.Content> Content </ExpandableBlock.Content>
-     * </ExpandableBlock>
+     * </ExpandableBlock.Wrapper>
      */
     Content: PolymorphicForwardRefComponent<"div", ExpandableBlockContentOwnProps>;
 };

package/esm/core/ExpandableBlock/ExpandableBlock.js

@@ -17,6 +17,21 @@ import {
 const ExpandableBlockContext = React.createContext(undefined);
 ExpandableBlockContext.displayName = 'ExpandableBlockContext';
 const ExpandableBlockComponent = React.forwardRef((props, forwardedRef) => {
+  const { children, title, caption, endIcon, ...rest } = props;
+  return React.createElement(
+    ExpandableBlock.Wrapper,
+    { ...rest, ref: forwardedRef },
+    React.createElement(ExpandableBlock.Trigger, {
+      label: title,
+      caption: caption,
+      endIcon: endIcon,
+    }),
+    React.createElement(ExpandableBlock.Content, null, children),
+  );
+});
+ExpandableBlockComponent.displayName = 'ExpandableBlock';
+// ----------------------------------------------------------------------------
+const ExpandableBlockWrapper = React.forwardRef((props, forwardedRef) => {
   const {
     children,
     className,
@@ -60,19 +75,20 @@ const ExpandableBlockComponent = React.forwardRef((props, forwardedRef) => {
     ),
   );
 });
-ExpandableBlockComponent.displayName = 'ExpandableBlock';
-const ExpandableBlockHeader = React.forwardRef((props, forwardedRef) => {
+ExpandableBlockWrapper.displayName = 'ExpandableBlock.Wrapper';
+const ExpandableBlockTrigger = React.forwardRef((props, forwardedRef) => {
   const {
     className,
     children,
     label,
+    caption,
     onClick: onClickProp,
     expandIcon,
+    endIcon,
     ...rest
   } = props;
-  const { isExpanded, setExpanded, disabled, onToggle } = useSafeContext(
-    ExpandableBlockContext,
-  );
+  const { isExpanded, setExpanded, disabled, onToggle, status } =
+    useSafeContext(ExpandableBlockContext);
   return React.createElement(
     ButtonBase,
     {
@@ -98,11 +114,16 @@ const ExpandableBlockHeader = React.forwardRef((props, forwardedRef) => {
           ExpandableBlock.LabelArea,
           null,
           React.createElement(ExpandableBlock.Title, null, label),
+          caption &&
+            React.createElement(ExpandableBlock.Caption, null, caption),
         ),
+        endIcon || status
+          ? React.createElement(ExpandableBlock.EndIcon, null, endIcon)
+          : null,
       ),
   );
 });
-ExpandableBlockHeader.displayName = 'ExpandableBlock.Header';
+ExpandableBlockTrigger.displayName = 'ExpandableBlock.Trigger';
 // ----------------------------------------------------------------------------
 // ExpandableBlock.ExpandIcon component
 const ExpandableBlockExpandIcon = React.forwardRef((props, forwardedRef) => {
@@ -170,29 +191,30 @@ ExpandableBlockContent.displayName = 'ExpandableBlock.Content';
 /**
  * Expandable block with customizable Title, Caption, Content and EndIcon subcomponents.
  * @example
- *  <ExpandableBlock>
- *    <ExpandableBlock.Header>
+ *  <ExpandableBlock.Wrapper>
+ *    <ExpandableBlock.Trigger>
  *      <ExpandableBlock.ExpandIcon/>
  *      <ExpandableBlock.LabelArea>
  *        <ExpandableBlock.Title/>
  *        <ExpandableBlock.Caption/>
  *      </ExpandableBlock.LabelArea>
  *      <ExpandableBlock.EndIcon/>
- *    </ExpandableBlock.Header>
+ *    </ExpandableBlock.Trigger>
  *    <ExpandableBlock.Content/>
- *  </ExpandableBlock>
+ *  </ExpandableBlock.Wrapper>
  */
 export const ExpandableBlock = Object.assign(ExpandableBlockComponent, {
+  Wrapper: ExpandableBlockWrapper,
   /**
    * `Header` container that contains `ExpandIcon`, `LabelArea` and `EndIcon` subcomponents
    * @example
-   * <ExpandableBlock.Header>
+   * <ExpandableBlock.Trigger>
    *    <ExpandableBlock.ExpandIcon/>
    *    <ExpandableBlock.LabelArea/>
    *    <ExpandableBlock.EndIcon/>
-   * </ExpandableBlock.Header>
+   * </ExpandableBlock.Trigger>
    */
-  Header: ExpandableBlockHeader,
+  Trigger: ExpandableBlockTrigger,
   /**
    * The expanding icon on the left of header
    */
@@ -218,17 +240,17 @@ export const ExpandableBlock = Object.assign(ExpandableBlockComponent, {
    * Svg icon displayed at the end of the main text.
    * Will override status icon if specified. Used inside `Header` subcomponent.
    * @example
-   * <ExpandableBlock.Header>
+   * <ExpandableBlock.Trigger>
    *    <ExpandableBlock.EndIcon> <SvgIcon/> </ExpandableBlock.EndIcon>
-   * <ExpandableBlock.Header/>
+   * <ExpandableBlock.Trigger/>
    */
   EndIcon: ExpandableBlockEndIcon,
   /**
    * Content shown in the block's body when fully expanded.
    * @example
-   * <ExpandableBlock>
+   * <ExpandableBlock.Wrapper>
    *    <ExpandableBlock.Content> Content </ExpandableBlock.Content>
-   * </ExpandableBlock>
+   * </ExpandableBlock.Wrapper>
    */
   Content: ExpandableBlockContent,
 });

package/esm/core/Header/HeaderSplitButton.js

@@ -52,6 +52,7 @@ export const HeaderSplitButton = React.forwardRef((props, forwardedRef) => {
       React.createElement(
         ButtonBase,
         {
+          'aria-label': 'More',
           className:
             'iui-header-breadcrumb-button iui-header-breadcrumb-button-split',
           disabled: disabled,

package/esm/core/Input/Input.d.ts

@@ -4,6 +4,10 @@ export type InputProps = {
      * Modify size of the input.
      */
     size?: 'small' | 'large';
+    /**
+     * Status of input.
+     */
+    status?: 'positive' | 'warning' | 'negative';
     /**
      * Modify the native `size` attribute of the `<input>` element.
      * The `width` or `inline-size` property must be unset in order to use this prop.

package/esm/core/Input/Input.js

@@ -13,13 +13,14 @@ import { useMergedRefs, Box } from '../utils/index.js';
  * <Input size='small' />
  */
 export const Input = React.forwardRef((props, ref) => {
-  const { size, htmlSize, className, ...rest } = props;
+  const { size, htmlSize, status, className, ...rest } = props;
   const inputRef = React.useRef(null);
   const refs = useMergedRefs(inputRef, ref);
   return React.createElement(Box, {
     as: 'input',
     className: cx('iui-input', className),
     'data-iui-size': size,
+    'data-iui-status': status,
     size: htmlSize,
     ref: refs,
     ...rest,

package/esm/core/InputGrid/InputGrid.d.ts

@@ -0,0 +1,25 @@
+import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+type InputGridOwnProps = {
+    /**
+     * Set display style of label.
+     * Supported values:
+     * - 'default' - label appears above input.
+     * - 'inline' - appears in the same line as input.
+     * @default 'default'
+     */
+    labelPlacement?: 'default' | 'inline';
+};
+/**
+ * InputGrid component is used to display inputs (input, textarea, select)
+ * with label and/or status message
+ *
+ * @usage
+ *
+ * <InputGrid>
+ *   <Label htmlFor='input-1'>This is label</Label>
+ *   <Input id='input-1'/>
+ *   <StatusMessage>This is message</StatusMessage>
+ * </InputGrid>
+ */
+export declare const InputGrid: PolymorphicForwardRefComponent<"div", InputGridOwnProps>;
+export default InputGrid;

package/esm/core/InputGrid/InputGrid.js

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import * as React from 'react';
+import { Box } from '../utils/index.js';
+import cx from 'classnames';
+//-------------------------------------------------------------------------------
+/**
+ * InputGrid component is used to display inputs (input, textarea, select)
+ * with label and/or status message
+ *
+ * @usage
+ *
+ * <InputGrid>
+ *   <Label htmlFor='input-1'>This is label</Label>
+ *   <Input id='input-1'/>
+ *   <StatusMessage>This is message</StatusMessage>
+ * </InputGrid>
+ */
+export const InputGrid = React.forwardRef((props, ref) => {
+  const { children, className, labelPlacement = undefined, ...rest } = props;
+  return React.createElement(
+    Box,
+    {
+      className: cx('iui-input-grid', className),
+      'data-iui-label-placement': labelPlacement,
+      ref: ref,
+      ...rest,
+    },
+    children,
+  );
+});
+//-------------------------------------------------------------------------------
+export default InputGrid;

package/esm/core/InputGrid/index.d.ts

@@ -0,0 +1,3 @@
+export { InputGrid } from './InputGrid.js';
+declare const _default: "./InputGrid";
+export default _default;

package/esm/core/InputGrid/index.js

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+export { InputGrid } from './InputGrid.js';
+export default './InputGrid';

package/esm/core/InputGroup/InputGroup.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+import { StatusMessage } from '../StatusMessage/index.js';
 type InputGroupProps = {
     /**
      * Label of the group.
@@ -36,6 +37,18 @@ type InputGroupProps = {
      * Child inputs inside group.
      */
     children: React.ReactNode;
+    /**
+     * Passes properties for label.
+     */
+    labelProps?: React.ComponentProps<'label'>;
+    /**
+     * Passes properties for message.
+     */
+    messageProps?: Pick<React.ComponentProps<typeof StatusMessage>, 'iconProps' | 'contentProps'>;
+    /**
+     * Passes properties for inner input group element.
+     */
+    innerProps?: React.ComponentProps<'div'>;
 };
 /**
  * Group Checkbox/Radio components together

package/esm/core/InputGroup/InputGroup.js

@@ -3,7 +3,11 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
-import { StatusIconMap, InputContainer, Box } from '../utils/index.js';
+import cx from 'classnames';
+import { StatusIconMap, Box } from '../utils/index.js';
+import { InputGrid } from '../InputGrid/index.js';
+import { Label } from '../Label/index.js';
+import { StatusMessage } from '../StatusMessage/index.js';
 /**
  * Group Checkbox/Radio components together
  * @example
@@ -21,6 +25,7 @@ import { StatusIconMap, InputContainer, Box } from '../utils/index.js';
  */
 export const InputGroup = React.forwardRef((props, forwardedRef) => {
   const {
+    className,
     children,
     disabled = false,
     displayStyle = 'default',
@@ -29,6 +34,9 @@ export const InputGroup = React.forwardRef((props, forwardedRef) => {
     status,
     svgIcon,
     required = false,
+    labelProps,
+    messageProps,
+    innerProps,
     ...rest
   } = props;
   const icon = () => {
@@ -43,19 +51,35 @@ export const InputGroup = React.forwardRef((props, forwardedRef) => {
     return undefined;
   };
   return React.createElement(
-    InputContainer,
+    InputGrid,
     {
-      label: label,
-      disabled: disabled,
-      required: required,
-      status: status,
-      message: message,
-      icon: icon(),
-      isLabelInline: displayStyle === 'inline',
       ref: forwardedRef,
+      as: 'div',
+      labelPlacement: displayStyle,
+      className: cx('iui-input-group-wrapper', className),
       ...rest,
     },
-    React.createElement(Box, { className: 'iui-input-group' }, children),
+    label &&
+      React.createElement(
+        Label,
+        { as: 'label', required: required, disabled: disabled, ...labelProps },
+        label,
+      ),
+    React.createElement(
+      Box,
+      {
+        as: 'div',
+        ...innerProps,
+        className: cx('iui-input-group', innerProps?.className),
+      },
+      children,
+    ),
+    (message || status || svgIcon) &&
+      React.createElement(
+        StatusMessage,
+        { startIcon: icon(), status: status, ...messageProps },
+        displayStyle !== 'inline' && message,
+      ),
   );
 });
 export default InputGroup;