@atlaskit/editor-core 185.15.4 → 185.16.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 185.16.1
+
+### Patch Changes
+
+- [`75520758a9d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/75520758a9d) - Fix layout not persisting on edits of datasource
+
+## 185.16.0
+
+### Minor Changes
+
+- [`5e03045b1a0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5e03045b1a0) - Adds support in /jira command to insert jira datasource table
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 185.15.4
 
 ### Patch Changes

package/dist/cjs/plugins/card/index.js

@@ -18,6 +18,11 @@ var _EditorSmartCardEventsNext = require("./ui/EditorSmartCardEventsNext");
 var _LayoutButton = _interopRequireDefault(require("./ui/LayoutButton"));
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _mountHyperlink = require("./pm-plugins/mountHyperlink");
+var _ModalWithState = _interopRequireDefault(require("./ui/DatasourceModal/ModalWithState"));
+var _messages = require("./messages");
+var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var _utils = require("@atlaskit/editor-common/utils");
+var _linkDatasource = require("@atlaskit/link-datasource");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var cardPlugin = function cardPlugin(options, api) {
@@ -94,6 +99,9 @@ var cardPlugin = function cardPlugin(options, api) {
         mountPoint: popupsMountPoint,
         scrollableElement: popupsScrollableElement,
         boundariesElement: popupsBoundariesElement
+      }), /*#__PURE__*/_react.default.createElement(_ModalWithState.default, {
+        api: api,
+        editorView: editorView
       }));
     },
     actions: {
@@ -103,7 +111,27 @@ var cardPlugin = function cardPlugin(options, api) {
       setSelectedCardAppearance: _doc.setSelectedCardAppearance
     },
     pluginsOptions: {
-      floatingToolbar: (0, _toolbar.floatingToolbar)(options, featureFlags, options.platform, options.linkPicker, api)
+      floatingToolbar: (0, _toolbar.floatingToolbar)(options, featureFlags, options.platform, options.linkPicker, api),
+      quickInsert: function quickInsert(_ref3) {
+        var formatMessage = _ref3.formatMessage;
+        if ((0, _utils.canRenderDatasource)(_linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
+          return [{
+            id: 'datasource',
+            title: formatMessage(_messages.messages.datasourceJiraIssue),
+            description: formatMessage(_messages.messages.datasourceJiraIssueDescription),
+            keywords: ['jira'],
+            icon: function icon() {
+              return /*#__PURE__*/_react.default.createElement(_quickInsert.IconDatasourceJiraIssue, null);
+            },
+            action: function action(insert) {
+              var tr = insert(undefined);
+              (0, _actions.showDatasourceModal)('jira')(tr);
+              return tr;
+            }
+          }];
+        }
+        return [];
+      }
     }
   };
 };

package/dist/cjs/plugins/card/messages.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.messages = void 0;
+var _reactIntlNext = require("react-intl-next");
+var messages = (0, _reactIntlNext.defineMessages)({
+  datasourceJiraIssue: {
+    id: 'fabric.editor.datasource.jiraIssue',
+    defaultMessage: 'Jira Issues',
+    description: 'Insert a jira datasource table'
+  },
+  datasourceJiraIssueDescription: {
+    id: 'fabric.editor.datasource.jiraIssue.description',
+    defaultMessage: 'Insert issues from Jira Cloud with enhanced search, filtering, and configuration',
+    description: 'Insert a jira datasource table'
+  }
+});
+exports.messages = messages;

package/dist/cjs/plugins/card/pm-plugins/actions.js

@@ -105,10 +105,13 @@ var hideLinkToolbar = function hideLinkToolbar(tr) {
   });
 };
 exports.hideLinkToolbar = hideLinkToolbar;
-var showDatasourceModal = function showDatasourceModal(tr) {
-  return cardAction(tr, {
-    type: 'SHOW_DATASOURCE_MODAL'
-  });
+var showDatasourceModal = function showDatasourceModal(modalType) {
+  return function (tr) {
+    return cardAction(tr, {
+      type: 'SHOW_DATASOURCE_MODAL',
+      modalType: modalType
+    });
+  };
 };
 exports.showDatasourceModal = showDatasourceModal;
 var hideDatasourceModal = function hideDatasourceModal(tr) {

package/dist/cjs/plugins/card/pm-plugins/doc.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateExistingDatasource = exports.updateCard = exports.setSelectedCardAppearance = exports.replaceQueuedUrlWithCard = exports.queueCardsFromChangedTr = exports.queueCardFromChangedTr = exports.handleFallbackWithAnalytics = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLinkFallback = exports.changeSelectedCardToLink = void 0;
+exports.updateExistingDatasource = exports.updateCard = exports.setSelectedCardAppearance = exports.replaceQueuedUrlWithCard = exports.queueCardsFromChangedTr = exports.queueCardFromChangedTr = exports.insertDatasource = exports.handleFallbackWithAnalytics = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLinkFallback = exports.changeSelectedCardToLink = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
@@ -435,19 +435,23 @@ var updateExistingDatasource = function updateExistingDatasource(state, node, ne
 
   // datasource to datasource
   if (newAdf.type === 'blockCard' && newAdf.attrs.datasource && node.attrs.datasource) {
-    var _ref, _ref2, _newViews$, _newViews$$properties, _oldViews$, _oldViews$$properties, _newAdf$attrs, _node$attrs;
-    var newViews = (_ref = newAdf.attrs.datasource.views) !== null && _ref !== void 0 ? _ref : [];
-    var oldViews = (_ref2 = node.attrs.datasource.views) !== null && _ref2 !== void 0 ? _ref2 : [];
-    var newColumnKeys = (_newViews$ = newViews[0]) === null || _newViews$ === void 0 ? void 0 : (_newViews$$properties = _newViews$.properties) === null || _newViews$$properties === void 0 ? void 0 : _newViews$$properties.columns.map(function (column) {
+    var _ref3, _ref6, _newViews$properties, _oldViews$properties, _newAdf$attrs, _node$attrs;
+    var _ref = (_ref3 = newAdf.attrs.datasource.views) !== null && _ref3 !== void 0 ? _ref3 : [],
+      _ref2 = (0, _slicedToArray2.default)(_ref, 1),
+      newViews = _ref2[0];
+    var _ref4 = (_ref6 = node.attrs.datasource.views) !== null && _ref6 !== void 0 ? _ref6 : [],
+      _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
+      oldViews = _ref5[0];
+    var newColumnKeys = newViews === null || newViews === void 0 ? void 0 : (_newViews$properties = newViews.properties) === null || _newViews$properties === void 0 ? void 0 : _newViews$properties.columns.map(function (column) {
       return column.key;
     });
-    var oldColumnKeys = (_oldViews$ = oldViews[0]) === null || _oldViews$ === void 0 ? void 0 : (_oldViews$$properties = _oldViews$.properties) === null || _oldViews$$properties === void 0 ? void 0 : _oldViews$$properties.columns.map(function (column) {
+    var oldColumnKeys = oldViews === null || oldViews === void 0 ? void 0 : (_oldViews$properties = oldViews.properties) === null || _oldViews$properties === void 0 ? void 0 : _oldViews$properties.columns.map(function (column) {
       return column.key;
     });
     var isColumnChange = !(0, _isEqual.default)(oldColumnKeys, newColumnKeys);
     var isUrlChange = ((_newAdf$attrs = newAdf.attrs) === null || _newAdf$attrs === void 0 ? void 0 : _newAdf$attrs.url) !== ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url);
     if (isColumnChange || isUrlChange) {
-      tr.setNodeMarkup(from, schemaNodes.blockCard, newAdf.attrs);
+      tr.setNodeMarkup(from, schemaNodes.blockCard, _objectSpread(_objectSpread({}, node.attrs), newAdf.attrs));
     }
   } else if (newAdf.type === 'inlineCard') {
     // datasource to inline
@@ -456,4 +460,19 @@ var updateExistingDatasource = function updateExistingDatasource(state, node, ne
   (0, _actions.hideDatasourceModal)(tr);
   view.dispatch(tr.scrollIntoView());
 };
-exports.updateExistingDatasource = updateExistingDatasource;
+exports.updateExistingDatasource = updateExistingDatasource;
+var insertDatasource = function insertDatasource(state, adf, view) {
+  var tr = state.tr,
+    from = state.selection.from,
+    schemaNodes = state.schema.nodes;
+  var attrs = adf.attrs,
+    type = adf.type;
+  var schemaNode = type === 'inlineCard' ? schemaNodes.inlineCard : schemaNodes.blockCard;
+  var newNode = schemaNode.createChecked(attrs);
+  // in future, if we decide to do datasource insertion from the main toolbar, we should probably consider editor-plugin-content-insertion instead of tr.insert
+  // this will allow us to deal with insertions from multiple paths in a more consistent way
+  newNode && tr.insert(from, newNode);
+  (0, _actions.hideDatasourceModal)(tr);
+  view.dispatch(tr.scrollIntoView());
+};
+exports.insertDatasource = insertDatasource;

package/dist/cjs/plugins/card/pm-plugins/main.js

@@ -59,6 +59,7 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             smartLinkEventsNext: undefined,
             editorAppearance: editorAppearance,
             showDatasourceModal: false,
+            datasourceModalType: undefined,
             datasourceTableRef: undefined,
             layout: undefined
           };
@@ -170,8 +171,8 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
             var hasIntlContext = true;
             var isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
             if (isDatasource) {
-              var _node$attrs4;
-              if (platform !== 'mobile' && (0, _utils.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+              var _node$attrs4, _node$attrs4$datasour;
+              if (platform !== 'mobile' && (0, _utils.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : (_node$attrs4$datasour = _node$attrs4.datasource) === null || _node$attrs4$datasour === void 0 ? void 0 : _node$attrs4$datasour.id)) {
                 return new _datasource.Datasource({
                   node: node,
                   view: view,

package/dist/cjs/plugins/card/pm-plugins/reducers.js

@@ -67,9 +67,16 @@ var setLinkToolbar = function setLinkToolbar(state, action) {
     showLinkingToolbar: action.type === 'SHOW_LINK_TOOLBAR'
   });
 };
-var setDatasourceModal = function setDatasourceModal(state, action) {
+var showDatasourceModal = function showDatasourceModal(state, action) {
   return _objectSpread(_objectSpread({}, state), {}, {
-    showDatasourceModal: action.type === 'SHOW_DATASOURCE_MODAL'
+    showDatasourceModal: true,
+    datasourceModalType: action.type === 'SHOW_DATASOURCE_MODAL' ? action.modalType : undefined
+  });
+};
+var hideDatasourceModal = function hideDatasourceModal(state) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    showDatasourceModal: false,
+    datasourceModalType: undefined
   });
 };
 var _default = function _default(state, action) {
@@ -96,8 +103,9 @@ var _default = function _default(state, action) {
     case 'HIDE_LINK_TOOLBAR':
       return setLinkToolbar(state, action);
     case 'SHOW_DATASOURCE_MODAL':
+      return showDatasourceModal(state, action);
     case 'HIDE_DATASOURCE_MODAL':
-      return setDatasourceModal(state, action);
+      return hideDatasourceModal(state);
   }
 };
 exports.default = _default;

package/dist/cjs/plugins/card/toolbar.js

@@ -174,7 +174,7 @@ var withToolbarMetadata = function withToolbarMetadata(command) {
 };
 var generateToolbarItems = function generateToolbarItems(state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) {
   return function (node) {
-    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2, _node$attrs2$datasour;
     var _titleUrlPairFromNode2 = (0, _utils.titleUrlPairFromNode)(node),
       url = _titleUrlPairFromNode2.url;
     var _ref = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.analytics) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
@@ -197,7 +197,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     var isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
     var shouldRenderDatasourceToolbar = isDatasource &&
     // not showing toolbar in mobile for now since not sure what our plans are for it
-    platform !== 'mobile' && (0, _utils2.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
+    platform !== 'mobile' && (0, _utils2.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : (_node$attrs2$datasour = _node$attrs2.datasource) === null || _node$attrs2$datasour === void 0 ? void 0 : _node$attrs2$datasour.id);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -208,12 +208,6 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         featureFlags: featureFlags,
         pluginInjectionApi: pluginInjectionApi
       })];
-    } else if (pluginState !== null && pluginState !== void 0 && pluginState.showDatasourceModal) {
-      return [(0, _EditLinkToolbar.openDatasourceModal)({
-        state: state,
-        node: node,
-        editorAnalyticsApi: editorAnalyticsApi
-      })];
     } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
@@ -336,7 +330,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     metadata: metadata,
     className: 'datasource-edit',
     title: intl.formatMessage(_messages.linkToolbarMessages.editDatasource),
-    onClick: (0, _EditLinkToolbar.editDatasource)(editorAnalyticsApi)
+    onClick: (0, _EditLinkToolbar.editDatasource)(node, editorAnalyticsApi)
   }];
   if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({

package/dist/cjs/plugins/card/ui/DatasourceModal/ModalWithState.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _index = require("./index");
+var ModalWithState = function ModalWithState(_ref) {
+  var api = _ref.api,
+    editorView = _ref.editorView;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['card']),
+    cardState = _useSharedPluginState.cardState;
+  if (!(cardState !== null && cardState !== void 0 && cardState.showDatasourceModal)) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_index.DatasourceModal, {
+    view: editorView,
+    modalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
+  });
+};
+var _default = ModalWithState;
+exports.default = _default;

package/dist/cjs/plugins/card/ui/DatasourceModal/index.js

@@ -0,0 +1,60 @@
+"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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _linkDatasource = require("@atlaskit/link-datasource");
+var _actions = require("../../pm-plugins/actions");
+var _doc = require("../../pm-plugins/doc");
+var _prosemirrorState = require("prosemirror-state");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var DatasourceModal = function DatasourceModal(_ref) {
+  var view = _ref.view,
+    modalType = _ref.modalType;
+  var dispatch = view.dispatch,
+    state = view.state;
+  var selection = state.selection;
+  var existingNode = selection instanceof _prosemirrorState.NodeSelection ? selection.node : undefined;
+  var onClose = (0, _react.useCallback)(function () {
+    dispatch((0, _actions.hideDatasourceModal)(state.tr));
+  }, [dispatch, state.tr]);
+  var onInsert = (0, _react.useCallback)(function (newAdf) {
+    if (existingNode) {
+      (0, _doc.updateExistingDatasource)(state, existingNode, newAdf, view);
+    } else {
+      (0, _doc.insertDatasource)(state, newAdf, view);
+    }
+  }, [existingNode, state, view]);
+  if (modalType === 'jira') {
+    var _existingNode$attrs, _tableView$properties;
+    var _ref2 = (existingNode === null || existingNode === void 0 ? void 0 : (_existingNode$attrs = existingNode.attrs) === null || _existingNode$attrs === void 0 ? void 0 : _existingNode$attrs.datasource) || {},
+      _ref2$id = _ref2.id,
+      datasourceId = _ref2$id === void 0 ? _linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID : _ref2$id,
+      parameters = _ref2.parameters,
+      _ref2$views = _ref2.views,
+      views = _ref2$views === void 0 ? [] : _ref2$views;
+    var _ref3 = views,
+      _ref4 = (0, _slicedToArray2.default)(_ref3, 1),
+      tableView = _ref4[0];
+    var visibleColumnKeys = tableView === null || tableView === void 0 ? void 0 : (_tableView$properties = tableView.properties) === null || _tableView$properties === void 0 ? void 0 : _tableView$properties.columns.map(function (column) {
+      return column.key;
+    });
+    return /*#__PURE__*/_react.default.createElement("div", {
+      "data-testid": "jira-config-modal"
+    }, /*#__PURE__*/_react.default.createElement(_linkDatasource.JiraIssuesConfigModal, {
+      datasourceId: datasourceId,
+      visibleColumnKeys: visibleColumnKeys,
+      parameters: parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
+  return null; // null for now until we have modal component that handles other datasources
+};
+exports.DatasourceModal = DatasourceModal;

package/dist/cjs/plugins/card/ui/EditLinkToolbar.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EditLinkToolbar = void 0;
 exports.HyperlinkAddToolbarWithState = HyperlinkAddToolbarWithState;
-exports.openDatasourceModal = exports.editLinkToolbarConfig = exports.editLink = exports.editDatasource = exports.buildEditLinkToolbar = void 0;
+exports.editLinkToolbarConfig = exports.editLink = exports.editDatasource = exports.buildEditLinkToolbar = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -24,8 +24,8 @@ var _doc = require("../pm-plugins/doc");
 var _utils = require("../utils");
 var _prosemirrorState = require("prosemirror-state");
 var _messages = require("@atlaskit/editor-common/messages");
-var _DatasourceModal = require("./DatasourceModal");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _linkDatasource = require("@atlaskit/link-datasource");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var HyperLinkToolbarWithListeners = (0, _ui.withOuterListeners)(HyperlinkAddToolbarWithState);
@@ -232,11 +232,13 @@ var editLinkToolbarConfig = function editLinkToolbarConfig(showLinkingToolbar, l
   } : {};
 };
 exports.editLinkToolbarConfig = editLinkToolbarConfig;
-var editDatasource = function editDatasource(editorAnalyticsApi) {
+var editDatasource = function editDatasource(node, editorAnalyticsApi) {
   return function (state, dispatch) {
-    if (dispatch) {
+    var _node$attrs;
+    var modalType = ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource.id) === _linkDatasource.JIRA_LIST_OF_LINKS_DATASOURCE_ID ? 'jira' : undefined;
+    if (dispatch && modalType) {
       var tr = state.tr;
-      (0, _actions.showDatasourceModal)(tr);
+      (0, _actions.showDatasourceModal)(modalType)(tr);
       // editorAnalyticsApi?.attachAnalyticsEvent(
       //   buildEditLinkPayload(
       //     type as
@@ -251,26 +253,4 @@ var editDatasource = function editDatasource(editorAnalyticsApi) {
     return false;
   };
 };
-exports.editDatasource = editDatasource;
-var openDatasourceModal = function openDatasourceModal(_ref3) {
-  var state = _ref3.state,
-    node = _ref3.node,
-    editorAnalyticsApi = _ref3.editorAnalyticsApi;
-  return {
-    type: 'custom',
-    disableArrowNavigation: true,
-    fallback: [],
-    render: function render(view) {
-      if (!view) {
-        return null;
-      }
-      return /*#__PURE__*/_react.default.createElement(_DatasourceModal.DatasourceModal, {
-        state: state,
-        view: view,
-        node: node,
-        editorAnalyticsApi: editorAnalyticsApi
-      });
-    }
-  };
-};
-exports.openDatasourceModal = openDatasourceModal;
+exports.editDatasource = editDatasource;

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "185.15.4";
+var version = "185.16.1";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.15.4",
+	"version": "185.16.1",
 	"sideEffects": false
 }

package/dist/es2019/plugins/card/index.js

@@ -10,6 +10,12 @@ import { EditorSmartCardEventsNext } from './ui/EditorSmartCardEventsNext';
 import LayoutButton from './ui/LayoutButton';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { mountHyperlinkPlugin } from './pm-plugins/mountHyperlink';
+import { showDatasourceModal } from './pm-plugins/actions';
+import DatasourceModalWithState from './ui/DatasourceModal/ModalWithState';
+import { messages } from './messages';
+import { IconDatasourceJiraIssue } from '@atlaskit/editor-common/quick-insert';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
+import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 const cardPlugin = (options, api) => {
   var _api$dependencies, _api$dependencies$fea;
   const featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies = api.dependencies) === null || _api$dependencies === void 0 ? void 0 : (_api$dependencies$fea = _api$dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
@@ -87,6 +93,9 @@ const cardPlugin = (options, api) => {
         mountPoint: popupsMountPoint,
         scrollableElement: popupsScrollableElement,
         boundariesElement: popupsBoundariesElement
+      }), /*#__PURE__*/React.createElement(DatasourceModalWithState, {
+        api: api,
+        editorView: editorView
       }));
     },
     actions: {
@@ -96,7 +105,26 @@ const cardPlugin = (options, api) => {
       setSelectedCardAppearance
     },
     pluginsOptions: {
-      floatingToolbar: floatingToolbar(options, featureFlags, options.platform, options.linkPicker, api)
+      floatingToolbar: floatingToolbar(options, featureFlags, options.platform, options.linkPicker, api),
+      quickInsert: ({
+        formatMessage
+      }) => {
+        if (canRenderDatasource(JIRA_LIST_OF_LINKS_DATASOURCE_ID)) {
+          return [{
+            id: 'datasource',
+            title: formatMessage(messages.datasourceJiraIssue),
+            description: formatMessage(messages.datasourceJiraIssueDescription),
+            keywords: ['jira'],
+            icon: () => /*#__PURE__*/React.createElement(IconDatasourceJiraIssue, null),
+            action(insert) {
+              const tr = insert(undefined);
+              showDatasourceModal('jira')(tr);
+              return tr;
+            }
+          }];
+        }
+        return [];
+      }
     }
   };
 };

package/dist/es2019/plugins/card/messages.js

@@ -0,0 +1,13 @@
+import { defineMessages } from 'react-intl-next';
+export const messages = defineMessages({
+  datasourceJiraIssue: {
+    id: 'fabric.editor.datasource.jiraIssue',
+    defaultMessage: 'Jira Issues',
+    description: 'Insert a jira datasource table'
+  },
+  datasourceJiraIssueDescription: {
+    id: 'fabric.editor.datasource.jiraIssue.description',
+    defaultMessage: 'Insert issues from Jira Cloud with enhanced search, filtering, and configuration',
+    description: 'Insert a jira datasource table'
+  }
+});

package/dist/es2019/plugins/card/pm-plugins/actions.js

@@ -48,8 +48,9 @@ export const showLinkToolbar = tr => cardAction(tr, {
 export const hideLinkToolbar = tr => cardAction(tr, {
   type: 'HIDE_LINK_TOOLBAR'
 });
-export const showDatasourceModal = tr => cardAction(tr, {
-  type: 'SHOW_DATASOURCE_MODAL'
+export const showDatasourceModal = modalType => tr => cardAction(tr, {
+  type: 'SHOW_DATASOURCE_MODAL',
+  modalType
 });
 export const hideDatasourceModal = tr => cardAction(tr, {
   type: 'HIDE_DATASOURCE_MODAL'

package/dist/es2019/plugins/card/pm-plugins/doc.js

@@ -407,15 +407,18 @@ export const updateExistingDatasource = (state, node, newAdf, view) => {
 
   // datasource to datasource
   if (newAdf.type === 'blockCard' && newAdf.attrs.datasource && node.attrs.datasource) {
-    var _ref, _ref2, _newViews$, _newViews$$properties, _oldViews$, _oldViews$$properties, _newAdf$attrs, _node$attrs;
-    const newViews = (_ref = newAdf.attrs.datasource.views) !== null && _ref !== void 0 ? _ref : [];
-    const oldViews = (_ref2 = node.attrs.datasource.views) !== null && _ref2 !== void 0 ? _ref2 : [];
-    const newColumnKeys = (_newViews$ = newViews[0]) === null || _newViews$ === void 0 ? void 0 : (_newViews$$properties = _newViews$.properties) === null || _newViews$$properties === void 0 ? void 0 : _newViews$$properties.columns.map(column => column.key);
-    const oldColumnKeys = (_oldViews$ = oldViews[0]) === null || _oldViews$ === void 0 ? void 0 : (_oldViews$$properties = _oldViews$.properties) === null || _oldViews$$properties === void 0 ? void 0 : _oldViews$$properties.columns.map(column => column.key);
+    var _ref, _ref2, _newViews$properties, _oldViews$properties, _newAdf$attrs, _node$attrs;
+    const [newViews] = (_ref = newAdf.attrs.datasource.views) !== null && _ref !== void 0 ? _ref : [];
+    const [oldViews] = (_ref2 = node.attrs.datasource.views) !== null && _ref2 !== void 0 ? _ref2 : [];
+    const newColumnKeys = newViews === null || newViews === void 0 ? void 0 : (_newViews$properties = newViews.properties) === null || _newViews$properties === void 0 ? void 0 : _newViews$properties.columns.map(column => column.key);
+    const oldColumnKeys = oldViews === null || oldViews === void 0 ? void 0 : (_oldViews$properties = oldViews.properties) === null || _oldViews$properties === void 0 ? void 0 : _oldViews$properties.columns.map(column => column.key);
     const isColumnChange = !isEqual(oldColumnKeys, newColumnKeys);
     const isUrlChange = ((_newAdf$attrs = newAdf.attrs) === null || _newAdf$attrs === void 0 ? void 0 : _newAdf$attrs.url) !== ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.url);
     if (isColumnChange || isUrlChange) {
-      tr.setNodeMarkup(from, schemaNodes.blockCard, newAdf.attrs);
+      tr.setNodeMarkup(from, schemaNodes.blockCard, {
+        ...node.attrs,
+        ...newAdf.attrs
+      });
     }
   } else if (newAdf.type === 'inlineCard') {
     // datasource to inline
@@ -423,4 +426,26 @@ export const updateExistingDatasource = (state, node, newAdf, view) => {
   }
   hideDatasourceModal(tr);
   view.dispatch(tr.scrollIntoView());
+};
+export const insertDatasource = (state, adf, view) => {
+  const {
+    tr,
+    selection: {
+      from
+    },
+    schema: {
+      nodes: schemaNodes
+    }
+  } = state;
+  const {
+    attrs,
+    type
+  } = adf;
+  const schemaNode = type === 'inlineCard' ? schemaNodes.inlineCard : schemaNodes.blockCard;
+  const newNode = schemaNode.createChecked(attrs);
+  // in future, if we decide to do datasource insertion from the main toolbar, we should probably consider editor-plugin-content-insertion instead of tr.insert
+  // this will allow us to deal with insertions from multiple paths in a more consistent way
+  newNode && tr.insert(from, newNode);
+  hideDatasourceModal(tr);
+  view.dispatch(tr.scrollIntoView());
 };

package/dist/es2019/plugins/card/pm-plugins/main.js

@@ -49,6 +49,7 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           smartLinkEventsNext: undefined,
           editorAppearance,
           showDatasourceModal: false,
+          datasourceModalType: undefined,
           datasourceTableRef: undefined,
           layout: undefined
         };
@@ -166,8 +167,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
           const hasIntlContext = true;
           const isDatasource = !!(node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.datasource);
           if (isDatasource) {
-            var _node$attrs4;
-            if (platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+            var _node$attrs4, _node$attrs4$datasour;
+            if (platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : (_node$attrs4$datasour = _node$attrs4.datasource) === null || _node$attrs4$datasour === void 0 ? void 0 : _node$attrs4$datasour.id)) {
               return new Datasource({
                 node,
                 view,

package/dist/es2019/plugins/card/pm-plugins/reducers.js

@@ -65,10 +65,18 @@ const setLinkToolbar = (state, action) => {
     showLinkingToolbar: action.type === 'SHOW_LINK_TOOLBAR'
   };
 };
-const setDatasourceModal = (state, action) => {
+const showDatasourceModal = (state, action) => {
   return {
     ...state,
-    showDatasourceModal: action.type === 'SHOW_DATASOURCE_MODAL'
+    showDatasourceModal: true,
+    datasourceModalType: action.type === 'SHOW_DATASOURCE_MODAL' ? action.modalType : undefined
+  };
+};
+const hideDatasourceModal = state => {
+  return {
+    ...state,
+    showDatasourceModal: false,
+    datasourceModalType: undefined
   };
 };
 export default ((state, action) => {
@@ -95,7 +103,8 @@ export default ((state, action) => {
     case 'HIDE_LINK_TOOLBAR':
       return setLinkToolbar(state, action);
     case 'SHOW_DATASOURCE_MODAL':
+      return showDatasourceModal(state, action);
     case 'HIDE_DATASOURCE_MODAL':
-      return setDatasourceModal(state, action);
+      return hideDatasourceModal(state);
   }
 });