@atlaskit/editor-core 185.8.0 → 185.8.3

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

@@ -174,7 +174,10 @@ var buildSubscriptIcon = buildIcon(_types.IconTypes.subscript);
 var buildSuperscriptIcon = buildIcon(_types.IconTypes.superscript);
 var useTextFormattingPluginState = function useTextFormattingPluginState(editorState) {
   return (0, _react.useMemo)(function () {
-    return _pluginKey.pluginKey.getState(editorState);
+    var pluginState = _pluginKey.pluginKey.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]);
 };
 var useFormattingIcons = function useFormattingIcons(_ref4) {

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

@@ -22,7 +22,8 @@ function onItemActivated(_ref) {
       break;
     case 'indent':
       {
-        var node = _indentationButtons.pluginKey.getState(editorView.state).node;
+        var _indentationButtonsPl;
+        var node = (_indentationButtonsPl = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl === void 0 ? void 0 : _indentationButtonsPl.node;
         if (node === 'paragraph_heading') {
           (0, _commands2.getIndentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
@@ -36,7 +37,8 @@ function onItemActivated(_ref) {
       }
     case 'outdent':
       {
-        var _node = _indentationButtons.pluginKey.getState(editorView.state).node;
+        var _indentationButtonsPl2;
+        var _node = (_indentationButtonsPl2 = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl2 === void 0 ? void 0 : _indentationButtonsPl2.node;
         if (_node === 'paragraph_heading') {
           (0, _commands2.getOutdentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }

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

@@ -9,7 +9,7 @@ var _actions = require("../pm-plugins/actions");
 var updateQuery = function updateQuery(query) {
   return function (state, dispatch) {
     var pluginState = _key.pluginKey.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/cjs/plugins/type-ahead/commands/update-selected-index.js

@@ -9,7 +9,7 @@ var _actions = require("../pm-plugins/actions");
 var updateSelectedIndex = function updateSelectedIndex(selectedIndex) {
   return function (state, dispatch) {
     var pluginState = _key.pluginKey.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/cjs/plugins/type-ahead/pm-plugins/decorations.js

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

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

@@ -104,8 +104,8 @@ var InputQuery = /*#__PURE__*/_react.default.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 = (0, _utils2.getPluginState)(editorView.state),
-      selectedIndex = _getPluginState.selectedIndex;
+    var _ref2 = (0, _utils2.getPluginState)(editorView.state) || {},
+      selectedIndex = _ref2.selectedIndex;
     setInFocus(true);
     switch (key) {
       case ' ':

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

@@ -79,8 +79,8 @@ var WrapperTypeAhead = /*#__PURE__*/_react.default.memo(function (_ref) {
   var insertSelectedItem = (0, _react.useCallback)(function () {
     var mode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _typeAhead.SelectItemMode.SELECTED;
     var view = editorViewRef.current;
-    var _getPluginState = (0, _utils.getPluginState)(view.state),
-      selectedIndex = _getPluginState.selectedIndex;
+    var _ref3 = (0, _utils.getPluginState)(view.state),
+      selectedIndex = _ref3.selectedIndex;
     setClosed(true);
     queueMicrotask(function () {
       onItemInsert({
@@ -97,7 +97,7 @@ var WrapperTypeAhead = /*#__PURE__*/_react.default.memo(function (_ref) {
   (0, _react.useEffect)(function () {
     var view = editorViewRef.current;
     var pluginState = (0, _utils.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;
     }
     (0, _updateQuery.updateQuery)(query)(view.state, view.dispatch);

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

@@ -17,7 +17,7 @@ var isTypeAheadHandler = function isTypeAheadHandler(handler) {
 exports.isTypeAheadHandler = isTypeAheadHandler;
 var isTypeAheadOpen = function isTypeAheadOpen(editorState) {
   var _typeAheadPluginKey$g, _typeAheadPluginKey$g2;
-  return (_key.pluginKey === null || _key.pluginKey === void 0 ? void 0 : (_typeAheadPluginKey$g = _key.pluginKey.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 !!(_key.pluginKey !== null && _key.pluginKey !== void 0 && (_typeAheadPluginKey$g = _key.pluginKey.getState(editorState)) !== null && _typeAheadPluginKey$g !== void 0 && (_typeAheadPluginKey$g2 = _typeAheadPluginKey$g.decorationSet) !== null && _typeAheadPluginKey$g2 !== void 0 && _typeAheadPluginKey$g2.find().length);
 };
 exports.isTypeAheadOpen = isTypeAheadOpen;
 var getPluginState = function getPluginState(editorState) {
@@ -25,11 +25,13 @@ var getPluginState = function getPluginState(editorState) {
 };
 exports.getPluginState = getPluginState;
 var getTypeAheadHandler = function getTypeAheadHandler(editorState) {
-  return _key.pluginKey.getState(editorState).triggerHandler;
+  var _typeAheadPluginKey$g3;
+  return (_typeAheadPluginKey$g3 = _key.pluginKey.getState(editorState)) === null || _typeAheadPluginKey$g3 === void 0 ? void 0 : _typeAheadPluginKey$g3.triggerHandler;
 };
 exports.getTypeAheadHandler = getTypeAheadHandler;
 var getTypeAheadQuery = function getTypeAheadQuery(editorState) {
-  return _key.pluginKey.getState(editorState).query;
+  var _typeAheadPluginKey$g4;
+  return (_typeAheadPluginKey$g4 = _key.pluginKey.getState(editorState)) === null || _typeAheadPluginKey$g4 === void 0 ? void 0 : _typeAheadPluginKey$g4.query;
 };
 exports.getTypeAheadQuery = getTypeAheadQuery;
 var isTypeAheadAllowed = function isTypeAheadAllowed(state) {

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

@@ -55,7 +55,7 @@ var subscribeToToolbarAndPickerUpdates = function subscribeToToolbarAndPickerUpd
       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/cjs/ui/Appearance/FullPage/FullPage.js

@@ -1,144 +1,102 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FullPageEditor = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
-var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _StyledComponents = require("./StyledComponents");
 var _ui = require("@atlaskit/editor-common/ui");
 var _FullPageContentArea = require("./FullPageContentArea");
 var _FullPageToolbar = require("./FullPageToolbar");
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
-var FullPageEditor = /*#__PURE__*/function (_React$Component) {
-  (0, _inherits2.default)(FullPageEditor, _React$Component);
-  var _super = _createSuper(FullPageEditor);
-  function FullPageEditor(props) {
-    var _this;
-    (0, _classCallCheck2.default)(this, FullPageEditor);
-    _this = _super.call(this, props);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
-      showKeyline: false
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scrollContainer", null);
-    // Wrapper container for toolbar and content area
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "wrapperElementRef", /*#__PURE__*/_react.default.createRef());
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "contentAreaRef", function (contentArea) {
-      _this.contentArea = contentArea;
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scrollContainerRef", function (ref) {
-      var previousScrollContainer = _this.scrollContainer;
+var _utils = require("@atlaskit/editor-common/utils");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+/** @jsx jsx */
 
-      // 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();
-      }
-    });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateToolbarKeyline", (0, _rafSchd.default)(function () {
-      if (!_this.scrollContainer) {
-        return false;
-      }
-      var scrollTop = _this.scrollContainer.scrollTop;
-      var showKeyline = scrollTop > _editorSharedStyles.akEditorToolbarKeylineHeight;
-      if (showKeyline !== _this.state.showKeyline) {
-        _this.setState({
-          showKeyline: showKeyline
-        });
-      }
-      return false;
-    }));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleResize", function () {
-      _this.updateToolbarKeyline();
-    });
-    _this.featureFlags = props.featureFlags;
-    if (props.innerRef) {
-      _this.wrapperElementRef = props.innerRef;
+var useShowKeyline = function useShowKeyline(contentAreaRef) {
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    showKeyline = _useState2[0],
+    setShowKeyline = _useState2[1];
+  (0, _react.useEffect)(function () {
+    var _contentAreaRef$curre;
+    if (!((_contentAreaRef$curre = contentAreaRef.current) !== null && _contentAreaRef$curre !== void 0 && _contentAreaRef$curre.contentArea)) {
+      return;
     }
-    return _this;
-  }
-  (0, _createClass2.default)(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 (0, _react2.jsx)(_ui.ContextPanelWidthProvider, null, (0, _react2.jsx)("div", {
-        css: _StyledComponents.fullPageEditorWrapper,
-        className: "akEditor",
-        ref: this.wrapperElementRef
-      }, (0, _react2.jsx)(_FullPageToolbar.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
-      }), (0, _react2.jsx)(_FullPageContentArea.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.default.Component);
-exports.FullPageEditor = FullPageEditor;
-(0, _defineProperty2.default)(FullPageEditor, "displayName", 'FullPageEditor');
+    var intersection = new IntersectionObserver(function (_ref) {
+      var _ref2 = (0, _slicedToArray2.default)(_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: _utils.browser.safari ? 0.98 : 1
+    });
+    intersection.observe(contentAreaRef.current.contentArea);
+    return function () {
+      intersection.disconnect();
+    };
+  }, [contentAreaRef]);
+  return showKeyline;
+};
+var FullPageEditor = function FullPageEditor(props) {
+  var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
+  var wrapperElementRef = (0, _react.useMemo)(function () {
+    return props.innerRef;
+  }, [props.innerRef]);
+  var scrollContentContainerRef = (0, _react.useRef)(null);
+  var showKeyline = useShowKeyline(scrollContentContainerRef);
+  return (0, _react2.jsx)(_ui.ContextPanelWidthProvider, null, (0, _react2.jsx)("div", {
+    css: _StyledComponents.fullPageEditorWrapper,
+    className: "akEditor",
+    ref: wrapperElementRef
+  }, (0, _react2.jsx)(_FullPageToolbar.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
+  }), (0, _react2.jsx)(_FullPageContentArea.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
+  })));
+};
+exports.FullPageEditor = FullPageEditor;

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

@@ -1,37 +1,53 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FullPageContentArea = exports.CONTENT_AREA_TEST_ID = void 0;
 var _react = require("@emotion/react");
 var _ui = require("@atlaskit/editor-common/ui");
-var _react2 = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _Addon = require("../../Addon");
 var _ContextPanel = _interopRequireDefault(require("../../ContextPanel"));
 var _PluginSlot = _interopRequireDefault(require("../../PluginSlot"));
 var _StyledComponents = require("./StyledComponents");
 var _messages = _interopRequireDefault(require("./messages"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
 
 var CONTENT_AREA_TEST_ID = 'ak-editor-fp-content-area';
 exports.CONTENT_AREA_TEST_ID = CONTENT_AREA_TEST_ID;
-var Content = /*#__PURE__*/_react2.default.memo(function (props) {
+var Content = /*#__PURE__*/_react2.default.forwardRef(function (props, ref) {
   var theme = (0, _react.useTheme)();
   var fullWidthMode = props.appearance === 'full-width';
+  var scrollContainerRef = (0, _react2.useRef)(null);
+  var contentAreaRef = (0, _react2.useRef)(null);
+  (0, _react2.useImperativeHandle)(ref, function () {
+    return {
+      get scrollContainer() {
+        return scrollContainerRef.current;
+      },
+      get contentArea() {
+        return contentAreaRef.current;
+      }
+    };
+  }, []);
   return (0, _react.jsx)(_ui.WidthConsumer, null, function (_ref) {
     var width = _ref.width;
     return (0, _react.jsx)(_ui.ContextPanelConsumer, null, function (_ref2) {
+      var _contentAreaRef$curre;
       var positionedOverEditor = _ref2.positionedOverEditor;
       return (0, _react.jsx)("div", {
         css: [_StyledComponents.contentArea, positionedOverEditor && _StyledComponents.positionedOverEditorStyle],
         "data-testid": CONTENT_AREA_TEST_ID
       }, (0, _react.jsx)(_StyledComponents.ScrollContainer, {
-        ref: props.scrollContainerRef,
         className: "fabric-editor-popup-scroll-parent",
-        featureFlags: props.featureFlags
+        featureFlags: props.featureFlags,
+        ref: scrollContainerRef
       }, (0, _react.jsx)(_Addon.ClickAreaBlock, {
         editorView: props.editorView,
         editorDisabled: props.disabled
@@ -43,10 +59,11 @@ var Content = /*#__PURE__*/_react2.default.memo(function (props) {
         }),
         role: "region",
         "aria-label": props.intl.formatMessage(_messages.default.editableContentLabel),
-        ref: props.contentAreaRef
+        ref: contentAreaRef
       }, (0, _react.jsx)("div", {
         css: _StyledComponents.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, (0, _react.jsx)(_PluginSlot.default, {
         editorView: props.editorView,
         editorActions: props.editorActions,
@@ -55,12 +72,12 @@ var Content = /*#__PURE__*/_react2.default.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)))), (0, _react.jsx)("div", {
@@ -71,5 +88,7 @@ var Content = /*#__PURE__*/_react2.default.memo(function (props) {
     });
   });
 });
-var FullPageContentArea = (0, _reactIntlNext.injectIntl)(Content);
+var FullPageContentArea = (0, _reactIntlNext.injectIntl)(Content, {
+  forwardRef: true
+});
 exports.FullPageContentArea = FullPageContentArea;

package/dist/cjs/utils/mark.js

@@ -102,7 +102,7 @@ var sanitiseMarksInSelection = function sanitiseMarksInSelection(tr, newParentTy
       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/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "185.8.0";
+var version = "185.8.3";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/commands/index.js

@@ -186,7 +186,7 @@ export const createToggleBlockMarkOnRange = (markType, getAttrs, allowedBlocks)
     if (!node.type.isBlock) {
       return false;
     }
-    if ((!allowedBlocks || (Array.isArray(allowedBlocks) ? allowedBlocks.indexOf(node.type) > -1 : allowedBlocks(state.schema, node, parent))) && parent.type.allowsMarkType(markType)) {
+    if ((!allowedBlocks || (Array.isArray(allowedBlocks) ? allowedBlocks.indexOf(node.type) > -1 : allowedBlocks(state.schema, node, parent))) && parent !== null && parent !== void 0 && parent.type.allowsMarkType(markType)) {
       const oldMarks = node.marks.filter(mark => mark.type === markType);
       const prevAttrs = oldMarks.length ? oldMarks[0].attrs : undefined;
       const newAttrs = getAttrs(prevAttrs, node);

package/dist/es2019/plugins/annotation/index.js

@@ -20,7 +20,7 @@ const annotationPlugin = (annotationProviders, api) => {
       if (!editorState) {
         return undefined;
       }
-      return getPluginState(editorState);
+      return getPluginState(editorState) || undefined;
     },
     pmPlugins: () => [{
       name: 'annotation',

package/dist/es2019/plugins/annotation/pm-plugins/inline-comment.js

@@ -58,11 +58,9 @@ const onUnResolve = (state, dispatch) => annotationId => {
 };
 const onMouseUp = (state, dispatch) => e => {
   const {
-    mouseData: {
-      isSelecting
-    }
-  } = getPluginState(state);
-  if (isSelecting) {
+    mouseData
+  } = getPluginState(state) || {};
+  if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
     updateMouseState({
       isSelecting: false
     })(state, dispatch);
@@ -110,7 +108,7 @@ export const inlineCommentPlugin = options => {
         update(view, _prevState) {
           const {
             dirtyAnnotations
-          } = getPluginState(view.state);
+          } = getPluginState(view.state) || {};
           if (!dirtyAnnotations) {
             return;
           }
@@ -133,7 +131,7 @@ export const inlineCommentPlugin = options => {
       handleDOMEvents: {
         mousedown: view => {
           const pluginState = getPluginState(view.state);
-          if (!pluginState.mouseData.isSelecting) {
+          if (!(pluginState !== null && pluginState !== void 0 && pluginState.mouseData.isSelecting)) {
             hideToolbar(view.state, view.dispatch)();
           }
           return false;
@@ -146,13 +144,13 @@ export const inlineCommentPlugin = options => {
           annotations,
           selectedAnnotations,
           isVisible
-        } = getPluginState(state);
+        } = getPluginState(state) || {};
         let decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         const focusDecorations = [];
         state.doc.descendants((node, pos) => {
           node.marks.filter(mark => mark.type === state.schema.marks.annotation).forEach(mark => {
-            const isSelected = selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id);
-            const isUnresolved = annotations[mark.attrs.id] === false;
+            const isSelected = !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
+            const isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
             if (isVisible) {
               focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
                 class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,

package/dist/es2019/plugins/annotation/ui/InlineCommentView.js

@@ -45,7 +45,7 @@ export function InlineCommentView({
     bookmark,
     selectedAnnotations,
     annotations
-  } = inlineCommentState;
+  } = inlineCommentState || {};
   const selection = getSelectionPositions(state, inlineCommentState);
   const position = findPosForDOM(selection);
   let dom;
@@ -103,7 +103,7 @@ export function InlineCommentView({
   }
 
   // View Component
-  const activeAnnotations = selectedAnnotations.filter(mark => annotations[mark.id] === false);
+  const activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(mark => annotations && annotations[mark.id] === false)) || [];
   if (!ViewComponent || activeAnnotations.length === 0) {
     return null;
   }

package/dist/es2019/plugins/annotation/utils.js

@@ -135,7 +135,7 @@ export const findAnnotationsInSelection = (selection, doc) => {
 export function getSelectionPositions(editorState, inlineCommentState) {
   const {
     bookmark
-  } = inlineCommentState;
+  } = inlineCommentState || {};
   // get positions via saved bookmark if it is available
   // this is to make comments box positioned relative to temporary highlight rather then current selection
   if (bookmark) {
@@ -191,7 +191,7 @@ export const isSelectionValid = state => {
   } = state;
   const {
     disallowOnWhitespace
-  } = getPluginState(state);
+  } = getPluginState(state) || {};
   if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection)) {
     return AnnotationSelectionType.INVALID;
   }
@@ -299,7 +299,7 @@ export function hasAnnotationMark(node, state) {
  */
 export function annotationExists(annotationId, state) {
   const commentsPluginState = getPluginState(state);
-  return commentsPluginState.annotations && Object.keys(commentsPluginState.annotations).includes(annotationId);
+  return !!(commentsPluginState !== null && commentsPluginState !== void 0 && commentsPluginState.annotations) && Object.keys(commentsPluginState.annotations).includes(annotationId);
 }
 
 /*

package/dist/es2019/plugins/base/pm-plugins/composition.js

@@ -2,7 +2,8 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
 const compositionPluginKey = new PluginKey('compositionPlugin');
 export const isComposing = state => {
-  return compositionPluginKey.getState(state).isComposing;
+  var _compositionPluginKey;
+  return !!((_compositionPluginKey = compositionPluginKey.getState(state)) !== null && _compositionPluginKey !== void 0 && _compositionPluginKey.isComposing);
 };
 export default (() => new SafePlugin({
   key: compositionPluginKey,