@atlaskit/link-datasource 2.1.1 → 2.1.3

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/link-datasource
 
+## 2.1.3
+
+### Patch Changes
+
+-   [#98501](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98501)
+    [`9122f89de81a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9122f89de81a) -
+    Updated rich text rendering to support rendering smart links as plain text.
+-   [#98943](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98943)
+    [`2df6f335bb3c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2df6f335bb3c) -
+    Fixes issue where falsy values such as number 0 are not rendering in datasources
+-   [#98062](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98062)
+    [`4e13438bdfc0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4e13438bdfc0) -
+    Minor refactor to datasource modal analytics. No expected functional changes.
+-   Updated dependencies
+
+## 2.1.2
+
+### Patch Changes
+
+-   [#97599](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97599)
+    [`32c3130b08fe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/32c3130b08fe) -
+    [ED-22282] Bump adf-schema to 36.1.0
+
 ## 2.1.1
 
 ### Patch Changes

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -16,7 +15,7 @@ var _uuid = require("uuid");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
-var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
+var _modalDialog = require("@atlaskit/modal-dialog");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
@@ -32,12 +31,11 @@ var _cmdbService = require("../../../services/cmdbService.utils");
 var _accessRequired = require("../../../ui/common/error-state/access-required");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
 var _cancelButton = require("../../common/modal/cancel-button");
+var _datasourceModal = require("../../common/modal/datasource-modal");
 var _searchContainer = require("../search-container");
 var _loadingState = require("../search-container/loading-state");
 var _messages = require("./messages");
 var _renderAssetsContent = require("./render-assets-content");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; } /** @jsx jsx */
 var modalBodyErrorWrapperStyles = (0, _react2.css)({
@@ -161,9 +159,6 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       });
     }
   }, [fireEvent, totalObjectSchemas]);
-  (0, _react.useEffect)(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
   var fireTableViewedEvent = (0, _react.useCallback)(function () {
     if (isDataReady) {
       fireEvent('ui.table.viewed.datasourceConfigModal', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
@@ -335,11 +330,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
-  }, (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_modalDialog.default, {
-    testId: 'asset-datasource-modal',
+  }, (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_datasourceModal.DatasourceModal, {
+    testId: "asset-datasource-modal",
     onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true,
     shouldCloseOnOverlayClick: false
   }, (0, _react2.jsx)(_modalDialog.ModalHeader, null, renderModalTitleContent()), (0, _react2.jsx)(_modalDialog.ModalBody, null, errorState ? (0, _react2.jsx)("div", {
     css: modalBodyErrorWrapperStyles

package/dist/cjs/ui/common/modal/datasource-modal/index.js

@@ -0,0 +1,34 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DatasourceModal = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _modalDialog = _interopRequireDefault(require("@atlaskit/modal-dialog"));
+var _analytics = require("../../../../analytics");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var ScreenEvent = function ScreenEvent() {
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  (0, _react.useEffect)(function () {
+    fireEvent('screen.datasourceModalDialog.viewed', {});
+  }, [fireEvent]);
+  return null;
+};
+var DatasourceModal = exports.DatasourceModal = function DatasourceModal(_ref) {
+  var testId = _ref.testId,
+    onClose = _ref.onClose,
+    shouldCloseOnOverlayClick = _ref.shouldCloseOnOverlayClick,
+    children = _ref.children;
+  return /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
+    testId: testId,
+    onClose: onClose,
+    width: "calc(100% - 80px)",
+    shouldScrollInViewport: true,
+    shouldCloseOnOverlayClick: shouldCloseOnOverlayClick
+  }, /*#__PURE__*/_react.default.createElement(ScreenEvent, null), children);
+};

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -16,7 +15,7 @@ var _uuid = require("uuid");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
-var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
+var _modalDialog = require("@atlaskit/modal-dialog");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
@@ -37,6 +36,7 @@ var _initialStateView = require("../../common/initial-state-view");
 var _cancelButton = require("../../common/modal/cancel-button");
 var _contentContainer = require("../../common/modal/content-container");
 var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
+var _datasourceModal = require("../../common/modal/datasource-modal");
 var _displayViewDropDown = require("../../common/modal/display-view-dropdown/display-view-drop-down");
 var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
@@ -46,8 +46,6 @@ var _utils = require("../../issue-like-table/utils");
 var _confluenceSearchContainer = _interopRequireDefault(require("../confluence-search-container"));
 var _confluenceSearchInitialStateSvg = require("./confluence-search-initial-state-svg");
 var _messages = require("./messages");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; } /** @jsx jsx */
 var inputContainerStyles = (0, _primitives.xcss)({
@@ -160,9 +158,6 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       });
     }
   }, [fireEvent, availableSites]);
-  (0, _react.useEffect)(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
@@ -427,11 +422,9 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
-  }, (0, _react2.jsx)(_modalDialog.default, {
+  }, (0, _react2.jsx)(_datasourceModal.DatasourceModal, {
     testId: "confluence-search-datasource-modal",
-    onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true
+    onClose: onCancel
   }, (0, _react2.jsx)(_modalDialog.ModalHeader, null, (0, _react2.jsx)(_modalDialog.ModalTitle, null, (0, _react2.jsx)(_siteSelector.SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

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

@@ -447,7 +447,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
           var _newRowData$key;
           var key = _ref11.key,
             type = _ref11.type;
-          var value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
+          // Need to make sure we keep falsy values like 0 and '', as well as the boolean false.
+          var value = (_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data;
           var values = Array.isArray(value) ? value : [value];
           var renderedValues = renderItem({
             type: type,

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

@@ -17,11 +17,25 @@ var rootStyles = (0, _react2.css)({
   position: 'relative',
   display: 'block'
 });
+var smartLinkNodeToUrl = function smartLinkNodeToUrl(node) {
+  var _node$attrs$url;
+  return (_node$attrs$url = node.attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : '';
+};
+var schemaSmartLinkOverride = new _model.Schema({
+  nodes: _schemaDefault.defaultSchema.spec.nodes.update('inlineCard', _objectSpread(_objectSpread({}, _schemaDefault.defaultSchema.spec.nodes.get('inlineCard')), {}, {
+    leafText: smartLinkNodeToUrl
+  })).update('blockCard', _objectSpread(_objectSpread({}, _schemaDefault.defaultSchema.spec.nodes.get('blockCard')), {}, {
+    leafText: smartLinkNodeToUrl
+  })).update('embedCard', _objectSpread(_objectSpread({}, _schemaDefault.defaultSchema.spec.nodes.get('embedCard')), {}, {
+    leafText: smartLinkNodeToUrl
+  })),
+  marks: _schemaDefault.defaultSchema.spec.marks
+});
 var parseRichText = exports.parseRichText = function parseRichText(value) {
   try {
     if (value.type === 'adf') {
       var adf = JSON.parse(value.text);
-      return _model.Node.fromJSON(_schemaDefault.defaultSchema, _objectSpread(_objectSpread({}, adf), {}, {
+      return _model.Node.fromJSON(schemaSmartLinkOverride, _objectSpread(_objectSpread({}, adf), {}, {
         content: (0, _toConsumableArray2.default)(adf.content.slice(0, 2))
       })).textContent;
     }

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -16,7 +15,7 @@ var _uuid = require("uuid");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
-var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
+var _modalDialog = require("@atlaskit/modal-dialog");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
@@ -42,6 +41,7 @@ var _messages2 = require("../../common/initial-state-view/messages");
 var _cancelButton = require("../../common/modal/cancel-button");
 var _contentContainer = require("../../common/modal/content-container");
 var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
+var _datasourceModal = require("../../common/modal/datasource-modal");
 var _displayViewDropDown = require("../../common/modal/display-view-dropdown/display-view-drop-down");
 var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
@@ -53,8 +53,6 @@ var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _jiraSearchContainer = require("../jira-search-container");
 var _jiraIssuesInitialStateSvg = require("./jira-issues-initial-state-svg");
 var _messages3 = require("./messages");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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; } /** @jsx jsx */
 var issueCountStyles = (0, _react2.css)({
@@ -184,9 +182,6 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     canBeLink: currentViewMode === 'inline',
     extensionKey: extensionKey
   });
-  (0, _react.useEffect)(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
   (0, _react.useEffect)(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;
@@ -462,11 +457,9 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
-  }, (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_modalDialog.default, {
+  }, (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_datasourceModal.DatasourceModal, {
     testId: "jira-datasource-modal",
-    onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true
+    onClose: onCancel
   }, (0, _react2.jsx)(_modalDialog.ModalHeader, null, (0, _react2.jsx)(_modalDialog.ModalTitle, null, (0, _react2.jsx)(_siteSelector.SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

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

@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -23,6 +23,7 @@ import { PermissionError } from '../../../services/cmdbService.utils';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { CancelButton } from '../../common/modal/cancel-button';
+import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { AssetsSearchContainer } from '../search-container';
 import { AssetsSearchContainerLoading } from '../search-container/loading-state';
 import { modalMessages } from './messages';
@@ -136,9 +137,6 @@ const PlainAssetsConfigModal = props => {
       });
     }
   }, [fireEvent, totalObjectSchemas]);
-  useEffect(() => {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
   const fireTableViewedEvent = useCallback(() => {
     if (isDataReady) {
       fireEvent('ui.table.viewed.datasourceConfigModal', {
@@ -310,11 +308,9 @@ const PlainAssetsConfigModal = props => {
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, jsx(ModalTransition, null, jsx(Modal, {
-    testId: 'asset-datasource-modal',
+  }, jsx(ModalTransition, null, jsx(DatasourceModal, {
+    testId: "asset-datasource-modal",
     onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true,
     shouldCloseOnOverlayClick: false
   }, jsx(ModalHeader, null, renderModalTitleContent()), jsx(ModalBody, null, errorState ? jsx("div", {
     css: modalBodyErrorWrapperStyles

package/dist/es2019/ui/common/modal/datasource-modal/index.js

@@ -0,0 +1,26 @@
+import React, { useEffect } from 'react';
+import Modal from '@atlaskit/modal-dialog';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
+const ScreenEvent = () => {
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
+  useEffect(() => {
+    fireEvent('screen.datasourceModalDialog.viewed', {});
+  }, [fireEvent]);
+  return null;
+};
+export const DatasourceModal = ({
+  testId,
+  onClose,
+  shouldCloseOnOverlayClick,
+  children
+}) => {
+  return /*#__PURE__*/React.createElement(Modal, {
+    testId: testId,
+    onClose: onClose,
+    width: "calc(100% - 80px)",
+    shouldScrollInViewport: true,
+    shouldCloseOnOverlayClick: shouldCloseOnOverlayClick
+  }, /*#__PURE__*/React.createElement(ScreenEvent, null), children);
+};

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

@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import LinkUrl from '@atlaskit/smart-card/link-url';
@@ -28,6 +28,7 @@ import { InitialStateView } from '../../common/initial-state-view';
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
+import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -130,9 +131,6 @@ export const PlainConfluenceSearchConfigModal = props => {
       });
     }
   }, [fireEvent, availableSites]);
-  useEffect(() => {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
@@ -398,11 +396,9 @@ export const PlainConfluenceSearchConfigModal = props => {
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, jsx(Modal, {
+  }, jsx(DatasourceModal, {
     testId: "confluence-search-datasource-modal",
-    onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true
+    onClose: onCancel
   }, jsx(ModalHeader, null, jsx(ModalTitle, null, jsx(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

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

@@ -452,7 +452,8 @@ export const IssueLikeDataTableView = ({
       type
     }) => {
       var _newRowData$key;
-      const value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
+      // Need to make sure we keep falsy values like 0 and '', as well as the boolean false.
+      const value = (_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data;
       const values = Array.isArray(value) ? value : [value];
       const renderedValues = renderItem({
         type,

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

@@ -2,16 +2,33 @@
 import { useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
-import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 const rootStyles = css({
   position: 'relative',
   display: 'block'
 });
+const smartLinkNodeToUrl = node => {
+  var _node$attrs$url;
+  return (_node$attrs$url = node.attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : '';
+};
+const schemaSmartLinkOverride = new Schema({
+  nodes: defaultSchema.spec.nodes.update('inlineCard', {
+    ...defaultSchema.spec.nodes.get('inlineCard'),
+    leafText: smartLinkNodeToUrl
+  }).update('blockCard', {
+    ...defaultSchema.spec.nodes.get('blockCard'),
+    leafText: smartLinkNodeToUrl
+  }).update('embedCard', {
+    ...defaultSchema.spec.nodes.get('embedCard'),
+    leafText: smartLinkNodeToUrl
+  }),
+  marks: defaultSchema.spec.marks
+});
 export const parseRichText = value => {
   try {
     if (value.type === 'adf') {
       const adf = JSON.parse(value.text);
-      return PMNode.fromJSON(defaultSchema, {
+      return PMNode.fromJSON(schemaSmartLinkOverride, {
         ...adf,
         content: [...adf.content.slice(0, 2)]
       }).textContent;
@@ -26,9 +43,7 @@ export const parseRichText = value => {
 const RichTextType = ({
   value
 }) => {
-  const adfPlainText = useMemo(() => {
-    return parseRichText(value);
-  }, [value]);
+  const adfPlainText = useMemo(() => parseRichText(value), [value]);
   if (adfPlainText) {
     return jsx("div", {
       css: rootStyles,

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

@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N800 } from '@atlaskit/theme/colors';
@@ -33,6 +33,7 @@ import { initialStateViewMessages } from '../../common/initial-state-view/messag
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
+import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -155,9 +156,6 @@ export const PlainJiraIssuesConfigModal = props => {
     canBeLink: currentViewMode === 'inline',
     extensionKey
   });
-  useEffect(() => {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
   useEffect(() => {
     const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;
@@ -441,11 +439,9 @@ export const PlainJiraIssuesConfigModal = props => {
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, jsx(ModalTransition, null, jsx(Modal, {
+  }, jsx(ModalTransition, null, jsx(DatasourceModal, {
     testId: "jira-datasource-modal",
-    onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true
+    onClose: onCancel
   }, jsx(ModalHeader, null, jsx(ModalTitle, null, jsx(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

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

@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -27,6 +27,7 @@ import { PermissionError } from '../../../services/cmdbService.utils';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { CancelButton } from '../../common/modal/cancel-button';
+import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { AssetsSearchContainer } from '../search-container';
 import { AssetsSearchContainerLoading } from '../search-container/loading-state';
 import { modalMessages } from './messages';
@@ -152,9 +153,6 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       });
     }
   }, [fireEvent, totalObjectSchemas]);
-  useEffect(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
   var fireTableViewedEvent = useCallback(function () {
     if (isDataReady) {
       fireEvent('ui.table.viewed.datasourceConfigModal', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
@@ -326,11 +324,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, jsx(ModalTransition, null, jsx(Modal, {
-    testId: 'asset-datasource-modal',
+  }, jsx(ModalTransition, null, jsx(DatasourceModal, {
+    testId: "asset-datasource-modal",
     onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true,
     shouldCloseOnOverlayClick: false
   }, jsx(ModalHeader, null, renderModalTitleContent()), jsx(ModalBody, null, errorState ? jsx("div", {
     css: modalBodyErrorWrapperStyles

package/dist/esm/ui/common/modal/datasource-modal/index.js

@@ -0,0 +1,24 @@
+import React, { useEffect } from 'react';
+import Modal from '@atlaskit/modal-dialog';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
+var ScreenEvent = function ScreenEvent() {
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  useEffect(function () {
+    fireEvent('screen.datasourceModalDialog.viewed', {});
+  }, [fireEvent]);
+  return null;
+};
+export var DatasourceModal = function DatasourceModal(_ref) {
+  var testId = _ref.testId,
+    onClose = _ref.onClose,
+    shouldCloseOnOverlayClick = _ref.shouldCloseOnOverlayClick,
+    children = _ref.children;
+  return /*#__PURE__*/React.createElement(Modal, {
+    testId: testId,
+    onClose: onClose,
+    width: "calc(100% - 80px)",
+    shouldScrollInViewport: true,
+    shouldCloseOnOverlayClick: shouldCloseOnOverlayClick
+  }, /*#__PURE__*/React.createElement(ScreenEvent, null), children);
+};

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

@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import LinkUrl from '@atlaskit/smart-card/link-url';
@@ -32,6 +32,7 @@ import { InitialStateView } from '../../common/initial-state-view';
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
+import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -151,9 +152,6 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       });
     }
   }, [fireEvent, availableSites]);
-  useEffect(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
@@ -418,11 +416,9 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, jsx(Modal, {
+  }, jsx(DatasourceModal, {
     testId: "confluence-search-datasource-modal",
-    onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true
+    onClose: onCancel
   }, jsx(ModalHeader, null, jsx(ModalTitle, null, jsx(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

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

@@ -440,7 +440,8 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
           var _newRowData$key;
           var key = _ref11.key,
             type = _ref11.type;
-          var value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
+          // Need to make sure we keep falsy values like 0 and '', as well as the boolean false.
+          var value = (_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data;
           var values = Array.isArray(value) ? value : [value];
           var renderedValues = renderItem({
             type: type,

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

@@ -6,16 +6,30 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
-import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 var rootStyles = css({
   position: 'relative',
   display: 'block'
 });
+var smartLinkNodeToUrl = function smartLinkNodeToUrl(node) {
+  var _node$attrs$url;
+  return (_node$attrs$url = node.attrs.url) !== null && _node$attrs$url !== void 0 ? _node$attrs$url : '';
+};
+var schemaSmartLinkOverride = new Schema({
+  nodes: defaultSchema.spec.nodes.update('inlineCard', _objectSpread(_objectSpread({}, defaultSchema.spec.nodes.get('inlineCard')), {}, {
+    leafText: smartLinkNodeToUrl
+  })).update('blockCard', _objectSpread(_objectSpread({}, defaultSchema.spec.nodes.get('blockCard')), {}, {
+    leafText: smartLinkNodeToUrl
+  })).update('embedCard', _objectSpread(_objectSpread({}, defaultSchema.spec.nodes.get('embedCard')), {}, {
+    leafText: smartLinkNodeToUrl
+  })),
+  marks: defaultSchema.spec.marks
+});
 export var parseRichText = function parseRichText(value) {
   try {
     if (value.type === 'adf') {
       var adf = JSON.parse(value.text);
-      return PMNode.fromJSON(defaultSchema, _objectSpread(_objectSpread({}, adf), {}, {
+      return PMNode.fromJSON(schemaSmartLinkOverride, _objectSpread(_objectSpread({}, adf), {}, {
         content: _toConsumableArray(adf.content.slice(0, 2))
       })).textContent;
     }

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

@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N800 } from '@atlaskit/theme/colors';
@@ -37,6 +37,7 @@ import { initialStateViewMessages } from '../../common/initial-state-view/messag
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
+import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -175,9 +176,6 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     canBeLink: currentViewMode === 'inline',
     extensionKey: extensionKey
   });
-  useEffect(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
   useEffect(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;
@@ -453,11 +451,9 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, jsx(ModalTransition, null, jsx(Modal, {
+  }, jsx(ModalTransition, null, jsx(DatasourceModal, {
     testId: "jira-datasource-modal",
-    onClose: onCancel,
-    width: "calc(100% - 80px)",
-    shouldScrollInViewport: true
+    onClose: onCancel
   }, jsx(ModalHeader, null, jsx(ModalTitle, null, jsx(SiteSelector, {
     availableSites: availableSites,
     onSiteSelection: onSiteSelection,

package/dist/types/ui/common/modal/datasource-modal/index.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { type ModalDialogProps } from '@atlaskit/modal-dialog';
+type DatasourceModalProps = Pick<ModalDialogProps, 'testId' | 'onClose' | 'children' | 'shouldCloseOnOverlayClick'>;
+export declare const DatasourceModal: ({ testId, onClose, shouldCloseOnOverlayClick, children, }: DatasourceModalProps) => JSX.Element;
+export {};

package/dist/types/ui/issue-like-table/render-type/index.d.ts

@@ -1,5 +1,5 @@
-import { IntlShape } from 'react-intl-next';
-import { DatasourceType } from '@atlaskit/linking-types';
-import { TableViewPropsRenderType } from '../types';
+import { type IntlShape } from 'react-intl-next';
+import { type DatasourceType } from '@atlaskit/linking-types';
+import { type TableViewPropsRenderType } from '../types';
 export declare const stringifyType: ({ type, value }: DatasourceType, formatMessage: IntlShape['formatMessage'], formatDate: IntlShape['formatDate']) => string;
 export declare const renderType: TableViewPropsRenderType;

package/dist/types/ui/issue-like-table/render-type/number/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { NumberType } from '@atlaskit/linking-types';
+import { type NumberType } from '@atlaskit/linking-types';
 interface NumberProps {
     testId?: string;
     number: NumberType['value'];

package/dist/types/ui/issue-like-table/render-type/richtext/index.d.ts

@@ -1,5 +1,5 @@
 import { jsx } from '@emotion/react';
-import { RichText } from '@atlaskit/linking-types';
+import { type RichText } from '@atlaskit/linking-types';
 export declare const parseRichText: (value: RichText) => string | null;
 declare const RichTextType: ({ value }: {
     value: RichText;

package/dist/types-ts4.5/ui/common/modal/datasource-modal/index.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { type ModalDialogProps } from '@atlaskit/modal-dialog';
+type DatasourceModalProps = Pick<ModalDialogProps, 'testId' | 'onClose' | 'children' | 'shouldCloseOnOverlayClick'>;
+export declare const DatasourceModal: ({ testId, onClose, shouldCloseOnOverlayClick, children, }: DatasourceModalProps) => JSX.Element;
+export {};

package/dist/types-ts4.5/ui/issue-like-table/render-type/index.d.ts

@@ -1,5 +1,5 @@
-import { IntlShape } from 'react-intl-next';
-import { DatasourceType } from '@atlaskit/linking-types';
-import { TableViewPropsRenderType } from '../types';
+import { type IntlShape } from 'react-intl-next';
+import { type DatasourceType } from '@atlaskit/linking-types';
+import { type TableViewPropsRenderType } from '../types';
 export declare const stringifyType: ({ type, value }: DatasourceType, formatMessage: IntlShape['formatMessage'], formatDate: IntlShape['formatDate']) => string;
 export declare const renderType: TableViewPropsRenderType;

package/dist/types-ts4.5/ui/issue-like-table/render-type/number/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { NumberType } from '@atlaskit/linking-types';
+import { type NumberType } from '@atlaskit/linking-types';
 interface NumberProps {
     testId?: string;
     number: NumberType['value'];

package/dist/types-ts4.5/ui/issue-like-table/render-type/richtext/index.d.ts

@@ -1,5 +1,5 @@
 import { jsx } from '@emotion/react';
-import { RichText } from '@atlaskit/linking-types';
+import { type RichText } from '@atlaskit/linking-types';
 export declare const parseRichText: (value: RichText) => string | null;
 declare const RichTextType: ({ value }: {
     value: RichText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "UI Components to support linking platform dataset feature",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.12.2",
+    "@atlaskit/adf-schema": "^36.1.0",
     "@atlaskit/analytics-next": "^9.3.0",
     "@atlaskit/avatar": "^21.8.0",
     "@atlaskit/avatar-group": "^9.6.0",
@@ -42,7 +42,7 @@
     "@atlaskit/dropdown-menu": "^12.10.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/empty-state": "^7.8.0",
-    "@atlaskit/form": "^9.3.0",
+    "@atlaskit/form": "^10.0.0",
     "@atlaskit/heading": "^2.3.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/icon-object": "^6.4.0",
@@ -66,13 +66,13 @@
     "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
     "@atlaskit/primitives": "^6.1.0",
     "@atlaskit/select": "^17.9.0",
-    "@atlaskit/smart-card": "^26.62.0",
+    "@atlaskit/smart-card": "^26.63.0",
     "@atlaskit/smart-user-picker": "6.9.3",
     "@atlaskit/spinner": "^16.1.0",
     "@atlaskit/tag": "^12.2.0",
     "@atlaskit/textfield": "6.3.1",
     "@atlaskit/theme": "^12.8.0",
-    "@atlaskit/tokens": "^1.46.0",
+    "@atlaskit/tokens": "^1.47.0",
     "@atlaskit/tooltip": "^18.3.0",
     "@atlaskit/ufo": "^0.2.4",
     "@atlaskit/width-detector": "^4.2.0",