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

package/esm/core/InputWithDecorations/InputWithDecorations.d.ts

@@ -0,0 +1,39 @@
+import * as React from 'react';
+import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+import type { InputProps } from '../Input/Input.js';
+/**
+ * Input component with various additional decorations.
+ * You can add icons, buttons and other various subcomponents to it.
+ *
+ * If you are not using default InputWithDecorations.Icon and InputWithDecorations.Button, use borderless versions of other components.
+ *
+ * @usage
+ * <InputWithDecorations>
+ *    <InputWithDecorations.Input />
+ *    <InputWithDecorations.Icon>
+ *      <SvgAdd />
+ *    </InputWithDecorations.Icon>
+ * </InputWithDecorations>
+ */
+export declare const InputWithDecorations: PolymorphicForwardRefComponent<"div", Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
+    ref?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
+}, "as" | keyof import("../utils/index.js").InputFlexContainerProps> & import("../utils/index.js").InputFlexContainerProps & {
+    as?: "div" | undefined;
+}> & {
+    /**
+     * Subcomponent to include input in your InputWithDecorations
+     */
+    Input: PolymorphicForwardRefComponent<"input", InputProps>;
+    /**
+     * Subcomponent to include button in your InputWithDecorations
+     */
+    Button: PolymorphicForwardRefComponent<"span", Omit<Omit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, "ref"> & {
+        ref?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined;
+    }, "label" | "as" | "size" | "htmlDisabled" | "styleType" | "isActive" | "iconProps"> & {
+        isActive?: boolean | undefined;
+        label?: React.ReactNode;
+        iconProps?: React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement> | undefined;
+    } & Omit<import("../Buttons/Button/Button.js").ButtonProps, "startIcon" | "endIcon" | "labelProps" | "startIconProps" | "endIconProps"> & {
+        as?: "button" | undefined;
+    }>;
+};

package/esm/core/InputWithDecorations/InputWithDecorations.js

@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------------------------
+ * 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, InputFlexContainer, useSafeContext } from '../utils/index.js';
+import { IconButton } from '../Buttons/index.js';
+const InputWithDecorationsContext = React.createContext(undefined);
+const InputWithDecorationsComponent = React.forwardRef((props, ref) => {
+  const { children, size, isDisabled, ...rest } = props;
+  return React.createElement(
+    InputWithDecorationsContext.Provider,
+    { value: { size, isDisabled } },
+    React.createElement(
+      InputFlexContainer,
+      { isDisabled: isDisabled, size: size, ref: ref, ...rest },
+      children,
+    ),
+  );
+});
+//-------------------------------------------------------------------------------
+const InputWithDecorationsInput = React.forwardRef((props, ref) => {
+  const { id: idProp, size, disabled: localDisabled, ...rest } = props;
+  const { size: contextSize, isDisabled } = useSafeContext(
+    InputWithDecorationsContext,
+  );
+  return React.createElement(Box, {
+    as: 'input',
+    ref: ref,
+    'data-iui-size': size ?? contextSize,
+    disabled: localDisabled ?? isDisabled,
+    id: idProp,
+    ...rest,
+  });
+});
+//-------------------------------------------------------------------------------
+const InputWithDecorationsButton = React.forwardRef((props, ref) => {
+  const { children, size, disabled: localDisabled, ...rest } = props;
+  const { size: contextSize, isDisabled } = useSafeContext(
+    InputWithDecorationsContext,
+  );
+  return React.createElement(
+    IconButton,
+    {
+      ref: ref,
+      size: size ?? contextSize,
+      styleType: 'borderless',
+      disabled: localDisabled ?? isDisabled,
+      ...rest,
+    },
+    children,
+  );
+});
+/**
+ * Input component with various additional decorations.
+ * You can add icons, buttons and other various subcomponents to it.
+ *
+ * If you are not using default InputWithDecorations.Icon and InputWithDecorations.Button, use borderless versions of other components.
+ *
+ * @usage
+ * <InputWithDecorations>
+ *    <InputWithDecorations.Input />
+ *    <InputWithDecorations.Icon>
+ *      <SvgAdd />
+ *    </InputWithDecorations.Icon>
+ * </InputWithDecorations>
+ */
+export const InputWithDecorations = Object.assign(
+  InputWithDecorationsComponent,
+  {
+    /**
+     * Subcomponent to include input in your InputWithDecorations
+     */
+    Input: InputWithDecorationsInput,
+    /**
+     * Subcomponent to include button in your InputWithDecorations
+     */
+    Button: InputWithDecorationsButton,
+  },
+);

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

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

package/esm/core/InputWithDecorations/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 { InputWithDecorations } from './InputWithDecorations.js';
+export default './Input';

package/esm/core/Label/Label.d.ts

@@ -12,6 +12,11 @@ type LabelOwnProps = {
      * This adds an asterisk next to the label text.
      */
     required?: boolean;
+    /**
+     * Adds disabled styling to a label.
+     * @default false
+     */
+    disabled?: boolean;
 };
 /**
  * A standalone label to be used with input components (using `htmlFor`).

package/esm/core/Label/Label.js

@@ -16,6 +16,7 @@ export const Label = React.forwardRef((props, forwardedRef) => {
   const {
     displayStyle = 'block',
     required,
+    disabled,
     className,
     children,
     ...rest
@@ -32,6 +33,7 @@ export const Label = React.forwardRef((props, forwardedRef) => {
         },
         className,
       ),
+      'data-iui-disabled': disabled ? true : undefined,
       ref: forwardedRef,
       ...rest,
     },

package/esm/core/LabeledInput/LabeledInput.d.ts

@@ -1,6 +1,9 @@
 import * as React from 'react';
-import type { InputProps } from '../Input/Input.js';
+import { Input } from '../Input/Input.js';
+import { Icon } from '../utils/index.js';
 import type { PolymorphicForwardRefComponent } from '../utils/index.js';
+import { InputGrid } from '../InputGrid/index.js';
+import { InputWithDecorations } from '../InputWithDecorations/index.js';
 export type LabeledInputProps = {
     /**
      * Label of the input.
@@ -17,15 +20,11 @@ export type LabeledInputProps = {
     /**
      * Custom svg icon. Will override status icon if specified.
      */
-    svgIcon?: JSX.Element;
+    svgIcon?: JSX.Element | null;
     /**
-     * Custom CSS class name for the input element.
+     * Pass props to wrapper element.
      */
-    inputClassName?: string;
-    /**
-     * Custom CSS Style for the input element.
-     */
-    inputStyle?: React.CSSProperties;
+    wrapperProps?: React.ComponentProps<typeof InputGrid>;
     /**
      * Set display style of label.
      * Supported values:
@@ -35,15 +34,22 @@ export type LabeledInputProps = {
      */
     displayStyle?: 'default' | 'inline';
     /**
-     * Set display style of icon.
-     * Supported values:
-     * - 'block' - icon appears below input.
-     * - 'inline' - icon appears inside input (at the end).
-     *
-     * Defaults to 'block' if `displayStyle` is `default`, else 'inline'.
+     * Passes properties for message content.
+     */
+    messageContentProps?: React.ComponentPropsWithRef<'div'>;
+    /**
+     * Passes properties for icon.
+     */
+    iconProps?: React.ComponentProps<typeof Icon>;
+    /**
+     * Passes properties for label.
+     */
+    labelProps?: React.ComponentProps<'label'>;
+    /**
+     *  Passes properties for input wrapper.
      */
-    iconDisplayStyle?: 'block' | 'inline';
-} & InputProps;
+    inputWrapperProps?: React.ComponentProps<typeof InputWithDecorations>;
+} & React.ComponentProps<typeof Input>;
 /**
  * Basic labeled input component
  * @example

package/esm/core/LabeledInput/LabeledInput.js

@@ -4,7 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import { Input } from '../Input/Input.js';
-import { StatusIconMap, InputContainer, useId } from '../utils/index.js';
+import { StatusIconMap, useId, Icon } from '../utils/index.js';
+import { InputGrid } from '../InputGrid/index.js';
+import { InputWithDecorations } from '../InputWithDecorations/index.js';
+import { StatusMessage } from '../StatusMessage/StatusMessage.js';
+import { Label } from '../Label/Label.js';
 /**
  * Basic labeled input component
  * @example
@@ -16,46 +20,66 @@ import { StatusIconMap, InputContainer, useId } from '../utils/index.js';
 export const LabeledInput = React.forwardRef((props, ref) => {
   const uid = useId();
   const {
-    className,
     disabled = false,
     label,
     message,
     status,
     svgIcon,
-    style,
-    inputClassName,
-    inputStyle,
+    wrapperProps,
+    labelProps,
+    messageContentProps,
+    iconProps,
+    inputWrapperProps,
     displayStyle = 'default',
-    iconDisplayStyle = displayStyle === 'default' ? 'block' : 'inline',
     required = false,
     id = uid,
     ...rest
   } = props;
   const icon = svgIcon ?? (status && StatusIconMap[status]());
+  const shouldShowIcon = svgIcon !== null && (svgIcon || (status && !message));
   return React.createElement(
-    InputContainer,
-    {
-      label: label,
-      disabled: disabled,
-      required: required,
-      status: status,
-      message: message,
-      icon: icon,
-      isLabelInline: displayStyle === 'inline',
-      isIconInline: iconDisplayStyle === 'inline',
-      className: className,
-      style: style,
-      inputId: id,
-    },
-    React.createElement(Input, {
-      disabled: disabled,
-      className: inputClassName,
-      style: inputStyle,
-      required: required,
-      ref: ref,
-      id: id,
-      ...rest,
-    }),
+    InputGrid,
+    { labelPlacement: displayStyle, ...wrapperProps },
+    label &&
+      React.createElement(
+        Label,
+        {
+          as: 'label',
+          required: required,
+          disabled: disabled,
+          htmlFor: id,
+          ...labelProps,
+        },
+        label,
+      ),
+    React.createElement(
+      InputWithDecorations,
+      { status: status, isDisabled: disabled, ...inputWrapperProps },
+      React.createElement(InputWithDecorations.Input, {
+        disabled: disabled,
+        required: required,
+        id: id,
+        ref: ref,
+        ...rest,
+      }),
+      shouldShowIcon &&
+        React.createElement(
+          Icon,
+          { fill: !svgIcon ? status : undefined, padded: true, ...iconProps },
+          icon,
+        ),
+    ),
+    typeof message === 'string'
+      ? React.createElement(
+          StatusMessage,
+          {
+            status: status,
+            iconProps: iconProps,
+            contentProps: messageContentProps,
+          },
+          message,
+        )
+      : message,
   );
 });
 export default LabeledInput;

package/esm/core/LabeledSelect/LabeledSelect.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import type { SelectProps } from '../Select/Select.js';
+import { Icon } from '../utils/index.js';
 import type { LabeledInputProps } from '../LabeledInput/LabeledInput.js';
+import { InputGrid } from '../InputGrid/InputGrid.js';
 export type LabeledSelectProps<T> = {
     /**
      * Label of the select.
@@ -20,18 +22,26 @@ export type LabeledSelectProps<T> = {
      */
     svgIcon?: JSX.Element;
     /**
-     * Custom CSS class name for the select element.
+     * If true, shows a red asterisk but does not prevent form submission.
+     * @default false
      */
-    selectClassName?: string;
+    required?: boolean;
     /**
-     * Custom CSS Style for the select element.
+     * Pass props to wrapper element.
      */
-    selectStyle?: React.CSSProperties;
+    wrapperProps?: React.ComponentProps<typeof InputGrid>;
     /**
-     * If true, shows a red asterisk but does not prevent form submission.
-     * @default false
+     * Passes properties for label.
      */
-    required?: boolean;
+    labelProps?: React.ComponentProps<'div'>;
+    /**
+     * Passes properties for message content.
+     */
+    messageContentProps?: React.ComponentPropsWithRef<'div'>;
+    /**
+     * Passes properties for message icon.
+     */
+    messageIconProps?: React.ComponentProps<typeof Icon>;
 } & Pick<LabeledInputProps, 'displayStyle'> & SelectProps<T>;
 /**
  * Labeled select component to select value from options.

package/esm/core/LabeledSelect/LabeledSelect.js

@@ -4,7 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import { Select } from '../Select/index.js';
-import { StatusIconMap, InputContainer, useId } from '../utils/index.js';
+import { StatusIconMap, useId, Icon } from '../utils/index.js';
+import { StatusMessage } from '../StatusMessage/StatusMessage.js';
+import { InputGrid } from '../InputGrid/InputGrid.js';
+import { Label } from '../Label/Label.js';
 /**
  * Labeled select component to select value from options.
  * @example
@@ -48,16 +51,18 @@ export const LabeledSelect = (props) => {
     svgIcon,
     displayStyle = 'default',
     style,
-    selectClassName,
-    selectStyle,
     required = false,
     triggerProps,
+    wrapperProps,
+    labelProps,
+    messageContentProps,
+    messageIconProps,
     ...rest
   } = props;
   const labelId = `${useId()}-label`;
   const icon = () => {
     if (svgIcon) {
-      return React.cloneElement(svgIcon, { 'aria-hidden': true });
+      return React.createElement(Icon, null, svgIcon);
     }
     if (status && message) {
       return StatusIconMap[status]();
@@ -65,29 +70,43 @@ export const LabeledSelect = (props) => {
     return undefined;
   };
   return React.createElement(
-    InputContainer,
-    {
-      label: label,
+    InputGrid,
+    { labelPlacement: displayStyle, ...wrapperProps },
+    label &&
+      React.createElement(
+        Label,
+        {
+          as: 'div',
+          required: required,
+          disabled: disabled,
+          id: labelId,
+          ...labelProps,
+        },
+        label,
+      ),
+    React.createElement(Select, {
       disabled: disabled,
-      required: required,
-      status: status,
-      message: message,
-      icon: displayStyle === 'default' ? icon() : undefined,
-      isLabelInline: displayStyle === 'inline',
       className: className,
       style: style,
-      labelId: labelId,
-    },
-    React.createElement(Select, {
-      disabled: disabled,
-      className: selectClassName,
-      style: selectStyle,
+      status: status,
       ...rest,
       triggerProps: {
         'aria-labelledby': labelId,
         ...triggerProps,
       },
     }),
+    typeof message === 'string'
+      ? React.createElement(
+          StatusMessage,
+          {
+            status: status,
+            startIcon: displayStyle === 'default' ? icon() : undefined,
+            iconProps: messageIconProps,
+            contentProps: messageContentProps,
+          },
+          message,
+        )
+      : message,
   );
 };
 export default LabeledSelect;

package/esm/core/LabeledTextarea/LabeledTextarea.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
+import { Icon } from '../utils/index.js';
 import type { PolymorphicForwardRefComponent } from '../utils/index.js';
 import type { LabeledInputProps } from '../LabeledInput/LabeledInput.js';
+import { InputGrid } from '../InputGrid/InputGrid.js';
 type LabeledTextareaProps = {
     /**
      * Label for the textarea.
@@ -15,14 +17,22 @@ type LabeledTextareaProps = {
      */
     status?: 'positive' | 'warning' | 'negative';
     /**
-     * Custom class name for textarea.
+     * Pass props to wrapper element.
      */
-    textareaClassName?: string;
+    wrapperProps?: React.ComponentProps<typeof InputGrid>;
     /**
-     * Custom style for textarea.
+     * Passes properties for label.
      */
-    textareaStyle?: React.CSSProperties;
-} & Pick<LabeledInputProps, 'svgIcon' | 'displayStyle' | 'iconDisplayStyle'>;
+    labelProps?: React.ComponentProps<'label'>;
+    /**
+     * Passes properties for message content.
+     */
+    messageContentProps?: React.ComponentPropsWithRef<'div'>;
+    /**
+     * Passes properties for svgIcon.
+     */
+    iconProps?: React.ComponentProps<typeof Icon>;
+} & Pick<LabeledInputProps, 'svgIcon' | 'displayStyle'>;
 /**
  * Textarea wrapper that allows for additional styling and labelling
  * @example

package/esm/core/LabeledTextarea/LabeledTextarea.js

@@ -3,8 +3,9 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
-import { StatusIconMap, InputContainer, useId } from '../utils/index.js';
-import { Textarea } from '../Textarea/index.js';
+import { Icon } from '../utils/index.js';
+import { InputGrid } from '../InputGrid/InputGrid.js';
+import { LabeledInput } from '../LabeledInput/index.js';
 /**
  * Textarea wrapper that allows for additional styling and labelling
  * @example
@@ -26,49 +27,17 @@ import { Textarea } from '../Textarea/index.js';
  *  status='negative'
  * />
  */
-export const LabeledTextarea = React.forwardRef((props, ref) => {
-  const uid = useId();
-  const {
-    className,
-    style,
-    disabled = false,
-    label,
-    message,
-    status,
-    textareaClassName,
-    textareaStyle,
-    displayStyle = 'default',
-    iconDisplayStyle = displayStyle === 'default' ? 'block' : 'inline',
-    svgIcon,
-    required = false,
-    id = uid,
-    ...textareaProps
-  } = props;
-  const icon = svgIcon ?? (status && StatusIconMap[status]());
-  return React.createElement(
-    InputContainer,
-    {
-      label: label,
-      disabled: disabled,
-      required: required,
-      status: status,
-      message: message,
-      icon: icon,
-      isLabelInline: displayStyle === 'inline',
-      isIconInline: iconDisplayStyle === 'inline',
-      className: className,
-      style: style,
-      inputId: id,
-    },
-    React.createElement(Textarea, {
-      disabled: disabled,
-      className: textareaClassName,
-      style: textareaStyle,
-      required: required,
-      id: id,
-      ...textareaProps,
-      ref: ref,
-    }),
+export const LabeledTextarea = React.forwardRef((props, forwardedRef) => {
+  return (
+    // ref types don't match but it's internal, so ts-ignore is ok here
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    React.createElement(LabeledInput, {
+      as: 'textarea',
+      rows: 3,
+      ref: forwardedRef,
+      ...props,
+    })
   );
 });
 export default LabeledTextarea;

package/esm/core/Menu/Menu.d.ts

@@ -17,5 +17,5 @@ type MenuProps = {
 /**
  * Basic menu component. Can be used for select or dropdown components.
  */
-export declare const Menu: PolymorphicForwardRefComponent<"ul", MenuProps>;
+export declare const Menu: PolymorphicForwardRefComponent<"div", MenuProps>;
 export default Menu;

package/esm/core/Menu/Menu.js

@@ -4,7 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 import * as React from 'react';
 import cx from 'classnames';
-import { useMergedRefs, getFocusableElements, Box } from '../utils/index.js';
+import {
+  useMergedRefs,
+  getFocusableElements,
+  Box,
+  mergeEventHandlers,
+} from '../utils/index.js';
 /**
  * Basic menu component. Can be used for select or dropdown components.
  */
@@ -60,12 +65,12 @@ export const Menu = React.forwardRef((props, ref) => {
     }
   };
   return React.createElement(Box, {
-    as: 'ul',
+    as: 'div',
     className: cx('iui-menu', className),
     role: 'menu',
-    onKeyDown: onKeyDown,
     ref: refs,
     ...rest,
+    onKeyDown: mergeEventHandlers(props.onKeyDown, onKeyDown),
   });
 });
 export default Menu;

package/esm/core/Menu/MenuDivider.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * Divider between menu items. Should be used inside `Menu`.
  * @example
@@ -13,5 +14,5 @@
  *   ]}
  * </Menu>
  */
-export declare const MenuDivider: import("../utils/props.js").PolymorphicForwardRefComponent<"li", {}>;
+export declare const MenuDivider: import("../utils/props.js").PolymorphicForwardRefComponent<NonNullable<keyof JSX.IntrinsicElements>, {}>;
 export default MenuDivider;

package/esm/core/Menu/MenuDivider.js

@@ -18,7 +18,7 @@ import { polymorphic } from '../utils/index.js';
  *   ]}
  * </Menu>
  */
-export const MenuDivider = polymorphic.li('iui-menu-divider', {
+export const MenuDivider = polymorphic('iui-menu-divider', {
   role: 'separator',
 });
 export default MenuDivider;

package/esm/core/Menu/MenuItem.d.ts

@@ -64,5 +64,5 @@ export type MenuItemProps = {
 /**
  * Basic menu item component. Should be used inside `Menu` component for each item.
  */
-export declare const MenuItem: PolymorphicForwardRefComponent<"li", MenuItemProps>;
+export declare const MenuItem: PolymorphicForwardRefComponent<"div", MenuItemProps>;
 export default MenuItem;