@atlaskit/navigation-system 2.3.2 → 2.3.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlassian/navigation-system
 
+## 2.3.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.3.3
+
+### Patch Changes
+
+- [`5a4eb937344d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a4eb937344d9) -
+  Internal refactors to skip links. This was previously behind a feature flag, which is now removed.
+
 ## 2.3.2
 
 ### Patch Changes

package/dist/cjs/components/skip-links/skip-links-container.js

@@ -1,18 +1,23 @@
 /* skip-links-container.tsx generated by @compiled/babel-plugin v0.36.1 */
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SkipLinksContainer = SkipLinksContainer;
 require("./skip-links-container.compiled.css");
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
 var _runtime = require("@compiled/react/runtime");
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _compiled = require("@atlaskit/primitives/compiled");
-var _skipLinksDataContext = require("../../context/skip-links/skip-links-data-context");
 var _skipLink = require("./skip-link");
 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; }
 var styles = {
   root: "_zulp1b66 _2rko12b0 _1rjcutpp _18zrutpp _1e0c1txw _2lx21bp4 _kqsw1n9t _1e02v47k _152tv47k _bfhk1bhr _16qs1cd0 _1pby1mrw _tzy4idpf _lcxvglyw _1digjh3g _1mygkb7n _18eu1wug",
   skipLinkList: "_zulp1b66 _1e0c1txw _2lx21bp4 _1x8w11lx _2mzuglyw _1pfhze3t _bozgze3t"
@@ -39,6 +44,42 @@ var closeOnEscape = function closeOnEscape(event) {
     activeElement.blur();
   }
 };
+var _assignIndex = function assignIndex(num, arr) {
+  if (!arr.includes(num)) {
+    return num;
+  }
+  return _assignIndex(num + 1, arr);
+};
+
+/**
+ * Sorts an array of skip links by list indexes.
+ *
+ * Skip links with custom list indexes are positioned first, followed by regular skip links,
+ * which are automatically assigned available index positions to avoid conflicts.
+ */
+function sortSkipLinks(arr) {
+  var customLinks = arr.filter(function (link) {
+    return Number.isInteger(link.listIndex);
+  });
+  if (customLinks.length === 0) {
+    return arr;
+  }
+  var usedIndexes = customLinks.map(function (a) {
+    return a.listIndex;
+  });
+  var regularLinksWithIndex = arr.filter(function (link) {
+    return link.listIndex === undefined;
+  }).map(function (link, index) {
+    var listIndex = _assignIndex(index, usedIndexes);
+    usedIndexes.push(listIndex);
+    return _objectSpread(_objectSpread({}, link), {}, {
+      listIndex: listIndex
+    });
+  });
+  return [].concat((0, _toConsumableArray2.default)(customLinks), (0, _toConsumableArray2.default)(regularLinksWithIndex)).sort(function (a, b) {
+    return a.listIndex - b.listIndex;
+  });
+}
 var isOnlyWhitespaceRegex = /^\s*$/;
 
 /**
@@ -56,7 +97,9 @@ function SkipLinksContainer(_ref) {
   var label = _ref.label,
     testId = _ref.testId,
     links = _ref.links;
-  var sortedLinks = (0, _skipLinksDataContext.useSortedSkipLinks)(links);
+  var sortedLinks = (0, _react.useMemo)(function () {
+    return sortSkipLinks(links);
+  }, [links]);
   if (sortedLinks.length === 0) {
     return null;
   }

package/dist/cjs/context/skip-links/skip-links-provider.js

@@ -9,10 +9,8 @@ exports.SkipLinksProvider = SkipLinksProvider;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _skipLinksContainer = require("../../components/skip-links/skip-links-container");
 var _skipLinksContext = require("./skip-links-context");
-var _skipLinksDataContext = require("./skip-links-data-context");
 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); }
 var getByDomOrderSortFunction = function getByDomOrderSortFunction() {
   var layoutSlots = Array.from(document.querySelectorAll("[data-layout-slot]"));
@@ -42,7 +40,7 @@ var getByDomOrderSortFunction = function getByDomOrderSortFunction() {
  * Provider for skip links. Should be rendered at the top level of the application.
  *
  * - Provides the context to register/unregister skip links
- * - Renders the skip links container (when the feature flag 'platform_dst_nav4_skip_links_hydration_fix' is enabled)
+ * - Renders the skip links container
  */
 function SkipLinksProvider(_ref) {
   var children = _ref.children,
@@ -84,11 +82,9 @@ function SkipLinksProvider(_ref) {
   }, [registerSkipLink, unregisterSkipLink]);
   return /*#__PURE__*/_react.default.createElement(_skipLinksContext.SkipLinksContext.Provider, {
     value: contextValue
-  }, (0, _platformFeatureFlags.fg)('platform_dst_nav4_skip_links_hydration_fix') ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_skipLinksContainer.SkipLinksContainer, {
+  }, /*#__PURE__*/_react.default.createElement(_skipLinksContainer.SkipLinksContainer, {
     label: label,
     testId: testId,
     links: links
-  }), children) : /*#__PURE__*/_react.default.createElement(_skipLinksDataContext.SkipLinksDataContext.Provider, {
-    value: links
-  }, children));
+  }), children);
 }

package/dist/cjs/ui/page-layout/root.js

@@ -11,8 +11,6 @@ require("./root.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _openLayerObserver = require("@atlaskit/layering/experimental/open-layer-observer");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _skipLinksContainer = require("../../components/skip-links/skip-links-container");
 var _skipLinksProvider = require("../../context/skip-links/skip-links-provider");
 var _topNavStartContextProvider = require("../../context/top-nav-start/top-nav-start-context-provider");
 var _hoistSlotSizesContext = require("./hoist-slot-sizes-context");
@@ -57,16 +55,7 @@ function Root(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_skipLinksProvider.SkipLinksProvider, {
     label: skipLinksLabel,
     testId: testId
-  }, !(0, _platformFeatureFlags.fg)('platform_dst_nav4_skip_links_hydration_fix') &&
-  /*#__PURE__*/
-  // SkipLinksContainer is rendered directly inside SkipLinksProvider when the FG is enabled.
-  _react.default.createElement(_skipLinksContainer.SkipLinksContainer, {
-    label: skipLinksLabel,
-    testId: testId,
-    links:
-    // The links prop won't be used when the FG is disabled.
-    []
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     className: (0, _runtime.ax)([styles.root, xcss]),
     id: gridRootId,

package/dist/es2019/components/skip-links/skip-links-container.js

@@ -2,8 +2,8 @@
 import "./skip-links-container.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
+import { useMemo } from 'react';
 import { Text } from '@atlaskit/primitives/compiled';
-import { useSortedSkipLinks } from '../../context/skip-links/skip-links-data-context';
 import { SkipLink } from './skip-link';
 const styles = {
   root: "_zulp1b66 _2rko12b0 _1rjcutpp _18zrutpp _1e0c1txw _2lx21bp4 _kqsw1n9t _1e02v47k _152tv47k _bfhk1bhr _16qs1cd0 _1pby1mrw _tzy4idpf _lcxvglyw _1digjh3g _1mygkb7n _18eu1wug",
@@ -31,6 +31,35 @@ const closeOnEscape = event => {
     activeElement.blur();
   }
 };
+const assignIndex = (num, arr) => {
+  if (!arr.includes(num)) {
+    return num;
+  }
+  return assignIndex(num + 1, arr);
+};
+
+/**
+ * Sorts an array of skip links by list indexes.
+ *
+ * Skip links with custom list indexes are positioned first, followed by regular skip links,
+ * which are automatically assigned available index positions to avoid conflicts.
+ */
+function sortSkipLinks(arr) {
+  const customLinks = arr.filter(link => Number.isInteger(link.listIndex));
+  if (customLinks.length === 0) {
+    return arr;
+  }
+  const usedIndexes = customLinks.map(a => a.listIndex);
+  const regularLinksWithIndex = arr.filter(link => link.listIndex === undefined).map((link, index) => {
+    const listIndex = assignIndex(index, usedIndexes);
+    usedIndexes.push(listIndex);
+    return {
+      ...link,
+      listIndex
+    };
+  });
+  return [...customLinks, ...regularLinksWithIndex].sort((a, b) => a.listIndex - b.listIndex);
+}
 const isOnlyWhitespaceRegex = /^\s*$/;
 
 /**
@@ -49,7 +78,9 @@ export function SkipLinksContainer({
   testId,
   links
 }) {
-  const sortedLinks = useSortedSkipLinks(links);
+  const sortedLinks = useMemo(() => {
+    return sortSkipLinks(links);
+  }, [links]);
   if (sortedLinks.length === 0) {
     return null;
   }

package/dist/es2019/context/skip-links/skip-links-provider.js

@@ -1,8 +1,6 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SkipLinksContainer } from '../../components/skip-links/skip-links-container';
 import { SkipLinksContext } from './skip-links-context';
-import { SkipLinksDataContext } from './skip-links-data-context';
 const getByDomOrderSortFunction = () => {
   const layoutSlots = Array.from(document.querySelectorAll(`[data-layout-slot]`));
   return (a, b) => {
@@ -31,7 +29,7 @@ const getByDomOrderSortFunction = () => {
  * Provider for skip links. Should be rendered at the top level of the application.
  *
  * - Provides the context to register/unregister skip links
- * - Renders the skip links container (when the feature flag 'platform_dst_nav4_skip_links_hydration_fix' is enabled)
+ * - Renders the skip links container
  */
 export function SkipLinksProvider({
   children,
@@ -71,11 +69,9 @@ This error will not be shown in production, and the duplicate skip link will be
   }, [registerSkipLink, unregisterSkipLink]);
   return /*#__PURE__*/React.createElement(SkipLinksContext.Provider, {
     value: contextValue
-  }, fg('platform_dst_nav4_skip_links_hydration_fix') ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SkipLinksContainer, {
+  }, /*#__PURE__*/React.createElement(SkipLinksContainer, {
     label: label,
     testId: testId,
     links: links
-  }), children) : /*#__PURE__*/React.createElement(SkipLinksDataContext.Provider, {
-    value: links
-  }, children));
+  }), children);
 }

package/dist/es2019/ui/page-layout/root.js

@@ -3,8 +3,6 @@ import "./root.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useRef } from 'react';
 import { OpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { SkipLinksContainer } from '../../components/skip-links/skip-links-container';
 import { SkipLinksProvider } from '../../context/skip-links/skip-links-provider';
 import { TopNavStartProvider } from '../../context/top-nav-start/top-nav-start-context-provider';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
@@ -57,16 +55,7 @@ This message will not be displayed in production.
   }, /*#__PURE__*/React.createElement(SkipLinksProvider, {
     label: skipLinksLabel,
     testId: testId
-  }, !fg('platform_dst_nav4_skip_links_hydration_fix') &&
-  /*#__PURE__*/
-  // SkipLinksContainer is rendered directly inside SkipLinksProvider when the FG is enabled.
-  React.createElement(SkipLinksContainer, {
-    label: skipLinksLabel,
-    testId: testId,
-    links:
-    // The links prop won't be used when the FG is disabled.
-    []
-  }), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: ax([styles.root, xcss]),
     id: gridRootId,

package/dist/esm/components/skip-links/skip-links-container.js

@@ -1,9 +1,13 @@
 /* skip-links-container.tsx generated by @compiled/babel-plugin v0.36.1 */
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import "./skip-links-container.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 { useMemo } from 'react';
 import { Text } from '@atlaskit/primitives/compiled';
-import { useSortedSkipLinks } from '../../context/skip-links/skip-links-data-context';
 import { SkipLink } from './skip-link';
 var styles = {
   root: "_zulp1b66 _2rko12b0 _1rjcutpp _18zrutpp _1e0c1txw _2lx21bp4 _kqsw1n9t _1e02v47k _152tv47k _bfhk1bhr _16qs1cd0 _1pby1mrw _tzy4idpf _lcxvglyw _1digjh3g _1mygkb7n _18eu1wug",
@@ -31,6 +35,42 @@ var closeOnEscape = function closeOnEscape(event) {
     activeElement.blur();
   }
 };
+var _assignIndex = function assignIndex(num, arr) {
+  if (!arr.includes(num)) {
+    return num;
+  }
+  return _assignIndex(num + 1, arr);
+};
+
+/**
+ * Sorts an array of skip links by list indexes.
+ *
+ * Skip links with custom list indexes are positioned first, followed by regular skip links,
+ * which are automatically assigned available index positions to avoid conflicts.
+ */
+function sortSkipLinks(arr) {
+  var customLinks = arr.filter(function (link) {
+    return Number.isInteger(link.listIndex);
+  });
+  if (customLinks.length === 0) {
+    return arr;
+  }
+  var usedIndexes = customLinks.map(function (a) {
+    return a.listIndex;
+  });
+  var regularLinksWithIndex = arr.filter(function (link) {
+    return link.listIndex === undefined;
+  }).map(function (link, index) {
+    var listIndex = _assignIndex(index, usedIndexes);
+    usedIndexes.push(listIndex);
+    return _objectSpread(_objectSpread({}, link), {}, {
+      listIndex: listIndex
+    });
+  });
+  return [].concat(_toConsumableArray(customLinks), _toConsumableArray(regularLinksWithIndex)).sort(function (a, b) {
+    return a.listIndex - b.listIndex;
+  });
+}
 var isOnlyWhitespaceRegex = /^\s*$/;
 
 /**
@@ -48,7 +88,9 @@ export function SkipLinksContainer(_ref) {
   var label = _ref.label,
     testId = _ref.testId,
     links = _ref.links;
-  var sortedLinks = useSortedSkipLinks(links);
+  var sortedLinks = useMemo(function () {
+    return sortSkipLinks(links);
+  }, [links]);
   if (sortedLinks.length === 0) {
     return null;
   }

package/dist/esm/context/skip-links/skip-links-provider.js

@@ -1,10 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useMemo, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SkipLinksContainer } from '../../components/skip-links/skip-links-container';
 import { SkipLinksContext } from './skip-links-context';
-import { SkipLinksDataContext } from './skip-links-data-context';
 var getByDomOrderSortFunction = function getByDomOrderSortFunction() {
   var layoutSlots = Array.from(document.querySelectorAll("[data-layout-slot]"));
   return function (a, b) {
@@ -33,7 +31,7 @@ var getByDomOrderSortFunction = function getByDomOrderSortFunction() {
  * Provider for skip links. Should be rendered at the top level of the application.
  *
  * - Provides the context to register/unregister skip links
- * - Renders the skip links container (when the feature flag 'platform_dst_nav4_skip_links_hydration_fix' is enabled)
+ * - Renders the skip links container
  */
 export function SkipLinksProvider(_ref) {
   var children = _ref.children,
@@ -75,11 +73,9 @@ export function SkipLinksProvider(_ref) {
   }, [registerSkipLink, unregisterSkipLink]);
   return /*#__PURE__*/React.createElement(SkipLinksContext.Provider, {
     value: contextValue
-  }, fg('platform_dst_nav4_skip_links_hydration_fix') ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SkipLinksContainer, {
+  }, /*#__PURE__*/React.createElement(SkipLinksContainer, {
     label: label,
     testId: testId,
     links: links
-  }), children) : /*#__PURE__*/React.createElement(SkipLinksDataContext.Provider, {
-    value: links
-  }, children));
+  }), children);
 }

package/dist/esm/ui/page-layout/root.js

@@ -3,8 +3,6 @@ import "./root.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useEffect, useRef } from 'react';
 import { OpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { SkipLinksContainer } from '../../components/skip-links/skip-links-container';
 import { SkipLinksProvider } from '../../context/skip-links/skip-links-provider';
 import { TopNavStartProvider } from '../../context/top-nav-start/top-nav-start-context-provider';
 import { DangerouslyHoistSlotSizes } from './hoist-slot-sizes-context';
@@ -49,16 +47,7 @@ export function Root(_ref) {
   }, /*#__PURE__*/React.createElement(SkipLinksProvider, {
     label: skipLinksLabel,
     testId: testId
-  }, !fg('platform_dst_nav4_skip_links_hydration_fix') &&
-  /*#__PURE__*/
-  // SkipLinksContainer is rendered directly inside SkipLinksProvider when the FG is enabled.
-  React.createElement(SkipLinksContainer, {
-    label: skipLinksLabel,
-    testId: testId,
-    links:
-    // The links prop won't be used when the FG is disabled.
-    []
-  }), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: ax([styles.root, xcss]),
     id: gridRootId,

package/dist/types/context/skip-links/skip-links-provider.d.ts

@@ -3,7 +3,7 @@ import React, { type ReactNode } from 'react';
  * Provider for skip links. Should be rendered at the top level of the application.
  *
  * - Provides the context to register/unregister skip links
- * - Renders the skip links container (when the feature flag 'platform_dst_nav4_skip_links_hydration_fix' is enabled)
+ * - Renders the skip links container
  */
 export declare function SkipLinksProvider({ children, label, testId, }: {
     children: ReactNode;

package/dist/types-ts4.5/context/skip-links/skip-links-provider.d.ts

@@ -3,7 +3,7 @@ import React, { type ReactNode } from 'react';
  * Provider for skip links. Should be rendered at the top level of the application.
  *
  * - Provides the context to register/unregister skip links
- * - Renders the skip links container (when the feature flag 'platform_dst_nav4_skip_links_hydration_fix' is enabled)
+ * - Renders the skip links container
  */
 export declare function SkipLinksProvider({ children, label, testId, }: {
     children: ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/navigation-system",
-	"version": "2.3.2",
+	"version": "2.3.4",
 	"description": "The latest navigation system for Atlassian apps.",
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"author": "Atlassian Pty Ltd",
@@ -69,7 +69,7 @@
 		"@atlaskit/analytics-next": "^11.1.0",
 		"@atlaskit/avatar": "^25.1.0",
 		"@atlaskit/button": "^23.4.0",
-		"@atlaskit/css": "^0.13.0",
+		"@atlaskit/css": "^0.14.0",
 		"@atlaskit/ds-lib": "^5.0.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/layering": "^3.0.0",
@@ -79,8 +79,8 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^14.13.0",
-		"@atlaskit/tokens": "^6.2.0",
+		"@atlaskit/primitives": "^14.14.0",
+		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -101,7 +101,7 @@
 		"@atlaskit/banner": "^14.0.0",
 		"@atlaskit/breadcrumbs": "^15.3.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
-		"@atlaskit/form": "^12.4.0",
+		"@atlaskit/form": "^12.5.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/lozenge": "^13.0.0",
@@ -173,9 +173,6 @@
 		"platform_dst_nav4_flyout_use_capture_outside": {
 			"type": "boolean"
 		},
-		"platform_dst_nav4_skip_links_hydration_fix": {
-			"type": "boolean"
-		},
 		"platform_dst_nav4_actionsonhover_focus_fix": {
 			"type": "boolean"
 		},

package/dist/cjs/context/skip-links/skip-links-data-context.js

@@ -1,69 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortSkipLinks = exports.SkipLinksDataContext = void 0;
-exports.useSortedSkipLinks = useSortedSkipLinks;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-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; }
-/**
- * Provides a way to store skip links
- *
- * Note: This will be cleaned up with fg('platform_dst_nav4_skip_links_hydration_fix')
- */
-var SkipLinksDataContext = exports.SkipLinksDataContext = /*#__PURE__*/(0, _react.createContext)([]);
-var _assignIndex = function assignIndex(num, arr) {
-  if (!arr.includes(num)) {
-    return num;
-  }
-  return _assignIndex(num + 1, arr);
-};
-
-/**
- * Sorts an array of skip links by list indexes.
- *
- * Skip links with custom list indexes are positioned first, followed by regular skip links,
- * which are automatically assigned available index positions to avoid conflicts.
- */
-var sortSkipLinks = exports.sortSkipLinks = function sortSkipLinks(arr) {
-  var customLinks = arr.filter(function (link) {
-    return Number.isInteger(link.listIndex);
-  });
-  if (customLinks.length === 0) {
-    return arr;
-  }
-  var usedIndexes = customLinks.map(function (a) {
-    return a.listIndex;
-  });
-  var regularLinksWithIndex = arr.filter(function (link) {
-    return link.listIndex === undefined;
-  }).map(function (link, index) {
-    var listIndex = _assignIndex(index, usedIndexes);
-    usedIndexes.push(listIndex);
-    return _objectSpread(_objectSpread({}, link), {}, {
-      listIndex: listIndex
-    });
-  });
-  return [].concat((0, _toConsumableArray2.default)(customLinks), (0, _toConsumableArray2.default)(regularLinksWithIndex)).sort(function (a, b) {
-    return a.listIndex - b.listIndex;
-  });
-};
-
-/**
- * Returns memoized and sorted skip links.
- *
- * TODO: when cleaning up fg('platform_dst_nav4_skip_links_hydration_fix'), we can inline this inside `SkipLinksContainer`.
- */
-function useSortedSkipLinks(providedLinks) {
-  var skipLinksData = (0, _react.useContext)(SkipLinksDataContext);
-  var links = (0, _platformFeatureFlags.fg)('platform_dst_nav4_skip_links_hydration_fix') ? providedLinks : skipLinksData;
-  return (0, _react.useMemo)(function () {
-    return sortSkipLinks(links);
-  }, [links]);
-}

package/dist/es2019/context/skip-links/skip-links-data-context.js

@@ -1,50 +0,0 @@
-import { createContext, useContext, useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-/**
- * Provides a way to store skip links
- *
- * Note: This will be cleaned up with fg('platform_dst_nav4_skip_links_hydration_fix')
- */
-export const SkipLinksDataContext = /*#__PURE__*/createContext([]);
-const assignIndex = (num, arr) => {
-  if (!arr.includes(num)) {
-    return num;
-  }
-  return assignIndex(num + 1, arr);
-};
-
-/**
- * Sorts an array of skip links by list indexes.
- *
- * Skip links with custom list indexes are positioned first, followed by regular skip links,
- * which are automatically assigned available index positions to avoid conflicts.
- */
-export const sortSkipLinks = arr => {
-  const customLinks = arr.filter(link => Number.isInteger(link.listIndex));
-  if (customLinks.length === 0) {
-    return arr;
-  }
-  const usedIndexes = customLinks.map(a => a.listIndex);
-  const regularLinksWithIndex = arr.filter(link => link.listIndex === undefined).map((link, index) => {
-    const listIndex = assignIndex(index, usedIndexes);
-    usedIndexes.push(listIndex);
-    return {
-      ...link,
-      listIndex
-    };
-  });
-  return [...customLinks, ...regularLinksWithIndex].sort((a, b) => a.listIndex - b.listIndex);
-};
-
-/**
- * Returns memoized and sorted skip links.
- *
- * TODO: when cleaning up fg('platform_dst_nav4_skip_links_hydration_fix'), we can inline this inside `SkipLinksContainer`.
- */
-export function useSortedSkipLinks(providedLinks) {
-  const skipLinksData = useContext(SkipLinksDataContext);
-  const links = fg('platform_dst_nav4_skip_links_hydration_fix') ? providedLinks : skipLinksData;
-  return useMemo(() => {
-    return sortSkipLinks(links);
-  }, [links]);
-}

package/dist/esm/context/skip-links/skip-links-data-context.js

@@ -1,61 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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 { createContext, useContext, useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-/**
- * Provides a way to store skip links
- *
- * Note: This will be cleaned up with fg('platform_dst_nav4_skip_links_hydration_fix')
- */
-export var SkipLinksDataContext = /*#__PURE__*/createContext([]);
-var _assignIndex = function assignIndex(num, arr) {
-  if (!arr.includes(num)) {
-    return num;
-  }
-  return _assignIndex(num + 1, arr);
-};
-
-/**
- * Sorts an array of skip links by list indexes.
- *
- * Skip links with custom list indexes are positioned first, followed by regular skip links,
- * which are automatically assigned available index positions to avoid conflicts.
- */
-export var sortSkipLinks = function sortSkipLinks(arr) {
-  var customLinks = arr.filter(function (link) {
-    return Number.isInteger(link.listIndex);
-  });
-  if (customLinks.length === 0) {
-    return arr;
-  }
-  var usedIndexes = customLinks.map(function (a) {
-    return a.listIndex;
-  });
-  var regularLinksWithIndex = arr.filter(function (link) {
-    return link.listIndex === undefined;
-  }).map(function (link, index) {
-    var listIndex = _assignIndex(index, usedIndexes);
-    usedIndexes.push(listIndex);
-    return _objectSpread(_objectSpread({}, link), {}, {
-      listIndex: listIndex
-    });
-  });
-  return [].concat(_toConsumableArray(customLinks), _toConsumableArray(regularLinksWithIndex)).sort(function (a, b) {
-    return a.listIndex - b.listIndex;
-  });
-};
-
-/**
- * Returns memoized and sorted skip links.
- *
- * TODO: when cleaning up fg('platform_dst_nav4_skip_links_hydration_fix'), we can inline this inside `SkipLinksContainer`.
- */
-export function useSortedSkipLinks(providedLinks) {
-  var skipLinksData = useContext(SkipLinksDataContext);
-  var links = fg('platform_dst_nav4_skip_links_hydration_fix') ? providedLinks : skipLinksData;
-  return useMemo(function () {
-    return sortSkipLinks(links);
-  }, [links]);
-}

package/dist/types/context/skip-links/skip-links-data-context.d.ts

@@ -1,20 +0,0 @@
-import { type SkipLinkData } from './types';
-/**
- * Provides a way to store skip links
- *
- * Note: This will be cleaned up with fg('platform_dst_nav4_skip_links_hydration_fix')
- */
-export declare const SkipLinksDataContext: import("react").Context<SkipLinkData[]>;
-/**
- * Sorts an array of skip links by list indexes.
- *
- * Skip links with custom list indexes are positioned first, followed by regular skip links,
- * which are automatically assigned available index positions to avoid conflicts.
- */
-export declare const sortSkipLinks: (arr: SkipLinkData[]) => SkipLinkData[];
-/**
- * Returns memoized and sorted skip links.
- *
- * TODO: when cleaning up fg('platform_dst_nav4_skip_links_hydration_fix'), we can inline this inside `SkipLinksContainer`.
- */
-export declare function useSortedSkipLinks(providedLinks: Array<SkipLinkData>): Array<SkipLinkData>;

package/dist/types-ts4.5/context/skip-links/skip-links-data-context.d.ts

@@ -1,20 +0,0 @@
-import { type SkipLinkData } from './types';
-/**
- * Provides a way to store skip links
- *
- * Note: This will be cleaned up with fg('platform_dst_nav4_skip_links_hydration_fix')
- */
-export declare const SkipLinksDataContext: import("react").Context<SkipLinkData[]>;
-/**
- * Sorts an array of skip links by list indexes.
- *
- * Skip links with custom list indexes are positioned first, followed by regular skip links,
- * which are automatically assigned available index positions to avoid conflicts.
- */
-export declare const sortSkipLinks: (arr: SkipLinkData[]) => SkipLinkData[];
-/**
- * Returns memoized and sorted skip links.
- *
- * TODO: when cleaning up fg('platform_dst_nav4_skip_links_hydration_fix'), we can inline this inside `SkipLinksContainer`.
- */
-export declare function useSortedSkipLinks(providedLinks: Array<SkipLinkData>): Array<SkipLinkData>;