@atlaskit/link-datasource 4.20.5 → 4.21.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/link-datasource
 
+## 4.21.0
+
+### Minor Changes
+
+- [`6ce6f7249075d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ce6f7249075d) -
+  [ux] NAVX-1483 using the ADS modal built in hasCloseButton for LP components to adhere to a11y
+
+### Patch Changes
+
+- [`d28c4180ae756`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d28c4180ae756) -
+  Internal changes to how border radius is applied.
+- [`fe80630362c42`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fe80630362c42) -
+  NAVX-1379 Cleaning up navx-1184-fix-smart-link-a-11-y-interactive-states
+- Updated dependencies
+
 ## 4.20.5
 
 ### Patch Changes

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -324,10 +324,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         },
         onSearch: handleOnSearch,
         modalTitle: AssetsModalTitle,
-        isSearching: status === 'loading'
+        isSearching: status === 'loading',
+        onCancel: onCancel
       });
     }
-  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status, onCancel]);
   var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
     return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
       searchCount: searchCount.current,

package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.compiled.css

@@ -1,7 +1,7 @@
 
 ._19itn8v0{border:var(--_vzvmm2)}
 ._n7zl1oe8{border-bottom:var(--_cfwo9c)}._12vemgnk{background-repeat:no-repeat}
-._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
+._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
 ._18m915vq{overflow-y:hidden}
 ._18m91wug{overflow-y:auto}
 ._1e0c11p5{display:grid}
@@ -11,4 +11,4 @@
 ._1reo1wug{overflow-x:auto}
 ._4t3i1pna{height:420px}
 ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
-._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
+._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}

package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.js

@@ -45,7 +45,7 @@ var NoResultsView = function NoResultsView() {
 };
 var LoadingView = function LoadingView() {
   return /*#__PURE__*/React.createElement("div", {
-    className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13lipd34 _qrwqpd34 _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"]),
+    className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13li1mok _qrwq1mok _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"]),
     style: {
       "--_vzvmm2": (0, _runtime.ix)("1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")"))),
       "--_cfwo9c": (0, _runtime.ix)("2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"))),
@@ -70,7 +70,7 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var issueLikeDataTableView = (0, _react.useMemo)(function () {
     return /*#__PURE__*/React.createElement("div", {
-      className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13lipd34 _qrwqpd34 _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00"]),
+      className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13li1mok _qrwq1mok _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00"]),
       style: {
         "--_vzvmm2": (0, _runtime.ix)("1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")"))),
         "--_cfwo9c": (0, _runtime.ix)("2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"))),

package/dist/cjs/ui/assets-modal/search-container/index.compiled.css

@@ -1,4 +1,7 @@
-._1bsb1osq{width:100%}
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}._1bsb1osq{width:100%}
 ._1e0c11p5{display:grid}
 ._1p57pxbi{row-gap:var(--ds-space-200,1pc)}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}
 ._p12ffkat{max-width:386px}

package/dist/cjs/ui/assets-modal/search-container/index.js

@@ -14,6 +14,9 @@ var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _form = _interopRequireDefault(require("@atlaskit/form"));
+var _modalDialog = require("@atlaskit/modal-dialog");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var _aqlSearchInput = require("./aql-search-input");
 var _objectSchemaSelect = require("./object-schema-select");
@@ -21,6 +24,10 @@ var _styled = require("./styled");
 var _excluded = ["as", "style"],
   _excluded2 = ["as", "style"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var styles = {
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq"
+};
 var DEFAULT_AQL_QUERY = '';
 var SEARCH_FORM_ID = 'linkDataSource.assets.configModal.searchContainer-form';
 
@@ -60,7 +67,8 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
     workspaceId = props.workspaceId,
     initialSearchData = props.initialSearchData,
     modalTitle = props.modalTitle,
-    isSearching = props.isSearching;
+    isSearching = props.isSearching,
+    onCancel = props.onCancel;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var onFormSubmit = function onFormSubmit(searchFormValues) {
@@ -75,18 +83,34 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
   return /*#__PURE__*/React.createElement(_form.default, {
     onSubmit: onFormSubmit
   }, function (_ref3) {
-    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
+    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$ob3, _initialSearchData$ob4, _initialSearchData$aq;
     var formProps = _ref3.formProps;
     return /*#__PURE__*/React.createElement(FormContainer, (0, _extends2.default)({}, formProps, {
       id: SEARCH_FORM_ID
     }), /*#__PURE__*/React.createElement(_styled.FormRowContainer, {
       isNarrowGap: true
-    }, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(_objectSchemaSelect.AssetsObjectSchemaSelect, {
+    }, (0, _platformFeatureFlags.fg)('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(_compiled.Flex, {
+      gap: "space.200",
+      justifyContent: "space-between",
+      xcss: styles.flexStyles
+    }, /*#__PURE__*/React.createElement(_compiled.Flex, {
+      justifyContent: "end"
+    }, /*#__PURE__*/React.createElement(_modalDialog.CloseButton, {
+      onClick: onCancel
+    })), /*#__PURE__*/React.createElement(_compiled.Flex, {
+      justifyContent: "start",
+      xcss: styles.modalTitleContainer
+    }, modalTitle, /*#__PURE__*/React.createElement(_objectSchemaSelect.AssetsObjectSchemaSelect, {
       value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
       workspaceId: workspaceId,
       initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
       classNamePrefix: "assets-datasource-modal--object-schema-select"
-    }))), /*#__PURE__*/React.createElement(_styled.FormRowContainer, null, /*#__PURE__*/React.createElement(_aqlSearchInput.AqlSearchInput, {
+    }))) : /*#__PURE__*/React.createElement("div", null, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(_objectSchemaSelect.AssetsObjectSchemaSelect, {
+      value: (_initialSearchData$ob3 = initialSearchData.objectSchema) !== null && _initialSearchData$ob3 !== void 0 ? _initialSearchData$ob3 : undefined,
+      workspaceId: workspaceId,
+      initialObjectSchemas: (_initialSearchData$ob4 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob4 !== void 0 ? _initialSearchData$ob4 : undefined,
+      classNamePrefix: "assets-datasource-modal--object-schema-select"
+    })))), /*#__PURE__*/React.createElement(_styled.FormRowContainer, null, /*#__PURE__*/React.createElement(_aqlSearchInput.AqlSearchInput, {
       value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,
       workspaceId: workspaceId,
       isSearching: isSearching

package/dist/cjs/ui/common/modal/content-container/index.compiled.css

@@ -5,7 +5,7 @@
 ._n7zl8e97{border-bottom:var(--ds-border-width-outline,2px) solid var(--ds-border,#dfe1e6)}
 ._n7zlglyw{border-bottom:none}
 ._x3do1x13{border-top:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
-._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
+._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
 ._18m91wug{overflow-y:auto}
 ._1e0c11p5{display:grid}
 ._1itk1sfv{background-image:linear-gradient(90deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(90deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1)),transparent),linear-gradient(90deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 70%),linear-gradient(90deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1))),linear-gradient(0deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 30%),linear-gradient(0deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05))),linear-gradient(0deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(0deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05)),transparent)}
@@ -14,4 +14,4 @@
 ._c71l1pna{max-height:420px}
 ._ouxlbac2{background-position:0,0,100%,100%,top,0 52px,bottom,bottom}
 ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
-._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
+._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}

package/dist/cjs/ui/common/modal/content-container/index.js

@@ -13,7 +13,7 @@ var _css = require("@atlaskit/css");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _colors = require("@atlaskit/theme/colors");
 var styles = {
-  tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13lipd34 _qrwqpd34",
+  tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13li1mok _qrwq1mok",
   contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00",
   contentContainerRemoveBorderStyles: "_n7zlglyw"
 };

package/dist/cjs/ui/common/modal/count-view-smart-link/index.compiled.css

@@ -1,5 +1,5 @@
 
-._2rko16jk{border-radius:var(--ds-border-radius-200,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
+._2rko18qm{border-radius:var(--ds-radius-large,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
 ._19bvv77o{padding-left:var(--ds-space-025,2px)}
 ._ca0qze3t{padding-top:var(--ds-space-0,0)}
 ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}

package/dist/cjs/ui/common/modal/count-view-smart-link/index.js

@@ -13,7 +13,7 @@ var _reactIntlNext = require("react-intl-next");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _link = _interopRequireDefault(require("../../../issue-like-table/render-type/link"));
 var styles = {
-  placeholderSmartLinkStyles: "_2rko16jk _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
+  placeholderSmartLinkStyles: "_2rko18qm _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
   smartLinkContainerStyles: "_19bvv77o"
 };
 var SmartCardPlaceholder = exports.SmartCardPlaceholder = function SmartCardPlaceholder(_ref) {

package/dist/cjs/ui/common/modal/popup-select/dropdownIndicator.js

@@ -11,7 +11,6 @@ var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
 var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/core/cross-circle"));
 var _search = _interopRequireDefault(require("@atlaskit/icon/core/search"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _select = require("@atlaskit/select");
 var styles = {
@@ -20,7 +19,7 @@ var styles = {
 };
 var CustomDropdownIndicator = function CustomDropdownIndicator(props) {
   var selectProps = props.selectProps;
-  return /*#__PURE__*/_react.default.createElement(_select.components.DropdownIndicator, props, (0, _platformFeatureFlags.fg)('navx-1184-fix-smart-link-a11y-interactive-states') ? /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
+  return /*#__PURE__*/_react.default.createElement(_select.components.DropdownIndicator, props, /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
     xcss: styles.customDropdownIndicatorStyles,
     onClick: function onClick() {
       if (selectProps.inputValue) {
@@ -34,20 +33,6 @@ var CustomDropdownIndicator = function CustomDropdownIndicator(props) {
     label: ""
   }) : /*#__PURE__*/_react.default.createElement(_search.default, {
     label: ""
-  })) : /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-    xcss: styles.customDropdownIndicatorStylesOld,
-    onClick: function onClick() {
-      if (selectProps.inputValue) {
-        selectProps.onInputChange && selectProps.onInputChange('', {
-          action: 'input-change',
-          prevInputValue: selectProps.inputValue
-        });
-      }
-    }
-  }, selectProps.inputValue ? /*#__PURE__*/_react.default.createElement(_crossCircle.default, {
-    label: ""
-  }) : /*#__PURE__*/_react.default.createElement(_search.default, {
-    label: ""
   })));
 };
 var _default = exports.default = CustomDropdownIndicator;

package/dist/cjs/ui/confluence-search-modal/modal/index.compiled.css

@@ -1,3 +1,8 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}
+._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
 ._1e0c1txw{display:flex}
 ._1tket9kd{min-height:72px}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}
 ._4cvr1q9y{align-items:baseline}

package/dist/cjs/ui/confluence-search-modal/modal/index.js

@@ -16,6 +16,7 @@ var _reactIntlNext = require("react-intl-next");
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _link = _interopRequireDefault(require("@atlaskit/link"));
 var _modalDialog = require("@atlaskit/modal-dialog");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var _types = require("../../../analytics/types");
@@ -49,7 +50,10 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 var styles = {
-  inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd"
+  inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd",
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq",
+  viewModeContainer: "_zulpu2gc _4cvr1h6o"
 };
 var isValidParameters = function isValidParameters(parameters) {
   return !!(parameters && parameters.cloudId && Object.values(parameters).filter(function (v) {
@@ -330,7 +334,25 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   }, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {
     testId: "confluence-search-datasource-modal",
     onClose: onCancel
-  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
+  }, (0, _platformFeatureFlags.fg)('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    gap: "space.200",
+    justifyContent: "space-between",
+    xcss: styles.flexStyles
+  }, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    justifyContent: "end",
+    xcss: styles.viewModeContainer
+  }, !hasNoConfluenceSites && /*#__PURE__*/_react.default.createElement(_modeSwitcher.DatasourceViewModeDropDown, null), /*#__PURE__*/_react.default.createElement(_modalDialog.CloseButton, {
+    onClick: onCancel
+  })), /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    justifyContent: "start",
+    xcss: styles.modalTitleContainer
+  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedConfluenceSite,
+    testId: "confluence-search-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  }))))) : /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedConfluenceSite,

package/dist/cjs/ui/issue-like-table/index.compiled.css

@@ -84,5 +84,5 @@
 ._x3fxnil1 font{medium:normal 400 14px/20px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif}
 ._yq5hus1c{border-collapse:separate}
 ._zzcc4f4w font{large:normal 400 1pc/24px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif}
-._8vu416jk:hover{border-radius:var(--ds-border-radius-200,3px)}
+._8vu418qm:hover{border-radius:var(--ds-radius-large,3px)}
 ._irr31d5g:hover{background-color:var(--ds-background-input-hovered,#f7f8f9)}

package/dist/cjs/ui/issue-like-table/index.js

@@ -507,7 +507,7 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     var isHeadingOutsideButton = !isEditable || !onWrappedColumnChange;
     if (isHeadingOutsideButton) {
       heading = /*#__PURE__*/React.createElement("div", {
-        className: (0, _runtime.ax)(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu416jk _irr31d5g"])
+        className: (0, _runtime.ax)(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr31d5g"])
       }, heading);
     }
     if (isEditable) {

package/dist/cjs/ui/jira-issues-modal/modal/index.compiled.css

@@ -0,0 +1,5 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}
+._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -1,3 +1,4 @@
+/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -6,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.JiraIssuesConfigModalNoSuspense = exports.JiraIssuesConfigModal = void 0;
+require("./index.compiled.css");
+var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -15,6 +18,7 @@ var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _link = _interopRequireDefault(require("@atlaskit/link"));
 var _modalDialog = require("@atlaskit/modal-dialog");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
@@ -56,6 +60,11 @@ var _messages3 = require("./messages");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable @atlaskit/platform/no-preconditioning */ /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
+var styles = {
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  viewModeContainer: "_zulpu2gc _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq"
+};
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   if (currentViewMode === 'table') {
     return _types.DatasourceDisplay.DATASOURCE_TABLE;
@@ -371,7 +380,25 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     testId: "jira-datasource-modal",
     onClose: onCancel,
     shouldReturnFocus: shouldReturnFocus
-  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
+  }, (0, _platformFeatureFlags.fg)('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    gap: "space.200",
+    justifyContent: "space-between",
+    xcss: styles.flexStyles
+  }, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    justifyContent: "end",
+    xcss: styles.viewModeContainer
+  }, !hasNoJiraSites && /*#__PURE__*/_react.default.createElement(_modeSwitcher.DatasourceViewModeDropDown, null), /*#__PURE__*/_react.default.createElement(_modalDialog.CloseButton, {
+    onClick: onCancel
+  })), /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
+    justifyContent: "start",
+    xcss: styles.modalTitleContainer
+  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedJiraSite,
+    testId: "jira-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  }))))) : /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedJiraSite,

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -297,10 +297,11 @@ const PlainAssetsConfigModal = props => {
         },
         onSearch: handleOnSearch,
         modalTitle: AssetsModalTitle,
-        isSearching: status === 'loading'
+        isSearching: status === 'loading',
+        onCancel: onCancel
       });
     }
-  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status, onCancel]);
   const getCancelButtonAnalyticsPayload = useCallback(() => {
     return {
       ...analyticsPayload,

package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.compiled.css

@@ -1,7 +1,7 @@
 
 ._19ith6cr{border:1px solid var(--ds-border,#dfe1e6)}
 ._n7zl17u4{border-bottom:2px solid var(--ds-background-accent-gray-subtler,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
-._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
+._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
 ._18m915vq{overflow-y:hidden}
 ._18m91wug{overflow-y:auto}
 ._1e0c11p5{display:grid}
@@ -11,4 +11,4 @@
 ._1reo1wug{overflow-x:auto}
 ._4t3i1pna{height:420px}
 ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
-._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
+._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}

package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.js

@@ -28,7 +28,7 @@ const NoResultsView = () => /*#__PURE__*/React.createElement("div", {
   className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5"])
 }, /*#__PURE__*/React.createElement(NoResults, null));
 const LoadingView = () => /*#__PURE__*/React.createElement("div", {
-  className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13lipd34 _qrwqpd34 _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"])
+  className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13li1mok _qrwq1mok _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"])
 }, /*#__PURE__*/React.createElement(EmptyState, {
   testId: "assets-aql-datasource-modal--loading-state"
 }));
@@ -48,7 +48,7 @@ export const RenderAssetsContent = props => {
   } = props;
   const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   const issueLikeDataTableView = useMemo(() => /*#__PURE__*/React.createElement("div", {
-    className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13lipd34 _qrwqpd34 _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00"])
+    className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13li1mok _qrwq1mok _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00"])
   }, /*#__PURE__*/React.createElement(IssueLikeDataTableView, {
     testId: "asset-datasource-table",
     status: status,

package/dist/es2019/ui/assets-modal/search-container/index.compiled.css

@@ -1,4 +1,7 @@
-._1bsb1osq{width:100%}
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}._1bsb1osq{width:100%}
 ._1e0c11p5{display:grid}
 ._1p57pxbi{row-gap:var(--ds-space-200,1pc)}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}
 ._p12ffkat{max-width:386px}

package/dist/es2019/ui/assets-modal/search-container/index.js

@@ -5,10 +5,17 @@ import { forwardRef } from 'react';
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import Form from '@atlaskit/form';
+import { CloseButton } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { AqlSearchInput } from './aql-search-input';
 import { AssetsObjectSchemaSelect } from './object-schema-select';
 import { FormRowContainer } from './styled';
+const styles = {
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq"
+};
 const DEFAULT_AQL_QUERY = '';
 const SEARCH_FORM_ID = 'linkDataSource.assets.configModal.searchContainer-form';
 
@@ -49,7 +56,8 @@ export const AssetsSearchContainer = props => {
     workspaceId,
     initialSearchData,
     modalTitle,
-    isSearching
+    isSearching,
+    onCancel
   } = props;
   const {
     fireEvent
@@ -70,17 +78,33 @@ export const AssetsSearchContainer = props => {
   }, ({
     formProps
   }) => {
-    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
+    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$ob3, _initialSearchData$ob4, _initialSearchData$aq;
     return /*#__PURE__*/React.createElement(FormContainer, _extends({}, formProps, {
       id: SEARCH_FORM_ID
     }), /*#__PURE__*/React.createElement(FormRowContainer, {
       isNarrowGap: true
-    }, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
+    }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(Flex, {
+      gap: "space.200",
+      justifyContent: "space-between",
+      xcss: styles.flexStyles
+    }, /*#__PURE__*/React.createElement(Flex, {
+      justifyContent: "end"
+    }, /*#__PURE__*/React.createElement(CloseButton, {
+      onClick: onCancel
+    })), /*#__PURE__*/React.createElement(Flex, {
+      justifyContent: "start",
+      xcss: styles.modalTitleContainer
+    }, modalTitle, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
       value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
       workspaceId: workspaceId,
       initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
       classNamePrefix: "assets-datasource-modal--object-schema-select"
-    }))), /*#__PURE__*/React.createElement(FormRowContainer, null, /*#__PURE__*/React.createElement(AqlSearchInput, {
+    }))) : /*#__PURE__*/React.createElement("div", null, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
+      value: (_initialSearchData$ob3 = initialSearchData.objectSchema) !== null && _initialSearchData$ob3 !== void 0 ? _initialSearchData$ob3 : undefined,
+      workspaceId: workspaceId,
+      initialObjectSchemas: (_initialSearchData$ob4 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob4 !== void 0 ? _initialSearchData$ob4 : undefined,
+      classNamePrefix: "assets-datasource-modal--object-schema-select"
+    })))), /*#__PURE__*/React.createElement(FormRowContainer, null, /*#__PURE__*/React.createElement(AqlSearchInput, {
       value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,
       workspaceId: workspaceId,
       isSearching: isSearching

package/dist/es2019/ui/common/modal/content-container/index.compiled.css

@@ -5,7 +5,7 @@
 ._n7zl8e97{border-bottom:var(--ds-border-width-outline,2px) solid var(--ds-border,#dfe1e6)}
 ._n7zlglyw{border-bottom:none}
 ._x3do1x13{border-top:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
-._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
+._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
 ._18m91wug{overflow-y:auto}
 ._1e0c11p5{display:grid}
 ._1itk1sfv{background-image:linear-gradient(90deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(90deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1)),transparent),linear-gradient(90deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 70%),linear-gradient(90deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1))),linear-gradient(0deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 30%),linear-gradient(0deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05))),linear-gradient(0deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(0deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05)),transparent)}
@@ -14,4 +14,4 @@
 ._c71l1pna{max-height:420px}
 ._ouxlbac2{background-position:0,0,100%,100%,top,0 52px,bottom,bottom}
 ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
-._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
+._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}

package/dist/es2019/ui/common/modal/content-container/index.js

@@ -6,7 +6,7 @@ import { cx } from '@atlaskit/css';
 import { Box } from '@atlaskit/primitives/compiled';
 import { N40 } from '@atlaskit/theme/colors';
 const styles = {
-  tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13lipd34 _qrwqpd34",
+  tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13li1mok _qrwq1mok",
   contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00",
   contentContainerRemoveBorderStyles: "_n7zlglyw"
 };

package/dist/es2019/ui/common/modal/count-view-smart-link/index.compiled.css

@@ -1,5 +1,5 @@
 
-._2rko16jk{border-radius:var(--ds-border-radius-200,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
+._2rko18qm{border-radius:var(--ds-radius-large,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
 ._19bvv77o{padding-left:var(--ds-space-025,2px)}
 ._ca0qze3t{padding-top:var(--ds-space-0,0)}
 ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}

package/dist/es2019/ui/common/modal/count-view-smart-link/index.js

@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl-next';
 import { Box } from '@atlaskit/primitives/compiled';
 import LinkRenderType from '../../../issue-like-table/render-type/link';
 const styles = {
-  placeholderSmartLinkStyles: "_2rko16jk _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
+  placeholderSmartLinkStyles: "_2rko18qm _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
   smartLinkContainerStyles: "_19bvv77o"
 };
 export const SmartCardPlaceholder = ({

package/dist/es2019/ui/common/modal/popup-select/dropdownIndicator.js

@@ -4,8 +4,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import CloseIcon from '@atlaskit/icon/core/cross-circle';
 import SearchIcon from '@atlaskit/icon/core/search';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { Box, Pressable } from '@atlaskit/primitives/compiled';
+import { Pressable } from '@atlaskit/primitives/compiled';
 import { components } from '@atlaskit/select';
 const styles = {
   customDropdownIndicatorStylesOld: "_1e0c1txw _80omtlke _1bah1h6o _1bsbzwfg",
@@ -15,7 +14,7 @@ const CustomDropdownIndicator = props => {
   const {
     selectProps
   } = props;
-  return /*#__PURE__*/React.createElement(components.DropdownIndicator, props, fg('navx-1184-fix-smart-link-a11y-interactive-states') ? /*#__PURE__*/React.createElement(Pressable, {
+  return /*#__PURE__*/React.createElement(components.DropdownIndicator, props, /*#__PURE__*/React.createElement(Pressable, {
     xcss: styles.customDropdownIndicatorStyles,
     onClick: () => {
       if (selectProps.inputValue) {
@@ -29,20 +28,6 @@ const CustomDropdownIndicator = props => {
     label: ""
   }) : /*#__PURE__*/React.createElement(SearchIcon, {
     label: ""
-  })) : /*#__PURE__*/React.createElement(Box, {
-    xcss: styles.customDropdownIndicatorStylesOld,
-    onClick: () => {
-      if (selectProps.inputValue) {
-        selectProps.onInputChange && selectProps.onInputChange('', {
-          action: 'input-change',
-          prevInputValue: selectProps.inputValue
-        });
-      }
-    }
-  }, selectProps.inputValue ? /*#__PURE__*/React.createElement(CloseIcon, {
-    label: ""
-  }) : /*#__PURE__*/React.createElement(SearchIcon, {
-    label: ""
   })));
 };
 export default CustomDropdownIndicator;

package/dist/es2019/ui/confluence-search-modal/modal/index.compiled.css

@@ -1,3 +1,8 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}
+._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
 ._1e0c1txw{display:flex}
 ._1tket9kd{min-height:72px}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}
 ._4cvr1q9y{align-items:baseline}

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -7,8 +7,9 @@ import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import LinkComponent from '@atlaskit/link';
-import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { Box } from '@atlaskit/primitives/compiled';
+import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Box, Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { DatasourceAction, DatasourceSearchMethod } from '../../../analytics/types';
 import { RichIconSearch } from '../../../common/ui/rich-icon/search';
@@ -38,7 +39,10 @@ import { EmptyState } from '../../issue-like-table';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { confluenceSearchModalMessages } from './messages';
 const styles = {
-  inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd"
+  inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd",
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq",
+  viewModeContainer: "_zulpu2gc _4cvr1h6o"
 };
 const isValidParameters = parameters => !!(parameters && parameters.cloudId && Object.values(parameters).filter(v => v !== undefined).length > 1);
 export const PlainConfluenceSearchConfigModal = props => {
@@ -314,7 +318,25 @@ export const PlainConfluenceSearchConfigModal = props => {
   }, /*#__PURE__*/React.createElement(DatasourceModal, {
     testId: "confluence-search-datasource-modal",
     onClose: onCancel
-  }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+  }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(Flex, {
+    gap: "space.200",
+    justifyContent: "space-between",
+    xcss: styles.flexStyles
+  }, /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "end",
+    xcss: styles.viewModeContainer
+  }, !hasNoConfluenceSites && /*#__PURE__*/React.createElement(DatasourceViewModeDropDown, null), /*#__PURE__*/React.createElement(CloseButton, {
+    onClick: onCancel
+  })), /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "start",
+    xcss: styles.modalTitleContainer
+  }, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedConfluenceSite,
+    testId: "confluence-search-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  }))))) : /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedConfluenceSite,

package/dist/es2019/ui/issue-like-table/index.compiled.css

@@ -81,5 +81,5 @@
 ._vchhusvi{box-sizing:border-box}
 ._vwz41tcg, .ProseMirror .pm-table-wrapper>table thead ._s99e1tcg, .pm-table-wrapper>table thead ._3mvc1tcg{line-height:24px}
 ._yq5hus1c{border-collapse:separate}
-._8vu416jk:hover{border-radius:var(--ds-border-radius-200,3px)}
+._8vu418qm:hover{border-radius:var(--ds-radius-large,3px)}
 ._irr31d5g:hover{background-color:var(--ds-background-input-hovered,#f7f8f9)}

package/dist/es2019/ui/issue-like-table/index.js

@@ -440,7 +440,7 @@ export const IssueLikeDataTableView = ({
     const isHeadingOutsideButton = !isEditable || !onWrappedColumnChange;
     if (isHeadingOutsideButton) {
       heading = /*#__PURE__*/React.createElement("div", {
-        className: ax(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu416jk _irr31d5g"])
+        className: ax(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr31d5g"])
       }, heading);
     }
     if (isEditable) {

package/dist/es2019/ui/jira-issues-modal/modal/index.compiled.css

@@ -0,0 +1,5 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}
+._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -1,12 +1,16 @@
+/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
 import _extends from "@babel/runtime/helpers/extends";
+import "./index.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
 /* eslint-disable @atlaskit/platform/no-preconditioning */
 /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import LinkComponent from '@atlaskit/link';
-import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { EVENT_CHANNEL } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
@@ -45,6 +49,11 @@ import { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
 import { modalMessages } from './messages';
+const styles = {
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  viewModeContainer: "_zulpu2gc _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq"
+};
 const getDisplayValue = (currentViewMode, itemCount) => {
   if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
@@ -358,7 +367,25 @@ const PlainJiraIssuesConfigModal = props => {
     testId: "jira-datasource-modal",
     onClose: onCancel,
     shouldReturnFocus: shouldReturnFocus
-  }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+  }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(Flex, {
+    gap: "space.200",
+    justifyContent: "space-between",
+    xcss: styles.flexStyles
+  }, /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "end",
+    xcss: styles.viewModeContainer
+  }, !hasNoJiraSites && /*#__PURE__*/React.createElement(DatasourceViewModeDropDown, null), /*#__PURE__*/React.createElement(CloseButton, {
+    onClick: onCancel
+  })), /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "start",
+    xcss: styles.modalTitleContainer
+  }, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedJiraSite,
+    testId: "jira-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  }))))) : /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedJiraSite,

package/dist/esm/ui/assets-modal/modal/index.js

@@ -315,10 +315,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         },
         onSearch: handleOnSearch,
         modalTitle: AssetsModalTitle,
-        isSearching: status === 'loading'
+        isSearching: status === 'loading',
+        onCancel: onCancel
       });
     }
-  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status, onCancel]);
   var getCancelButtonAnalyticsPayload = useCallback(function () {
     return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
       searchCount: searchCount.current,

package/dist/esm/ui/assets-modal/modal/render-assets-content/index.compiled.css

@@ -1,7 +1,7 @@
 
 ._19itn8v0{border:var(--_vzvmm2)}
 ._n7zl1oe8{border-bottom:var(--_cfwo9c)}._12vemgnk{background-repeat:no-repeat}
-._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
+._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
 ._18m915vq{overflow-y:hidden}
 ._18m91wug{overflow-y:auto}
 ._1e0c11p5{display:grid}
@@ -11,4 +11,4 @@
 ._1reo1wug{overflow-x:auto}
 ._4t3i1pna{height:420px}
 ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
-._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
+._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}

package/dist/esm/ui/assets-modal/modal/render-assets-content/index.js

@@ -37,7 +37,7 @@ var NoResultsView = function NoResultsView() {
 };
 var LoadingView = function LoadingView() {
   return /*#__PURE__*/React.createElement("div", {
-    className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13lipd34 _qrwqpd34 _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"]),
+    className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13li1mok _qrwq1mok _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"]),
     style: {
       "--_vzvmm2": ix("1px solid ".concat("var(--ds-border, ".concat(N40, ")"))),
       "--_cfwo9c": ix("2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(N40, ")"))),
@@ -62,7 +62,7 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var issueLikeDataTableView = useMemo(function () {
     return /*#__PURE__*/React.createElement("div", {
-      className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13lipd34 _qrwqpd34 _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00"]),
+      className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13li1mok _qrwq1mok _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00"]),
       style: {
         "--_vzvmm2": ix("1px solid ".concat("var(--ds-border, ".concat(N40, ")"))),
         "--_cfwo9c": ix("2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(N40, ")"))),

package/dist/esm/ui/assets-modal/search-container/index.compiled.css

@@ -1,4 +1,7 @@
-._1bsb1osq{width:100%}
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}._1bsb1osq{width:100%}
 ._1e0c11p5{display:grid}
 ._1p57pxbi{row-gap:var(--ds-space-200,1pc)}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}
 ._p12ffkat{max-width:386px}

package/dist/esm/ui/assets-modal/search-container/index.js

@@ -8,10 +8,17 @@ import { forwardRef } from 'react';
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import Form from '@atlaskit/form';
+import { CloseButton } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { AqlSearchInput } from './aql-search-input';
 import { AssetsObjectSchemaSelect } from './object-schema-select';
 import { FormRowContainer } from './styled';
+var styles = {
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq"
+};
 var DEFAULT_AQL_QUERY = '';
 var SEARCH_FORM_ID = 'linkDataSource.assets.configModal.searchContainer-form';
 
@@ -51,7 +58,8 @@ export var AssetsSearchContainer = function AssetsSearchContainer(props) {
     workspaceId = props.workspaceId,
     initialSearchData = props.initialSearchData,
     modalTitle = props.modalTitle,
-    isSearching = props.isSearching;
+    isSearching = props.isSearching,
+    onCancel = props.onCancel;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var onFormSubmit = function onFormSubmit(searchFormValues) {
@@ -66,18 +74,34 @@ export var AssetsSearchContainer = function AssetsSearchContainer(props) {
   return /*#__PURE__*/React.createElement(Form, {
     onSubmit: onFormSubmit
   }, function (_ref3) {
-    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
+    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$ob3, _initialSearchData$ob4, _initialSearchData$aq;
     var formProps = _ref3.formProps;
     return /*#__PURE__*/React.createElement(FormContainer, _extends({}, formProps, {
       id: SEARCH_FORM_ID
     }), /*#__PURE__*/React.createElement(FormRowContainer, {
       isNarrowGap: true
-    }, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
+    }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(Flex, {
+      gap: "space.200",
+      justifyContent: "space-between",
+      xcss: styles.flexStyles
+    }, /*#__PURE__*/React.createElement(Flex, {
+      justifyContent: "end"
+    }, /*#__PURE__*/React.createElement(CloseButton, {
+      onClick: onCancel
+    })), /*#__PURE__*/React.createElement(Flex, {
+      justifyContent: "start",
+      xcss: styles.modalTitleContainer
+    }, modalTitle, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
       value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
       workspaceId: workspaceId,
       initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
       classNamePrefix: "assets-datasource-modal--object-schema-select"
-    }))), /*#__PURE__*/React.createElement(FormRowContainer, null, /*#__PURE__*/React.createElement(AqlSearchInput, {
+    }))) : /*#__PURE__*/React.createElement("div", null, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
+      value: (_initialSearchData$ob3 = initialSearchData.objectSchema) !== null && _initialSearchData$ob3 !== void 0 ? _initialSearchData$ob3 : undefined,
+      workspaceId: workspaceId,
+      initialObjectSchemas: (_initialSearchData$ob4 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob4 !== void 0 ? _initialSearchData$ob4 : undefined,
+      classNamePrefix: "assets-datasource-modal--object-schema-select"
+    })))), /*#__PURE__*/React.createElement(FormRowContainer, null, /*#__PURE__*/React.createElement(AqlSearchInput, {
       value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,
       workspaceId: workspaceId,
       isSearching: isSearching

package/dist/esm/ui/common/modal/content-container/index.compiled.css

@@ -5,7 +5,7 @@
 ._n7zl8e97{border-bottom:var(--ds-border-width-outline,2px) solid var(--ds-border,#dfe1e6)}
 ._n7zlglyw{border-bottom:none}
 ._x3do1x13{border-top:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
-._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
+._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
 ._18m91wug{overflow-y:auto}
 ._1e0c11p5{display:grid}
 ._1itk1sfv{background-image:linear-gradient(90deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(90deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1)),transparent),linear-gradient(90deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 70%),linear-gradient(90deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1))),linear-gradient(0deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 30%),linear-gradient(0deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05))),linear-gradient(0deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(0deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05)),transparent)}
@@ -14,4 +14,4 @@
 ._c71l1pna{max-height:420px}
 ._ouxlbac2{background-position:0,0,100%,100%,top,0 52px,bottom,bottom}
 ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
-._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
+._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}

package/dist/esm/ui/common/modal/content-container/index.js

@@ -6,7 +6,7 @@ import { cx } from '@atlaskit/css';
 import { Box } from '@atlaskit/primitives/compiled';
 import { N40 } from '@atlaskit/theme/colors';
 var styles = {
-  tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13lipd34 _qrwqpd34",
+  tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13li1mok _qrwq1mok",
   contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00",
   contentContainerRemoveBorderStyles: "_n7zlglyw"
 };

package/dist/esm/ui/common/modal/count-view-smart-link/index.compiled.css

@@ -1,5 +1,5 @@
 
-._2rko16jk{border-radius:var(--ds-border-radius-200,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
+._2rko18qm{border-radius:var(--ds-radius-large,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
 ._19bvv77o{padding-left:var(--ds-space-025,2px)}
 ._ca0qze3t{padding-top:var(--ds-space-0,0)}
 ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}

package/dist/esm/ui/common/modal/count-view-smart-link/index.js

@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl-next';
 import { Box } from '@atlaskit/primitives/compiled';
 import LinkRenderType from '../../../issue-like-table/render-type/link';
 var styles = {
-  placeholderSmartLinkStyles: "_2rko16jk _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
+  placeholderSmartLinkStyles: "_2rko18qm _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
   smartLinkContainerStyles: "_19bvv77o"
 };
 export var SmartCardPlaceholder = function SmartCardPlaceholder(_ref) {

package/dist/esm/ui/common/modal/popup-select/dropdownIndicator.js

@@ -4,8 +4,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import CloseIcon from '@atlaskit/icon/core/cross-circle';
 import SearchIcon from '@atlaskit/icon/core/search';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { Box, Pressable } from '@atlaskit/primitives/compiled';
+import { Pressable } from '@atlaskit/primitives/compiled';
 import { components } from '@atlaskit/select';
 var styles = {
   customDropdownIndicatorStylesOld: "_1e0c1txw _80omtlke _1bah1h6o _1bsbzwfg",
@@ -13,7 +12,7 @@ var styles = {
 };
 var CustomDropdownIndicator = function CustomDropdownIndicator(props) {
   var selectProps = props.selectProps;
-  return /*#__PURE__*/React.createElement(components.DropdownIndicator, props, fg('navx-1184-fix-smart-link-a11y-interactive-states') ? /*#__PURE__*/React.createElement(Pressable, {
+  return /*#__PURE__*/React.createElement(components.DropdownIndicator, props, /*#__PURE__*/React.createElement(Pressable, {
     xcss: styles.customDropdownIndicatorStyles,
     onClick: function onClick() {
       if (selectProps.inputValue) {
@@ -27,20 +26,6 @@ var CustomDropdownIndicator = function CustomDropdownIndicator(props) {
     label: ""
   }) : /*#__PURE__*/React.createElement(SearchIcon, {
     label: ""
-  })) : /*#__PURE__*/React.createElement(Box, {
-    xcss: styles.customDropdownIndicatorStylesOld,
-    onClick: function onClick() {
-      if (selectProps.inputValue) {
-        selectProps.onInputChange && selectProps.onInputChange('', {
-          action: 'input-change',
-          prevInputValue: selectProps.inputValue
-        });
-      }
-    }
-  }, selectProps.inputValue ? /*#__PURE__*/React.createElement(CloseIcon, {
-    label: ""
-  }) : /*#__PURE__*/React.createElement(SearchIcon, {
-    label: ""
   })));
 };
 export default CustomDropdownIndicator;

package/dist/esm/ui/confluence-search-modal/modal/index.compiled.css

@@ -1,3 +1,8 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}
+._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
 ._1e0c1txw{display:flex}
 ._1tket9kd{min-height:72px}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}
 ._4cvr1q9y{align-items:baseline}

package/dist/esm/ui/confluence-search-modal/modal/index.js

@@ -10,8 +10,9 @@ import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react'
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import LinkComponent from '@atlaskit/link';
-import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { Box } from '@atlaskit/primitives/compiled';
+import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Box, Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { DatasourceAction, DatasourceSearchMethod } from '../../../analytics/types';
 import { RichIconSearch } from '../../../common/ui/rich-icon/search';
@@ -41,7 +42,10 @@ import { EmptyState } from '../../issue-like-table';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { confluenceSearchModalMessages } from './messages';
 var styles = {
-  inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd"
+  inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd",
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq",
+  viewModeContainer: "_zulpu2gc _4cvr1h6o"
 };
 var isValidParameters = function isValidParameters(parameters) {
   return !!(parameters && parameters.cloudId && Object.values(parameters).filter(function (v) {
@@ -322,7 +326,25 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   }, /*#__PURE__*/React.createElement(DatasourceModal, {
     testId: "confluence-search-datasource-modal",
     onClose: onCancel
-  }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+  }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(Flex, {
+    gap: "space.200",
+    justifyContent: "space-between",
+    xcss: styles.flexStyles
+  }, /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "end",
+    xcss: styles.viewModeContainer
+  }, !hasNoConfluenceSites && /*#__PURE__*/React.createElement(DatasourceViewModeDropDown, null), /*#__PURE__*/React.createElement(CloseButton, {
+    onClick: onCancel
+  })), /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "start",
+    xcss: styles.modalTitleContainer
+  }, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedConfluenceSite,
+    testId: "confluence-search-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  }))))) : /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedConfluenceSite,

package/dist/esm/ui/issue-like-table/index.compiled.css

@@ -84,5 +84,5 @@
 ._x3fxnil1 font{medium:normal 400 14px/20px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif}
 ._yq5hus1c{border-collapse:separate}
 ._zzcc4f4w font{large:normal 400 1pc/24px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif}
-._8vu416jk:hover{border-radius:var(--ds-border-radius-200,3px)}
+._8vu418qm:hover{border-radius:var(--ds-radius-large,3px)}
 ._irr31d5g:hover{background-color:var(--ds-background-input-hovered,#f7f8f9)}

package/dist/esm/ui/issue-like-table/index.js

@@ -500,7 +500,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
     var isHeadingOutsideButton = !isEditable || !onWrappedColumnChange;
     if (isHeadingOutsideButton) {
       heading = /*#__PURE__*/React.createElement("div", {
-        className: ax(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu416jk _irr31d5g"])
+        className: ax(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr31d5g"])
       }, heading);
     }
     if (isEditable) {

package/dist/esm/ui/jira-issues-modal/modal/index.compiled.css

@@ -0,0 +1,5 @@
+
+._zulppxbi{gap:var(--ds-space-200,1pc)}
+._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
+._2lx21sbv{flex-direction:row-reverse}
+._4cvr1h6o{align-items:center}

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -1,6 +1,9 @@
+/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import "./index.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /* eslint-disable @atlaskit/platform/no-preconditioning */
@@ -9,8 +12,9 @@ import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } fr
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import LinkComponent from '@atlaskit/link';
-import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { Flex } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { EVENT_CHANNEL } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
@@ -49,6 +53,11 @@ import { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
 import { modalMessages } from './messages';
+var styles = {
+  modalTitleContainer: "_zulppxbi _4cvr1h6o",
+  viewModeContainer: "_zulpu2gc _4cvr1h6o",
+  flexStyles: "_2lx21sbv _1bsb1osq"
+};
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
@@ -364,7 +373,25 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     testId: "jira-datasource-modal",
     onClose: onCancel,
     shouldReturnFocus: shouldReturnFocus
-  }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+  }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(Flex, {
+    gap: "space.200",
+    justifyContent: "space-between",
+    xcss: styles.flexStyles
+  }, /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "end",
+    xcss: styles.viewModeContainer
+  }, !hasNoJiraSites && /*#__PURE__*/React.createElement(DatasourceViewModeDropDown, null), /*#__PURE__*/React.createElement(CloseButton, {
+    onClick: onCancel
+  })), /*#__PURE__*/React.createElement(Flex, {
+    justifyContent: "start",
+    xcss: styles.modalTitleContainer
+  }, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedJiraSite,
+    testId: "jira-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  }))))) : /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(ModalTitle, null, /*#__PURE__*/React.createElement(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,
     selectedSite: selectedJiraSite,

package/dist/types/ui/assets-modal/search-container/index.d.ts

@@ -8,6 +8,7 @@ export interface SearchContainerProps {
     initialSearchData: InitialSearchData;
     isSearching: boolean;
     modalTitle?: JSX.Element;
+    onCancel: () => void;
     onSearch: (aql: string, schemaId: string) => void;
     workspaceId: string;
 }

package/dist/types-ts4.5/ui/assets-modal/search-container/index.d.ts

@@ -8,6 +8,7 @@ export interface SearchContainerProps {
     initialSearchData: InitialSearchData;
     isSearching: boolean;
     modalTitle?: JSX.Element;
+    onCancel: () => void;
     onSearch: (aql: string, schemaId: string) => void;
     workspaceId: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "4.20.5",
+	"version": "4.21.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/empty-state": "^10.1.0",
 		"@atlaskit/flag": "^17.3.0",
-		"@atlaskit/form": "^12.2.0",
+		"@atlaskit/form": "^12.4.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/icon-object": "^7.2.0",
@@ -77,7 +77,7 @@
 		"@atlaskit/primitives": "^14.12.0",
 		"@atlaskit/react-select": "^3.5.0",
 		"@atlaskit/select": "^21.2.0",
-		"@atlaskit/smart-card": "^40.15.0",
+		"@atlaskit/smart-card": "^40.17.0",
 		"@atlaskit/smart-user-picker": "^8.2.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/tag": "^14.1.0",
@@ -181,10 +181,10 @@
 		"navx-1180-sllv-return-focus-on-escape": {
 			"type": "boolean"
 		},
-		"navx-1184-fix-smart-link-a11y-interactive-states": {
+		"lp_enable_datasource-table-view_height_override": {
 			"type": "boolean"
 		},
-		"lp_enable_datasource-table-view_height_override": {
+		"navx-1483-a11y-close-button-in-modal-updates": {
 			"type": "boolean"
 		}
 	},