@atlaskit/form 12.6.2 → 13.0.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/form
 
+## 13.0.0
+
+### Major Changes
+
+- [`2eb0f5a39acd6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2eb0f5a39acd6) -
+  Spread props have been removed from the checkbox field and range field components to improve
+  maintenance and consistency of experience for makers.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 12.7.0
+
+### Minor Changes
+
+- [`edef4ab21e5c5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/edef4ab21e5c5) -
+  We are testing a new streamlined implementation of the field component behind a feature flag. If
+  this fix is successful it will be available in a later release.
+
 ## 12.6.2
 
 ### Patch Changes

package/dist/cjs/checkbox-field.js

@@ -6,18 +6,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _field = _interopRequireDefault(require("./field"));
-var _excluded = ["children", "defaultIsChecked", "isDisabled", "isRequired", "label", "name", "value"],
-  _excluded2 = ["value", "onChange"],
-  _excluded3 = ["fieldProps"],
-  _excluded4 = ["value", "onChange"],
-  _excluded5 = ["fieldProps"];
+var _excluded = ["value", "onChange"],
+  _excluded2 = ["fieldProps"],
+  _excluded3 = ["value", "onChange"],
+  _excluded4 = ["fieldProps"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -38,16 +35,13 @@ var CheckboxField = function CheckboxField(_ref) {
     isRequired = _ref.isRequired,
     label = _ref.label,
     name = _ref.name,
-    value = _ref.value,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+    value = _ref.value;
   // Maintains a memoised list of the default values
   var defaultValue = (0, _react.useCallback)(function () {
     var currentValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     return defaultIsChecked && value !== undefined ? [].concat((0, _toConsumableArray2.default)(currentValue), [value]) : currentValue;
   }, [value, defaultIsChecked]);
-  return value !== undefined ? /*#__PURE__*/_react.default.createElement(_field.default
-  // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
-  , (0, _extends2.default)({}, (0, _platformFeatureFlags.fg)('platform_design-system-team_checkbox-field-spread') ? {} : _objectSpread({}, rest), {
+  return value !== undefined ? /*#__PURE__*/_react.default.createElement(_field.default, {
     defaultValue: defaultValue,
     isDisabled: isDisabled,
     isRequired: isRequired,
@@ -58,12 +52,12 @@ var CheckboxField = function CheckboxField(_ref) {
         return v !== value;
       });
     }
-  }), function (_ref2) {
+  }, function (_ref2) {
     var _ref2$fieldProps = _ref2.fieldProps,
       fieldValue = _ref2$fieldProps.value,
       _onChange = _ref2$fieldProps.onChange,
-      otherFieldProps = (0, _objectWithoutProperties2.default)(_ref2$fieldProps, _excluded2),
-      others = (0, _objectWithoutProperties2.default)(_ref2, _excluded3);
+      otherFieldProps = (0, _objectWithoutProperties2.default)(_ref2$fieldProps, _excluded),
+      others = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
     return children(_objectSpread({
       fieldProps: _objectSpread(_objectSpread({}, otherFieldProps), {}, {
         // Setting to any because it's typed weirdly at the field level
@@ -76,9 +70,7 @@ var CheckboxField = function CheckboxField(_ref) {
         value: value
       })
     }, others));
-  }) : /*#__PURE__*/_react.default.createElement(_field.default
-  // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
-  , (0, _extends2.default)({}, (0, _platformFeatureFlags.fg)('platform_design-system-team_checkbox-field-spread') ? {} : _objectSpread({}, rest), {
+  }) : /*#__PURE__*/_react.default.createElement(_field.default, {
     defaultValue: defaultIsChecked,
     isDisabled: isDisabled,
     isRequired: isRequired,
@@ -87,12 +79,12 @@ var CheckboxField = function CheckboxField(_ref) {
     transform: function transform(event) {
       return typeof event === 'boolean' ? event : event.currentTarget.checked;
     }
-  }), function (_ref3) {
+  }, function (_ref3) {
     var _ref3$fieldProps = _ref3.fieldProps,
       fieldValue = _ref3$fieldProps.value,
       _onChange2 = _ref3$fieldProps.onChange,
-      otherFieldProps = (0, _objectWithoutProperties2.default)(_ref3$fieldProps, _excluded4),
-      others = (0, _objectWithoutProperties2.default)(_ref3, _excluded5);
+      otherFieldProps = (0, _objectWithoutProperties2.default)(_ref3$fieldProps, _excluded3),
+      others = (0, _objectWithoutProperties2.default)(_ref3, _excluded4);
     return children(_objectSpread({
       fieldProps: _objectSpread(_objectSpread({}, otherFieldProps), {}, {
         // Setting to any because it's typed weirdly at the field level

package/dist/cjs/field.js

@@ -8,16 +8,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Field;
 require("./field.compiled.css");
-var _react = _interopRequireWildcard(require("react"));
-var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _react = _interopRequireWildcard(require("react"));
 var _useId = require("@atlaskit/ds-lib/use-id");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _fieldIdContext = require("./field-id-context");
 var _form = require("./form");
 var _label = require("./label");
+var _messages = require("./messages");
 var _requiredAsterisk = _interopRequireDefault(require("./required-asterisk"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -67,6 +68,11 @@ function isShallowEqual(previousValue, currentValue) {
 }
 function Field(props) {
   var _getCurrentValue;
+  var _props$children = props.children,
+    children = _props$children === void 0 ? function () {
+      return null;
+    } : _props$children,
+    component = props.component;
   var _useContext = (0, _react.useContext)(_form.FormContext),
     registerField = _useContext.registerField,
     getCurrentValue = _useContext.getCurrentValue;
@@ -248,16 +254,18 @@ function Field(props) {
     'aria-labelledby': "".concat(fieldId, "-label"),
     id: fieldId
   });
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": props.testId,
     className: (0, _runtime.ax)(["_1pfhu2gc"])
-  }, props.label && /*#__PURE__*/React.createElement(_label.Label, {
+  }, props.label && /*#__PURE__*/_react.default.createElement(_label.Label, {
     htmlFor: fieldId,
     id: "".concat(fieldId, "-label"),
     testId: props.testId && "".concat(props.testId, "--label")
-  }, props.label, props.isRequired && /*#__PURE__*/React.createElement(_requiredAsterisk.default, null), props.elementAfterLabel), /*#__PURE__*/React.createElement(_fieldIdContext.FieldId.Provider, {
+  }, props.label, props.isRequired && /*#__PURE__*/_react.default.createElement(_requiredAsterisk.default, null), props.elementAfterLabel), /*#__PURE__*/_react.default.createElement(_fieldIdContext.FieldId.Provider, {
     value: fieldId
-  }, props.children({
+  }, component && (0, _platformFeatureFlags.fg)('platform_design-system-team_field-upgrade') ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, component && component({
+    fieldProps: extendedFieldProps
+  }), /*#__PURE__*/_react.default.createElement(_messages.MessageWrapper, null, props.helperMessage && /*#__PURE__*/_react.default.createElement(_messages.HelperMessage, null, props.helperMessage), state.error && /*#__PURE__*/_react.default.createElement(_messages.ErrorMessage, null, props.errorMessage || state.error), state.meta.touched && state.valid && props.validMessage && /*#__PURE__*/_react.default.createElement(_messages.ValidMessage, null, props.validMessage))) : children({
     fieldProps: extendedFieldProps,
     error: state.error,
     valid: state.valid,

package/dist/cjs/range-field.js

@@ -5,15 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _field = _interopRequireDefault(require("./field"));
-var _excluded = ["children", "defaultValue", "id", "isDisabled", "label", "name"],
-  _excluded2 = ["isInvalid", "isRequired"],
-  _excluded3 = ["fieldProps"];
+var _excluded = ["isInvalid", "isRequired"],
+  _excluded2 = ["fieldProps"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -31,21 +28,20 @@ var RangeField = function RangeField(_ref) {
     id = _ref.id,
     isDisabled = _ref.isDisabled,
     label = _ref.label,
-    name = _ref.name,
-    strippedProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/_react.default.createElement(_field.default, (0, _extends2.default)({}, (0, _platformFeatureFlags.fg)('platform_design-system-team_range-field-spread') ? {} : strippedProps, {
+    name = _ref.name;
+  return /*#__PURE__*/_react.default.createElement(_field.default, {
     defaultValue: defaultValue,
     id: id,
     isDisabled: isDisabled,
     label: label,
     name: name,
     transform: Number
-  }), function (_ref2) {
+  }, function (_ref2) {
     var _ref2$fieldProps = _ref2.fieldProps,
       isInvalid = _ref2$fieldProps.isInvalid,
       isRequired = _ref2$fieldProps.isRequired,
-      fieldProps = (0, _objectWithoutProperties2.default)(_ref2$fieldProps, _excluded2),
-      rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded3);
+      fieldProps = (0, _objectWithoutProperties2.default)(_ref2$fieldProps, _excluded),
+      rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
     return (
       // isInvalid and isRequired are specifically invalid for range inputs
       children(_objectSpread({

package/dist/es2019/checkbox-field.js

@@ -1,6 +1,4 @@
-import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Field from './field';
 /**
  * __Checkbox field__
@@ -18,23 +16,18 @@ const CheckboxField = ({
   isRequired,
   label,
   name,
-  value,
-  ...rest
+  value
 }) => {
   // Maintains a memoised list of the default values
   const defaultValue = useCallback((currentValue = []) => defaultIsChecked && value !== undefined ? [...currentValue, value] : currentValue, [value, defaultIsChecked]);
-  return value !== undefined ? /*#__PURE__*/React.createElement(Field
-  // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
-  , _extends({}, fg('platform_design-system-team_checkbox-field-spread') ? {} : {
-    ...rest
-  }, {
+  return value !== undefined ? /*#__PURE__*/React.createElement(Field, {
     defaultValue: defaultValue,
     isDisabled: isDisabled,
     isRequired: isRequired,
     label: label,
     name: name,
     transform: (event, currentValue) => !Array.isArray(event) && event.currentTarget.checked && currentValue ? [...currentValue, value] : currentValue.filter(v => v !== value)
-  }), ({
+  }, ({
     fieldProps: {
       value: fieldValue,
       onChange,
@@ -50,18 +43,14 @@ const CheckboxField = ({
       value
     },
     ...others
-  })) : /*#__PURE__*/React.createElement(Field
-  // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
-  , _extends({}, fg('platform_design-system-team_checkbox-field-spread') ? {} : {
-    ...rest
-  }, {
+  })) : /*#__PURE__*/React.createElement(Field, {
     defaultValue: defaultIsChecked,
     isDisabled: isDisabled,
     isRequired: isRequired,
     label: label,
     name: name,
     transform: event => typeof event === 'boolean' ? event : event.currentTarget.checked
-  }), ({
+  }, ({
     fieldProps: {
       value: fieldValue,
       onChange,

package/dist/es2019/field.js

@@ -1,12 +1,13 @@
 /* field.tsx generated by @compiled/babel-plugin v0.36.1 */
 import "./field.compiled.css";
-import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { useContext, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useId } from '@atlaskit/ds-lib/use-id';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FieldId } from './field-id-context';
 import { FormContext, IsDisabledContext } from './form';
 import { Label } from './label';
+import { ErrorMessage, HelperMessage, MessageWrapper, ValidMessage } from './messages';
 import RequiredAsterisk from './required-asterisk';
 const fieldWrapperStyles = null;
 function isEvent(event) {
@@ -53,6 +54,10 @@ function isShallowEqual(previousValue, currentValue) {
 }
 export default function Field(props) {
   var _getCurrentValue;
+  const {
+    children = () => null,
+    component
+  } = props;
   const {
     registerField,
     getCurrentValue
@@ -241,7 +246,9 @@ export default function Field(props) {
     testId: props.testId && `${props.testId}--label`
   }, props.label, props.isRequired && /*#__PURE__*/React.createElement(RequiredAsterisk, null), props.elementAfterLabel), /*#__PURE__*/React.createElement(FieldId.Provider, {
     value: fieldId
-  }, props.children({
+  }, component && fg('platform_design-system-team_field-upgrade') ? /*#__PURE__*/React.createElement(React.Fragment, null, component && component({
+    fieldProps: extendedFieldProps
+  }), /*#__PURE__*/React.createElement(MessageWrapper, null, props.helperMessage && /*#__PURE__*/React.createElement(HelperMessage, null, props.helperMessage), state.error && /*#__PURE__*/React.createElement(ErrorMessage, null, props.errorMessage || state.error), state.meta.touched && state.valid && props.validMessage && /*#__PURE__*/React.createElement(ValidMessage, null, props.validMessage))) : children({
     fieldProps: extendedFieldProps,
     error: state.error,
     valid: state.valid,

package/dist/es2019/range-field.js

@@ -1,6 +1,4 @@
-import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Field from './field';
 /**
  * __Range field__
@@ -17,16 +15,15 @@ const RangeField = ({
   id,
   isDisabled,
   label,
-  name,
-  ...strippedProps
-}) => /*#__PURE__*/React.createElement(Field, _extends({}, fg('platform_design-system-team_range-field-spread') ? {} : strippedProps, {
+  name
+}) => /*#__PURE__*/React.createElement(Field, {
   defaultValue: defaultValue,
   id: id,
   isDisabled: isDisabled,
   label: label,
   name: name,
   transform: Number
-}), ({
+}, ({
   fieldProps: {
     isInvalid,
     isRequired,

package/dist/esm/checkbox-field.js

@@ -1,16 +1,13 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "defaultIsChecked", "isDisabled", "isRequired", "label", "name", "value"],
-  _excluded2 = ["value", "onChange"],
-  _excluded3 = ["fieldProps"],
-  _excluded4 = ["value", "onChange"],
-  _excluded5 = ["fieldProps"];
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+var _excluded = ["value", "onChange"],
+  _excluded2 = ["fieldProps"],
+  _excluded3 = ["value", "onChange"],
+  _excluded4 = ["fieldProps"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useCallback } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Field from './field';
 /**
  * __Checkbox field__
@@ -29,16 +26,13 @@ var CheckboxField = function CheckboxField(_ref) {
     isRequired = _ref.isRequired,
     label = _ref.label,
     name = _ref.name,
-    value = _ref.value,
-    rest = _objectWithoutProperties(_ref, _excluded);
+    value = _ref.value;
   // Maintains a memoised list of the default values
   var defaultValue = useCallback(function () {
     var currentValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     return defaultIsChecked && value !== undefined ? [].concat(_toConsumableArray(currentValue), [value]) : currentValue;
   }, [value, defaultIsChecked]);
-  return value !== undefined ? /*#__PURE__*/React.createElement(Field
-  // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
-  , _extends({}, fg('platform_design-system-team_checkbox-field-spread') ? {} : _objectSpread({}, rest), {
+  return value !== undefined ? /*#__PURE__*/React.createElement(Field, {
     defaultValue: defaultValue,
     isDisabled: isDisabled,
     isRequired: isRequired,
@@ -49,12 +43,12 @@ var CheckboxField = function CheckboxField(_ref) {
         return v !== value;
       });
     }
-  }), function (_ref2) {
+  }, function (_ref2) {
     var _ref2$fieldProps = _ref2.fieldProps,
       fieldValue = _ref2$fieldProps.value,
       _onChange = _ref2$fieldProps.onChange,
-      otherFieldProps = _objectWithoutProperties(_ref2$fieldProps, _excluded2),
-      others = _objectWithoutProperties(_ref2, _excluded3);
+      otherFieldProps = _objectWithoutProperties(_ref2$fieldProps, _excluded),
+      others = _objectWithoutProperties(_ref2, _excluded2);
     return children(_objectSpread({
       fieldProps: _objectSpread(_objectSpread({}, otherFieldProps), {}, {
         // Setting to any because it's typed weirdly at the field level
@@ -67,9 +61,7 @@ var CheckboxField = function CheckboxField(_ref) {
         value: value
       })
     }, others));
-  }) : /*#__PURE__*/React.createElement(Field
-  // eslint-disable-next-line @repo/internal/react/no-unsafe-spread-props
-  , _extends({}, fg('platform_design-system-team_checkbox-field-spread') ? {} : _objectSpread({}, rest), {
+  }) : /*#__PURE__*/React.createElement(Field, {
     defaultValue: defaultIsChecked,
     isDisabled: isDisabled,
     isRequired: isRequired,
@@ -78,12 +70,12 @@ var CheckboxField = function CheckboxField(_ref) {
     transform: function transform(event) {
       return typeof event === 'boolean' ? event : event.currentTarget.checked;
     }
-  }), function (_ref3) {
+  }, function (_ref3) {
     var _ref3$fieldProps = _ref3.fieldProps,
       fieldValue = _ref3$fieldProps.value,
       _onChange2 = _ref3$fieldProps.onChange,
-      otherFieldProps = _objectWithoutProperties(_ref3$fieldProps, _excluded4),
-      others = _objectWithoutProperties(_ref3, _excluded5);
+      otherFieldProps = _objectWithoutProperties(_ref3$fieldProps, _excluded3),
+      others = _objectWithoutProperties(_ref3, _excluded4);
     return children(_objectSpread({
       fieldProps: _objectSpread(_objectSpread({}, otherFieldProps), {}, {
         // Setting to any because it's typed weirdly at the field level

package/dist/esm/field.js

@@ -3,15 +3,16 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _typeof from "@babel/runtime/helpers/typeof";
 import "./field.compiled.css";
-import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { useContext, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { useId } from '@atlaskit/ds-lib/use-id';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FieldId } from './field-id-context';
 import { FormContext, IsDisabledContext } from './form';
 import { Label } from './label';
+import { ErrorMessage, HelperMessage, MessageWrapper, ValidMessage } from './messages';
 import RequiredAsterisk from './required-asterisk';
 var fieldWrapperStyles = null;
 function isEvent(event) {
@@ -58,6 +59,11 @@ function isShallowEqual(previousValue, currentValue) {
 }
 export default function Field(props) {
   var _getCurrentValue;
+  var _props$children = props.children,
+    children = _props$children === void 0 ? function () {
+      return null;
+    } : _props$children,
+    component = props.component;
   var _useContext = useContext(FormContext),
     registerField = _useContext.registerField,
     getCurrentValue = _useContext.getCurrentValue;
@@ -248,7 +254,9 @@ export default function Field(props) {
     testId: props.testId && "".concat(props.testId, "--label")
   }, props.label, props.isRequired && /*#__PURE__*/React.createElement(RequiredAsterisk, null), props.elementAfterLabel), /*#__PURE__*/React.createElement(FieldId.Provider, {
     value: fieldId
-  }, props.children({
+  }, component && fg('platform_design-system-team_field-upgrade') ? /*#__PURE__*/React.createElement(React.Fragment, null, component && component({
+    fieldProps: extendedFieldProps
+  }), /*#__PURE__*/React.createElement(MessageWrapper, null, props.helperMessage && /*#__PURE__*/React.createElement(HelperMessage, null, props.helperMessage), state.error && /*#__PURE__*/React.createElement(ErrorMessage, null, props.errorMessage || state.error), state.meta.touched && state.valid && props.validMessage && /*#__PURE__*/React.createElement(ValidMessage, null, props.validMessage))) : children({
     fieldProps: extendedFieldProps,
     error: state.error,
     valid: state.valid,

package/dist/esm/range-field.js

@@ -1,13 +1,10 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["children", "defaultValue", "id", "isDisabled", "label", "name"],
-  _excluded2 = ["isInvalid", "isRequired"],
-  _excluded3 = ["fieldProps"];
+var _excluded = ["isInvalid", "isRequired"],
+  _excluded2 = ["fieldProps"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import Field from './field';
 /**
  * __Range field__
@@ -24,21 +21,20 @@ var RangeField = function RangeField(_ref) {
     id = _ref.id,
     isDisabled = _ref.isDisabled,
     label = _ref.label,
-    name = _ref.name,
-    strippedProps = _objectWithoutProperties(_ref, _excluded);
-  return /*#__PURE__*/React.createElement(Field, _extends({}, fg('platform_design-system-team_range-field-spread') ? {} : strippedProps, {
+    name = _ref.name;
+  return /*#__PURE__*/React.createElement(Field, {
     defaultValue: defaultValue,
     id: id,
     isDisabled: isDisabled,
     label: label,
     name: name,
     transform: Number
-  }), function (_ref2) {
+  }, function (_ref2) {
     var _ref2$fieldProps = _ref2.fieldProps,
       isInvalid = _ref2$fieldProps.isInvalid,
       isRequired = _ref2$fieldProps.isRequired,
-      fieldProps = _objectWithoutProperties(_ref2$fieldProps, _excluded2),
-      rest = _objectWithoutProperties(_ref2, _excluded3);
+      fieldProps = _objectWithoutProperties(_ref2$fieldProps, _excluded),
+      rest = _objectWithoutProperties(_ref2, _excluded2);
     return (
       // isInvalid and isRequired are specifically invalid for range inputs
       children(_objectSpread({

package/dist/types/checkbox-field.d.ts

@@ -47,5 +47,5 @@ interface CheckboxProps {
  * - [Code] https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#checkboxfield-reference
  * - [Usage] https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#checkboxfield-reference
  */
-declare const CheckboxField: ({ children, defaultIsChecked, isDisabled, isRequired, label, name, value, ...rest }: CheckboxProps) => React.JSX.Element;
+declare const CheckboxField: ({ children, defaultIsChecked, isDisabled, isRequired, label, name, value, }: CheckboxProps) => React.JSX.Element;
 export default CheckboxField;

package/dist/types/field.d.ts

@@ -29,16 +29,34 @@ export interface Meta {
     submitError?: boolean;
     validating?: boolean;
 }
-export interface FieldComponentProps<FieldValue, Element extends SupportedElements> {
+export type FieldComponentProps<FieldValue, Element extends SupportedElements> = {
     /**
-     * Content to render in the field. This is a function that is called with props for the field component and other information about the field.
+     * Content to render in the field. This is a function that is called with props for the field component and other information about the field. This cannot be used at the same time as the `component` prop, as the `children` prop will be ignored.
      */
-    children: (args: {
+    children?: (args: {
         fieldProps: FieldProps<FieldValue, Element>;
         error?: string;
         valid: boolean;
         meta: Meta;
     }) => ReactNode;
+    /**
+     * Content to render in the field. This will be rendered with the `*Message` props. This cannot be used at the same time as the `children` prop, as the `children` prop will be ignored.
+     */
+    component?: (args: {
+        fieldProps: FieldProps<FieldValue, Element>;
+    }) => ReactNode;
+    /**
+     * Renders a `HelperMessage` with the provided content when using the `component` prop.
+     */
+    helperMessage?: ReactNode;
+    /**
+     * Renders an `ErrorMessage` with the provided content when using the `component` prop.
+     */
+    errorMessage?: ReactNode;
+    /**
+     * Renders a `ValidMessage` with the provided content when using the `component` prop.
+     */
+    validMessage?: ReactNode;
     /**
      * Sets the default value of the field. If a function is provided, it is called with the current default value of the field.
      */
@@ -79,6 +97,6 @@ export interface FieldComponentProps<FieldValue, Element extends SupportedElemen
      * A `testId` prop is provided for specified elements, which is a unique string that appears as a data attribute `data-testid` in the rendered code, serving as a hook for automated tests
      */
     testId?: string;
-}
+};
 export default function Field<FieldValue = string, Element extends SupportedElements = HTMLInputElement>(props: FieldComponentProps<FieldValue, Element>): JSX.Element;
 export {};

package/dist/types/range-field.d.ts

@@ -40,5 +40,5 @@ export interface RangeFieldProps {
  * - [Code](https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#rangefield-reference)
  * - [Usage](https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#rangefield-reference)
  */
-declare const RangeField: ({ children, defaultValue, id, isDisabled, label, name, ...strippedProps }: RangeFieldProps) => React.JSX.Element;
+declare const RangeField: ({ children, defaultValue, id, isDisabled, label, name }: RangeFieldProps) => React.JSX.Element;
 export default RangeField;

package/dist/types-ts4.5/checkbox-field.d.ts

@@ -47,5 +47,5 @@ interface CheckboxProps {
  * - [Code] https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#checkboxfield-reference
  * - [Usage] https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#checkboxfield-reference
  */
-declare const CheckboxField: ({ children, defaultIsChecked, isDisabled, isRequired, label, name, value, ...rest }: CheckboxProps) => React.JSX.Element;
+declare const CheckboxField: ({ children, defaultIsChecked, isDisabled, isRequired, label, name, value, }: CheckboxProps) => React.JSX.Element;
 export default CheckboxField;

package/dist/types-ts4.5/field.d.ts

@@ -29,16 +29,34 @@ export interface Meta {
     submitError?: boolean;
     validating?: boolean;
 }
-export interface FieldComponentProps<FieldValue, Element extends SupportedElements> {
+export type FieldComponentProps<FieldValue, Element extends SupportedElements> = {
     /**
-     * Content to render in the field. This is a function that is called with props for the field component and other information about the field.
+     * Content to render in the field. This is a function that is called with props for the field component and other information about the field. This cannot be used at the same time as the `component` prop, as the `children` prop will be ignored.
      */
-    children: (args: {
+    children?: (args: {
         fieldProps: FieldProps<FieldValue, Element>;
         error?: string;
         valid: boolean;
         meta: Meta;
     }) => ReactNode;
+    /**
+     * Content to render in the field. This will be rendered with the `*Message` props. This cannot be used at the same time as the `children` prop, as the `children` prop will be ignored.
+     */
+    component?: (args: {
+        fieldProps: FieldProps<FieldValue, Element>;
+    }) => ReactNode;
+    /**
+     * Renders a `HelperMessage` with the provided content when using the `component` prop.
+     */
+    helperMessage?: ReactNode;
+    /**
+     * Renders an `ErrorMessage` with the provided content when using the `component` prop.
+     */
+    errorMessage?: ReactNode;
+    /**
+     * Renders a `ValidMessage` with the provided content when using the `component` prop.
+     */
+    validMessage?: ReactNode;
     /**
      * Sets the default value of the field. If a function is provided, it is called with the current default value of the field.
      */
@@ -79,6 +97,6 @@ export interface FieldComponentProps<FieldValue, Element extends SupportedElemen
      * A `testId` prop is provided for specified elements, which is a unique string that appears as a data attribute `data-testid` in the rendered code, serving as a hook for automated tests
      */
     testId?: string;
-}
+};
 export default function Field<FieldValue = string, Element extends SupportedElements = HTMLInputElement>(props: FieldComponentProps<FieldValue, Element>): JSX.Element;
 export {};

package/dist/types-ts4.5/range-field.d.ts

@@ -40,5 +40,5 @@ export interface RangeFieldProps {
  * - [Code](https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#rangefield-reference)
  * - [Usage](https://atlaskit.atlassian.com/packages/design-system/form/docs/fields#rangefield-reference)
  */
-declare const RangeField: ({ children, defaultValue, id, isDisabled, label, name, ...strippedProps }: RangeFieldProps) => React.JSX.Element;
+declare const RangeField: ({ children, defaultValue, id, isDisabled, label, name }: RangeFieldProps) => React.JSX.Element;
 export default RangeField;

package/offerings.json

@@ -33,8 +33,6 @@
 			"Always include a visible label (exception: search fields)",
 			"Match field length to intended content length"
 		],
-		"examples": {
-			"basic": "./examples/ai/form.tsx"
-		}
+		"examples": ["./examples/ai/form.tsx"]
 	}
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/form",
-	"version": "12.6.2",
+	"version": "13.0.0",
 	"description": "A form allows users to input information.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^28.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.14.0",
+		"@atlaskit/primitives": "^14.15.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0",
 		"final-form": "^4.20.3",
@@ -110,13 +110,10 @@
 		"platform_dst_form_screenreader_message_fix": {
 			"type": "boolean"
 		},
-		"platform_design-system-team_range-field-spread": {
-			"type": "boolean"
-		},
 		"platform_design-system-team_form-upgrade": {
 			"type": "boolean"
 		},
-		"platform_design-system-team_checkbox-field-spread": {
+		"platform_design-system-team_field-upgrade": {
 			"type": "boolean"
 		},
 		"platform-form-field-error-focus": {