@atlaskit/editor-core 149.0.0 → 150.0.1

package/dist/cjs/plugins/layout/actions.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.forceSectionToPresetLayout = forceSectionToPresetLayout;
-exports.deleteActiveLayoutNode = exports.fixColumnStructure = exports.fixColumnSizes = exports.setPresetLayout = exports.insertLayoutColumnsWithAnalytics = exports.insertLayoutColumns = exports.createDefaultLayoutSection = exports.getSelectedLayout = exports.getPresetLayout = exports.THREE_COL_LAYOUTS = exports.TWO_COL_LAYOUTS = void 0;
+exports.deleteActiveLayoutNode = exports.fixColumnStructure = exports.fixColumnSizes = exports.setPresetLayout = exports.insertLayoutColumnsWithAnalytics = exports.insertLayoutColumns = exports.createDefaultLayoutSection = exports.getSelectedLayout = exports.getPresetLayout = exports.THREE_COL_LAYOUTS = exports.TWO_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -32,6 +32,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
+var ONE_COL_LAYOUTS = ['single'];
+exports.ONE_COL_LAYOUTS = ONE_COL_LAYOUTS;
 var TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 exports.TWO_COL_LAYOUTS = TWO_COL_LAYOUTS;
 var THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
@@ -39,6 +41,9 @@ exports.THREE_COL_LAYOUTS = THREE_COL_LAYOUTS;
 
 var getWidthsForPreset = function getWidthsForPreset(presetLayout) {
   switch (presetLayout) {
+    case 'single':
+      return [100];
+
     case 'two_equal':
       return [50, 50];
 
@@ -67,6 +72,9 @@ var getPresetLayout = function getPresetLayout(section) {
   }).join(',');
 
   switch (widths) {
+    case '100':
+      return 'single';
+
     case '33.33,33.33,33.33':
       return 'three_equal';
 
@@ -135,6 +143,47 @@ var insertLayoutColumnsWithAnalytics = function insertLayoutColumnsWithAnalytics
     eventType: _enums.EVENT_TYPE.TRACK
   })(insertLayoutColumns);
 };
+/**
+ * Add a column to the right of existing layout
+ */
+
+
+exports.insertLayoutColumnsWithAnalytics = insertLayoutColumnsWithAnalytics;
+
+function addColumn(schema, pos) {
+  return function (tr) {
+    tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos), schema.nodes.layoutColumn.createAndFill());
+  };
+}
+
+function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
+  return function (tr) {
+    if ((0, _utils.isEmptyDocument)(column)) {
+      tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(insideRightEdgePos), _prosemirrorModel.Slice.empty);
+    } else {
+      tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), _prosemirrorModel.Slice.empty);
+    }
+  };
+}
+
+var fromTwoColsToThree = addColumn;
+var fromOneColToTwo = addColumn;
+var fromTwoColsToOne = removeLastColumnInLayout;
+var fromThreeColsToTwo = removeLastColumnInLayout;
+
+var fromOneColToThree = function fromOneColToThree(schema, pos) {
+  return function (tr) {
+    addColumn(schema, pos)(tr);
+    addColumn(schema, pos)(tr);
+  };
+};
+
+var fromThreeColstoOne = function fromThreeColstoOne(node, tr, insideRightEdgePos) {
+  var thirdColumn = node.content.child(2);
+  fromThreeColsToTwo(thirdColumn, insideRightEdgePos - thirdColumn.nodeSize, insideRightEdgePos)(tr);
+  var secondColumn = node.content.child(1);
+  fromTwoColsToOne(secondColumn, insideRightEdgePos - thirdColumn.nodeSize - secondColumn.nodeSize, insideRightEdgePos)(tr);
+};
 /**
  * Handles switching from 2 -> 3 cols, or 3 -> 2 cols
  * Switching from 2 -> 3 just adds a new one at the end
@@ -143,27 +192,29 @@ var insertLayoutColumnsWithAnalytics = function insertLayoutColumnsWithAnalytics
  */
 
 
-exports.insertLayoutColumnsWithAnalytics = insertLayoutColumnsWithAnalytics;
-
 function forceColumnStructure(state, node, pos, presetLayout) {
   var tr = state.tr;
   var insideRightEdgeOfLayoutSection = pos + node.nodeSize - 1;
-  var numCols = node.childCount;
+  var numCols = node.childCount; // 3 columns -> 2 columns
 
   if (TWO_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 3) {
     var thirdColumn = node.content.child(2);
-    var thirdColumnPos = insideRightEdgeOfLayoutSection - thirdColumn.nodeSize;
-
-    if ((0, _utils.isEmptyDocument)(thirdColumn)) {
-      tr.replaceRange( // end pos of second column
-      tr.mapping.map(thirdColumnPos - 1), tr.mapping.map(insideRightEdgeOfLayoutSection), _prosemirrorModel.Slice.empty);
-    } else {
-      tr.replaceRange( // end pos of second column
-      tr.mapping.map(thirdColumnPos - 1), // start pos of third column
-      tr.mapping.map(thirdColumnPos + 1), _prosemirrorModel.Slice.empty);
-    }
+    var columnPos = insideRightEdgeOfLayoutSection - thirdColumn.nodeSize;
+    fromThreeColsToTwo(thirdColumn, columnPos, insideRightEdgeOfLayoutSection)(tr); // 2 columns -> 3 columns
   } else if (THREE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 2) {
-    tr.replaceWith(tr.mapping.map(insideRightEdgeOfLayoutSection), tr.mapping.map(insideRightEdgeOfLayoutSection), state.schema.nodes.layoutColumn.createAndFill());
+    fromTwoColsToThree(state.schema, insideRightEdgeOfLayoutSection)(tr); // 2 columns -> 1 column
+  } else if (ONE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 2) {
+    var secondColumn = node.content.child(1);
+
+    var _columnPos = insideRightEdgeOfLayoutSection - secondColumn.nodeSize;
+
+    fromTwoColsToOne(secondColumn, _columnPos, insideRightEdgeOfLayoutSection)(tr); // 3 columns -> 1 column
+  } else if (ONE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 3) {
+    fromThreeColstoOne(node, tr, insideRightEdgeOfLayoutSection); // 1 column -> 2 columns
+  } else if (TWO_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 1) {
+    fromOneColToTwo(state.schema, insideRightEdgeOfLayoutSection)(tr); // 1 column -> 3 columns
+  } else if (THREE_COL_LAYOUTS.indexOf(presetLayout) >= 0 && numCols === 1) {
+    fromOneColToThree(state.schema, insideRightEdgeOfLayoutSection)(tr);
   }
 
   return tr;
@@ -259,7 +310,7 @@ function getLayoutChange(node, pos, schema) {
       return;
     }
 
-    var presetLayout = node.childCount === 2 ? 'two_equal' : 'three_equal';
+    var presetLayout = node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
     var fixedColumns = columnWidth(node, schema, getWidthsForPreset(presetLayout));
     return {
       from: pos + 1,
@@ -360,6 +411,9 @@ exports.deleteActiveLayoutNode = deleteActiveLayoutNode;
 
 var formatLayoutName = function formatLayoutName(layout) {
   switch (layout) {
+    case 'single':
+      return _nodeEvents.LAYOUT_TYPE.SINGLE_COL;
+
     case 'two_equal':
       return _nodeEvents.LAYOUT_TYPE.TWO_COLS_EQUAL;
 

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

@@ -57,10 +57,11 @@ var layoutPlugin = function layoutPlugin() {
         var _ref = _pluginKey.pluginKey.getState(state),
             pos = _ref.pos,
             allowBreakout = _ref.allowBreakout,
-            addSidebarLayouts = _ref.addSidebarLayouts;
+            addSidebarLayouts = _ref.addSidebarLayouts,
+            allowSingleColumnLayout = _ref.allowSingleColumnLayout;
 
         if (pos !== null) {
-          return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts);
+          return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout);
         }
 
         return undefined;

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

@@ -76,13 +76,15 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
   var maybeLayoutSection = (0, _prosemirrorUtils.findParentNodeOfType)(state.schema.nodes.layoutSection)(state.selection);
   var allowBreakout = options.allowBreakout || false;
   var addSidebarLayouts = options.UNSAFE_addSidebarLayouts || false;
+  var allowSingleColumnLayout = options.UNSAFE_allowSingleColumnLayout || false;
   var pos = maybeLayoutSection ? maybeLayoutSection.pos : null;
   var selectedLayout = (0, _actions.getSelectedLayout)(maybeLayoutSection && maybeLayoutSection.node, DEFAULT_LAYOUT);
   return {
     pos: pos,
     allowBreakout: allowBreakout,
     addSidebarLayouts: addSidebarLayouts,
-    selectedLayout: selectedLayout
+    selectedLayout: selectedLayout,
+    allowSingleColumnLayout: allowSingleColumnLayout
   };
 };
 

package/dist/cjs/plugins/layout/toolbar-messages.js

@@ -8,6 +8,11 @@ exports.toolbarMessages = void 0;
 var _reactIntl = require("react-intl");
 
 var toolbarMessages = (0, _reactIntl.defineMessages)({
+  singleColumn: {
+    id: 'fabric.editor.single',
+    defaultMessage: 'Single column',
+    description: 'Layout with one single column'
+  },
   twoColumns: {
     id: 'fabric.editor.twoColumns',
     defaultMessage: 'Two columns',

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

@@ -11,6 +11,8 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
+var _layoutSingle = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-single"));
+
 var _layoutTwoEqual = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-two-equal"));
 
 var _layoutThreeEqual = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/layout-three-equal"));
@@ -42,6 +44,12 @@ var LAYOUT_TYPES = [{
   title: _toolbarMessages.toolbarMessages.threeColumns,
   icon: _layoutThreeEqual.default
 }];
+var LAYOUT_TYPES_WITH_SINGLE_COL = [{
+  id: 'editor.layout.singeLayout',
+  type: 'single',
+  title: _toolbarMessages.toolbarMessages.singleColumn,
+  icon: _layoutSingle.default
+}].concat(LAYOUT_TYPES);
 var SIDEBAR_LAYOUT_TYPES = [{
   id: 'editor.layout.twoRightSidebar',
   type: 'two_right_sidebar',
@@ -74,7 +82,7 @@ var buildLayoutButton = function buildLayoutButton(intl, item, currentLayout) {
 var layoutToolbarTitle = 'Layout floating controls';
 exports.layoutToolbarTitle = layoutToolbarTitle;
 
-var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts) {
+var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSidebarLayouts, allowSingleColumnLayout) {
   var node = state.doc.nodeAt(pos);
 
   if (node) {
@@ -96,13 +104,14 @@ var buildToolbar = function buildToolbar(state, intl, pos, _allowBreakout, addSi
       onFocus: (0, _decoration.hoverDecoration)(nodeType, true),
       onBlur: (0, _decoration.hoverDecoration)(nodeType, false)
     };
+    var layoutTypes = allowSingleColumnLayout ? LAYOUT_TYPES_WITH_SINGLE_COL : LAYOUT_TYPES;
     return {
       title: layoutToolbarTitle,
       getDomRef: function getDomRef(view) {
         return (0, _prosemirrorUtils.findDomRefAtPos)(pos, view.domAtPos.bind(view));
       },
       nodeType: nodeType,
-      items: [].concat((0, _toConsumableArray2.default)(LAYOUT_TYPES.map(function (i) {
+      items: [].concat((0, _toConsumableArray2.default)(layoutTypes.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout);
       })), (0, _toConsumableArray2.default)(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(function (i) {
         return buildLayoutButton(intl, i, currentLayout);

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

@@ -15,16 +15,12 @@ var _prosemirrorView = require("prosemirror-view");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
-var _analytics = require("../../analytics");
-
 var _selection = require("../utils/selection");
 
 var _node = require("../utils/node");
 
 var _pluginStateFactory = require("../../../utils/plugin-state-factory");
 
-var _find = require("../utils/find");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -133,40 +129,6 @@ var createPlugin = function createPlugin(eventDispatch) {
   return new _prosemirrorState.Plugin({
     state: createPluginState(eventDispatch, createInitialState),
     key: listPluginKey,
-    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
-      var lastTransaction = transactions[transactions.length - 1];
-
-      if (!lastTransaction.docChanged || !lastTransaction.selectionSet) {
-        return;
-      }
-
-      var tr = newState.tr;
-      var rootList = (0, _find.findRootParentListNode)(tr.selection.$from);
-
-      if (!rootList) {
-        return;
-      }
-
-      var listsJoined = (0, _node.joinSiblingLists)({
-        tr: tr,
-        direction: _node.JoinDirection.RIGHT
-      });
-
-      if (tr.docChanged) {
-        var orderedListsJoined = listsJoined.orderedList,
-            bulletListsJoined = listsJoined.bulletList;
-        (0, _analytics.addAnalytics)(newState, tr, {
-          action: _analytics.ACTION.FIXED,
-          actionSubject: _analytics.ACTION_SUBJECT.LIST,
-          eventType: _analytics.EVENT_TYPE.TRACK,
-          attributes: {
-            orderedListsJoined: orderedListsJoined,
-            bulletListsJoined: bulletListsJoined
-          }
-        });
-        return tr;
-      }
-    },
     props: {
       decorations: function decorations(state) {
         var _getPluginState = getPluginState(state),

package/dist/cjs/plugins/macro/actions.js

@@ -91,20 +91,20 @@ var insertMacroFromMacroBrowser = function insertMacroFromMacroBrowser(macroProv
                 tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, state.selection.anchor));
               } // If any extension is currently selected
               else if ((0, _prosemirrorUtils.findSelectedNodeOfType)([extension, bodiedExtension, inlineExtension])(selection)) {
-                  tr = (0, _prosemirrorUtils.replaceSelectedNode)(node)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
-
-                  tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
-                } // When we loose the selection. This usually happens when Synchrony resets or changes
-                // the selection when user is in the middle of updating an extension.
-                else if (extensionState.element) {
-                    pos = view.posAtDOM(extensionState.element, -1);
-
-                    if (pos > -1) {
-                      tr = tr.replaceWith(pos, pos + macroNode.nodeSize, node);
-                      tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
-                      targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
-                    }
-                  } // Only scroll if we have anything to update, best to avoid surprise scroll
+                tr = (0, _prosemirrorUtils.replaceSelectedNode)(node)(tr); // Replacing selected node doesn't update the selection. `selection.node` still returns the old node
+
+                tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, tr.mapping.map(state.selection.anchor)));
+              } // When we loose the selection. This usually happens when Synchrony resets or changes
+              // the selection when user is in the middle of updating an extension.
+              else if (extensionState.element) {
+                pos = view.posAtDOM(extensionState.element, -1);
+
+                if (pos > -1) {
+                  tr = tr.replaceWith(pos, pos + macroNode.nodeSize, node);
+                  tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(pos)));
+                  targetSelectionSource = _extensionEvents.TARGET_SELECTION_SOURCE.HTML_ELEMENT;
+                }
+              } // Only scroll if we have anything to update, best to avoid surprise scroll
 
 
               if (dispatch && tr.docChanged) {

package/dist/cjs/plugins/mentions/analytics.js

@@ -102,7 +102,7 @@ var buildTypeAheadInviteItemViewedPayload = function buildTypeAheadInviteItemVie
 
 exports.buildTypeAheadInviteItemViewedPayload = buildTypeAheadInviteItemViewedPayload;
 
-var buildTypeAheadInviteExposurePayload = function buildTypeAheadInviteExposurePayload(shouldEnableInvite, sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole) {
+var buildTypeAheadInviteExposurePayload = function buildTypeAheadInviteExposurePayload(sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole) {
   var _ref2 = contextIdentifierProvider || {},
       containerId = _ref2.containerId,
       objectId = _ref2.objectId,
@@ -110,8 +110,7 @@ var buildTypeAheadInviteExposurePayload = function buildTypeAheadInviteExposureP
 
   return buildAnalyticsPayload('feature', 'exposed', _analyticsGasTypes.OPERATIONAL_EVENT_TYPE, sessionId, {
     flagKey: 'confluence.frontend.invite.from.mention',
-    value: shouldEnableInvite,
-    cohort: inviteExperimentCohort,
+    value: inviteExperimentCohort || 'not-enrolled',
     containerId: containerId,
     objectId: objectId,
     childObjectId: childObjectId,

package/dist/cjs/plugins/mentions/type-ahead/index.js

@@ -292,6 +292,13 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
 
           if (mentions.length === 0 && firstQueryWithoutResults === null) {
             firstQueryWithoutResults = query;
+          } // Growth (El-dorado) experiment design hard requirement
+
+
+          if (mentionItems.length <= 2) {
+            var inviteExperimentCohort = mentionProvider.inviteExperimentCohort,
+                userRole = mentionProvider.userRole;
+            fireEvent((0, _analytics.buildTypeAheadInviteExposurePayload)(sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole));
           }
 
           if (!mentionProvider.shouldEnableInvite || mentionItems.length > 2) {
@@ -317,18 +324,6 @@ var createTypeAheadConfig = function createTypeAheadConfig(_ref6) {
     },
     onOpen: function onOpen(editorState) {
       firstQueryWithoutResults = null;
-      var pluginState = (0, _utils2.getMentionPluginState)(editorState);
-
-      if (!pluginState || !pluginState.mentionProvider) {
-        return null;
-      }
-
-      var contextIdentifierProvider = pluginState.contextIdentifierProvider,
-          _pluginState$mentionP = pluginState.mentionProvider,
-          shouldEnableInvite = _pluginState$mentionP.shouldEnableInvite,
-          inviteExperimentCohort = _pluginState$mentionP.inviteExperimentCohort,
-          userRole = _pluginState$mentionP.userRole;
-      fireEvent((0, _analytics.buildTypeAheadInviteExposurePayload)(!!shouldEnableInvite, sessionId, contextIdentifierProvider, inviteExperimentCohort, userRole));
     },
     selectItem: function selectItem(state, item, insert, _ref8) {
       var mode = _ref8.mode,

package/dist/cjs/plugins/panel/nodeviews/panel.js

@@ -35,7 +35,8 @@ var _editorCommon = require("@atlaskit/editor-common");
 
 var _utils = require("../utils");
 
-var fitToHeight = 20;
+var _consts = require("@atlaskit/editor-shared-styles/consts");
+
 var panelIcons = {
   info: _info.default,
   success: _success.default,
@@ -60,7 +61,7 @@ var PanelIcon = function PanelIcon(props) {
       shortName: panelIcon,
       showTooltip: false,
       allowTextFallback: false,
-      fitToHeight: fitToHeight
+      fitToHeight: _consts.akEditorCustomIconSize
     });
   }
 
@@ -91,7 +92,10 @@ var PanelNodeView = /*#__PURE__*/function () {
 
     if (!this.icon) {
       return;
-    }
+    } // set contentEditable as false to be able to select the custom panels with keyboard
+
+
+    this.icon.contentEditable = 'false';
 
     _reactDom.default.render( /*#__PURE__*/_react.default.createElement(PanelIcon, {
       allowCustomPanel: pluginOptions.UNSAFE_allowCustomPanel,

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

@@ -21,7 +21,7 @@ var _warning = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/warni
 
 var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/error"));
 
-var _EditorHideEmojiIcon = _interopRequireDefault(require("../floating-toolbar/ui/EditorHideEmojiIcon"));
+var _EditorRemoveEmojiIcon = _interopRequireDefault(require("../floating-toolbar/ui/EditorRemoveEmojiIcon"));
 
 var _messages = _interopRequireDefault(require("../../messages"));
 
@@ -247,13 +247,15 @@ var getToolbarItems = function getToolbarItems(formatMessage, panelNodeType, isC
         return changeEmoji(emojiShortName);
       }
     };
-    items.push(emojiPicker, {
-      id: 'editor.panel.hideEmoji',
+    var removeEmojiButton = {
+      id: 'editor.panel.removeEmoji',
       type: 'button',
-      icon: _EditorHideEmojiIcon.default,
+      icon: _EditorRemoveEmojiIcon.default,
       onClick: removeEmoji(),
-      title: formatMessage(_messages.default.hideEmoji)
-    }, {
+      title: formatMessage(_messages.default.removeEmoji),
+      disabled: activePanelIcon ? false : true
+    };
+    items.push(emojiPicker, removeEmojiButton, {
       type: 'separator'
     }, colorPicker);
   }

package/dist/cjs/plugins/panel/toolbar.test.js

@@ -100,16 +100,16 @@ describe('getToolbarItems', function () {
         color: '#ABF5D1'
       }, true);
     });
-    it("should call changePanelType when clicked on hide emoji", function () {
-      var hideEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
-        return item.type === 'button' && item.id === 'editor.panel.hideEmoji';
+    it("should call changePanelType when clicked on remove emoji", function () {
+      var removeEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
       });
-      hideEmojiButton.onClick(editorView.state);
+      removeEmojiButton.onClick(editorView.state);
       expect(changePanelTypespy).toBeCalledWith(_adfSchema.PanelType.CUSTOM, {
         emoji: undefined
       }, true);
     });
-    it("should not call changePanelType when clicked on hide emoji when no emoji in panel", function () {
+    it("should not call changePanelType when clicked on remove emoji when no emoji in panel", function () {
       var _createEditor2 = createEditor({
         doc: (0, _docBuilder.doc)((0, _docBuilder.panel)({
           panelType: 'custom'
@@ -120,13 +120,27 @@ describe('getToolbarItems', function () {
           editorView = _createEditor2.editorView;
 
       var toolbarItems = (0, _toolbar.getToolbarItems)(dummyFormatMessage, _schema.default.nodes.panel, true, providerFactory, _adfSchema.PanelType.CUSTOM);
-      var hideEmojiButton = toolbarItems.find(function (item) {
-        return item.type === 'button' && item.id === 'editor.panel.hideEmoji';
+      var removeEmojiButton = toolbarItems.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
       });
       changePanelTypespy.mockClear();
-      hideEmojiButton.onClick(editorView.state);
+      removeEmojiButton.onClick(editorView.state);
       expect(changePanelTypespy).not.toBeCalled();
     });
+    it("should have remove emoji button disabled when focus on panel without emoji", function () {
+      var toolbarItems = (0, _toolbar.getToolbarItems)(dummyFormatMessage, _schema.default.nodes.panel, true, providerFactory, _adfSchema.PanelType.CUSTOM, '#ABF5D1', '');
+      var removeEmojiButton = toolbarItems.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
+      });
+      expect(removeEmojiButton.disabled).toBe(true);
+    });
+    it("should have remove emoji button enabled when focus on panel with emoji", function () {
+      var toolbarItems = (0, _toolbar.getToolbarItems)(dummyFormatMessage, _schema.default.nodes.panel, true, providerFactory, _adfSchema.PanelType.CUSTOM, '#ABF5D1', ':smiley:');
+      var removeEmojiButton = toolbarItems.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
+      });
+      expect(removeEmojiButton.disabled).toBe(false);
+    });
   });
   describe('analytics for custom panels', function () {
     var createEditor = (0, _createProsemirrorEditor.createProsemirrorEditorFactory)();
@@ -189,14 +203,14 @@ describe('getToolbarItems', function () {
       expect(createAnalyticsEvent).toHaveBeenCalledWith(payload);
     });
     it('Should trigger analytics when Icon is removed', function () {
-      var hideEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
-        return item.type === 'button' && item.id === 'editor.panel.hideEmoji';
+      var removeEmojiButton = itemsWithCustomPanelEnabled.find(function (item) {
+        return item.type === 'button' && item.id === 'editor.panel.removeEmoji';
       });
       var emojiPickerConfig = itemsWithCustomPanelEnabled.find(function (item) {
         return item.type === 'select' && item.selectType === 'emoji';
       });
       emojiPickerConfig.onChange(':smiley:')(editorView.state, editorView.dispatch);
-      hideEmojiButton.onClick(editorView.state, editorView.dispatch);
+      removeEmojiButton.onClick(editorView.state, editorView.dispatch);
       var payload = {
         action: _analytics.ACTION.REMOVE_ICON,
         actionSubject: _analytics.ACTION_SUBJECT.PANEL,

package/dist/cjs/plugins/paste/handlers.js

@@ -117,8 +117,8 @@ function handlePasteIntoTaskAndDecision(slice) {
 
     if (selection instanceof _prosemirrorState.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || textFormattingState.codeActive) // for codeMarks let's make sure mark is active
     ) {
-        filters.push((0, _util.applyTextMarksToSlice)(schema, selection.$head.marks()));
-      }
+      filters.push((0, _util.applyTextMarksToSlice)(schema, selection.$head.marks()));
+    }
 
     var transformedSlice = _utils.compose.apply(null, filters)(slice);
 

package/dist/cjs/plugins/selection/gap-cursor/actions.js

@@ -116,8 +116,7 @@ var arrow = function arrow(dir, endOfTextblock) {
 
 
     if (selection instanceof _selection.GapCursorSelection && // next node allow gap cursor position
-    (0, _isValidTargetNode.isValidTargetNode)((0, _direction.isBackward)(dir) ? $pos.nodeBefore : $pos.nodeAfter) && ( // gap cursor changes block node
-    (0, _direction.isBackward)(dir) && selection.side === _selection.Side.LEFT || (0, _direction.isForward)(dir) && selection.side === _selection.Side.RIGHT)) {
+    (0, _isValidTargetNode.isValidTargetNode)((0, _direction.isBackward)(dir) ? $pos.nodeBefore : $pos.nodeAfter) && ((0, _direction.isBackward)(dir) && selection.side === _selection.Side.LEFT || (0, _direction.isForward)(dir) && selection.side === _selection.Side.RIGHT)) {
       // reverse cursor position
       if (dispatch) {
         dispatch(tr.setSelection(new _selection.GapCursorSelection($pos, selection.side === _selection.Side.RIGHT ? _selection.Side.LEFT : _selection.Side.RIGHT)).scrollIntoView());
@@ -291,12 +290,12 @@ var setSelectionTopLevelBlocks = function setSelectionTopLevelBlocks(tr, event,
   } // try to set text selection if the editor isnt focused
   // if the editor is focused, we are most likely dragging a selection outside.
   else if (editorFocused === false) {
-      var selectionTemp = _prosemirrorState.Selection.findFrom($pos, cursorCoords.side === _selection.Side.LEFT ? 1 : -1, true);
+    var selectionTemp = _prosemirrorState.Selection.findFrom($pos, cursorCoords.side === _selection.Side.LEFT ? 1 : -1, true);
 
-      if (selectionTemp) {
-        tr.setSelection(selectionTemp);
-      }
+    if (selectionTemp) {
+      tr.setSelection(selectionTemp);
     }
+  }
 };
 
 exports.setSelectionTopLevelBlocks = setSelectionTopLevelBlocks;

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

@@ -43,9 +43,7 @@ var createPlugin = function createPlugin(dispatch, dispatchAnalyticsEvent) {
             return;
           }
 
-          var analyticsPayload = (0, _utils.getNodeSelectionAnalyticsPayload)(state.selection) || (0, _utils.getAllSelectionAnalyticsPayload)(state.selection) || // We handle all range/cell selections except click and drag here, which is
-          // handled in mouseup handler below
-          !editorView.mouseDown && ((0, _utils.getRangeSelectionAnalyticsPayload)(state.selection, state.doc) || (0, _utils.getCellSelectionAnalyticsPayload)(state)); // We have to use dispatchAnalyticsEvent over any of the analytics plugin helpers
+          var analyticsPayload = (0, _utils.getNodeSelectionAnalyticsPayload)(state.selection) || (0, _utils.getAllSelectionAnalyticsPayload)(state.selection) || !editorView.mouseDown && ((0, _utils.getRangeSelectionAnalyticsPayload)(state.selection, state.doc) || (0, _utils.getCellSelectionAnalyticsPayload)(state)); // We have to use dispatchAnalyticsEvent over any of the analytics plugin helpers
           // as there were several issues caused by the fact that adding analytics through
           // the plugin adds a new step to the transaction
           // This causes prosemirror to run through some different code paths, eg. attempting