@atlaskit/editor-common 115.5.0 → 115.6.0

package/dist/es2019/link/LinkPicker/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -12,7 +12,7 @@ import { css, jsx } from '@emotion/react';
 import debounce from 'lodash/debounce';
 import { flushSync } from 'react-dom';
 import FocusLock from 'react-focus-lock';
-import { injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import CrossCircleIcon from '@atlaskit/icon/core/cross-circle';
@@ -28,11 +28,8 @@ import { getBrowserInfo } from '../../../utils/browser';
 import LinkSearchList from '../../LinkSearch/LinkSearchList';
 import { container, narrowContainerWidth, inputWrapper } from '../../LinkSearch/ToolbarComponents';
 import { transformTimeStamp } from '../../LinkSearch/transformTimeStamp';
-import { filterUniqueItems } from './filterUniqueItems';
-import { messages } from './messages';
-import { sha1 } from './sha1';
-import { mapContentTypeToIcon } from './utils';
-import { wordCount } from './wordCount';
+import { filterUniqueItems, mapContentTypeToIcon, sha1, wordCount } from './utils';
+
 /**
  * Visible only to screenreaders. Use when there is a need
  * to provide more context to a non-sighted user.
@@ -74,6 +71,48 @@ const inputLabel = css({
 const inputWrapperPosition = css({
   position: 'relative'
 });
+export const messages = defineMessages({
+  displayText: {
+    id: 'fabric.editor.displayText',
+    defaultMessage: 'Text to display',
+    description: 'Label for the text input field in the hyperlink toolbar where users enter the display text for a link.'
+  },
+  clearText: {
+    id: 'fabric.editor.clearLinkText',
+    defaultMessage: 'Clear text',
+    description: 'The text is shown on a button in the hyperlink toolbar that clears the display text field, removing any custom link text the user has entered.'
+  },
+  clearLink: {
+    id: 'fabric.editor.clearLink',
+    defaultMessage: 'Clear link',
+    description: 'The text is shown on a button in the hyperlink toolbar that clears the URL field, removing any link address the user has entered.'
+  },
+  hyperlinkAriaLabel: {
+    id: 'fabric.editor.hyperlink.ariaLabel',
+    defaultMessage: 'Hyperlink Edit',
+    description: 'Aria label for the Hyperlink Add Toolbar'
+  },
+  searchLinkAriaDescription: {
+    id: 'fabric.editor.hyperlink.searchLinkAriaDescription',
+    defaultMessage: 'Suggestions will appear below as you type into the field',
+    description: 'Describes what the search field does for screen reader users.'
+  },
+  searchLinkResults: {
+    id: 'fabric.editor.hyperlink.searchLinkResults',
+    defaultMessage: '{count, plural, =0 {no results} one {# result} other {# results}} found',
+    description: 'Announce search results for screen-reader users.'
+  },
+  linkVisibleLabel: {
+    id: 'fabric.editor.hyperlink.linkVisibleLabel',
+    defaultMessage: 'Paste or search for link',
+    description: 'Visible label for link input in hyperlink floating control'
+  },
+  textVisibleLabel: {
+    id: 'fabric.editor.hyperlink.textVisibleLabel',
+    defaultMessage: 'Display text (optional)',
+    description: 'Visible label for text input in hyperlink floating control'
+  }
+});
 const defaultIcon = jsx(PageObject, {
   label: "page"
 });
@@ -841,6 +880,4 @@ function limit(items) {
 // eslint-disable-next-line @typescript-eslint/ban-types
 export const HyperlinkLinkAddToolbarWithIntl = injectIntl(HyperlinkLinkAddToolbar);
 const _default_1 = withAnalyticsEvents()(HyperlinkLinkAddToolbarWithIntl);
-export default _default_1;
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { messages } from './messages';
+export default _default_1;

package/dist/es2019/link/LinkPicker/HyperlinkAddToolbar/messages.js

@@ -1,43 +1,38 @@
 import { defineMessages } from 'react-intl';
-export const messages = defineMessages({
-  displayText: {
-    id: 'fabric.editor.displayText',
-    defaultMessage: 'Text to display',
-    description: 'Label for the text input field in the hyperlink toolbar where users enter the display text for a link.'
+export const utilMessages = defineMessages({
+  hyperlinkIconIssueLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconIssueLabel',
+    defaultMessage: 'Issue',
+    description: 'Accessible label for the Jira issue icon displayed in the hyperlink add toolbar when users search for or insert a link to a Jira issue.'
   },
-  clearText: {
-    id: 'fabric.editor.clearLinkText',
-    defaultMessage: 'Clear text',
-    description: 'The text is shown on a button in the hyperlink toolbar that clears the display text field, removing any custom link text the user has entered.'
+  hyperlinkIconBugLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconBugLabel',
+    defaultMessage: 'Bug',
+    description: 'Accessible label for the Jira bug icon displayed in the hyperlink add toolbar when users search for or insert a link to a Jira bug.'
   },
-  clearLink: {
-    id: 'fabric.editor.clearLink',
-    defaultMessage: 'Clear link',
-    description: 'The text is shown on a button in the hyperlink toolbar that clears the URL field, removing any link address the user has entered.'
+  hyperlinkIconStoryLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconStoryLabel',
+    defaultMessage: 'Story',
+    description: 'Accessible label for the Jira story icon displayed in the hyperlink add toolbar when users search for or insert a link to a Jira story.'
   },
-  hyperlinkAriaLabel: {
-    id: 'fabric.editor.hyperlink.ariaLabel',
-    defaultMessage: 'Hyperlink Edit',
-    description: 'Aria label for the Hyperlink Add Toolbar'
+  hyperlinkIconTaskLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconTaskLabel',
+    defaultMessage: 'Task',
+    description: 'Accessible label for the Jira task icon displayed in the hyperlink add toolbar when users search for or insert a link to a Jira task.'
   },
-  searchLinkAriaDescription: {
-    id: 'fabric.editor.hyperlink.searchLinkAriaDescription',
-    defaultMessage: 'Suggestions will appear below as you type into the field',
-    description: 'Describes what the search field does for screen reader users.'
+  hyperlinkIconPageLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconPageLabel',
+    defaultMessage: 'Page',
+    description: 'The text is shown as an icon label in the hyperlink toolbar to identify Confluence pages. Displayed next to the page icon when users are linking to Confluence pages in the editor.'
   },
-  searchLinkResults: {
-    id: 'fabric.editor.hyperlink.searchLinkResults',
-    defaultMessage: '{count, plural, =0 {no results} one {# result} other {# results}} found',
-    description: 'Announce search results for screen-reader users.'
+  hyperlinkIconBlogLabel: {
+    id: 'fabric.editor.headingLink.hyperlinkIconBlogLabel',
+    defaultMessage: 'Blog',
+    description: 'The text is shown as an icon label in the hyperlink toolbar to identify Confluence blog posts. Displayed next to the blog icon when users are linking to Confluence blogs in the editor.'
   },
-  linkVisibleLabel: {
-    id: 'fabric.editor.hyperlink.linkVisibleLabel',
-    defaultMessage: 'Paste or search for link',
-    description: 'Visible label for link input in hyperlink floating control'
-  },
-  textVisibleLabel: {
-    id: 'fabric.editor.hyperlink.textVisibleLabel',
-    defaultMessage: 'Display text (optional)',
-    description: 'Visible label for text input in hyperlink floating control'
+  hyperlinkIconIssueLabelIssueTermRefresh: {
+    id: 'fabric.editor.headingLink.hyperlinkIconIssueLabel.issue-term-refresh',
+    defaultMessage: 'Work Item',
+    description: 'Accessible label for the Jira issue icon displayed in the hyperlink add toolbar when users search for or insert a link to a Jira work item. This is the refreshed terminology used instead of "Issue".'
   }
 });

package/dist/es2019/link/LinkPicker/HyperlinkAddToolbar/utils.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl';
+import Rusha from 'rusha';
 import BlogObject from '@atlaskit/object/blog';
 import BugObject from '@atlaskit/object/bug';
 import PageObject from '@atlaskit/object/page';
@@ -7,7 +8,12 @@ import StoryObject from '@atlaskit/object/story';
 import TaskObject from '@atlaskit/object/task';
 import WorkItemObject from '@atlaskit/object/work-item';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { utilMessages } from './utilMessages';
+import { utilMessages } from './messages';
+export function filterUniqueItems(arr, comparator) {
+  return arr.filter((firstItem, index, self) => {
+    return self.findIndex(secondItem => comparator ? comparator(firstItem, secondItem) : firstItem === secondItem) === index;
+  });
+}
 const Issue16 = props => {
   const {
     intl
@@ -70,9 +76,9 @@ export const mapContentTypeToIcon = {
   'confluence.page': /*#__PURE__*/React.createElement(IntlPage16Icon, null),
   'confluence.blogpost': /*#__PURE__*/React.createElement(IntlBlog16Icon, null)
 };
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { filterUniqueItems } from './filterUniqueItems';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { sha1 } from './sha1';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { wordCount } from './wordCount';
+export const sha1 = input => {
+  return Rusha.createHash().update(input).digest('hex');
+};
+export const wordCount = input => {
+  return input.split(' ').length;
+};

package/dist/es2019/link/index.js

@@ -6,14 +6,11 @@ export { container, containerWithProvider, inputWrapper } from './LinkSearch/Too
 export { default as LinkSearchListItem } from './LinkSearch/LinkSearchListItem';
 export { default as LinkSearchList } from './LinkSearch/LinkSearchList';
 export { default as RecentSearch } from './LinkSearch';
-export { InsertStatus } from './InsertStatus';
-export { LinkAction } from './LinkAction';
+export { InsertStatus, LinkAction } from './types';
 export { EditorLinkPicker } from './LinkPicker/EditorLinkPicker';
 export { HyperlinkAddToolbar } from './LinkPicker/HyperlinkAddToolbar';
 export { default as HyperlinkLinkAddToolbar, HyperlinkLinkAddToolbarWithIntl, RECENT_SEARCH_LIST_SIZE } from './LinkPicker/HyperlinkAddToolbar/HyperlinkAddToolbar';
-export { sha1 } from './LinkPicker/HyperlinkAddToolbar/sha1';
-export { isLinkAtPos } from './isLinkAtPos';
-export { isTextAtPos } from './isTextAtPos';
-export { getLinkPreferencesURLFromENV, getActiveLinkMark } from './utils';
+export { sha1 } from './LinkPicker/HyperlinkAddToolbar/utils';
+export { isLinkAtPos, isTextAtPos, getLinkPreferencesURLFromENV, getActiveLinkMark } from './utils';
 export { OverlayButton } from './ConfigureLinkOverlay';
 export { handleNavigation } from './ConfigureLinkOverlay/handleNavigation';

package/dist/es2019/link/types.js

@@ -1,4 +1,16 @@
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { LinkAction } from './LinkAction';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { InsertStatus } from './InsertStatus';
+export let LinkAction = /*#__PURE__*/function (LinkAction) {
+  LinkAction["SHOW_INSERT_TOOLBAR"] = "SHOW_INSERT_TOOLBAR";
+  LinkAction["HIDE_TOOLBAR"] = "HIDE_TOOLBAR";
+  LinkAction["SELECTION_CHANGE"] = "SELECTION_CHANGE";
+  LinkAction["INSERT_LINK_TOOLBAR"] = "INSERT";
+  LinkAction["EDIT_INSERTED_TOOLBAR"] = "EDIT_INSERTED_TOOLBAR";
+  LinkAction["SET_CONFIGURE_BUTTON_TARGET_POS"] = "SET_CONFIGURE_BUTTON_TARGET_POS";
+  LinkAction["SET_CONFIGURE_DROPDOWN_OPEN"] = "SET_CONFIGURE_DROPDOWN_OPEN";
+  return LinkAction;
+}({});
+export let InsertStatus = /*#__PURE__*/function (InsertStatus) {
+  InsertStatus["EDIT_LINK_TOOLBAR"] = "EDIT";
+  InsertStatus["INSERT_LINK_TOOLBAR"] = "INSERT";
+  InsertStatus["EDIT_INSERTED_TOOLBAR"] = "EDIT_INSERTED";
+  return InsertStatus;
+}({});

package/dist/es2019/link/utils.js

@@ -4,6 +4,20 @@ import { linkPreferencesPath } from './constants';
 const STAGING = 'staging';
 const PRODUCTION = 'prod';
 const DEV = 'dev';
+export function isTextAtPos(pos) {
+  return ({
+    tr
+  }) => {
+    const node = tr.doc.nodeAt(pos);
+    return !!node && node.isText;
+  };
+}
+export function isLinkAtPos(pos) {
+  return state => {
+    const node = state.doc.nodeAt(pos);
+    return !!node && !!state.schema.marks.link.isInSet(node.marks);
+  };
+}
 export const getLinkPreferencesURLFromENV = () => {
   const envType = process.env.CLOUD_ENV === 'staging' ? STAGING : PRODUCTION;
   return getUrlForDomainInContext('id', envType) + linkPreferencesPath;
@@ -67,8 +81,4 @@ export const getActiveLinkMark = state => {
     } : undefined;
   }
   return undefined;
-};
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { isTextAtPos } from './isTextAtPos';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { isLinkAtPos } from './isLinkAtPos';
+};

package/dist/es2019/lists/analytics.js

@@ -1,4 +1,4 @@
-import { countListItemsInSelection } from './countListItemsInSelection';
+import { isListItemNode, isListNode } from '../utils';
 import { getListItemAttributes } from './selection';
 export const getCommonListAnalyticsAttributes = tr => {
   const {
@@ -17,5 +17,20 @@ export const getCommonListAnalyticsAttributes = tr => {
     itemsInSelection: countListItemsInSelection(tr)
   };
 };
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { countListItemsInSelection } from './countListItemsInSelection';
+export const countListItemsInSelection = tr => {
+  const {
+    from,
+    to
+  } = tr.selection;
+  if (from === to) {
+    return 1;
+  }
+  let count = 0;
+  const listSlice = tr.doc.cut(from, to);
+  listSlice.content.nodesBetween(0, listSlice.content.size, (node, pos, parent, index) => {
+    if (parent && isListItemNode(parent) && !isListNode(node) && index === 0) {
+      count++;
+    }
+  });
+  return count;
+};

package/dist/es2019/lists/indentation.js

@@ -1,4 +1,4 @@
-import { numberNestedLists } from './numberNestedLists';
+import { numberNestedLists } from './selection';
 export const hasValidListIndentationLevel = ({
   tr,
   maxIndentation

package/dist/es2019/lists/index.js

@@ -3,11 +3,8 @@
 
 export { getListItemAttributes, normalizeListItemsSelection } from './selection';
 export { moveTargetIntoList } from './replace-content';
-export { JoinDirection } from './JoinDirection';
-export { isListNodeValidContent } from './isListNodeValidContent';
-export { joinSiblingLists, processNestedTaskListsInSameLevel } from './node';
-export { getCommonListAnalyticsAttributes } from './analytics';
-export { countListItemsInSelection } from './countListItemsInSelection';
+export { JoinDirection, isListNodeValidContent, joinSiblingLists, processNestedTaskListsInSameLevel } from './node';
+export { getCommonListAnalyticsAttributes, countListItemsInSelection } from './analytics';
 export { hasValidListIndentationLevel } from './indentation';
 export { restoreSelection, computeSelectionOffsets } from './restore-selection';
 export { buildReplacementFragment } from './build-replacement-fragment';

package/dist/es2019/lists/node.js

@@ -1,7 +1,21 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isListItemNode, isListNode } from '../utils';
-import { isListNodeValidContent } from './isListNodeValidContent';
-import { JoinDirection } from './JoinDirection';
-import { wrapTaskListIntoListAbove } from './wrapTaskListIntoListAbove';
+import { wrapTaskListIntoListAbove } from './replace-content';
+export function isListNodeValidContent(node) {
+  const {
+    bulletList
+  } = node.type.schema.nodes;
+  if (!bulletList) {
+    return false;
+  }
+  const listFragment = Fragment.from(bulletList.createAndFill());
+  return !isListItemNode(node) && node.type.validContent(listFragment);
+}
+export let JoinDirection = /*#__PURE__*/function (JoinDirection) {
+  JoinDirection[JoinDirection["LEFT"] = 1] = "LEFT";
+  JoinDirection[JoinDirection["RIGHT"] = -1] = "RIGHT";
+  return JoinDirection;
+}({});
 export const joinSiblingLists = ({
   tr,
   direction,
@@ -156,8 +170,4 @@ export const processNestedTaskListsInSameLevel = tr => {
     });
   }
   return;
-};
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { isListNodeValidContent } from './isListNodeValidContent';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { JoinDirection } from './JoinDirection';
+};

package/dist/es2019/lists/replace-content.js

@@ -1,3 +1,4 @@
+import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 export const moveTargetIntoList = ({
   insertPosition,
@@ -16,5 +17,26 @@ export const moveTargetIntoList = ({
   const step = new ReplaceAroundStep(from, to, gapFrom, gapTo, $target.doc.slice(insertPosition, $target.pos), 0, true);
   return step;
 };
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { wrapTaskListIntoListAbove } from './wrapTaskListIntoListAbove';
+export const wrapTaskListIntoListAbove = (tr, taskListStart, previousListStart) => {
+  const $taskListStart = tr.doc.resolve(taskListStart);
+
+  /* Safecheck: if not passed a taskList node, return */
+  if ($taskListStart.node().type.name !== 'taskList') {
+    return;
+  }
+  const $previousListStart = tr.doc.resolve(previousListStart);
+  const taskList = tr.doc.slice($taskListStart.pos, $taskListStart.after());
+  const frag = Fragment.from(taskList.content);
+
+  /*
+     Delete the existing taskList at the same level and insert inside above list provided
+     1. To delete the tasklist, we need wrapping positions before and after it to completely delete it.
+       $taskListStart.after() would give us closing position enclosed by node itself using it would remove only the contents of taskList
+       so we add 1 to it to get the position after the taskList node and completly remove it.
+     2. Inserting the taskList at the end() position safe inserts the taskList to next available position which would lead to deleting and inserting taskList at same place.
+       Reason: $previousListStart.end() gives us end position of listItem but we can add content only inside listItem not at same level
+       so we subtract 1 to get the position inside the list item and insert the TaskList same level as paragraph/content inside listItem.
+   */
+  tr.delete($taskListStart.before(), $taskListStart.after() + 1);
+  tr.insert($previousListStart.end() - 1, frag);
+};

package/dist/es2019/lists/selection.js

@@ -1,7 +1,16 @@
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { isListItemNode } from '../utils';
-import { numberNestedLists } from './numberNestedLists';
+import { isListItemNode, isListNode } from '../utils';
+export const numberNestedLists = resolvedPos => {
+  let count = 0;
+  for (let i = resolvedPos.depth - 1; i > 0; i--) {
+    const node = resolvedPos.node(i);
+    if (isListNode(node)) {
+      count += 1;
+    }
+  }
+  return count;
+};
 export const getListItemAttributes = $pos => {
   // Get level for the correct indent of nesting
   const indentLevel = numberNestedLists($pos) - 1;
@@ -42,6 +51,4 @@ const resolvePositionToEndOfListItem = $pos => {
   const toRange = $pos.blockRange($pos, isListItemNode);
   const toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
   return toPosition;
-};
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { numberNestedLists } from './numberNestedLists';
+};

package/dist/es2019/mark/commands.js

@@ -3,7 +3,6 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { entireSelectionContainsMark } from './entireSelectionContainsMark';
 const SMART_TO_ASCII = {
   '…': '...',
   '→': '->',
@@ -18,6 +17,18 @@ const SMART_TO_ASCII = {
 // Ignored via go/ees005
 // eslint-disable-next-line require-unicode-regexp
 const FIND_SMART_CHAR = new RegExp(`[${Object.keys(SMART_TO_ASCII).join('')}]`, 'g');
+export function filterChildrenBetween(doc, from, to, predicate) {
+  const results = [];
+  doc.nodesBetween(from, to, (node, pos, _parent) => {
+    if (predicate(node, pos, _parent)) {
+      results.push({
+        node,
+        pos
+      });
+    }
+  });
+  return results;
+}
 export function transformNonTextNodesToText(from, to, tr) {
   const {
     doc
@@ -107,6 +118,19 @@ export const applyMarkOnRange = (from, to, removeMark, mark, tr) => {
   });
   return tr;
 };
+export const entireSelectionContainsMark = (mark, doc, fromPos, toPos) => {
+  let onlyContainsMark = true;
+  doc.nodesBetween(fromPos, toPos, node => {
+    // Skip recursion once we've found text which doesn't include the mark
+    if (!onlyContainsMark) {
+      return false;
+    }
+    if (node.isText) {
+      onlyContainsMark && (onlyContainsMark = !!(mark !== null && mark !== void 0 && mark.isInSet(node.marks)));
+    }
+  });
+  return onlyContainsMark;
+};
 const toggleMarkInRange = mark => ({
   tr
 }) => {
@@ -171,9 +195,30 @@ export const toggleMark = (markType, attrs) => ({
     tr
   });
 };
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { filterChildrenBetween } from './filterChildrenBetween';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { entireSelectionContainsMark } from './entireSelectionContainsMark';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { removeMark } from './removeMark';
+
+/**
+ * A wrapper around ProseMirror removeMark and removeStoredMark, which handles mark removal in text, CellSelections and cursor stored marks.
+ */
+export const removeMark = mark => ({
+  tr
+}) => {
+  const {
+    selection
+  } = tr;
+  if (selection instanceof CellSelection) {
+    selection.forEachCell((cell, cellPos) => {
+      const from = cellPos;
+      const to = cellPos + cell.nodeSize;
+      tr.removeMark(from, to, mark);
+    });
+  } else if (selection instanceof TextSelection && selection.$cursor) {
+    tr.removeStoredMark(mark);
+  } else {
+    const {
+      from,
+      to
+    } = selection;
+    tr.removeMark(from, to, mark);
+  }
+  return tr;
+};

package/dist/es2019/mark/index.js

@@ -1,11 +1,5 @@
 // Disable no-re-export rule for entry point files
 /* eslint-disable @atlaskit/editor/no-re-export */
 
-export { transformNonTextNodesToText, applyMarkOnRange, toggleMark } from './commands';
-export { entireSelectionContainsMark } from './entireSelectionContainsMark';
-export { filterChildrenBetween } from './filterChildrenBetween';
-export { removeMark } from './removeMark';
-export { anyMarkActive } from './anyMarkActive';
-export { isMarkAllowedInRange } from './isMarkAllowedInRange';
-export { isMarkExcluded } from './isMarkExcluded';
-export { wholeSelectionHasMarks } from './text-formatting';
+export { transformNonTextNodesToText, applyMarkOnRange, filterChildrenBetween, toggleMark, removeMark, entireSelectionContainsMark } from './commands';
+export { anyMarkActive, wholeSelectionHasMarks, isMarkAllowedInRange, isMarkExcluded } from './text-formatting';

package/dist/es2019/mark/text-formatting.js

@@ -1,5 +1,33 @@
 import { Mark } from '@atlaskit/editor-prosemirror/model';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+
+/**
+ * Determine if a mark of a specific type exists anywhere in the selection.
+ */
+export const anyMarkActive = (state, markType) => {
+  const {
+    $from,
+    from,
+    to,
+    empty
+  } = state.selection;
+  if (empty) {
+    return !!markType.isInSet(state.storedMarks || $from.marks());
+  }
+  let rangeHasMark = false;
+  if (state.selection instanceof CellSelection) {
+    state.selection.forEachCell((cell, cellPos) => {
+      const from = cellPos;
+      const to = cellPos + cell.nodeSize;
+      if (!rangeHasMark) {
+        rangeHasMark = state.doc.rangeHasMark(from, to, markType);
+      }
+    });
+  } else {
+    rangeHasMark = state.doc.rangeHasMark(from, to, markType);
+  }
+  return rangeHasMark;
+};
 const allMarksAreRuledOut = marks => Array.from(marks.values()).every(mark => !mark);
 
 /**
@@ -90,9 +118,29 @@ const wholeRangeHasMarks = (from, to, doc, markTypes) => {
   });
   return isTextContent ? hasMarks : hasNoMarks;
 };
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { anyMarkActive } from './anyMarkActive';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { isMarkAllowedInRange } from './isMarkAllowedInRange';
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { isMarkExcluded } from './isMarkExcluded';
+export const isMarkAllowedInRange = (doc, ranges, type) => {
+  for (let i = 0; i < ranges.length; i++) {
+    const {
+      $from,
+      $to
+    } = ranges[i];
+    let can = $from.depth === 0 ? doc.type.allowsMarkType(type) : false;
+    doc.nodesBetween($from.pos, $to.pos, node => {
+      if (can) {
+        return false;
+      }
+      can = node.inlineContent && node.type.allowsMarkType(type);
+      return;
+    });
+    if (can) {
+      return can;
+    }
+  }
+  return false;
+};
+export const isMarkExcluded = (type, marks) => {
+  if (marks) {
+    return marks.some(mark => mark.type !== type && mark.type.excludes(type));
+  }
+  return false;
+};

package/dist/es2019/media-single/CommentBadge.js

@@ -12,7 +12,6 @@ import CommentIcon from '@atlaskit/icon/core/comment';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
 import { commentMessages as messages } from '../media';
-import { getBadgeSize } from './getBadgeSize';
 const commentBadgeWrapper = css({
   position: 'absolute',
   // closest parent element with position relative is .resizer-hover-zone, which includes 10px padding
@@ -28,6 +27,10 @@ const commentBadgeEditorOverrides = badgeOffsetRight => css({
   right: badgeOffsetRight,
   zIndex: 100
 });
+export const getBadgeSize = (width, height) => {
+  // width is the original width of image, not resized or currently rendered to user. Defaulting to medium for now
+  return width && width < 70 || height && height < 70 ? 'small' : 'medium';
+};
 export const CommentBadge = /*#__PURE__*/forwardRef(({
   intl,
   width,
@@ -109,6 +112,4 @@ export const CommentBadge = /*#__PURE__*/forwardRef(({
       color: "currentColor"
     })
   })));
-});
-// eslint-disable-next-line @atlaskit/editor/no-re-export
-export { getBadgeSize } from './getBadgeSize';
+});

package/dist/es2019/media-single/index.js

@@ -2,15 +2,7 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 
 export { MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_HIGHLIGHT_GAP, MEDIA_SINGLE_GUTTER_SIZE, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, Layout as MediaSingleLayout, DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT, wrappedLayouts, CAPTION_PLACEHOLDER_ID, MEDIA_SINGLE_ADJACENT_HANDLE_MARGIN } from './constants';
-export { calcMediaSingleMaxWidth } from './calcMediaSingleMaxWidth';
-export { calcMinWidth } from './calcMinWidth';
-export { calculateOffsetLeft } from './calculateOffsetLeft';
-export { currentMediaNodeWithPos } from './currentMediaNodeWithPos';
-export { getMaxWidthForNestedNode } from './getMaxWidthForNestedNode';
-export { getMediaSingleInitialWidth } from './getMediaSingleInitialWidth';
-export { getMediaSinglePixelWidth } from './getMediaSinglePixelWidth';
-export { roundToNearest } from './roundToNearest';
-export { calcMediaSinglePixelWidth, getMaxWidthForNestedNodeNext } from './utils';
+export { getMediaSinglePixelWidth, calcMediaSinglePixelWidth, calcMediaSingleMaxWidth, getMediaSingleInitialWidth, calculateOffsetLeft, roundToNearest, calcMinWidth, getMaxWidthForNestedNode, getMaxWidthForNestedNodeNext, currentMediaNodeWithPos } from './utils';
 export { CommentBadge } from './CommentBadge';
 export { CommentBadgeNext } from './CommentBadgeNext';
 export { ExternalImageBadge } from './ExternalImageBadge';