@atlaskit/renderer 118.4.1 → 118.5.1

package/dist/cjs/ui/annotations/hover/mounter.js

@@ -1,15 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Mounter = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _dom = require("../draft/dom");
 var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -24,29 +21,18 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
     isAnnotationAllowed = props.isAnnotationAllowed,
     wrapperDOM = props.wrapperDOM,
     onCloseProps = props.onClose,
-    clearAnnotationDraft = props.clearAnnotationDraft,
-    applyAnnotationDraftAt = props.applyAnnotationDraftAt,
     documentPosition = props.documentPosition,
     applyAnnotation = props.applyAnnotation,
     createAnalyticsEvent = props.createAnalyticsEvent,
     generateIndexMatch = props.generateIndexMatch;
-
-  // if platform_renderer_annotation_draft_position_fix is enabled; then
   var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
     promoteHoverToDraft = _useAnnotationRangeDi.promoteHoverToDraft,
     clearHoverDraft = _useAnnotationRangeDi.clearHoverDraft;
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
     hoverDraftDocumentPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
-  // else;
-  var _useState = (0, _react.useState)(),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    draftDocumentPosition = _useState2[0],
-    setDraftDocumentPosition = _useState2[1];
-  // end-if
-
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
-    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
+    var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
     if (!isAnnotationAllowed || !positionToAnnotate || !applyAnnotation) {
       return false;
     }
@@ -64,7 +50,7 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       }).fire(_types.FabricChannel.editor);
     }
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [isAnnotationAllowed, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, hoverDraftDocumentPosition]);
+  }, [isAnnotationAllowed, documentPosition, applyAnnotation, createAnalyticsEvent, hoverDraftDocumentPosition]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -88,12 +74,7 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       }
       return false;
     }
-    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-      promoteHoverToDraft(documentPosition);
-    } else {
-      setDraftDocumentPosition(documentPosition);
-      applyAnnotationDraftAt && applyAnnotationDraftAt(documentPosition);
-    }
+    promoteHoverToDraft(documentPosition);
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = actions.getAnnotationsByPosition(range);
       createAnalyticsEvent({
@@ -116,7 +97,7 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
         }
       }
     });
-    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
+    var positionToAnnotate = hoverDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       return false;
     }
@@ -125,19 +106,14 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, promoteHoverToDraft, hoverDraftDocumentPosition]);
+  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, promoteHoverToDraft, hoverDraftDocumentPosition]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-      clearHoverDraft();
-    } else {
-      clearAnnotationDraft && clearAnnotationDraft();
-      setDraftDocumentPosition(null);
-    }
+    clearHoverDraft();
     var sel = window.getSelection();
     if (sel) {
       sel.removeAllRanges();
     }
-  }, [clearAnnotationDraft, clearHoverDraft]);
+  }, [clearHoverDraft]);
   var onCloseCallback = (0, _react.useCallback)(function () {
     if (createAnalyticsEvent) {
       createAnalyticsEvent({

package/dist/cjs/ui/annotations/hover/range-validator.js

@@ -15,8 +15,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var RangeValidator = exports.RangeValidator = function RangeValidator(props) {
   var component = props.component,
     rendererRef = props.rendererRef,
-    applyAnnotationDraftAt = props.applyAnnotationDraftAt,
-    clearAnnotationDraft = props.clearAnnotationDraft,
     createAnalyticsEvent = props.createAnalyticsEvent;
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
@@ -39,9 +37,7 @@ var RangeValidator = exports.RangeValidator = function RangeValidator(props) {
     documentPosition: documentPosition,
     isAnnotationAllowed: true,
     applyAnnotation: actions.applyAnnotation.bind(actions),
-    applyAnnotationDraftAt: applyAnnotationDraftAt,
     generateIndexMatch: actions.generateAnnotationIndexMatch.bind(actions),
-    clearAnnotationDraft: clearAnnotationDraft,
     createAnalyticsEvent: createAnalyticsEvent
   });
 };

package/dist/cjs/ui/annotations/selection/mounter.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SelectionInlineCommentMounter = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -27,26 +26,15 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     isAnnotationAllowed = props.isAnnotationAllowed,
     wrapperDOM = props.wrapperDOM,
     onCloseProps = props.onClose,
-    clearAnnotationDraft = props.clearAnnotationDraft,
-    applyAnnotationDraftAt = props.applyAnnotationDraftAt,
     documentPosition = props.documentPosition,
     applyAnnotation = props.applyAnnotation,
     createAnalyticsEvent = props.createAnalyticsEvent,
     generateIndexMatch = props.generateIndexMatch;
-
-  // if platform_renderer_annotation_draft_position_fix is enabled; then
   var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
     promoteSelectionToDraft = _useAnnotationRangeDi.promoteSelectionToDraft,
     clearSelectionDraft = _useAnnotationRangeDi.clearSelectionDraft;
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
     selectionDraftDocumentPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
-  // else;
-  var _useState = (0, _react.useState)(),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    draftDocumentPosition = _useState2[0],
-    setDraftDocumentPosition = _useState2[1];
-  // end-if
-
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var _useAnnotationManager = (0, _AnnotationManagerContext.useAnnotationManagerState)(),
     isDrafting = _useAnnotationManager.isDrafting,
@@ -80,7 +68,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
     // We want to support creation on a documentPosition if the user is only using ranges
     // but we want to prioritize draft positions if they are being used by consumers
-    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
+    var positionToAnnotate = selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation) {
       // TODO: EDITOR-595 - This analytic event is temporary and should be removed once the following issue
       // has been identified and fixed: https://atlassian.slack.com/archives/C08JK0WSCH5/p1745902609966999
@@ -91,10 +79,10 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
           actionSubjectId: 'inlineCommentFailureReason',
           attributes: {
             reason: 'Annotation Position invalid',
-            draftDocumentPosition: (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition : draftDocumentPosition,
+            draftDocumentPosition: selectionDraftDocumentPosition,
             documentPosition: documentPosition,
             applyAnnotation: !!applyAnnotation,
-            isDraftPositionFixEnabled: (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')
+            isDraftPositionFixEnabled: true
           },
           eventType: _analytics.EVENT_TYPE.OPERATIONAL
         }).fire(_types.FabricChannel.editor);
@@ -132,7 +120,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     } else {
       return applyAnnotation(positionToAnnotate, annotation);
     }
-  }, [actions, documentPosition, applyAnnotation, draftDocumentPosition, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
+  }, [actions, documentPosition, applyAnnotation, createAnalyticsEvent, inlineNodeTypes, selectionDraftDocumentPosition]);
   var createIndexCallback = (0, _react.useCallback)(function () {
     if (!documentPosition || !generateIndexMatch) {
       return false;
@@ -158,12 +146,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       }
       return false;
     }
-    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-      promoteSelectionToDraft(documentPosition);
-    } else {
-      setDraftDocumentPosition(documentPosition);
-      applyAnnotationDraftAt && applyAnnotationDraftAt(documentPosition);
-    }
+    promoteSelectionToDraft(documentPosition);
     if (createAnalyticsEvent) {
       var uniqueAnnotationsInRange = range ? actions.getAnnotationsByPosition(range) : [];
       createAnalyticsEvent({
@@ -187,7 +170,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
         }
       }
     });
-    var positionToAnnotate = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition || documentPosition : draftDocumentPosition || documentPosition;
+    var positionToAnnotate = selectionDraftDocumentPosition || documentPosition;
     if (!positionToAnnotate || !applyAnnotation || !options.annotationId) {
       return false;
     }
@@ -196,19 +179,14 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
       annotationType: _adfSchema.AnnotationTypes.INLINE_COMMENT
     };
     return applyAnnotation(positionToAnnotate, annotation);
-  }, [documentPosition, isAnnotationAllowed, applyAnnotationDraftAt, createAnalyticsEvent, applyAnnotation, draftDocumentPosition, actions, range, inlineNodeTypes, promoteSelectionToDraft, selectionDraftDocumentPosition]);
+  }, [documentPosition, isAnnotationAllowed, createAnalyticsEvent, applyAnnotation, actions, range, inlineNodeTypes, promoteSelectionToDraft, selectionDraftDocumentPosition]);
   var removeDraftModeCallback = (0, _react.useCallback)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-      clearSelectionDraft();
-    } else {
-      clearAnnotationDraft && clearAnnotationDraft();
-      setDraftDocumentPosition(null);
-    }
+    clearSelectionDraft();
     var sel = window.getSelection();
     if (sel) {
       sel.removeAllRanges();
     }
-  }, [clearAnnotationDraft, clearSelectionDraft]);
+  }, [clearSelectionDraft]);
   var onCloseCallback = (0, _react.useCallback)(function () {
     if (createAnalyticsEvent) {
       createAnalyticsEvent({
@@ -248,12 +226,6 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
             reason: 'draft-in-progress'
           };
         }
-        if (!actions.isValidAnnotationRange(range)) {
-          return {
-            success: false,
-            reason: 'invalid-range'
-          };
-        }
         var id = (0, _v.default)();
         var result = applyDraftModeCallback({
           annotationId: id,

package/dist/cjs/ui/annotations/selection/range-validator.js

@@ -16,8 +16,6 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var SelectionRangeValidator = exports.SelectionRangeValidator = function SelectionRangeValidator(props) {
   var selectionComponent = props.selectionComponent,
     rendererRef = props.rendererRef,
-    applyAnnotationDraftAt = props.applyAnnotationDraftAt,
-    clearAnnotationDraft = props.clearAnnotationDraft,
     createAnalyticsEvent = props.createAnalyticsEvent;
   var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var _useUserSelectionRang = (0, _userSelection.useUserSelectionRange)({
@@ -50,9 +48,7 @@ var SelectionRangeValidator = exports.SelectionRangeValidator = function Selecti
     documentPosition: documentPosition,
     isAnnotationAllowed: isAnnotationAllowedOnRange,
     applyAnnotation: actions.applyAnnotation.bind(actions),
-    applyAnnotationDraftAt: applyAnnotationDraftAt,
     generateIndexMatch: actions.generateAnnotationIndexMatch.bind(actions),
-    clearAnnotationDraft: clearAnnotationDraft,
     createAnalyticsEvent: createAnalyticsEvent
   });
 };

package/dist/cjs/ui/annotations/wrapper.js

@@ -4,71 +4,14 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AnnotationsContextWrapperOld = exports.AnnotationsContextWrapperNew = exports.AnnotationsContextWrapper = void 0;
+exports.AnnotationsContextWrapper = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _context = require("./context");
 var _rangeValidator = require("./hover/range-validator");
 var _rangeValidator2 = require("./selection/range-validator");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _AnnotationRangeContext = require("./contexts/AnnotationRangeContext");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-var AnnotationsContextWrapperOld = exports.AnnotationsContextWrapperOld = function AnnotationsContextWrapperOld(props) {
-  var providers = (0, _react.useContext)(_context.ProvidersContext);
-  var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
-    range = _useAnnotationRangeSt.range,
-    type = _useAnnotationRangeSt.type;
-  var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
-    setDraftRange = _useAnnotationRangeDi.setDraftRange,
-    clearDraftRange = _useAnnotationRangeDi.clearDraftRange;
-  var rendererRef = props.rendererRef,
-    createAnalyticsEvent = props.createAnalyticsEvent,
-    children = props.children,
-    isNestedRender = props.isNestedRender;
-  var inlineCommentProvider = providers && providers.inlineComment;
-  var selectionComponent = inlineCommentProvider && inlineCommentProvider.selectionComponent;
-  var hoverComponent = inlineCommentProvider && inlineCommentProvider.hoverComponent;
-
-  // We want to set the draft to the range the user highlighted
-  var setRangeForDraft = (0, _react.useCallback)(function () {
-    setDraftRange(range, type);
-  }, [range, setDraftRange, type]);
-  var clearRangeForDraft = (0, _react.useCallback)(function () {
-    clearDraftRange(type);
-  }, [type, clearDraftRange]);
-  var render = (0, _react.useCallback)(function (_ref) {
-    var applyAnnotationDraftAt = _ref.applyAnnotationDraftAt,
-      clearAnnotationDraft = _ref.clearAnnotationDraft;
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, !!hoverComponent && /*#__PURE__*/_react.default.createElement(_rangeValidator.RangeValidator, {
-      createAnalyticsEvent: createAnalyticsEvent,
-      rendererRef: rendererRef
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ,
-      component: hoverComponent,
-      applyAnnotationDraftAt: applyAnnotationDraftAt,
-      clearAnnotationDraft: clearAnnotationDraft
-    }), !!selectionComponent && /*#__PURE__*/_react.default.createElement(_rangeValidator2.SelectionRangeValidator, {
-      createAnalyticsEvent: createAnalyticsEvent,
-      rendererRef: rendererRef
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ,
-      selectionComponent: selectionComponent,
-      applyAnnotationDraftAt: applyAnnotationDraftAt,
-      clearAnnotationDraft: clearAnnotationDraft
-    }));
-  }, [hoverComponent, selectionComponent, children, rendererRef, createAnalyticsEvent]);
-  if (!selectionComponent && !hoverComponent) {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children);
-  }
-  return /*#__PURE__*/_react.default.createElement(_context.AnnotationsDraftContextWrapper, {
-    setDraftRange: setRangeForDraft,
-    clearDraftRange: clearRangeForDraft,
-    isNestedRender: isNestedRender
-  }, render);
-};
-var AnnotationsContextWrapperNew = exports.AnnotationsContextWrapperNew = function AnnotationsContextWrapperNew(props) {
+var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var rendererRef = props.rendererRef,
     createAnalyticsEvent = props.createAnalyticsEvent,
@@ -94,22 +37,4 @@ var AnnotationsContextWrapperNew = exports.AnnotationsContextWrapperNew = functi
     ,
     selectionComponent: selectionComponent
   }));
-};
-var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
-  if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-    // IMPORTANT: Please make sure the AnnotationsDraftContextWrapper is not used anc cleaned up correctly.
-    // This code path completely removes all reliance on that wrapper. Also the applyAnnotationDraftAt & clearAnnotationDraft
-    // properties have been made optional and not used. This means when we cleanup we can also remove those properties.
-    return /*#__PURE__*/_react.default.createElement(AnnotationsContextWrapperNew, {
-      rendererRef: props.rendererRef,
-      createAnalyticsEvent: props.createAnalyticsEvent,
-      isNestedRender: props.isNestedRender
-    }, props.children);
-  } else {
-    return /*#__PURE__*/_react.default.createElement(AnnotationsContextWrapperOld, {
-      rendererRef: props.rendererRef,
-      createAnalyticsEvent: props.createAnalyticsEvent,
-      isNestedRender: props.isNestedRender
-    }, props.children);
-  }
 };

package/dist/es2019/react/nodes/media/index.js

@@ -21,7 +21,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, VIEW_METHOD } fr
 import { fg } from '@atlaskit/platform-feature-flags';
 import { MODE, PLATFORM } from '../../../analytics/events';
 import AnnotationComponent from '../../marks/annotation';
-import { AnnotationsDraftContext } from '../../../ui/annotations/context';
 import { CommentBadge as CommentBadgeComponent, CommentBadgeNext, ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { injectIntl } from 'react-intl-next';
 import { useInlineCommentsFilter } from '../../../ui/annotations/hooks/use-inline-comments-filter';
@@ -389,11 +388,9 @@ class Media extends PureComponent {
   }
 }
 const MediaWithDraftAnnotation = props => {
-  const draftPositionOld = React.useContext(AnnotationsDraftContext);
   const {
-    hoverDraftDocumentPosition
+    hoverDraftDocumentPosition: draftPosition
   } = useAnnotationRangeState();
-  const draftPosition = fg('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition : draftPositionOld;
   const {
     dataAttributes
   } = props;

package/dist/es2019/react/nodes/tableNew.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-/* eslint-disable @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/ui-styling-standard/enforce-style-prop */
+/* eslint-disable @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/ui-styling-standard/enforce-style-prop, @repo/internal/react/no-class-components */
 import React from 'react';
 import { TableSharedCssClassName, tableMarginTop } from '@atlaskit/editor-common/styles';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { FullPagePadding } from '../../ui/Renderer/style';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { createCompareNodes, convertProsemirrorTableNodeToArrayOfRows, hasMergedCell, compose } from '@atlaskit/editor-common/utils';
 import { SortOrder } from '@atlaskit/editor-common/types';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth } from '@atlaskit/editor-shared-styles';
@@ -13,6 +14,23 @@ import { StickyTable, tableStickyPadding, OverflowParent } from './table/sticky'
 import { Table } from './table/table';
 import { isCommentAppearance, isFullWidthOrFullPageAppearance, isFullWidthAppearance, isFullPageAppearance } from '../utils/appearance';
 import { TableStickyScrollbar } from './TableStickyScrollbar';
+const stickyContainerBaseStyles = {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+  height: "var(--ds-space-250, 20px)",
+  // MAX_BROWSER_SCROLLBAR_HEIGHT
+  // Follow editor to hide by default so it does not show empty gap in SSR
+  // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/browse/platform/packages/editor/editor-plugin-table/src/nodeviews/TableComponent.tsx#957
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+  display: 'block',
+  width: '100%'
+};
+const stickyContainerAdditionalStyles = {
+  visibility: 'hidden',
+  overflowX: 'auto',
+  position: 'sticky',
+  bottom: "var(--ds-space-0, 0px)",
+  zIndex: 1
+};
 export const isTableResizingEnabled = appearance => isFullWidthOrFullPageAppearance(appearance) || isCommentAppearance(appearance) && editorExperiment('support_table_in_comment', true, {
   exposure: true
 });
@@ -96,6 +114,9 @@ export const tableCanBeSticky = (node, children) => {
  */
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
+/**
+ *
+ */
 export class TableContainer extends React.Component {
   constructor(...args) {
     super(...args);
@@ -450,23 +471,16 @@ export class TableContainer extends React.Component {
       isPresentational: isPresentational
     }, this.grabFirstRowRef(children))), isStickyScrollbarEnabled(this.props.rendererAppearance) && /*#__PURE__*/React.createElement("div", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-      className: TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_CONTAINER,
+      className: `${TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_CONTAINER}${fg('confluence_frontend_table_scrollbar_ttvc_fix') ? '-view-page' : ''}`,
       ref: this.stickyScrollbarRef,
       "data-vc": "table-sticky-scrollbar-container",
-      style: {
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-        height: "var(--ds-space-250, 20px)",
-        // MAX_BROWSER_SCROLLBAR_HEIGHT
-        // Follow editor to hide by default so it does not show empty gap in SSR
-        // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/browse/platform/packages/editor/editor-plugin-table/src/nodeviews/TableComponent.tsx#957
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-        display: 'block',
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
-        width: '100%'
-      }
+      style: fg('confluence_frontend_table_scrollbar_ttvc_fix') ? {
+        ...stickyContainerBaseStyles,
+        ...stickyContainerAdditionalStyles
+      } : stickyContainerBaseStyles
     }, /*#__PURE__*/React.createElement("div", {
       style: {
-        width: (_this$tableRef$curren = this.tableRef.current) === null || _this$tableRef$curren === void 0 ? void 0 : _this$tableRef$curren.clientWidth,
+        width: fg('confluence_frontend_table_scrollbar_ttvc_fix') ? '100%' : (_this$tableRef$curren = this.tableRef.current) === null || _this$tableRef$curren === void 0 ? void 0 : _this$tableRef$curren.clientWidth,
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         height: '100%'
       }
@@ -482,6 +496,9 @@ export class TableContainer extends React.Component {
  */
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
+/**
+ *
+ */
 export class TableProcessorWithContainerStyles extends React.Component {
   constructor(...args) {
     super(...args);

package/dist/es2019/ui/Renderer/RendererStyleContainer.js

@@ -1789,7 +1789,7 @@ export const RendererStyleContainer = props => {
         '--ak-renderer-editor-font-heading-h6': `${editorUGCToken('editor.font.heading.h6')}`,
         '--ak-renderer-editor-font-normal-text': `${editorUGCToken('editor.font.body')}`
       },
-      css: [baseStyles, fg('platform_hide_heading_anchor_wrapper_before_hover') && hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, appearance === 'full-width' && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, telepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, fg('platform_editor_typography_ugc') ? paragraphSharedStylesWithEditorUGC : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, tasksAndDecisionsStyles, smartCardStyles, fg('platform-linking-visual-refresh-v1') && smartCardStylesAvatarFix, fg('smartcard_avatar_margin_fix') && smartCardStylesAvatarMarginFix,
+      css: [baseStyles, hideHeadingCopyLinkWrapperStyles, appearance === 'full-page' && rendererFullPageStyles, appearance === 'full-width' && rendererFullWidthStyles, appearance === 'full-width' && !isTableResizingEnabled(appearance) && rendererFullWidthStylesForTableResizing, telepointerStyles, whitespaceSharedStyles, blockquoteSharedStyles, fg('platform_editor_typography_ugc') ? headingsSharedStylesWithEditorUGC : headingsSharedStyles, headingWithAlignmentStyles, ruleSharedStyles, fg('platform_editor_typography_ugc') ? paragraphSharedStylesWithEditorUGC : paragraphSharedStyles, listsSharedStyles, browser.gecko && listsSharedStylesForGekko, indentationSharedStyles, blockMarksSharedStyles, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, textColorStyles, backgroundColorStyles, tasksAndDecisionsStyles, smartCardStyles, fg('platform-linking-visual-refresh-v1') && smartCardStylesAvatarFix, fg('smartcard_avatar_margin_fix') && smartCardStylesAvatarMarginFix,
       // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
       fg('editor_inline_comments_on_inline_nodes') && rendererAnnotationStyles,
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning, @atlaskit/platform/ensure-feature-flag-prefix

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

@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "118.4.1";
+const packageVersion = "118.5.1";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/ui/annotations/context.js

@@ -1,85 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React, { createContext } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { createContext } from 'react';
 export const ProvidersContext = /*#__PURE__*/createContext(null);
-export const InlineCommentsStateContext = /*#__PURE__*/createContext({});
-
-/**
- * @private
- * @deprecated The FG platform_renderer_annotation_draft_position_fix will make this context redundant as the draft position
- * has been moved to the AnnotationRangeProvider in order to be more consistent with the hover and selection ranges.
- * Once the FG is rolled out this context will be removed. Please ensure any changes are duplicated to the AnnotationRangeProvider.
- */
-export const AnnotationsDraftContext = /*#__PURE__*/createContext(null);
-
-/**
- * @private
- * @deprecated The FG platform_renderer_annotation_draft_position_fix will make this context redundant as the draft position
- * has been moved to the AnnotationRangeProvider in order to be more consistent with the hover and selection ranges.
- * Once the FG is rolled out this context will be removed. Please ensure any changes are duplicated to the AnnotationRangeProvider.
- */
-// Ignored via go/ees005
-// eslint-disable-next-line @repo/internal/react/no-class-components
-export class AnnotationsDraftContextWrapper extends React.Component {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "state", {
-      position: null
-    });
-    _defineProperty(this, "applyAnnotationDraftAt", nextPosition => {
-      const {
-        setDraftRange
-      } = this.props;
-
-      // Set the draft range to preserve it downstream
-      setDraftRange();
-
-      // We need to support a new draft being made while one exists and overwrite it
-      // Set the document position for the newly created draft
-      this.setState({
-        position: nextPosition
-      });
-    });
-    _defineProperty(this, "clearAnnotationDraft", () => {
-      const {
-        clearDraftRange
-      } = this.props;
-
-      // Clear the draft range
-      clearDraftRange();
-
-      // Clear the draft position in the document
-      this.setState({
-        position: null
-      });
-    });
-  }
-  render() {
-    const {
-      children,
-      isNestedRender
-    } = this.props;
-    const {
-      position
-    } = this.state;
-    const applyAnnotationDraftAt = this.applyAnnotationDraftAt;
-    const clearAnnotationDraft = this.clearAnnotationDraft;
-
-    /*
-     * If this is a nested render, we do not provide the draft context
-     * because it has already been provided higher up the component tree
-     * and we need the original context to create draft annotations on extensions.
-     */
-    return isNestedRender && fg('confluence_frontend_fix_extension_draft_annotation') ? /*#__PURE__*/React.createElement("span", {
-      "data-testid": "context-wrapper-without-provider"
-    }, children({
-      applyAnnotationDraftAt,
-      clearAnnotationDraft
-    })) : /*#__PURE__*/React.createElement(AnnotationsDraftContext.Provider, {
-      value: position
-    }, children({
-      applyAnnotationDraftAt,
-      clearAnnotationDraft
-    }));
-  }
-}
+export const InlineCommentsStateContext = /*#__PURE__*/createContext({});