[FormControl] Add fullWidth prop to FormControl context (#19369)

mui · Jan 24, 2020 · 0ad3b6d · 0ad3b6d
1 parent 481cdd8
commit 0ad3b6d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/material-ui/src/FormControl/FormControl.js b/packages/material-ui/src/FormControl/FormControl.js
@@ -162,6 +162,7 @@ const FormControl = React.forwardRef(function FormControl(props, ref) {
  error,
  filled,
  focused,
+ fullWidth,
  hiddenLabel,
  margin: (size === 'small' ? 'dense' : undefined) || margin,
  onBlur: () => {

diff --git a/packages/material-ui/src/FormControl/FormControl.test.js b/packages/material-ui/src/FormControl/FormControl.test.js
@@ -224,6 +224,16 @@ describe('<FormControl />', () => {
  setProps({ margin: 'dense' });
  expect(formControlRef.current).to.have.property('margin', 'dense');
  });
+
+ it('should have the fullWidth prop from the instance', () => {
+ const formControlRef = React.createRef();
+ const { setProps } = render(<FormControlled ref={formControlRef} />);
+
+ expect(formControlRef.current).to.have.property('fullWidth', false);
+
+ setProps({ fullWidth: true });
+ expect(formControlRef.current).to.have.property('fullWidth', true);
+ });
  });
 
  describe('callbacks', () => {

diff --git a/packages/material-ui/src/FormControl/useFormControl.d.ts b/packages/material-ui/src/FormControl/useFormControl.d.ts
@@ -4,7 +4,14 @@ import { FormControlProps } from './FormControl';
 // shut off automatic exporting
 export {};
 
-type ContextFromPropsKey = 'disabled' | 'error' | 'hiddenLabel' | 'margin' | 'required' | 'variant';
+type ContextFromPropsKey =
+ | 'disabled'
+ | 'error'
+ | 'fullWidth'
+ | 'hiddenLabel'
+ | 'margin'
+ | 'required'
+ | 'variant';
 
 export interface FormControlState extends Pick<FormControlProps, ContextFromPropsKey> {
  adornedStart: boolean;