@atlaskit/editor-plugin-card 0.3.5 → 0.3.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-card
 
+## 0.3.7
+
+### Patch Changes
+
+- [`31405891e32`](https://bitbucket.org/atlassian/atlassian-frontend/commits/31405891e32) - Extract editor disabled plugin as separate package.
+- Updated dependencies
+
+## 0.3.6
+
+### Patch Changes
+
+- [`fd24b65bb62`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fd24b65bb62) - Fix table width bug when layout is undefined for datasource.
+
 ## 0.3.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/datasource.js

@@ -122,12 +122,6 @@ var Datasource = /*#__PURE__*/function (_ReactNodeView) {
     var _this2;
     (0, _classCallCheck2.default)(this, Datasource);
     _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this2), "calcTableWidth", function (layout, containerWidth) {
-      if (layout === 'center') {
-        return 'inherit';
-      }
-      return (0, _utils.calcBreakoutWidthPx)(layout, containerWidth);
-    });
     var sharedState = props === null || props === void 0 ? void 0 : (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 ? void 0 : (_props$pluginInjectio2 = _props$pluginInjectio.dependencies) === null || _props$pluginInjectio2 === void 0 ? void 0 : (_props$pluginInjectio3 = _props$pluginInjectio2.width) === null || _props$pluginInjectio3 === void 0 ? void 0 : _props$pluginInjectio3.sharedState;
     _this2.tableWidth = sharedState === null || sharedState === void 0 ? void 0 : (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
     sharedState === null || sharedState === void 0 ? void 0 : sharedState.onChange(function (_ref2) {
@@ -150,11 +144,10 @@ var Datasource = /*#__PURE__*/function (_ReactNodeView) {
     key: "render",
     value: function render() {
       var attrs = this.node.attrs;
-      var calculatedWidth = this.calcTableWidth(attrs.layout, this.tableWidth);
       return (0, _react2.jsx)("div", {
         className: _styles.DATASOURCE_INNER_CONTAINER_CLASSNAME,
         style: {
-          minWidth: calculatedWidth
+          minWidth: (0, _utils.calcBreakoutWidth)(attrs.layout, this.tableWidth)
         }
       }, (0, _react2.jsx)(DatasourceComponent, {
         node: this.node,

package/dist/cjs/ui/EditLinkToolbar.js

@@ -9,11 +9,9 @@ exports.HyperlinkAddToolbarWithState = HyperlinkAddToolbarWithState;
 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"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
@@ -28,7 +26,6 @@ var _doc = require("../pm-plugins/doc");
 var _utils = require("../utils");
 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);
 function HyperlinkAddToolbarWithState(_ref) {
   var _ref$linkPickerOption = _ref.linkPickerOptions,
     linkPickerOptions = _ref$linkPickerOption === void 0 ? {} : _ref$linkPickerOption,
@@ -68,20 +65,8 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(EditLinkToolbar, _React$Component);
   var _super = _createSuper(EditLinkToolbar);
   function EditLinkToolbar() {
-    var _this;
     (0, _classCallCheck2.default)(this, EditLinkToolbar);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    /** Focus should move to the 'Edit link' button when the toolbar closes
-     * and not close the floating toolbar.
-     */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleEsc", function (e) {
-      var _this$props$forceFocu, _this$props;
-      (_this$props$forceFocu = (_this$props = _this.props).forceFocusSelector) === null || _this$props$forceFocu === void 0 ? void 0 : _this$props$forceFocu.call(_this$props, "[aria-label=\"".concat(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
-    });
-    return _this;
+    return _super.apply(this, arguments);
   }
   (0, _createClass2.default)(EditLinkToolbar, [{
     key: "componentDidUpdate",
@@ -104,31 +89,31 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
-      var _this$props2 = this.props,
-        linkPickerOptions = _this$props2.linkPickerOptions,
-        providerFactory = _this$props2.providerFactory,
-        url = _this$props2.url,
-        text = _this$props2.text,
-        view = _this$props2.view,
-        featureFlags = _this$props2.featureFlags,
-        _onSubmit = _this$props2.onSubmit,
-        pluginInjectionApi = _this$props2.pluginInjectionApi;
-      return /*#__PURE__*/_react.default.createElement(HyperLinkToolbarWithListeners, {
+      var _this = this;
+      var _this$props = this.props,
+        linkPickerOptions = _this$props.linkPickerOptions,
+        providerFactory = _this$props.providerFactory,
+        url = _this$props.url,
+        text = _this$props.text,
+        view = _this$props.view,
+        featureFlags = _this$props.featureFlags,
+        _onSubmit = _this$props.onSubmit,
+        pluginInjectionApi = _this$props.pluginInjectionApi,
+        forceFocusSelector = _this$props.forceFocusSelector;
+      return /*#__PURE__*/_react.default.createElement(HyperlinkAddToolbarWithState, {
         pluginInjectionApi: pluginInjectionApi,
         view: view,
         linkPickerOptions: linkPickerOptions,
         providerFactory: providerFactory,
         displayUrl: url,
-        displayText: text,
-        handleEscapeKeydown: this.handleEsc
+        displayText: text
         // Assumes that the smart card link picker can only ever be invoked by clicking "edit"
         // via the floating toolbar
         ,
         invokeMethod: _analytics.INPUT_METHOD.FLOATING_TB,
         featureFlags: featureFlags,
         onSubmit: function onSubmit(href, title, displayText, inputMethod, analytic) {
-          _this2.hideLinkToolbar();
+          _this.hideLinkToolbar();
           if (_onSubmit) {
             _onSubmit(href, displayText || title, inputMethod, analytic);
           }
@@ -137,6 +122,7 @@ var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
           var tr = state.tr;
           pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.hyperlink.actions.hideLinkToolbar(tr);
           (0, _actions.hideLinkToolbar)(tr);
+          forceFocusSelector === null || forceFocusSelector === void 0 ? void 0 : forceFocusSelector("[aria-label=\"".concat(_messages.linkToolbarMessages.editLink.defaultMessage, "\"]"))(tr);
           if (dispatch) {
             dispatch(tr);
             return true;

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "0.3.5",
+	"version": "0.3.7",
 	"sideEffects": false
 }

package/dist/es2019/nodeviews/datasource.js

@@ -5,7 +5,7 @@ import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { DATASOURCE_INNER_CONTAINER_CLASSNAME, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
-import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
+import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { DatasourceTableView } from '@atlaskit/link-datasource';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class DatasourceComponent extends React.PureComponent {
@@ -90,12 +90,6 @@ export class Datasource extends ReactNodeView {
   constructor(props) {
     var _props$pluginInjectio, _props$pluginInjectio2, _props$pluginInjectio3, _sharedState$currentS;
     super(props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
-    _defineProperty(this, "calcTableWidth", (layout, containerWidth) => {
-      if (layout === 'center') {
-        return 'inherit';
-      }
-      return calcBreakoutWidthPx(layout, containerWidth);
-    });
     const sharedState = props === null || props === void 0 ? void 0 : (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 ? void 0 : (_props$pluginInjectio2 = _props$pluginInjectio.dependencies) === null || _props$pluginInjectio2 === void 0 ? void 0 : (_props$pluginInjectio3 = _props$pluginInjectio2.width) === null || _props$pluginInjectio3 === void 0 ? void 0 : _props$pluginInjectio3.sharedState;
     this.tableWidth = sharedState === null || sharedState === void 0 ? void 0 : (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
     sharedState === null || sharedState === void 0 ? void 0 : sharedState.onChange(({
@@ -117,11 +111,10 @@ export class Datasource extends ReactNodeView {
     const {
       attrs
     } = this.node;
-    const calculatedWidth = this.calcTableWidth(attrs.layout, this.tableWidth);
     return jsx("div", {
       className: DATASOURCE_INNER_CONTAINER_CLASSNAME,
       style: {
-        minWidth: calculatedWidth
+        minWidth: calcBreakoutWidth(attrs.layout, this.tableWidth)
       }
     }, jsx(DatasourceComponent, {
       node: this.node,

package/dist/es2019/ui/EditLinkToolbar.js

@@ -1,17 +1,15 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { ACTION, buildEditLinkPayload, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { HyperlinkAddToolbar as HyperlinkToolbar } from '@atlaskit/editor-common/link';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
-import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX, withOuterListeners } from '@atlaskit/editor-common/ui';
+import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { hideLinkToolbar, showDatasourceModal, showLinkToolbar } from '../pm-plugins/actions';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { displayInfoForCard, findCardInfo } from '../utils';
-const HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkAddToolbarWithState);
 export function HyperlinkAddToolbarWithState({
   linkPickerOptions = {},
   onSubmit,
@@ -49,16 +47,6 @@ export function HyperlinkAddToolbarWithState({
 
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export class EditLinkToolbar extends React.Component {
-  constructor(...args) {
-    super(...args);
-    /** Focus should move to the 'Edit link' button when the toolbar closes
-     * and not close the floating toolbar.
-     */
-    _defineProperty(this, "handleEsc", e => {
-      var _this$props$forceFocu, _this$props;
-      (_this$props$forceFocu = (_this$props = this.props).forceFocusSelector) === null || _this$props$forceFocu === void 0 ? void 0 : _this$props$forceFocu.call(_this$props, `[aria-label="${linkToolbarMessages.editLink.defaultMessage}"]`, this.props.view);
-    });
-  }
   componentDidUpdate(prevProps) {
     if (prevProps.node !== this.props.node) {
       this.hideLinkToolbar();
@@ -82,16 +70,16 @@ export class EditLinkToolbar extends React.Component {
       view,
       featureFlags,
       onSubmit,
-      pluginInjectionApi
+      pluginInjectionApi,
+      forceFocusSelector
     } = this.props;
-    return /*#__PURE__*/React.createElement(HyperLinkToolbarWithListeners, {
+    return /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
       pluginInjectionApi: pluginInjectionApi,
       view: view,
       linkPickerOptions: linkPickerOptions,
       providerFactory: providerFactory,
       displayUrl: url,
-      displayText: text,
-      handleEscapeKeydown: this.handleEsc
+      displayText: text
       // Assumes that the smart card link picker can only ever be invoked by clicking "edit"
       // via the floating toolbar
       ,
@@ -109,6 +97,7 @@ export class EditLinkToolbar extends React.Component {
         } = state;
         pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.hyperlink.actions.hideLinkToolbar(tr);
         hideLinkToolbar(tr);
+        forceFocusSelector === null || forceFocusSelector === void 0 ? void 0 : forceFocusSelector(`[aria-label="${linkToolbarMessages.editLink.defaultMessage}"]`)(tr);
         if (dispatch) {
           dispatch(tr);
           return true;

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "0.3.5",
+	"version": "0.3.7",
 	"sideEffects": false
 }

package/dist/esm/nodeviews/datasource.js

@@ -15,7 +15,7 @@ import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { DATASOURCE_INNER_CONTAINER_CLASSNAME, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
-import { calcBreakoutWidthPx } from '@atlaskit/editor-common/utils';
+import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
 import { DatasourceTableView } from '@atlaskit/link-datasource';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export var DatasourceComponent = /*#__PURE__*/function (_React$PureComponent) {
@@ -115,12 +115,6 @@ export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
     var _this2;
     _classCallCheck(this, Datasource);
     _this2 = _super2.call(this, props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props, undefined, true, undefined, props.hasIntlContext);
-    _defineProperty(_assertThisInitialized(_this2), "calcTableWidth", function (layout, containerWidth) {
-      if (layout === 'center') {
-        return 'inherit';
-      }
-      return calcBreakoutWidthPx(layout, containerWidth);
-    });
     var sharedState = props === null || props === void 0 ? void 0 : (_props$pluginInjectio = props.pluginInjectionApi) === null || _props$pluginInjectio === void 0 ? void 0 : (_props$pluginInjectio2 = _props$pluginInjectio.dependencies) === null || _props$pluginInjectio2 === void 0 ? void 0 : (_props$pluginInjectio3 = _props$pluginInjectio2.width) === null || _props$pluginInjectio3 === void 0 ? void 0 : _props$pluginInjectio3.sharedState;
     _this2.tableWidth = sharedState === null || sharedState === void 0 ? void 0 : (_sharedState$currentS = sharedState.currentState()) === null || _sharedState$currentS === void 0 ? void 0 : _sharedState$currentS.width;
     sharedState === null || sharedState === void 0 ? void 0 : sharedState.onChange(function (_ref2) {
@@ -143,11 +137,10 @@ export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
     key: "render",
     value: function render() {
       var attrs = this.node.attrs;
-      var calculatedWidth = this.calcTableWidth(attrs.layout, this.tableWidth);
       return jsx("div", {
         className: DATASOURCE_INNER_CONTAINER_CLASSNAME,
         style: {
-          minWidth: calculatedWidth
+          minWidth: calcBreakoutWidth(attrs.layout, this.tableWidth)
         }
       }, jsx(DatasourceComponent, {
         node: this.node,

package/dist/esm/ui/EditLinkToolbar.js

@@ -1,10 +1,8 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
 import React from 'react';
@@ -13,13 +11,12 @@ import { commandWithMetadata } from '@atlaskit/editor-common/card';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { HyperlinkAddToolbar as HyperlinkToolbar } from '@atlaskit/editor-common/link';
 import { linkToolbarMessages } from '@atlaskit/editor-common/messages';
-import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX, withOuterListeners } from '@atlaskit/editor-common/ui';
+import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource';
 import { hideLinkToolbar as _hideLinkToolbar, showDatasourceModal, showLinkToolbar } from '../pm-plugins/actions';
 import { changeSelectedCardToLink, updateCard } from '../pm-plugins/doc';
 import { displayInfoForCard, findCardInfo } from '../utils';
-var HyperLinkToolbarWithListeners = withOuterListeners(HyperlinkAddToolbarWithState);
 export function HyperlinkAddToolbarWithState(_ref) {
   var _ref$linkPickerOption = _ref.linkPickerOptions,
     linkPickerOptions = _ref$linkPickerOption === void 0 ? {} : _ref$linkPickerOption,
@@ -59,20 +56,8 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   _inherits(EditLinkToolbar, _React$Component);
   var _super = _createSuper(EditLinkToolbar);
   function EditLinkToolbar() {
-    var _this;
     _classCallCheck(this, EditLinkToolbar);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    /** Focus should move to the 'Edit link' button when the toolbar closes
-     * and not close the floating toolbar.
-     */
-    _defineProperty(_assertThisInitialized(_this), "handleEsc", function (e) {
-      var _this$props$forceFocu, _this$props;
-      (_this$props$forceFocu = (_this$props = _this.props).forceFocusSelector) === null || _this$props$forceFocu === void 0 ? void 0 : _this$props$forceFocu.call(_this$props, "[aria-label=\"".concat(linkToolbarMessages.editLink.defaultMessage, "\"]"), _this.props.view);
-    });
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(EditLinkToolbar, [{
     key: "componentDidUpdate",
@@ -95,31 +80,31 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
-      var _this$props2 = this.props,
-        linkPickerOptions = _this$props2.linkPickerOptions,
-        providerFactory = _this$props2.providerFactory,
-        url = _this$props2.url,
-        text = _this$props2.text,
-        view = _this$props2.view,
-        featureFlags = _this$props2.featureFlags,
-        _onSubmit = _this$props2.onSubmit,
-        pluginInjectionApi = _this$props2.pluginInjectionApi;
-      return /*#__PURE__*/React.createElement(HyperLinkToolbarWithListeners, {
+      var _this = this;
+      var _this$props = this.props,
+        linkPickerOptions = _this$props.linkPickerOptions,
+        providerFactory = _this$props.providerFactory,
+        url = _this$props.url,
+        text = _this$props.text,
+        view = _this$props.view,
+        featureFlags = _this$props.featureFlags,
+        _onSubmit = _this$props.onSubmit,
+        pluginInjectionApi = _this$props.pluginInjectionApi,
+        forceFocusSelector = _this$props.forceFocusSelector;
+      return /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
         pluginInjectionApi: pluginInjectionApi,
         view: view,
         linkPickerOptions: linkPickerOptions,
         providerFactory: providerFactory,
         displayUrl: url,
-        displayText: text,
-        handleEscapeKeydown: this.handleEsc
+        displayText: text
         // Assumes that the smart card link picker can only ever be invoked by clicking "edit"
         // via the floating toolbar
         ,
         invokeMethod: INPUT_METHOD.FLOATING_TB,
         featureFlags: featureFlags,
         onSubmit: function onSubmit(href, title, displayText, inputMethod, analytic) {
-          _this2.hideLinkToolbar();
+          _this.hideLinkToolbar();
           if (_onSubmit) {
             _onSubmit(href, displayText || title, inputMethod, analytic);
           }
@@ -128,6 +113,7 @@ export var EditLinkToolbar = /*#__PURE__*/function (_React$Component) {
           var tr = state.tr;
           pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.hyperlink.actions.hideLinkToolbar(tr);
           _hideLinkToolbar(tr);
+          forceFocusSelector === null || forceFocusSelector === void 0 ? void 0 : forceFocusSelector("[aria-label=\"".concat(linkToolbarMessages.editLink.defaultMessage, "\"]"))(tr);
           if (dispatch) {
             dispatch(tr);
             return true;

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "0.3.5",
+	"version": "0.3.7",
 	"sideEffects": false
 }

package/dist/types/nodeviews/datasource.d.ts

@@ -9,7 +9,6 @@ import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { cardPlugin } from '../index';
-import { DatasourceTableLayout } from '../ui/LayoutButton/types';
 interface DatasourceProps extends ReactComponentProps {
     node: PMNode;
     view: EditorView;
@@ -36,7 +35,6 @@ export declare class Datasource extends ReactNodeView<DatasourceProps> {
     private tableWidth;
     constructor(props: DatasourceProps);
     createDomRef(): HTMLElement;
-    calcTableWidth: (layout: DatasourceTableLayout, containerWidth?: number) => number | 'inherit';
     render(): jsx.JSX.Element;
 }
 export {};

package/dist/types/ui/EditLinkToolbar.d.ts

@@ -27,10 +27,6 @@ export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubm
 export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProps> {
     componentDidUpdate(prevProps: EditLinkToolbarProps): void;
     componentWillUnmount(): void;
-    /** Focus should move to the 'Edit link' button when the toolbar closes
-     * and not close the floating toolbar.
-     */
-    private handleEsc;
     private hideLinkToolbar;
     render(): JSX.Element;
 }

package/dist/types-ts4.5/nodeviews/datasource.d.ts

@@ -9,7 +9,6 @@ import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { cardPlugin } from '../index';
-import { DatasourceTableLayout } from '../ui/LayoutButton/types';
 interface DatasourceProps extends ReactComponentProps {
     node: PMNode;
     view: EditorView;
@@ -36,7 +35,6 @@ export declare class Datasource extends ReactNodeView<DatasourceProps> {
     private tableWidth;
     constructor(props: DatasourceProps);
     createDomRef(): HTMLElement;
-    calcTableWidth: (layout: DatasourceTableLayout, containerWidth?: number) => number | 'inherit';
     render(): jsx.JSX.Element;
 }
 export {};

package/dist/types-ts4.5/ui/EditLinkToolbar.d.ts

@@ -27,10 +27,6 @@ export declare function HyperlinkAddToolbarWithState({ linkPickerOptions, onSubm
 export declare class EditLinkToolbar extends React.Component<EditLinkToolbarProps> {
     componentDidUpdate(prevProps: EditLinkToolbarProps): void;
     componentWillUnmount(): void;
-    /** Focus should move to the 'Edit link' button when the toolbar closes
-     * and not close the floating toolbar.
-     */
-    private handleEsc;
     private hideLinkToolbar;
     render(): JSX.Element;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,11 +33,11 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^26.4.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^74.33.0",
+    "@atlaskit/editor-common": "^74.34.0",
     "@atlaskit/editor-plugin-analytics": "^0.1.0",
     "@atlaskit/editor-plugin-decorations": "^0.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^0.1.0",
-    "@atlaskit/editor-plugin-floating-toolbar": "^0.2.0",
+    "@atlaskit/editor-plugin-floating-toolbar": "^0.3.0",
     "@atlaskit/editor-plugin-grid": "^0.1.0",
     "@atlaskit/editor-plugin-hyperlink": "^0.2.0",
     "@atlaskit/editor-plugin-width": "^0.1.0",
@@ -49,7 +49,7 @@
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/smart-card": "^26.14.0",
     "@atlaskit/theme": "^12.5.0",
-    "@atlaskit/tokens": "^1.13.0",
+    "@atlaskit/tokens": "^1.14.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "lodash": "^4.17.21",