@atlaskit/editor-core 185.5.7 → 185.6.1

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

@@ -11,13 +11,14 @@ import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
 import { richMediaClassName } from '@atlaskit/editor-common/styles';
-import { buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
+import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig, openDatasourceModal } from './ui/EditLinkToolbar';
 import { displayInfoForCard, findCardInfo, titleUrlPairFromNode, appearanceForNodeType } from './utils';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { messages } from './messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from './styles';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
+import { SmallerEditIcon } from './ui/SmallerEditIcon';
 export const removeCard = editorAnalyticsApi => commandWithMetadata((state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -163,7 +164,7 @@ const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB
 });
 const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOptions, platform, linkPicker, pluginInjectionApi) => node => {
-  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5;
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -187,6 +188,7 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
   const {
     hoverDecoration
   } = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.decorations) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {};
+  const isDatasource = currentAppearance === 'block' && (node === null || node === void 0 ? void 0 : (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.datasource);
 
   /* mobile builds toolbar natively using toolbarItems */
   if (pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -197,6 +199,15 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       featureFlags,
       pluginInjectionApi
     })];
+  } else if (pluginState.showDatasourceModal) {
+    return [openDatasourceModal({
+      state,
+      node,
+      editorAnalyticsApi
+    })];
+    // not showing toolbar in mobile for now since not sure what our plans are for it
+  } else if (isDatasource && platform !== 'mobile') {
+    return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
   } else {
     const {
       inlineCard
@@ -309,4 +320,45 @@ const getSettingsButtonGroup = (state, featureFlags, intl, editorAnalyticsApi) =
   }, {
     type: 'separator'
   }] : [];
+};
+const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) => {
+  var _node$attrs2;
+  const toolbarItems = [{
+    id: 'editor.edit.datasource',
+    type: 'button',
+    icon: SmallerEditIcon,
+    metadata: metadata,
+    className: 'datasource-edit',
+    title: intl.formatMessage(linkToolbarMessages.editDatasource),
+    onClick: editDatasource(editorAnalyticsApi)
+  }];
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+    toolbarItems.push({
+      type: 'separator'
+    }, {
+      id: 'editor.link.openLink',
+      type: 'button',
+      icon: OpenIcon,
+      metadata: metadata,
+      className: 'hyperlink-open-link',
+      title: intl.formatMessage(linkMessages.openLink),
+      onClick: visitCardLink(editorAnalyticsApi)
+    });
+  }
+  toolbarItems.push({
+    type: 'separator'
+  }, {
+    id: 'editor.link.delete',
+    focusEditoronEnter: true,
+    type: 'button',
+    appearance: 'danger',
+    icon: RemoveIcon,
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
+    title: intl.formatMessage(commonMessages.remove),
+    onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
+  });
+  return toolbarItems;
 };

package/dist/es2019/plugins/card/ui/DatasourceModal.js

@@ -0,0 +1,30 @@
+import React, { useCallback } from 'react';
+import { JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { hideDatasourceModal } from '../pm-plugins/actions';
+import { updateExistingDatasource } from '../pm-plugins/doc';
+export const DatasourceModal = ({
+  state,
+  view,
+  node
+}) => {
+  const isJiraDatasource = node.attrs.datasource.parameters.jql;
+  const onClose = useCallback(() => {
+    view.dispatch(hideDatasourceModal(view.state.tr));
+  }, [view]);
+  const onInsert = useCallback(newAdf => {
+    updateExistingDatasource(state, node, newAdf, view);
+  }, [state, node, view]);
+  if (isJiraDatasource) {
+    var _node$attrs$datasourc, _node$attrs$datasourc2;
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testId": "jira-config-modal"
+    }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
+      datasourceId: node.attrs.datasource.id,
+      visibleColumnKeys: (_node$attrs$datasourc = node.attrs.datasource.views[0]) === null || _node$attrs$datasourc === void 0 ? void 0 : (_node$attrs$datasourc2 = _node$attrs$datasourc.properties) === null || _node$attrs$datasourc2 === void 0 ? void 0 : _node$attrs$datasourc2.columns.map(column => column.key),
+      parameters: node.attrs.datasource.parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
+  return null; // null for now until we have modal component that handles other datasources
+};

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

@@ -3,13 +3,14 @@ import React from 'react';
 import { withOuterListeners } from '@atlaskit/editor-common/ui';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import HyperlinkToolbar from '../../hyperlink/ui/HyperlinkAddToolbar';
-import { showLinkToolbar, hideLinkToolbar } from '../pm-plugins/actions';
+import { showLinkToolbar, hideLinkToolbar, showDatasourceModal } from '../pm-plugins/actions';
 import { INPUT_METHOD, ACTION, buildEditLinkPayload } from '@atlaskit/editor-common/analytics';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
+import { DatasourceModal } from './DatasourceModal';
 const HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export class EditLinkToolbar extends React.Component {
   constructor(...args) {
@@ -138,4 +139,45 @@ export const editLinkToolbarConfig = (showLinkingToolbar, lpLinkPicker) => {
     width: RECENT_SEARCH_WIDTH_IN_PX,
     forcePlacement: true
   } : {};
+};
+export const editDatasource = editorAnalyticsApi => (state, dispatch) => {
+  if (dispatch) {
+    const {
+      tr
+    } = state;
+    showDatasourceModal(tr);
+    // editorAnalyticsApi?.attachAnalyticsEvent(
+    //   buildEditLinkPayload(
+    //     type as
+    //       | ACTION_SUBJECT_ID.CARD_INLINE
+    //       | ACTION_SUBJECT_ID.CARD_BLOCK
+    //       | ACTION_SUBJECT_ID.EMBEDS,
+    //   ),
+    // )(tr);
+    dispatch(tr);
+    return true;
+  }
+  return false;
+};
+export const openDatasourceModal = ({
+  state,
+  node,
+  editorAnalyticsApi
+}) => {
+  return {
+    type: 'custom',
+    disableArrowNavigation: true,
+    fallback: [],
+    render: view => {
+      if (!view) {
+        return null;
+      }
+      return /*#__PURE__*/React.createElement(DatasourceModal, {
+        state: state,
+        view: view,
+        node: node,
+        editorAnalyticsApi: editorAnalyticsApi
+      });
+    }
+  };
 };

package/dist/es2019/plugins/card/ui/SmallerEditIcon.js

@@ -0,0 +1,11 @@
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import EditIcon from '@atlaskit/icon/glyph/edit';
+import { editIconStyles } from './styled';
+export const SmallerEditIcon = () => {
+  return jsx("div", {
+    css: editIconStyles
+  }, jsx(EditIcon, {
+    label: "edit"
+  }));
+};

package/dist/es2019/plugins/card/ui/styled.js

@@ -21,4 +21,7 @@ export const embedCardStyles = css`
 `;
 export const embedSpacingStyles = css`
   margin: 0 10px;
+`;
+export const editIconStyles = css`
+  width: 20px;
 `;

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.5.7";
+export const version = "185.6.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/create-editor/ReactEditorViewInternal.js

@@ -481,14 +481,24 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
         });
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "editor", /*#__PURE__*/React.createElement("div", {
-      className: getUAPrefix(),
-      key: "ProseMirror",
-      ref: _this.handleEditorViewRef,
-      "aria-label": _this.props.editorProps.assistiveLabel ? _this.props.editorProps.assistiveLabel : _this.props.intl.formatMessage(editorMessages.editorAssistiveLabel),
-      role: "textbox",
-      id: EDIT_AREA_ID
-    }));
+    _defineProperty(_assertThisInitialized(_this), "createEditor", function (assistiveLabel) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: getUAPrefix(),
+        key: "ProseMirror",
+        ref: _this.handleEditorViewRef,
+        "aria-label": assistiveLabel || _this.props.intl.formatMessage(editorMessages.editorAssistiveLabel)
+        // setting aria-multiline to true when not mobile appearance.
+        //  because somehow mobile tests are failing when it set.
+        //  don't know why that is happening.
+        // Created https://product-fabric.atlassian.net/jira/servicedesk/projects/DTR/queues/issue/DTR-1675
+        //  to investigate further.
+        ,
+        "aria-multiline": _this.props.editorProps.appearance !== 'mobile' ? true : false,
+        role: "textbox",
+        id: EDIT_AREA_ID
+      });
+    });
+    _defineProperty(_assertThisInitialized(_this), "editor", _this.createEditor(_this.props.editorProps.assistiveLabel));
     _this.pluginInjectionAPI = new EditorPluginInjectionAPI({
       getEditorState: _this.getEditorState
     });
@@ -617,6 +627,9 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       if (!this.transactionTracking.enabled) {
         this.pluginPerformanceObserver.disconnect();
       }
+      if (nextProps.editorProps.assistiveLabel !== this.props.editorProps.assistiveLabel) {
+        this.editor = this.createEditor(nextProps.editorProps.assistiveLabel);
+      }
     }
   }, {
     key: "reconfigureState",

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

@@ -86,4 +86,14 @@ export var hideLinkToolbar = function hideLinkToolbar(tr) {
   return cardAction(tr, {
     type: 'HIDE_LINK_TOOLBAR'
   });
+};
+export var showDatasourceModal = function showDatasourceModal(tr) {
+  return cardAction(tr, {
+    type: 'SHOW_DATASOURCE_MODAL'
+  });
+};
+export var hideDatasourceModal = function hideDatasourceModal(tr) {
+  return cardAction(tr, {
+    type: 'HIDE_DATASOURCE_MODAL'
+  });
 };

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

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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) { _defineProperty(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; }
+import isEqual from 'lodash/isEqual';
 import { NodeSelection, TextSelection } from 'prosemirror-state';
 import { closeHistory } from 'prosemirror-history';
 import { isSafeUrl } from '@atlaskit/adf-schema';
@@ -10,7 +11,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, SM
 import { nodesBetweenChanged, processRawValue } from '@atlaskit/editor-common/utils';
 import { isFromCurrentDomain, getLinkCreationAnalyticsEvent } from '@atlaskit/editor-common/utils';
 import { appearanceForNodeType, selectedCardAppearance } from '../utils';
-import { queueCards, resolveCard } from './actions';
+import { queueCards, resolveCard, hideDatasourceModal } from './actions';
 import { pluginKey } from './plugin-key';
 import { shouldReplaceLink } from './shouldReplaceLink';
 
@@ -409,4 +410,34 @@ var getLinkNodeType = function getLinkNodeType(appearance, linkNodes) {
     case 'embed':
       return linkNodes.embedCard;
   }
+};
+
+// Apply an update to a datasource (aka blockCard) node
+export var updateExistingDatasource = function updateExistingDatasource(state, node, newAdf, view) {
+  var tr = state.tr,
+    from = state.selection.from,
+    schemaNodes = state.schema.nodes;
+
+  // 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) {
+      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) {
+      return column.key;
+    });
+    var isColumnChange = !isEqual(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);
+    }
+  } else if (newAdf.type === 'inlineCard') {
+    // datasource to inline
+    tr.setNodeMarkup(from, schemaNodes.inlineCard, newAdf.attrs);
+  }
+  hideDatasourceModal(tr);
+  view.dispatch(tr.scrollIntoView());
 };

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

@@ -38,6 +38,7 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
             smartLinkEventsNext: undefined,
             createAnalyticsEvent: createAnalyticsEvent,
             editorAppearance: editorAppearance,
+            showDatasourceModal: false,
             datasourceTableRef: undefined,
             layout: undefined
           };

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

@@ -60,6 +60,11 @@ var setLinkToolbar = function setLinkToolbar(state, action) {
     showLinkingToolbar: action.type === 'SHOW_LINK_TOOLBAR'
   });
 };
+var setDatasourceModal = function setDatasourceModal(state, action) {
+  return _objectSpread(_objectSpread({}, state), {}, {
+    showDatasourceModal: action.type === 'SHOW_DATASOURCE_MODAL'
+  });
+};
 export default (function (state, action) {
   switch (action.type) {
     case 'QUEUE':
@@ -83,5 +88,8 @@ export default (function (state, action) {
     case 'SHOW_LINK_TOOLBAR':
     case 'HIDE_LINK_TOOLBAR':
       return setLinkToolbar(state, action);
+    case 'SHOW_DATASOURCE_MODAL':
+    case 'HIDE_DATASOURCE_MODAL':
+      return setDatasourceModal(state, action);
   }
 });

package/dist/esm/plugins/card/styles.js

@@ -1,9 +1,10 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 var _templateObject;
 import { css } from '@emotion/react';
-import { SelectionStyle, getSelectionStyles, akEditorDeleteBorder, akEditorDeleteBackground } from '@atlaskit/editor-shared-styles';
-import { N20 } from '@atlaskit/theme/colors';
+import { SelectionStyle, getSelectionStyles, akEditorDeleteBorder, akEditorDeleteBackground, akEditorRuleBorderRadius } from '@atlaskit/editor-shared-styles';
+import { N0, N20, N40 } from '@atlaskit/theme/colors';
 import { SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { DATASOURCE_INNER_CONTAINER_CLASSNAME } from './nodeviews/datasource';
 export var FLOATING_TOOLBAR_LINKPICKER_CLASSNAME = 'card-floating-toolbar--link-picker';
-export var smartCardStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    max-width: calc(100% - 20px);\n    vertical-align: top;\n    word-break: break-all;\n\n    .card {\n      padding-left: 2px;\n      padding-right: 2px;\n      padding-top: 0.5em;\n      padding-bottom: 0.5em;\n      margin-bottom: -0.5em;\n\n      .", " > a:focus {\n        ", "\n      }\n    }\n\n    &.", "\n      .", "\n      > a {\n      ", "\n    }\n    .", " > a {\n      /* EDM-1717: box-shadow Safari fix start */\n      z-index: 1;\n      position: relative;\n      /* EDM-1717: box-shadow Safari fix end */\n    }\n\n    &.danger {\n      .", " > a {\n        box-shadow: 0 0 0 1px\n          ", ";\n        /* EDM-1717: box-shadow Safari fix start */\n        z-index: 2;\n        /* EDM-1717: box-shadow Safari fix end */\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n    }\n\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.danger {\n      .", " > div {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n      }\n    }\n  }\n\n  .", ".", " {\n    max-width: 100%;\n    display: flex;\n    justify-content: center;\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &::after {\n        transition: box-shadow 0s;\n      }\n    }\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.", "\n      .", "\n      > div::after {\n      ", "\n    }\n\n    &.danger {\n      .media-card-frame::after {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n        background: ", " !important;\n      }\n      .richMedia-resize-handle-right::after,\n      .richMedia-resize-handle-left::after {\n        background: ", ";\n      }\n    }\n  }\n\n  .", " {\n    padding: 0;\n  }\n"])), SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), SmartCardSharedCssClassName.LOADER_WRAPPER, SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-background-neutral-subtle-hovered, ".concat(N20, ")"), akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), SmartCardSharedCssClassName.DATASOURCE_CONTAINER, SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, SmartCardSharedCssClassName.LOADER_WRAPPER, akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);
+export var smartCardStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    max-width: calc(100% - 20px);\n    vertical-align: top;\n    word-break: break-all;\n\n    .card {\n      padding-left: 2px;\n      padding-right: 2px;\n      padding-top: 0.5em;\n      padding-bottom: 0.5em;\n      margin-bottom: -0.5em;\n\n      .", " > a:focus {\n        ", "\n      }\n    }\n\n    &.", "\n      .", "\n      > a {\n      ", "\n    }\n    .", " > a {\n      /* EDM-1717: box-shadow Safari fix start */\n      z-index: 1;\n      position: relative;\n      /* EDM-1717: box-shadow Safari fix end */\n    }\n\n    &.danger {\n      .", " > a {\n        box-shadow: 0 0 0 1px\n          ", ";\n        /* EDM-1717: box-shadow Safari fix start */\n        z-index: 2;\n        /* EDM-1717: box-shadow Safari fix end */\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &:hover {\n        background-color: ", ";\n      }\n    }\n\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.danger {\n      .", " > div {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n      }\n    }\n  }\n\n  .", ".", " {\n    max-width: 100%;\n    display: flex;\n    justify-content: center;\n\n    .", " {\n      cursor: pointer;\n      background-color: ", ";\n      border-radius: ", ";\n      border: 1px solid ", ";\n    }\n\n    &.", " {\n      .", " {\n        ", "\n      }\n    }\n\n    &.danger {\n      .", " {\n        box-shadow: 0 0 0 1px\n          ", ";\n      }\n    }\n  }\n\n  .", " {\n    .", " > div {\n      cursor: pointer;\n      &::after {\n        transition: box-shadow 0s;\n      }\n    }\n    &.", "\n      .", "\n      > div {\n      ", "\n    }\n\n    &.", "\n      .", "\n      > div::after {\n      ", "\n    }\n\n    &.danger {\n      .media-card-frame::after {\n        box-shadow: 0 0 0 1px\n          ", " !important;\n        background: ", " !important;\n      }\n      .richMedia-resize-handle-right::after,\n      .richMedia-resize-handle-left::after {\n        background: ", ";\n      }\n    }\n  }\n\n  .", " {\n    padding: 0;\n  }\n"])), SmartCardSharedCssClassName.INLINE_CARD_CONTAINER, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), SmartCardSharedCssClassName.LOADER_WRAPPER, SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-background-neutral-subtle-hovered, ".concat(N20, ")"), akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), SmartCardSharedCssClassName.LOADER_WRAPPER, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), SmartCardSharedCssClassName.DATASOURCE_CONTAINER, SmartCardSharedCssClassName.BLOCK_CARD_CONTAINER, DATASOURCE_INNER_CONTAINER_CLASSNAME, "var(--ds-background-neutral-subtle, ".concat(N0, ")"), "var(--ds-border-radius-100, ".concat(akEditorRuleBorderRadius, ")"), "var(--ds-border, ".concat(N40, ")"), akEditorSelectedNodeClassName, DATASOURCE_INNER_CONTAINER_CLASSNAME, getSelectionStyles([SelectionStyle.BoxShadow]), DATASOURCE_INNER_CONTAINER_CLASSNAME, "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), SmartCardSharedCssClassName.EMBED_CARD_CONTAINER, SmartCardSharedCssClassName.LOADER_WRAPPER, akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedNodeClassName, SmartCardSharedCssClassName.LOADER_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), "var(--ds-background-danger, ".concat(akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), FLOATING_TOOLBAR_LINKPICKER_CLASSNAME);

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

@@ -15,13 +15,14 @@ import { changeSelectedCardToText } from './pm-plugins/doc';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { pluginKey } from './pm-plugins/main';
 import { richMediaClassName } from '@atlaskit/editor-common/styles';
-import { buildEditLinkToolbar, editLink, editLinkToolbarConfig } from './ui/EditLinkToolbar';
+import { editDatasource, buildEditLinkToolbar, editLink, editLinkToolbarConfig, openDatasourceModal } from './ui/EditLinkToolbar';
 import { displayInfoForCard, findCardInfo, titleUrlPairFromNode, appearanceForNodeType } from './utils';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { LinkToolbarAppearance } from './ui/LinkToolbarAppearance';
 import { messages } from './messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from './styles';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
+import { SmallerEditIcon } from './ui/SmallerEditIcon';
 export var removeCard = function removeCard(editorAnalyticsApi) {
   return commandWithMetadata(function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
@@ -161,7 +162,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;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs;
     var _titleUrlPairFromNode2 = 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 : {},
@@ -181,6 +182,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     var currentAppearance = appearanceForNodeType(node.type);
     var _ref2 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d4 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : (_pluginInjectionApi$d5 = _pluginInjectionApi$d4.decorations) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
       hoverDecoration = _ref2.hoverDecoration;
+    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);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -191,6 +193,15 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         featureFlags: featureFlags,
         pluginInjectionApi: pluginInjectionApi
       })];
+    } else if (pluginState.showDatasourceModal) {
+      return [openDatasourceModal({
+        state: state,
+        node: node,
+        editorAnalyticsApi: editorAnalyticsApi
+      })];
+      // not showing toolbar in mobile for now since not sure what our plans are for it
+    } else if (isDatasource && platform !== 'mobile') {
+      return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
       var toolbarItems = [{
@@ -300,4 +311,45 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, featureFlags
   }, {
     type: 'separator'
   }] : [];
+};
+var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) {
+  var _node$attrs2;
+  var toolbarItems = [{
+    id: 'editor.edit.datasource',
+    type: 'button',
+    icon: SmallerEditIcon,
+    metadata: metadata,
+    className: 'datasource-edit',
+    title: intl.formatMessage(linkToolbarMessages.editDatasource),
+    onClick: editDatasource(editorAnalyticsApi)
+  }];
+  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+    toolbarItems.push({
+      type: 'separator'
+    }, {
+      id: 'editor.link.openLink',
+      type: 'button',
+      icon: OpenIcon,
+      metadata: metadata,
+      className: 'hyperlink-open-link',
+      title: intl.formatMessage(linkMessages.openLink),
+      onClick: visitCardLink(editorAnalyticsApi)
+    });
+  }
+  toolbarItems.push({
+    type: 'separator'
+  }, {
+    id: 'editor.link.delete',
+    focusEditoronEnter: true,
+    type: 'button',
+    appearance: 'danger',
+    icon: RemoveIcon,
+    onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true),
+    onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
+    onFocus: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, true),
+    onBlur: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(node.type, false),
+    title: intl.formatMessage(commonMessages.remove),
+    onClick: withToolbarMetadata(removeCard(editorAnalyticsApi))
+  });
+  return toolbarItems;
 };

package/dist/esm/plugins/card/ui/DatasourceModal.js

@@ -0,0 +1,31 @@
+import React, { useCallback } from 'react';
+import { JiraIssuesConfigModal } from '@atlaskit/link-datasource';
+import { hideDatasourceModal } from '../pm-plugins/actions';
+import { updateExistingDatasource } from '../pm-plugins/doc';
+export var DatasourceModal = function DatasourceModal(_ref) {
+  var state = _ref.state,
+    view = _ref.view,
+    node = _ref.node;
+  var isJiraDatasource = node.attrs.datasource.parameters.jql;
+  var onClose = useCallback(function () {
+    view.dispatch(hideDatasourceModal(view.state.tr));
+  }, [view]);
+  var onInsert = useCallback(function (newAdf) {
+    updateExistingDatasource(state, node, newAdf, view);
+  }, [state, node, view]);
+  if (isJiraDatasource) {
+    var _node$attrs$datasourc, _node$attrs$datasourc2;
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testId": "jira-config-modal"
+    }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
+      datasourceId: node.attrs.datasource.id,
+      visibleColumnKeys: (_node$attrs$datasourc = node.attrs.datasource.views[0]) === null || _node$attrs$datasourc === void 0 ? void 0 : (_node$attrs$datasourc2 = _node$attrs$datasourc.properties) === null || _node$attrs$datasourc2 === void 0 ? void 0 : _node$attrs$datasourc2.columns.map(function (column) {
+        return column.key;
+      }),
+      parameters: node.attrs.datasource.parameters,
+      onCancel: onClose,
+      onInsert: onInsert
+    }));
+  }
+  return null; // null for now until we have modal component that handles other datasources
+};

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

@@ -11,13 +11,14 @@ import React from 'react';
 import { withOuterListeners } from '@atlaskit/editor-common/ui';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import HyperlinkToolbar from '../../hyperlink/ui/HyperlinkAddToolbar';
-import { showLinkToolbar, hideLinkToolbar as _hideLinkToolbar } from '../pm-plugins/actions';
+import { showLinkToolbar, hideLinkToolbar as _hideLinkToolbar, showDatasourceModal } from '../pm-plugins/actions';
 import { INPUT_METHOD, ACTION, buildEditLinkPayload } from '@atlaskit/editor-common/analytics';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { findCardInfo, displayInfoForCard } from '../utils';
 import { NodeSelection } from 'prosemirror-state';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
+import { DatasourceModal } from './DatasourceModal';
 var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkToolbar);
 export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   _inherits(EditLinkToolbar, _React$Component);
@@ -161,4 +162,44 @@ export var editLinkToolbarConfig = function editLinkToolbarConfig(showLinkingToo
     width: RECENT_SEARCH_WIDTH_IN_PX,
     forcePlacement: true
   } : {};
+};
+export var editDatasource = function editDatasource(editorAnalyticsApi) {
+  return function (state, dispatch) {
+    if (dispatch) {
+      var tr = state.tr;
+      showDatasourceModal(tr);
+      // editorAnalyticsApi?.attachAnalyticsEvent(
+      //   buildEditLinkPayload(
+      //     type as
+      //       | ACTION_SUBJECT_ID.CARD_INLINE
+      //       | ACTION_SUBJECT_ID.CARD_BLOCK
+      //       | ACTION_SUBJECT_ID.EMBEDS,
+      //   ),
+      // )(tr);
+      dispatch(tr);
+      return true;
+    }
+    return false;
+  };
+};
+export var openDatasourceModal = function openDatasourceModal(_ref2) {
+  var state = _ref2.state,
+    node = _ref2.node,
+    editorAnalyticsApi = _ref2.editorAnalyticsApi;
+  return {
+    type: 'custom',
+    disableArrowNavigation: true,
+    fallback: [],
+    render: function render(view) {
+      if (!view) {
+        return null;
+      }
+      return /*#__PURE__*/React.createElement(DatasourceModal, {
+        state: state,
+        view: view,
+        node: node,
+        editorAnalyticsApi: editorAnalyticsApi
+      });
+    }
+  };
 };

package/dist/esm/plugins/card/ui/SmallerEditIcon.js

@@ -0,0 +1,11 @@
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
+import EditIcon from '@atlaskit/icon/glyph/edit';
+import { editIconStyles } from './styled';
+export var SmallerEditIcon = function SmallerEditIcon() {
+  return jsx("div", {
+    css: editIconStyles
+  }, jsx(EditIcon, {
+    label: "edit"
+  }));
+};

package/dist/esm/plugins/card/ui/styled.js

@@ -1,5 +1,6 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 import { css } from '@emotion/react';
 export var embedCardStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .embedCardView-content-wrap[layout^='wrap-'] {\n      max-width: 100%;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-left'] {\n      float: left;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-right'] {\n      float: right;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-right']\n      + .embedCardView-content-wrap[layout='wrap-left'] {\n      clear: both;\n    }\n  }\n"])));
-export var embedSpacingStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0 10px;\n"])));
+export var embedSpacingStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0 10px;\n"])));
+export var editIconStyles = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  width: 20px;\n"])));

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.5.7";
+export var version = "185.6.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

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

package/dist/types/create-editor/ReactEditorViewInternal.d.ts

@@ -110,6 +110,7 @@ export declare class ReactEditorView<T = {}> extends React.Component<EditorViewP
     private createEditorView;
     handleEditorViewRef: (node: HTMLDivElement) => void;
     dispatchAnalyticsEvent: (payload: AnalyticsEventPayload) => void;
+    private createEditor;
     private editor;
     render(): JSX.Element;
 }

package/dist/types/plugins/card/pm-plugins/actions.d.ts

@@ -18,3 +18,5 @@ export declare const setCardLayoutAndDatasourceTableRef: ({ layout, datasourceTa
 }) => (tr: Transaction) => Transaction<any>;
 export declare const showLinkToolbar: (tr: Transaction) => Transaction<any>;
 export declare const hideLinkToolbar: (tr: Transaction) => Transaction<any>;
+export declare const showDatasourceModal: (tr: Transaction) => Transaction<any>;
+export declare const hideDatasourceModal: (tr: Transaction) => Transaction<any>;