@atlaskit/editor-core 161.0.0 → 163.0.0

package/dist/esm/plugins/expand/ui/ExpandIconButton.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
@@ -5,7 +6,6 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["buttonStyles"];
 
 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; }
@@ -16,19 +16,15 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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, { useCallback, forwardRef } from 'react';
+/** @jsx jsx */
+import React, { useCallback } from 'react';
+import { jsx } from '@emotion/react';
 import Button from '@atlaskit/button/custom-theme-button';
-import { expandMessages, ExpandLayoutWrapper } from '@atlaskit/editor-common/ui';
+import { expandMessages, expandLayoutWrapperStyle, ExpandLayoutWrapperWithRef } from '@atlaskit/editor-common/ui';
 import { akEditorSwoopCubicBezier } from '@atlaskit/editor-shared-styles';
 import ChevronRightIcon from '@atlaskit/icon/glyph/chevron-right';
 import Tooltip from '@atlaskit/tooltip';
 import { expandClassNames } from './class-names';
-var ExpandLayoutWrapperWithRef = /*#__PURE__*/forwardRef(function WithRef(props, ref) {
-  // @ts-ignore: incorrect innerRef typing
-  return /*#__PURE__*/React.createElement(ExpandLayoutWrapper, _extends({}, props, {
-    innerRef: ref
-  }));
-});
 export var withTooltip = function withTooltip(WrapperComponent) {
   return /*#__PURE__*/function (_React$Component) {
     _inherits(WithSortableColumn, _React$Component);
@@ -45,11 +41,11 @@ export var withTooltip = function withTooltip(WrapperComponent) {
       key: "render",
       value: function render() {
         var label = this.props.label;
-        return /*#__PURE__*/React.createElement(Tooltip, {
+        return jsx(Tooltip, {
           content: label,
           position: "top",
           tag: ExpandLayoutWrapperWithRef
-        }, /*#__PURE__*/React.createElement(WrapperComponent, this.props));
+        }, jsx(WrapperComponent, this.props));
       }
     }]);
 
@@ -74,10 +70,10 @@ export var CustomButton = function CustomButton(props) {
       })
     }, rest);
   }, [props]);
-  return /*#__PURE__*/React.createElement(Button, {
+  return jsx(Button, {
     appearance: "subtle",
     className: expandClassNames.iconContainer,
-    iconBefore: /*#__PURE__*/React.createElement(ChevronRightIcon, {
+    iconBefore: jsx(ChevronRightIcon, {
       label: label
     }),
     shouldFitContainer: true,
@@ -97,12 +93,14 @@ export var ExpandIconButton = function ExpandIconButton(props) {
   var hoverEventCheck = supportsAnyHover ? window.matchMedia('(any-hover: hover)').matches : true; // hoverEventCheck is to disable tooltips for mobile to prevent incorrect hover state causing issues on iOS
 
   if (props.allowInteractiveExpand && hoverEventCheck) {
-    return /*#__PURE__*/React.createElement(ButtonWithTooltip, _extends({
+    return jsx(ButtonWithTooltip, _extends({
       label: label
     }, props));
   }
 
-  return /*#__PURE__*/React.createElement(ExpandLayoutWrapper, null, /*#__PURE__*/React.createElement(ButtonWithoutTooltip, _extends({
+  return jsx("div", {
+    css: expandLayoutWrapperStyle
+  }, jsx(ButtonWithoutTooltip, _extends({
     label: label
   }, props)));
 };

package/dist/esm/plugins/expand/ui/styles.js

@@ -2,7 +2,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2;
 
-import { css } from 'styled-components';
+import { css } from '@emotion/react';
 import { themed } from '@atlaskit/theme/components';
 import { gridSize } from '@atlaskit/theme/constants';
 import { R50, R300, N40A, N50A, N80A, DN50, R200 } from '@atlaskit/theme/colors';
@@ -14,10 +14,14 @@ var EXPAND_SELECTED_BACKGROUND = themed({
   light: 'rgba(255, 255, 255, 0.6)',
   dark: 'rgba(9, 10, 11, 0.29)'
 });
-var EXPAND_ICON_COLOR = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: ", ";\n"])), themed({
-  light: N80A,
-  dark: '#d9dde3'
-}));
+
+var EXPAND_ICON_COLOR = function EXPAND_ICON_COLOR(props) {
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: ", ";\n"])), themed({
+    light: N80A,
+    dark: '#d9dde3'
+  })(props));
+};
+
 var ACTIVE_STATE_BACKGROUND_COLOR = themed({
   dark: "#0C294F"
 });
@@ -40,10 +44,18 @@ var DANGER_STATE_BORDER_COLOR = themed({
 var DANGER_STATE_BORDER_RADIUS = themed({
   dark: '3px'
 });
-export var expandStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .", " > div {\n    display: flex;\n  }\n\n  .", " {\n    ", "\n    overflow: hidden;\n    cursor: pointer;\n    box-sizing: border-box;\n\n    td > & {\n      margin-top: 0;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(90deg);\n    }\n\n    &.", ":not(.danger) {\n      ", "\n\n      ::after {\n        // Custom background color and borders (for dark theme).\n        background-color: ", ";\n        border: ", ";\n        border-radius: ", ";\n      }\n    }\n\n    &.danger {\n      background: ", ";\n      border: ", ";\n      border-color: ", ";\n      border-radius: ", ";\n    }\n  }\n\n  .ProseMirror\n    > .", ",\n    .", "\n    > .", " {\n    margin-left: -", "px;\n    margin-right: -", "px;\n  }\n\n  .", " {\n    ", "\n    cursor: text;\n    padding-top: 0px;\n  }\n\n  .", " {\n    ", "\n  }\n\n  .", " {\n    ", ";\n    overflow: visible;\n  }\n\n  .", " {\n    background: ", ";\n    border-color: ", ";\n\n    .", " {\n      padding-top: ", "px;\n    }\n  }\n\n  .", " {\n    width: 100%;\n  }\n\n  .", ":(.", ") {\n    .expand-content-wrapper {\n      height: auto;\n    }\n  }\n\n  .", ":not(.", ") {\n    .ak-editor-expand__content {\n      position: absolute;\n      height: 1px;\n      width: 1px;\n      overflow: hidden;\n      clip: rect(1px, 1px, 1px, 1px);\n      white-space: nowrap;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(0deg);\n    }\n\n    &:not(.", "):not(.danger) {\n      background: transparent;\n      border-color: transparent;\n\n      &:hover {\n        border-color: ", ";\n        background: ", ";\n      }\n    }\n  }\n"])), expandClassNames.icon, expandClassNames.prefix, sharedExpandStyles.ContainerStyles, expandClassNames.iconContainer, EXPAND_ICON_COLOR, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.Border]), ACTIVE_STATE_BACKGROUND_COLOR, ACTIVE_STATE_BORDER, ACTIVE_STATE_BORDER_RADIUS, DANGER_STATE_BACKGROUND_COLOR, DANGER_STATE_BORDER, DANGER_STATE_BORDER_COLOR, DANGER_STATE_BORDER_RADIUS, expandClassNames.type('expand'), BreakoutCssClassName.BREAKOUT_MARK_DOM, expandClassNames.type('expand'), akLayoutGutterOffset, akLayoutGutterOffset, expandClassNames.content, sharedExpandStyles.ContentStyles, expandClassNames.titleInput, sharedExpandStyles.TitleInputStyles, expandClassNames.titleContainer, sharedExpandStyles.TitleContainerStyles, expandClassNames.expanded, EXPAND_SELECTED_BACKGROUND, themed({
-  light: N40A,
-  dark: DN50
-}), expandClassNames.content, gridSize, expandClassNames.inputContainer, expandClassNames.prefix, expandClassNames.expanded, expandClassNames.prefix, expandClassNames.expanded, expandClassNames.iconContainer, EXPAND_ICON_COLOR, akEditorSelectedNodeClassName, themed({
-  light: N50A,
-  dark: DN50
-}), EXPAND_SELECTED_BACKGROUND);
+export var expandStyles = function expandStyles(props) {
+  return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .", " > div {\n    display: flex;\n  }\n\n  .", " {\n    ", "\n    overflow: hidden;\n    cursor: pointer;\n    box-sizing: border-box;\n\n    td > & {\n      margin-top: 0;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(90deg);\n    }\n\n    &.", ":not(.danger) {\n      ", "\n\n      ::after {\n        // Custom background color and borders (for dark theme).\n        background-color: ", ";\n        border: ", ";\n        border-radius: ", ";\n      }\n    }\n\n    &.danger {\n      background: ", ";\n      border: ", ";\n      border-color: ", ";\n      border-radius: ", ";\n    }\n  }\n\n  .ProseMirror\n    > .", ",\n    .", "\n    > .", " {\n    margin-left: -", "px;\n    margin-right: -", "px;\n  }\n\n  .", " {\n    ", "\n    cursor: text;\n    padding-top: 0px;\n  }\n\n  .", " {\n    ", "\n  }\n\n  .", " {\n    ", ";\n    overflow: visible;\n  }\n\n  .", " {\n    background: ", ";\n    border-color: ", ";\n\n    .", " {\n      padding-top: ", "px;\n    }\n  }\n\n  .", " {\n    width: 100%;\n  }\n\n  /* stylelint-disable property-no-unknown, value-keyword-case */\n  .", ":(.", ") {\n    .expand-content-wrapper {\n      height: auto;\n    }\n  }\n  /* stylelint-enable property-no-unknown, value-keyword-case */\n\n  .", ":not(.", ") {\n    .ak-editor-expand__content {\n      position: absolute;\n      height: 1px;\n      width: 1px;\n      overflow: hidden;\n      clip: rect(1px, 1px, 1px, 1px);\n      white-space: nowrap;\n    }\n\n    .", " svg {\n      ", ";\n      transform: rotate(0deg);\n    }\n\n    &:not(.", "):not(.danger) {\n      background: transparent;\n      border-color: transparent;\n\n      &:hover {\n        border-color: ", ";\n        background: ", ";\n      }\n    }\n  }\n"])), expandClassNames.icon, expandClassNames.prefix, sharedExpandStyles.containerStyles({
+    expanded: false,
+    focused: false
+  })(props), expandClassNames.iconContainer, EXPAND_ICON_COLOR(props), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.Border]), ACTIVE_STATE_BACKGROUND_COLOR(props), ACTIVE_STATE_BORDER(props), ACTIVE_STATE_BORDER_RADIUS(props), DANGER_STATE_BACKGROUND_COLOR(props), DANGER_STATE_BORDER(props), DANGER_STATE_BORDER_COLOR(props), DANGER_STATE_BORDER_RADIUS(props), expandClassNames.type('expand'), BreakoutCssClassName.BREAKOUT_MARK_DOM, expandClassNames.type('expand'), akLayoutGutterOffset, akLayoutGutterOffset, expandClassNames.content, sharedExpandStyles.contentStyles({
+    expanded: false,
+    focused: false
+  })(props), expandClassNames.titleInput, sharedExpandStyles.titleInputStyles(props), expandClassNames.titleContainer, sharedExpandStyles.titleContainerStyles(props), expandClassNames.expanded, EXPAND_SELECTED_BACKGROUND(props), themed({
+    light: N40A,
+    dark: DN50
+  })(props), expandClassNames.content, gridSize(), expandClassNames.inputContainer, expandClassNames.prefix, expandClassNames.expanded, expandClassNames.prefix, expandClassNames.expanded, expandClassNames.iconContainer, EXPAND_ICON_COLOR(props), akEditorSelectedNodeClassName, themed({
+    light: N50A,
+    dark: DN50
+  })(props), EXPAND_SELECTED_BACKGROUND(props));
+};

package/dist/esm/plugins/extension/plugin-factory.js

@@ -7,6 +7,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { pluginFactory } from '../../utils/plugin-state-factory';
 import reducer from './reducer';
 import { pluginKey } from './plugin-key';
+import { onSelectionChanged } from './utils';
 var factory = pluginFactory(pluginKey, reducer, {
   mapping: function mapping(tr, state) {
     var _ref = state,
@@ -25,7 +26,8 @@ var factory = pluginFactory(pluginKey, reducer, {
     return _objectSpread(_objectSpread({}, state), {}, {
       positions: positions
     });
-  }
+  },
+  onSelectionChanged: onSelectionChanged
 });
 export var createPluginState = factory.createPluginState;
 export var createCommand = factory.createCommand;

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

@@ -251,6 +251,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
   var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
   var options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
   var state = createPluginState(dispatch, {
+    shouldRefreshEditButton: false,
     showEditButton: false,
     showContextPanel: false
   });
@@ -274,25 +275,45 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
               element = _getPluginState.element,
               localId = _getPluginState.localId,
               extensionProvider = _getPluginState.extensionProvider,
-              showContextPanel = _getPluginState.showContextPanel; // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
+              showContextPanel = _getPluginState.showContextPanel,
+              shouldRefreshEditButton = _getPluginState.shouldRefreshEditButton;
 
+          if (!shouldRefreshEditButton) {
+            return false;
+          } // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
 
-          var selectedExtension = getSelectedExtension(state, true);
+
+          var selectedExtension = getSelectedExtension(state, true); // If our selection isn't on an extension node, clear some state and hide the config panel
 
           if (!selectedExtension) {
             if (showContextPanel) {
               clearEditingContext(state, dispatch);
             }
 
+            updateState({
+              shouldRefreshEditButton: false,
+              localId: undefined,
+              element: undefined,
+              showEditButton: false,
+              updateExtension: undefined
+            })(state, dispatch);
             return;
-          }
+          } // By this point we're certain we've selected an extension node.
+          // But we need to determine if the selection has changed to another
+          // extension node or remained on the same node.
+
 
           var node = selectedExtension.node;
           var newElement = getSelectedDomElement(state.schema, domAtPos, selectedExtension); // New node is selection
 
-          if (node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
+          var hasSelectedNodeChanged = node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
           // as fallback in case we need to turn off `allowLocalIdGeneration`
-          element !== newElement) {
+          element !== newElement;
+          var nextState = {
+            shouldRefreshEditButton: false
+          };
+
+          if (hasSelectedNodeChanged) {
             if (showContextPanel) {
               clearEditingContext(state, dispatch);
             }
@@ -303,20 +324,20 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
             var showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
             var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {// do nothing;
             });
-            updateState({
+            Object.assign(nextState, {
               localId: node.attrs.localId,
-              showContextPanel: false,
               element: newElement,
               showEditButton: showEditButton,
               updateExtension: updateExtension
-            })(state, dispatch);
+            });
           } // New DOM element doesn't necessarily mean it's a new Node
           else if (element !== newElement) {
-            updateState({
+            Object.assign(nextState, {
               element: newElement
-            })(state, dispatch);
+            });
           }
 
+          updateState(nextState)(state, dispatch);
           return true;
         },
         destroy: function destroy() {
@@ -333,7 +354,9 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         inlineExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions)
       },
       handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension'], function (target) {
-        return !target.closest('.extension-content');
+        // Clicked on anything around the extension content
+        // or specifically on the content border of a bodied extension
+        return !target.closest('.extension-content') || target.classList.contains('extension-content');
       }, {
         useLongPressSelection: useLongPressSelection
       })

package/dist/esm/plugins/extension/ui/Extension/Extension/index.js

@@ -1,9 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { overflowShadow } from '@atlaskit/editor-common/ui';
 import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
-import { Wrapper, Header, Content, ContentWrapper, widerLayoutClassName } from './styles';
-import { Overlay } from '../styles';
+import { wrapperStyle, Header, Content, ContentWrapper, widerLayoutClassName } from './styles';
+import { overlay } from '../styles';
 import ExtensionLozenge from '../Lozenge';
 import { pluginKey as widthPluginKey } from '../../../../width';
 import WithPluginState from '../../../../../ui/WithPluginState';
@@ -30,7 +33,7 @@ var Extension = function Extension(props) {
     'with-children': hasChildren,
     'without-frame': removeBorder
   });
-  return /*#__PURE__*/React.createElement(WithPluginState, {
+  return jsx(WithPluginState, {
     editorView: view,
     plugins: {
       widthState: widthPluginKey
@@ -40,21 +43,25 @@ var Extension = function Extension(props) {
           widthState = _ref$widthState === void 0 ? {
         width: 0
       } : _ref$widthState;
-      return /*#__PURE__*/React.createElement(Wrapper, {
-        innerRef: handleRef,
+      return jsx("div", {
+        ref: handleRef,
         "data-layout": node.attrs.layout,
         className: classNames,
-        extensionWidth: calcBreakoutWidth(node.attrs.layout, widthState.width)
-      }, /*#__PURE__*/React.createElement("div", {
+        css: function css(theme) {
+          var extensionWidth = calcBreakoutWidth(node.attrs.layout, widthState.width);
+          return wrapperStyle(theme, extensionWidth);
+        }
+      }, jsx("div", {
         className: "extension-overflow-wrapper ".concat(hasBody ? 'with-body' : '')
-      }, /*#__PURE__*/React.createElement(Overlay, {
+      }, jsx("div", {
+        css: overlay,
         className: "extension-overlay"
-      }), /*#__PURE__*/React.createElement(Header, {
+      }), jsx(Header, {
         contentEditable: false,
         className: headerClassNames
-      }, !removeBorder && /*#__PURE__*/React.createElement(ExtensionLozenge, {
+      }, !removeBorder && jsx(ExtensionLozenge, {
         node: node
-      }), children), hasBody && /*#__PURE__*/React.createElement(ContentWrapper, null, /*#__PURE__*/React.createElement(Content, {
+      }), children), hasBody && jsx(ContentWrapper, null, jsx(Content, {
         innerRef: handleContentDOMRef,
         className: "extension-content block"
       }))));

package/dist/esm/plugins/extension/ui/Extension/Extension/styles.js

@@ -3,16 +3,16 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 import styled from 'styled-components';
+import { css } from '@emotion/react';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import { DN30, DN900, N30 } from '@atlaskit/theme/colors';
-import { Wrapper as WrapperDefault, padding } from '../styles';
+import { wrapperDefault, padding } from '../styles';
 var dataConsumerSelector = '[data-mark-type="dataConsumer"]';
 export var widerLayoutClassName = 'wider-layout';
-export var Wrapper = styled(WrapperDefault)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.without-frame {\n    background: transparent;\n  }\n  cursor: pointer;\n  width: 100%;\n\n  .extension-overflow-wrapper:not(.with-body) {\n    overflow-x: auto;\n  }\n\n  /* extension container breakout, only works on top level*/\n  .ProseMirror\n    > ", "\n    > [extensiontype]\n    &.", ",\n    .ProseMirror\n    > [extensiontype]\n    &.", " {\n    width: ", ";\n    margin-left: 50%;\n    transform: translateX(-50%);\n  }\n"])), dataConsumerSelector, widerLayoutClassName, widerLayoutClassName, function (_ref) {
-  var extensionWidth = _ref.extensionWidth;
-  return "".concat(extensionWidth);
-});
+export var wrapperStyle = function wrapperStyle(theme, extensionWidth) {
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", "\n\n  &.without-frame {\n    background: transparent;\n  }\n  cursor: pointer;\n  width: 100%;\n\n  .extension-overflow-wrapper:not(.with-body) {\n    overflow-x: auto;\n  }\n\n  /* extension container breakout, only works on top level */\n  .ProseMirror\n    > ", "\n    > [extensiontype]\n    &.", ",\n    .ProseMirror\n    > [extensiontype]\n    &.", " {\n    width: ", ";\n    margin-left: 50%;\n    transform: translateX(-50%);\n  }\n"])), wrapperDefault(theme), dataConsumerSelector, widerLayoutClassName, widerLayoutClassName, extensionWidth);
+};
 export var Header = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: ", "px ", "px ", "px;\n  vertical-align: middle;\n\n  &.with-children:not(.without-frame) {\n    padding: 4px 8px 8px;\n  }\n  &.without-frame {\n    padding: 0;\n  }\n"])), padding / 2, padding / 2, padding / 4);
 export var Content = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding: ", "px;\n  background: ", ";\n  color: ", ";\n  border: 1px solid ", ";\n  border-radius: ", "px;\n  cursor: initial;\n"])), padding, themed({
   light: 'white',

package/dist/esm/plugins/extension/ui/Extension/InlineExtension/index.js

@@ -8,11 +8,13 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { Component } from 'react';
-import { Overlay } from '../styles';
+import { overlay } from '../styles';
 import ExtensionLozenge from '../Lozenge';
-import { Wrapper } from './styles';
+import { wrapperStyle } from './styles';
 
 var InlineExtension = /*#__PURE__*/function (_Component) {
   _inherits(InlineExtension, _Component);
@@ -33,11 +35,13 @@ var InlineExtension = /*#__PURE__*/function (_Component) {
           children = _this$props.children;
       var hasChildren = !!children;
       var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-      return /*#__PURE__*/React.createElement(Wrapper, {
+      return jsx("div", {
+        css: wrapperStyle,
         className: "extension-container inline ".concat(className)
-      }, /*#__PURE__*/React.createElement(Overlay, {
+      }, jsx("div", {
+        css: overlay,
         className: "extension-overlay"
-      }), children ? children : /*#__PURE__*/React.createElement(ExtensionLozenge, {
+      }), children ? children : jsx(ExtensionLozenge, {
         node: node
       }));
     }

package/dist/esm/plugins/extension/ui/Extension/InlineExtension/styles.js

@@ -2,7 +2,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject;
 
-import styled from 'styled-components';
+import { css } from '@emotion/react';
 import { borderRadius } from '@atlaskit/theme/constants';
-import { Wrapper as WrapperDefault } from '../styles';
-export var Wrapper = styled(WrapperDefault)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  display: inline-flex;\n  margin: 1px;\n\n  > img {\n    border-radius: ", "px;\n  }\n\n  &::after,\n  &::before {\n    vertical-align: text-top;\n    display: inline-block;\n    width: 1px;\n    content: '';\n  }\n\n  &.with-children {\n    padding: 0;\n    background: white;\n  }\n"])), borderRadius());
+import { wrapperDefault } from '../styles';
+export var wrapperStyle = function wrapperStyle(theme) {
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  ", "\n\n  cursor: pointer;\n  display: inline-flex;\n  margin: 1px;\n\n  > img {\n    border-radius: ", "px;\n  }\n\n  &::after,\n  &::before {\n    vertical-align: text-top;\n    display: inline-block;\n    width: 1px;\n    content: '';\n  }\n\n  &.with-children {\n    padding: 0;\n    background: white;\n  }\n"])), wrapperDefault(theme), borderRadius());
+};

package/dist/esm/plugins/extension/ui/Extension/Lozenge.js

@@ -16,11 +16,12 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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';
+/** @jsx jsx */
+import { jsx } from '@emotion/react';
 import { Component } from 'react';
 import EditorFileIcon from '@atlaskit/icon/glyph/editor/file';
 import { getExtensionLozengeData } from '@atlaskit/editor-common/utils';
-import { PlaceholderFallback, PlaceholderFallbackParams, StyledImage } from './styles';
+import { placeholderFallback, placeholderFallbackParams, styledImage } from './styles';
 export var capitalizeFirstLetter = function capitalizeFirstLetter(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 };
@@ -64,7 +65,8 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
       var url = lozengeData.url,
           rest = _objectWithoutProperties(lozengeData, _excluded);
 
-      return /*#__PURE__*/React.createElement(StyledImage, _extends({
+      return jsx("img", _extends({
+        css: styledImage,
         src: url
       }, rest, {
         alt: extensionKey
@@ -80,14 +82,18 @@ var ExtensionLozenge = /*#__PURE__*/function (_Component) {
       var params = parameters && parameters.macroParams;
       var title = parameters && parameters.extensionTitle || parameters && parameters.macroMetadata && parameters.macroMetadata.title || extensionKey;
       var isBlockExtension = name === 'extension';
-      return /*#__PURE__*/React.createElement(PlaceholderFallback, null, lozengeData && !isBlockExtension ? this.renderImage(_objectSpread({
+      return jsx("div", {
+        css: placeholderFallback
+      }, lozengeData && !isBlockExtension ? this.renderImage(_objectSpread({
         height: ICON_SIZE,
         width: ICON_SIZE
-      }, lozengeData)) : /*#__PURE__*/React.createElement(EditorFileIcon, {
+      }, lozengeData)) : jsx(EditorFileIcon, {
         label: title
-      }), /*#__PURE__*/React.createElement("span", {
+      }), jsx("span", {
         className: "extension-title"
-      }, capitalizeFirstLetter(title)), params && !isBlockExtension && /*#__PURE__*/React.createElement(PlaceholderFallbackParams, null, Object.keys(params).map(function (key) {
+      }, capitalizeFirstLetter(title)), params && !isBlockExtension && jsx("span", {
+        css: placeholderFallbackParams
+      }, Object.keys(params).map(function (key) {
         return key && " | ".concat(key, " = ").concat(params[key].value);
       })));
     }

package/dist/esm/plugins/extension/ui/Extension/styles.js

@@ -2,7 +2,7 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
-import styled from 'styled-components';
+import { css } from '@emotion/react';
 import { fontSize, gridSize } from '@atlaskit/theme/constants';
 import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
@@ -10,13 +10,15 @@ import { N20, DN50, DN700, B200, N20A, N70 } from '@atlaskit/theme/colors';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 export var padding = gridSize();
 export var BODIED_EXT_PADDING = padding * 2;
-export var Wrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  border-radius: ", "px;\n  color: ", ";\n  position: relative;\n  vertical-align: middle;\n  font-size: ", ";\n\n  .ProseMirror-selectednode > span > & > .extension-overlay {\n    box-shadow: inset 0px 0px 0px 2px ", ";\n    opacity: 1;\n  }\n\n  &.with-overlay {\n    .extension-overlay {\n      background: ", ";\n      color: transparent;\n    }\n\n    &:hover .extension-overlay {\n      opacity: 1;\n    }\n  }\n"])), themed({
-  light: N20,
-  dark: DN50
-}), borderRadius(), themed({
-  dark: DN700
-}), relativeFontSizeToBase16(fontSize()), B200, N20A);
-export var Overlay = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border-radius: ", "px;\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  opacity: 0;\n  pointer-events: none;\n  transition: opacity 0.3s;\n"])), borderRadius());
-export var PlaceholderFallback = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: inline-flex;\n  align-items: center;\n\n  & > img {\n    margin: 0 4px;\n  }\n"])));
-export var PlaceholderFallbackParams = styled.span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: inline-block;\n  max-width: 200px;\n  margin-left: 5px;\n  color: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), N70);
-export var StyledImage = styled.img(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  max-height: 16px;\n  max-width: 16px;\n"])));
+export var wrapperDefault = function wrapperDefault(theme) {
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  border-radius: ", "px;\n  color: ", ";\n  position: relative;\n  vertical-align: middle;\n  font-size: ", ";\n\n  .ProseMirror-selectednode > span > & > .extension-overlay {\n    box-shadow: inset 0px 0px 0px 2px ", ";\n    opacity: 1;\n  }\n\n  &.with-overlay {\n    .extension-overlay {\n      background: ", ";\n      color: transparent;\n    }\n\n    &:hover .extension-overlay {\n      opacity: 1;\n    }\n  }\n"])), themed({
+    light: N20,
+    dark: DN50
+  })(theme), borderRadius(), themed({
+    dark: DN700
+  })(theme), relativeFontSizeToBase16(fontSize()), B200, N20A);
+};
+export var overlay = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  border-radius: ", "px;\n  position: absolute;\n  width: 100%;\n  height: 100%;\n  opacity: 0;\n  pointer-events: none;\n  transition: opacity 0.3s;\n"])), borderRadius());
+export var placeholderFallback = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  display: inline-flex;\n  align-items: center;\n\n  & > img {\n    margin: 0 4px;\n  }\n  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n  /* stylelint-disable-next-line */\n  label: placeholder-fallback;\n"])));
+export var placeholderFallbackParams = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  display: inline-block;\n  max-width: 200px;\n  margin-left: 5px;\n  color: ", ";\n  text-overflow: ellipsis;\n  white-space: nowrap;\n  overflow: hidden;\n"])), N70);
+export var styledImage = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  max-height: 16px;\n  max-width: 16px;\n  /* TODO: fix in develop: https://atlassian.slack.com/archives/CFG3PSQ9E/p1647395052443259?thread_ts=1647394572.556029&cid=CFG3PSQ9E */\n  /* stylelint-disable-next-line */\n  label: lozenge-image;\n"])));

package/dist/esm/plugins/extension/ui/SaveIndicator/SaveIndicator.js

@@ -3,8 +3,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject, _templateObject2, _templateObject3;
 
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import styled from 'styled-components';
+/** @jsx jsx */
+import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
+import { css, jsx } from '@emotion/react';
 import { G300, N0 } from '@atlaskit/theme/colors';
 import CheckCircleIcon from '@atlaskit/icon/glyph/check-circle';
 import { FormattedMessage } from 'react-intl-next';
@@ -12,9 +13,9 @@ import { messages } from './messages';
 
 var noop = function noop() {};
 
-var SaveIndicatorWrapper = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: center;\n"])));
-var SaveIndicatorContent = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: fixed;\n  width: 256px;\n  bottom: 20px;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  padding: 6px 12px;\n\n  background: ", ";\n\n  /* E300 */\n  box-shadow: 0px 8px 12px rgba(9, 30, 66, 0.15),\n    0px 0px 1px rgba(9, 30, 66, 0.31);\n  border-radius: 16px;\n"])), N0);
-var SaveIndicatorText = styled.span(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding-left: 6px;\n"])));
+var saveIndicatorWrapper = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  justify-content: center;\n"])));
+var saveIndicatorContent = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: fixed;\n  width: 256px;\n  bottom: 20px;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  padding: 6px 12px;\n\n  background: ", ";\n\n  /* E300 */\n  box-shadow: 0px 8px 12px rgba(9, 30, 66, 0.15),\n    0px 0px 1px rgba(9, 30, 66, 0.31);\n  border-radius: 16px;\n"])), N0);
+var saveIndicatorText = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  padding-left: 6px;\n"])));
 export var SaveIndicator = function SaveIndicator(_ref) {
   var children = _ref.children,
       duration = _ref.duration,
@@ -43,14 +44,19 @@ export var SaveIndicator = function SaveIndicator(_ref) {
       };
     }
   }, [saving, duration]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", null, children({
+  return jsx(Fragment, null, jsx("div", null, children({
     onSaveStarted: onSaveStarted,
     onSaveEnded: noop
-  })), visible && saving && /*#__PURE__*/React.createElement(SaveIndicatorWrapper, null, /*#__PURE__*/React.createElement(SaveIndicatorContent, {
+  })), visible && saving && jsx("div", {
+    css: saveIndicatorWrapper
+  }, jsx("div", {
+    css: saveIndicatorContent,
     "data-testid": "save-indicator-content"
-  }, /*#__PURE__*/React.createElement(CheckCircleIcon, {
+  }, jsx(CheckCircleIcon, {
     label: "Saving",
     primaryColor: G300,
     size: "small"
-  }), /*#__PURE__*/React.createElement(SaveIndicatorText, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.saveIndicator)))));
+  }), jsx("span", {
+    css: saveIndicatorText
+  }, jsx(FormattedMessage, messages.saveIndicator)))));
 };

package/dist/esm/plugins/extension/ui/styles.js

@@ -2,6 +2,6 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 
 var _templateObject;
 
-import { css } from 'styled-components';
+import { css } from '@emotion/react';
 import { blockNodesVerticalMargin, akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackground, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-export var extensionStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .extensionView-content-wrap,\n  .bodiedExtensionView-content-wrap {\n    margin: ", " 0;\n\n    &:first-of-type {\n      margin-top: 0;\n    }\n\n    &:last-of-type {\n      margin-bottom: 0;\n    }\n\n    &:not(.danger).", " {\n      & > span > .extension-container {\n        ", "\n      }\n    }\n\n    &.danger > span > .extension-container {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n    }\n\n    &.inline {\n      word-wrap: break-all;\n    }\n  }\n\n  .extensionView-content-wrap .extension-container {\n    overflow: hidden;\n  }\n\n  .bodiedExtensionView-content-wrap\n    .extensionView-content-wrap\n    .extension-container {\n    width: 100%;\n  }\n"])), blockNodesVerticalMargin, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackground);
+export var extensionStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .extensionView-content-wrap,\n  .bodiedExtensionView-content-wrap {\n    margin: ", " 0;\n\n    &:first-of-type {\n      margin-top: 0;\n    }\n\n    &:last-of-type {\n      margin-bottom: 0;\n    }\n\n    &:not(.danger).", " {\n      & > span > .extension-container {\n        ", "\n      }\n    }\n\n    &.danger > span > .extension-container {\n      box-shadow: 0 0 0 ", "px ", ";\n      background-color: ", ";\n    }\n\n    &.inline {\n      word-wrap: break-all;\n    }\n  }\n\n  .extensionView-content-wrap .extension-container {\n    overflow: hidden;\n  }\n\n  .bodiedExtensionView-content-wrap\n    .extensionView-content-wrap\n    .extension-container {\n    width: 100%;\n    max-width: 100%; // ensure width can't go over 100%;\n  }\n"])), blockNodesVerticalMargin, akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.BoxShadow]), akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorDeleteBackground);

package/dist/esm/plugins/extension/utils.js

@@ -1,15 +1,32 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 { findParentNodeOfType, findSelectedNodeOfType, findDomRefAtPos } from 'prosemirror-utils';
 import { closestElement } from '../../utils/dom';
 import { findNodePosByLocalIds } from '../../utils/nodes-by-localIds';
+
+var getSelectedExtensionByTransaction = function getSelectedExtensionByTransaction(transaction) {
+  var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  return _getSelectedExtension(transaction.doc.type.schema, transaction.selection, searchParent);
+};
+
 export var getSelectedExtension = function getSelectedExtension(state) {
   var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var _state$schema$nodes = state.schema.nodes,
-      inlineExtension = _state$schema$nodes.inlineExtension,
-      extension = _state$schema$nodes.extension,
-      bodiedExtension = _state$schema$nodes.bodiedExtension;
+  return _getSelectedExtension(state.schema, state.selection, searchParent);
+};
+
+var _getSelectedExtension = function _getSelectedExtension(schema, selection, searchParent) {
+  var _schema$nodes = schema.nodes,
+      inlineExtension = _schema$nodes.inlineExtension,
+      extension = _schema$nodes.extension,
+      bodiedExtension = _schema$nodes.bodiedExtension;
   var nodeTypes = [extension, bodiedExtension, inlineExtension];
-  return findSelectedNodeOfType(nodeTypes)(state.selection) || searchParent && findParentNodeOfType(nodeTypes)(state.selection) || undefined;
+  return findSelectedNodeOfType(nodeTypes)(selection) || searchParent && findParentNodeOfType(nodeTypes)(selection) || undefined;
 };
+
 export var findExtensionWithLocalId = function findExtensionWithLocalId(state, localId) {
   var selectedExtension = getSelectedExtension(state, true);
 
@@ -21,10 +38,10 @@ export var findExtensionWithLocalId = function findExtensionWithLocalId(state, l
     return selectedExtension;
   }
 
-  var _state$schema$nodes2 = state.schema.nodes,
-      inlineExtension = _state$schema$nodes2.inlineExtension,
-      extension = _state$schema$nodes2.extension,
-      bodiedExtension = _state$schema$nodes2.bodiedExtension;
+  var _state$schema$nodes = state.schema.nodes,
+      inlineExtension = _state$schema$nodes.inlineExtension,
+      extension = _state$schema$nodes.extension,
+      bodiedExtension = _state$schema$nodes.bodiedExtension;
   var nodeTypes = [extension, bodiedExtension, inlineExtension];
   var matched;
   state.doc.descendants(function (node, pos) {
@@ -64,4 +81,29 @@ export var getNodeTypesReferenced = function getNodeTypesReferenced(ids, state)
 export var findNodePosWithLocalId = function findNodePosWithLocalId(state, localId) {
   var nodes = findNodePosByLocalIds(state, [localId]);
   return nodes.length >= 1 ? nodes[0] : undefined;
+};
+export var onSelectionChanged = function onSelectionChanged(tr, state) {
+  var selectedExtension = getSelectedExtensionByTransaction(tr, true);
+  var hasUnselectedExtension = !!state.element && !selectedExtension;
+  /*
+   * We use this to indicate to our plugin that the selection has changed.
+   *
+   * - ignore if shouldRefreshEditButton already set
+   * - restrict to scenarios when an extension is
+   * - a) actually selected
+   * - b) or un-selected (not accounting for selection extensionA -> extensionB)
+   *
+   * The rest of the logic will be handled in Extension main plugin view update().
+   *
+   * Known issue: typing inside of a bodiedExtension will trigger state changes each keystroke
+   * as the toolbar always being open while it is focused.
+   */
+
+  if (!state.shouldRefreshEditButton && (selectedExtension || hasUnselectedExtension)) {
+    return _objectSpread(_objectSpread({}, state), {}, {
+      shouldRefreshEditButton: true
+    });
+  }
+
+  return state;
 };