Fix conflicts

mui · Mar 6, 2025 · bc3f6b9 · bc3f6b9
1 parent 3133cf9
commit bc3f6b9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/react/src/number-field/group/NumberFieldGroup.tsx b/packages/react/src/number-field/group/NumberFieldGroup.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useNumberFieldRootContext } from '../root/NumberFieldRootContext';
 import type { NumberFieldRoot } from '../root/NumberFieldRoot';
-import { mergeReactProps } from '../../utils/mergeReactProps';
+import { mergeProps } from '../../merge-props';
 import type { BaseUIComponentProps } from '../../utils/types';
 import { useComponentRenderer } from '../../utils/useComponentRenderer';
 
@@ -23,7 +23,7 @@ const NumberFieldGroup = React.forwardRef(function NumberFieldGroup(
 
   const getGroupProps = React.useCallback(
     (externalProps = {}) =>
-      mergeReactProps(externalProps, {
+      mergeProps(externalProps, {
         role: 'group',
       }),
     [],

diff --git a/packages/react/src/number-field/input/useNumberFieldInput.ts b/packages/react/src/number-field/input/useNumberFieldInput.ts
@@ -5,7 +5,7 @@ import { ARABIC_RE, HAN_RE, getNumberLocaleDetails, parseNumber } from '../utils
 import { useFieldRootContext } from '../../field/root/FieldRootContext';
 import { useFieldControlValidation } from '../../field/control/useFieldControlValidation';
 import type { InputMode } from '../root/useNumberFieldRoot';
-import { mergeReactProps } from '../../utils/mergeReactProps';
+import { mergeProps } from '../../merge-props';
 import { useForkRef } from '../../utils/useForkRef';
 
 export function useNumberFieldInput(
@@ -51,7 +51,7 @@ export function useNumberFieldInput(
 
   const getInputProps = React.useCallback(
     (externalProps = {}) =>
-      mergeReactProps<'input'>(
+      mergeProps<'input'>(
         {
           id,
           required,

diff --git a/packages/react/src/number-field/root/useNumberFieldButton.ts b/packages/react/src/number-field/root/useNumberFieldButton.ts
@@ -6,7 +6,7 @@ import {
   SCROLLING_POINTER_MOVE_DISTANCE,
   TOUCH_TIMEOUT,
 } from '../utils/constants';
-import { mergeReactProps } from '../../utils/mergeReactProps';
+import { mergeProps } from '../../merge-props';
 import { parseNumber } from '../utils/parse';
 import { GenericHTMLProps } from '../../utils/types';
 
@@ -60,7 +60,7 @@ export function useNumberFieldButton(
         }
       }
 
-      return mergeReactProps<'button'>(
+      return mergeProps<'button'>(
         {
           disabled: disabled || (isIncrement ? isMax : isMin),
           type: 'button',

diff --git a/packages/react/src/number-field/scrub-area-cursor/NumberFieldScrubAreaCursor.tsx b/packages/react/src/number-field/scrub-area-cursor/NumberFieldScrubAreaCursor.tsx
@@ -9,7 +9,7 @@ import { useForkRef } from '../../utils/useForkRef';
 import type { BaseUIComponentProps, GenericHTMLProps } from '../../utils/types';
 import type { NumberFieldRoot } from '../root/NumberFieldRoot';
 import { ownerDocument } from '../../utils/owner';
-import { mergeReactProps } from '../../utils/mergeReactProps';
+import { mergeProps } from '../../merge-props';
 
 /**
  * A custom element to display instead of the native cursor while using the scrub area.
@@ -35,7 +35,7 @@ const NumberFieldScrubAreaCursor = React.forwardRef(function NumberFieldScrubAre
 
   const propGetter = React.useCallback(
     (externalProps: GenericHTMLProps) =>
-      mergeReactProps<'span'>(externalProps, {
+      mergeProps<'span'>(externalProps, {
         role: 'presentation',
         style: {
           position: 'fixed',