@atlaskit/jql-editor 5.13.5 → 5.14.0

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

@@ -3,7 +3,6 @@ import { css } from '@emotion/react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import styled from '@emotion/styled';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { N0, N40, N50, N500, R400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var UserContainer = styled.span({
   display: 'inline-flex',
@@ -21,42 +20,42 @@ function (_ref) {
     if (error) {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       return css({
-        color: "var(--ds-text-inverse, ".concat(N0, ")"),
-        backgroundColor: "var(--ds-background-danger-bold, ".concat(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(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 css({
-        color: "var(--ds-text, ".concat(N0, ")"),
-        backgroundColor: "var(--ds-background-selected, ".concat(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 css({
-        color: "var(--ds-text-subtle, ".concat(N500, ")"),
-        backgroundColor: "var(--ds-background-neutral, ".concat(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(R400, ")"),
+        textDecorationColor: "var(--ds-text-danger, #AE2E24)",
         '&:hover': {
-          backgroundColor: "var(--ds-background-neutral-hovered, ".concat(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 css({
-        color: "var(--ds-text-subtle, ".concat(N500, ")"),
-        backgroundColor: "var(--ds-background-neutral, ".concat(N40, ")"),
+        color: "var(--ds-text-subtle, #505258)",
+        backgroundColor: "var(--ds-background-neutral, #0515240F)",
         '&:hover': {
-          backgroundColor: "var(--ds-background-neutral-hovered, ".concat(N50, ")")
+          backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
         }
       });
     }

package/dist/esm/plugins/rich-inline-nodes/util/replace-nodes-transaction.js

@@ -26,7 +26,7 @@ export var replaceRichInlineNodes = function replaceRichInlineNodes(editorState,
       fieldName = _ref2[0],
       values = _ref2[1];
     values.forEach(function (value) {
-      if (value.type === 'user' || value.type === 'team' && fg('jira_update_jql_teams') || value.type === 'project' && fg('projects_in_jira_eap_drop2')) {
+      if (value.type === 'user' || value.type === 'team' || value.type === 'project' && fg('projects_in_jira_eap_drop2')) {
         // First try to find as direct value operand (e.g., Team[Team] = uuid)
         var astNodes = getValueNodes(ast, fieldName, value.id);
 

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

@@ -4,10 +4,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 { fg } from '@atlaskit/platform-feature-flags';
 import { getJastFromState } from '../../plugins/jql-ast';
 import { replaceRichInlineNodes } from '../../plugins/rich-inline-nodes/util/replace-nodes-transaction';
 import { actions } from '../index';
-import { ValidQueryVisitor } from './util';
+import { normaliseHydrationKey, ValidQueryVisitor } from './util';
 export var hydrateQuery = function hydrateQuery() {
   return /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref, _ref2) {
@@ -42,15 +43,21 @@ export var 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 = _slicedToArray(_ref4, 2),
                 fieldName = _ref5[0],
                 values = _ref5[1];
-              var valueMap = new Map(oldHydratedValues[fieldName]);
+              var fieldNameToUse = fg('projects_in_jira_eap_drop2') ? normaliseHydrationKey(fieldName) : fieldName;
+              var valueMap = new Map(oldHydratedValues[fieldNameToUse]);
               values.forEach(function (value) {
                 valueMap.set(value.id, value);
               });
-              return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, fieldName, valueMap));
+              return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, fieldNameToUse, valueMap));
             }, {});
             setState({
               hydratedValues: hydratedValuesMap

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

@@ -6,9 +6,18 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
-import { AbstractJastVisitor } from '@atlaskit/jql-ast';
+import { AbstractJastVisitor, normaliseJqlString } from '@atlaskit/jql-ast';
 import { fg } from '@atlaskit/platform-feature-flags';
 
+/**
+ * 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).
+ */
+export var normaliseHydrationKey = function normaliseHydrationKey(key) {
+  return 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/esm/state/index.js

@@ -14,6 +14,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { computeJqlInsights, isListOperator, normaliseJqlString } from '@atlaskit/jql-ast';
 import { JQLAutocomplete } from '@atlaskit/jql-autocomplete';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ActionSubject, ActionSubjectId, Action as AnalyticsAction, EventType } from '../analytics';
 import { selectErrorCommand } from '../commands/select-error-command';
 import { JQL_EDITOR_MAIN_ID } from '../common/constants';
@@ -24,6 +25,7 @@ import { getNodeText } from '../utils/document-text';
 import { onStartAutocompleteEvent } from './analytics';
 import { sortOperators } from './autocomplete';
 import { hydrateQuery } from './hydration';
+import { normaliseHydrationKey } from './hydration/util';
 import { getAutocompleteOptionId, getAutocompletePosition, getFieldNodes, getReplacePositionStart, sendDebugMessage, tokensToAutocompleteOptions } from './util';
 var initialIntl = createIntl({
   locale: 'en'
@@ -886,38 +888,47 @@ export var useAutocompletePosition = createHook(Store, {
     };
   }
 });
+
+// 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.
 export var useHydratedValue = 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 (fg('projects_in_jira_eap_drop2')) {
+      var _state$hydratedValues;
+      return (_state$hydratedValues = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get(normaliseJqlString(id));
+    }
+    return (_state$hydratedValues2 = state.hydratedValues[fieldName]) === null || _state$hydratedValues2 === void 0 ? void 0 : _state$hydratedValues2.get(id);
   }
 });
 export var useHydratedUser = 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 = fg('projects_in_jira_eap_drop2') ? (_state$hydratedValues3 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get(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;
   }
 });
 export var useHydratedTeam = 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 = fg('projects_in_jira_eap_drop2') ? (_state$hydratedValues5 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues5 === void 0 ? void 0 : _state$hydratedValues5.get(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;
   }
 });
 export var useHydratedProject = 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[normaliseJqlString(fieldName)]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get(normaliseJqlString(id));
+    var project = fg('projects_in_jira_eap_drop2') ? (_state$hydratedValues7 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues7 === void 0 ? void 0 : _state$hydratedValues7.get(normaliseJqlString(id)) : (_state$hydratedValues8 = state.hydratedValues[normaliseJqlString(fieldName)]) === null || _state$hydratedValues8 === void 0 ? void 0 : _state$hydratedValues8.get(normaliseJqlString(id));
     return project && project.type === 'project' ? project : undefined;
   }
 });
@@ -927,10 +938,10 @@ export var useHydratedDeprecations = createHook(Store, {
     var fieldsInQuery = getFieldNodes(ast);
     var toReturn = [];
     Object.entries(state.hydratedValues).forEach(function (_ref42) {
-      var _state$hydratedValues5;
+      var _state$hydratedValues9;
       var _ref43 = _slicedToArray(_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/esm/ui/jql-editor-controls-content/base-expand-toggle/index.js

@@ -4,7 +4,6 @@ import { IconButton } from '@atlaskit/button/new';
 import GrowDiagonalIcon from '@atlaskit/icon/core/grow-diagonal';
 import ShrinkDiagonalIcon from '@atlaskit/icon/core/shrink-diagonal';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { N50, N500 } from '@atlaskit/theme/colors';
 import { ExpandToggleContainer } from './styled';
 
 // Atlaskit doesn't provide a circle variation of the expand/collapse icons so we have to implement our own
@@ -12,14 +11,14 @@ var ExpandCircleIcon = function ExpandCircleIcon(_ref) {
   var isDisabled = _ref.isDisabled;
   return /*#__PURE__*/React.createElement(GrowDiagonalIcon, {
     label: '',
-    color: isDisabled ? "var(--ds-icon-disabled, ".concat(N50, ")") : "var(--ds-icon, ".concat(N500, ")")
+    color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon, #292A2E)"
   });
 };
 var CollapseCircleIcon = function CollapseCircleIcon(_ref2) {
   var isDisabled = _ref2.isDisabled;
   return /*#__PURE__*/React.createElement(ShrinkDiagonalIcon, {
     label: '',
-    color: isDisabled ? "var(--ds-icon-disabled, ".concat(N50, ")") : "var(--ds-icon, ".concat(N500, ")")
+    color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon, #292A2E)"
   });
 };
 export var BaseExpandToggle = function BaseExpandToggle(_ref3) {

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

@@ -1,6 +1,5 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import styled from '@emotion/styled';
-import { N40, N50 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var ExpandToggleContainer = styled.div({
   /* Override background styles for our button to match designs */
@@ -10,11 +9,11 @@ export var ExpandToggleContainer = styled.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(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(N50, ")")
+      background: "var(--ds-background-neutral-subtle-pressed, #0B120E24)"
     }
   }
 });

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

@@ -6,7 +6,6 @@ import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
 import { fg } from '@atlaskit/platform-feature-flags';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';
-import { N0 } from '@atlaskit/theme/colors';
 import { SyntaxHelpContainer } from './styled';
 
 // Fixes icon margin issus after new icon migration
@@ -45,7 +44,7 @@ export var BaseSyntaxHelp = function BaseSyntaxHelp(_ref) {
       xcss: iconStyle
     }, /*#__PURE__*/React.createElement(QuestionCircleIcon, {
       label: '',
-      color: isDisabled ? "var(--ds-icon-disabled, ".concat(N0, ")") : "var(--ds-icon-inverse, ".concat(N0, ")")
+      color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon-inverse, #FFFFFF)"
     })),
     onClick: onClick
   }));

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

@@ -1,26 +1,25 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import styled from '@emotion/styled';
-import { N50, N500, N600, N70 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var SyntaxHelpContainer = styled.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(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(N500, ")")
+      background: "var(--ds-background-neutral-bold-hovered, #3B3D42)"
     },
     '&:focus': {
-      background: "var(--ds-background-neutral-bold, ".concat(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(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(N50, ")")
+      background: "var(--ds-background-disabled, #17171708)"
     }
   }
 });

package/dist/esm/ui/jql-editor-footer-content/jql-messages/infos/index.js

@@ -4,7 +4,6 @@ import { di } from 'react-magnetic-di';
 import { HelperMessage } from '@atlaskit/form';
 import StatusInformationIcon from '@atlaskit/icon/core/status-information';
 import { Box } from '@atlaskit/primitives/compiled';
-import * as colors from '@atlaskit/theme/colors';
 import { useEditorViewHasInfos } from '../../../../hooks/use-editor-view-has-infos';
 import { useExternalMessages } from '../../../../state';
 import { FormatMessages, MessageContainer } from '../format';
@@ -29,7 +28,7 @@ export var InfoMessages = function InfoMessages() {
     paddingInlineEnd: "space.050"
   }, /*#__PURE__*/React.createElement(StatusInformationIcon, {
     label: "",
-    color: "var(--ds-icon-information, ".concat(colors.B500, ")"),
+    color: "var(--ds-icon-information, #357DE8)",
     size: "small"
   })), infoMessage)) : null;
 };

package/dist/esm/ui/jql-editor-footer-content/jql-messages/warnings/index.js

@@ -7,7 +7,6 @@ import StatusWarningIcon from '@atlaskit/icon/core/status-warning';
 import Link from '@atlaskit/link';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
-import * as colors from '@atlaskit/theme/colors';
 import { useEditorViewHasWarnings } from '../../../../hooks/use-editor-view-has-warnings';
 import { useExternalMessages, useHydratedDeprecations, useIntl } from '../../../../state';
 import { FormatMessages, MessageContainer } from '../format';
@@ -120,7 +119,7 @@ export var WarningMessages = function WarningMessages() {
     paddingInlineEnd: "space.050"
   }, /*#__PURE__*/React.createElement(StatusWarningIcon, {
     label: "",
-    color: "var(--ds-icon-warning, ".concat(colors.Y400, ")"),
+    color: "var(--ds-icon-warning, #E06C00)",
     size: "small"
   })), warningMessage)) : null;
 };

package/dist/esm/ui/jql-editor-layout/styled.js

@@ -5,7 +5,6 @@ import { css, keyframes } from '@emotion/react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import styled from '@emotion/styled';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { B200, B300, G500, N0, N10, N100, N30, N700, N800, N900, P400, R400 } from '@atlaskit/theme/colors';
 import { layers } from '@atlaskit/theme/constants';
 import { TOOLTIP_CLASSNAME, TOOLTIP_ENTER_CLASSNAME, TOOLTIP_EXIT_CLASSNAME } from '../../plugins/validation-tooltip/constants';
 var fadeIn = keyframes({
@@ -27,7 +26,7 @@ var fadeOut = keyframes({
 });
 
 // eslint-disable-next-line @atlaskit/design-system/no-styled-tagged-template-expression, @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
-export var EditorMain = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t/* CSS reset */\n\tfont-family: ", ";\n\tfont-size: 14px;\n\tflex-grow: 1;\n\n\t/* These styles and animations are derived from @atlaskit/tooltip */\n\n\t.", " {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\tborder-radius: ", ";\n\t\tbox-sizing: border-box;\n\t\tfont: ", ";\n\t\tline-height: 1.3;\n\t\tmax-width: 240px;\n\t\tpadding: ", " ", ";\n\t\tword-wrap: break-word;\n\t\toverflow-wrap: break-word;\n\t\tz-index: ", ";\n\t\tpointer-events: none;\n\t\tposition: absolute;\n\t\tvisibility: hidden;\n\n\t\t/* Horizontally center and vertically position above the target element */\n\t\ttransform: translate(-50%, calc(-100% - ", "));\n\n\t\t&.", " {\n\t\t\tanimation: ", " 350ms cubic-bezier(0.15, 1, 0.3, 1);\n\t\t\tvisibility: visible;\n\t\t}\n\n\t\t&.", " {\n\t\t\tanimation: ", " 350ms cubic-bezier(0.15, 1, 0.3, 1);\n\t\t}\n\t}\n"])), "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)", TOOLTIP_CLASSNAME, "var(--ds-background-neutral-bold, ".concat(N800, ")"), "var(--ds-text-inverse, ".concat(N0, ")"), "var(--ds-radius-small, 3px)", "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)", "var(--ds-space-025, 2px)", "var(--ds-space-075, 6px)", layers.tooltip(), "var(--ds-space-200, 16px)", TOOLTIP_ENTER_CLASSNAME, fadeIn, TOOLTIP_EXIT_CLASSNAME, fadeOut);
+export var EditorMain = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t/* CSS reset */\n\tfont-family: ", ";\n\tfont-size: 14px;\n\tflex-grow: 1;\n\n\t/* These styles and animations are derived from @atlaskit/tooltip */\n\n\t.", " {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\tborder-radius: ", ";\n\t\tbox-sizing: border-box;\n\t\tfont: ", ";\n\t\tline-height: 1.3;\n\t\tmax-width: 240px;\n\t\tpadding: ", " ", ";\n\t\tword-wrap: break-word;\n\t\toverflow-wrap: break-word;\n\t\tz-index: ", ";\n\t\tpointer-events: none;\n\t\tposition: absolute;\n\t\tvisibility: hidden;\n\n\t\t/* Horizontally center and vertically position above the target element */\n\t\ttransform: translate(-50%, calc(-100% - ", "));\n\n\t\t&.", " {\n\t\t\tanimation: ", " 350ms cubic-bezier(0.15, 1, 0.3, 1);\n\t\t\tvisibility: visible;\n\t\t}\n\n\t\t&.", " {\n\t\t\tanimation: ", " 350ms cubic-bezier(0.15, 1, 0.3, 1);\n\t\t}\n\t}\n"])), "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)", TOOLTIP_CLASSNAME, "var(--ds-background-neutral-bold, #292A2E)", "var(--ds-text-inverse, #FFFFFF)", "var(--ds-radius-small, 3px)", "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)", "var(--ds-space-025, 2px)", "var(--ds-space-075, 6px)", layers.tooltip(), "var(--ds-space-200, 16px)", TOOLTIP_ENTER_CLASSNAME, fadeIn, TOOLTIP_EXIT_CLASSNAME, fadeOut);
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var EditorFooter = styled.div({
@@ -45,14 +44,14 @@ var getEditorInputVerticalPadding = function getEditorInputVerticalPadding(isCom
 var editorInputHorizontalPadding = 6;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var EditorViewContainer = styled.div({
-  backgroundColor: "var(--ds-background-input, ".concat(N10, ")"),
+  backgroundColor: "var(--ds-background-input, #FFFFFF)",
   borderStyle: 'solid',
   borderWidth: "var(--ds-border-width, 1px)",
-  borderColor: "var(--ds-border-input, ".concat(N100, ")"),
+  borderColor: "var(--ds-border-input, #8C8F97)",
   borderRadius: "var(--ds-radius-medium, 3px)",
   padding: "var(--ds-border-width, 1px)",
   boxSizing: 'border-box',
-  color: "var(--ds-text, ".concat(N900, ")"),
+  color: "var(--ds-text, #292A2E)",
   display: 'flex',
   overflow: 'auto',
   transition: 'background-color 0.2s ease-in-out, border-color 0.2s ease-in-out'
@@ -62,8 +61,8 @@ function (props) {
   return props.editorViewIsInvalid &&
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
   css({
-    borderColor: "var(--ds-border-danger, ".concat(R400, ")"),
-    boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-danger, ".concat(R400, ")"))
+    borderColor: "var(--ds-border-danger, #E2483D)",
+    boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-danger, #E2483D)")
   });
 },
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
@@ -71,28 +70,28 @@ function (props) {
   return props.editorViewHasFocus ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
   css({
-    backgroundColor: "var(--ds-surface, ".concat(N0, ")"),
-    borderColor: "var(--ds-border-focused, ".concat(B200, ")"),
-    boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-focused, ".concat(B200, ")"))
+    backgroundColor: "var(--ds-surface, #FFFFFF)",
+    borderColor: "var(--ds-border-focused, #4688EC)",
+    boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-focused, #4688EC)")
   }) :
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
   css({
     '&:hover': {
-      backgroundColor: "var(--ds-background-input-hovered, ".concat(N30, ")")
+      backgroundColor: "var(--ds-background-input-hovered, #F8F8F8)"
     }
   });
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var ReadOnlyEditorViewContainer = styled(EditorViewContainer)({
-  backgroundColor: "var(--ds-background-disabled, ".concat(N30, ")"),
-  color: "var(--ds-text-disabled, ".concat(N100, ")"),
+  backgroundColor: "var(--ds-background-disabled, #17171708)",
+  color: "var(--ds-text-disabled, #080F214A)",
   pointerEvents: 'none'
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var LineNumberToolbar = styled.div({
-  backgroundColor: "var(--ds-background-neutral, ".concat(N30, ")"),
+  backgroundColor: "var(--ds-background-neutral, #0515240F)",
   flexShrink: 0,
   width: '30px',
   position: 'sticky',
@@ -121,9 +120,9 @@ export var EditorView = styled.div(_templateObject2 || (_templateObject2 = _tagg
   return rowHeight * props.expandedRows + getEditorInputVerticalPadding(props.isCompact) * 2;
 }, function (props) {
   return rowHeight * props.expandedRows + getEditorInputVerticalPadding(props.isCompact) * 2;
-}, "var(--ds-text, ".concat(N700, ")"), function (props) {
+}, "var(--ds-text, #292A2E)", function (props) {
   return getEditorInputVerticalPadding(props.isCompact);
-}, editorInputHorizontalPadding, "var(--ds-text-accent-purple, ".concat(P400, ")"), "var(--ds-text-accent-blue, ".concat(B300, ")"), "var(--ds-text-accent-green, ".concat(G500, ")"), "var(--ds-text-danger, ".concat(R400, ")"), "var(--ds-text-subtlest, ".concat(N100, ")"), rowHeight / 10, "var(--ds-space-100, 8px)", "var(--ds-space-025, 2px)", "var(--ds-space-100, 8px)", function (props) {
+}, editorInputHorizontalPadding, "var(--ds-text-accent-purple, #803FA5)", "var(--ds-text-accent-blue, #1558BC)", "var(--ds-text-accent-green, #216E4E)", "var(--ds-text-danger, #AE2E24)", "var(--ds-text-subtlest, #6B6E76)", rowHeight / 10, "var(--ds-space-100, 8px)", "var(--ds-space-025, 2px)", "var(--ds-space-100, 8px)", function (props) {
   return !props.lineNumbersVisible && // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
   css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n\t\t\t\t\tdisplay: none;\n\t\t\t\t"])));
 });

package/dist/types/state/hydration/util.d.ts

@@ -1,4 +1,10 @@
 import { AbstractJastVisitor, type CompoundClause, type FunctionOperand, type ListOperand, type NotClause, type Query, type TerminalClause, type ValueOperand } from '@atlaskit/jql-ast';
+/**
+ * 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).
+ */
+export declare const normaliseHydrationKey: (key: string) => string;
 /**
  * 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/types-ts4.5/state/hydration/util.d.ts

@@ -1,4 +1,10 @@
 import { AbstractJastVisitor, type CompoundClause, type FunctionOperand, type ListOperand, type NotClause, type Query, type TerminalClause, type ValueOperand } from '@atlaskit/jql-ast';
+/**
+ * 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).
+ */
+export declare const normaliseHydrationKey: (key: string) => string;
 /**
  * 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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/jql-editor",
-	"version": "5.13.5",
+	"version": "5.14.0",
 	"description": "This package allows consumers to render an advanced JQL editor component to enable autocomplete-assisted authoring and validation of JQL queries.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,15 +34,15 @@
 	"dependencies": {
 		"@atlaskit/afm-i18n-platform-jql-jql-editor": "2.10.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
-		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/avatar": "^25.10.0",
+		"@atlaskit/analytics-next": "^11.2.0",
+		"@atlaskit/avatar": "^25.11.0",
 		"@atlaskit/button": "^23.10.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/emoji": "^69.10.0",
-		"@atlaskit/form": "^15.4.0",
-		"@atlaskit/icon": "^33.0.0",
-		"@atlaskit/icon-lab": "^6.0.0",
+		"@atlaskit/form": "^15.5.0",
+		"@atlaskit/icon": "^33.1.0",
+		"@atlaskit/icon-lab": "^6.2.0",
 		"@atlaskit/jql-ast": "^3.4.0",
 		"@atlaskit/jql-autocomplete": "^2.0.0",
 		"@atlaskit/jql-editor-common": "^3.1.0",
@@ -50,12 +50,12 @@
 		"@atlaskit/link": "^3.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popper": "^7.1.0",
-		"@atlaskit/primitives": "^18.0.0",
+		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/teams-avatar": "^2.4.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tokens": "^11.1.0",
+		"@atlaskit/tokens": "^11.4.0",
 		"@atlaskit/tooltip": "^21.0.0",
 		"@atlaskit/townsquare-emoji-provider": "^1.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -144,9 +144,6 @@
 		"jql_editor_autocomplete_use_popper": {
 			"type": "boolean"
 		},
-		"jira_update_jql_teams": {
-			"type": "boolean"
-		},
 		"jira-membersof-team-support": {
 			"type": "boolean"
 		},