@atlaskit/editor-core 185.8.0 → 185.8.3

package/dist/esm/plugins/selection/pm-plugins/gap-cursor-main.js

@@ -81,12 +81,12 @@ var plugin = new SafePlugin({
     createSelectionBetween: function createSelectionBetween(view, $anchor, $head) {
       if (view && view.state && view.state.selection instanceof CellSelection) {
         // Do not show GapCursor when there is a CellSection happening
-        return;
+        return null;
       }
       if ($anchor.pos === $head.pos && GapCursorSelection.valid($head)) {
         return new GapCursorSelection($head);
       }
-      return;
+      return null;
     },
     // there's no space between top level nodes and the wrapping ProseMirror contenteditable area and handleClick won't capture clicks, there's nothing to click on
     // it handles only attempts to set gap cursor for nested nodes, where we have space between parent and child nodes

package/dist/esm/plugins/status/actions.js

@@ -37,8 +37,8 @@ export var updateStatus = function updateStatus(status) {
     }) : status;
     var statusProps = _objectSpread(_objectSpread({}, DEFAULT_STATUS), selectedStatus);
     var tr = state.tr;
-    var _pluginKey$getState = pluginKey.getState(state),
-      showStatusPickerAt = _pluginKey$getState.showStatusPickerAt;
+    var _ref = pluginKey.getState(state) || {},
+      showStatusPickerAt = _ref.showStatusPickerAt;
     if (!showStatusPickerAt) {
       // Same behaviour as quick insert (used in createStatus)
       var statusNode = schema.nodes.status.createChecked(statusProps);
@@ -105,8 +105,8 @@ export var commitStatusPicker = function commitStatusPicker() {
   return function (editorView) {
     var state = editorView.state,
       dispatch = editorView.dispatch;
-    var _pluginKey$getState2 = pluginKey.getState(state),
-      showStatusPickerAt = _pluginKey$getState2.showStatusPickerAt;
+    var _ref2 = pluginKey.getState(state) || {},
+      showStatusPickerAt = _ref2.showStatusPickerAt;
     if (!showStatusPickerAt) {
       return;
     }

package/dist/esm/plugins/status/plugin.js

@@ -61,9 +61,9 @@ var createPlugin = function createPlugin(pmPluginFactoryParams, options) {
     filterTransaction: function filterTransaction(tr, state) {
       // if it is a selection change transaction, and selection changes from node to text
       if (tr.selectionSet && !tr.steps.length && tr.isGeneric && tr.selection instanceof TextSelection && state.selection instanceof NodeSelection) {
-        var _pluginKey$getState = pluginKey.getState(state),
-          isNew = _pluginKey$getState.isNew,
-          showStatusPickerAt = _pluginKey$getState.showStatusPickerAt;
+        var _ref = pluginKey.getState(state) || {},
+          isNew = _ref.isNew,
+          showStatusPickerAt = _ref.showStatusPickerAt;
         var nodeAtSelection = tr.doc.nodeAt(tr.selection.from);
         // prevent changing node selection to text selection on dom change right after inserting status
         // if newly selected status is selected with status picker opened

package/dist/esm/plugins/submit-editor/index.js

@@ -13,6 +13,9 @@ export function createPlugin(eventDispatch, onSave) {
     if (mediaState && mediaState.waitForMediaUpload && !mediaState.allUploadsFinished) {
       return true;
     }
+    if (!editorView) {
+      return false;
+    }
     eventDispatch(analyticsEventKey, analyticsPayload(state));
     onSave(editorView);
     return true;

package/dist/esm/plugins/text-color/commands/change-color.js

@@ -39,11 +39,11 @@ export var changeColor = function changeColor(color) {
     if (textColor) {
       var pluginState = pluginKey.getState(state);
       var activeColor = getActiveColor(state);
-      var withColorAnalytics = createWithColorAnalytics(color, activeColor, pluginState.palette);
-      if (pluginState.disabled) {
+      var withColorAnalytics = createWithColorAnalytics(color, activeColor, (pluginState === null || pluginState === void 0 ? void 0 : pluginState.palette) || []);
+      if (pluginState !== null && pluginState !== void 0 && pluginState.disabled) {
         return false;
       }
-      if (color === pluginState.defaultColor) {
+      if (color === (pluginState === null || pluginState === void 0 ? void 0 : pluginState.defaultColor)) {
         withColorAnalytics(removeColor())(state, dispatch);
         return true;
       }

package/dist/esm/plugins/text-formatting/commands/transform-to-code.js

@@ -34,7 +34,7 @@ var isNodeTextBlock = function isNodeTextBlock(schema) {
     emoji = _schema$nodes.emoji;
   return function (node, _, parent) {
     if (node.type === mention || node.type === emoji || node.type === text) {
-      return parent.isTextblock;
+      return parent === null || parent === void 0 ? void 0 : parent.isTextblock;
     }
     return;
   };

package/dist/esm/plugins/text-formatting/pm-plugins/input-rule.js

@@ -69,7 +69,7 @@ function addMark(markType, schema, char) {
     doc.nodesBetween(start, end, function (node) {
       if (node.type === schema.nodes.hardBreak) {
         containsHardBreak = true;
-        return null;
+        return false;
       }
       return !containsHardBreak;
     });

package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -164,7 +164,10 @@ var buildSubscriptIcon = buildIcon(IconTypes.subscript);
 var buildSuperscriptIcon = buildIcon(IconTypes.superscript);
 var useTextFormattingPluginState = function useTextFormattingPluginState(editorState) {
   return useMemo(function () {
-    return textFormattingPluginKey.getState(editorState);
+    var pluginState = textFormattingPluginKey.getState(editorState);
+
+    // TODO: ED-13910 for reasons that goes beyond my knowledge. This is the only way to make the current unit tests happy. Even thought this was wrong before
+    return pluginState;
   }, [editorState]);
 };
 export var useFormattingIcons = function useFormattingIcons(_ref4) {

package/dist/esm/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -16,7 +16,8 @@ export function onItemActivated(_ref) {
       break;
     case 'indent':
       {
-        var node = indentationButtonsPluginKey.getState(editorView.state).node;
+        var _indentationButtonsPl;
+        var node = (_indentationButtonsPl = indentationButtonsPluginKey.getState(editorView.state)) === null || _indentationButtonsPl === void 0 ? void 0 : _indentationButtonsPl.node;
         if (node === 'paragraph_heading') {
           indentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
@@ -30,7 +31,8 @@ export function onItemActivated(_ref) {
       }
     case 'outdent':
       {
-        var _node = indentationButtonsPluginKey.getState(editorView.state).node;
+        var _indentationButtonsPl2;
+        var _node = (_indentationButtonsPl2 = indentationButtonsPluginKey.getState(editorView.state)) === null || _indentationButtonsPl2 === void 0 ? void 0 : _indentationButtonsPl2.node;
         if (_node === 'paragraph_heading') {
           outdentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }

package/dist/esm/plugins/type-ahead/commands/update-query.js

@@ -3,7 +3,7 @@ import { ACTIONS } from '../pm-plugins/actions';
 export var updateQuery = function updateQuery(query) {
   return function (state, dispatch) {
     var pluginState = typeAheadPluginKey.getState(state);
-    if (pluginState.query === query) {
+    if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.query) === query) {
       return false;
     }
     var tr = state.tr;

package/dist/esm/plugins/type-ahead/commands/update-selected-index.js

@@ -3,7 +3,7 @@ import { ACTIONS } from '../pm-plugins/actions';
 export var updateSelectedIndex = function updateSelectedIndex(selectedIndex) {
   return function (state, dispatch) {
     var pluginState = typeAheadPluginKey.getState(state);
-    if (pluginState.selectedIndex === selectedIndex) {
+    if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedIndex) === selectedIndex) {
       return false;
     }
     var tr = state.tr;

package/dist/esm/plugins/type-ahead/pm-plugins/decorations.js

@@ -56,7 +56,7 @@ export var factoryDecorations = function factoryDecorations(_ref) {
         }
         var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
         var currentQuery = getTypeAheadQuery(editorView.state);
-        if (hasReopenQuery || currentQuery.length === 0) {
+        if (hasReopenQuery || (currentQuery === null || currentQuery === void 0 ? void 0 : currentQuery.length) === 0) {
           var command = inputType === 'historyUndo' ? undo : redo;
           var _tr = editorView.state.tr;
           var fakeDispatch = function fakeDispatch(customTr) {

package/dist/esm/plugins/type-ahead/ui/InputQuery.js

@@ -94,8 +94,8 @@ export var InputQuery = /*#__PURE__*/React.memo(function (_ref) {
     var raw = ((_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.textContent) || '';
     var text = cleanedInputContent();
     var stopDefault = false;
-    var _getPluginState = getPluginState(editorView.state),
-      selectedIndex = _getPluginState.selectedIndex;
+    var _ref2 = getPluginState(editorView.state) || {},
+      selectedIndex = _ref2.selectedIndex;
     setInFocus(true);
     switch (key) {
       case ' ':

package/dist/esm/plugins/type-ahead/ui/WrapperTypeAhead.js

@@ -69,8 +69,8 @@ export var WrapperTypeAhead = /*#__PURE__*/React.memo(function (_ref) {
   var insertSelectedItem = useCallback(function () {
     var mode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : SelectItemMode.SELECTED;
     var view = editorViewRef.current;
-    var _getPluginState = getPluginState(view.state),
-      selectedIndex = _getPluginState.selectedIndex;
+    var _ref3 = getPluginState(view.state),
+      selectedIndex = _ref3.selectedIndex;
     setClosed(true);
     queueMicrotask(function () {
       onItemInsert({
@@ -87,7 +87,7 @@ export var WrapperTypeAhead = /*#__PURE__*/React.memo(function (_ref) {
   useEffect(function () {
     var view = editorViewRef.current;
     var pluginState = getPluginState(view.state);
-    if (query.length === 0 || query === pluginState.query || !pluginState.triggerHandler) {
+    if (query.length === 0 || query === (pluginState === null || pluginState === void 0 ? void 0 : pluginState.query) || !(pluginState !== null && pluginState !== void 0 && pluginState.triggerHandler)) {
       return;
     }
     updateQuery(query)(view.state, view.dispatch);

package/dist/esm/plugins/type-ahead/utils.js

@@ -10,16 +10,18 @@ export var isTypeAheadHandler = function isTypeAheadHandler(handler) {
 /** Is a typeahead plugin open? */
 export var isTypeAheadOpen = function isTypeAheadOpen(editorState) {
   var _typeAheadPluginKey$g, _typeAheadPluginKey$g2;
-  return (typeAheadPluginKey === null || typeAheadPluginKey === void 0 ? void 0 : (_typeAheadPluginKey$g = typeAheadPluginKey.getState(editorState)) === null || _typeAheadPluginKey$g === void 0 ? void 0 : (_typeAheadPluginKey$g2 = _typeAheadPluginKey$g.decorationSet) === null || _typeAheadPluginKey$g2 === void 0 ? void 0 : _typeAheadPluginKey$g2.find().length) > 0;
+  return !!(typeAheadPluginKey !== null && typeAheadPluginKey !== void 0 && (_typeAheadPluginKey$g = typeAheadPluginKey.getState(editorState)) !== null && _typeAheadPluginKey$g !== void 0 && (_typeAheadPluginKey$g2 = _typeAheadPluginKey$g.decorationSet) !== null && _typeAheadPluginKey$g2 !== void 0 && _typeAheadPluginKey$g2.find().length);
 };
 export var getPluginState = function getPluginState(editorState) {
   return typeAheadPluginKey.getState(editorState);
 };
 export var getTypeAheadHandler = function getTypeAheadHandler(editorState) {
-  return typeAheadPluginKey.getState(editorState).triggerHandler;
+  var _typeAheadPluginKey$g3;
+  return (_typeAheadPluginKey$g3 = typeAheadPluginKey.getState(editorState)) === null || _typeAheadPluginKey$g3 === void 0 ? void 0 : _typeAheadPluginKey$g3.triggerHandler;
 };
 export var getTypeAheadQuery = function getTypeAheadQuery(editorState) {
-  return typeAheadPluginKey.getState(editorState).query;
+  var _typeAheadPluginKey$g4;
+  return (_typeAheadPluginKey$g4 = typeAheadPluginKey.getState(editorState)) === null || _typeAheadPluginKey$g4 === void 0 ? void 0 : _typeAheadPluginKey$g4.query;
 };
 export var isTypeAheadAllowed = function isTypeAheadAllowed(state) {
   var isOpen = isTypeAheadOpen(state);

package/dist/esm/plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates.js

@@ -49,7 +49,7 @@ export var subscribeToToolbarAndPickerUpdates = function subscribeToToolbarAndPi
       if (dateState !== oldDateState || statusState !== oldStatusState ||
       // Sometimes the toolbar changes while a picker is open, we dont care about this
       // EG A nested status or date node in a table
-      !isToolbarEqual && !statusState.showStatusPickerAt && !dateState.showDatePickerAt) {
+      !isToolbarEqual && !(statusState !== null && statusState !== void 0 && statusState.showStatusPickerAt) && !(dateState !== null && dateState !== void 0 && dateState.showDatePickerAt)) {
         shouldCallback = true;
       }
     } else {

package/dist/esm/ui/Appearance/FullPage/FullPage.js

@@ -1,137 +1,90 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
-import React from 'react';
+import React, { useEffect, useState, useRef, useMemo } from 'react';
 import { jsx } from '@emotion/react';
-import rafSchedule from 'raf-schd';
-import { akEditorToolbarKeylineHeight } from '@atlaskit/editor-shared-styles';
 import { fullPageEditorWrapper } from './StyledComponents';
 import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
 import { FullPageContentArea } from './FullPageContentArea';
 import { FullPageToolbar } from './FullPageToolbar';
-export var FullPageEditor = /*#__PURE__*/function (_React$Component) {
-  _inherits(FullPageEditor, _React$Component);
-  var _super = _createSuper(FullPageEditor);
-  function FullPageEditor(props) {
-    var _this;
-    _classCallCheck(this, FullPageEditor);
-    _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "state", {
-      showKeyline: false
-    });
-    _defineProperty(_assertThisInitialized(_this), "scrollContainer", null);
-    // Wrapper container for toolbar and content area
-    _defineProperty(_assertThisInitialized(_this), "wrapperElementRef", /*#__PURE__*/React.createRef());
-    _defineProperty(_assertThisInitialized(_this), "contentAreaRef", function (contentArea) {
-      _this.contentArea = contentArea;
-    });
-    _defineProperty(_assertThisInitialized(_this), "scrollContainerRef", function (ref) {
-      var previousScrollContainer = _this.scrollContainer;
-
-      // remove existing handler
-      if (previousScrollContainer) {
-        previousScrollContainer.removeEventListener('scroll', _this.updateToolbarKeyline);
-      }
-      _this.scrollContainer = ref ? ref : null;
-      if (_this.scrollContainer) {
-        _this.scrollContainer.addEventListener('scroll', _this.updateToolbarKeyline, false);
-        _this.updateToolbarKeyline();
-      }
-    });
-    _defineProperty(_assertThisInitialized(_this), "updateToolbarKeyline", rafSchedule(function () {
-      if (!_this.scrollContainer) {
-        return false;
-      }
-      var scrollTop = _this.scrollContainer.scrollTop;
-      var showKeyline = scrollTop > akEditorToolbarKeylineHeight;
-      if (showKeyline !== _this.state.showKeyline) {
-        _this.setState({
-          showKeyline: showKeyline
-        });
-      }
-      return false;
-    }));
-    _defineProperty(_assertThisInitialized(_this), "handleResize", function () {
-      _this.updateToolbarKeyline();
-    });
-    _this.featureFlags = props.featureFlags;
-    if (props.innerRef) {
-      _this.wrapperElementRef = props.innerRef;
+import { browser } from '@atlaskit/editor-common/utils';
+var useShowKeyline = function useShowKeyline(contentAreaRef) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    showKeyline = _useState2[0],
+    setShowKeyline = _useState2[1];
+  useEffect(function () {
+    var _contentAreaRef$curre;
+    if (!((_contentAreaRef$curre = contentAreaRef.current) !== null && _contentAreaRef$curre !== void 0 && _contentAreaRef$curre.contentArea)) {
+      return;
     }
-    return _this;
-  }
-  _createClass(FullPageEditor, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      window.addEventListener('resize', this.handleResize, false);
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      window.removeEventListener('resize', this.handleResize);
-      this.updateToolbarKeyline.cancel();
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var props = this.props;
-      var showKeyline = this.state.showKeyline;
-      return jsx(ContextPanelWidthProvider, null, jsx("div", {
-        css: fullPageEditorWrapper,
-        className: "akEditor",
-        ref: this.wrapperElementRef
-      }, jsx(FullPageToolbar, {
-        appearance: props.appearance,
-        beforeIcon: props.primaryToolbarIconBefore,
-        collabEdit: props.collabEdit,
-        containerElement: this.scrollContainer,
-        customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
-        disabled: !!props.disabled,
-        dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
-        editorActions: props.editorActions,
-        editorDOMElement: props.editorDOMElement,
-        editorView: props.editorView,
-        eventDispatcher: props.eventDispatcher,
-        hasMinWidth: props.enableToolbarMinWidth,
-        popupsBoundariesElement: props.popupsBoundariesElement,
-        popupsMountPoint: props.popupsMountPoint,
-        popupsScrollableElement: props.popupsScrollableElement,
-        primaryToolbarComponents: props.primaryToolbarComponents,
-        providerFactory: props.providerFactory,
-        showKeyline: showKeyline,
-        featureFlags: this.featureFlags
-      }), jsx(FullPageContentArea, {
-        appearance: props.appearance,
-        contentArea: this.contentArea,
-        contentAreaRef: this.contentAreaRef,
-        contentComponents: props.contentComponents,
-        contextPanel: props.contextPanel,
-        customContentComponents: props.customContentComponents,
-        disabled: props.disabled,
-        dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
-        editorActions: props.editorActions,
-        editorDOMElement: props.editorDOMElement,
-        editorView: props.editorView,
-        eventDispatcher: props.eventDispatcher,
-        popupsBoundariesElement: props.popupsBoundariesElement,
-        popupsMountPoint: props.popupsMountPoint,
-        popupsScrollableElement: props.popupsScrollableElement,
-        providerFactory: props.providerFactory,
-        scrollContainer: this.scrollContainer,
-        scrollContainerRef: this.scrollContainerRef,
-        wrapperElement: this.wrapperElementRef.current,
-        pluginHooks: props.pluginHooks,
-        featureFlags: this.featureFlags
-      })));
-    }
-  }]);
-  return FullPageEditor;
-}(React.Component);
-_defineProperty(FullPageEditor, "displayName", 'FullPageEditor');
+    var intersection = new IntersectionObserver(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 1),
+        entry = _ref2[0];
+      setShowKeyline(!entry.isIntersecting && entry.boundingClientRect.top < entry.intersectionRect.top);
+    }, {
+      root: undefined,
+      // Safari seems to miss events (on fast scroll) sometimes due
+      // to differences in IntersectionObserver behaviour between browsers.
+      // By lowering the threshold a little it gives Safari more
+      // time to catch these events.
+      threshold: browser.safari ? 0.98 : 1
+    });
+    intersection.observe(contentAreaRef.current.contentArea);
+    return function () {
+      intersection.disconnect();
+    };
+  }, [contentAreaRef]);
+  return showKeyline;
+};
+export var FullPageEditor = function FullPageEditor(props) {
+  var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
+  var wrapperElementRef = useMemo(function () {
+    return props.innerRef;
+  }, [props.innerRef]);
+  var scrollContentContainerRef = useRef(null);
+  var showKeyline = useShowKeyline(scrollContentContainerRef);
+  return jsx(ContextPanelWidthProvider, null, jsx("div", {
+    css: fullPageEditorWrapper,
+    className: "akEditor",
+    ref: wrapperElementRef
+  }, jsx(FullPageToolbar, {
+    appearance: props.appearance,
+    beforeIcon: props.primaryToolbarIconBefore,
+    collabEdit: props.collabEdit,
+    containerElement: (_scrollContentContain = (_scrollContentContain2 = scrollContentContainerRef.current) === null || _scrollContentContain2 === void 0 ? void 0 : _scrollContentContain2.scrollContainer) !== null && _scrollContentContain !== void 0 ? _scrollContentContain : null,
+    customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
+    disabled: !!props.disabled,
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
+    editorActions: props.editorActions,
+    editorDOMElement: props.editorDOMElement,
+    editorView: props.editorView,
+    eventDispatcher: props.eventDispatcher,
+    hasMinWidth: props.enableToolbarMinWidth,
+    popupsBoundariesElement: props.popupsBoundariesElement,
+    popupsMountPoint: props.popupsMountPoint,
+    popupsScrollableElement: props.popupsScrollableElement,
+    primaryToolbarComponents: props.primaryToolbarComponents,
+    providerFactory: props.providerFactory,
+    showKeyline: showKeyline,
+    featureFlags: props.featureFlags
+  }), jsx(FullPageContentArea, {
+    ref: scrollContentContainerRef,
+    appearance: props.appearance,
+    contentComponents: props.contentComponents,
+    contextPanel: props.contextPanel,
+    customContentComponents: props.customContentComponents,
+    disabled: props.disabled,
+    dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
+    editorActions: props.editorActions,
+    editorDOMElement: props.editorDOMElement,
+    editorView: props.editorView,
+    eventDispatcher: props.eventDispatcher,
+    popupsBoundariesElement: props.popupsBoundariesElement,
+    popupsMountPoint: props.popupsMountPoint,
+    popupsScrollableElement: props.popupsScrollableElement,
+    providerFactory: props.providerFactory,
+    wrapperElement: (_wrapperElementRef$cu = wrapperElementRef === null || wrapperElementRef === void 0 ? void 0 : wrapperElementRef.current) !== null && _wrapperElementRef$cu !== void 0 ? _wrapperElementRef$cu : null,
+    pluginHooks: props.pluginHooks,
+    featureFlags: props.featureFlags
+  })));
+};

package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js

@@ -2,7 +2,7 @@
 import { jsx, useTheme } from '@emotion/react';
 import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
-import React from 'react';
+import React, { useImperativeHandle, useRef } from 'react';
 import { injectIntl } from 'react-intl-next';
 import { ClickAreaBlock } from '../../Addon';
 import ContextPanel from '../../ContextPanel';
@@ -10,20 +10,33 @@ import PluginSlot from '../../PluginSlot';
 import { contentArea, editorContentAreaStyle, sidebarArea, ScrollContainer, editorContentGutterStyle, positionedOverEditorStyle } from './StyledComponents';
 import messages from './messages';
 export var CONTENT_AREA_TEST_ID = 'ak-editor-fp-content-area';
-var Content = /*#__PURE__*/React.memo(function (props) {
+var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var theme = useTheme();
   var fullWidthMode = props.appearance === 'full-width';
+  var scrollContainerRef = useRef(null);
+  var contentAreaRef = useRef(null);
+  useImperativeHandle(ref, function () {
+    return {
+      get scrollContainer() {
+        return scrollContainerRef.current;
+      },
+      get contentArea() {
+        return contentAreaRef.current;
+      }
+    };
+  }, []);
   return jsx(WidthConsumer, null, function (_ref) {
     var width = _ref.width;
     return jsx(ContextPanelConsumer, null, function (_ref2) {
+      var _contentAreaRef$curre;
       var positionedOverEditor = _ref2.positionedOverEditor;
       return jsx("div", {
         css: [contentArea, positionedOverEditor && positionedOverEditorStyle],
         "data-testid": CONTENT_AREA_TEST_ID
       }, jsx(ScrollContainer, {
-        ref: props.scrollContainerRef,
         className: "fabric-editor-popup-scroll-parent",
-        featureFlags: props.featureFlags
+        featureFlags: props.featureFlags,
+        ref: scrollContainerRef
       }, jsx(ClickAreaBlock, {
         editorView: props.editorView,
         editorDisabled: props.disabled
@@ -35,10 +48,11 @@ var Content = /*#__PURE__*/React.memo(function (props) {
         }),
         role: "region",
         "aria-label": props.intl.formatMessage(messages.editableContentLabel),
-        ref: props.contentAreaRef
+        ref: contentAreaRef
       }, jsx("div", {
         css: editorContentGutterStyle,
-        className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' ')
+        className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' '),
+        ref: contentAreaRef
       }, props.customContentComponents, jsx(PluginSlot, {
         editorView: props.editorView,
         editorActions: props.editorActions,
@@ -47,12 +61,12 @@ var Content = /*#__PURE__*/React.memo(function (props) {
         appearance: props.appearance,
         items: props.contentComponents,
         pluginHooks: props.pluginHooks,
-        contentArea: props.contentArea,
+        contentArea: (_contentAreaRef$curre = contentAreaRef.current) !== null && _contentAreaRef$curre !== void 0 ? _contentAreaRef$curre : undefined,
         popupsMountPoint: props.popupsMountPoint,
         popupsBoundariesElement: props.popupsBoundariesElement,
         popupsScrollableElement: props.popupsScrollableElement,
         disabled: !!props.disabled,
-        containerElement: props.scrollContainer,
+        containerElement: scrollContainerRef.current,
         dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
         wrapperElement: props.wrapperElement
       }), props.editorDOMElement)))), jsx("div", {
@@ -63,4 +77,6 @@ var Content = /*#__PURE__*/React.memo(function (props) {
     });
   });
 });
-export var FullPageContentArea = injectIntl(Content);
+export var FullPageContentArea = injectIntl(Content, {
+  forwardRef: true
+});

package/dist/esm/utils/mark.js

@@ -91,7 +91,7 @@ export var sanitiseMarksInSelection = function sanitiseMarksInSelection(tr, newP
       return true;
     }
     node.marks.forEach(function (mark) {
-      if (!parent.type.allowsMarkType(mark.type) || newParentType && !newParentType.allowsMarkType(mark.type)) {
+      if (!(parent !== null && parent !== void 0 && parent.type.allowsMarkType(mark.type)) || newParentType && !newParentType.allowsMarkType(mark.type)) {
         var filteredMarks = node.marks.filter(function (m) {
           return m.type !== mark.type;
         });

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "185.8.0";
+export var version = "185.8.3";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "185.8.0",
+	"version": "185.8.3",
 	"sideEffects": false
 }

package/dist/types/commands/index.d.ts

@@ -11,7 +11,7 @@ export declare function createParagraphNear(append?: boolean): Command;
 export declare function addParagraphAtEnd(tr: Transaction): void;
 export declare function createParagraphAtEnd(): Command;
 export declare const changeImageAlignment: (align?: AlignmentState) => Command;
-export declare const createToggleBlockMarkOnRange: <T extends {} = object>(markType: MarkType, getAttrs: (prevAttrs?: T | undefined, node?: PMNode) => false | T | undefined, allowedBlocks?: NodeType<any>[] | ((schema: Schema, node: PMNode, parent: PMNode) => boolean) | undefined) => (from: number, to: number, tr: Transaction, state: EditorState) => boolean;
+export declare const createToggleBlockMarkOnRange: <T extends {} = object>(markType: MarkType, getAttrs: (prevAttrs?: T | undefined, node?: PMNode) => false | T | undefined, allowedBlocks?: NodeType[] | ((schema: Schema, node: PMNode, parent: PMNode | null) => boolean) | undefined) => (from: number, to: number, tr: Transaction, state: EditorState) => boolean;
 /**
  * Toggles block mark based on the return type of `getAttrs`.
  * This is similar to ProseMirror's `getAttrs` from `AttributeSpec`
@@ -19,5 +19,5 @@ export declare const createToggleBlockMarkOnRange: <T extends {} = object>(markT
  * return `undefined for no-op.
  * return an `object` to update the mark.
  */
-export declare const toggleBlockMark: <T extends {} = object>(markType: MarkType, getAttrs: (prevAttrs?: T | undefined, node?: PMNode) => false | T | undefined, allowedBlocks?: NodeType<any>[] | ((schema: Schema, node: PMNode, parent: PMNode) => boolean) | undefined) => Command;
+export declare const toggleBlockMark: <T extends {} = object>(markType: MarkType, getAttrs: (prevAttrs?: T | undefined, node?: PMNode) => false | T | undefined, allowedBlocks?: NodeType[] | ((schema: Schema, node: PMNode, parent: PMNode | null) => boolean) | undefined) => Command;
 export declare const clearEditorContent: Command;

package/dist/types/create-editor/ReactEditorViewInternal.d.ts

@@ -85,7 +85,7 @@ export declare class ReactEditorView<T = {}> extends React.Component<EditorViewP
     private countNodes;
     private isTransactionTrackingExplicitlyDisabled;
     constructor(props: EditorViewProps & WrappedComponentProps & T, context: EditorReactContext);
-    getEditorState: () => EditorState<any> | undefined;
+    getEditorState: () => EditorState | undefined;
     UNSAFE_componentWillReceiveProps(nextProps: EditorViewProps): void;
     formatFullWidthAppearance: (appearance: EditorAppearance | undefined) => FULL_WIDTH_MODE;
     resetEditorState: ({ doc, shouldScrollToBottom, }: {
@@ -102,7 +102,7 @@ export declare class ReactEditorView<T = {}> extends React.Component<EditorViewP
     componentWillUnmount(): void;
     private editorPlugins;
     getPlugins(preset: EditorPresetBuilder<string[], AllEditorPresetPluginTypes[]>): EditorPlugin[];
-    createEditorState: (options: CreateEditorStateOptions) => EditorState<any>;
+    createEditorState: (options: CreateEditorStateOptions) => EditorState;
     private onEditorViewStateUpdated;
     private trackValidTransactions;
     private dispatchTransaction;

package/dist/types/extensibility.d.ts

@@ -1,3 +1,5 @@
+/// <reference path="../../../../../typings/prosemirror.d.ts" />
+/// <reference path="../../../../../typings/prosemirror-state.d.ts" />
 export { getChangedNodes } from './utils/document';
 export { validateNodes } from './utils/nodes';
 export { toJSON } from './utils';
@@ -8,7 +10,7 @@ export { ExtensionNode } from './plugins/extension/nodeviews/extension';
  * @deprecated [ED-14688] - used during the table viz project and not used anymore
  * will be removed in a future version of `@atlaskit/editor-core`
  */
-declare const tablePluginKey: import("prosemirror-state").PluginKey<import("@atlaskit/editor-plugin-table/types").TablePluginState, any>;
+declare const tablePluginKey: import("prosemirror-state").PluginKey<import("@atlaskit/editor-plugin-table/types").TablePluginState>;
 export { tablePluginKey };
 export declare const EmitterEvents: {
     TABLE_DELETED: string;