@atlaskit/form 10.5.1 → 10.5.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/form
 
+## 10.5.3
+
+### Patch Changes
+
+- [`34d8c0a75098e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/34d8c0a75098e) -
+  [ux] accessibility improvements to the error validation
+
+## 10.5.2
+
+### Patch Changes
+
+- [#129726](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129726)
+  [`778c15c1d279a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/778c15c1d279a) -
+  [ux] Removed feature flag `platform.design-system-team.form-header-typography-updates_4f1g6` and
+  `platform.design-system-team.form-label-typography-updates` feature flags resulting in minor
+  visual changes to typography.
+
 ## 10.5.1
 
 ### Patch Changes

package/dist/cjs/entry-points/messages.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "HelperMessage", {
     return _messages.HelperMessage;
   }
 });
+Object.defineProperty(exports, "MessageWrapper", {
+  enumerable: true,
+  get: function get() {
+    return _messages.MessageWrapper;
+  }
+});
 Object.defineProperty(exports, "ValidMessage", {
   enumerable: true,
   get: function get() {

package/dist/cjs/form-header.js

@@ -4,12 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.FormHeaderTitle = exports.FormHeaderDescription = exports.FormHeaderContent = void 0;
+exports.default = void 0;
 var _react = require("@emotion/react");
 var _heading = _interopRequireDefault(require("@atlaskit/heading"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
-var _typography = require("@atlaskit/theme/typography");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -24,48 +22,6 @@ var formHeaderContentStyles = (0, _primitives.xcss)({
 var formHeaderDescriptionStyles = (0, _primitives.xcss)({
   marginBlockStart: 'space.100'
 });
-var formHeaderTitleStyles = (0, _react.css)({
-  lineHeight: "var(--ds-font-lineHeight-500, 32px)",
-  marginBlockStart: 0,
-  marginInlineEnd: "var(--ds-space-400, 32px)",
-  overflow: 'hidden',
-  textOverflow: 'ellipsis',
-  whiteSpace: 'nowrap'
-});
-var formHeaderWrapperStyles = (0, _react.css)({
-  fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
-});
-
-// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-var lightH700Styles = (0, _react.css)((0, _typography.h700)({
-  theme: {
-    mode: 'light'
-  }
-}));
-var FormHeaderContent = exports.FormHeaderContent = function FormHeaderContent(_ref) {
-  var children = _ref.children;
-  return (0, _react.jsx)(_primitives.Box, {
-    xcss: formHeaderContentStyles
-  }, children);
-};
-var FormHeaderDescription = exports.FormHeaderDescription = function FormHeaderDescription(_ref2) {
-  var children = _ref2.children;
-  return (0, _react.jsx)(_primitives.Box, {
-    xcss: formHeaderDescriptionStyles
-  }, children);
-};
-var FormHeaderTitle = exports.FormHeaderTitle = function FormHeaderTitle(_ref3) {
-  var children = _ref3.children;
-  return (0, _react.jsx)("h2", {
-    css: [lightH700Styles, formHeaderTitleStyles]
-  }, children);
-};
-var FormHeaderWrapper = function FormHeaderWrapper(_ref4) {
-  var children = _ref4.children;
-  return (0, _react.jsx)("div", {
-    css: formHeaderWrapperStyles
-  }, children);
-};
 
 /**
  * __Form header__.
@@ -77,12 +33,16 @@ var FormHeaderWrapper = function FormHeaderWrapper(_ref4) {
  * - [Code](https://atlaskit.atlassian.com/packages/design-system/form/docs/layout)
  * - [Usage](https://atlaskit.atlassian.com/packages/design-system/form/docs/layout).
  */
-var FormHeader = function FormHeader(_ref5) {
-  var children = _ref5.children,
-    description = _ref5.description,
-    title = _ref5.title;
-  return (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.form-header-typography-updates_4f1g6') ? (0, _react.jsx)(_primitives.Box, null, title && (0, _react.jsx)(_heading.default, {
+var FormHeader = function FormHeader(_ref) {
+  var children = _ref.children,
+    description = _ref.description,
+    title = _ref.title;
+  return (0, _react.jsx)(_primitives.Box, null, title && (0, _react.jsx)(_heading.default, {
     size: "large"
-  }, title), description && (0, _react.jsx)(FormHeaderDescription, null, description), children && (0, _react.jsx)(FormHeaderContent, null, children)) : (0, _react.jsx)(FormHeaderWrapper, null, title && (0, _react.jsx)(FormHeaderTitle, null, title), description && (0, _react.jsx)(FormHeaderDescription, null, description), children && (0, _react.jsx)(FormHeaderContent, null, children));
+  }, title), description && (0, _react.jsx)(_primitives.Box, {
+    xcss: formHeaderDescriptionStyles
+  }, description), children && (0, _react.jsx)(_primitives.Box, {
+    xcss: formHeaderContentStyles
+  }, children));
 };
 var _default = exports.default = FormHeader;

package/dist/cjs/index.js

@@ -64,6 +64,12 @@ Object.defineProperty(exports, "Legend", {
     return _label.Legend;
   }
 });
+Object.defineProperty(exports, "MessageWrapper", {
+  enumerable: true,
+  get: function get() {
+    return _messages.MessageWrapper;
+  }
+});
 Object.defineProperty(exports, "RangeField", {
   enumerable: true,
   get: function get() {

package/dist/cjs/label.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Legend = exports.Label = void 0;
 var _react = require("@emotion/react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _colors = require("@atlaskit/theme/colors");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -16,18 +14,12 @@ var _colors = require("@atlaskit/theme/colors");
 
 var fieldsetLabelStyles = (0, _react.css)({
   display: 'inline-block',
+  color: "var(--ds-text-subtle, #44546F)",
   font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-bold, 700)",
   marginBlockEnd: "var(--ds-space-050, 4px)",
   marginBlockStart: "var(--ds-space-0, 0px)"
 });
-var oldFieldsetLabelStyles = (0, _react.css)({
-  color: "var(--ds-text-subtle, ".concat(_colors.N200, ")"),
-  fontWeight: "var(--ds-font-weight-semibold, 600)"
-});
-var newFieldsetLabelStyles = (0, _react.css)({
-  color: "var(--ds-text-subtle, #44546F)",
-  fontWeight: "var(--ds-font-weight-bold, 700)"
-});
 
 /**
  * __Label__
@@ -43,9 +35,7 @@ var Label = exports.Label = function Label(_ref) {
     id = _ref.id,
     testId = _ref.testId;
   return (0, _react.jsx)("label", {
-    css: [fieldsetLabelStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.form-label-typography-updates') ? newFieldsetLabelStyles : oldFieldsetLabelStyles],
+    css: fieldsetLabelStyles,
     id: id,
     htmlFor: htmlFor,
     "data-testid": testId
@@ -60,9 +50,7 @@ var Label = exports.Label = function Label(_ref) {
 var Legend = exports.Legend = function Legend(_ref2) {
   var children = _ref2.children;
   return (0, _react.jsx)("legend", {
-    css: [fieldsetLabelStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    (0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.form-label-typography-updates') ? newFieldsetLabelStyles : oldFieldsetLabelStyles]
+    css: fieldsetLabelStyles
   }, children);
 };
 var _default = exports.default = Label;

package/dist/cjs/messages.js

@@ -4,8 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ValidMessage = exports.HelperMessage = exports.ErrorMessage = void 0;
-var _react = require("@emotion/react");
+exports.ValidMessage = exports.MessageWrapperContext = exports.MessageWrapper = exports.HelperMessage = exports.ErrorMessage = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _react2 = require("@emotion/react");
 var _success = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/success"));
 var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/error"));
 var _colors = require("@atlaskit/theme/colors");
@@ -25,7 +27,7 @@ var _fieldIdContext = require("./field-id-context");
  * Public API of the various message components.
  */
 
-var messageStyles = (0, _react.css)({
+var messageStyles = (0, _react2.css)({
   display: 'flex',
   justifyContent: 'baseline',
   gap: "var(--ds-space-050, 4px)",
@@ -33,31 +35,31 @@ var messageStyles = (0, _react.css)({
   marginBlockStart: "var(--ds-space-050, 4px)"
 });
 var messageAppearanceStyles = {
-  default: (0, _react.css)({
+  default: (0, _react2.css)({
     color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")")
   }),
-  error: (0, _react.css)({
+  error: (0, _react2.css)({
     color: "var(--ds-text-danger, #AE2A19)"
   }),
-  valid: (0, _react.css)({
+  valid: (0, _react2.css)({
     color: "var(--ds-text-success, #216E4E)"
   })
 };
-var iconWrapperStyles = (0, _react.css)({
+var iconWrapperStyles = (0, _react2.css)({
   display: 'flex'
 });
 var IconWrapper = function IconWrapper(_ref) {
   var children = _ref.children;
-  return (0, _react.jsx)("span", {
+  return (0, _react2.jsx)("span", {
     css: iconWrapperStyles
   }, children);
 };
 var messageIcons = {
-  error: (0, _react.jsx)(_error.default, {
+  error: (0, _react2.jsx)(_error.default, {
     size: "small",
     label: "error"
   }),
-  valid: (0, _react.jsx)(_success.default, {
+  valid: (0, _react2.jsx)(_success.default, {
     size: "small",
     label: "success"
   })
@@ -69,6 +71,18 @@ var Message = function Message(_ref2) {
     fieldId = _ref2.fieldId,
     testId = _ref2.testId;
   var icon = messageIcons[appearance];
+  var messageRef = (0, _react.useRef)(null);
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hasMessageWrapper = _useState2[0],
+    setHasMessageWrapper = _useState2[1];
+  var _useContext = (0, _react.useContext)(MessageWrapperContext),
+    isWrapper = _useContext.isWrapper;
+  (0, _react.useEffect)(function () {
+    if (messageRef.current) {
+      setHasMessageWrapper(isWrapper);
+    }
+  }, [isWrapper]);
 
   /**
    * The wrapping span is necessary to preserve spaces between children.
@@ -78,13 +92,16 @@ var Message = function Message(_ref2) {
    * If the child is just a string, this is not required and we can use one
    * less DOM element.
    */
-  var content = typeof children === 'string' ? children : (0, _react.jsx)("span", null, children);
-  return (0, _react.jsx)("div", {
+  var content = typeof children === 'string' ? children : (0, _react2.jsx)("span", null, children);
+  return (0, _react2.jsx)("div", {
     css: [messageStyles, messageAppearanceStyles[appearance]],
     "data-testid": testId,
     id: fieldId,
-    "aria-live": "polite"
-  }, icon && (0, _react.jsx)(IconWrapper, null, icon), content);
+    ref: messageRef
+    // For backwards compatability, if there is a wrapper, aria-live is not needed
+    ,
+    "aria-live": !hasMessageWrapper ? 'polite' : undefined
+  }, icon && (0, _react2.jsx)(IconWrapper, null, icon), content);
 };
 
 /**
@@ -97,8 +114,8 @@ var Message = function Message(_ref2) {
 var HelperMessage = exports.HelperMessage = function HelperMessage(_ref3) {
   var children = _ref3.children,
     testId = _ref3.testId;
-  return (0, _react.jsx)(_fieldIdContext.FieldId.Consumer, null, function (fieldId) {
-    return (0, _react.jsx)(Message, {
+  return (0, _react2.jsx)(_fieldIdContext.FieldId.Consumer, null, function (fieldId) {
+    return (0, _react2.jsx)(Message, {
       fieldId: fieldId ? "".concat(fieldId, "-helper") : undefined,
       testId: testId
     }, children);
@@ -115,8 +132,8 @@ var HelperMessage = exports.HelperMessage = function HelperMessage(_ref3) {
 var ErrorMessage = exports.ErrorMessage = function ErrorMessage(_ref4) {
   var children = _ref4.children,
     testId = _ref4.testId;
-  return (0, _react.jsx)(_fieldIdContext.FieldId.Consumer, null, function (fieldId) {
-    return (0, _react.jsx)(Message, {
+  return (0, _react2.jsx)(_fieldIdContext.FieldId.Consumer, null, function (fieldId) {
+    return (0, _react2.jsx)(Message, {
       appearance: "error",
       fieldId: fieldId ? "".concat(fieldId, "-error") : undefined,
       testId: testId
@@ -134,11 +151,43 @@ var ErrorMessage = exports.ErrorMessage = function ErrorMessage(_ref4) {
 var ValidMessage = exports.ValidMessage = function ValidMessage(_ref5) {
   var children = _ref5.children,
     testId = _ref5.testId;
-  return (0, _react.jsx)(_fieldIdContext.FieldId.Consumer, null, function (fieldId) {
-    return (0, _react.jsx)(Message, {
+  return (0, _react2.jsx)(_fieldIdContext.FieldId.Consumer, null, function (fieldId) {
+    return (0, _react2.jsx)(Message, {
       appearance: "valid",
       fieldId: fieldId ? "".concat(fieldId, "-valid") : undefined,
       testId: testId
     }, children);
   });
+};
+
+/**
+ * __Message wrapper context__
+ *
+ * A message wrapper context allows the children to check
+ * if it is contained within the MessageWrapper.
+ */
+var MessageWrapperContext = exports.MessageWrapperContext = /*#__PURE__*/(0, _react.createContext)({
+  isWrapper: false
+});
+
+/**
+ * __Message wrapper __
+ *
+ * A message wrapper is used to allow assistive technologies, like screen readers, to announce error or
+ * valid messages. This must be loaded into the DOM before the
+ * ErrorMessage, ValidMessage is loaded. Otherwise, assistive technologies
+ * may not render the message.
+ *
+ */
+var MessageWrapper = exports.MessageWrapper = function MessageWrapper(_ref6) {
+  var children = _ref6.children;
+  var contextValue = {
+    isWrapper: true
+  };
+  return (0, _react2.jsx)(MessageWrapperContext.Provider, {
+    value: contextValue
+  }, (0, _react2.jsx)("div", {
+    "aria-live": "polite",
+    "data-testid": "message-wrapper"
+  }, children));
 };

package/dist/es2019/entry-points/messages.js

@@ -1 +1 @@
-export { HelperMessage, ErrorMessage, ValidMessage } from '../messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from '../messages';

package/dist/es2019/form-header.js

@@ -4,11 +4,9 @@
  */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { css, jsx } from '@emotion/react';
+import { jsx } from '@emotion/react';
 import Heading from '@atlaskit/heading';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
-import { h700 } from '@atlaskit/theme/typography';
 const formHeaderContentStyles = xcss({
   minWidth: '100%',
   marginBlockStart: 'space.100'
@@ -16,52 +14,6 @@ const formHeaderContentStyles = xcss({
 const formHeaderDescriptionStyles = xcss({
   marginBlockStart: 'space.100'
 });
-const formHeaderTitleStyles = css({
-  lineHeight: "var(--ds-font-lineHeight-500, 32px)",
-  marginBlockStart: 0,
-  marginInlineEnd: "var(--ds-space-400, 32px)",
-  overflow: 'hidden',
-  textOverflow: 'ellipsis',
-  whiteSpace: 'nowrap'
-});
-const formHeaderWrapperStyles = css({
-  fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
-});
-
-// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-const lightH700Styles = css(h700({
-  theme: {
-    mode: 'light'
-  }
-}));
-const FormHeaderContent = ({
-  children
-}) => {
-  return jsx(Box, {
-    xcss: formHeaderContentStyles
-  }, children);
-};
-const FormHeaderDescription = ({
-  children
-}) => {
-  return jsx(Box, {
-    xcss: formHeaderDescriptionStyles
-  }, children);
-};
-const FormHeaderTitle = ({
-  children
-}) => {
-  return jsx("h2", {
-    css: [lightH700Styles, formHeaderTitleStyles]
-  }, children);
-};
-const FormHeaderWrapper = ({
-  children
-}) => {
-  return jsx("div", {
-    css: formHeaderWrapperStyles
-  }, children);
-};
 
 /**
  * __Form header__.
@@ -78,9 +30,12 @@ const FormHeader = ({
   description,
   title
 }) => {
-  return getBooleanFF('platform.design-system-team.form-header-typography-updates_4f1g6') ? jsx(Box, null, title && jsx(Heading, {
+  return jsx(Box, null, title && jsx(Heading, {
     size: "large"
-  }, title), description && jsx(FormHeaderDescription, null, description), children && jsx(FormHeaderContent, null, children)) : jsx(FormHeaderWrapper, null, title && jsx(FormHeaderTitle, null, title), description && jsx(FormHeaderDescription, null, description), children && jsx(FormHeaderContent, null, children));
+  }, title), description && jsx(Box, {
+    xcss: formHeaderDescriptionStyles
+  }, description), children && jsx(Box, {
+    xcss: formHeaderContentStyles
+  }, children));
 };
-export default FormHeader;
-export { FormHeaderContent, FormHeaderDescription, FormHeaderTitle };
+export default FormHeader;

package/dist/es2019/index.js

@@ -6,7 +6,7 @@ export { default as Field } from './field';
 export { default as CheckboxField } from './checkbox-field';
 export { default as RangeField } from './range-field';
 export { Label, Legend } from './label';
-export { HelperMessage, ErrorMessage, ValidMessage } from './messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from './messages';
 export { default as Fieldset } from './fieldset';
 export { default as RequiredAsterisk } from './required-asterisk';
 // eslint-disable-next-line import/no-unresolved

package/dist/es2019/label.js

@@ -5,22 +5,14 @@
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { N200 } from '@atlaskit/theme/colors';
 const fieldsetLabelStyles = css({
   display: 'inline-block',
+  color: "var(--ds-text-subtle, #44546F)",
   font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-bold, 700)",
   marginBlockEnd: "var(--ds-space-050, 4px)",
   marginBlockStart: "var(--ds-space-0, 0px)"
 });
-const oldFieldsetLabelStyles = css({
-  color: `var(--ds-text-subtle, ${N200})`,
-  fontWeight: "var(--ds-font-weight-semibold, 600)"
-});
-const newFieldsetLabelStyles = css({
-  color: "var(--ds-text-subtle, #44546F)",
-  fontWeight: "var(--ds-font-weight-bold, 700)"
-});
 
 /**
  * __Label__
@@ -36,9 +28,7 @@ export const Label = ({
   id,
   testId
 }) => jsx("label", {
-  css: [fieldsetLabelStyles,
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-  getBooleanFF('platform.design-system-team.form-label-typography-updates') ? newFieldsetLabelStyles : oldFieldsetLabelStyles],
+  css: fieldsetLabelStyles,
   id: id,
   htmlFor: htmlFor,
   "data-testid": testId
@@ -53,9 +43,7 @@ export const Legend = ({
   children
 }) => {
   return jsx("legend", {
-    css: [fieldsetLabelStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    getBooleanFF('platform.design-system-team.form-label-typography-updates') ? newFieldsetLabelStyles : oldFieldsetLabelStyles]
+    css: fieldsetLabelStyles
   }, children);
 };
 export default Label;

package/dist/es2019/messages.js

@@ -3,6 +3,8 @@
  * @jsx jsx
  */
 
+import { createContext, useContext, useEffect, useRef, useState } from 'react';
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import SuccessIcon from '@atlaskit/icon/glyph/editor/success';
@@ -63,6 +65,16 @@ const Message = ({
   testId
 }) => {
   const icon = messageIcons[appearance];
+  const messageRef = useRef(null);
+  const [hasMessageWrapper, setHasMessageWrapper] = useState(false);
+  const {
+    isWrapper
+  } = useContext(MessageWrapperContext);
+  useEffect(() => {
+    if (messageRef.current) {
+      setHasMessageWrapper(isWrapper);
+    }
+  }, [isWrapper]);
 
   /**
    * The wrapping span is necessary to preserve spaces between children.
@@ -77,7 +89,10 @@ const Message = ({
     css: [messageStyles, messageAppearanceStyles[appearance]],
     "data-testid": testId,
     id: fieldId,
-    "aria-live": "polite"
+    ref: messageRef
+    // For backwards compatability, if there is a wrapper, aria-live is not needed
+    ,
+    "aria-live": !hasMessageWrapper ? 'polite' : undefined
   }, icon && jsx(IconWrapper, null, icon), content);
 };
 
@@ -126,4 +141,37 @@ export const ValidMessage = ({
   appearance: "valid",
   fieldId: fieldId ? `${fieldId}-valid` : undefined,
   testId: testId
-}, children));
+}, children));
+
+/**
+ * __Message wrapper context__
+ *
+ * A message wrapper context allows the children to check
+ * if it is contained within the MessageWrapper.
+ */
+export const MessageWrapperContext = /*#__PURE__*/createContext({
+  isWrapper: false
+});
+
+/**
+ * __Message wrapper __
+ *
+ * A message wrapper is used to allow assistive technologies, like screen readers, to announce error or
+ * valid messages. This must be loaded into the DOM before the
+ * ErrorMessage, ValidMessage is loaded. Otherwise, assistive technologies
+ * may not render the message.
+ *
+ */
+export const MessageWrapper = ({
+  children
+}) => {
+  const contextValue = {
+    isWrapper: true
+  };
+  return jsx(MessageWrapperContext.Provider, {
+    value: contextValue
+  }, jsx("div", {
+    "aria-live": "polite",
+    "data-testid": "message-wrapper"
+  }, children));
+};

package/dist/esm/entry-points/messages.js

@@ -1 +1 @@
-export { HelperMessage, ErrorMessage, ValidMessage } from '../messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from '../messages';

package/dist/esm/form-header.js

@@ -4,11 +4,9 @@
  */
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { css, jsx } from '@emotion/react';
+import { jsx } from '@emotion/react';
 import Heading from '@atlaskit/heading';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
-import { h700 } from '@atlaskit/theme/typography';
 var formHeaderContentStyles = xcss({
   minWidth: '100%',
   marginBlockStart: 'space.100'
@@ -16,48 +14,6 @@ var formHeaderContentStyles = xcss({
 var formHeaderDescriptionStyles = xcss({
   marginBlockStart: 'space.100'
 });
-var formHeaderTitleStyles = css({
-  lineHeight: "var(--ds-font-lineHeight-500, 32px)",
-  marginBlockStart: 0,
-  marginInlineEnd: "var(--ds-space-400, 32px)",
-  overflow: 'hidden',
-  textOverflow: 'ellipsis',
-  whiteSpace: 'nowrap'
-});
-var formHeaderWrapperStyles = css({
-  fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
-});
-
-// eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-var lightH700Styles = css(h700({
-  theme: {
-    mode: 'light'
-  }
-}));
-var FormHeaderContent = function FormHeaderContent(_ref) {
-  var children = _ref.children;
-  return jsx(Box, {
-    xcss: formHeaderContentStyles
-  }, children);
-};
-var FormHeaderDescription = function FormHeaderDescription(_ref2) {
-  var children = _ref2.children;
-  return jsx(Box, {
-    xcss: formHeaderDescriptionStyles
-  }, children);
-};
-var FormHeaderTitle = function FormHeaderTitle(_ref3) {
-  var children = _ref3.children;
-  return jsx("h2", {
-    css: [lightH700Styles, formHeaderTitleStyles]
-  }, children);
-};
-var FormHeaderWrapper = function FormHeaderWrapper(_ref4) {
-  var children = _ref4.children;
-  return jsx("div", {
-    css: formHeaderWrapperStyles
-  }, children);
-};
 
 /**
  * __Form header__.
@@ -69,13 +25,16 @@ var FormHeaderWrapper = function FormHeaderWrapper(_ref4) {
  * - [Code](https://atlaskit.atlassian.com/packages/design-system/form/docs/layout)
  * - [Usage](https://atlaskit.atlassian.com/packages/design-system/form/docs/layout).
  */
-var FormHeader = function FormHeader(_ref5) {
-  var children = _ref5.children,
-    description = _ref5.description,
-    title = _ref5.title;
-  return getBooleanFF('platform.design-system-team.form-header-typography-updates_4f1g6') ? jsx(Box, null, title && jsx(Heading, {
+var FormHeader = function FormHeader(_ref) {
+  var children = _ref.children,
+    description = _ref.description,
+    title = _ref.title;
+  return jsx(Box, null, title && jsx(Heading, {
     size: "large"
-  }, title), description && jsx(FormHeaderDescription, null, description), children && jsx(FormHeaderContent, null, children)) : jsx(FormHeaderWrapper, null, title && jsx(FormHeaderTitle, null, title), description && jsx(FormHeaderDescription, null, description), children && jsx(FormHeaderContent, null, children));
+  }, title), description && jsx(Box, {
+    xcss: formHeaderDescriptionStyles
+  }, description), children && jsx(Box, {
+    xcss: formHeaderContentStyles
+  }, children));
 };
-export default FormHeader;
-export { FormHeaderContent, FormHeaderDescription, FormHeaderTitle };
+export default FormHeader;

package/dist/esm/index.js

@@ -6,7 +6,7 @@ export { default as Field } from './field';
 export { default as CheckboxField } from './checkbox-field';
 export { default as RangeField } from './range-field';
 export { Label, Legend } from './label';
-export { HelperMessage, ErrorMessage, ValidMessage } from './messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from './messages';
 export { default as Fieldset } from './fieldset';
 export { default as RequiredAsterisk } from './required-asterisk';
 // eslint-disable-next-line import/no-unresolved

package/dist/esm/label.js

@@ -5,22 +5,14 @@
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { N200 } from '@atlaskit/theme/colors';
 var fieldsetLabelStyles = css({
   display: 'inline-block',
+  color: "var(--ds-text-subtle, #44546F)",
   font: "var(--ds-font-body-UNSAFE_small, normal 400 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-bold, 700)",
   marginBlockEnd: "var(--ds-space-050, 4px)",
   marginBlockStart: "var(--ds-space-0, 0px)"
 });
-var oldFieldsetLabelStyles = css({
-  color: "var(--ds-text-subtle, ".concat(N200, ")"),
-  fontWeight: "var(--ds-font-weight-semibold, 600)"
-});
-var newFieldsetLabelStyles = css({
-  color: "var(--ds-text-subtle, #44546F)",
-  fontWeight: "var(--ds-font-weight-bold, 700)"
-});
 
 /**
  * __Label__
@@ -36,9 +28,7 @@ export var Label = function Label(_ref) {
     id = _ref.id,
     testId = _ref.testId;
   return jsx("label", {
-    css: [fieldsetLabelStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    getBooleanFF('platform.design-system-team.form-label-typography-updates') ? newFieldsetLabelStyles : oldFieldsetLabelStyles],
+    css: fieldsetLabelStyles,
     id: id,
     htmlFor: htmlFor,
     "data-testid": testId
@@ -53,9 +43,7 @@ export var Label = function Label(_ref) {
 export var Legend = function Legend(_ref2) {
   var children = _ref2.children;
   return jsx("legend", {
-    css: [fieldsetLabelStyles,
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    getBooleanFF('platform.design-system-team.form-label-typography-updates') ? newFieldsetLabelStyles : oldFieldsetLabelStyles]
+    css: fieldsetLabelStyles
   }, children);
 };
 export default Label;

package/dist/esm/messages.js

@@ -1,8 +1,11 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
 
+import { createContext, useContext, useEffect, useRef, useState } from 'react';
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import SuccessIcon from '@atlaskit/icon/glyph/editor/success';
@@ -62,6 +65,18 @@ var Message = function Message(_ref2) {
     fieldId = _ref2.fieldId,
     testId = _ref2.testId;
   var icon = messageIcons[appearance];
+  var messageRef = useRef(null);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    hasMessageWrapper = _useState2[0],
+    setHasMessageWrapper = _useState2[1];
+  var _useContext = useContext(MessageWrapperContext),
+    isWrapper = _useContext.isWrapper;
+  useEffect(function () {
+    if (messageRef.current) {
+      setHasMessageWrapper(isWrapper);
+    }
+  }, [isWrapper]);
 
   /**
    * The wrapping span is necessary to preserve spaces between children.
@@ -76,7 +91,10 @@ var Message = function Message(_ref2) {
     css: [messageStyles, messageAppearanceStyles[appearance]],
     "data-testid": testId,
     id: fieldId,
-    "aria-live": "polite"
+    ref: messageRef
+    // For backwards compatability, if there is a wrapper, aria-live is not needed
+    ,
+    "aria-live": !hasMessageWrapper ? 'polite' : undefined
   }, icon && jsx(IconWrapper, null, icon), content);
 };
 
@@ -134,4 +152,36 @@ export var ValidMessage = function ValidMessage(_ref5) {
       testId: testId
     }, children);
   });
+};
+
+/**
+ * __Message wrapper context__
+ *
+ * A message wrapper context allows the children to check
+ * if it is contained within the MessageWrapper.
+ */
+export var MessageWrapperContext = /*#__PURE__*/createContext({
+  isWrapper: false
+});
+
+/**
+ * __Message wrapper __
+ *
+ * A message wrapper is used to allow assistive technologies, like screen readers, to announce error or
+ * valid messages. This must be loaded into the DOM before the
+ * ErrorMessage, ValidMessage is loaded. Otherwise, assistive technologies
+ * may not render the message.
+ *
+ */
+export var MessageWrapper = function MessageWrapper(_ref6) {
+  var children = _ref6.children;
+  var contextValue = {
+    isWrapper: true
+  };
+  return jsx(MessageWrapperContext.Provider, {
+    value: contextValue
+  }, jsx("div", {
+    "aria-live": "polite",
+    "data-testid": "message-wrapper"
+  }, children));
 };

package/dist/types/entry-points/messages.d.ts

@@ -1 +1 @@
-export { HelperMessage, ErrorMessage, ValidMessage } from '../messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from '../messages';

package/dist/types/form-header.d.ts

@@ -18,15 +18,6 @@ export interface FormHeaderProps {
      */
     children?: ReactNode;
 }
-declare const FormHeaderContent: ({ children }: {
-    children: ReactNode;
-}) => jsx.JSX.Element;
-declare const FormHeaderDescription: ({ children }: {
-    children: ReactNode;
-}) => jsx.JSX.Element;
-declare const FormHeaderTitle: ({ children }: {
-    children: ReactNode;
-}) => jsx.JSX.Element;
 /**
  * __Form header__.
  *
@@ -39,4 +30,3 @@ declare const FormHeaderTitle: ({ children }: {
  */
 declare const FormHeader: ({ children, description, title }: FormHeaderProps) => jsx.JSX.Element;
 export default FormHeader;
-export { FormHeaderContent, FormHeaderDescription, FormHeaderTitle };

package/dist/types/index.d.ts

@@ -11,7 +11,7 @@ export { default as RangeField } from './range-field';
 export type { RangeFieldProps } from './range-field';
 export { Label, Legend } from './label';
 export type { LabelProps, LegendProps } from './label';
-export { HelperMessage, ErrorMessage, ValidMessage } from './messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from './messages';
 export { default as Fieldset } from './fieldset';
 export { default as RequiredAsterisk } from './required-asterisk';
 export type { OnSubmitHandler, FormApi } from './types';

package/dist/types/messages.d.ts

@@ -53,4 +53,23 @@ export declare const ErrorMessage: ({ children, testId }: MessageProps) => jsx.J
  *
  */
 export declare const ValidMessage: ({ children, testId }: MessageProps) => jsx.JSX.Element;
+/**
+ * __Message wrapper context__
+ *
+ * A message wrapper context allows the children to check
+ * if it is contained within the MessageWrapper.
+ */
+export declare const MessageWrapperContext: import("react").Context<{
+    isWrapper: boolean;
+}>;
+/**
+ * __Message wrapper __
+ *
+ * A message wrapper is used to allow assistive technologies, like screen readers, to announce error or
+ * valid messages. This must be loaded into the DOM before the
+ * ErrorMessage, ValidMessage is loaded. Otherwise, assistive technologies
+ * may not render the message.
+ *
+ */
+export declare const MessageWrapper: ({ children }: MessageProps) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/entry-points/messages.d.ts

@@ -1 +1 @@
-export { HelperMessage, ErrorMessage, ValidMessage } from '../messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from '../messages';

package/dist/types-ts4.5/form-header.d.ts

@@ -18,15 +18,6 @@ export interface FormHeaderProps {
      */
     children?: ReactNode;
 }
-declare const FormHeaderContent: ({ children }: {
-    children: ReactNode;
-}) => jsx.JSX.Element;
-declare const FormHeaderDescription: ({ children }: {
-    children: ReactNode;
-}) => jsx.JSX.Element;
-declare const FormHeaderTitle: ({ children }: {
-    children: ReactNode;
-}) => jsx.JSX.Element;
 /**
  * __Form header__.
  *
@@ -39,4 +30,3 @@ declare const FormHeaderTitle: ({ children }: {
  */
 declare const FormHeader: ({ children, description, title }: FormHeaderProps) => jsx.JSX.Element;
 export default FormHeader;
-export { FormHeaderContent, FormHeaderDescription, FormHeaderTitle };

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

@@ -11,7 +11,7 @@ export { default as RangeField } from './range-field';
 export type { RangeFieldProps } from './range-field';
 export { Label, Legend } from './label';
 export type { LabelProps, LegendProps } from './label';
-export { HelperMessage, ErrorMessage, ValidMessage } from './messages';
+export { HelperMessage, ErrorMessage, MessageWrapper, ValidMessage } from './messages';
 export { default as Fieldset } from './fieldset';
 export { default as RequiredAsterisk } from './required-asterisk';
 export type { OnSubmitHandler, FormApi } from './types';

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

@@ -53,4 +53,23 @@ export declare const ErrorMessage: ({ children, testId }: MessageProps) => jsx.J
  *
  */
 export declare const ValidMessage: ({ children, testId }: MessageProps) => jsx.JSX.Element;
+/**
+ * __Message wrapper context__
+ *
+ * A message wrapper context allows the children to check
+ * if it is contained within the MessageWrapper.
+ */
+export declare const MessageWrapperContext: import("react").Context<{
+    isWrapper: boolean;
+}>;
+/**
+ * __Message wrapper __
+ *
+ * A message wrapper is used to allow assistive technologies, like screen readers, to announce error or
+ * valid messages. This must be loaded into the DOM before the
+ * ErrorMessage, ValidMessage is loaded. Otherwise, assistive technologies
+ * may not render the message.
+ *
+ */
+export declare const MessageWrapper: ({ children }: MessageProps) => jsx.JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/form",
-	"version": "10.5.1",
+	"version": "10.5.3",
 	"description": "A form allows users to input information.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,8 +29,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/heading": "^2.4.0",
-		"@atlaskit/icon": "^22.12.0",
-		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/icon": "^22.13.0",
 		"@atlaskit/primitives": "^12.0.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tokens": "^1.58.0",
@@ -50,7 +49,7 @@
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
 		"@atlaskit/banner": "^12.5.0",
-		"@atlaskit/button": "^19.2.0",
+		"@atlaskit/button": "^20.0.0",
 		"@atlaskit/checkbox": "^13.7.0",
 		"@atlaskit/ds-lib": "^2.4.0",
 		"@atlaskit/modal-dialog": "^12.15.0",
@@ -122,13 +121,5 @@
 		"./Label": "./src/entry-points/label.tsx",
 		".": "./src/index.tsx"
 	},
-	"homepage": "https://atlassian.design/components/form/",
-	"platform-feature-flags": {
-		"platform.design-system-team.form-header-typography-updates_4f1g6": {
-			"type": "boolean"
-		},
-		"platform.design-system-team.form-label-typography-updates": {
-			"type": "boolean"
-		}
-	}
+	"homepage": "https://atlassian.design/components/form/"
 }