@atlaskit/editor-core 185.12.2 → 185.13.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 185.13.1
+
+### Patch Changes
+
+- [`202f8c2ee69`](https://bitbucket.org/atlassian/atlassian-frontend/commits/202f8c2ee69) - The changes here adds support for datasource feature flag for rollout.
+
+## 185.13.0
+
+### Patch Changes
+
+- [`36f667d92e5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/36f667d92e5) - Add data-testid to ToolbarBlockType
+
 ## 185.12.2
 
 ### Patch Changes

package/dist/cjs/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -37,7 +37,8 @@ var BlockTypeButton = function BlockTypeButton(props) {
     "aria-haspopup": true,
     "aria-expanded": props['aria-expanded'],
     iconAfter: (0, _react2.jsx)("span", {
-      css: [_styles.wrapperStyle, props.isSmall && _styles.wrapperSmallStyle]
+      css: [_styles.wrapperStyle, props.isSmall && _styles.wrapperSmallStyle],
+      "data-testid": "toolbar-block-type-text-styles-icon"
     }, props.isSmall && (0, _react2.jsx)(_textStyle.default, {
       label: labelTextStyles
     }), (0, _react2.jsx)("span", {

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

@@ -28,6 +28,7 @@ var _datasource = require("../nodeviews/datasource");
 var _styles = require("@atlaskit/editor-common/styles");
 var _actions = require("./actions");
 var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var createPlugin = function createPlugin(options, pluginInjectionApi) {
   return function (pmPluginFactoryParams) {
     var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
@@ -39,6 +40,14 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
       fullWidthMode = options.fullWidthMode,
       createAnalyticsEvent = options.createAnalyticsEvent,
       showServerActions = options.showServerActions;
+    var inlineCardViewProducer = (0, _reactNodeView.getInlineNodeViewProducer)({
+      pmPluginFactoryParams: pmPluginFactoryParams,
+      Component: _inlineCard.InlineCardNodeView,
+      extraComponentProps: {
+        useAlternativePreloader: useAlternativePreloader,
+        showServerActions: showServerActions
+      }
+    });
     return new _safePlugin.SafePlugin({
       state: {
         init: function init() {
@@ -151,15 +160,8 @@ var createPlugin = function createPlugin(options, pluginInjectionApi) {
       },
       props: {
         nodeViews: {
-          inlineCard: (0, _reactNodeView.getInlineNodeViewProducer)({
-            pmPluginFactoryParams: pmPluginFactoryParams,
-            Component: _inlineCard.InlineCardNodeView,
-            extraComponentProps: {
-              useAlternativePreloader: useAlternativePreloader,
-              showServerActions: showServerActions
-            }
-          }),
-          blockCard: function blockCard(node, view, getPos) {
+          inlineCard: inlineCardViewProducer,
+          blockCard: function blockCard(node, view, getPos, decorations) {
             var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -170,15 +172,20 @@ 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) {
-              return new _datasource.Datasource({
-                node: node,
-                view: view,
-                getPos: getPos,
-                portalProviderAPI: portalProviderAPI,
-                eventDispatcher: eventDispatcher,
-                hasIntlContext: hasIntlContext,
-                pluginInjectionApi: pluginInjectionApi
-              }).init();
+              var _node$attrs4;
+              if ((0, _utils.canRenderDatasource)(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+                return new _datasource.Datasource({
+                  node: node,
+                  view: view,
+                  getPos: getPos,
+                  portalProviderAPI: portalProviderAPI,
+                  eventDispatcher: eventDispatcher,
+                  hasIntlContext: hasIntlContext,
+                  pluginInjectionApi: pluginInjectionApi
+                }).init();
+              } else {
+                return inlineCardViewProducer(node, view, getPos, decorations);
+              }
             }
             return new _blockCard.BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           },

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

@@ -26,6 +26,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _LinkToolbarAppearance = require("./ui/LinkToolbarAppearance");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _SmallerEditIcon = require("./ui/SmallerEditIcon");
+var _utils2 = require("@atlaskit/editor-common/utils");
 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; }
 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; }
@@ -173,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;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
     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 : {},
@@ -194,6 +195,9 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     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);
+    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);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -210,8 +214,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         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') {
+    } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
@@ -325,7 +328,7 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, featureFlags
   }] : [];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) {
-  var _node$attrs2;
+  var _node$attrs3;
   var toolbarItems = [{
     id: 'editor.edit.datasource',
     type: 'button',
@@ -335,7 +338,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     title: intl.formatMessage(_messages.linkToolbarMessages.editDatasource),
     onClick: (0, _EditLinkToolbar.editDatasource)(editorAnalyticsApi)
   }];
-  if (node !== null && node !== void 0 && (_node$attrs2 = node.attrs) !== null && _node$attrs2 !== void 0 && _node$attrs2.url) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       type: 'separator'
     }, {

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.12.2";
+var version = "185.13.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.12.2",
+	"version": "185.13.1",
 	"sideEffects": false
 }

package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -28,7 +28,8 @@ export const BlockTypeButton = props => {
     "aria-haspopup": true,
     "aria-expanded": props['aria-expanded'],
     iconAfter: jsx("span", {
-      css: [wrapperStyle, props.isSmall && wrapperSmallStyle]
+      css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
+      "data-testid": "toolbar-block-type-text-styles-icon"
     }, props.isSmall && jsx(TextStyleIcon, {
       label: labelTextStyles
     }), jsx("span", {

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

@@ -15,6 +15,7 @@ import { DATASOURCE_INNER_CONTAINER_CLASSNAME } from '@atlaskit/editor-common/st
 import { setDatasourceTableRef, setCardLayoutAndDatasourceTableRef } from './actions';
 import { findDomRefAtPos } from 'prosemirror-utils';
 export { pluginKey } from './plugin-key';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryParams => {
   const {
     lpAnalyticsEventsNext
@@ -29,6 +30,14 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     createAnalyticsEvent,
     showServerActions
   } = options;
+  const inlineCardViewProducer = getInlineNodeViewProducer({
+    pmPluginFactoryParams,
+    Component: InlineCardNodeView,
+    extraComponentProps: {
+      useAlternativePreloader,
+      showServerActions
+    }
+  });
   return new SafePlugin({
     state: {
       init() {
@@ -145,15 +154,8 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
     },
     props: {
       nodeViews: {
-        inlineCard: getInlineNodeViewProducer({
-          pmPluginFactoryParams,
-          Component: InlineCardNodeView,
-          extraComponentProps: {
-            useAlternativePreloader,
-            showServerActions
-          }
-        }),
-        blockCard: (node, view, getPos) => {
+        inlineCard: inlineCardViewProducer,
+        blockCard: (node, view, getPos, decorations) => {
           var _node$attrs3;
           const {
             portalProviderAPI,
@@ -166,15 +168,20 @@ 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) {
-            return new Datasource({
-              node,
-              view,
-              getPos,
-              portalProviderAPI,
-              eventDispatcher,
-              hasIntlContext,
-              pluginInjectionApi
-            }).init();
+            var _node$attrs4;
+            if (canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+              return new Datasource({
+                node,
+                view,
+                getPos,
+                portalProviderAPI,
+                eventDispatcher,
+                hasIntlContext,
+                pluginInjectionApi
+              }).init();
+            } else {
+              return inlineCardViewProducer(node, view, getPos, decorations);
+            }
           }
           return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
         },

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

@@ -19,6 +19,7 @@ import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from '@atlaskit/editor-common/styles';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
 import { SmallerEditIcon } from './ui/SmallerEditIcon';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 export const removeCard = editorAnalyticsApi => commandWithMetadata((state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
@@ -164,7 +165,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, _node$attrs;
+  var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
   const {
     url
   } = titleUrlPairFromNode(node);
@@ -189,6 +190,9 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
     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);
+  const shouldRenderDatasourceToolbar = isDatasource &&
+  // not showing toolbar in mobile for now since not sure what our plans are for it
+  platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
 
   /* mobile builds toolbar natively using toolbarItems */
   if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -205,8 +209,7 @@ const generateToolbarItems = (state, featureFlags, intl, providerFactory, cardOp
       node,
       editorAnalyticsApi
     })];
-    // not showing toolbar in mobile for now since not sure what our plans are for it
-  } else if (isDatasource && platform !== 'mobile') {
+  } else if (shouldRenderDatasourceToolbar) {
     return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
   } else {
     const {
@@ -323,7 +326,7 @@ const getSettingsButtonGroup = (state, featureFlags, intl, editorAnalyticsApi) =
   }] : [];
 };
 const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) => {
-  var _node$attrs2;
+  var _node$attrs3;
   const toolbarItems = [{
     id: 'editor.edit.datasource',
     type: 'button',
@@ -333,7 +336,7 @@ const getDatasourceButtonGroup = (state, metadata, intl, editorAnalyticsApi, nod
     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) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       type: 'separator'
     }, {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "185.12.2";
+export const version = "185.13.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.12.2",
+	"version": "185.13.1",
 	"sideEffects": false
 }

package/dist/esm/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -28,7 +28,8 @@ export var BlockTypeButton = function BlockTypeButton(props) {
     "aria-haspopup": true,
     "aria-expanded": props['aria-expanded'],
     iconAfter: jsx("span", {
-      css: [wrapperStyle, props.isSmall && wrapperSmallStyle]
+      css: [wrapperStyle, props.isSmall && wrapperSmallStyle],
+      "data-testid": "toolbar-block-type-text-styles-icon"
     }, props.isSmall && jsx(TextStyleIcon, {
       label: labelTextStyles
     }), jsx("span", {

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

@@ -16,6 +16,7 @@ import { DATASOURCE_INNER_CONTAINER_CLASSNAME } from '@atlaskit/editor-common/st
 import { setDatasourceTableRef, setCardLayoutAndDatasourceTableRef } from './actions';
 import { findDomRefAtPos } from 'prosemirror-utils';
 export { pluginKey } from './plugin-key';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 export var createPlugin = function createPlugin(options, pluginInjectionApi) {
   return function (pmPluginFactoryParams) {
     var lpAnalyticsEventsNext = pmPluginFactoryParams.featureFlags.lpAnalyticsEventsNext;
@@ -27,6 +28,14 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       fullWidthMode = options.fullWidthMode,
       createAnalyticsEvent = options.createAnalyticsEvent,
       showServerActions = options.showServerActions;
+    var inlineCardViewProducer = getInlineNodeViewProducer({
+      pmPluginFactoryParams: pmPluginFactoryParams,
+      Component: InlineCardNodeView,
+      extraComponentProps: {
+        useAlternativePreloader: useAlternativePreloader,
+        showServerActions: showServerActions
+      }
+    });
     return new SafePlugin({
       state: {
         init: function init() {
@@ -139,15 +148,8 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
       },
       props: {
         nodeViews: {
-          inlineCard: getInlineNodeViewProducer({
-            pmPluginFactoryParams: pmPluginFactoryParams,
-            Component: InlineCardNodeView,
-            extraComponentProps: {
-              useAlternativePreloader: useAlternativePreloader,
-              showServerActions: showServerActions
-            }
-          }),
-          blockCard: function blockCard(node, view, getPos) {
+          inlineCard: inlineCardViewProducer,
+          blockCard: function blockCard(node, view, getPos, decorations) {
             var _node$attrs3;
             var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
               eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -158,15 +160,20 @@ export 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) {
-              return new Datasource({
-                node: node,
-                view: view,
-                getPos: getPos,
-                portalProviderAPI: portalProviderAPI,
-                eventDispatcher: eventDispatcher,
-                hasIntlContext: hasIntlContext,
-                pluginInjectionApi: pluginInjectionApi
-              }).init();
+              var _node$attrs4;
+              if (canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs4 = node.attrs) === null || _node$attrs4 === void 0 ? void 0 : _node$attrs4.datasource)) {
+                return new Datasource({
+                  node: node,
+                  view: view,
+                  getPos: getPos,
+                  portalProviderAPI: portalProviderAPI,
+                  eventDispatcher: eventDispatcher,
+                  hasIntlContext: hasIntlContext,
+                  pluginInjectionApi: pluginInjectionApi
+                }).init();
+              } else {
+                return inlineCardViewProducer(node, view, getPos, decorations);
+              }
             }
             return new BlockCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();
           },

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

@@ -23,6 +23,7 @@ import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME } from '@atlaskit/editor-common/styles';
 import { ACTION, ACTION_SUBJECT, INPUT_METHOD, EVENT_TYPE, buildOpenedSettingsPayload, buildVisitedLinkPayload } from '@atlaskit/editor-common/analytics';
 import { SmallerEditIcon } from './ui/SmallerEditIcon';
+import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 export var removeCard = function removeCard(editorAnalyticsApi) {
   return commandWithMetadata(function (state, dispatch) {
     if (!(state.selection instanceof NodeSelection)) {
@@ -162,7 +163,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;
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2, _pluginInjectionApi$d3, _pluginInjectionApi$d4, _pluginInjectionApi$d5, _node$attrs, _node$attrs2;
     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 : {},
@@ -183,6 +184,9 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
     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);
+    var shouldRenderDatasourceToolbar = isDatasource &&
+    // not showing toolbar in mobile for now since not sure what our plans are for it
+    platform !== 'mobile' && canRenderDatasource(node === null || node === void 0 ? void 0 : (_node$attrs2 = node.attrs) === null || _node$attrs2 === void 0 ? void 0 : _node$attrs2.datasource);
 
     /* mobile builds toolbar natively using toolbarItems */
     if (pluginState !== null && pluginState !== void 0 && pluginState.showLinkingToolbar && platform !== 'mobile') {
@@ -199,8 +203,7 @@ var generateToolbarItems = function generateToolbarItems(state, featureFlags, in
         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') {
+    } else if (shouldRenderDatasourceToolbar) {
       return getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration);
     } else {
       var inlineCard = state.schema.nodes.inlineCard;
@@ -314,7 +317,7 @@ var getSettingsButtonGroup = function getSettingsButtonGroup(state, featureFlags
   }] : [];
 };
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata, intl, editorAnalyticsApi, node, hoverDecoration) {
-  var _node$attrs2;
+  var _node$attrs3;
   var toolbarItems = [{
     id: 'editor.edit.datasource',
     type: 'button',
@@ -324,7 +327,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(state, metadata
     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) {
+  if (node !== null && node !== void 0 && (_node$attrs3 = node.attrs) !== null && _node$attrs3 !== void 0 && _node$attrs3.url) {
     toolbarItems.push({
       type: 'separator'
     }, {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.12.2";
+export var version = "185.13.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.12.2",
+	"version": "185.13.1",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "185.12.2",
+  "version": "185.13.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -148,7 +148,7 @@
     "@af/editor-libra": "*",
     "@af/integration-testing": "*",
     "@atlaskit/code": "^14.6.0",
-    "@atlaskit/collab-provider": "9.6.1",
+    "@atlaskit/collab-provider": "9.6.2",
     "@atlaskit/dropdown-menu": "^11.10.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/editor-plugin-table": "^2.0.0",
@@ -253,6 +253,9 @@
     "platform.design-system-team.border-checkbox_nyoiu": {
       "type": "boolean",
       "referenceOnly": "true"
+    },
+    "platform.linking-platform.datasource-jira_issues": {
+      "type": "boolean"
     }
   }
 }