@atlaskit/renderer 112.6.13 → 112.6.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/renderer
 
+## 112.6.14
+
+### Patch Changes
+
+- [#174633](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/174633)
+  [`11d98912f520d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/11d98912f520d) -
+  Removed internal re-exports
+
 ## 112.6.13
 
 ### Patch Changes

package/dist/cjs/react/marks/annotation.js

@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _annotations = require("../../ui/annotations");
+var _element = require("../../ui/annotations/element");
 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 isAnnotationMark = exports.isAnnotationMark = function isAnnotationMark(mark) {
@@ -38,7 +38,7 @@ var AnnotationComponent = function AnnotationComponent(_ref) {
     // when using comment navigation to access comments on mediaInline
     _react.default.createElement("span", {
       id: id
-    }, children) : /*#__PURE__*/_react.default.createElement(_annotations.AnnotationMark, {
+    }, children) : /*#__PURE__*/_react.default.createElement(_element.MarkElement, {
       id: id,
       dataAttributes: data,
       annotationParentIds: annotationParentIds,

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

@@ -12,7 +12,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _reactIntlNext = require("react-intl-next");
-var _TaskItemsFormatContext = require("../../ui/TaskItemsFormatContext");
+var _TaskItemsFormatContext = require("../../ui/TaskItemsFormatContext/TaskItemsFormatContext");
 var _useInlineAnnotationProps = require("../../ui/annotations/element/useInlineAnnotationProps");
 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; }

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

@@ -34,7 +34,8 @@ 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 _hooks = require("../../../ui/annotations/hooks");
+var _useInlineCommentsFilter = require("../../../ui/annotations/hooks/use-inline-comments-filter");
+var _useInlineCommentSubscriber = require("../../../ui/annotations/hooks/use-inline-comment-subscriber");
 var _types = require("@atlaskit/editor-common/types");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _excluded = ["marks", "mediaSingleElement", "isDrafting"],
@@ -151,8 +152,8 @@ var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     entered = _useState4[0],
     setEntered = _useState4[1];
-  var updateSubscriber = (0, _hooks.useInlineCommentSubscriberContext)();
-  var activeParentIds = (0, _hooks.useInlineCommentsFilter)({
+  var updateSubscriber = (0, _useInlineCommentSubscriber.useInlineCommentSubscriberContext)();
+  var activeParentIds = (0, _useInlineCommentsFilter.useInlineCommentsFilter)({
     annotationIds: (_marks$map = marks === null || marks === void 0 ? void 0 : marks.map(function (mark) {
       return mark.attrs.id;
     })) !== null && _marks$map !== void 0 ? _marks$map : [''],
@@ -230,8 +231,8 @@ var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref6) {
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     entered = _useState8[0],
     setEntered = _useState8[1];
-  var updateSubscriber = (0, _hooks.useInlineCommentSubscriberContext)();
-  var activeParentIds = (0, _hooks.useInlineCommentsFilter)({
+  var updateSubscriber = (0, _useInlineCommentSubscriber.useInlineCommentSubscriberContext)();
+  var activeParentIds = (0, _useInlineCommentsFilter.useInlineCommentsFilter)({
     annotationIds: (_marks$map2 = marks === null || marks === void 0 ? void 0 : marks.map(function (mark) {
       return mark.attrs.id;
     })) !== null && _marks$map2 !== void 0 ? _marks$map2 : [''],

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

@@ -18,7 +18,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _taskItemWithProviders = _interopRequireDefault(require("./task-item-with-providers"));
 var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-context");
-var _TaskItemsFormatContext = require("../../ui/TaskItemsFormatContext");
+var _TaskItemsFormatContext = require("../../ui/TaskItemsFormatContext/TaskItemsFormatContext");
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }

package/dist/cjs/react/nodes/text-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _annotations = require("../../ui/annotations");
+var _component = require("../../ui/annotations/draft/component");
 var TextWrapper = function TextWrapper(props) {
   var startPos = props.startPos,
     endPos = props.endPos;
@@ -14,7 +14,7 @@ var TextWrapper = function TextWrapper(props) {
   if (!children) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_annotations.TextWithAnnotationDraft, {
+  return /*#__PURE__*/_react.default.createElement(_component.TextWithAnnotationDraft, {
     startPos: startPos,
     endPos: endPos,
     textHighlighter: props.textHighlighter,

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

@@ -65,7 +65,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "112.6.13";
+var packageVersion = "112.6.14";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

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

@@ -8,7 +8,9 @@ exports.MarkElement = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _mark = require("./mark");
-var _hooks = require("../hooks");
+var _useInlineCommentsFilter = require("../hooks/use-inline-comments-filter");
+var _useInlineCommentSubscriber = require("../hooks/use-inline-comment-subscriber");
+var _useEvents = require("../hooks/use-events");
 var _context = require("../context");
 var _types = require("@atlaskit/editor-common/types");
 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); }
@@ -19,9 +21,9 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
     dataAttributes = _ref.dataAttributes,
     id = _ref.id,
     useBlockLevel = _ref.useBlockLevel;
-  var updateSubscriber = (0, _hooks.useInlineCommentSubscriberContext)();
+  var updateSubscriber = (0, _useInlineCommentSubscriber.useInlineCommentSubscriberContext)();
   var states = (0, _react.useContext)(_context.InlineCommentsStateContext);
-  var _useHasFocusEvent = (0, _hooks.useHasFocusEvent)({
+  var _useHasFocusEvent = (0, _useEvents.useHasFocusEvent)({
       id: id,
       updateSubscriber: updateSubscriber
     }),
@@ -44,7 +46,7 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
       eventTarget: eventTarget
     });
   }, [updateSubscriber, useBlockLevel]);
-  var activeParentIds = (0, _hooks.useInlineCommentsFilter)({
+  var activeParentIds = (0, _useInlineCommentsFilter.useInlineCommentsFilter)({
     annotationIds: annotationParentIds,
     filter: {
       state: _adfSchema.AnnotationMarkStates.ACTIVE

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

@@ -9,7 +9,7 @@ exports.Mounter = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _draft = require("../draft");
+var _dom = require("../draft/dom");
 var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _RendererActionsContext = require("../../RendererActionsContext");
@@ -91,7 +91,7 @@ var Mounter = exports.Mounter = /*#__PURE__*/_react.default.memo(function (props
     }
     window.requestAnimationFrame(function () {
       if (options.keepNativeSelection) {
-        (0, _draft.updateWindowSelectionAroundDraft)(documentPosition);
+        (0, _dom.updateWindowSelectionAroundDraft)(documentPosition);
       } else {
         var sel = window.getSelection();
         if (sel) {

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

@@ -4,19 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "AnnotationMark", {
-  enumerable: true,
-  get: function get() {
-    return _element.MarkElement;
-  }
-});
 exports.AnnotationsWrapper = exports.AnnotationsPositionContext = void 0;
-Object.defineProperty(exports, "TextWithAnnotationDraft", {
-  enumerable: true,
-  get: function get() {
-    return _draft.TextWithAnnotationDraft;
-  }
-});
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _view = require("./view");
@@ -27,8 +15,6 @@ var _useEvents = require("./hooks/use-events");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _AnnotationRangeContext = require("./contexts/AnnotationRangeContext");
 var _AnnotationHoverContext = require("./contexts/AnnotationHoverContext");
-var _draft = require("./draft");
-var _element = require("./element");
 var LoadAnnotations = /*#__PURE__*/_react.default.memo(function (_ref) {
   var adfDocument = _ref.adfDocument,
     isNestedRender = _ref.isNestedRender,

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

@@ -10,7 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _draft = require("../draft");
+var _dom = require("../draft/dom");
 var _types = require("@atlaskit/analytics-listeners/types");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _getRendererRangeInlineNodeNames = require("../../../actions/get-renderer-range-inline-node-names");
@@ -130,7 +130,7 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     }
     window.requestAnimationFrame(function () {
       if (options.keepNativeSelection) {
-        (0, _draft.updateWindowSelectionAroundDraft)(documentPosition);
+        (0, _dom.updateWindowSelectionAroundDraft)(documentPosition);
       } else {
         var sel = window.getSelection();
         if (sel) {

package/dist/cjs/ui/annotations/view/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.AnnotationView = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _context = require("../context");
-var _hooks = require("../hooks");
+var _useEvents = require("../hooks/use-events");
 var _RendererActionsContext = require("../../../ui/RendererActionsContext");
 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; }
@@ -16,7 +16,7 @@ var AnnotationView = exports.AnnotationView = function AnnotationView(props) {
   var actionContext = (0, _react.useContext)(_RendererActionsContext.RendererContext);
   var inlineCommentProvider = providers && providers.inlineComment;
   var updateSubscriber = inlineCommentProvider && inlineCommentProvider.updateSubscriber || null;
-  var viewComponentProps = (0, _hooks.useAnnotationClickEvent)({
+  var viewComponentProps = (0, _useEvents.useAnnotationClickEvent)({
     updateSubscriber: updateSubscriber,
     createAnalyticsEvent: props.createAnalyticsEvent,
     isNestedRender: props.isNestedRender

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

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.AnnotationsContextWrapper = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _context = require("./context");
-var _hover = require("./hover");
-var _selection = require("./selection");
+var _rangeValidator = require("./hover/range-validator");
+var _rangeValidator2 = require("./selection/range-validator");
 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; }
@@ -37,13 +37,13 @@ var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function Ann
   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(_hover.HoverRangeValidator, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, !!hoverComponent && /*#__PURE__*/_react.default.createElement(_rangeValidator.RangeValidator, {
       createAnalyticsEvent: createAnalyticsEvent,
       rendererRef: rendererRef,
       component: hoverComponent,
       applyAnnotationDraftAt: applyAnnotationDraftAt,
       clearAnnotationDraft: clearAnnotationDraft
-    }), !!selectionComponent && /*#__PURE__*/_react.default.createElement(_selection.SelectionRangeValidator, {
+    }), !!selectionComponent && /*#__PURE__*/_react.default.createElement(_rangeValidator2.SelectionRangeValidator, {
       createAnalyticsEvent: createAnalyticsEvent,
       rendererRef: rendererRef,
       selectionComponent: selectionComponent,

package/dist/es2019/react/marks/annotation.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { buildAnnotationMarkDataAttributes } from '@atlaskit/adf-schema';
-import { AnnotationMark } from '../../ui/annotations';
+import { MarkElement as AnnotationMark } from '../../ui/annotations/element';
 export const isAnnotationMark = mark => {
   return mark && mark.type && mark.type.name === 'annotation';
 };

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

@@ -3,7 +3,7 @@ import React, { memo } from 'react';
 import { DateSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { isPastDate, timestampToString, timestampToTaskContext } from '@atlaskit/editor-common/utils';
 import { injectIntl } from 'react-intl-next';
-import { useTaskItemsFormatContext } from '../../ui/TaskItemsFormatContext';
+import { useTaskItemsFormatContext } from '../../ui/TaskItemsFormatContext/TaskItemsFormatContext';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 const Date = /*#__PURE__*/memo(function Date(props) {
   const inlineAnnotationProps = useInlineAnnotationProps(props);

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

@@ -24,7 +24,8 @@ 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 { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
+import { useInlineCommentsFilter } from '../../../ui/annotations/hooks/use-inline-comments-filter';
+import { useInlineCommentSubscriberContext } from '../../../ui/annotations/hooks/use-inline-comment-subscriber';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766

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

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import { ProviderFactory, WithProviders } from '@atlaskit/editor-common/provider-factory';
 import TaskItemWithProviders from './task-item-with-providers';
 import { FabricElementsAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { TaskItemsFormatProvider, TaskItemsFormatConsumer } from '../../ui/TaskItemsFormatContext';
+import { TaskItemsFormatProvider, TaskItemsFormatConsumer } from '../../ui/TaskItemsFormatContext/TaskItemsFormatContext';
 export default class TaskItem extends PureComponent {
   constructor(props) {
     super(props);

package/dist/es2019/react/nodes/text-wrapper.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TextWithAnnotationDraft } from '../../ui/annotations';
+import { TextWithAnnotationDraft } from '../../ui/annotations/draft/component';
 const TextWrapper = props => {
   const {
     startPos,

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

@@ -45,7 +45,7 @@ import { countNodes } from './count-nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "112.6.13";
+const packageVersion = "112.6.14";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/es2019/ui/annotations/element/index.js

@@ -1,7 +1,9 @@
 import React, { useMemo, useCallback, useContext } from 'react';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { MarkComponent } from './mark';
-import { useInlineCommentSubscriberContext, useHasFocusEvent, useInlineCommentsFilter } from '../hooks';
+import { useInlineCommentsFilter } from '../hooks/use-inline-comments-filter';
+import { useInlineCommentSubscriberContext } from '../hooks/use-inline-comment-subscriber';
+import { useHasFocusEvent } from '../hooks/use-events';
 import { InlineCommentsStateContext } from '../context';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 const MarkElement = ({

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

@@ -1,6 +1,6 @@
 import React, { useCallback, useState, useContext } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { updateWindowSelectionAroundDraft } from '../draft';
+import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';

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

@@ -63,6 +63,4 @@ export const AnnotationsWrapper = props => {
     isNestedRender: isNestedRender,
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));
-};
-export { TextWithAnnotationDraft } from './draft';
-export { MarkElement as AnnotationMark } from './element';
+};

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

@@ -1,7 +1,7 @@
 import React, { useCallback, useState, useContext, useMemo } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { updateWindowSelectionAroundDraft } from '../draft';
+import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getRendererRangeInlineNodeNames } from '../../../actions/get-renderer-range-inline-node-names';

package/dist/es2019/ui/annotations/view/index.js

@@ -1,6 +1,6 @@
 import React, { useContext, useMemo, useCallback } from 'react';
 import { ProvidersContext } from '../context';
-import { useAnnotationClickEvent } from '../hooks';
+import { useAnnotationClickEvent } from '../hooks/use-events';
 import { RendererContext } from '../../../ui/RendererActionsContext';
 const AnnotationView = props => {
   const providers = useContext(ProvidersContext);

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

@@ -1,7 +1,7 @@
 import React, { useCallback, useContext } from 'react';
 import { AnnotationsDraftContextWrapper, ProvidersContext } from './context';
-import { HoverRangeValidator } from './hover';
-import { SelectionRangeValidator } from './selection';
+import { RangeValidator as HoverRangeValidator } from './hover/range-validator';
+import { SelectionRangeValidator } from './selection/range-validator';
 import { useAnnotationRangeDispatch, useAnnotationRangeState } from './contexts/AnnotationRangeContext';
 export const AnnotationsContextWrapper = props => {
   const providers = useContext(ProvidersContext);

package/dist/esm/react/marks/annotation.js

@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import React from 'react';
 import { buildAnnotationMarkDataAttributes } from '@atlaskit/adf-schema';
-import { AnnotationMark } from '../../ui/annotations';
+import { MarkElement as AnnotationMark } from '../../ui/annotations/element';
 export var isAnnotationMark = function isAnnotationMark(mark) {
   return mark && mark.type && mark.type.name === 'annotation';
 };

package/dist/esm/react/nodes/date.js

@@ -4,7 +4,7 @@ import React, { memo } from 'react';
 import { DateSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { isPastDate, timestampToString, timestampToTaskContext } from '@atlaskit/editor-common/utils';
 import { injectIntl } from 'react-intl-next';
-import { useTaskItemsFormatContext } from '../../ui/TaskItemsFormatContext';
+import { useTaskItemsFormatContext } from '../../ui/TaskItemsFormatContext/TaskItemsFormatContext';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 var Date = /*#__PURE__*/memo(function Date(props) {
   var inlineAnnotationProps = useInlineAnnotationProps(props);

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

@@ -40,7 +40,8 @@ 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 { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
+import { useInlineCommentsFilter } from '../../../ui/annotations/hooks/use-inline-comments-filter';
+import { useInlineCommentSubscriberContext } from '../../../ui/annotations/hooks/use-inline-comment-subscriber';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766

package/dist/esm/react/nodes/taskItem.js

@@ -12,7 +12,7 @@ import React, { PureComponent } from 'react';
 import { ProviderFactory, WithProviders } from '@atlaskit/editor-common/provider-factory';
 import TaskItemWithProviders from './task-item-with-providers';
 import { FabricElementsAnalyticsContext } from '@atlaskit/analytics-namespaced-context';
-import { TaskItemsFormatProvider, TaskItemsFormatConsumer } from '../../ui/TaskItemsFormatContext';
+import { TaskItemsFormatProvider, TaskItemsFormatConsumer } from '../../ui/TaskItemsFormatContext/TaskItemsFormatContext';
 var TaskItem = /*#__PURE__*/function (_PureComponent) {
   _inherits(TaskItem, _PureComponent);
   var _super = _createSuper(TaskItem);

package/dist/esm/react/nodes/text-wrapper.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TextWithAnnotationDraft } from '../../ui/annotations';
+import { TextWithAnnotationDraft } from '../../ui/annotations/draft/component';
 var TextWrapper = function TextWrapper(props) {
   var startPos = props.startPos,
     endPos = props.endPos;

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

@@ -55,7 +55,7 @@ import { countNodes } from './count-nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "112.6.13";
+var packageVersion = "112.6.14";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',

package/dist/esm/ui/annotations/element/index.js

@@ -1,7 +1,9 @@
 import React, { useMemo, useCallback, useContext } from 'react';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { MarkComponent } from './mark';
-import { useInlineCommentSubscriberContext, useHasFocusEvent, useInlineCommentsFilter } from '../hooks';
+import { useInlineCommentsFilter } from '../hooks/use-inline-comments-filter';
+import { useInlineCommentSubscriberContext } from '../hooks/use-inline-comment-subscriber';
+import { useHasFocusEvent } from '../hooks/use-events';
 import { InlineCommentsStateContext } from '../context';
 import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 var MarkElement = function MarkElement(_ref) {

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

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useState, useContext } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { updateWindowSelectionAroundDraft } from '../draft';
+import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { RendererContext as ActionsContext } from '../../RendererActionsContext';

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

@@ -59,6 +59,4 @@ export var AnnotationsWrapper = function AnnotationsWrapper(props) {
     isNestedRender: isNestedRender,
     createAnalyticsEvent: createAnalyticsEvent
   }), children)))));
-};
-export { TextWithAnnotationDraft } from './draft';
-export { MarkElement as AnnotationMark } from './element';
+};

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

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useState, useContext, useMemo } from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { updateWindowSelectionAroundDraft } from '../draft';
+import { updateWindowSelectionAroundDraft } from '../draft/dom';
 import { FabricChannel } from '@atlaskit/analytics-listeners/types';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getRendererRangeInlineNodeNames } from '../../../actions/get-renderer-range-inline-node-names';

package/dist/esm/ui/annotations/view/index.js

@@ -1,6 +1,6 @@
 import React, { useContext, useMemo, useCallback } from 'react';
 import { ProvidersContext } from '../context';
-import { useAnnotationClickEvent } from '../hooks';
+import { useAnnotationClickEvent } from '../hooks/use-events';
 import { RendererContext } from '../../../ui/RendererActionsContext';
 var AnnotationView = function AnnotationView(props) {
   var providers = useContext(ProvidersContext);

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

@@ -1,7 +1,7 @@
 import React, { useCallback, useContext } from 'react';
 import { AnnotationsDraftContextWrapper, ProvidersContext } from './context';
-import { HoverRangeValidator } from './hover';
-import { SelectionRangeValidator } from './selection';
+import { RangeValidator as HoverRangeValidator } from './hover/range-validator';
+import { SelectionRangeValidator } from './selection/range-validator';
 import { useAnnotationRangeDispatch, useAnnotationRangeState } from './contexts/AnnotationRangeContext';
 export var AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
   var providers = useContext(ProvidersContext);

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

@@ -4,5 +4,3 @@ export declare const AnnotationsPositionContext: React.Context<{
     startPos: number;
 }>;
 export declare const AnnotationsWrapper: (props: AnnotationsWrapperProps) => JSX.Element;
-export { TextWithAnnotationDraft } from './draft';
-export { MarkElement as AnnotationMark } from './element';

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

@@ -4,5 +4,3 @@ export declare const AnnotationsPositionContext: React.Context<{
     startPos: number;
 }>;
 export declare const AnnotationsWrapper: (props: AnnotationsWrapperProps) => JSX.Element;
-export { TextWithAnnotationDraft } from './draft';
-export { MarkElement as AnnotationMark } from './element';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "112.6.13",
+	"version": "112.6.14",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/code": "^15.6.0",
-		"@atlaskit/editor-common": "^96.1.0",
+		"@atlaskit/editor-common": "^96.2.0",
 		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-prosemirror": "6.2.1",
@@ -50,7 +50,7 @@
 		"@atlaskit/status": "^1.8.0",
 		"@atlaskit/task-decision": "^17.11.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.23.0",
 		"@atlaskit/tokens": "^2.4.0",
 		"@atlaskit/tooltip": "^18.9.0",
 		"@babel/runtime": "^7.0.0",

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

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "TaskItemsFormatConsumer", {
-  enumerable: true,
-  get: function get() {
-    return _TaskItemsFormatContext.TaskItemsFormatConsumer;
-  }
-});
-Object.defineProperty(exports, "TaskItemsFormatProvider", {
-  enumerable: true,
-  get: function get() {
-    return _TaskItemsFormatContext.TaskItemsFormatProvider;
-  }
-});
-Object.defineProperty(exports, "useTaskItemsFormatContext", {
-  enumerable: true,
-  get: function get() {
-    return _TaskItemsFormatContext.useTaskItemsFormatContext;
-  }
-});
-var _TaskItemsFormatContext = require("./TaskItemsFormatContext");

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

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "TextWithAnnotationDraft", {
-  enumerable: true,
-  get: function get() {
-    return _component.TextWithAnnotationDraft;
-  }
-});
-Object.defineProperty(exports, "updateWindowSelectionAroundDraft", {
-  enumerable: true,
-  get: function get() {
-    return _dom.updateWindowSelectionAroundDraft;
-  }
-});
-var _dom = require("./dom");
-var _component = require("./component");

package/dist/cjs/ui/annotations/hooks/index.js

@@ -1,32 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "useAnnotationClickEvent", {
-  enumerable: true,
-  get: function get() {
-    return _useEvents.useAnnotationClickEvent;
-  }
-});
-Object.defineProperty(exports, "useHasFocusEvent", {
-  enumerable: true,
-  get: function get() {
-    return _useEvents.useHasFocusEvent;
-  }
-});
-Object.defineProperty(exports, "useInlineCommentSubscriberContext", {
-  enumerable: true,
-  get: function get() {
-    return _useInlineCommentSubscriber.useInlineCommentSubscriberContext;
-  }
-});
-Object.defineProperty(exports, "useInlineCommentsFilter", {
-  enumerable: true,
-  get: function get() {
-    return _useInlineCommentsFilter.useInlineCommentsFilter;
-  }
-});
-var _useEvents = require("./use-events");
-var _useInlineCommentsFilter = require("./use-inline-comments-filter");
-var _useInlineCommentSubscriber = require("./use-inline-comment-subscriber");

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

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "HoverRangeValidator", {
-  enumerable: true,
-  get: function get() {
-    return _rangeValidator.RangeValidator;
-  }
-});
-var _rangeValidator = require("./range-validator");

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

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "SelectionRangeValidator", {
-  enumerable: true,
-  get: function get() {
-    return _rangeValidator.SelectionRangeValidator;
-  }
-});
-var _rangeValidator = require("./range-validator");

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

@@ -1 +0,0 @@
-export { TaskItemsFormatProvider, TaskItemsFormatConsumer, useTaskItemsFormatContext } from './TaskItemsFormatContext';

package/dist/es2019/ui/annotations/draft/index.js

@@ -1,2 +0,0 @@
-export { updateWindowSelectionAroundDraft } from './dom';
-export { TextWithAnnotationDraft } from './component';

package/dist/es2019/ui/annotations/hooks/index.js

@@ -1,3 +0,0 @@
-export { useHasFocusEvent, useAnnotationClickEvent } from './use-events';
-export { useInlineCommentsFilter } from './use-inline-comments-filter';
-export { useInlineCommentSubscriberContext } from './use-inline-comment-subscriber';

package/dist/es2019/ui/annotations/hover/index.js

@@ -1 +0,0 @@
-export { RangeValidator as HoverRangeValidator } from './range-validator';

package/dist/es2019/ui/annotations/selection/index.js

@@ -1 +0,0 @@
-export { SelectionRangeValidator } from './range-validator';

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

@@ -1 +0,0 @@
-export { TaskItemsFormatProvider, TaskItemsFormatConsumer, useTaskItemsFormatContext } from './TaskItemsFormatContext';

package/dist/esm/ui/annotations/draft/index.js

@@ -1,2 +0,0 @@
-export { updateWindowSelectionAroundDraft } from './dom';
-export { TextWithAnnotationDraft } from './component';

package/dist/esm/ui/annotations/hooks/index.js

@@ -1,3 +0,0 @@
-export { useHasFocusEvent, useAnnotationClickEvent } from './use-events';
-export { useInlineCommentsFilter } from './use-inline-comments-filter';
-export { useInlineCommentSubscriberContext } from './use-inline-comment-subscriber';

package/dist/esm/ui/annotations/hover/index.js

@@ -1 +0,0 @@
-export { RangeValidator as HoverRangeValidator } from './range-validator';

package/dist/esm/ui/annotations/selection/index.js

@@ -1 +0,0 @@
-export { SelectionRangeValidator } from './range-validator';

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

@@ -1 +0,0 @@
-export { TaskItemsFormatProvider, TaskItemsFormatConsumer, useTaskItemsFormatContext, } from './TaskItemsFormatContext';

package/dist/types/ui/annotations/draft/index.d.ts

@@ -1,2 +0,0 @@
-export { updateWindowSelectionAroundDraft } from './dom';
-export { TextWithAnnotationDraft } from './component';

package/dist/types/ui/annotations/hooks/index.d.ts

@@ -1,3 +0,0 @@
-export { useHasFocusEvent, useAnnotationClickEvent } from './use-events';
-export { useInlineCommentsFilter } from './use-inline-comments-filter';
-export { useInlineCommentSubscriberContext } from './use-inline-comment-subscriber';

package/dist/types/ui/annotations/hover/index.d.ts

@@ -1 +0,0 @@
-export { RangeValidator as HoverRangeValidator } from './range-validator';

package/dist/types/ui/annotations/selection/index.d.ts

@@ -1 +0,0 @@
-export { SelectionRangeValidator } from './range-validator';

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

@@ -1 +0,0 @@
-export { TaskItemsFormatProvider, TaskItemsFormatConsumer, useTaskItemsFormatContext, } from './TaskItemsFormatContext';

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

@@ -1,2 +0,0 @@
-export { updateWindowSelectionAroundDraft } from './dom';
-export { TextWithAnnotationDraft } from './component';

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

@@ -1,3 +0,0 @@
-export { useHasFocusEvent, useAnnotationClickEvent } from './use-events';
-export { useInlineCommentsFilter } from './use-inline-comments-filter';
-export { useInlineCommentSubscriberContext } from './use-inline-comment-subscriber';

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

@@ -1 +0,0 @@
-export { RangeValidator as HoverRangeValidator } from './range-validator';

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

@@ -1 +0,0 @@
-export { SelectionRangeValidator } from './range-validator';