@atlaskit/jql-editor 5.13.6 → 5.14.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/jql-editor
 
+## 5.14.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.14.0
+
+### Minor Changes
+
+- [`2ce9dcaba3539`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2ce9dcaba3539) -
+  [ux] Normalise hydration key so that lozenge data is refreshed in JQL editor
+
+### Patch Changes
+
+- [`ce16754d5db01`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ce16754d5db01) -
+  Internal changes to remove unnecessary token fallbacks and imports from `@atlaskit/theme`
+
 ## 5.13.6
 
 ### Patch Changes

package/dist/cjs/analytics/util.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 exports.useJqlEditorAnalytics = void 0;
 var _jqlEditorCommon = require("@atlaskit/jql-editor-common");
 var useJqlEditorAnalytics = exports.useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
-  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "0.0.0-development", _jqlEditorCommon.ANALYTICS_CHANNEL);
+  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "5.14.0", _jqlEditorCommon.ANALYTICS_CHANNEL);
 };

package/dist/cjs/async.js

@@ -13,7 +13,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _errorBoundary = require("./ui/error-boundary");
 var _intlProvider = require("./ui/intl-provider");
 var _jqlEditorLayout = require("./ui/jql-editor-layout");
-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" != (0, _typeof2.default)(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 _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" != (0, _typeof2.default)(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); } // oxlint-disable-next-line @atlassian/no-restricted-imports
 var JQLEditor = (0, _reactLooselyLazy.lazyForPaint)(function () {
   return Promise.resolve().then(function () {
     return _interopRequireWildcard(require( /* webpackChunkName: "async-jql-editor" */'./ui/jql-editor'));

package/dist/cjs/plugins/autocomplete/components/autocomplete-dropdown/styled.js

@@ -6,19 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.OptionList = exports.AutocompleteOptionsContainer = exports.AutocompleteLoadingFooter = exports.AutocompleteContainer = void 0;
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var AutocompleteContainer = exports.AutocompleteContainer = _styled.default.div({
   position: 'absolute',
-  backgroundColor: "var(--ds-surface-overlay, white)",
+  backgroundColor: "var(--ds-surface-overlay, #FFFFFF)",
   borderRadius: "var(--ds-radius-small, 3px)",
   willChange: 'top, left',
   zIndex: _constants.layers.dialog(),
-  boxShadow: "var(--ds-shadow-overlay, ".concat("0 4px 8px -2px ".concat(_colors.N50A, ", 0 0 1px ").concat(_colors.N60A), ")"),
-  padding: "var(--ds-space-075, 6px)".concat(" ", "var(--ds-space-0, 0)"),
+  boxShadow: "var(--ds-shadow-overlay, 0px 8px 12px #1E1F2126, 0px 0px 1px #1E1F214f)",
+  padding: "var(--ds-space-075, 6px)".concat(" ", "var(--ds-space-0, 0px)"),
   minWidth: '200px',
   maxWidth: '400px',
   '&:focus': {
@@ -53,15 +52,15 @@ var AutocompleteOptionsContainer = exports.AutocompleteOptionsContainer = _style
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var OptionList = exports.OptionList = _styled.default.ul({
   listStyle: 'none',
-  margin: "var(--ds-space-0, 0)",
-  padding: "var(--ds-space-0, 0)"
+  margin: "var(--ds-space-0, 0px)",
+  padding: "var(--ds-space-0, 0px)"
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var AutocompleteLoadingFooter = exports.AutocompleteLoadingFooter = _styled.default.div({
   display: 'flex',
   justifyContent: 'center',
-  color: "var(--ds-text-subtlest, ".concat(_colors.N200, ")"),
+  color: "var(--ds-text-subtlest, #6B6E76)",
   fontStyle: 'italic',
   padding: "var(--ds-space-150, 12px)",
   textAlign: 'center'
@@ -70,7 +69,7 @@ var AutocompleteLoadingFooter = exports.AutocompleteLoadingFooter = _styled.defa
 function (_ref3) {
   var hasOptions = _ref3.hasOptions;
   return hasOptions && {
-    borderTop: "solid 1px ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
+    borderTop: "solid ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border, #0B120E24)"),
     marginTop: "var(--ds-space-075, 6px)",
     paddingTop: "var(--ds-space-250, 20px)"
   };

package/dist/cjs/plugins/autocomplete/components/autocomplete-option/index.js

@@ -24,7 +24,6 @@ var _tag = _interopRequireDefault(require("@atlaskit/icon/core/tag"));
 var _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
 var _text = _interopRequireDefault(require("@atlaskit/icon/core/text"));
 var _jqlAst = require("@atlaskit/jql-ast");
-var _colors = require("@atlaskit/theme/colors");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _state = require("../../../../state");
 var _messages = require("./messages");
@@ -172,7 +171,7 @@ var AutocompleteOption = /*#__PURE__*/(0, _react.forwardRef)(function (props, re
     spacing: "spacious",
     testId: "jql-editor-deprecated-icon",
     label: "",
-    color: "var(--ds-icon, ".concat(_colors.N400, ")")
+    color: "var(--ds-icon, #292A2E)"
   }))) : optionName, fieldType && /*#__PURE__*/_react.default.createElement(_styled.FieldType, null, fieldTypeIcon && /*#__PURE__*/_react.default.createElement(_styled.FieldTypeIcon, null, fieldTypeIcon), fieldType));
   var tooltipContent = /*#__PURE__*/_react.default.createElement(_styled.TooltipContent, null, name);
   if (overflows) {

package/dist/cjs/plugins/autocomplete/components/autocomplete-option/styled.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TooltipContent = exports.OptionName = exports.OptionListItem = exports.OptionHighlight = exports.FieldTypeIcon = exports.FieldType = exports.DeprecatedOptionContainer = void 0;
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _colors = require("@atlaskit/theme/colors");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
@@ -26,7 +25,7 @@ var OptionListItem = exports.OptionListItem = _styled.default.li({
 function (_ref) {
   var isSelected = _ref.isSelected;
   return isSelected && {
-    background: "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N20, ")")
+    background: "var(--ds-background-neutral-subtle-hovered, #0515240F)"
   };
 },
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
@@ -34,13 +33,13 @@ function (_ref2) {
   var isDeprecated = _ref2.isDeprecated;
   return isDeprecated && {
     cursor: 'default',
-    color: "var(--ds-text-disabled, ".concat(_colors.N50, ")")
+    color: "var(--ds-text-disabled, #080F214A)"
   };
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var OptionName = exports.OptionName = _styled.default.div({
-  color: "var(--ds-text, ".concat(_colors.N800, ")"),
+  color: "var(--ds-text, #292A2E)",
   overflow: 'hidden',
   whiteSpace: 'nowrap',
   textOverflow: 'ellipsis',
@@ -50,7 +49,7 @@ var OptionName = exports.OptionName = _styled.default.div({
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var DeprecatedOptionContainer = exports.DeprecatedOptionContainer = _styled.default.div({
-  color: "var(--ds-text-disabled, ".concat(_colors.N50, ")"),
+  color: "var(--ds-text-disabled, #080F214A)",
   display: 'flex',
   justifyContent: 'space-between',
   opacity: 0.6
@@ -66,7 +65,7 @@ var FieldType = exports.FieldType = _styled.default.div({
   display: 'flex',
   alignItems: 'center',
   marginTop: "var(--ds-space-negative-025, -2px)",
-  color: "var(--ds-text-subtlest, ".concat(_colors.N100, ")")
+  color: "var(--ds-text-subtlest, #6B6E76)"
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766

package/dist/cjs/plugins/rich-inline-nodes/nodes/team/styled.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.TeamContainer = exports.NameContainer = exports.AvatarWrapper = void 0;
 var _react = require("@emotion/react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _colors = require("@atlaskit/theme/colors");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -29,42 +28,42 @@ function (_ref) {
     if (error) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text-inverse, ".concat(_colors.N0, ")"),
-        backgroundColor: "var(--ds-background-danger-bold, ".concat(_colors.R400, ")"),
+        color: "var(--ds-text-inverse, #FFFFFF)",
+        backgroundColor: "var(--ds-background-danger-bold, #C9372C)",
         textDecoration: 'wavy underline',
         textDecorationThickness: '1px',
         textDecorationSkipInk: 'none',
-        textDecorationColor: "var(--ds-text-inverse, ".concat(_colors.N0, ")")
+        textDecorationColor: "var(--ds-text-inverse, #FFFFFF)"
       });
     } else {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text, ".concat(_colors.N0, ")"),
-        backgroundColor: "var(--ds-background-selected, ".concat(_colors.N500, ")"),
-        boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, transparent)")
+        color: "var(--ds-text, #292A2E)",
+        backgroundColor: "var(--ds-background-selected, #E9F2FE)",
+        boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)")
       });
     }
   } else {
     if (error) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text-subtle, ".concat(_colors.N500, ")"),
-        backgroundColor: "var(--ds-background-neutral, ".concat(_colors.N40, ")"),
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
         textDecoration: 'wavy underline',
         textDecorationThickness: '1px',
         textDecorationSkipInk: 'none',
-        textDecorationColor: "var(--ds-text-danger, ".concat(_colors.R400, ")"),
+        textDecorationColor: "var(--ds-text-danger, #AE2E24)",
         '&:hover': {
-          backgroundColor: "var(--ds-background-neutral-hovered, ".concat(_colors.N50, ")")
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
         }
       });
     } else {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text-subtle, ".concat(_colors.N500, ")"),
-        backgroundColor: "var(--ds-background-neutral, ".concat(_colors.N40, ")"),
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
         '&:hover': {
-          backgroundColor: "var(--ds-background-neutral-hovered, ".concat(_colors.N50, ")")
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
         }
       });
     }

package/dist/cjs/plugins/rich-inline-nodes/nodes/user/styled.js

@@ -8,7 +8,6 @@ exports.UserContainer = exports.NameContainer = exports.AvatarWrapper = void 0;
 var _react = require("@emotion/react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _colors = require("@atlaskit/theme/colors");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -30,42 +29,42 @@ function (_ref) {
     if (error) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text-inverse, ".concat(_colors.N0, ")"),
-        backgroundColor: "var(--ds-background-danger-bold, ".concat(_colors.R400, ")"),
+        color: "var(--ds-text-inverse, #FFFFFF)",
+        backgroundColor: "var(--ds-background-danger-bold, #C9372C)",
         textDecoration: 'wavy underline',
         textDecorationThickness: '1px',
         textDecorationSkipInk: 'none',
-        textDecorationColor: "var(--ds-text-inverse, ".concat(_colors.N0, ")")
+        textDecorationColor: "var(--ds-text-inverse, #FFFFFF)"
       });
     } else {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text, ".concat(_colors.N0, ")"),
-        backgroundColor: "var(--ds-background-selected, ".concat(_colors.N500, ")"),
-        boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, transparent)")
+        color: "var(--ds-text, #292A2E)",
+        backgroundColor: "var(--ds-background-selected, #E9F2FE)",
+        boxShadow: "0 0 0 1px ".concat("var(--ds-border-selected, #1868DB)")
       });
     }
   } else {
     if (error) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text-subtle, ".concat(_colors.N500, ")"),
-        backgroundColor: "var(--ds-background-neutral, ".concat(_colors.N40, ")"),
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
         textDecoration: 'wavy underline',
         textDecorationThickness: '1px',
         textDecorationSkipInk: 'none',
-        textDecorationColor: "var(--ds-text-danger, ".concat(_colors.R400, ")"),
+        textDecorationColor: "var(--ds-text-danger, #AE2E24)",
         '&:hover': {
-          backgroundColor: "var(--ds-background-neutral-hovered, ".concat(_colors.N50, ")")
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
         }
       });
     } else {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return (0, _react.css)({
-        color: "var(--ds-text-subtle, ".concat(_colors.N500, ")"),
-        backgroundColor: "var(--ds-background-neutral, ".concat(_colors.N40, ")"),
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
         '&:hover': {
-          backgroundColor: "var(--ds-background-neutral-hovered, ".concat(_colors.N50, ")")
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
         }
       });
     }

package/dist/cjs/state/hydration/index.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _jqlAst = require("../../plugins/jql-ast");
 var _replaceNodesTransaction = require("../../plugins/rich-inline-nodes/util/replace-nodes-transaction");
 var _index = require("../index");
@@ -49,15 +50,21 @@ var hydrateQuery = exports.hydrateQuery = function hydrateQuery() {
             return onHydrate(queryToHydrate);
           case 13:
             newHydratedValues = _context.sent;
+            // IMPORTANT: Field name keys must be normalised (unquoted + lowercased) when storing hydrated values.
+            // The hydration API returns field names in a canonical format (e.g. 'Project[AtlassianProject]'),
+            // but lookup keys from ProseMirror node attributes may differ in quoting and casing
+            // (e.g. '"project[atlassianproject]"'). normaliseHydrationKey ensures both storage and lookup use
+            // the same key format. See normaliseHydrationKey in ./util.ts.
             hydratedValuesMap = Object.entries(newHydratedValues).reduce(function (map, _ref4) {
               var _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
                 fieldName = _ref5[0],
                 values = _ref5[1];
-              var valueMap = new Map(oldHydratedValues[fieldName]);
+              var fieldNameToUse = (0, _platformFeatureFlags.fg)('projects_in_jira_eap_drop2') ? (0, _util.normaliseHydrationKey)(fieldName) : fieldName;
+              var valueMap = new Map(oldHydratedValues[fieldNameToUse]);
               values.forEach(function (value) {
                 valueMap.set(value.id, value);
               });
-              return _objectSpread(_objectSpread({}, map), {}, (0, _defineProperty2.default)({}, fieldName, valueMap));
+              return _objectSpread(_objectSpread({}, map), {}, (0, _defineProperty2.default)({}, fieldNameToUse, valueMap));
             }, {});
             setState({
               hydratedValues: hydratedValuesMap

package/dist/cjs/state/hydration/util.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ValidQueryVisitor = void 0;
+exports.normaliseHydrationKey = exports.ValidQueryVisitor = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -15,6 +15,15 @@ var _jqlAst = require("@atlaskit/jql-ast");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+/**
+ * Normalise a JQL string for use as a hydration map key.
+ * Strips quotes/escaping and lowercases to ensure case-insensitive matching
+ * between field names from different sources (e.g. AST vs hydration API).
+ */
+var normaliseHydrationKey = exports.normaliseHydrationKey = function normaliseHydrationKey(key) {
+  return (0, _jqlAst.normaliseJqlString)(key).toLowerCase();
+};
+
 /**
  * Given an AST with parse errors, this visitor returns a valid query that is equivalent for hydration purposes
  * (i.e. just fields, operators and values). Resulting query is generated on a best-effort basis and depends on

package/dist/cjs/state/index.js

@@ -18,6 +18,7 @@ var _uuid = require("uuid");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _jqlAst = require("@atlaskit/jql-ast");
 var _jqlAutocomplete = require("@atlaskit/jql-autocomplete");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _selectErrorCommand = require("../commands/select-error-command");
 var _constants = require("../common/constants");
@@ -28,7 +29,8 @@ var _documentText = require("../utils/document-text");
 var _analytics2 = require("./analytics");
 var _autocomplete = require("./autocomplete");
 var _hydration = require("./hydration");
-var _util = require("./util");
+var _util = require("./hydration/util");
+var _util2 = require("./util");
 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var initialIntl = (0, _reactIntlNext.createIntl)({
@@ -219,10 +221,10 @@ var actions = exports.actions = {
       setState({
         autocomplete: _objectSpread(_objectSpread(_objectSpread({}, autocomplete), {}, {
           options: _objectSpread(_objectSpread({}, defaultAutocompleteOptions), {}, {
-            tokens: (0, _util.tokensToAutocompleteOptions)(suggestions.tokens)
+            tokens: (0, _util2.tokensToAutocompleteOptions)(suggestions.tokens)
           })
         }, editorView && {
-          replacePositionStart: (0, _util.getReplacePositionStart)(suggestions)
+          replacePositionStart: (0, _util2.getReplacePositionStart)(suggestions)
         }), {}, {
           // Update autocomplete visibility in the same update as initial options to avoid visible layout shifts
           shouldStayClosed: shouldStayClosedOnNextUpdate
@@ -246,7 +248,7 @@ var actions = exports.actions = {
             matchedText: matchedText,
             replacePosition: replacePosition,
             type: type,
-            id: (0, _util.getAutocompleteOptionId)(option.value)
+            id: (0, _util2.getAutocompleteOptionId)(option.value)
           });
         });
         var _getState3 = getState(),
@@ -464,7 +466,7 @@ var actions = exports.actions = {
         // race condition where the transaction is applied to the editor state but the editor state is being updated in another transaction.
         if (error instanceof RangeError && editorView) {
           var message = "Error occurred trying to update editor state with the message: ".concat(error.message);
-          (0, _util.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, {
+          (0, _util2.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, {
             stack: error.stack,
             transaction: JSON.stringify(transaction)
           });
@@ -581,7 +583,7 @@ var actions = exports.actions = {
             }
             return result;
           }, {});
-          (0, _util.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, _objectSpread({
+          (0, _util2.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, _objectSpread({
             stack: error instanceof Error ? error.stack : ''
           }, attributeDiff));
         }
@@ -694,7 +696,7 @@ var actions = exports.actions = {
         // our client side validation. Let's monitor any errors we weren't expecting.
         if (editorView && !hasClientError && attributes.syntaxErrorCount > 0) {
           var message = 'External JQL syntax error is shown without a client error.';
-          (0, _util.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, {
+          (0, _util2.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, {
             syntaxErrorTypes: attributes.syntaxErrorTypes.join(',')
           });
         }
@@ -859,7 +861,7 @@ var useAutocompletePosition = exports.useAutocompletePosition = (0, _reactSweetS
     var docTop;
     var docLeft;
     try {
-      var autocompletePosition = (0, _util.getAutocompletePosition)(editorView, replacePositionStart);
+      var autocompletePosition = (0, _util2.getAutocompletePosition)(editorView, replacePositionStart);
       docTop = autocompletePosition.top;
       docLeft = autocompletePosition.left;
     } catch (error) {
@@ -868,7 +870,7 @@ var useAutocompletePosition = exports.useAutocompletePosition = (0, _reactSweetS
       // seems to be some type of race condition whether the view is being updated with a mismatched selection in the
       // UI. We'll catch the error so the UI doesn't break and fire a callback to debug the error.
       var message = "Error occurred trying to get autocomplete position with the message: ".concat(error instanceof Error ? error.message : String(error));
-      (0, _util.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, {
+      (0, _util2.sendDebugMessage)(message, editorView, editorState, onDebugUnsafeMessage, {
         stack: error instanceof Error ? error.stack : ''
       });
 
@@ -892,51 +894,60 @@ var useAutocompletePosition = exports.useAutocompletePosition = (0, _reactSweetS
     };
   }
 });
+
+// IMPORTANT: All hydration lookup hooks below must normalise fieldName using normaliseHydrationKey.
+// This ensures consistent matching regardless of quoting or casing differences between the hydration API
+// response (storage) and ProseMirror node attributes (lookup). Both sides must use the same normalisation.
+// See normaliseHydrationKey in ./hydration/util.ts for details.
 var useHydratedValue = exports.useHydratedValue = (0, _reactSweetState.createHook)(Store, {
   selector: function selector(state, _ref38) {
-    var _state$hydratedValues;
+    var _state$hydratedValues2;
     var id = _ref38.id,
       fieldName = _ref38.fieldName;
-    return (_state$hydratedValues = state.hydratedValues[fieldName]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get(id);
+    if ((0, _platformFeatureFlags.fg)('projects_in_jira_eap_drop2')) {
+      var _state$hydratedValues;
+      return (_state$hydratedValues = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get((0, _jqlAst.normaliseJqlString)(id));
+    }
+    return (_state$hydratedValues2 = state.hydratedValues[fieldName]) === null || _state$hydratedValues2 === void 0 ? void 0 : _state$hydratedValues2.get(id);
   }
 });
 var useHydratedUser = exports.useHydratedUser = (0, _reactSweetState.createHook)(Store, {
   selector: function selector(state, _ref39) {
-    var _state$hydratedValues2;
+    var _state$hydratedValues3, _state$hydratedValues4;
     var id = _ref39.id,
       fieldName = _ref39.fieldName;
-    var user = (_state$hydratedValues2 = state.hydratedValues[fieldName]) === null || _state$hydratedValues2 === void 0 ? void 0 : _state$hydratedValues2.get(id);
+    var user = (0, _platformFeatureFlags.fg)('projects_in_jira_eap_drop2') ? (_state$hydratedValues3 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get((0, _jqlAst.normaliseJqlString)(id)) : (_state$hydratedValues4 = state.hydratedValues[fieldName]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get(id);
     return user && user.type === 'user' ? user : undefined;
   }
 });
 var useHydratedTeam = exports.useHydratedTeam = (0, _reactSweetState.createHook)(Store, {
   selector: function selector(state, _ref40) {
-    var _state$hydratedValues3;
+    var _state$hydratedValues5, _state$hydratedValues6;
     var id = _ref40.id,
       fieldName = _ref40.fieldName;
-    var team = (_state$hydratedValues3 = state.hydratedValues[fieldName]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get(id);
+    var team = (0, _platformFeatureFlags.fg)('projects_in_jira_eap_drop2') ? (_state$hydratedValues5 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues5 === void 0 ? void 0 : _state$hydratedValues5.get((0, _jqlAst.normaliseJqlString)(id)) : (_state$hydratedValues6 = state.hydratedValues[fieldName]) === null || _state$hydratedValues6 === void 0 ? void 0 : _state$hydratedValues6.get(id);
     return team && team.type === 'team' ? team : undefined;
   }
 });
 var useHydratedProject = exports.useHydratedProject = (0, _reactSweetState.createHook)(Store, {
   selector: function selector(state, _ref41) {
-    var _state$hydratedValues4;
+    var _state$hydratedValues7, _state$hydratedValues8;
     var id = _ref41.id,
       fieldName = _ref41.fieldName;
-    var project = (_state$hydratedValues4 = state.hydratedValues[(0, _jqlAst.normaliseJqlString)(fieldName)]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get((0, _jqlAst.normaliseJqlString)(id));
+    var project = (0, _platformFeatureFlags.fg)('projects_in_jira_eap_drop2') ? (_state$hydratedValues7 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues7 === void 0 ? void 0 : _state$hydratedValues7.get((0, _jqlAst.normaliseJqlString)(id)) : (_state$hydratedValues8 = state.hydratedValues[(0, _jqlAst.normaliseJqlString)(fieldName)]) === null || _state$hydratedValues8 === void 0 ? void 0 : _state$hydratedValues8.get((0, _jqlAst.normaliseJqlString)(id));
     return project && project.type === 'project' ? project : undefined;
   }
 });
 var useHydratedDeprecations = exports.useHydratedDeprecations = (0, _reactSweetState.createHook)(Store, {
   selector: function selector(state) {
     var ast = (0, _jqlAst2.getJastFromState)(state.editorState);
-    var fieldsInQuery = (0, _util.getFieldNodes)(ast);
+    var fieldsInQuery = (0, _util2.getFieldNodes)(ast);
     var toReturn = [];
     Object.entries(state.hydratedValues).forEach(function (_ref42) {
-      var _state$hydratedValues5;
+      var _state$hydratedValues9;
       var _ref43 = (0, _slicedToArray2.default)(_ref42, 1),
         fieldName = _ref43[0];
-      (_state$hydratedValues5 = state.hydratedValues[fieldName]) === null || _state$hydratedValues5 === void 0 || _state$hydratedValues5.forEach(function (value) {
+      (_state$hydratedValues9 = state.hydratedValues[fieldName]) === null || _state$hydratedValues9 === void 0 || _state$hydratedValues9.forEach(function (value) {
         if (value.type === 'deprecated-field') {
           if (fieldsInQuery.has(value.id.toLowerCase())) {
             toReturn.push(value);

package/dist/cjs/ui/jql-editor-controls-content/base-expand-toggle/index.js

@@ -11,21 +11,20 @@ var _new = require("@atlaskit/button/new");
 var _growDiagonal = _interopRequireDefault(require("@atlaskit/icon/core/grow-diagonal"));
 var _shrinkDiagonal = _interopRequireDefault(require("@atlaskit/icon/core/shrink-diagonal"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _colors = require("@atlaskit/theme/colors");
 var _styled = require("./styled");
 // Atlaskit doesn't provide a circle variation of the expand/collapse icons so we have to implement our own
 var ExpandCircleIcon = function ExpandCircleIcon(_ref) {
   var isDisabled = _ref.isDisabled;
   return /*#__PURE__*/_react.default.createElement(_growDiagonal.default, {
     label: '',
-    color: isDisabled ? "var(--ds-icon-disabled, ".concat(_colors.N50, ")") : "var(--ds-icon, ".concat(_colors.N500, ")")
+    color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon, #292A2E)"
   });
 };
 var CollapseCircleIcon = function CollapseCircleIcon(_ref2) {
   var isDisabled = _ref2.isDisabled;
   return /*#__PURE__*/_react.default.createElement(_shrinkDiagonal.default, {
     label: '',
-    color: isDisabled ? "var(--ds-icon-disabled, ".concat(_colors.N50, ")") : "var(--ds-icon, ".concat(_colors.N500, ")")
+    color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon, #292A2E)"
   });
 };
 var BaseExpandToggle = exports.BaseExpandToggle = function BaseExpandToggle(_ref3) {

package/dist/cjs/ui/jql-editor-controls-content/base-expand-toggle/styled.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ExpandToggleContainer = void 0;
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _colors = require("@atlaskit/theme/colors");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
@@ -18,11 +17,11 @@ var ExpandToggleContainer = exports.ExpandToggleContainer = _styled.default.div(
     /* Fill the remaining vertical space for a single line in our editor and space between buttons */
     margin: "var(--ds-space-050, 4px)".concat(" 0"),
     '&:hover': {
-      background: "var(--ds-background-neutral-subtle-hovered, ".concat(_colors.N40, ")")
+      background: "var(--ds-background-neutral-subtle-hovered, #0515240F)"
     },
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     "&:active, &[data-firefox-is-active='true']": {
-      background: "var(--ds-background-neutral-subtle-pressed, ".concat(_colors.N50, ")")
+      background: "var(--ds-background-neutral-subtle-pressed, #0B120E24)"
     }
   }
 });

package/dist/cjs/ui/jql-editor-controls-content/base-syntax-help/index.js

@@ -12,7 +12,6 @@ var _new = require("@atlaskit/button/new");
 var _questionCircle = _interopRequireDefault(require("@atlaskit/icon/core/question-circle"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
-var _colors = require("@atlaskit/theme/colors");
 var _styled = require("./styled");
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 
@@ -52,7 +51,7 @@ var BaseSyntaxHelp = exports.BaseSyntaxHelp = function BaseSyntaxHelp(_ref) {
       xcss: iconStyle
     }, /*#__PURE__*/_react.default.createElement(_questionCircle.default, {
       label: '',
-      color: isDisabled ? "var(--ds-icon-disabled, ".concat(_colors.N0, ")") : "var(--ds-icon-inverse, ".concat(_colors.N0, ")")
+      color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon-inverse, #FFFFFF)"
     })),
     onClick: onClick
   }));

package/dist/cjs/ui/jql-editor-controls-content/base-syntax-help/styled.js

@@ -6,29 +6,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SyntaxHelpContainer = void 0;
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _colors = require("@atlaskit/theme/colors");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var SyntaxHelpContainer = exports.SyntaxHelpContainer = _styled.default.div({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '> a': {
-    background: "var(--ds-background-neutral-bold, ".concat(_colors.N70, ")"),
+    background: "var(--ds-background-neutral-bold, #292A2E)",
     borderRadius: "var(--ds-radius-full, 9999px)",
     margin: "var(--ds-space-050, 4px)",
     '&:hover': {
-      background: "var(--ds-background-neutral-bold-hovered, ".concat(_colors.N500, ")")
+      background: "var(--ds-background-neutral-bold-hovered, #3B3D42)"
     },
     '&:focus': {
-      background: "var(--ds-background-neutral-bold, ".concat(_colors.N70, ")")
+      background: "var(--ds-background-neutral-bold, #292A2E)"
     },
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     "&:active, &[data-firefox-is-active='true']": {
-      background: "var(--ds-background-neutral-bold-pressed, ".concat(_colors.N600, ")")
+      background: "var(--ds-background-neutral-bold-pressed, #505258)"
     },
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '&[disabled]': {
-      background: "var(--ds-background-disabled, ".concat(_colors.N50, ")")
+      background: "var(--ds-background-disabled, #17171708)"
     }
   }
 });