@pingux/astro 1.42.2 → 2.0.0-alpha.4

package/lib/hooks/useField/useField.js

@@ -9,175 +9,176 @@ import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/esm/objectWithoutProperties";
-var _excluded = ["autocomplete", "autoComplete", "autoCorrect", "children", "className", "containerProps", "controlProps", "defaultText", "defaultValue", "direction", "disabledKeys", "hasAutoFocus", "hasNoStatusIndicator", "helperText", "hintText", "id", "isDefaultSelected", "isDisabled", "isIndeterminate", "isReadOnly", "isRequired", "isRestrictiveMultivalues", "isSelected", "label", "labelMode", "labelProps", "maxLength", "name", "onBlur", "onChange", "onClear", "onFocus", "onFocusChange", "onLoadMore", "onOpenChange", "onSelectionChange", "placeholder", "role", "selectedKey", "spellCheck", "status", "statusClasses", "type", "value"];
-
+var _excluded = ["autocomplete", "autoComplete", "autoCorrect", "children", "className", "containerProps", "controlProps", "defaultText", "defaultValue", "direction", "disabledKeys", "hasAutoFocus", "hasNoStatusIndicator", "helperText", "hintText", "id", "isDefaultSelected", "isDisabled", "isIndeterminate", "isReadOnly", "isRequired", "isRestrictiveMultivalues", "isSelected", "label", "labelMode", "labelProps", "maxLength", "name", "onBlur", "onChange", "onClear", "onFocus", "onFocusChange", "onLoadMore", "onOpenChange", "onSelectionChange", "placeholder", "role", "selectedKey", "spellCheck", "status", "statusClasses", "type", "value", "wrapperProps"];
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { useEffect, useState } from 'react';
-import omit from 'lodash/omit';
-import noop from 'lodash/noop';
-import { useLabel } from '@react-aria/label';
+import { mergeProps, useFocusRing, useLabel } from 'react-aria';
 import { useFocusWithin } from '@react-aria/interactions';
-import { useFocusRing } from '@react-aria/focus';
-import { mergeProps } from '@react-aria/utils';
-import { getAriaAttributeProps } from '../../utils/devUtils/props/ariaAttributes';
-import statuses from '../../utils/devUtils/constants/statuses';
-import { useStatusClasses } from '../../hooks';
+import noop from 'lodash/noop';
+import omit from 'lodash/omit';
 import { modes as labelModes } from '../../components/Label/constants';
+import statuses from '../../utils/devUtils/constants/statuses';
+import { getAriaAttributeProps } from '../../utils/devUtils/props/ariaAttributes';
+import { useStatusClasses } from '..';
+
 /**
  * Generates the necessary props to be used in field components.
  * @param {{}} props Props for the field
  * @returns {{}} Prop objects to be spread into field components.
  */
-
 var useField = function useField() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
   var autocomplete = props.autocomplete,
-      autoComplete = props.autoComplete,
-      autoCorrect = props.autoCorrect,
-      children = props.children,
-      className = props.className,
-      _props$containerProps = props.containerProps,
-      containerProps = _props$containerProps === void 0 ? {} : _props$containerProps,
-      _props$controlProps = props.controlProps,
-      controlProps = _props$controlProps === void 0 ? {} : _props$controlProps,
-      defaultText = props.defaultText,
-      defaultValue = props.defaultValue,
-      direction = props.direction,
-      disabledKeys = props.disabledKeys,
-      hasAutoFocus = props.hasAutoFocus,
-      hasNoStatusIndicator = props.hasNoStatusIndicator,
-      helperText = props.helperText,
-      hintText = props.hintText,
-      id = props.id,
-      isDefaultSelected = props.isDefaultSelected,
-      isDisabled = props.isDisabled,
-      isIndeterminate = props.isIndeterminate,
-      isReadOnly = props.isReadOnly,
-      isRequired = props.isRequired,
-      isRestrictiveMultivalues = props.isRestrictiveMultivalues,
-      isSelected = props.isSelected,
-      label = props.label,
-      labelMode = props.labelMode,
-      _props$labelProps = props.labelProps,
-      labelProps = _props$labelProps === void 0 ? {} : _props$labelProps,
-      maxLength = props.maxLength,
-      name = props.name,
-      onBlur = props.onBlur,
-      _props$onChange = props.onChange,
-      onChange = _props$onChange === void 0 ? noop : _props$onChange,
-      onClear = props.onClear,
-      onFocus = props.onFocus,
-      onFocusChange = props.onFocusChange,
-      onLoadMore = props.onLoadMore,
-      onOpenChange = props.onOpenChange,
-      onSelectionChange = props.onSelectionChange,
-      placeholder = props.placeholder,
-      role = props.role,
-      selectedKey = props.selectedKey,
-      spellCheck = props.spellCheck,
-      _props$status = props.status,
-      status = _props$status === void 0 ? statuses.DEFAULT : _props$status,
-      statusClasses = props.statusClasses,
-      type = props.type,
-      value = props.value,
-      others = _objectWithoutProperties(props, _excluded); // 0 could be a valid input for fields, but null, undefined, and '' are not
-
-
+    autoComplete = props.autoComplete,
+    autoCorrect = props.autoCorrect,
+    children = props.children,
+    className = props.className,
+    _props$containerProps = props.containerProps,
+    containerProps = _props$containerProps === void 0 ? {} : _props$containerProps,
+    _props$controlProps = props.controlProps,
+    controlProps = _props$controlProps === void 0 ? {} : _props$controlProps,
+    defaultText = props.defaultText,
+    defaultValue = props.defaultValue,
+    direction = props.direction,
+    disabledKeys = props.disabledKeys,
+    hasAutoFocus = props.hasAutoFocus,
+    hasNoStatusIndicator = props.hasNoStatusIndicator,
+    helperText = props.helperText,
+    hintText = props.hintText,
+    id = props.id,
+    isDefaultSelected = props.isDefaultSelected,
+    isDisabled = props.isDisabled,
+    isIndeterminate = props.isIndeterminate,
+    isReadOnly = props.isReadOnly,
+    isRequired = props.isRequired,
+    isRestrictiveMultivalues = props.isRestrictiveMultivalues,
+    isSelected = props.isSelected,
+    label = props.label,
+    labelMode = props.labelMode,
+    _props$labelProps = props.labelProps,
+    labelProps = _props$labelProps === void 0 ? {} : _props$labelProps,
+    maxLength = props.maxLength,
+    name = props.name,
+    onBlur = props.onBlur,
+    _props$onChange = props.onChange,
+    onChange = _props$onChange === void 0 ? noop : _props$onChange,
+    onClear = props.onClear,
+    onFocus = props.onFocus,
+    onFocusChange = props.onFocusChange,
+    onLoadMore = props.onLoadMore,
+    onOpenChange = props.onOpenChange,
+    onSelectionChange = props.onSelectionChange,
+    placeholder = props.placeholder,
+    role = props.role,
+    selectedKey = props.selectedKey,
+    spellCheck = props.spellCheck,
+    _props$status = props.status,
+    status = _props$status === void 0 ? statuses.DEFAULT : _props$status,
+    statusClasses = props.statusClasses,
+    type = props.type,
+    value = props.value,
+    wrapperProps = props.wrapperProps,
+    others = _objectWithoutProperties(props, _excluded);
+
+  // 0 could be a valid input for fields, but null, undefined, and '' are not
   var _useState = useState(!!value || value === 0),
-      _useState2 = _slicedToArray(_useState, 2),
-      hasValue = _useState2[0],
-      setHasValue = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    hasValue = _useState2[0],
+    setHasValue = _useState2[1];
   var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      hasFocusWithin = _useState4[0],
-      setFocusWithin = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    hasFocusWithin = _useState4[0],
+    setFocusWithin = _useState4[1];
   useEffect(function () {
     if (!!defaultValue || defaultValue === 0 || !!value || value === 0 || !!placeholder || placeholder === 0) {
       setHasValue(true);
     } else {
       setHasValue(false);
     }
-  }, [defaultValue, value, placeholder]); // Capture value changes so we can apply the has-value class to the container
+  }, [defaultValue, value, placeholder]);
 
+  // Capture value changes so we can apply the has-value class to the container
   var fieldOnChange = function fieldOnChange(e) {
     var _e$target;
-
     var eventValue = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
-
     if (!!eventValue || eventValue === 0 || !!placeholder || placeholder === 0) {
       setHasValue(true);
     } else {
       setHasValue(false);
-    } // adding this function resolves the error brought up in UIP-5116
-
-
+    }
+    // adding this function resolves the error brought up in UIP-5116
     if (e.persist) {
       e.persist();
-    } // Make sure to call the original onChange event
-
-
+    }
+    // Make sure to call the original onChange event
     return onChange(e);
   };
-
   var _useLabel = useLabel(_objectSpread(_objectSpread({}, props), controlProps)),
-      raLabelProps = _useLabel.labelProps,
-      raFieldProps = _useLabel.fieldProps;
-
+    raLabelProps = _useLabel.labelProps,
+    raFieldProps = _useLabel.fieldProps;
   var _useFocusRing = useFocusRing(),
-      isFocusVisible = _useFocusRing.isFocusVisible,
-      focusProps = _useFocusRing.focusProps;
-
-  var _useStatusClasses = useStatusClasses(className, _objectSpread(_defineProperty({
-    hasNoStatusIndicator: hasNoStatusIndicator,
-    isFocused: isFocusVisible,
-    isDisabled: isDisabled,
-    isReadOnly: isReadOnly
-  }, "is-".concat(status), true), statusClasses)),
-      classNames = _useStatusClasses.classNames;
-
+    isFocusVisible = _useFocusRing.isFocusVisible,
+    focusProps = _useFocusRing.focusProps;
+  var _useStatusClasses = useStatusClasses(className, _objectSpread(_objectSpread(_defineProperty({
+      'field-control__wrapper': true,
+      // generates 'field-control__wrapper' class
+      hasNoStatusIndicator: hasNoStatusIndicator,
+      isFocused: isFocusVisible,
+      isDisabled: isDisabled,
+      isReadOnly: isReadOnly
+    }, "is-".concat(status), true), statusClasses), wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.statusClasses)),
+    wrapperClasses = _useStatusClasses.classNames;
+  var _useStatusClasses2 = useStatusClasses(className, _objectSpread(_objectSpread(_defineProperty({
+      'field-control__input': true,
+      // generates 'field-control__input' class
+      hasNoStatusIndicator: hasNoStatusIndicator,
+      isFocused: isFocusVisible,
+      isDisabled: isDisabled,
+      isReadOnly: isReadOnly
+    }, "is-".concat(status), true), statusClasses), controlProps === null || controlProps === void 0 ? void 0 : controlProps.statusClasses)),
+    inputClasses = _useStatusClasses2.classNames;
+  var _useStatusClasses3 = useStatusClasses(className, _objectSpread(_objectSpread(_defineProperty({
+      'field-label': true,
+      hasNoStatusIndicator: hasNoStatusIndicator,
+      isFocused: isFocusVisible,
+      isDisabled: isDisabled,
+      isReadOnly: isReadOnly
+    }, "is-".concat(status), true), statusClasses), labelProps === null || labelProps === void 0 ? void 0 : labelProps.statusClasses)),
+    labelClasses = _useStatusClasses3.classNames;
   var _getAriaAttributeProp = getAriaAttributeProps(others),
-      ariaProps = _getAriaAttributeProp.ariaProps,
-      nonAriaProps = _getAriaAttributeProp.nonAriaProps; // Handle focus within and value state for the container. These are needed for float labels.
-
+    ariaProps = _getAriaAttributeProp.ariaProps,
+    nonAriaProps = _getAriaAttributeProp.nonAriaProps;
 
+  // Handle focus within and value state for the container. These are needed for float labels.
   var _useFocusWithin = useFocusWithin({
-    onFocusWithinChange: setFocusWithin
-  }),
-      focusWithinProps = _useFocusWithin.focusWithinProps;
-
+      onFocusWithinChange: setFocusWithin
+    }),
+    focusWithinProps = _useFocusWithin.focusWithinProps;
   var isFloatLabel = labelMode === labelModes.FLOAT || (labelProps === null || labelProps === void 0 ? void 0 : labelProps.labelMode) === labelModes.FLOAT;
   var isLeftLabel = labelMode === labelModes.LEFT || (labelProps === null || labelProps === void 0 ? void 0 : labelProps.labelMode) === labelModes.LEFT;
   var isFloatLabelActive = isFloatLabel && (hasValue || (containerProps === null || containerProps === void 0 ? void 0 : containerProps.isFloatLabelActive));
-
-  var _useStatusClasses2 = useStatusClasses(containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, {
-    'field-container': true,
-    // generates 'field-container' class
-    hasValue: hasValue,
-    hasFocusWithin: hasFocusWithin,
-    isLeftLabel: isLeftLabel,
-    isFloatLabel: isFloatLabel,
-    isFloatLabelActive: isFloatLabelActive
-  }),
-      containerClasses = _useStatusClasses2.classNames;
-
+  var _useStatusClasses4 = useStatusClasses(containerProps === null || containerProps === void 0 ? void 0 : containerProps.className, _objectSpread(_objectSpread({
+      'field-container': true,
+      // generates 'field-container' class
+      hasValue: hasValue,
+      hasFocusWithin: hasFocusWithin,
+      isLeftLabel: isLeftLabel,
+      isFloatLabel: isFloatLabel,
+      isFloatLabelActive: isFloatLabelActive
+    }, statusClasses), containerProps === null || containerProps === void 0 ? void 0 : containerProps.statusClasses)),
+    containerClasses = _useStatusClasses4.classNames;
   var fieldContainerProps = _objectSpread(_objectSpread(_objectSpread({}, nonAriaProps), mergeProps(containerProps, focusWithinProps)), {}, {
     className: containerClasses,
     sx: _objectSpread({
       position: 'relative'
     }, containerProps === null || containerProps === void 0 ? void 0 : containerProps.sx)
   });
-
-  var fieldControlProps = _objectSpread(_objectSpread(_objectSpread({
+  var fieldControlInputProps = _objectSpread(_objectSpread(_objectSpread({
     autoComplete: autocomplete || autoComplete,
     autoCorrect: autoCorrect,
     autoFocus: hasAutoFocus,
-    className: classNames,
+    className: inputClasses,
     defaultSelected: isDefaultSelected,
     defaultValue: defaultValue,
     disabled: isDisabled,
@@ -198,20 +199,21 @@ var useField = function useField() {
     onBlur: onBlur,
     onFocus: onFocus
   }, omit(controlProps, 'data-testid'), focusProps));
-
   var fieldLabelProps = _objectSpread(_objectSpread({
     children: label,
-    className: classNames,
+    className: labelClasses,
     hintText: hintText,
     isRequired: isRequired,
     mode: labelMode
   }, raLabelProps), labelProps);
-
+  var fieldControlWrapperProps = _objectSpread({
+    className: wrapperClasses
+  }, wrapperProps);
   return {
     fieldContainerProps: fieldContainerProps,
-    fieldControlProps: fieldControlProps,
+    fieldControlInputProps: fieldControlInputProps,
+    fieldControlWrapperProps: fieldControlWrapperProps,
     fieldLabelProps: fieldLabelProps
   };
 };
-
 export default useField;

package/lib/hooks/useField/useField.test.js

@@ -7,24 +7,27 @@ import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-st
 import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
-
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import { renderHook, act } from '@testing-library/react-hooks';
-import useField from './useField';
-import statuses from '../../utils/devUtils/constants/statuses';
+import { act, renderHook } from '@testing-library/react-hooks';
 import { modes as labelModes } from '../../components/Label/constants';
+import statuses from '../../utils/devUtils/constants/statuses';
+import useField from './useField';
 var defaultProps = {
   autoComplete: 'off',
   className: 'test',
   containerProps: {
-    id: 'test'
+    id: 'test',
+    statusClasses: {
+      isContainer: true
+    }
   },
   controlProps: {
-    id: 'test'
+    id: 'test',
+    statusClasses: {
+      isControlInput: true
+    }
   },
   defaultValue: 'test',
   hasAutoFocus: true,
@@ -35,6 +38,11 @@ var defaultProps = {
   isRequired: true,
   isSelected: true,
   label: 'test',
+  labelProps: {
+    statusClasses: {
+      isFieldLabel: true
+    }
+  },
   name: 'test',
   placeholder: 'test',
   role: 'test',
@@ -42,7 +50,13 @@ var defaultProps = {
     isTested: true
   },
   type: 'test',
-  value: 'test'
+  value: 'test',
+  wrapperProps: {
+    id: 'test',
+    statusClasses: {
+      isControlWrapper: true
+    }
+  }
 };
 test('default useField', function () {
   renderHook(function () {
@@ -51,34 +65,38 @@ test('default useField', function () {
 });
 test('should return props objects for field components', function () {
   var _context, _context2;
-
   var _renderHook = renderHook(function () {
-    return useField(defaultProps);
-  }),
-      result = _renderHook.result;
-
+      return useField(defaultProps);
+    }),
+    result = _renderHook.result;
   var _result$current = result.current,
-      fieldContainerProps = _result$current.fieldContainerProps,
-      fieldControlProps = _result$current.fieldControlProps,
-      fieldLabelProps = _result$current.fieldLabelProps;
+    fieldContainerProps = _result$current.fieldContainerProps,
+    fieldControlInputProps = _result$current.fieldControlInputProps,
+    fieldControlWrapperProps = _result$current.fieldControlWrapperProps,
+    fieldLabelProps = _result$current.fieldLabelProps;
   expect(fieldContainerProps).toEqual({
-    className: 'field-container has-value',
+    className: 'field-container has-value is-tested is-container',
     id: defaultProps.containerProps.id,
     onBlur: expect.any(Function),
     onFocus: expect.any(Function),
     sx: expect.objectContaining({
       position: 'relative'
-    })
+    }),
+    statusClasses: {
+      isContainer: true
+    }
   });
-  expect(fieldControlProps).toEqual({
+  expect(fieldControlInputProps).toEqual({
     autoComplete: defaultProps.autoComplete,
+    autoCorrect: undefined,
     autoFocus: defaultProps.hasAutoFocus,
-    className: _concatInstanceProperty(_context = "".concat(defaultProps.className, " is-disabled is-read-only is-")).call(_context, statuses.DEFAULT, " is-tested"),
+    className: _concatInstanceProperty(_context = "".concat(defaultProps.className, " field-control-input is-disabled is-read-only is-")).call(_context, statuses.DEFAULT, " is-tested is-control-input"),
     defaultSelected: true,
     defaultValue: defaultProps.defaultValue,
     disabled: true,
     id: defaultProps.id,
     isFocused: false,
+    maxLength: undefined,
     readOnly: true,
     required: true,
     onBlur: expect.any(Function),
@@ -87,6 +105,10 @@ test('should return props objects for field components', function () {
     name: defaultProps.name,
     placeholder: defaultProps.placeholder,
     role: defaultProps.role,
+    spellCheck: undefined,
+    statusClasses: {
+      isControlInput: true
+    },
     type: defaultProps.type,
     value: defaultProps.value,
     'aria-label': undefined,
@@ -94,62 +116,74 @@ test('should return props objects for field components', function () {
   });
   expect(fieldLabelProps).toEqual({
     children: defaultProps.label,
-    className: _concatInstanceProperty(_context2 = "".concat(defaultProps.className, " is-disabled is-read-only is-")).call(_context2, statuses.DEFAULT, " is-tested"),
+    className: _concatInstanceProperty(_context2 = "".concat(defaultProps.className, " field-label is-disabled is-read-only is-")).call(_context2, statuses.DEFAULT, " is-tested is-field-label"),
+    hintText: undefined,
     id: expect.any(String),
     htmlFor: expect.any(String),
-    isRequired: true
+    isRequired: true,
+    mode: undefined,
+    statusClasses: {
+      isFieldLabel: true
+    }
+  });
+  expect(fieldControlWrapperProps).toEqual({
+    className: "".concat(defaultProps.className, " field-control-wrapper is-disabled is-read-only is-default is-tested is-control-wrapper"),
+    id: expect.any(String),
+    statusClasses: {
+      isControlWrapper: true
+    }
   });
 });
 test('should support autocomplete additionally', function () {
   var newProps = _objectSpread(_objectSpread({}, defaultProps), {}, {
     autocomplete: 'new-password'
   });
-
   delete newProps.autoComplete;
-
   var _renderHook2 = renderHook(function () {
-    return useField(newProps);
-  }),
-      result = _renderHook2.result;
-
-  var fieldControlProps = result.current.fieldControlProps;
-  expect(fieldControlProps).toMatchObject({
+      return useField(newProps);
+    }),
+    result = _renderHook2.result;
+  var fieldControlInputProps = result.current.fieldControlInputProps;
+  expect(fieldControlInputProps).toMatchObject({
     autoComplete: 'new-password'
   });
 });
 test('should return isFloatLabelActive class for container', function () {
   var _renderHook3 = renderHook(function (initialProps) {
-    return useField(_objectSpread(_objectSpread({}, initialProps), {}, {
-      placeholder: null
-    }));
-  }, {
-    initialProps: defaultProps
-  }),
-      result = _renderHook3.result,
-      rerender = _renderHook3.rerender; // Does not have the class if the label mode is not set to float
-
-
-  expect(result.current.fieldContainerProps.className).not.toContain('is-float-label-active'); // Has the class if the value is valid and label mode is float
+      return useField(_objectSpread(_objectSpread({}, initialProps), {}, {
+        placeholder: null
+      }));
+    }, {
+      initialProps: defaultProps
+    }),
+    result = _renderHook3.result,
+    rerender = _renderHook3.rerender;
+  // Does not have the class if the label mode is not set to float
+  expect(result.current.fieldContainerProps.className).not.toContain('is-float-label-active');
 
+  // Has the class if the value is valid and label mode is float
   rerender(_objectSpread(_objectSpread({}, defaultProps), {}, {
     labelMode: labelModes.FLOAT
   }));
-  expect(result.current.fieldContainerProps.className).toContain('is-float-label-active'); // Does not have the class if the value is invalid
+  expect(result.current.fieldContainerProps.className).toContain('is-float-label-active');
 
+  // Does not have the class if the value is invalid
   act(function () {
-    return result.current.fieldControlProps.onChange({
+    return result.current.fieldControlInputProps.onChange({
       target: {
         value: undefined
       }
     });
   });
-  expect(result.current.fieldContainerProps.className).not.toContain('is-float-label-active'); // Has the class if the container has focus within it
+  expect(result.current.fieldContainerProps.className).not.toContain('is-float-label-active');
 
+  // Has the class if the container has focus within it
   act(function () {
     return result.current.fieldContainerProps.onFocus({});
   });
-  expect(result.current.fieldContainerProps.className).toContain('is-float-label'); // Does not have the class if the container loses focus within it
+  expect(result.current.fieldContainerProps.className).toContain('is-float-label');
 
+  // Does not have the class if the container loses focus within it
   act(function () {
     return result.current.fieldContainerProps.onBlur({
       currentTarget: {
@@ -157,8 +191,9 @@ test('should return isFloatLabelActive class for container', function () {
       }
     });
   });
-  expect(result.current.fieldContainerProps.className).not.toContain('is-float-label-active'); // Has the class if the mode is float and the isFloatLabelActive containerProp is passed in
+  expect(result.current.fieldContainerProps.className).not.toContain('is-float-label-active');
 
+  // Has the class if the mode is float and the isFloatLabelActive containerProp is passed in
   rerender(_objectSpread(_objectSpread({}, defaultProps), {}, {
     labelMode: labelModes.FLOAT,
     containerProps: {
@@ -169,16 +204,16 @@ test('should return isFloatLabelActive class for container', function () {
 });
 test('should return isLeftLabel class for container', function () {
   var _renderHook4 = renderHook(function (initialProps) {
-    return useField(initialProps);
-  }, {
-    initialProps: defaultProps
-  }),
-      result = _renderHook4.result,
-      rerender = _renderHook4.rerender; // Does not have the class if the label mode is not set to left
-
-
-  expect(result.current.fieldContainerProps.className).not.toContain('is-left-label'); // Has the class if the value is valid and label mode is left
+      return useField(initialProps);
+    }, {
+      initialProps: defaultProps
+    }),
+    result = _renderHook4.result,
+    rerender = _renderHook4.rerender;
+  // Does not have the class if the label mode is not set to left
+  expect(result.current.fieldContainerProps.className).not.toContain('is-left-label');
 
+  // Has the class if the value is valid and label mode is left
   rerender(_objectSpread(_objectSpread({}, defaultProps), {}, {
     labelMode: labelModes.LEFT
   }));
@@ -187,50 +222,52 @@ test('should return isLeftLabel class for container', function () {
 test('should return hasValue class for container when onChange updates internal state', function () {
   var onChange = jest.fn();
   var numCalls = 0;
-
   var _renderHook5 = renderHook(function () {
-    return useField(_objectSpread(_objectSpread({}, defaultProps), {}, {
-      defaultValue: null,
-      placeholder: null,
-      onChange: onChange,
-      value: ''
-    }));
-  }),
-      result = _renderHook5.result; // Empty string is not a valid value
-
-
-  expect(result.current.fieldContainerProps.className).not.toContain('has-value'); // 0 should be a valid value
+      return useField(_objectSpread(_objectSpread({}, defaultProps), {}, {
+        defaultValue: null,
+        placeholder: null,
+        onChange: onChange,
+        value: ''
+      }));
+    }),
+    result = _renderHook5.result;
+  // Empty string is not a valid value
+  expect(result.current.fieldContainerProps.className).not.toContain('has-value');
 
+  // 0 should be a valid value
   act(function () {
-    return result.current.fieldControlProps.onChange({
+    return result.current.fieldControlInputProps.onChange({
       target: {
         value: 0
       }
     });
   });
   expect(result.current.fieldContainerProps.className).toContain('has-value');
-  numCalls += 1; // undefined is not a valid value
+  numCalls += 1;
 
+  // undefined is not a valid value
   act(function () {
-    return result.current.fieldControlProps.onChange({
+    return result.current.fieldControlInputProps.onChange({
       target: {
         value: undefined
       }
     });
   });
   expect(result.current.fieldContainerProps.className).not.toContain('has-value');
-  numCalls += 1; // a non-empty string is a valid value
+  numCalls += 1;
 
+  // a non-empty string is a valid value
   act(function () {
-    return result.current.fieldControlProps.onChange({
+    return result.current.fieldControlInputProps.onChange({
       target: {
         value: 'a'
       }
     });
   });
   expect(result.current.fieldContainerProps.className).toContain('has-value');
-  numCalls += 1; // the original onChange should be called each time
+  numCalls += 1;
 
+  // the original onChange should be called each time
   expect(numCalls).toBeGreaterThan(0);
   expect(onChange).toHaveBeenCalledTimes(numCalls);
 });