@atlaskit/editor-core 187.47.0 → 187.47.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 187.47.3
+
+### Patch Changes
+
+- [`3aaff60be08`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3aaff60be08) - ED-18988 Updates overflow property for content area of comment editor when table sticky scrollbar is enabled.
+- Updated dependencies
+
+## 187.47.2
+
+### Patch Changes
+
+- [`c89c55c6d49`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c89c55c6d49) - [ux] ED-19508 fixes closed inline comments reopening when user toggles an expand node
+
 ## 187.47.0
 
 ### Minor Changes

package/dist/cjs/plugins/annotation/commands/index.js

@@ -27,9 +27,12 @@ var updateInlineCommentResolvedState = function updateInlineCommentResolvedState
   return (0, _pluginFactory.createCommand)(command);
 };
 exports.updateInlineCommentResolvedState = updateInlineCommentResolvedState;
-var closeComponent = function closeComponent() {
+var closeComponent = function closeComponent(state) {
   return (0, _pluginFactory.createCommand)({
-    type: _types.ACTIONS.CLOSE_COMPONENT
+    type: _types.ACTIONS.CLOSE_COMPONENT,
+    data: {
+      lastClosedPos: state.selection.$head.pos
+    }
   });
 };
 exports.closeComponent = closeComponent;

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

@@ -156,7 +156,7 @@ var inlineCommentPlugin = function inlineCommentPlugin(options) {
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
         if (!annotationId) {
-          (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+          (0, _commands.closeComponent)(editorView.state)(editorView.state, editorView.dispatch);
         } else {
           (0, _commands.setSelectedAnnotation)(annotationId)(editorView.state, editorView.dispatch);
         }

package/dist/cjs/plugins/annotation/pm-plugins/reducer.js

@@ -21,7 +21,8 @@ var _default = function _default(pluginState, action) {
     case _types.ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE:
       var mouseData = Object.assign({}, pluginState.mouseData, action.data.mouseData);
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        mouseData: mouseData
+        mouseData: mouseData,
+        lastClosedPos: undefined
       });
     case _types.ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -32,7 +33,8 @@ var _default = function _default(pluginState, action) {
       });
     case _types.ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: []
+        selectedAnnotations: [],
+        lastClosedPos: action.data.lastClosedPos
       });
     case _types.ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);

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

@@ -45,7 +45,8 @@ function InlineCommentView(_ref) {
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
-    annotations = _ref2.annotations;
+    annotations = _ref2.annotations,
+    lastClosedPos = _ref2.lastClosedPos;
   var annotationsList = (0, _utils2.getAllAnnotations)(editorView.state.doc);
   var selection = (0, _utils2.getSelectionPositions)(state, inlineCommentState);
   var position = findPosForDOM(selection);
@@ -107,7 +108,9 @@ function InlineCommentView(_ref) {
   var activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(function (mark) {
     return annotations && annotations[mark.id] === false;
   })) || [];
-  if (!ViewComponent || activeAnnotations.length === 0) {
+  if (!ViewComponent || activeAnnotations.length === 0 ||
+  // Check if the user has moved the selection since closing the previous comment
+  editorView.state.selection.$head.pos === lastClosedPos) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
@@ -145,7 +148,7 @@ function InlineCommentView(_ref) {
       return (0, _commands.updateInlineCommentResolvedState)((0, _defineProperty2.default)({}, id, true), _inlineCommentEvents.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
-      (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+      (0, _commands.closeComponent)(editorView.state)(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/cjs/plugins/floating-toolbar/index.js

@@ -223,6 +223,13 @@ function ContentComponent(_ref5) {
     forcePlacement = config.forcePlacement,
     preventPopupOverflow = config.preventPopupOverflow,
     onPositionCalculated = config.onPositionCalculated,
+    _config$absoluteOffse = config.absoluteOffset,
+    absoluteOffset = _config$absoluteOffse === void 0 ? {
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0
+    } : _config$absoluteOffse,
     focusTrap = config.focusTrap;
   var targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
   if (!targetRef || editorDisabledState && editorDisabledState.editorDisabled) {
@@ -258,6 +265,7 @@ function ContentComponent(_ref5) {
     forcePlacement: forcePlacement,
     fitHeight: height,
     fitWidth: width,
+    absoluteOffset: absoluteOffset,
     alignX: align,
     stick: true,
     zIndex: zIndex,

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -30,6 +30,7 @@ var _WithFlash = _interopRequireDefault(require("../../WithFlash"));
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _styles = require("@atlaskit/editor-common/styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = _interopRequireDefault(require("../../../messages"));
@@ -42,7 +43,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var CommentEditorMargin = 14;
 var commentEditorStyle = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n\n  .less-margin .ProseMirror {\n    margin: ", " ", "\n      ", ";\n  }\n\n  min-width: 272px;\n  /* Border + Toolbar + Footer + (Paragraph + ((Paragraph + Margin) * (DefaultLines - 1)) */\n  /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n  height: auto;\n  background-color: ", ";\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: ", "px;\n\n  max-width: inherit;\n  word-wrap: break-word;\n"])), "var(--ds-space-150, 12px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-background-input, white)", "var(--ds-border, ".concat(_colors.N40, ")"), (0, _constants.borderRadius)());
-var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  flex-grow: 1;\n  overflow-x: hidden;\n  overflow-y: auto;\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n  .ProseMirror {\n    margin: ", " ", "px\n      ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), "var(--ds-space-150, 12px)", CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
+var ContentArea = (0, _ContentStyles.createEditorContentStyle)((0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  flex-grow: 1;\n  overflow-x: ", ";\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n  .ProseMirror {\n    margin: ", " ", "px\n      ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden', "var(--ds-space-150, 12px)", CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, CommentEditorMargin - _styles.GRID_GUTTER, _Toolbar2.TableControlsPadding, _commonStyles.tableCommentEditorStyles));
 ContentArea.displayName = 'ContentArea';
 var secondaryToolbarStyle = (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  box-sizing: border-box;\n  justify-content: flex-end;\n  align-items: center;\n  display: flex;\n  padding: ", " 1px;\n"])), "var(--ds-space-150, 12px)");
 var Editor = /*#__PURE__*/function (_React$Component) {

package/dist/cjs/ui/FloatingToolbar/index.js

@@ -56,6 +56,7 @@ var FloatingToolbar = /*#__PURE__*/function (_PureComponent) {
         popupsMountPoint = _this$props.popupsMountPoint,
         popupsBoundariesElement = _this$props.popupsBoundariesElement,
         className = _this$props.className,
+        absoluteOffset = _this$props.absoluteOffset,
         alignX = _this$props.alignX,
         alignY = _this$props.alignY,
         zIndex = _this$props.zIndex;
@@ -63,6 +64,7 @@ var FloatingToolbar = /*#__PURE__*/function (_PureComponent) {
         return null;
       }
       return (0, _react.jsx)(_ui.Popup, {
+        absoluteOffset: absoluteOffset,
         alignX: alignX,
         alignY: alignY,
         target: target,

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 = "187.47.0";
+var version = "187.47.3";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

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

@@ -16,8 +16,11 @@ export const updateInlineCommentResolvedState = (partialNewState, resolveMethod)
   }
   return createCommand(command);
 };
-export const closeComponent = () => createCommand({
-  type: ACTIONS.CLOSE_COMPONENT
+export const closeComponent = state => createCommand({
+  type: ACTIONS.CLOSE_COMPONENT,
+  data: {
+    lastClosedPos: state.selection.$head.pos
+  }
 });
 export const clearDirtyMark = () => createCommand({
   type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK

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

@@ -99,7 +99,7 @@ export const inlineCommentPlugin = options => {
       const setVisibility = isVisible => onSetVisibility(editorView)(isVisible);
       const setSelectedAnnotationFn = annotationId => {
         if (!annotationId) {
-          closeComponent()(editorView.state, editorView.dispatch);
+          closeComponent(editorView.state)(editorView.state, editorView.dispatch);
         } else {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }

package/dist/es2019/plugins/annotation/pm-plugins/reducer.js

@@ -15,7 +15,8 @@ export default ((pluginState, action) => {
       const mouseData = Object.assign({}, pluginState.mouseData, action.data.mouseData);
       return {
         ...pluginState,
-        mouseData
+        mouseData,
+        lastClosedPos: undefined
       };
     case ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -28,7 +29,8 @@ export default ((pluginState, action) => {
     case ACTIONS.CLOSE_COMPONENT:
       return {
         ...pluginState,
-        selectedAnnotations: []
+        selectedAnnotations: [],
+        lastClosedPos: action.data.lastClosedPos
       };
     case ACTIONS.ADD_INLINE_COMMENT:
       const updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);

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

@@ -44,7 +44,8 @@ export function InlineCommentView({
   const {
     bookmark,
     selectedAnnotations,
-    annotations
+    annotations,
+    lastClosedPos
   } = inlineCommentState || {};
   const annotationsList = getAllAnnotations(editorView.state.doc);
   const selection = getSelectionPositions(state, inlineCommentState);
@@ -105,7 +106,9 @@ export function InlineCommentView({
 
   // View Component
   const activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(mark => annotations && annotations[mark.id] === false)) || [];
-  if (!ViewComponent || activeAnnotations.length === 0) {
+  if (!ViewComponent || activeAnnotations.length === 0 ||
+  // Check if the user has moved the selection since closing the previous comment
+  editorView.state.selection.$head.pos === lastClosedPos) {
     return null;
   }
   const onAnnotationViewed = () => {
@@ -141,7 +144,7 @@ export function InlineCommentView({
       [id]: true
     }, RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch),
     onClose: () => {
-      closeComponent()(editorView.state, editorView.dispatch);
+      closeComponent(editorView.state)(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/es2019/plugins/floating-toolbar/index.js

@@ -211,6 +211,12 @@ function ContentComponent({
     forcePlacement,
     preventPopupOverflow,
     onPositionCalculated,
+    absoluteOffset = {
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0
+    },
     focusTrap
   } = config;
   const targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
@@ -246,6 +252,7 @@ function ContentComponent({
     forcePlacement: forcePlacement,
     fitHeight: height,
     fitWidth: width,
+    absoluteOffset: absoluteOffset,
     alignX: align,
     stick: true,
     zIndex: zIndex,

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -17,6 +17,7 @@ import WithFlash from '../../WithFlash';
 import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
 import messages from '../../../messages';
@@ -48,8 +49,7 @@ const commentEditorStyle = css`
 `;
 const ContentArea = createEditorContentStyle(css`
   flex-grow: 1;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow-x: ${getBooleanFF('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden'};
   line-height: 24px;
 
   /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/

package/dist/es2019/ui/FloatingToolbar/index.js

@@ -16,6 +16,7 @@ export default class FloatingToolbar extends PureComponent {
       popupsMountPoint,
       popupsBoundariesElement,
       className,
+      absoluteOffset,
       alignX,
       alignY,
       zIndex
@@ -24,6 +25,7 @@ export default class FloatingToolbar extends PureComponent {
       return null;
     }
     return jsx(Popup, {
+      absoluteOffset: absoluteOffset,
       alignX: alignX,
       alignY: alignY,
       target: target,

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.47.0";
+export const version = "187.47.3";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/annotation/commands/index.js

@@ -19,9 +19,12 @@ export var updateInlineCommentResolvedState = function updateInlineCommentResolv
   }
   return createCommand(command);
 };
-export var closeComponent = function closeComponent() {
+export var closeComponent = function closeComponent(state) {
   return createCommand({
-    type: ACTIONS.CLOSE_COMPONENT
+    type: ACTIONS.CLOSE_COMPONENT,
+    data: {
+      lastClosedPos: state.selection.$head.pos
+    }
   });
 };
 export var clearDirtyMark = function clearDirtyMark() {

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

@@ -149,7 +149,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
         if (!annotationId) {
-          closeComponent()(editorView.state, editorView.dispatch);
+          closeComponent(editorView.state)(editorView.state, editorView.dispatch);
         } else {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }

package/dist/esm/plugins/annotation/pm-plugins/reducer.js

@@ -14,7 +14,8 @@ export default (function (pluginState, action) {
     case ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE:
       var mouseData = Object.assign({}, pluginState.mouseData, action.data.mouseData);
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        mouseData: mouseData
+        mouseData: mouseData,
+        lastClosedPos: undefined
       });
     case ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
       return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -25,7 +26,8 @@ export default (function (pluginState, action) {
       });
     case ACTIONS.CLOSE_COMPONENT:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: []
+        selectedAnnotations: [],
+        lastClosedPos: action.data.lastClosedPos
       });
     case ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);

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

@@ -38,7 +38,8 @@ export function InlineCommentView(_ref) {
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
-    annotations = _ref2.annotations;
+    annotations = _ref2.annotations,
+    lastClosedPos = _ref2.lastClosedPos;
   var annotationsList = getAllAnnotations(editorView.state.doc);
   var selection = getSelectionPositions(state, inlineCommentState);
   var position = findPosForDOM(selection);
@@ -100,7 +101,9 @@ export function InlineCommentView(_ref) {
   var activeAnnotations = (selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.filter(function (mark) {
     return annotations && annotations[mark.id] === false;
   })) || [];
-  if (!ViewComponent || activeAnnotations.length === 0) {
+  if (!ViewComponent || activeAnnotations.length === 0 ||
+  // Check if the user has moved the selection since closing the previous comment
+  editorView.state.selection.$head.pos === lastClosedPos) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
@@ -138,7 +141,7 @@ export function InlineCommentView(_ref) {
       return updateInlineCommentResolvedState(_defineProperty({}, id, true), RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
-      closeComponent()(editorView.state, editorView.dispatch);
+      closeComponent(editorView.state)(editorView.state, editorView.dispatch);
     }
   }));
 }

package/dist/esm/plugins/floating-toolbar/index.js

@@ -213,6 +213,13 @@ function ContentComponent(_ref5) {
     forcePlacement = config.forcePlacement,
     preventPopupOverflow = config.preventPopupOverflow,
     onPositionCalculated = config.onPositionCalculated,
+    _config$absoluteOffse = config.absoluteOffset,
+    absoluteOffset = _config$absoluteOffse === void 0 ? {
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0
+    } : _config$absoluteOffse,
     focusTrap = config.focusTrap;
   var targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
   if (!targetRef || editorDisabledState && editorDisabledState.editorDisabled) {
@@ -248,6 +255,7 @@ function ContentComponent(_ref5) {
     forcePlacement: forcePlacement,
     fitHeight: height,
     fitWidth: width,
+    absoluteOffset: absoluteOffset,
     alignX: align,
     stick: true,
     zIndex: zIndex,

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

@@ -27,6 +27,7 @@ import WithFlash from '../../WithFlash';
 import { WidthConsumer } from '@atlaskit/editor-common/ui';
 import { akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
 import messages from '../../../messages';
@@ -35,7 +36,7 @@ import { createEditorContentStyle } from '../../ContentStyles';
 import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 var CommentEditorMargin = 14;
 var commentEditorStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column;\n\n  .less-margin .ProseMirror {\n    margin: ", " ", "\n      ", ";\n  }\n\n  min-width: 272px;\n  /* Border + Toolbar + Footer + (Paragraph + ((Paragraph + Margin) * (DefaultLines - 1)) */\n  /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */\n\n  height: auto;\n  background-color: ", ";\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: ", "px;\n\n  max-width: inherit;\n  word-wrap: break-word;\n"])), "var(--ds-space-150, 12px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-background-input, white)", "var(--ds-border, ".concat(N40, ")"), borderRadius());
-var ContentArea = createEditorContentStyle(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  flex-grow: 1;\n  overflow-x: hidden;\n  overflow-y: auto;\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n  .ProseMirror {\n    margin: ", " ", "px\n      ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), "var(--ds-space-150, 12px)", CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, TableControlsPadding, tableCommentEditorStyles));
+var ContentArea = createEditorContentStyle(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  flex-grow: 1;\n  overflow-x: ", ";\n  line-height: 24px;\n\n  /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/\n  /** Hack for table controls. Otherwise margin collapse and controls are misplaced. **/\n  .ProseMirror {\n    margin: ", " ", "px\n      ", "px;\n  }\n\n  .gridParent {\n    margin-left: ", "px;\n    margin-right: ", "px;\n    width: calc(100% + ", "px);\n  }\n\n  padding: ", "px;\n\n  ", ";\n"])), getBooleanFF('platform.editor.table-sticky-scrollbar') ? 'clip' : 'hidden', "var(--ds-space-150, 12px)", CommentEditorMargin, CommentEditorMargin, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, CommentEditorMargin - GRID_GUTTER, TableControlsPadding, tableCommentEditorStyles));
 ContentArea.displayName = 'ContentArea';
 var secondaryToolbarStyle = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  justify-content: flex-end;\n  align-items: center;\n  display: flex;\n  padding: ", " 1px;\n"])), "var(--ds-space-150, 12px)");
 var Editor = /*#__PURE__*/function (_React$Component) {

package/dist/esm/ui/FloatingToolbar/index.js

@@ -32,6 +32,7 @@ var FloatingToolbar = /*#__PURE__*/function (_PureComponent) {
         popupsMountPoint = _this$props.popupsMountPoint,
         popupsBoundariesElement = _this$props.popupsBoundariesElement,
         className = _this$props.className,
+        absoluteOffset = _this$props.absoluteOffset,
         alignX = _this$props.alignX,
         alignY = _this$props.alignY,
         zIndex = _this$props.zIndex;
@@ -39,6 +40,7 @@ var FloatingToolbar = /*#__PURE__*/function (_PureComponent) {
         return null;
       }
       return jsx(Popup, {
+        absoluteOffset: absoluteOffset,
         alignX: alignX,
         alignY: alignY,
         target: target,

package/dist/esm/version-wrapper.js

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

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

@@ -1,10 +1,11 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { RESOLVE_METHOD } from './../../analytics/types/inline-comment-events';
 import type { Command } from '../../../types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '../../analytics';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
 export declare const updateInlineCommentResolvedState: (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
-export declare const closeComponent: () => Command;
+export declare const closeComponent: (state: EditorState) => Command;
 export declare const clearDirtyMark: () => Command;
 export declare const removeInlineCommentNearSelection: (id: string) => Command;
 export declare const setInlineCommentDraftState: (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;

package/dist/types/plugins/annotation/pm-plugins/types.d.ts

@@ -43,6 +43,9 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
+    data: {
+        lastClosedPos: number;
+    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -71,4 +74,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    lastClosedPos?: number;
 };

package/dist/types/ui/FloatingToolbar/index.d.ts

@@ -7,6 +7,7 @@ export type Coordinates = {
     top?: number;
     bottom?: number;
 };
+export type PositionOffset = Coordinates;
 export interface Props {
     zIndex?: number;
     className?: string;
@@ -16,6 +17,7 @@ export interface Props {
     offset?: number[];
     fitWidth?: number;
     fitHeight?: number;
+    absoluteOffset?: PositionOffset;
     alignX?: 'left' | 'center' | 'right';
     alignY?: 'bottom' | 'top';
     onPositionCalculated?: (position: Coordinates) => any;

package/dist/types-ts4.5/plugins/annotation/commands/index.d.ts

@@ -1,10 +1,11 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { RESOLVE_METHOD } from './../../analytics/types/inline-comment-events';
 import type { Command } from '../../../types';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { INPUT_METHOD } from '../../analytics';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
 export declare const updateInlineCommentResolvedState: (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
-export declare const closeComponent: () => Command;
+export declare const closeComponent: (state: EditorState) => Command;
 export declare const clearDirtyMark: () => Command;
 export declare const removeInlineCommentNearSelection: (id: string) => Command;
 export declare const setInlineCommentDraftState: (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;

package/dist/types-ts4.5/plugins/annotation/pm-plugins/types.d.ts

@@ -43,6 +43,9 @@ export type InlineCommentAction = {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK;
 } | {
     type: ACTIONS.CLOSE_COMPONENT;
+    data: {
+        lastClosedPos: number;
+    };
 } | {
     type: ACTIONS.ADD_INLINE_COMMENT;
     data: {
@@ -71,4 +74,5 @@ export type InlineCommentPluginState = {
     bookmark?: SelectionBookmark;
     disallowOnWhitespace: boolean;
     isVisible: boolean;
+    lastClosedPos?: number;
 };

package/dist/types-ts4.5/ui/FloatingToolbar/index.d.ts

@@ -7,6 +7,7 @@ export type Coordinates = {
     top?: number;
     bottom?: number;
 };
+export type PositionOffset = Coordinates;
 export interface Props {
     zIndex?: number;
     className?: string;
@@ -16,6 +17,7 @@ export interface Props {
     offset?: number[];
     fitWidth?: number;
     fitHeight?: number;
+    absoluteOffset?: PositionOffset;
     alignX?: 'left' | 'center' | 'right';
     alignY?: 'bottom' | 'top';
     onPositionCalculated?: (position: Coordinates) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.47.0",
+  "version": "187.47.3",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
     "@atlaskit/code": "^14.6.0",
     "@atlaskit/date": "^0.10.0",
     "@atlaskit/datetime-picker": "^12.10.0",
-    "@atlaskit/editor-common": "^75.7.0",
+    "@atlaskit/editor-common": "^75.8.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-markdown-transformer": "^5.2.5",
     "@atlaskit/editor-palette": "1.5.1",
@@ -81,13 +81,13 @@
     "@atlaskit/editor-plugin-placeholder": "^0.1.0",
     "@atlaskit/editor-plugin-quick-insert": "^0.1.0",
     "@atlaskit/editor-plugin-rule": "^0.1.0",
-    "@atlaskit/editor-plugin-table": "^3.1.0",
+    "@atlaskit/editor-plugin-table": "^3.2.0",
     "@atlaskit/editor-plugin-text-formatting": "^0.4.0",
     "@atlaskit/editor-plugin-type-ahead": "^0.3.0",
     "@atlaskit/editor-plugin-unsupported-content": "^0.2.0",
     "@atlaskit/editor-plugin-width": "^0.2.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
-    "@atlaskit/editor-shared-styles": "^2.7.0",
+    "@atlaskit/editor-shared-styles": "^2.8.0",
     "@atlaskit/editor-tables": "^2.3.0",
     "@atlaskit/emoji": "^67.5.0",
     "@atlaskit/empty-state": "^7.6.0",
@@ -156,7 +156,7 @@
     "@atlaskit/collab-provider": "9.12.3",
     "@atlaskit/dropdown-menu": "^11.14.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
-    "@atlaskit/editor-plugin-table": "^3.1.0",
+    "@atlaskit/editor-plugin-table": "^3.2.0",
     "@atlaskit/flag": "^15.2.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/inline-dialog": "^13.6.0",
@@ -179,7 +179,7 @@
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
-    "@atlassian/editor-extension-link-create": "^0.3.0",
+    "@atlassian/editor-extension-link-create": "^0.4.0",
     "@atlassian/feature-flags-test-utils": "^0.1.1",
     "@atlassian/link-picker-plugins": "^23.0.0",
     "@atlassian/search-provider": "2.4.7",
@@ -248,6 +248,9 @@
       "type": "boolean",
       "referenceOnly": "true"
     },
+    "platform.editor.table-sticky-scrollbar": {
+      "type": "boolean"
+    },
     "platform.editor.update-table-cell-width-via-step": {
       "type": "boolean",
       "referenceOnly": "true"