@atlaskit/jql-editor 4.1.0 → 4.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/jql-editor
 
+## 4.2.0
+
+### Minor Changes
+
+- [#91934](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/91934) [`b76a78c6a199`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b76a78c6a199) - bumped editor-prosemirror version to 4.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 4.1.1
+
+### Patch Changes
+
+- [#92100](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92100) [`9dea2099d7d5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9dea2099d7d5) - Fix module-level FF evaluation
+
 ## 4.1.0
 
 ### Minor 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", "4.1.0", _jqlEditorCommon.ANALYTICS_CHANNEL);
+  return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "4.2.0", _jqlEditorCommon.ANALYTICS_CHANNEL);
 };

package/dist/cjs/ui/jql-editor-layout/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.JQLEditorReadOnly = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useEditorTheme = require("../../hooks/use-editor-theme");
 var _splitTextByNewLine = require("../../utils/split-text-by-new-line");
 var _readOnlyControlsContent = require("../jql-editor-controls-content/read-only-controls-content");
@@ -37,6 +38,7 @@ var JQLEditorLayout = function JQLEditorLayout(props) {
   }, /*#__PURE__*/_react.default.createElement(_styled.EditorViewContainer, {
     editorViewHasFocus: editorViewHasFocus,
     editorViewIsInvalid: editorViewIsInvalid,
+    isBorderContrastFixEnabled: (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? true : false,
     ref: onEditorViewContainerRef,
     onScroll: onEditorViewContainerScroll
   }, /*#__PURE__*/_react.default.createElement(_styled.LineNumberToolbar, {
@@ -70,7 +72,9 @@ var JQLEditorReadOnlyWithoutTheme = function JQLEditorReadOnlyWithoutTheme(_ref)
     isCompact = _useEditorThemeContex2.isCompact;
   var blocks = (0, _splitTextByNewLine.splitTextByNewLine)(query);
   var lineNumbersVisible = blocks.length > 1;
-  return /*#__PURE__*/_react.default.createElement(_styled.EditorMain, null, /*#__PURE__*/_react.default.createElement(_styled.ReadOnlyEditorViewContainer, null, /*#__PURE__*/_react.default.createElement(_styled.LineNumberToolbar, {
+  return /*#__PURE__*/_react.default.createElement(_styled.EditorMain, null, /*#__PURE__*/_react.default.createElement(_styled.ReadOnlyEditorViewContainer, {
+    isBorderContrastFixEnabled: (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? true : false
+  }, /*#__PURE__*/_react.default.createElement(_styled.LineNumberToolbar, {
     lineNumbersVisible: lineNumbersVisible
   }), /*#__PURE__*/_react.default.createElement(_styled.ReadOnlyEditorView, {
     "data-testid": "jql-editor-read-only",

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

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
 var _constants2 = require("../../plugins/validation-tooltip/constants");
@@ -49,31 +48,34 @@ var getEditorInputVerticalPadding = function getEditorInputVerticalPadding(isCom
   return isCompact ? 3 : 7;
 };
 var editorInputHorizontalPadding = 6;
-var EditorViewContainer = exports.EditorViewContainer = _styled.default.div(_objectSpread(_objectSpread({
+var EditorViewContainer = exports.EditorViewContainer = _styled.default.div({
   backgroundColor: "var(--ds-background-input, ".concat(_colors.N10, ")"),
   borderStyle: 'solid',
-  borderWidth: (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? "var(--ds-border-width, 1px)" : '2px',
-  borderColor: (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? "var(--ds-border-input, ".concat(_colors.N100, ")") : "var(--ds-border, ".concat(_colors.N40, ")"),
-  borderRadius: "var(--ds-border-radius-100, 3px)"
-}, (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
-  padding: "var(--ds-border-width, 1px)"
-} : {}), {}, {
+  borderWidth: '2px',
+  borderColor: "var(--ds-border, ".concat(_colors.N40, ")"),
+  borderRadius: "var(--ds-border-radius-100, 3px)",
   boxSizing: 'border-box',
   color: "var(--ds-text, ".concat(_colors.N900, ")"),
   display: 'flex',
   overflow: 'auto',
   transition: 'background-color 0.2s ease-in-out, border-color 0.2s ease-in-out'
-}), function (props) {
+}, function (props) {
+  return props.isBorderContrastFixEnabled && (0, _react.css)({
+    borderWidth: "var(--ds-border-width, 1px)",
+    borderColor: "var(--ds-border-input, ".concat(_colors.N100, ")"),
+    padding: "var(--ds-border-width, 1px)"
+  });
+}, function (props) {
   return props.editorViewIsInvalid && (0, _react.css)(_objectSpread({
     borderColor: "var(--ds-border-danger, ".concat(_colors.R400, ")")
-  }, (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
+  }, props.isBorderContrastFixEnabled ? {
     boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-danger, ".concat(_colors.R400, ")"))
   } : {}));
 }, function (props) {
   return props.editorViewHasFocus ? (0, _react.css)(_objectSpread({
     backgroundColor: "var(--ds-surface, ".concat(_colors.N0, ")"),
-    borderColor: "var(--ds-border-focused, ".concat((0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? _colors.B200 : _colors.B100, ")")
-  }, (0, _platformFeatureFlags.getBooleanFF)('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
+    borderColor: "var(--ds-border-focused, ".concat(props.isBorderContrastFixEnabled ? _colors.B200 : _colors.B100, ")")
+  }, props.isBorderContrastFixEnabled ? {
     boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-focused, ".concat(_colors.B200, ")"))
   } : {})) : (0, _react.css)({
     ':hover': {

package/dist/es2019/analytics/util.js

@@ -1,4 +1,4 @@
 import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
 export const useJqlEditorAnalytics = analyticsSource => {
-  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.1.0", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.2.0", ANALYTICS_CHANNEL);
 };

package/dist/es2019/ui/jql-editor-layout/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { EditorThemeContext, useEditorTheme, useEditorThemeContext } from '../../hooks/use-editor-theme';
 import { splitTextByNewLine } from '../../utils/split-text-by-new-line';
 // eslint-disable-next-line @atlassian/tangerine/import/no-parent-imports
@@ -32,6 +33,7 @@ const JQLEditorLayout = props => {
   }, /*#__PURE__*/React.createElement(EditorViewContainer, {
     editorViewHasFocus: editorViewHasFocus,
     editorViewIsInvalid: editorViewIsInvalid,
+    isBorderContrastFixEnabled: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? true : false,
     ref: onEditorViewContainerRef,
     onScroll: onEditorViewContainerScroll
   }, /*#__PURE__*/React.createElement(LineNumberToolbar, {
@@ -67,7 +69,9 @@ const JQLEditorReadOnlyWithoutTheme = ({
   } = useEditorThemeContext();
   const blocks = splitTextByNewLine(query);
   const lineNumbersVisible = blocks.length > 1;
-  return /*#__PURE__*/React.createElement(EditorMain, null, /*#__PURE__*/React.createElement(ReadOnlyEditorViewContainer, null, /*#__PURE__*/React.createElement(LineNumberToolbar, {
+  return /*#__PURE__*/React.createElement(EditorMain, null, /*#__PURE__*/React.createElement(ReadOnlyEditorViewContainer, {
+    isBorderContrastFixEnabled: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? true : false
+  }, /*#__PURE__*/React.createElement(LineNumberToolbar, {
     lineNumbersVisible: lineNumbersVisible
   }), /*#__PURE__*/React.createElement(ReadOnlyEditorView, {
     "data-testid": "jql-editor-read-only",

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

@@ -1,6 +1,5 @@
 import { css, keyframes } from '@emotion/react';
 import styled from '@emotion/styled';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B100, B200, B300, G300, N0, N10, N100, N30, N40, N700, N800, N900, P400, R400 } from '@atlaskit/theme/colors';
 import { codeFontFamily, fontFamily, fontSize,
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
@@ -76,27 +75,27 @@ const editorInputHorizontalPadding = 6;
 export const EditorViewContainer = styled.div({
   backgroundColor: `var(--ds-background-input, ${N10})`,
   borderStyle: 'solid',
-  borderWidth: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? "var(--ds-border-width, 1px)" : '2px',
-  borderColor: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? `var(--ds-border-input, ${N100})` : `var(--ds-border, ${N40})`,
+  borderWidth: '2px',
+  borderColor: `var(--ds-border, ${N40})`,
   borderRadius: "var(--ds-border-radius-100, 3px)",
-  // add 1px padding to keep the same overall height & width after border reduced from 2px to 1px
-  ...(getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
-    padding: "var(--ds-border-width, 1px)"
-  } : {}),
   boxSizing: 'border-box',
   color: `var(--ds-text, ${N900})`,
   display: 'flex',
   overflow: 'auto',
   transition: 'background-color 0.2s ease-in-out, border-color 0.2s ease-in-out'
-}, props => props.editorViewIsInvalid && css({
+}, props => props.isBorderContrastFixEnabled && css({
+  borderWidth: "var(--ds-border-width, 1px)",
+  borderColor: `var(--ds-border-input, ${N100})`,
+  padding: "var(--ds-border-width, 1px)"
+}), props => props.editorViewIsInvalid && css({
   borderColor: `var(--ds-border-danger, ${R400})`,
-  ...(getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
+  ...(props.isBorderContrastFixEnabled ? {
     boxShadow: `inset 0 0 0 ${"var(--ds-border-width, 1px)"} ${`var(--ds-border-danger, ${R400})`}`
   } : {})
 }), props => props.editorViewHasFocus ? css({
   backgroundColor: `var(--ds-surface, ${N0})`,
-  borderColor: `var(--ds-border-focused, ${getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? B200 : B100})`,
-  ...(getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
+  borderColor: `var(--ds-border-focused, ${props.isBorderContrastFixEnabled ? B200 : B100})`,
+  ...(props.isBorderContrastFixEnabled ? {
     boxShadow: `inset 0 0 0 ${"var(--ds-border-width, 1px)"} ${`var(--ds-border-focused, ${B200})`}`
   } : {})
 }) : css({

package/dist/esm/analytics/util.js

@@ -1,4 +1,4 @@
 import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
 export var useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
-  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.1.0", ANALYTICS_CHANNEL);
+  return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "4.2.0", ANALYTICS_CHANNEL);
 };

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

@@ -1,6 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["isSearch", "isCompact"];
 import React from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { EditorThemeContext, useEditorTheme, useEditorThemeContext } from '../../hooks/use-editor-theme';
 import { splitTextByNewLine } from '../../utils/split-text-by-new-line';
 // eslint-disable-next-line @atlassian/tangerine/import/no-parent-imports
@@ -31,6 +32,7 @@ var JQLEditorLayout = function JQLEditorLayout(props) {
   }, /*#__PURE__*/React.createElement(EditorViewContainer, {
     editorViewHasFocus: editorViewHasFocus,
     editorViewIsInvalid: editorViewIsInvalid,
+    isBorderContrastFixEnabled: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? true : false,
     ref: onEditorViewContainerRef,
     onScroll: onEditorViewContainerScroll
   }, /*#__PURE__*/React.createElement(LineNumberToolbar, {
@@ -64,7 +66,9 @@ var JQLEditorReadOnlyWithoutTheme = function JQLEditorReadOnlyWithoutTheme(_ref)
     isCompact = _useEditorThemeContex2.isCompact;
   var blocks = splitTextByNewLine(query);
   var lineNumbersVisible = blocks.length > 1;
-  return /*#__PURE__*/React.createElement(EditorMain, null, /*#__PURE__*/React.createElement(ReadOnlyEditorViewContainer, null, /*#__PURE__*/React.createElement(LineNumberToolbar, {
+  return /*#__PURE__*/React.createElement(EditorMain, null, /*#__PURE__*/React.createElement(ReadOnlyEditorViewContainer, {
+    isBorderContrastFixEnabled: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? true : false
+  }, /*#__PURE__*/React.createElement(LineNumberToolbar, {
     lineNumbersVisible: lineNumbersVisible
   }), /*#__PURE__*/React.createElement(ReadOnlyEditorView, {
     "data-testid": "jql-editor-read-only",

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

@@ -5,7 +5,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { css, keyframes } from '@emotion/react';
 import styled from '@emotion/styled';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { B100, B200, B300, G300, N0, N10, N100, N30, N40, N700, N800, N900, P400, R400 } from '@atlaskit/theme/colors';
 import { codeFontFamily, fontFamily, fontSize,
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
@@ -44,31 +43,34 @@ var getEditorInputVerticalPadding = function getEditorInputVerticalPadding(isCom
   return isCompact ? 3 : 7;
 };
 var editorInputHorizontalPadding = 6;
-export var EditorViewContainer = styled.div(_objectSpread(_objectSpread({
+export var EditorViewContainer = styled.div({
   backgroundColor: "var(--ds-background-input, ".concat(N10, ")"),
   borderStyle: 'solid',
-  borderWidth: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? "var(--ds-border-width, 1px)" : '2px',
-  borderColor: getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? "var(--ds-border-input, ".concat(N100, ")") : "var(--ds-border, ".concat(N40, ")"),
-  borderRadius: "var(--ds-border-radius-100, 3px)"
-}, getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
-  padding: "var(--ds-border-width, 1px)"
-} : {}), {}, {
+  borderWidth: '2px',
+  borderColor: "var(--ds-border, ".concat(N40, ")"),
+  borderRadius: "var(--ds-border-radius-100, 3px)",
   boxSizing: 'border-box',
   color: "var(--ds-text, ".concat(N900, ")"),
   display: 'flex',
   overflow: 'auto',
   transition: 'background-color 0.2s ease-in-out, border-color 0.2s ease-in-out'
-}), function (props) {
+}, function (props) {
+  return props.isBorderContrastFixEnabled && css({
+    borderWidth: "var(--ds-border-width, 1px)",
+    borderColor: "var(--ds-border-input, ".concat(N100, ")"),
+    padding: "var(--ds-border-width, 1px)"
+  });
+}, function (props) {
   return props.editorViewIsInvalid && css(_objectSpread({
     borderColor: "var(--ds-border-danger, ".concat(R400, ")")
-  }, getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
+  }, props.isBorderContrastFixEnabled ? {
     boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-danger, ".concat(R400, ")"))
   } : {}));
 }, function (props) {
   return props.editorViewHasFocus ? css(_objectSpread({
     backgroundColor: "var(--ds-surface, ".concat(N0, ")"),
-    borderColor: "var(--ds-border-focused, ".concat(getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? B200 : B100, ")")
-  }, getBooleanFF('platform.a11y-jira-team.fix-border-contrast-for-jql-editor-textarea_vy0qk') ? {
+    borderColor: "var(--ds-border-focused, ".concat(props.isBorderContrastFixEnabled ? B200 : B100, ")")
+  }, props.isBorderContrastFixEnabled ? {
     boxShadow: "inset 0 0 0 ".concat("var(--ds-border-width, 1px)", " ", "var(--ds-border-focused, ".concat(B200, ")"))
   } : {})) : css({
     ':hover': {

package/dist/types/ui/jql-editor-layout/styled.d.ts

@@ -10,6 +10,7 @@ export declare const EditorFooter: import("@emotion/styled").StyledComponent<{
 type EditorViewContainerProps = {
     editorViewHasFocus?: boolean;
     editorViewIsInvalid?: boolean;
+    isBorderContrastFixEnabled: boolean;
 };
 export declare const EditorViewContainer: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;

package/dist/types-ts4.5/ui/jql-editor-layout/styled.d.ts

@@ -10,6 +10,7 @@ export declare const EditorFooter: import("@emotion/styled").StyledComponent<{
 type EditorViewContainerProps = {
     editorViewHasFocus?: boolean;
     editorViewIsInvalid?: boolean;
+    isBorderContrastFixEnabled: boolean;
 };
 export declare const EditorViewContainer: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/jql-editor",
-  "version": "4.1.0",
+  "version": "4.2.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",
@@ -37,11 +37,11 @@
   },
   "dependencies": {
     "@atlaskit/analytics-gas-types": "^5.1.0",
-    "@atlaskit/analytics-next": "^9.2.0",
+    "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/avatar": "^21.5.0",
-    "@atlaskit/button": "^17.12.0",
-    "@atlaskit/editor-prosemirror": "3.0.0",
-    "@atlaskit/form": "^9.2.0",
+    "@atlaskit/button": "^17.14.0",
+    "@atlaskit/editor-prosemirror": "4.0.0",
+    "@atlaskit/form": "^9.3.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/jql-ast": "^3.2.0",
     "@atlaskit/jql-autocomplete": "^2.0.0",