@atlaskit/editor-core 188.7.5 → 188.8.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 188.8.0
+
+### Minor Changes
+
+- [#41459](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41459) [`9874d0f70b0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/9874d0f70b0) - [ED-20003] TypeAhead extraction: Replace the mobile view-subscription with proper API
+
+### Patch Changes
+
+- Updated dependencies
+
+## 188.7.6
+
+### Patch Changes
+
+- [#41438](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41438) [`b8d36b142ca`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b8d36b142ca) - Make insertDate and deleteDate an Editor Command
+
 ## 188.7.5
 
 ### Patch Changes

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

@@ -3,14 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setDatePickerAt = exports.openDatePicker = exports.insertDate = exports.focusDateInput = exports.deleteDate = exports.createDate = exports.closeDatePickerWithAnalytics = exports.closeDatePicker = void 0;
+exports.setDatePickerAt = exports.openDatePicker = exports.focusDateInput = exports.createDate = exports.closeDatePickerWithAnalytics = exports.closeDatePicker = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-common/utils");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _internal = require("./utils/internal");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var createDate = exports.createDate = function createDate(isQuickInsertAction) {
   return function (insert, state) {
     var dateNode = state.schema.nodes.date.createChecked({
@@ -31,25 +30,6 @@ var createDate = exports.createDate = function createDate(isQuickInsertAction) {
   };
 };
 
-/** Delete the date and close the datepicker */
-var deleteDate = exports.deleteDate = function deleteDate() {
-  return function (state, dispatch) {
-    var pluginState = _pluginKey.pluginKey.getState(state);
-    if (!pluginState || pluginState.showDatePickerAt === null) {
-      return false;
-    }
-    var showDatePickerAt = pluginState.showDatePickerAt;
-    var tr = state.tr.delete(showDatePickerAt, showDatePickerAt + 1).setMeta(_pluginKey.pluginKey, {
-      showDatePickerAt: null,
-      isNew: false
-    });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  };
-};
-
 /** Focus input */
 var focusDateInput = exports.focusDateInput = function focusDateInput() {
   return function (state, dispatch) {
@@ -67,92 +47,6 @@ var focusDateInput = exports.focusDateInput = function focusDateInput() {
     return true;
   };
 };
-var insertDate = exports.insertDate = function insertDate(date, inputMethod, commitMethod) {
-  var enterPressed = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  var pluginInjectionApi = arguments.length > 4 ? arguments[4] : undefined;
-  return function (state, dispatch) {
-    var schema = state.schema;
-    var timestamp;
-    if (date) {
-      timestamp = Date.UTC(date.year, date.month - 1, date.day).toString();
-    } else {
-      timestamp = (0, _utils.todayTimestampInUTC)();
-    }
-    var tr = state.tr;
-    if (inputMethod) {
-      var _pluginInjectionApi$a;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 || (_pluginInjectionApi$a = _pluginInjectionApi$a.actions) === null || _pluginInjectionApi$a === void 0 || _pluginInjectionApi$a.attachAnalyticsEvent({
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.DATE,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          inputMethod: inputMethod
-        }
-      })(tr);
-    }
-    if (commitMethod) {
-      var _pluginInjectionApi$a2;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 || (_pluginInjectionApi$a2 = _pluginInjectionApi$a2.actions) === null || _pluginInjectionApi$a2 === void 0 || _pluginInjectionApi$a2.attachAnalyticsEvent({
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        action: _analytics.ACTION.COMMITTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DATE,
-        attributes: {
-          commitMethod: commitMethod,
-          isValid: date !== undefined,
-          isToday: (0, _internal.isToday)(date)
-        }
-      })(tr);
-    }
-    var _ref = _pluginKey.pluginKey.getState(state) || {},
-      showDatePickerAt = _ref.showDatePickerAt;
-    if (!showDatePickerAt) {
-      var dateNode = schema.nodes.date.createChecked({
-        timestamp: timestamp
-      });
-      var textNode = state.schema.text(' ');
-      var fragment = _model.Fragment.fromArray([dateNode, textNode]);
-      var _state$selection = state.selection,
-        from = _state$selection.from,
-        to = _state$selection.to;
-      var insertable = (0, _utils2.canInsert)(tr.selection.$from, fragment);
-      if (!insertable) {
-        var parentSelection = _state.NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
-        tr.insert(parentSelection.to, fragment).setSelection(_state.NodeSelection.create(tr.doc, parentSelection.to + 1));
-      } else {
-        tr.replaceWith(from, to, fragment).setSelection(_state.NodeSelection.create(tr.doc, from));
-      }
-      if (dispatch) {
-        dispatch(tr.scrollIntoView().setMeta(_pluginKey.pluginKey, {
-          isNew: true
-        }));
-      }
-      return true;
-    }
-    if (state.doc.nodeAt(showDatePickerAt)) {
-      if (enterPressed) {
-        // Setting selection to outside the date node causes showDatePickerAt
-        // to be set to null by the PM plugin (onSelectionChanged), which will
-        // immediately close the datepicker once a valid date is typed in.
-        // Adding this check forces it to stay open until the user presses Enter.
-        tr = tr.setSelection(_state.Selection.near(tr.doc.resolve(showDatePickerAt + 2)));
-      }
-      tr = tr.setNodeMarkup(showDatePickerAt, schema.nodes.date, {
-        timestamp: timestamp
-      }).setMeta(_pluginKey.pluginKey, {
-        isNew: false
-      }).scrollIntoView();
-      if (!enterPressed) {
-        tr = tr.setSelection(_state.NodeSelection.create(tr.doc, showDatePickerAt));
-      }
-      if (dispatch) {
-        dispatch(tr);
-      }
-      return true;
-    }
-    return false;
-  };
-};
 var setDatePickerAt = exports.setDatePickerAt = function setDatePickerAt(showDatePickerAt) {
   return function (state, dispatch) {
     dispatch(state.tr.setMeta(_pluginKey.pluginKey, {
@@ -163,8 +57,8 @@ var setDatePickerAt = exports.setDatePickerAt = function setDatePickerAt(showDat
 };
 var closeDatePicker = exports.closeDatePicker = function closeDatePicker() {
   return function (state, dispatch) {
-    var _ref2 = _pluginKey.pluginKey.getState(state) || {},
-      showDatePickerAt = _ref2.showDatePickerAt;
+    var _ref = _pluginKey.pluginKey.getState(state) || {},
+      showDatePickerAt = _ref.showDatePickerAt;
     if (!dispatch) {
       return false;
     }
@@ -178,11 +72,11 @@ var closeDatePicker = exports.closeDatePicker = function closeDatePicker() {
     return false;
   };
 };
-var closeDatePickerWithAnalytics = exports.closeDatePickerWithAnalytics = function closeDatePickerWithAnalytics(_ref3) {
-  var _pluginInjectionApi$a3;
-  var date = _ref3.date,
-    pluginInjectionApi = _ref3.pluginInjectionApi;
-  pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 || (_pluginInjectionApi$a3 = _pluginInjectionApi$a3.actions) === null || _pluginInjectionApi$a3 === void 0 || _pluginInjectionApi$a3.attachAnalyticsEvent({
+var closeDatePickerWithAnalytics = exports.closeDatePickerWithAnalytics = function closeDatePickerWithAnalytics(_ref2) {
+  var _pluginInjectionApi$a;
+  var date = _ref2.date,
+    pluginInjectionApi = _ref2.pluginInjectionApi;
+  pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 || (_pluginInjectionApi$a = _pluginInjectionApi$a.actions) === null || _pluginInjectionApi$a === void 0 || _pluginInjectionApi$a.attachAnalyticsEvent({
     eventType: _analytics.EVENT_TYPE.TRACK,
     action: _analytics.ACTION.COMMITTED,
     actionSubject: _analytics.ACTION_SUBJECT.DATE,

package/dist/cjs/plugins/date/commands.js

@@ -0,0 +1,118 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.insertDateCommand = exports.deleteDateCommand = void 0;
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
+var _pluginKey = require("./pm-plugins/plugin-key");
+var _internal = require("./utils/internal");
+/** Delete the date and close the datepicker */
+var deleteDateCommand = exports.deleteDateCommand = function deleteDateCommand(pluginInjectionApi) {
+  return function (_ref) {
+    var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+    var tr = _ref.tr;
+    var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.date) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.sharedState.currentState()) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
+      showDatePickerAt = _ref2.showDatePickerAt;
+    if (!showDatePickerAt) {
+      return tr;
+    }
+    tr.delete(showDatePickerAt, showDatePickerAt + 1).setMeta(_pluginKey.pluginKey, {
+      showDatePickerAt: null,
+      isNew: false
+    });
+    return tr;
+  };
+};
+var insertDateCommand = exports.insertDateCommand = function insertDateCommand(pluginInjectionApi) {
+  return function (_ref3) {
+    var date = _ref3.date,
+      inputMethod = _ref3.inputMethod,
+      commitMethod = _ref3.commitMethod,
+      _ref3$enterPressed = _ref3.enterPressed,
+      enterPressed = _ref3$enterPressed === void 0 ? true : _ref3$enterPressed;
+    return function (_ref4) {
+      var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+      var tr = _ref4.tr;
+      var schema = tr.doc.type.schema;
+      var timestamp;
+      if (date) {
+        timestamp = Date.UTC(date.year, date.month - 1, date.day).toString();
+      } else {
+        timestamp = (0, _utils2.todayTimestampInUTC)();
+      }
+      if (inputMethod) {
+        var _pluginInjectionApi$a;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 || (_pluginInjectionApi$a = _pluginInjectionApi$a.actions) === null || _pluginInjectionApi$a === void 0 || _pluginInjectionApi$a.attachAnalyticsEvent({
+          action: _analytics.ACTION.INSERTED,
+          actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.DATE,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            inputMethod: inputMethod
+          }
+        })(tr);
+      }
+      if (commitMethod) {
+        var _pluginInjectionApi$a2;
+        pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 || (_pluginInjectionApi$a2 = _pluginInjectionApi$a2.actions) === null || _pluginInjectionApi$a2 === void 0 || _pluginInjectionApi$a2.attachAnalyticsEvent({
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          action: _analytics.ACTION.COMMITTED,
+          actionSubject: _analytics.ACTION_SUBJECT.DATE,
+          attributes: {
+            commitMethod: commitMethod,
+            isValid: date !== undefined,
+            isToday: (0, _internal.isToday)(date)
+          }
+        })(tr);
+      }
+      var _ref5 = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d4 = pluginInjectionApi.date) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.sharedState.currentState()) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {},
+        showDatePickerAt = _ref5.showDatePickerAt;
+      if (!showDatePickerAt) {
+        var dateNode = schema.nodes.date.createChecked({
+          timestamp: timestamp
+        });
+        var textNode = schema.text(' ');
+        var fragment = _model.Fragment.fromArray([dateNode, textNode]);
+        var _tr$selection = tr.selection,
+          from = _tr$selection.from,
+          to = _tr$selection.to;
+        var insertable = (0, _utils.canInsert)(tr.selection.$from, fragment);
+        if (!insertable) {
+          var parentSelection = _state.NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+          tr.insert(parentSelection.to, fragment).setSelection(_state.NodeSelection.create(tr.doc, parentSelection.to + 1));
+        } else {
+          tr.replaceWith(from, to, fragment).setSelection(_state.NodeSelection.create(tr.doc, from));
+        }
+        if (tr.docChanged) {
+          tr.scrollIntoView().setMeta(_pluginKey.pluginKey, {
+            isNew: true
+          });
+        }
+        return tr;
+      }
+      if (tr.doc.nodeAt(showDatePickerAt)) {
+        if (enterPressed) {
+          // Setting selection to outside the date node causes showDatePickerAt
+          // to be set to null by the PM plugin (onSelectionChanged), which will
+          // immediately close the datepicker once a valid date is typed in.
+          // Adding this check forces it to stay open until the user presses Enter.
+          tr = tr.setSelection(_state.Selection.near(tr.doc.resolve(showDatePickerAt + 2)));
+        }
+        tr = tr.setNodeMarkup(showDatePickerAt, schema.nodes.date, {
+          timestamp: timestamp
+        }).setMeta(_pluginKey.pluginKey, {
+          isNew: false
+        }).scrollIntoView();
+        if (!enterPressed) {
+          tr = tr.setSelection(_state.NodeSelection.create(tr.doc, showDatePickerAt));
+        }
+      }
+      return tr;
+    };
+  };
+};

package/dist/cjs/plugins/date/plugin.js

@@ -11,6 +11,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _actions = require("./actions");
+var _commands = require("./commands");
 var _main = _interopRequireDefault(require("./pm-plugins/main"));
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
@@ -61,20 +62,25 @@ function ContentComponent(_ref) {
     isNew: isNew,
     autoFocus: focusDateInput,
     onDelete: function onDelete() {
-      (0, _actions.deleteDate)()(editorView.state, dispatch);
+      dependencyApi === null || dependencyApi === void 0 || dependencyApi.core.actions.execute((0, _commands.deleteDateCommand)(dependencyApi));
       editorView.focus();
-      return;
     },
     onSelect: function onSelect(date, commitMethod) {
       // Undefined means couldn't parse date, null means invalid (out of bounds) date
       if (date === undefined || date === null) {
         return;
       }
-      (0, _actions.insertDate)(date, undefined, commitMethod)(editorView.state, dispatch);
+      dependencyApi === null || dependencyApi === void 0 || dependencyApi.core.actions.execute((0, _commands.insertDateCommand)(dependencyApi)({
+        date: date,
+        commitMethod: commitMethod
+      }));
       editorView.focus();
     },
     onTextChanged: function onTextChanged(date) {
-      (0, _actions.insertDate)(date, undefined, undefined, false)(editorView.state, dispatch);
+      dependencyApi === null || dependencyApi === void 0 || dependencyApi.core.actions.execute((0, _commands.insertDateCommand)(dependencyApi)({
+        date: date,
+        enterPressed: false
+      }));
     },
     closeDatePicker: function closeDatePicker() {
       (0, _actions.closeDatePicker)()(editorView.state, dispatch);
@@ -115,9 +121,9 @@ var datePlugin = function datePlugin(_ref3) {
         focusDateInput: !!focusDateInput
       };
     },
-    actions: {
-      insertDate: _actions.insertDate,
-      deleteDate: _actions.deleteDate
+    commands: {
+      insertDate: (0, _commands.insertDateCommand)(api),
+      deleteDate: (0, _commands.deleteDateCommand)(api)
     },
     nodes: function nodes() {
       return [{

package/dist/cjs/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -202,11 +202,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       })(state, dispatch)) !== null && _pluginInjectionApi$t !== void 0 ? _pluginInjectionApi$t : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createDate", function (inputMethod) {
-      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
-      var _this$props3 = _this.props,
-        pluginInjectionApi = _this$props3.pluginInjectionApi,
-        editorView = _this$props3.editorView;
-      return (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.date) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.insertDate(undefined, inputMethod)(editorView.state, editorView.dispatch)) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : false;
+      var _pluginInjectionApi$d;
+      var pluginInjectionApi = _this.props.pluginInjectionApi;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d = pluginInjectionApi.date) === null || _pluginInjectionApi$d === void 0 || (_pluginInjectionApi$d = _pluginInjectionApi$d.commands) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.insertDate({
+        inputMethod: inputMethod
+      }));
+      return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createPlaceholderText", function () {
       var editorView = _this.props.editorView;
@@ -220,15 +221,15 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createStatus", function (inputMethod) {
       var _pluginInjectionApi$s, _pluginInjectionApi$s2;
-      var _this$props4 = _this.props,
-        pluginInjectionApi = _this$props4.pluginInjectionApi,
-        editorView = _this$props4.editorView;
+      var _this$props3 = _this.props,
+        pluginInjectionApi = _this$props3.pluginInjectionApi,
+        editorView = _this$props3.editorView;
       return (_pluginInjectionApi$s = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$s2 = pluginInjectionApi.status) === null || _pluginInjectionApi$s2 === void 0 || (_pluginInjectionApi$s2 = _pluginInjectionApi$s2.actions) === null || _pluginInjectionApi$s2 === void 0 ? void 0 : _pluginInjectionApi$s2.updateStatus(inputMethod)(editorView.state, editorView.dispatch)) !== null && _pluginInjectionApi$s !== void 0 ? _pluginInjectionApi$s : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "openMediaPicker", function (inputMethod) {
-      var _this$props5 = _this.props,
-        onShowMediaPicker = _this$props5.onShowMediaPicker,
-        dispatchAnalyticsEvent = _this$props5.dispatchAnalyticsEvent;
+      var _this$props4 = _this.props,
+        onShowMediaPicker = _this$props4.onShowMediaPicker,
+        dispatchAnalyticsEvent = _this$props4.dispatchAnalyticsEvent;
       if (onShowMediaPicker) {
         onShowMediaPicker();
         if (dispatchAnalyticsEvent) {
@@ -256,11 +257,11 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertHorizontalRule", function (inputMethod) {
       var _pluginInjectionApi$r, _pluginInjectionApi$r2;
-      var _this$props6 = _this.props,
-        _this$props6$editorVi = _this$props6.editorView,
-        state = _this$props6$editorVi.state,
-        dispatch = _this$props6$editorVi.dispatch,
-        pluginInjectionApi = _this$props6.pluginInjectionApi;
+      var _this$props5 = _this.props,
+        _this$props5$editorVi = _this$props5.editorView,
+        state = _this$props5$editorVi.state,
+        dispatch = _this$props5$editorVi.dispatch,
+        pluginInjectionApi = _this$props5.pluginInjectionApi;
       return (_pluginInjectionApi$r = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$r2 = pluginInjectionApi.rule) === null || _pluginInjectionApi$r2 === void 0 ? void 0 : _pluginInjectionApi$r2.actions.insertHorizontalRule(inputMethod)(state, dispatch)) !== null && _pluginInjectionApi$r !== void 0 ? _pluginInjectionApi$r : false;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertExpand", function () {
@@ -271,9 +272,9 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "insertBlockType", function (itemName) {
       return function () {
-        var _this$props7 = _this.props,
-          editorView = _this$props7.editorView,
-          onInsertBlockType = _this$props7.onInsertBlockType;
+        var _this$props6 = _this.props,
+          editorView = _this$props6.editorView,
+          onInsertBlockType = _this$props6.onInsertBlockType;
         var state = editorView.state,
           dispatch = editorView.dispatch;
         onInsertBlockType(itemName)(state, dispatch);
@@ -296,11 +297,11 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onItemActivated", function (_ref2) {
       var item = _ref2.item,
         inputMethod = _ref2.inputMethod;
-      var _this$props8 = _this.props,
-        editorView = _this$props8.editorView,
-        editorActions = _this$props8.editorActions,
-        handleImageUpload = _this$props8.handleImageUpload,
-        expandEnabled = _this$props8.expandEnabled;
+      var _this$props7 = _this.props,
+        editorView = _this$props7.editorView,
+        editorActions = _this$props7.editorActions,
+        handleImageUpload = _this$props7.handleImageUpload,
+        expandEnabled = _this$props7.expandEnabled;
 
       // need to do this before inserting nodes so scrollIntoView works properly
       if (!editorView.hasFocus()) {
@@ -416,12 +417,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     key: "renderPopup",
     value: function renderPopup() {
       var emojiPickerOpen = this.state.emojiPickerOpen;
-      var _this$props9 = this.props,
-        popupsMountPoint = _this$props9.popupsMountPoint,
-        popupsBoundariesElement = _this$props9.popupsBoundariesElement,
-        popupsScrollableElement = _this$props9.popupsScrollableElement,
-        emojiProvider = _this$props9.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props9.replacePlusMenuWithElementBrowser;
+      var _this$props8 = this.props,
+        popupsMountPoint = _this$props8.popupsMountPoint,
+        popupsBoundariesElement = _this$props8.popupsBoundariesElement,
+        popupsScrollableElement = _this$props8.popupsScrollableElement,
+        emojiProvider = _this$props8.emojiProvider,
+        replacePlusMenuWithElementBrowser = _this$props8.replacePlusMenuWithElementBrowser;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref4) {
         var name = _ref4.value.name;
         return name === 'emoji';
@@ -458,9 +459,9 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         buttons = _this$state.buttons,
         dropdownItems = _this$state.dropdownItems,
         emojiPickerOpen = _this$state.emojiPickerOpen;
-      var _this$props10 = this.props,
-        isDisabled = _this$props10.isDisabled,
-        isReducedSpacing = _this$props10.isReducedSpacing;
+      var _this$props9 = this.props,
+        isDisabled = _this$props9.isDisabled,
+        isReducedSpacing = _this$props9.isReducedSpacing;
       if (buttons.length === 0 && dropdownItems.length === 0) {
         return null;
       }