@atlaskit/jql-editor 5.13.6 → 5.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/analytics/util.js +1 -1
  3. package/dist/cjs/async.js +1 -1
  4. package/dist/cjs/plugins/autocomplete/components/autocomplete-dropdown/styled.js +7 -8
  5. package/dist/cjs/plugins/autocomplete/components/autocomplete-option/index.js +1 -2
  6. package/dist/cjs/plugins/autocomplete/components/autocomplete-option/styled.js +5 -6
  7. package/dist/cjs/plugins/rich-inline-nodes/nodes/team/styled.js +13 -14
  8. package/dist/cjs/plugins/rich-inline-nodes/nodes/user/styled.js +13 -14
  9. package/dist/cjs/state/hydration/index.js +9 -2
  10. package/dist/cjs/state/hydration/util.js +10 -1
  11. package/dist/cjs/state/index.js +31 -20
  12. package/dist/cjs/ui/jql-editor-controls-content/base-expand-toggle/index.js +2 -3
  13. package/dist/cjs/ui/jql-editor-controls-content/base-expand-toggle/styled.js +2 -3
  14. package/dist/cjs/ui/jql-editor-controls-content/base-syntax-help/index.js +1 -2
  15. package/dist/cjs/ui/jql-editor-controls-content/base-syntax-help/styled.js +5 -6
  16. package/dist/cjs/ui/jql-editor-footer-content/jql-messages/infos/index.js +1 -4
  17. package/dist/cjs/ui/jql-editor-footer-content/jql-messages/warnings/index.js +1 -2
  18. package/dist/cjs/ui/jql-editor-layout/styled.js +15 -16
  19. package/dist/es2019/analytics/util.js +1 -1
  20. package/dist/es2019/async.js +2 -0
  21. package/dist/es2019/plugins/autocomplete/components/autocomplete-dropdown/styled.js +7 -8
  22. package/dist/es2019/plugins/autocomplete/components/autocomplete-option/index.js +1 -2
  23. package/dist/es2019/plugins/autocomplete/components/autocomplete-option/styled.js +5 -6
  24. package/dist/es2019/plugins/rich-inline-nodes/nodes/team/styled.js +13 -14
  25. package/dist/es2019/plugins/rich-inline-nodes/nodes/user/styled.js +13 -14
  26. package/dist/es2019/state/hydration/index.js +12 -4
  27. package/dist/es2019/state/hydration/util.js +8 -1
  28. package/dist/es2019/state/index.js +21 -10
  29. package/dist/es2019/ui/jql-editor-controls-content/base-expand-toggle/index.js +2 -3
  30. package/dist/es2019/ui/jql-editor-controls-content/base-expand-toggle/styled.js +2 -3
  31. package/dist/es2019/ui/jql-editor-controls-content/base-syntax-help/index.js +1 -2
  32. package/dist/es2019/ui/jql-editor-controls-content/base-syntax-help/styled.js +5 -6
  33. package/dist/es2019/ui/jql-editor-footer-content/jql-messages/infos/index.js +1 -2
  34. package/dist/es2019/ui/jql-editor-footer-content/jql-messages/warnings/index.js +1 -2
  35. package/dist/es2019/ui/jql-editor-layout/styled.js +20 -21
  36. package/dist/esm/analytics/util.js +1 -1
  37. package/dist/esm/async.js +2 -0
  38. package/dist/esm/plugins/autocomplete/components/autocomplete-dropdown/styled.js +7 -8
  39. package/dist/esm/plugins/autocomplete/components/autocomplete-option/index.js +1 -2
  40. package/dist/esm/plugins/autocomplete/components/autocomplete-option/styled.js +5 -6
  41. package/dist/esm/plugins/rich-inline-nodes/nodes/team/styled.js +13 -14
  42. package/dist/esm/plugins/rich-inline-nodes/nodes/user/styled.js +13 -14
  43. package/dist/esm/state/hydration/index.js +10 -3
  44. package/dist/esm/state/hydration/util.js +10 -1
  45. package/dist/esm/state/index.js +21 -10
  46. package/dist/esm/ui/jql-editor-controls-content/base-expand-toggle/index.js +2 -3
  47. package/dist/esm/ui/jql-editor-controls-content/base-expand-toggle/styled.js +2 -3
  48. package/dist/esm/ui/jql-editor-controls-content/base-syntax-help/index.js +1 -2
  49. package/dist/esm/ui/jql-editor-controls-content/base-syntax-help/styled.js +5 -6
  50. package/dist/esm/ui/jql-editor-footer-content/jql-messages/infos/index.js +1 -2
  51. package/dist/esm/ui/jql-editor-footer-content/jql-messages/warnings/index.js +1 -2
  52. package/dist/esm/ui/jql-editor-layout/styled.js +15 -16
  53. package/dist/types/state/hydration/util.d.ts +6 -0
  54. package/dist/types-ts4.5/state/hydration/util.d.ts +6 -0
  55. package/package.json +8 -8
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- var _typeof = require("@babel/runtime/helpers/typeof");
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
@@ -12,11 +11,9 @@ var _reactMagneticDi = require("react-magnetic-di");
12
11
  var _form = require("@atlaskit/form");
13
12
  var _statusInformation = _interopRequireDefault(require("@atlaskit/icon/core/status-information"));
14
13
  var _compiled = require("@atlaskit/primitives/compiled");
15
- var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
16
14
  var _useEditorViewHasInfos = require("../../../../hooks/use-editor-view-has-infos");
17
15
  var _state = require("../../../../state");
18
16
  var _format = require("../format");
19
- 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); }
20
17
  var useFormattedInfoMessage = exports.useFormattedInfoMessage = function useFormattedInfoMessage() {
21
18
  var _useExternalMessages = (0, _state.useExternalMessages)(),
22
19
  _useExternalMessages2 = (0, _slicedToArray2.default)(_useExternalMessages, 1),
@@ -38,7 +35,7 @@ var InfoMessages = exports.InfoMessages = function InfoMessages() {
38
35
  paddingInlineEnd: "space.050"
39
36
  }, /*#__PURE__*/_react.default.createElement(_statusInformation.default, {
40
37
  label: "",
41
- color: "var(--ds-icon-information, ".concat(colors.B500, ")"),
38
+ color: "var(--ds-icon-information, #357DE8)",
42
39
  size: "small"
43
40
  })), infoMessage)) : null;
44
41
  };
@@ -15,7 +15,6 @@ var _statusWarning = _interopRequireDefault(require("@atlaskit/icon/core/status-
15
15
  var _link = _interopRequireDefault(require("@atlaskit/link"));
16
16
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
17
  var _compiled = require("@atlaskit/primitives/compiled");
18
- var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
19
18
  var _useEditorViewHasWarnings = require("../../../../hooks/use-editor-view-has-warnings");
20
19
  var _state = require("../../../../state");
21
20
  var _format = require("../format");
@@ -129,7 +128,7 @@ var WarningMessages = exports.WarningMessages = function WarningMessages() {
129
128
  paddingInlineEnd: "space.050"
130
129
  }, /*#__PURE__*/_react.default.createElement(_statusWarning.default, {
131
130
  label: "",
132
- color: "var(--ds-icon-warning, ".concat(colors.Y400, ")"),
131
+ color: "var(--ds-icon-warning, #E06C00)",
133
132
  size: "small"
134
133
  })), warningMessage)) : null;
135
134
  };
@@ -9,7 +9,6 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
9
9
  var _react = require("@emotion/react");
10
10
  var _styled = _interopRequireDefault(require("@emotion/styled"));
11
11
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
12
- var _colors = require("@atlaskit/theme/colors");
13
12
  var _constants = require("@atlaskit/theme/constants");
14
13
  var _constants2 = require("../../plugins/validation-tooltip/constants");
15
14
  var _templateObject, _templateObject2, _templateObject3, _templateObject4; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -33,7 +32,7 @@ var fadeOut = (0, _react.keyframes)({
33
32
  });
34
33
 
35
34
  // 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
36
- var EditorMain = exports.EditorMain = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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)", _constants2.TOOLTIP_CLASSNAME, "var(--ds-background-neutral-bold, ".concat(_colors.N800, ")"), "var(--ds-text-inverse, ".concat(_colors.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)", _constants.layers.tooltip(), "var(--ds-space-200, 16px)", _constants2.TOOLTIP_ENTER_CLASSNAME, fadeIn, _constants2.TOOLTIP_EXIT_CLASSNAME, fadeOut);
35
+ var EditorMain = exports.EditorMain = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\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)", _constants2.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)", _constants.layers.tooltip(), "var(--ds-space-200, 16px)", _constants2.TOOLTIP_ENTER_CLASSNAME, fadeIn, _constants2.TOOLTIP_EXIT_CLASSNAME, fadeOut);
37
36
 
38
37
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
39
38
  var EditorFooter = exports.EditorFooter = _styled.default.div({
@@ -51,14 +50,14 @@ var getEditorInputVerticalPadding = function getEditorInputVerticalPadding(isCom
51
50
  var editorInputHorizontalPadding = 6;
52
51
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
53
52
  var EditorViewContainer = exports.EditorViewContainer = _styled.default.div({
54
- backgroundColor: "var(--ds-background-input, ".concat(_colors.N10, ")"),
53
+ backgroundColor: "var(--ds-background-input, #FFFFFF)",
55
54
  borderStyle: 'solid',
56
55
  borderWidth: "var(--ds-border-width, 1px)",
57
- borderColor: "var(--ds-border-input, ".concat(_colors.N100, ")"),
56
+ borderColor: "var(--ds-border-input, #8C8F97)",
58
57
  borderRadius: "var(--ds-radius-medium, 3px)",
59
58
  padding: "var(--ds-border-width, 1px)",
60
59
  boxSizing: 'border-box',
61
- color: "var(--ds-text, ".concat(_colors.N900, ")"),
60
+ color: "var(--ds-text, #292A2E)",
62
61
  display: 'flex',
63
62
  overflow: 'auto',
64
63
  transition: 'background-color 0.2s ease-in-out, border-color 0.2s ease-in-out'
@@ -68,8 +67,8 @@ function (props) {
68
67
  return props.editorViewIsInvalid &&
69
68
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
70
69
  (0, _react.css)({
71
- borderColor: "var(--ds-border-danger, ".concat(_colors.R400, ")"),
72
- boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-danger, ".concat(_colors.R400, ")"))
70
+ borderColor: "var(--ds-border-danger, #E2483D)",
71
+ boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-danger, #E2483D)")
73
72
  });
74
73
  },
75
74
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
@@ -77,28 +76,28 @@ function (props) {
77
76
  return props.editorViewHasFocus ?
78
77
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
79
78
  (0, _react.css)({
80
- backgroundColor: "var(--ds-surface, ".concat(_colors.N0, ")"),
81
- borderColor: "var(--ds-border-focused, ".concat(_colors.B200, ")"),
82
- boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-focused, ".concat(_colors.B200, ")"))
79
+ backgroundColor: "var(--ds-surface, #FFFFFF)",
80
+ borderColor: "var(--ds-border-focused, #4688EC)",
81
+ boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-focused, #4688EC)")
83
82
  }) :
84
83
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
85
84
  (0, _react.css)({
86
85
  '&:hover': {
87
- backgroundColor: "var(--ds-background-input-hovered, ".concat(_colors.N30, ")")
86
+ backgroundColor: "var(--ds-background-input-hovered, #F8F8F8)"
88
87
  }
89
88
  });
90
89
  });
91
90
 
92
91
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
93
92
  var ReadOnlyEditorViewContainer = exports.ReadOnlyEditorViewContainer = (0, _styled.default)(EditorViewContainer)({
94
- backgroundColor: "var(--ds-background-disabled, ".concat(_colors.N30, ")"),
95
- color: "var(--ds-text-disabled, ".concat(_colors.N100, ")"),
93
+ backgroundColor: "var(--ds-background-disabled, #17171708)",
94
+ color: "var(--ds-text-disabled, #080F214A)",
96
95
  pointerEvents: 'none'
97
96
  });
98
97
 
99
98
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
100
99
  var LineNumberToolbar = exports.LineNumberToolbar = _styled.default.div({
101
- backgroundColor: "var(--ds-background-neutral, ".concat(_colors.N30, ")"),
100
+ backgroundColor: "var(--ds-background-neutral, #0515240F)",
102
101
  flexShrink: 0,
103
102
  width: '30px',
104
103
  position: 'sticky',
@@ -127,9 +126,9 @@ var EditorView = exports.EditorView = _styled.default.div(_templateObject2 || (_
127
126
  return rowHeight * props.expandedRows + getEditorInputVerticalPadding(props.isCompact) * 2;
128
127
  }, function (props) {
129
128
  return rowHeight * props.expandedRows + getEditorInputVerticalPadding(props.isCompact) * 2;
130
- }, "var(--ds-text, ".concat(_colors.N700, ")"), function (props) {
129
+ }, "var(--ds-text, #292A2E)", function (props) {
131
130
  return getEditorInputVerticalPadding(props.isCompact);
132
- }, editorInputHorizontalPadding, "var(--ds-text-accent-purple, ".concat(_colors.P400, ")"), "var(--ds-text-accent-blue, ".concat(_colors.B300, ")"), "var(--ds-text-accent-green, ".concat(_colors.G500, ")"), "var(--ds-text-danger, ".concat(_colors.R400, ")"), "var(--ds-text-subtlest, ".concat(_colors.N100, ")"), rowHeight / 10, "var(--ds-space-100, 8px)", "var(--ds-space-025, 2px)", "var(--ds-space-100, 8px)", function (props) {
131
+ }, 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) {
133
132
  return !props.lineNumbersVisible && // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
134
133
  (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t\tdisplay: none;\n\t\t\t\t"])));
135
134
  });
@@ -1,4 +1,4 @@
1
1
  import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
2
2
  export const useJqlEditorAnalytics = analyticsSource => {
3
- return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "0.0.0-development", ANALYTICS_CHANNEL);
3
+ return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "5.13.6", ANALYTICS_CHANNEL);
4
4
  };
@@ -1,5 +1,7 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import React from 'react';
3
+
4
+ // oxlint-disable-next-line @atlassian/no-restricted-imports
3
5
  import { lazyForPaint, LazySuspense } from 'react-loosely-lazy';
4
6
  import { fg } from '@atlaskit/platform-feature-flags';
5
7
  import { withErrorBoundary } from './ui/error-boundary';
@@ -1,16 +1,15 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import styled from '@emotion/styled';
3
- import { N200, N40, N50A, N60A } from '@atlaskit/theme/colors';
4
3
  import { layers } from '@atlaskit/theme/constants';
5
4
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
6
5
  export const AutocompleteContainer = styled.div({
7
6
  position: 'absolute',
8
- backgroundColor: "var(--ds-surface-overlay, white)",
7
+ backgroundColor: "var(--ds-surface-overlay, #FFFFFF)",
9
8
  borderRadius: "var(--ds-radius-small, 3px)",
10
9
  willChange: 'top, left',
11
10
  zIndex: layers.dialog(),
12
- boxShadow: `var(--ds-shadow-overlay, ${`0 4px 8px -2px ${N50A}, 0 0 1px ${N60A}`})`,
13
- padding: `${"var(--ds-space-075, 6px)"} ${"var(--ds-space-0, 0)"}`,
11
+ boxShadow: "var(--ds-shadow-overlay, 0px 8px 12px #1E1F2126, 0px 0px 1px #1E1F214f)",
12
+ padding: `${"var(--ds-space-075, 6px)"} ${"var(--ds-space-0, 0px)"}`,
14
13
  minWidth: '200px',
15
14
  maxWidth: '400px',
16
15
  '&:focus': {
@@ -43,15 +42,15 @@ export const AutocompleteOptionsContainer = styled.div({
43
42
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
44
43
  export const OptionList = styled.ul({
45
44
  listStyle: 'none',
46
- margin: `${"var(--ds-space-0, 0)"}`,
47
- padding: `${"var(--ds-space-0, 0)"}`
45
+ margin: `${"var(--ds-space-0, 0px)"}`,
46
+ padding: `${"var(--ds-space-0, 0px)"}`
48
47
  });
49
48
 
50
49
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
51
50
  export const AutocompleteLoadingFooter = styled.div({
52
51
  display: 'flex',
53
52
  justifyContent: 'center',
54
- color: `var(--ds-text-subtlest, ${N200})`,
53
+ color: "var(--ds-text-subtlest, #6B6E76)",
55
54
  fontStyle: 'italic',
56
55
  padding: "var(--ds-space-150, 12px)",
57
56
  textAlign: 'center'
@@ -60,7 +59,7 @@ export const AutocompleteLoadingFooter = styled.div({
60
59
  ({
61
60
  hasOptions
62
61
  }) => hasOptions && {
63
- borderTop: `solid 1px ${`var(--ds-border, ${N40})`}`,
62
+ borderTop: `solid ${"var(--ds-border-width, 1px)"} ${"var(--ds-border, #0B120E24)"}`,
64
63
  marginTop: "var(--ds-space-075, 6px)",
65
64
  paddingTop: "var(--ds-space-250, 20px)"
66
65
  });
@@ -14,7 +14,6 @@ import TagIcon from '@atlaskit/icon/core/tag';
14
14
  import CheckboxIcon from '@atlaskit/icon/core/task';
15
15
  import TextIcon from '@atlaskit/icon/core/text';
16
16
  import { normaliseJqlString } from '@atlaskit/jql-ast';
17
- import { N400 } from '@atlaskit/theme/colors';
18
17
  import Tooltip from '@atlaskit/tooltip';
19
18
  import { useIntl } from '../../../../state';
20
19
  import { messages } from './messages';
@@ -157,7 +156,7 @@ const AutocompleteOption = /*#__PURE__*/forwardRef((props, ref) => {
157
156
  spacing: "spacious",
158
157
  testId: "jql-editor-deprecated-icon",
159
158
  label: "",
160
- color: `var(--ds-icon, ${N400})`
159
+ color: "var(--ds-icon, #292A2E)"
161
160
  }))) : optionName, fieldType && /*#__PURE__*/React.createElement(FieldType, null, fieldTypeIcon && /*#__PURE__*/React.createElement(FieldTypeIcon, null, fieldTypeIcon), fieldType));
162
161
  const tooltipContent = /*#__PURE__*/React.createElement(TooltipContent, null, name);
163
162
  if (overflows) {
@@ -1,6 +1,5 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import styled from '@emotion/styled';
3
- import { N100, N20, N50, N800 } from '@atlaskit/theme/colors';
4
3
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
5
4
  export const TooltipContent = styled.div({
6
5
  fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
@@ -18,19 +17,19 @@ export const OptionListItem = styled.li({
18
17
  ({
19
18
  isSelected
20
19
  }) => isSelected && {
21
- background: `var(--ds-background-neutral-subtle-hovered, ${N20})`
20
+ background: "var(--ds-background-neutral-subtle-hovered, #0515240F)"
22
21
  },
23
22
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-dynamic-styles -- Ignored via go/DSP-18766
24
23
  ({
25
24
  isDeprecated
26
25
  }) => isDeprecated && {
27
26
  cursor: 'default',
28
- color: `var(--ds-text-disabled, ${N50})`
27
+ color: "var(--ds-text-disabled, #080F214A)"
29
28
  });
30
29
 
31
30
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
32
31
  export const OptionName = styled.div({
33
- color: `var(--ds-text, ${N800})`,
32
+ color: "var(--ds-text, #292A2E)",
34
33
  overflow: 'hidden',
35
34
  whiteSpace: 'nowrap',
36
35
  textOverflow: 'ellipsis',
@@ -40,7 +39,7 @@ export const OptionName = styled.div({
40
39
 
41
40
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
42
41
  export const DeprecatedOptionContainer = styled.div({
43
- color: `var(--ds-text-disabled, ${N50})`,
42
+ color: "var(--ds-text-disabled, #080F214A)",
44
43
  display: 'flex',
45
44
  justifyContent: 'space-between',
46
45
  opacity: 0.6
@@ -56,7 +55,7 @@ export const FieldType = styled.div({
56
55
  display: 'flex',
57
56
  alignItems: 'center',
58
57
  marginTop: "var(--ds-space-negative-025, -2px)",
59
- color: `var(--ds-text-subtlest, ${N100})`
58
+ color: "var(--ds-text-subtlest, #6B6E76)"
60
59
  });
61
60
 
62
61
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
@@ -2,7 +2,6 @@
2
2
  import { css } from '@emotion/react';
3
3
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
4
4
  import styled from '@emotion/styled';
5
- import { N0, N40, N50, N500, R400 } from '@atlaskit/theme/colors';
6
5
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
7
6
  export const TeamContainer = styled.span({
8
7
  display: 'inline-flex',
@@ -21,42 +20,42 @@ export const TeamContainer = styled.span({
21
20
  if (error) {
22
21
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
23
22
  return css({
24
- color: `var(--ds-text-inverse, ${N0})`,
25
- backgroundColor: `var(--ds-background-danger-bold, ${R400})`,
23
+ color: "var(--ds-text-inverse, #FFFFFF)",
24
+ backgroundColor: "var(--ds-background-danger-bold, #C9372C)",
26
25
  textDecoration: 'wavy underline',
27
26
  textDecorationThickness: '1px',
28
27
  textDecorationSkipInk: 'none',
29
- textDecorationColor: `var(--ds-text-inverse, ${N0})`
28
+ textDecorationColor: "var(--ds-text-inverse, #FFFFFF)"
30
29
  });
31
30
  } else {
32
31
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
33
32
  return css({
34
- color: `var(--ds-text, ${N0})`,
35
- backgroundColor: `var(--ds-background-selected, ${N500})`,
36
- boxShadow: `0 0 0 1px ${"var(--ds-border-selected, transparent)"}`
33
+ color: "var(--ds-text, #292A2E)",
34
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)",
35
+ boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}`
37
36
  });
38
37
  }
39
38
  } else {
40
39
  if (error) {
41
40
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
42
41
  return css({
43
- color: `var(--ds-text-subtle, ${N500})`,
44
- backgroundColor: `var(--ds-background-neutral, ${N40})`,
42
+ color: "var(--ds-text-subtle, #505258)",
43
+ backgroundColor: "var(--ds-background-neutral, #0515240F)",
45
44
  textDecoration: 'wavy underline',
46
45
  textDecorationThickness: '1px',
47
46
  textDecorationSkipInk: 'none',
48
- textDecorationColor: `var(--ds-text-danger, ${R400})`,
47
+ textDecorationColor: "var(--ds-text-danger, #AE2E24)",
49
48
  '&:hover': {
50
- backgroundColor: `var(--ds-background-neutral-hovered, ${N50})`
49
+ backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
51
50
  }
52
51
  });
53
52
  } else {
54
53
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
55
54
  return css({
56
- color: `var(--ds-text-subtle, ${N500})`,
57
- backgroundColor: `var(--ds-background-neutral, ${N40})`,
55
+ color: "var(--ds-text-subtle, #505258)",
56
+ backgroundColor: "var(--ds-background-neutral, #0515240F)",
58
57
  '&:hover': {
59
- backgroundColor: `var(--ds-background-neutral-hovered, ${N50})`
58
+ backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
60
59
  }
61
60
  });
62
61
  }
@@ -3,7 +3,6 @@ import { css } from '@emotion/react';
3
3
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
4
4
  import styled from '@emotion/styled';
5
5
  import { fg } from '@atlaskit/platform-feature-flags';
6
- import { N0, N40, N50, N500, R400 } from '@atlaskit/theme/colors';
7
6
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
8
7
  export const UserContainer = styled.span({
9
8
  display: 'inline-flex',
@@ -22,42 +21,42 @@ export const UserContainer = styled.span({
22
21
  if (error) {
23
22
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
24
23
  return css({
25
- color: `var(--ds-text-inverse, ${N0})`,
26
- backgroundColor: `var(--ds-background-danger-bold, ${R400})`,
24
+ color: "var(--ds-text-inverse, #FFFFFF)",
25
+ backgroundColor: "var(--ds-background-danger-bold, #C9372C)",
27
26
  textDecoration: 'wavy underline',
28
27
  textDecorationThickness: '1px',
29
28
  textDecorationSkipInk: 'none',
30
- textDecorationColor: `var(--ds-text-inverse, ${N0})`
29
+ textDecorationColor: "var(--ds-text-inverse, #FFFFFF)"
31
30
  });
32
31
  } else {
33
32
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
34
33
  return css({
35
- color: `var(--ds-text, ${N0})`,
36
- backgroundColor: `var(--ds-background-selected, ${N500})`,
37
- boxShadow: `0 0 0 1px ${"var(--ds-border-selected, transparent)"}`
34
+ color: "var(--ds-text, #292A2E)",
35
+ backgroundColor: "var(--ds-background-selected, #E9F2FE)",
36
+ boxShadow: `0 0 0 1px ${"var(--ds-border-selected, #1868DB)"}`
38
37
  });
39
38
  }
40
39
  } else {
41
40
  if (error) {
42
41
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
43
42
  return css({
44
- color: `var(--ds-text-subtle, ${N500})`,
45
- backgroundColor: `var(--ds-background-neutral, ${N40})`,
43
+ color: "var(--ds-text-subtle, #505258)",
44
+ backgroundColor: "var(--ds-background-neutral, #0515240F)",
46
45
  textDecoration: 'wavy underline',
47
46
  textDecorationThickness: '1px',
48
47
  textDecorationSkipInk: 'none',
49
- textDecorationColor: `var(--ds-text-danger, ${R400})`,
48
+ textDecorationColor: "var(--ds-text-danger, #AE2E24)",
50
49
  '&:hover': {
51
- backgroundColor: `var(--ds-background-neutral-hovered, ${N50})`
50
+ backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
52
51
  }
53
52
  });
54
53
  } else {
55
54
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
56
55
  return css({
57
- color: `var(--ds-text-subtle, ${N500})`,
58
- backgroundColor: `var(--ds-background-neutral, ${N40})`,
56
+ color: "var(--ds-text-subtle, #505258)",
57
+ backgroundColor: "var(--ds-background-neutral, #0515240F)",
59
58
  '&:hover': {
60
- backgroundColor: `var(--ds-background-neutral-hovered, ${N50})`
59
+ backgroundColor: "var(--ds-background-neutral-hovered, #0B120E24)"
61
60
  }
62
61
  });
63
62
  }
@@ -1,7 +1,8 @@
1
+ import { fg } from '@atlaskit/platform-feature-flags';
1
2
  import { getJastFromState } from '../../plugins/jql-ast';
2
3
  import { replaceRichInlineNodes } from '../../plugins/rich-inline-nodes/util/replace-nodes-transaction';
3
4
  import { actions } from '../index';
4
- import { ValidQueryVisitor } from './util';
5
+ import { normaliseHydrationKey, ValidQueryVisitor } from './util';
5
6
  export const hydrateQuery = () => async ({
6
7
  setState,
7
8
  getState,
@@ -32,21 +33,28 @@ export const hydrateQuery = () => async ({
32
33
  }
33
34
  try {
34
35
  const newHydratedValues = await onHydrate(queryToHydrate);
36
+
37
+ // IMPORTANT: Field name keys must be normalised (unquoted + lowercased) when storing hydrated values.
38
+ // The hydration API returns field names in a canonical format (e.g. 'Project[AtlassianProject]'),
39
+ // but lookup keys from ProseMirror node attributes may differ in quoting and casing
40
+ // (e.g. '"project[atlassianproject]"'). normaliseHydrationKey ensures both storage and lookup use
41
+ // the same key format. See normaliseHydrationKey in ./util.ts.
35
42
  const hydratedValuesMap = Object.entries(newHydratedValues).reduce((map, [fieldName, values]) => {
36
- const valueMap = new Map(oldHydratedValues[fieldName]);
43
+ const fieldNameToUse = fg('projects_in_jira_eap_drop2') ? normaliseHydrationKey(fieldName) : fieldName;
44
+ const valueMap = new Map(oldHydratedValues[fieldNameToUse]);
37
45
  values.forEach(value => {
38
46
  valueMap.set(value.id, value);
39
47
  });
40
48
  return {
41
49
  ...map,
42
- [fieldName]: valueMap
50
+ [fieldNameToUse]: valueMap
43
51
  };
44
52
  }, {});
45
53
  setState({
46
54
  hydratedValues: hydratedValuesMap
47
55
  });
48
56
  dispatch(replaceHydratedValuesWithRichInlineNodes());
49
- } catch (error) {
57
+ } catch {
50
58
  // Hydration failed, do nothing
51
59
  }
52
60
  };
@@ -1,7 +1,14 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- import { AbstractJastVisitor } from '@atlaskit/jql-ast';
2
+ import { AbstractJastVisitor, normaliseJqlString } from '@atlaskit/jql-ast';
3
3
  import { fg } from '@atlaskit/platform-feature-flags';
4
4
 
5
+ /**
6
+ * Normalise a JQL string for use as a hydration map key.
7
+ * Strips quotes/escaping and lowercases to ensure case-insensitive matching
8
+ * between field names from different sources (e.g. AST vs hydration API).
9
+ */
10
+ export const normaliseHydrationKey = key => normaliseJqlString(key).toLowerCase();
11
+
5
12
  /**
6
13
  * Given an AST with parse errors, this visitor returns a valid query that is equivalent for hydration purposes
7
14
  * (i.e. just fields, operators and values). Resulting query is generated on a best-effort basis and depends on
@@ -9,6 +9,7 @@ import { v4 as uuidv4 } from 'uuid';
9
9
  import { EditorView } from '@atlaskit/editor-prosemirror/view';
10
10
  import { computeJqlInsights, isListOperator, normaliseJqlString } from '@atlaskit/jql-ast';
11
11
  import { JQLAutocomplete } from '@atlaskit/jql-autocomplete';
12
+ import { fg } from '@atlaskit/platform-feature-flags';
12
13
  import { ActionSubject, ActionSubjectId, Action as AnalyticsAction, EventType } from '../analytics';
13
14
  import { selectErrorCommand } from '../commands/select-error-command';
14
15
  import { JQL_EDITOR_MAIN_ID } from '../common/constants';
@@ -19,6 +20,7 @@ import { getNodeText } from '../utils/document-text';
19
20
  import { onStartAutocompleteEvent } from './analytics';
20
21
  import { sortOperators } from './autocomplete';
21
22
  import { hydrateQuery } from './hydration';
23
+ import { normaliseHydrationKey } from './hydration/util';
22
24
  import { getAutocompleteOptionId, getAutocompletePosition, getFieldNodes, getReplacePositionStart, sendDebugMessage, tokensToAutocompleteOptions } from './util';
23
25
  const initialIntl = createIntl({
24
26
  locale: 'en'
@@ -864,13 +866,22 @@ export const useAutocompletePosition = createHook(Store, {
864
866
  };
865
867
  }
866
868
  });
869
+
870
+ // IMPORTANT: All hydration lookup hooks below must normalise fieldName using normaliseHydrationKey.
871
+ // This ensures consistent matching regardless of quoting or casing differences between the hydration API
872
+ // response (storage) and ProseMirror node attributes (lookup). Both sides must use the same normalisation.
873
+ // See normaliseHydrationKey in ./hydration/util.ts for details.
867
874
  export const useHydratedValue = createHook(Store, {
868
875
  selector: (state, {
869
876
  id,
870
877
  fieldName
871
878
  }) => {
872
- var _state$hydratedValues;
873
- return (_state$hydratedValues = state.hydratedValues[fieldName]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get(id);
879
+ var _state$hydratedValues2;
880
+ if (fg('projects_in_jira_eap_drop2')) {
881
+ var _state$hydratedValues;
882
+ return (_state$hydratedValues = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get(normaliseJqlString(id));
883
+ }
884
+ return (_state$hydratedValues2 = state.hydratedValues[fieldName]) === null || _state$hydratedValues2 === void 0 ? void 0 : _state$hydratedValues2.get(id);
874
885
  }
875
886
  });
876
887
  export const useHydratedUser = createHook(Store, {
@@ -878,8 +889,8 @@ export const useHydratedUser = createHook(Store, {
878
889
  id,
879
890
  fieldName
880
891
  }) => {
881
- var _state$hydratedValues2;
882
- const user = (_state$hydratedValues2 = state.hydratedValues[fieldName]) === null || _state$hydratedValues2 === void 0 ? void 0 : _state$hydratedValues2.get(id);
892
+ var _state$hydratedValues3, _state$hydratedValues4;
893
+ const 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);
883
894
  return user && user.type === 'user' ? user : undefined;
884
895
  }
885
896
  });
@@ -888,8 +899,8 @@ export const useHydratedTeam = createHook(Store, {
888
899
  id,
889
900
  fieldName
890
901
  }) => {
891
- var _state$hydratedValues3;
892
- const team = (_state$hydratedValues3 = state.hydratedValues[fieldName]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get(id);
902
+ var _state$hydratedValues5, _state$hydratedValues6;
903
+ const 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);
893
904
  return team && team.type === 'team' ? team : undefined;
894
905
  }
895
906
  });
@@ -898,8 +909,8 @@ export const useHydratedProject = createHook(Store, {
898
909
  id,
899
910
  fieldName
900
911
  }) => {
901
- var _state$hydratedValues4;
902
- const project = (_state$hydratedValues4 = state.hydratedValues[normaliseJqlString(fieldName)]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get(normaliseJqlString(id));
912
+ var _state$hydratedValues7, _state$hydratedValues8;
913
+ const 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));
903
914
  return project && project.type === 'project' ? project : undefined;
904
915
  }
905
916
  });
@@ -909,8 +920,8 @@ export const useHydratedDeprecations = createHook(Store, {
909
920
  const fieldsInQuery = getFieldNodes(ast);
910
921
  const toReturn = [];
911
922
  Object.entries(state.hydratedValues).forEach(([fieldName]) => {
912
- var _state$hydratedValues5;
913
- (_state$hydratedValues5 = state.hydratedValues[fieldName]) === null || _state$hydratedValues5 === void 0 ? void 0 : _state$hydratedValues5.forEach(value => {
923
+ var _state$hydratedValues9;
924
+ (_state$hydratedValues9 = state.hydratedValues[fieldName]) === null || _state$hydratedValues9 === void 0 ? void 0 : _state$hydratedValues9.forEach(value => {
914
925
  if (value.type === 'deprecated-field') {
915
926
  if (fieldsInQuery.has(value.id.toLowerCase())) {
916
927
  toReturn.push(value);
@@ -4,7 +4,6 @@ import { IconButton } from '@atlaskit/button/new';
4
4
  import GrowDiagonalIcon from '@atlaskit/icon/core/grow-diagonal';
5
5
  import ShrinkDiagonalIcon from '@atlaskit/icon/core/shrink-diagonal';
6
6
  import { fg } from '@atlaskit/platform-feature-flags';
7
- import { N50, N500 } from '@atlaskit/theme/colors';
8
7
  import { ExpandToggleContainer } from './styled';
9
8
 
10
9
  // Atlaskit doesn't provide a circle variation of the expand/collapse icons so we have to implement our own
@@ -12,13 +11,13 @@ const ExpandCircleIcon = ({
12
11
  isDisabled
13
12
  }) => /*#__PURE__*/React.createElement(GrowDiagonalIcon, {
14
13
  label: '',
15
- color: isDisabled ? `var(--ds-icon-disabled, ${N50})` : `var(--ds-icon, ${N500})`
14
+ color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon, #292A2E)"
16
15
  });
17
16
  const CollapseCircleIcon = ({
18
17
  isDisabled
19
18
  }) => /*#__PURE__*/React.createElement(ShrinkDiagonalIcon, {
20
19
  label: '',
21
- color: isDisabled ? `var(--ds-icon-disabled, ${N50})` : `var(--ds-icon, ${N500})`
20
+ color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon, #292A2E)"
22
21
  });
23
22
  export const BaseExpandToggle = ({
24
23
  expanded,
@@ -1,6 +1,5 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import styled from '@emotion/styled';
3
- import { N40, N50 } from '@atlaskit/theme/colors';
4
3
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled, @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
5
4
  export const ExpandToggleContainer = styled.div({
6
5
  /* Override background styles for our button to match designs */
@@ -10,11 +9,11 @@ export const ExpandToggleContainer = styled.div({
10
9
  /* Fill the remaining vertical space for a single line in our editor and space between buttons */
11
10
  margin: `${"var(--ds-space-050, 4px)"} 0`,
12
11
  '&:hover': {
13
- background: `var(--ds-background-neutral-subtle-hovered, ${N40})`
12
+ background: "var(--ds-background-neutral-subtle-hovered, #0515240F)"
14
13
  },
15
14
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
16
15
  "&:active, &[data-firefox-is-active='true']": {
17
- background: `var(--ds-background-neutral-subtle-pressed, ${N50})`
16
+ background: "var(--ds-background-neutral-subtle-pressed, #0B120E24)"
18
17
  }
19
18
  }
20
19
  });
@@ -6,7 +6,6 @@ import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';
6
6
  import { fg } from '@atlaskit/platform-feature-flags';
7
7
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
8
8
  import { Box, xcss } from '@atlaskit/primitives';
9
- import { N0 } from '@atlaskit/theme/colors';
10
9
  import { SyntaxHelpContainer } from './styled';
11
10
 
12
11
  // Fixes icon margin issus after new icon migration
@@ -44,7 +43,7 @@ export const BaseSyntaxHelp = ({
44
43
  xcss: iconStyle
45
44
  }, /*#__PURE__*/React.createElement(QuestionCircleIcon, {
46
45
  label: '',
47
- color: isDisabled ? `var(--ds-icon-disabled, ${N0})` : `var(--ds-icon-inverse, ${N0})`
46
+ color: isDisabled ? "var(--ds-icon-disabled, #080F214A)" : "var(--ds-icon-inverse, #FFFFFF)"
48
47
  })),
49
48
  onClick: onClick
50
49
  }));