@atlaskit/editor-core 178.1.1 → 178.1.2

package/dist/es2019/plugins/find-replace/utils/batch-decorations.js

@@ -1,10 +1,10 @@
 import { createDecorations, findDecorationFromMatch } from './index';
-import { getPluginState } from '../plugin'; // max number of decorations to apply at once
-
-const batchIncrement = 100; // position range to apply decorations between before alternating above or below viewport
+import { getPluginState } from '../plugin';
 
+// max number of decorations to apply at once
+const batchIncrement = 100;
+// position range to apply decorations between before alternating above or below viewport
 const posIncrement = 2000;
-
 /**
  * Provides support for applying search match highlight decorations in batches
  */
@@ -14,27 +14,22 @@ class BatchDecorations {
       cancelAnimationFrame(this.rafId);
     }
   }
+
   /**
    * Applies the decorations needed for the current search results
    * It does so async, splitting them up into batches to help with performance
    */
-
-
   async applyAllSearchDecorations(editorView, containerElement, addDecorations, removeDecorations) {
     this.stop();
     this.addDecorations = addDecorations;
     this.removeDecorations = removeDecorations;
-
     if (!containerElement) {
       return;
     }
-
     const pmElement = containerElement.querySelector('.ProseMirror');
-
     if (!pmElement) {
       return;
     }
-
     const positions = this.calcDecorationPositions(editorView, containerElement, pmElement);
     const {
       startPos,
@@ -46,7 +41,6 @@ class BatchDecorations {
     let before = viewportStartPos;
     let after = viewportEndPos - posIncrement;
     await this.updateDecorationsBetween(editorView, viewportStartPos, viewportEndPos);
-
     while (before > startPos || after < endPos) {
       if (dir++ % 2 === 0 && before > startPos || after >= endPos) {
         const diff = before - startPos;
@@ -58,12 +52,10 @@ class BatchDecorations {
       }
     }
   }
-
   async updateDecorationsBetween(editorView, startPos, endPos) {
     await this.removeDecorationsBetween(editorView, startPos, endPos);
     await this.addDecorationsBetween(editorView, startPos, endPos);
   }
-
   async addDecorationsBetween(editorView, startPos, endPos) {
     const {
       selection
@@ -72,32 +64,25 @@ class BatchDecorations {
       matches,
       decorationSet
     } = getPluginState(editorView.state);
-
     if (matches.length === 0) {
       return;
     }
-
     const matchesBetween = matches.filter(m => m.start >= startPos && (endPos === undefined || m.start < endPos));
     const selectionMatch = matches.find(match => match.start >= selection.from);
     const selectionIndex = matchesBetween.findIndex(match => match === selectionMatch);
     return await this.batchRequests(counter => {
       let matchesToDecorate = matchesBetween.slice(counter, counter + batchIncrement);
-
       if (matchesToDecorate.length === 0) {
         return false;
       }
-
       let useSelectionIndex = selectionIndex >= counter && selectionIndex < counter + batchIncrement;
-
       if (selectionMatch && useSelectionIndex) {
         const selectionMatchDecoration = findDecorationFromMatch(decorationSet, selectionMatch);
-
         if (selectionMatchDecoration) {
           matchesToDecorate.splice(selectionIndex % batchIncrement, 1);
           useSelectionIndex = false;
         }
       }
-
       if (this.addDecorations) {
         this.addDecorations(createDecorations(useSelectionIndex ? selectionIndex % batchIncrement : -1, matchesToDecorate));
       }
@@ -106,33 +91,26 @@ class BatchDecorations {
       until: matchesBetween.length
     });
   }
-
   async removeDecorationsBetween(editorView, startPos, endPos) {
     const {
       decorationSet
     } = getPluginState(editorView.state);
     const decorations = decorationSet.find(startPos, endPos);
-
     if (decorations.length === 0) {
       return;
     }
-
     return await this.batchRequests(counter => {
       let decorationsToRemove = decorations.slice(counter, counter + batchIncrement);
-
       if (decorationsToRemove.length === 0) {
         return false;
-      } // only get those decorations whose from >= startPos
-
-
+      }
+      // only get those decorations whose from >= startPos
       for (let i = 0; i < decorationsToRemove.length; i++) {
         if (decorationsToRemove[i].from >= startPos) {
           break;
         }
-
         decorationsToRemove = decorationsToRemove.slice(1);
       }
-
       if (this.removeDecorations) {
         this.removeDecorations(decorationsToRemove);
       }
@@ -141,14 +119,13 @@ class BatchDecorations {
       until: decorations.length
     });
   }
+
   /**
    * Calculates Prosemirror start and end positions we want to apply the decorations
    * between
    * Also calculates the positions the are the start and end of the user's viewport
    * so we can apply decorations there first and work outwards
    */
-
-
   calcDecorationPositions(editorView, containerElement, pmElement) {
     const containerRect = containerElement.getBoundingClientRect();
     const pmRect = pmElement.getBoundingClientRect();
@@ -161,7 +138,6 @@ class BatchDecorations {
       endPos: editorView.state.doc.nodeSize
     };
   }
-
   getStartPos(editorView, y, x) {
     const startPos = editorView.posAtCoords({
       top: y,
@@ -169,7 +145,6 @@ class BatchDecorations {
     });
     return startPos ? startPos.pos : 1;
   }
-
   getEndPos(editorView, y, x) {
     const maxPos = editorView.state.doc.nodeSize;
     const endPos = editorView.posAtCoords({
@@ -178,14 +153,13 @@ class BatchDecorations {
     });
     return endPos ? endPos.pos : maxPos;
   }
+
   /**
    * Util to batch function calls by animation frames
    * A counter will start at 0 and increment by provided value until reaches limit
    * Passed in fn receives the counter as a param, return false to skip waiting
    * for the animation frame for the next call
    */
-
-
   batchRequests(fn, opts) {
     let counter = 0;
     const {
@@ -195,12 +169,10 @@ class BatchDecorations {
     return new Promise(resolve => {
       const batchedFn = () => {
         let result = fn(counter);
-
         while (result === false && counter < until) {
           counter += increment;
           result = fn(counter);
         }
-
         if (counter < until) {
           counter += increment;
           this.rafId = requestAnimationFrame(batchedFn);
@@ -209,12 +181,9 @@ class BatchDecorations {
           resolve();
         }
       };
-
       this.rafId = requestAnimationFrame(batchedFn);
     });
   }
-
 }
-
 const batchDecorations = new BatchDecorations();
 export default batchDecorations;

package/dist/es2019/plugins/find-replace/utils/index.js

@@ -4,11 +4,9 @@ import { selectedSearchMatchClass, searchMatchClass } from '../styles';
 export function getSelectedText(selection) {
   let text = '';
   const selectedContent = selection.content().content;
-
   for (let i = 0; i < selectedContent.childCount; i++) {
     text += selectedContent.child(i).textContent;
   }
-
   return text;
 }
 export const createDecorations = (selectedIndex, matches) => matches.map(({
@@ -17,11 +15,9 @@ export const createDecorations = (selectedIndex, matches) => matches.map(({
 }, i) => createDecoration(start, end, i === selectedIndex));
 export const createDecoration = (start, end, isSelected) => {
   let className = searchMatchClass;
-
   if (isSelected) {
     className += ` ${selectedSearchMatchClass}`;
   }
-
   return Decoration.inline(start, end, {
     class: className
   });
@@ -30,29 +26,24 @@ export function findMatches(content, searchText, shouldMatchCase, contentIndex =
   let matches = [];
   const searchTextLength = searchText.length;
   let textGrouping = null;
-
   const collectMatch = textGrouping => {
     if (!textGrouping) {
       return;
     }
-
     let {
       text,
       pos: relativePos
     } = textGrouping;
     const pos = contentIndex + relativePos;
-
     if (!shouldMatchCase) {
       searchText = searchText.toLowerCase();
       text = text.toLowerCase();
     }
-
     let index = text.indexOf(searchText);
-
     while (index !== -1) {
       // Find the next substring from the end of the first, so that they don't overlap
-      const end = index + searchTextLength; // Add the substring index to the position of the node
-
+      const end = index + searchTextLength;
+      // Add the substring index to the position of the node
       matches.push({
         start: pos + index,
         end: pos + end
@@ -60,7 +51,6 @@ export function findMatches(content, searchText, shouldMatchCase, contentIndex =
       index = text.indexOf(searchText, end);
     }
   };
-
   if (searchTextLength > 0) {
     content.descendants((node, pos) => {
       if (node.isText) {
@@ -76,31 +66,28 @@ export function findMatches(content, searchText, shouldMatchCase, contentIndex =
         collectMatch(textGrouping);
         textGrouping = null;
       }
-    }); // if there's a dangling text grouping and no non-text node to trigger collectMatch, manually collectMatch
-
+    });
+    // if there's a dangling text grouping and no non-text node to trigger collectMatch, manually collectMatch
     if (textGrouping) {
       collectMatch(textGrouping);
     }
   }
-
   return matches;
 }
+
 /**
  * Finds index of first item in matches array that comes after user's cursor pos.
  * If `backward` is `true`, finds index of first item that comes before instead.
  */
-
 export function findSearchIndex(selectionPos, matches, backward = false) {
   if (backward) {
     let matchIndex = matches.findIndex(match => match.start >= selectionPos) - 1;
-
     if (matchIndex < 0) {
       matchIndex = matches.length - 1; // wrap around from the end
     }
 
     return matchIndex;
   }
-
   return Math.max(matches.findIndex(match => match.start >= selectionPos), 0);
 }
 export const nextIndex = (currentIndex, total) => (currentIndex + 1) % total;
@@ -109,37 +96,37 @@ export const getSelectionForMatch = (selection, doc, index, matches, offset = 0)
   if (matches[index]) {
     return TextSelection.create(doc, matches[index].start + offset);
   }
-
   return selection;
 };
 export const findDecorationFromMatch = (decorationSet, match) => {
   if (!match) {
     return;
   }
-
   const decorations = decorationSet.find(match.start, match.end);
-  return decorations.length ? decorations.find( // decorationSet.find() returns any decorations that touch the specifided
+  return decorations.length ? decorations.find(
+  // decorationSet.find() returns any decorations that touch the specifided
   // positions, but we want to be stricter
   decoration => decoration.from === match.start && decoration.to === match.end) : undefined;
 };
 export const removeDecorationsFromSet = (decorationSet, decorationsToRemove, doc) => {
-  const prevDecorations = decorationSet.find(); // it is essential that we copy the decorations otherwise in some rare cases
+  const prevDecorations = decorationSet.find();
+
+  // it is essential that we copy the decorations otherwise in some rare cases
   // prosemirror-view will update our decorationsToRemove array to contain nulls
   // instead of Decorations which ruins our check for lost decorations below
-
-  decorationSet = decorationSet.remove(decorationsToRemove.map(decoration => // copy exists but isn't on the type definition
+  decorationSet = decorationSet.remove(decorationsToRemove.map(decoration =>
+  // copy exists but isn't on the type definition
   decoration.copy(decoration.from, decoration.to)));
-  const newDecorations = decorationSet.find(); // there is a bug in prosemirror-view where it can't cope with deleting inline
+  const newDecorations = decorationSet.find();
+
+  // there is a bug in prosemirror-view where it can't cope with deleting inline
   // decorations from a set in some cases (where there are multiple levels of nested
   // children arrays), and it deletes more decorations than it should
   // todo: ticket link
-
   const lostDecorations = findLostAdjacentDecorations(decorationsToRemove, prevDecorations, newDecorations);
-
   if (lostDecorations.length > 0) {
     decorationSet = decorationSet.add(doc, lostDecorations);
   }
-
   return decorationSet;
 };
 export const removeMatchesFromSet = (decorationSet, matches, doc) => {
@@ -151,15 +138,14 @@ export const removeMatchesFromSet = (decorationSet, matches, doc) => {
   });
   return decorationSet;
 };
+
 /**
  * Finds decorations in prevDecorations that are not in newDecorations or decorationsToRemove
  * These decorations have been lost by Prosemirror during an over eager decoration removal
  * We need to be smart to cope with thousands of decorations without crashing everything
  */
-
 export const findLostAdjacentDecorations = (decorationsToRemove, prevDecorations, newDecorations) => {
   let lostDecorations = [];
-
   if (prevDecorations.length - decorationsToRemove.length > newDecorations.length) {
     const position = decorationsToRemove.length > 0 ? decorationsToRemove[0].from : 0;
     const prevDecorationsStartIdx = findIndexBeforePosition(prevDecorations, position);
@@ -171,71 +157,63 @@ export const findLostAdjacentDecorations = (decorationsToRemove, prevDecorations
     const numToFind = prevDecorationsToCheck.length - newDecorationsToCheck.length;
     let foundAll = false;
     let newDecorationsIdxOffset = 0;
-
     for (let i = 0; i < prevDecorationsToCheck.length; i++) {
-      const prevDecoration = prevDecorationsToCheck[i]; // this was a legit removal, skip and continue
-
+      const prevDecoration = prevDecorationsToCheck[i];
+      // this was a legit removal, skip and continue
       if (decorationsToRemove.find(decoration => decoration.from === prevDecoration.from)) {
         newDecorationsIdxOffset -= 1;
         continue;
       }
+      let j = i + newDecorationsIdxOffset;
 
-      let j = i + newDecorationsIdxOffset; // this is a lost decoration
-
+      // this is a lost decoration
       if (j >= newDecorationsToCheck.length) {
         uniqueInPrev.push(prevDecoration);
-
         if (uniqueInPrev.length === numToFind) {
           foundAll = true;
         }
       }
-
       for (; j < newDecorationsToCheck.length; j++) {
-        const newDecoration = newDecorationsToCheck[j]; // decoration found in both arrays, skip and continue
+        const newDecoration = newDecorationsToCheck[j];
 
+        // decoration found in both arrays, skip and continue
         if (prevDecoration.from === newDecoration.from) {
           break;
-        } // this is a lost decoration
-
+        }
 
+        // this is a lost decoration
         if (newDecoration.from > prevDecoration.from || j === newDecorationsToCheck.length - 1) {
           uniqueInPrev.push(prevDecoration);
           newDecorationsIdxOffset -= 1;
-
           if (uniqueInPrev.length === numToFind) {
             foundAll = true;
           }
-
           break;
         }
       }
-
       if (foundAll) {
         break;
       }
-    } // make sure we ignore any that we wanted to delete
-
+    }
 
+    // make sure we ignore any that we wanted to delete
     lostDecorations = uniqueInPrev.filter(decoration => !decorationsToRemove.find(decorationToRemove => decoration.from === decorationToRemove.from));
   }
-
   return lostDecorations;
 };
+
 /**
  * Searches through array in bumps of 100 to return the index of the first
  * decoration whose 'from' value is before or equal to the position
  */
-
 export const findIndexBeforePosition = (items, position) => {
   // jump in batches to cope with arrays with thousands of decorations
   const increment = 100;
   let index = 0;
-
   for (let i = items.length - 1; i >= 0; i -= increment) {
     if (items[i].from < position) {
       // now we have found the 100 range, we can narrow it down to exact index
       index = i;
-
       for (let j = i; j <= items.length - 1; j++) {
         if (items[j].from <= position) {
           index = j;
@@ -243,17 +221,15 @@ export const findIndexBeforePosition = (items, position) => {
           break;
         }
       }
-
       break;
     }
-
     if (i < 100 && i > 0) {
       i = 100;
     }
   }
-
   return index;
 };
+
 /**
  * Determines whether a find/replace text Match will be changed as a result
  * of a Step modification to the document. This is evaluated by checking
@@ -262,7 +238,6 @@ export const findIndexBeforePosition = (items, position) => {
  *
  * **Note:** Match state received here is after step has been applied.
  */
-
 export const isMatchAffectedByStep = (match, step, tr) => {
   const {
     from,

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

@@ -3,7 +3,8 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey, AllSelection } from 'prosemirror-state';
 import { findDomRefAtPos, findSelectedNodeOfType } from 'prosemirror-utils';
 import camelCase from 'lodash/camelCase';
-import { Popup } from '@atlaskit/editor-common/ui'; // AFP-2532 TODO: Fix automatic suppressions below
+import { Popup } from '@atlaskit/editor-common/ui';
+// AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
 
 import WithPluginState from '../../ui/WithPluginState';
@@ -25,7 +26,6 @@ export const getRelevantConfig = (selection, configs) => {
   let configPair;
   configs.find(config => {
     const node = findSelectedNodeOfType(config.nodeType)(selection);
-
     if (node) {
       configPair = {
         node: node.node,
@@ -33,15 +33,13 @@ export const getRelevantConfig = (selection, configs) => {
         config
       };
     }
-
     return !!node;
   });
-
   if (configPair) {
     return configPair;
-  } // create mapping of node type name to configs
-
+  }
 
+  // create mapping of node type name to configs
   const configByNodeType = {};
   configs.forEach(config => {
     if (Array.isArray(config.nodeType)) {
@@ -51,16 +49,15 @@ export const getRelevantConfig = (selection, configs) => {
     } else {
       configByNodeType[config.nodeType.name] = config;
     }
-  }); // search up the tree from selection
+  });
 
+  // search up the tree from selection
   const {
     $from
   } = selection;
-
   for (let i = $from.depth; i > 0; i--) {
     const node = $from.node(i);
     const matchedConfig = configByNodeType[node.type.name];
-
     if (matchedConfig) {
       return {
         config: matchedConfig,
@@ -68,9 +65,9 @@ export const getRelevantConfig = (selection, configs) => {
         pos: $from.pos
       };
     }
-  } // if it is AllSelection (can be result of Cmd+A) - use first node
-
+  }
 
+  // if it is AllSelection (can be result of Cmd+A) - use first node
   if (selection instanceof AllSelection) {
     const docNode = $from.node(0);
     let matchedConfig = null;
@@ -78,7 +75,6 @@ export const getRelevantConfig = (selection, configs) => {
       matchedConfig = configByNodeType[node.type.name];
       return !!matchedConfig;
     });
-
     if (firstChild && matchedConfig) {
       return {
         config: matchedConfig,
@@ -87,17 +83,14 @@ export const getRelevantConfig = (selection, configs) => {
       };
     }
   }
-
   return;
 };
-
 const getDomRefFromSelection = (view, dispatchAnalyticsEvent) => {
   try {
     return findDomRefAtPos(view.state.selection.from, view.domAtPos.bind(view));
   } catch (error) {
     // eslint-disable-next-line no-console
     console.warn(error);
-
     if (dispatchAnalyticsEvent) {
       const payload = {
         action: ACTION.ERRORED,
@@ -116,14 +109,11 @@ const getDomRefFromSelection = (view, dispatchAnalyticsEvent) => {
     }
   }
 };
-
 function filterUndefined(x) {
   return !!x;
 }
-
 const floatingToolbarPlugin = () => ({
   name: 'floatingToolbar',
-
   pmPlugins(floatingToolbarHandlers = []) {
     return [{
       // Should be after all toolbar plugins
@@ -145,7 +135,6 @@ const floatingToolbarPlugin = () => ({
       }) => floatingToolbarDataPluginFactory(dispatch)
     }];
   },
-
   contentComponent({
     popupsMountPoint,
     popupsBoundariesElement,
@@ -168,13 +157,10 @@ const floatingToolbarPlugin = () => ({
         extensionsState
       }) => {
         var _configWithNodeInfo$c, _configWithNodeInfo$c2;
-
         const configWithNodeInfo = floatingToolbarState === null || floatingToolbarState === void 0 ? void 0 : floatingToolbarState.getConfigWithNodeInfo(editorView.state);
-
         if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
           return null;
         }
-
         const {
           config,
           node
@@ -195,23 +181,19 @@ const floatingToolbarPlugin = () => ({
           focusTrap
         } = config;
         const targetRef = getDomRef(editorView, dispatchAnalyticsEvent);
-
         if (!targetRef || editorDisabledPlugin && editorDisabledPlugin.editorDisabled) {
           return null;
         }
-
         let customPositionCalculation;
         const toolbarItems = processCopyButtonItems(editorView.state)(Array.isArray(items) ? items : items(node));
-
         if (onPositionCalculated) {
           customPositionCalculation = nextPos => {
             return onPositionCalculated(editorView, nextPos);
           };
         }
+        const dispatchCommand = fn => fn && fn(editorView.state, editorView.dispatch, editorView);
 
-        const dispatchCommand = fn => fn && fn(editorView.state, editorView.dispatch, editorView); // Confirm dialog
-
-
+        // Confirm dialog
         const {
           confirmDialogForItem
         } = floatingToolbarData || {};
@@ -266,7 +248,6 @@ const floatingToolbarPlugin = () => ({
             } else {
               dispatchCommand(confirmButtonItem.onClick);
             }
-
             dispatchCommand(hideConfirmDialog());
           } // When closed without clicking OK or cancel buttons
           ,
@@ -277,10 +258,9 @@ const floatingToolbarPlugin = () => ({
       }
     });
   }
-
 });
-
 export default floatingToolbarPlugin;
+
 /**
  *
  * ProseMirror Plugin
@@ -288,23 +268,21 @@ export default floatingToolbarPlugin;
  */
 // We throttle update of this plugin with RAF.
 // So from other plugins you will always get the previous state.
-
 export const pluginKey = new PluginKey('floatingToolbarPluginKey');
+
 /**
  * Clean up floating toolbar configs from undesired properties.
  */
-
 function sanitizeFloatingToolbarConfig(config) {
   // Cleanup from non existing node types
   if (Array.isArray(config.nodeType)) {
-    return { ...config,
+    return {
+      ...config,
       nodeType: config.nodeType.filter(filterUndefined)
     };
   }
-
   return config;
 }
-
 function floatingToolbarPluginFactory(options) {
   const {
     floatingToolbarHandlers,
@@ -313,13 +291,11 @@ function floatingToolbarPluginFactory(options) {
     getIntl
   } = options;
   const intl = getIntl();
-
   const getConfigWithNodeInfo = editorState => {
     const activeConfigs = floatingToolbarHandlers.map(handler => handler(editorState, intl, providerFactory)).filter(filterUndefined).map(config => sanitizeFloatingToolbarConfig(config));
     const relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-
   const apply = (tr, pluginState) => {
     const newPluginState = {
       getConfigWithNodeInfo
@@ -327,7 +303,6 @@ function floatingToolbarPluginFactory(options) {
     dispatch(pluginKey, newPluginState);
     return newPluginState;
   };
-
   return new SafePlugin({
     key: pluginKey,
     state: {