@atlaskit/renderer 118.4.1 → 118.5.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/renderer
 
+## 118.5.1
+
+### Patch Changes
+
+- [#161072](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/161072)
+  [`a0c4a3b5661b9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a0c4a3b5661b9) -
+  EDITOR-775 - Could not create new comment on extension Excerpt in renderer
+- Updated dependencies
+
+## 118.5.0
+
+### Minor Changes
+
+- [#158238](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/158238)
+  [`6e8934b998a34`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e8934b998a34) -
+  Cleanup FG platform_renderer_annotation_draft_position_fix and removed all deprecated code as it
+  no longer needed since this gate is rolled out
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 118.4.1
 
 ### Patch Changes

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

@@ -29,7 +29,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _events = require("../../../analytics/events");
 var _annotation = _interopRequireDefault(require("../../marks/annotation"));
-var _context = require("../../../ui/annotations/context");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _reactIntlNext = require("react-intl-next");
 var _useInlineCommentsFilter = require("../../../ui/annotations/hooks/use-inline-comments-filter");
@@ -434,10 +433,8 @@ var Media = /*#__PURE__*/function (_PureComponent) {
   }]);
 }(_react.PureComponent);
 var MediaWithDraftAnnotation = function MediaWithDraftAnnotation(props) {
-  var draftPositionOld = _react.default.useContext(_context.AnnotationsDraftContext);
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
-    hoverDraftDocumentPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
-  var draftPosition = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? hoverDraftDocumentPosition : draftPositionOld;
+    draftPosition = _useAnnotationRangeSt.hoverDraftDocumentPosition;
   var dataAttributes = props.dataAttributes;
   var pos = dataAttributes && dataAttributes['data-renderer-start-pos'];
   var _useState9 = (0, _react.useState)(),

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

@@ -15,6 +15,7 @@ var _react = _interopRequireDefault(require("react"));
 var _styles = require("@atlaskit/editor-common/styles");
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _style = require("../../ui/Renderer/style");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("@atlaskit/editor-common/utils");
 var _types = require("@atlaskit/editor-common/types");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -24,11 +25,30 @@ var _sticky = require("./table/sticky");
 var _table = require("./table/table");
 var _appearance = require("../utils/appearance");
 var _TableStickyScrollbar = require("./TableStickyScrollbar");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/ui-styling-standard/enforce-style-prop */
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/ui-styling-standard/enforce-style-prop, @repo/internal/react/no-class-components */
+var 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%'
+};
+var stickyContainerAdditionalStyles = {
+  visibility: 'hidden',
+  overflowX: 'auto',
+  position: 'sticky',
+  bottom: "var(--ds-space-0, 0px)",
+  zIndex: 1
+};
 var isTableResizingEnabled = exports.isTableResizingEnabled = function isTableResizingEnabled(appearance) {
   return (0, _appearance.isFullWidthOrFullPageAppearance)(appearance) || (0, _appearance.isCommentAppearance)(appearance) && (0, _experiments.editorExperiment)('support_table_in_comment', true, {
     exposure: true
@@ -125,6 +145,9 @@ var tableCanBeSticky = exports.tableCanBeSticky = function tableCanBeSticky(node
  */
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
+/**
+ *
+ */
 var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Component) {
   function TableContainer() {
     var _this;
@@ -504,23 +527,13 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
         isPresentational: isPresentational
       }, this.grabFirstRowRef(children))), isStickyScrollbarEnabled(this.props.rendererAppearance) && /*#__PURE__*/_react.default.createElement("div", {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-        className: _styles.TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_CONTAINER,
+        className: "".concat(_styles.TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_CONTAINER).concat((0, _platformFeatureFlags.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: (0, _platformFeatureFlags.fg)('confluence_frontend_table_scrollbar_ttvc_fix') ? _objectSpread(_objectSpread({}, stickyContainerBaseStyles), stickyContainerAdditionalStyles) : stickyContainerBaseStyles
       }, /*#__PURE__*/_react.default.createElement("div", {
         style: {
-          width: (_this$tableRef$curren = this.tableRef.current) === null || _this$tableRef$curren === void 0 ? void 0 : _this$tableRef$curren.clientWidth,
+          width: (0, _platformFeatureFlags.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%'
         }
@@ -537,6 +550,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
  */
 // Ignored via go/ees005
 // eslint-disable-next-line @repo/internal/react/no-class-components
+/**
+ *
+ */
 var TableProcessorWithContainerStyles = exports.TableProcessorWithContainerStyles = /*#__PURE__*/function (_React$Component2) {
   function TableProcessorWithContainerStyles() {
     var _this2;

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

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

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

@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "118.4.1";
+var packageVersion = "118.5.1";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

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

@@ -1,105 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ProvidersContext = exports.InlineCommentsStateContext = exports.AnnotationsDraftContextWrapper = exports.AnnotationsDraftContext = void 0;
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-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; }
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+exports.ProvidersContext = exports.InlineCommentsStateContext = void 0;
+var _react = require("react");
 var ProvidersContext = exports.ProvidersContext = /*#__PURE__*/(0, _react.createContext)(null);
-var InlineCommentsStateContext = exports.InlineCommentsStateContext = /*#__PURE__*/(0, _react.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.
- */
-var AnnotationsDraftContext = exports.AnnotationsDraftContext = /*#__PURE__*/(0, _react.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
-var AnnotationsDraftContextWrapper = exports.AnnotationsDraftContextWrapper = /*#__PURE__*/function (_React$Component) {
-  function AnnotationsDraftContextWrapper() {
-    var _this;
-    (0, _classCallCheck2.default)(this, AnnotationsDraftContextWrapper);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _callSuper(this, AnnotationsDraftContextWrapper, [].concat(args));
-    (0, _defineProperty2.default)(_this, "state", {
-      position: null
-    });
-    (0, _defineProperty2.default)(_this, "applyAnnotationDraftAt", function (nextPosition) {
-      var setDraftRange = _this.props.setDraftRange;
-
-      // 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
-      });
-    });
-    (0, _defineProperty2.default)(_this, "clearAnnotationDraft", function () {
-      var clearDraftRange = _this.props.clearDraftRange;
-
-      // Clear the draft range
-      clearDraftRange();
-
-      // Clear the draft position in the document
-      _this.setState({
-        position: null
-      });
-    });
-    return _this;
-  }
-  (0, _inherits2.default)(AnnotationsDraftContextWrapper, _React$Component);
-  return (0, _createClass2.default)(AnnotationsDraftContextWrapper, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        children = _this$props.children,
-        isNestedRender = _this$props.isNestedRender;
-      var position = this.state.position;
-      var applyAnnotationDraftAt = this.applyAnnotationDraftAt;
-      var 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 && (0, _platformFeatureFlags.fg)('confluence_frontend_fix_extension_draft_annotation') ? /*#__PURE__*/_react.default.createElement("span", {
-        "data-testid": "context-wrapper-without-provider"
-      }, children({
-        applyAnnotationDraftAt: applyAnnotationDraftAt,
-        clearAnnotationDraft: clearAnnotationDraft
-      })) : /*#__PURE__*/_react.default.createElement(AnnotationsDraftContext.Provider, {
-        value: position
-      }, children({
-        applyAnnotationDraftAt: applyAnnotationDraftAt,
-        clearAnnotationDraft: clearAnnotationDraft
-      }));
-    }
-  }]);
-}(_react.default.Component);
+var InlineCommentsStateContext = exports.InlineCommentsStateContext = /*#__PURE__*/(0, _react.createContext)({});

package/dist/cjs/ui/annotations/contexts/AnnotationRangeContext.js

@@ -5,18 +5,15 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useAnnotationRangeState = exports.useAnnotationRangeDispatch = exports.AnnotationRangeProviderInner = exports.AnnotationRangeProvider = void 0;
+exports.useAnnotationRangeState = exports.useAnnotationRangeDispatch = exports.AnnotationRangeStateContext = exports.AnnotationRangeProviderInner = exports.AnnotationRangeProvider = exports.AnnotationRangeDispatchContext = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var initialState = {
-  range: null,
-  draftRange: null,
   type: null,
   selectionRange: null,
   hoverRange: null,
@@ -25,80 +22,8 @@ var initialState = {
   selectionDraftDocumentPosition: null,
   hoverDraftDocumentPosition: null
 };
-function reducerOld(state, action) {
-  switch (action.type) {
-    case 'clear':
-      return initialState;
-    case 'clearSelection':
-      if (state.type === 'selection') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          range: null,
-          type: null
-        });
-      }
-      return state;
-    case 'clearDraftSelection':
-      if (state.type === 'selection') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          draftRange: null
-        });
-      }
-      return state;
-    case 'clearDraftHover':
-      if (state.type === 'hover') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          draftRange: null
-        });
-      }
-      return state;
-    case 'clearHover':
-      if (state.type === 'hover') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          range: null,
-          draftRange: null,
-          type: null
-        });
-      }
-      return state;
-    case 'setSelection':
-      if (state.range !== action.range || state.type !== 'selection') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          range: action.range,
-          type: 'selection'
-        });
-      }
-      return state;
-    case 'setHover':
-      if (state.range !== action.range || state.type !== 'hover') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          range: action.range,
-          type: 'hover'
-        });
-      }
-      return state;
-    case 'setDraftSelection':
-      if (state.draftRange !== action.draftRange || state.type !== 'selection') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          range: null,
-          draftRange: action.draftRange,
-          type: null
-        });
-      }
-      return state;
-    case 'setDraftHover':
-      if (state.draftRange !== action.draftRange || state.type !== 'hover') {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          draftRange: action.draftRange
-        });
-      }
-      return state;
-  }
-  return state;
-}
-function reducerNew(state, action) {
+function reducer(state, action) {
   switch (action.type) {
-    case 'clear':
-      return initialState;
     case 'clearSelection':
       if (state.selectionRange !== null) {
         return _objectSpread(_objectSpread({}, state), {}, {
@@ -173,9 +98,8 @@ function reducerNew(state, action) {
       }
       return state;
   }
-  return state;
 }
-var AnnotationRangeStateContext = /*#__PURE__*/(0, _react.createContext)({
+var AnnotationRangeStateContext = exports.AnnotationRangeStateContext = /*#__PURE__*/(0, _react.createContext)({
   range: null,
   type: null,
   selectionDraftRange: null,
@@ -183,31 +107,21 @@ var AnnotationRangeStateContext = /*#__PURE__*/(0, _react.createContext)({
   selectionDraftDocumentPosition: null,
   hoverDraftDocumentPosition: null
 });
-var AnnotationRangeDispatchContext = /*#__PURE__*/(0, _react.createContext)({
-  clearRange: function clearRange() {},
+var AnnotationRangeDispatchContext = exports.AnnotationRangeDispatchContext = /*#__PURE__*/(0, _react.createContext)({
   clearSelectionRange: function clearSelectionRange() {},
   clearHoverRange: function clearHoverRange() {},
   setSelectionRange: function setSelectionRange() {},
-  // if platform_renderer_annotation_draft_position_fix is off; then
-  setDraftRange: function setDraftRange() {},
-  clearDraftRange: function clearDraftRange() {},
-  // end-if
-
-  // if platform_renderer_annotation_draft_position_fix is on; then
   promoteSelectionToDraft: function promoteSelectionToDraft() {},
   promoteHoverToDraft: function promoteHoverToDraft() {},
   clearSelectionDraft: function clearSelectionDraft() {},
   clearHoverDraft: function clearHoverDraft() {}
-  // end-if
 });
 var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = function AnnotationRangeProviderInner(_ref) {
   var children = _ref.children,
     allowCommentsOnMedia = _ref.allowCommentsOnMedia;
-  var _useReducer = (0, _react.useReducer)((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? reducerNew : reducerOld, initialState),
+  var _useReducer = (0, _react.useReducer)(reducer, initialState),
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
     _useReducer2$ = _useReducer2[0],
-    range = _useReducer2$.range,
-    draftRange = _useReducer2$.draftRange,
     selectionRange = _useReducer2$.selectionRange,
     hoverRange = _useReducer2$.hoverRange,
     type = _useReducer2$.type,
@@ -216,27 +130,11 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
     hoverDraftRange = _useReducer2$.hoverDraftRange,
     hoverDraftDocumentPosition = _useReducer2$.hoverDraftDocumentPosition,
     dispatch = _useReducer2[1];
-  var clearRange = (0, _react.useCallback)(function () {
-    return dispatch({
-      type: 'clear'
-    });
-  }, []);
   var clearSelectionRange = (0, _react.useCallback)(function () {
     return dispatch({
       type: 'clearSelection'
     });
   }, []);
-  var clearDraftRange = (0, _react.useCallback)(function (type) {
-    if (type === 'hover') {
-      dispatch({
-        type: 'clearDraftHover'
-      });
-      return;
-    }
-    dispatch({
-      type: 'clearDraftSelection'
-    });
-  }, []);
   var clearHoverRange = (0, _react.useCallback)(function () {
     return dispatch({
       type: 'clearHover'
@@ -248,19 +146,6 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
       range: range
     });
   }, []);
-  var setDraftRange = (0, _react.useCallback)(function (range, type) {
-    if (type === 'hover') {
-      dispatch({
-        type: 'setDraftHover',
-        draftRange: range
-      });
-      return;
-    }
-    dispatch({
-      type: 'setDraftSelection',
-      draftRange: range
-    });
-  }, []);
   var setHoverTarget = (0, _react.useCallback)(function (target) {
     // the HoverComponent expects an element deeply nested inside media, these classes work with the current implementation
     var mediaNode = target.querySelector('.media-card-inline-player, .media-file-card-view');
@@ -298,46 +183,29 @@ var AnnotationRangeProviderInner = exports.AnnotationRangeProviderInner = functi
     });
   }, []);
   var stateData = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-      return {
-        // We techinically have two ranges, however we only want to expose one of them at a time, because only one draft
-        // can be active at a time. The type of range is used to determine which range is active.
-        range: type === 'selection' ? selectionRange : hoverRange,
-        type: type,
-        selectionDraftRange: selectionDraftRange,
-        hoverDraftRange: hoverDraftRange,
-        selectionDraftDocumentPosition: selectionDraftDocumentPosition,
-        hoverDraftDocumentPosition: hoverDraftDocumentPosition
-      };
-    } else {
-      return {
-        range: range,
-        draftRange: draftRange,
-        type: type,
-        // I've updated some refs to use the new selectionDraftRange, this is being add here to be fowards compatible
-        // with the new changes coming in platform_renderer_annotation_draft_position_fix.
-        selectionDraftRange: draftRange,
-        hoverDraftRange: draftRange,
-        selectionDraftDocumentPosition: null,
-        hoverDraftDocumentPosition: null
-      };
-    }
-  }, [range, draftRange, selectionRange, hoverRange, type, selectionDraftRange, selectionDraftDocumentPosition, hoverDraftRange, hoverDraftDocumentPosition]);
+    return {
+      // We techinically have two ranges, however we only want to expose one of them at a time, because only one draft
+      // can be active at a time. The type of range is used to determine which range is active.
+      range: type === 'selection' ? selectionRange : hoverRange,
+      type: type,
+      selectionDraftRange: selectionDraftRange,
+      hoverDraftRange: hoverDraftRange,
+      selectionDraftDocumentPosition: selectionDraftDocumentPosition,
+      hoverDraftDocumentPosition: hoverDraftDocumentPosition
+    };
+  }, [selectionRange, hoverRange, type, selectionDraftRange, selectionDraftDocumentPosition, hoverDraftRange, hoverDraftDocumentPosition]);
   var dispatchData = (0, _react.useMemo)(function () {
     return {
-      clearRange: clearRange,
       clearSelectionRange: clearSelectionRange,
-      clearDraftRange: clearDraftRange,
       clearHoverRange: clearHoverRange,
       setSelectionRange: setSelectionRange,
-      setDraftRange: setDraftRange,
       setHoverTarget: !!allowCommentsOnMedia ? setHoverTarget : undefined,
       promoteSelectionToDraft: promoteSelectionToDraft,
       promoteHoverToDraft: promoteHoverToDraft,
       clearSelectionDraft: clearSelectionDraft,
       clearHoverDraft: clearHoverDraft
     };
-  }, [allowCommentsOnMedia, clearRange, clearSelectionRange, clearDraftRange, clearHoverRange, setSelectionRange, setDraftRange, setHoverTarget, promoteSelectionToDraft, promoteHoverToDraft, clearSelectionDraft, clearHoverDraft]);
+  }, [allowCommentsOnMedia, clearSelectionRange, clearHoverRange, setSelectionRange, setHoverTarget, promoteSelectionToDraft, promoteHoverToDraft, clearSelectionDraft, clearHoverDraft]);
   return /*#__PURE__*/_react.default.createElement(AnnotationRangeStateContext.Provider, {
     value: stateData
   }, /*#__PURE__*/_react.default.createElement(AnnotationRangeDispatchContext.Provider, {
@@ -348,20 +216,14 @@ var AnnotationRangeProvider = exports.AnnotationRangeProvider = function Annotat
   var children = _ref2.children,
     allowCommentsOnMedia = _ref2.allowCommentsOnMedia,
     isNestedRender = _ref2.isNestedRender;
-  if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-    /*
-     * If this is a nested render, we do not provide the context
-     * because it has already been provided higher up the component tree
-     * and we need the original context to create annotations on extensions.
-     */
-    return isNestedRender ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children) : /*#__PURE__*/_react.default.createElement(AnnotationRangeProviderInner, {
-      allowCommentsOnMedia: allowCommentsOnMedia
-    }, children);
-  } else {
-    return /*#__PURE__*/_react.default.createElement(AnnotationRangeProviderInner, {
-      allowCommentsOnMedia: allowCommentsOnMedia
-    }, children);
-  }
+  /*
+   * If this is a nested render, we do not provide the context
+   * because it has already been provided higher up the component tree
+   * and we need the original context to create annotations on extensions.
+   */
+  return isNestedRender ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children) : /*#__PURE__*/_react.default.createElement(AnnotationRangeProviderInner, {
+    allowCommentsOnMedia: allowCommentsOnMedia
+  }, children);
 };
 var useAnnotationRangeState = exports.useAnnotationRangeState = function useAnnotationRangeState() {
   return (0, _react.useContext)(AnnotationRangeStateContext);

package/dist/cjs/ui/annotations/draft/component.js

@@ -9,9 +9,7 @@ exports.getAnnotationIndex = exports.applyAnnotationOnText = exports.TextWithAnn
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../types");
-var _context = require("../context");
 var _text = require("./text");
 var _position = require("./position");
 var _dom = require("./dom");
@@ -122,10 +120,8 @@ var TextWithAnnotationDraft = exports.TextWithAnnotationDraft = function TextWit
       end: endPos
     };
   }, [endPos, startPos]);
-  var nextDraftPositionOld = _react.default.useContext(_context.AnnotationsDraftContext);
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
-    selectionDraftDocumentPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
-  var nextDraftPosition = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition : nextDraftPositionOld;
+    nextDraftPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
   var shouldApplyAnnotationAt = _react.default.useMemo(function () {
     if (!nextDraftPosition) {
       return false;

package/dist/cjs/ui/annotations/element/useInlineAnnotationProps.js

@@ -4,15 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useInlineAnnotationProps = useInlineAnnotationProps;
-var _react = require("react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _context = require("../context");
 var _AnnotationRangeContext = require("../contexts/AnnotationRangeContext");
 function useInlineAnnotationProps(props) {
-  var draftPositionOld = (0, _react.useContext)(_context.AnnotationsDraftContext);
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
-    selectionDraftDocumentPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
-  var draftPosition = (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? selectionDraftDocumentPosition : draftPositionOld;
+    draftPosition = _useAnnotationRangeSt.selectionDraftDocumentPosition;
   if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
     return {};
   }

package/dist/cjs/ui/annotations/hooks/user-selection.js

@@ -13,7 +13,6 @@ var useUserSelectionRange = exports.useUserSelectionRange = function useUserSele
   var rendererDOM = props.rendererRef.current;
   var selectionTimeoutRef = (0, _react.useRef)();
   var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
-    clearRange = _useAnnotationRangeDi.clearRange,
     clearSelectionRange = _useAnnotationRangeDi.clearSelectionRange,
     setSelectionRange = _useAnnotationRangeDi.setSelectionRange;
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
@@ -113,12 +112,8 @@ var useUserSelectionRange = exports.useUserSelectionRange = function useUserSele
       // Ignored via go/ees005
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
       document.removeEventListener('selectionchange', onSelectionChange);
-      if ((0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix')) {
-        clearSelectionRange();
-      } else {
-        clearRange();
-      }
+      clearSelectionRange();
     };
-  }, [rendererDOM, onSelectionChange, clearSelectionRange, clearRange]);
-  return [type, range, selectionDraftRange, (0, _platformFeatureFlags.fg)('platform_renderer_annotation_draft_position_fix') ? clearSelectionRange : clearRange];
+  }, [rendererDOM, onSelectionChange, clearSelectionRange]);
+  return [type, range, selectionDraftRange, clearSelectionRange];
 };