Update comments

mui · Aug 11, 2023 · c5ffe59 · c5ffe59
1 parent 4009cdc
commit c5ffe59
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/packages/mui-material-next/src/InputBase/InputBase.test.js b/packages/mui-material-next/src/InputBase/InputBase.test.js
@@ -1,4 +1,3 @@
-// TODO: un-skip skipped tests if any
 /* eslint-disable mocha/no-skipped-tests */
 import * as React from 'react';
 import PropTypes from 'prop-types';
@@ -293,7 +292,8 @@ describe('<InputBase />', () => {
     });
   });
 
-  // TODO: requires material-next/FormControl
+  // TODO: unskip and refactor when integrating material-next/FormControl
+
   describe.skip('with FormControl', () => {
     it('should have the formControl class', () => {
       const { getByTestId } = render(
@@ -645,7 +645,7 @@ describe('<InputBase />', () => {
   });
 
   describe('prop: focused', () => {
-    xit('should render correct border color with `ThemeProvider` imported from `@emotion/react`', function test() {
+    it.skip('should render correct border color with `ThemeProvider` imported from `@emotion/react`', function test() {
       if (/jsdom/.test(window.navigator.userAgent)) {
         this.skip();
       }

diff --git a/packages/mui-material-next/src/InputBase/InputBase.tsx b/packages/mui-material-next/src/InputBase/InputBase.tsx
@@ -285,7 +285,7 @@ const InputBase = React.forwardRef(function InputBase<
     renderSuffix,
     required,
     rows,
-    size,
+    size: sizeProp,
     slotProps = {},
     slots = {},
     startAdornment,
@@ -296,7 +296,7 @@ const InputBase = React.forwardRef(function InputBase<
 
   const { current: isControlled } = React.useRef(value != null);
 
-  // TODO: integrate FormControl
+  // TODO: integrate material-next/FormControl
   const muiFormControl = useFormControl();
 
   /*
@@ -320,7 +320,7 @@ const InputBase = React.forwardRef(function InputBase<
   const onFilled = muiFormControl && muiFormControl.onFilled;
   const onEmpty = muiFormControl && muiFormControl.onEmpty;
 
-  // TODO: needs FormControl & Outlined/FilledInput
+  // TODO: needs material-next/FormControl & material-next/Outlined|FilledInput
   const checkDirty = React.useCallback(
     (obj: any) => {
       if (isFilled(obj)) {
@@ -392,7 +392,8 @@ const InputBase = React.forwardRef(function InputBase<
   const {
     getRootProps,
     getInputProps,
-    focused,
+    focused: focusedState,
+    // TODO: what if this `formControlContext` is completely ignored and the component uses a completely separate one similar to Joy
     // formControlContext,
     error: errorState,
     disabled: disabledState,
@@ -410,18 +411,19 @@ const InputBase = React.forwardRef(function InputBase<
     inputRef: inputRefProp,
   });
 
+  // TODO: integrate ownerState properties with material-next/FormControl: color, disabled, error, focused, hiddenLabel, size
   const ownerState = {
     ...props,
-    color: colorProp,
+    color: colorProp || 'primary',
     disabled: disabledState,
     endAdornment,
     error: errorState,
-    focused,
+    focused: focusedState,
     formControl: muiFormControl,
     fullWidth,
-    hiddenLabel: false, // TODO: FormControl integration
+    hiddenLabel: false, // TODO: material-next/FormControl integration
     multiline,
-    // size: fcs.size,
+    size: sizeProp,
     startAdornment,
     type,
   };