@atlaskit/editor-plugin-find-replace 2.6.1 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 2.7.0
+
+### Minor Changes
+
+- [#173285](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173285)
+  [`91430cbcf0026`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/91430cbcf0026) -
+  [ux] ED-27957 extend the find algorithm to search mention nodes behind
+  platform_editor_find_and_replace_part_2
+
 ## 2.6.1
 
 ### Patch Changes

package/dist/cjs/findReplacePlugin.js

@@ -68,7 +68,7 @@ var findReplacePlugin = exports.findReplacePlugin = function findReplacePlugin(_
         plugin: function plugin(_ref3) {
           var dispatch = _ref3.dispatch,
             getIntl = _ref3.getIntl;
-          return (0, _main.createPlugin)(dispatch, getIntl);
+          return (0, _main.createPlugin)(dispatch, getIntl, api);
         }
       }, {
         name: 'findReplaceKeymap',

package/dist/cjs/pm-plugins/commands.js

@@ -25,8 +25,15 @@ var activate = exports.activate = function activate() {
       findText = (0, _utils.getSelectedText)(selection);
       var _getPluginState = (0, _pluginFactory.getPluginState)(state),
         shouldMatchCase = _getPluginState.shouldMatchCase,
-        getIntl = _getPluginState.getIntl;
-      matches = (0, _utils.findMatches)(state.doc, findText, shouldMatchCase, undefined, getIntl);
+        getIntl = _getPluginState.getIntl,
+        api = _getPluginState.api;
+      matches = (0, _utils.findMatches)({
+        content: state.doc,
+        searchText: findText,
+        shouldMatchCase: shouldMatchCase,
+        getIntl: getIntl,
+        api: api
+      });
       index = (0, _utils.findSearchIndex)(selection.from, matches);
     }
     return {
@@ -42,8 +49,15 @@ var find = exports.find = function find(editorView, containerElement, keyword) {
     var selection = state.selection;
     var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
       shouldMatchCase = _getPluginState2.shouldMatchCase,
-      getIntl = _getPluginState2.getIntl;
-    var matches = keyword !== undefined ? (0, _utils.findMatches)(state.doc, keyword, shouldMatchCase, undefined, getIntl) : [];
+      getIntl = _getPluginState2.getIntl,
+      api = _getPluginState2.api;
+    var matches = keyword !== undefined ? (0, _utils.findMatches)({
+      content: state.doc,
+      searchText: keyword,
+      shouldMatchCase: shouldMatchCase,
+      getIntl: getIntl,
+      api: api
+    }) : [];
     var index = (0, _utils.findSearchIndex)(selection.from, matches);
 
     // we can't just apply all the decorations to highlight the search results at once
@@ -63,8 +77,15 @@ var find = exports.find = function find(editorView, containerElement, keyword) {
     var selection = state.selection;
     var _getPluginState3 = (0, _pluginFactory.getPluginState)(state),
       shouldMatchCase = _getPluginState3.shouldMatchCase,
-      getIntl = _getPluginState3.getIntl;
-    var matches = keyword !== undefined ? (0, _utils.findMatches)(state.doc, keyword, shouldMatchCase, undefined, getIntl) : [];
+      getIntl = _getPluginState3.getIntl,
+      api = _getPluginState3.api;
+    var matches = keyword !== undefined ? (0, _utils.findMatches)({
+      content: state.doc,
+      searchText: keyword,
+      shouldMatchCase: shouldMatchCase,
+      getIntl: getIntl,
+      api: api
+    }) : [];
     if (matches.length > 0) {
       var index = (0, _utils.findSearchIndex)(selection.from, matches);
       return tr.setSelection((0, _utils.getSelectionForMatch)(tr.selection, tr.doc, index, matches));

package/dist/cjs/pm-plugins/main.js

@@ -23,12 +23,13 @@ var initialState = exports.initialState = {
   decorationSet: _view.DecorationSet.empty,
   shouldMatchCase: false
 };
-var createPlugin = exports.createPlugin = function createPlugin(dispatch, getIntl) {
+var createPlugin = exports.createPlugin = function createPlugin(dispatch, getIntl, api) {
   return new _safePlugin.SafePlugin({
     key: _pluginKey.findReplacePluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, function () {
       return (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, initialState), {}, {
-        getIntl: getIntl
+        getIntl: getIntl,
+        api: api
       }) : _objectSpread({}, initialState);
     }),
     props: {

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -34,8 +34,15 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     decorationSet = pluginState.decorationSet,
     matches = pluginState.matches,
     shouldMatchCase = pluginState.shouldMatchCase,
-    getIntl = pluginState.getIntl;
-  var newMatches = (0, _utils2.findMatches)(tr.doc, findText, shouldMatchCase, undefined, getIntl);
+    getIntl = pluginState.getIntl,
+    api = pluginState.api;
+  var newMatches = (0, _utils2.findMatches)({
+    content: tr.doc,
+    searchText: findText,
+    shouldMatchCase: shouldMatchCase,
+    getIntl: getIntl,
+    api: api
+  });
   decorationSet = decorationSet.map(tr.mapping, tr.doc);
   var numDecorations = decorationSet.find().length;
   var mappedMatches = matches.map(function (match) {

package/dist/cjs/pm-plugins/reducer.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("./actions");
 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; }
@@ -44,7 +45,12 @@ var reducer = function reducer(getInitialState) {
           index: action.index
         });
       case _actions.FindReplaceActionTypes.CANCEL:
-        return getInitialState();
+        var getIntl = state.getIntl,
+          api = state.api;
+        return (0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, getInitialState()), {}, {
+          getIntl: getIntl,
+          api: api
+        }) : getInitialState();
       case _actions.FindReplaceActionTypes.BLUR:
         return _objectSpread(_objectSpread({}, state), {}, {
           shouldFocus: false

package/dist/cjs/pm-plugins/utils/index.js

@@ -11,6 +11,8 @@ exports.removeMatchesFromSet = exports.removeDecorationsFromSet = exports.prevIn
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _resource = require("@atlaskit/mention/resource");
+var _types = require("@atlaskit/mention/types");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _styles = require("../../ui/styles");
 function getSelectedText(selection) {
@@ -37,9 +39,14 @@ var createDecoration = exports.createDecoration = function createDecoration(star
     class: className
   });
 };
-function findMatches(content, searchText, shouldMatchCase) {
-  var contentIndex = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  var getIntl = arguments.length > 4 ? arguments[4] : undefined;
+function findMatches(_ref2) {
+  var content = _ref2.content,
+    searchText = _ref2.searchText,
+    shouldMatchCase = _ref2.shouldMatchCase,
+    _ref2$contentIndex = _ref2.contentIndex,
+    contentIndex = _ref2$contentIndex === void 0 ? 0 : _ref2$contentIndex,
+    getIntl = _ref2.getIntl,
+    api = _ref2.api;
   var matches = [];
   var searchTextLength = searchText.length;
   var textGrouping = null;
@@ -95,7 +102,7 @@ function findMatches(content, searchText, shouldMatchCase) {
       });
     }
   };
-  var collectDateMatch = function collectDateMatch(textGrouping, nodeSize) {
+  var collectDateOrMentionMatch = function collectDateOrMentionMatch(textGrouping, nodeSize) {
     if (!textGrouping) {
       return;
     }
@@ -139,12 +146,43 @@ function findMatches(content, searchText, shouldMatchCase) {
               break;
             case 'date':
               if ((0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2')) {
-                collectDateMatch({
+                collectDateOrMentionMatch({
                   text: (0, _utils.timestampToString)(node.attrs.timestamp, getIntl ? getIntl() : null),
                   pos: pos
                 }, node.nodeSize);
               }
               break;
+            case 'mention':
+              if ((0, _platformFeatureFlags.fg)('platform_editor_find_and_replace_part_2')) {
+                var text;
+                if (node.attrs.text) {
+                  text = node.attrs.text;
+                } else {
+                  var _api$mention;
+                  // the text may be sanitised from the node for privacy reasons
+                  // so we need to use the mentionProvider to resolve it
+                  var mentionProvider = api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.sharedState.currentState()) === null || _api$mention === void 0 ? void 0 : _api$mention.mentionProvider;
+                  if ((0, _resource.isResolvingMentionProvider)(mentionProvider)) {
+                    var nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
+                    if ((0, _types.isPromise)(nameDetail)) {
+                      text = '@...';
+                    } else {
+                      if (nameDetail.status === _types.MentionNameStatus.OK) {
+                        text = "@".concat(nameDetail.name || '');
+                      } else {
+                        text = '@_|unknown|_';
+                      }
+                    }
+                  }
+                }
+                if (text) {
+                  collectDateOrMentionMatch({
+                    text: text,
+                    pos: pos
+                  }, node.nodeSize);
+                }
+              }
+              break;
             default:
               break;
           }

package/dist/es2019/findReplacePlugin.js

@@ -63,7 +63,7 @@ export const findReplacePlugin = ({
         plugin: ({
           dispatch,
           getIntl
-        }) => createPlugin(dispatch, getIntl)
+        }) => createPlugin(dispatch, getIntl, api)
       }, {
         name: 'findReplaceKeymap',
         plugin: () => {

package/dist/es2019/pm-plugins/commands.js

@@ -19,9 +19,16 @@ export const activate = () => createCommand(state => {
     findText = getSelectedText(selection);
     const {
       shouldMatchCase,
-      getIntl
+      getIntl,
+      api
     } = getPluginState(state);
-    matches = findMatches(state.doc, findText, shouldMatchCase, undefined, getIntl);
+    matches = findMatches({
+      content: state.doc,
+      searchText: findText,
+      shouldMatchCase,
+      getIntl,
+      api
+    });
     index = findSearchIndex(selection.from, matches);
   }
   return {
@@ -37,9 +44,16 @@ export const find = (editorView, containerElement, keyword) => withScrollIntoVie
   } = state;
   const {
     shouldMatchCase,
-    getIntl
+    getIntl,
+    api
   } = getPluginState(state);
-  const matches = keyword !== undefined ? findMatches(state.doc, keyword, shouldMatchCase, undefined, getIntl) : [];
+  const matches = keyword !== undefined ? findMatches({
+    content: state.doc,
+    searchText: keyword,
+    shouldMatchCase,
+    getIntl,
+    api
+  }) : [];
   const index = findSearchIndex(selection.from, matches);
 
   // we can't just apply all the decorations to highlight the search results at once
@@ -57,9 +71,16 @@ export const find = (editorView, containerElement, keyword) => withScrollIntoVie
   } = state;
   const {
     shouldMatchCase,
-    getIntl
+    getIntl,
+    api
   } = getPluginState(state);
-  const matches = keyword !== undefined ? findMatches(state.doc, keyword, shouldMatchCase, undefined, getIntl) : [];
+  const matches = keyword !== undefined ? findMatches({
+    content: state.doc,
+    searchText: keyword,
+    shouldMatchCase,
+    getIntl,
+    api
+  }) : [];
   if (matches.length > 0) {
     const index = findSearchIndex(selection.from, matches);
     return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, index, matches));

package/dist/es2019/pm-plugins/main.js

@@ -13,12 +13,13 @@ export const initialState = {
   decorationSet: DecorationSet.empty,
   shouldMatchCase: false
 };
-export const createPlugin = (dispatch, getIntl) => {
+export const createPlugin = (dispatch, getIntl, api) => {
   return new SafePlugin({
     key: findReplacePluginKey,
     state: createPluginState(dispatch, () => fg('platform_editor_find_and_replace_part_2') ? {
       ...initialState,
-      getIntl
+      getIntl,
+      api
     } : {
       ...initialState
     }),

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -25,9 +25,16 @@ const handleDocChanged = (tr, pluginState) => {
     decorationSet,
     matches,
     shouldMatchCase,
-    getIntl
+    getIntl,
+    api
   } = pluginState;
-  const newMatches = findMatches(tr.doc, findText, shouldMatchCase, undefined, getIntl);
+  const newMatches = findMatches({
+    content: tr.doc,
+    searchText: findText,
+    shouldMatchCase: shouldMatchCase,
+    getIntl,
+    api
+  });
   decorationSet = decorationSet.map(tr.mapping, tr.doc);
   const numDecorations = decorationSet.find().length;
   const mappedMatches = matches.map(match => ({

package/dist/es2019/pm-plugins/reducer.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FindReplaceActionTypes } from './actions';
 const reducer = getInitialState => (state, action) => {
   switch (action.type) {
@@ -38,7 +39,15 @@ const reducer = getInitialState => (state, action) => {
         index: action.index
       };
     case FindReplaceActionTypes.CANCEL:
-      return getInitialState();
+      const {
+        getIntl,
+        api
+      } = state;
+      return fg('platform_editor_find_and_replace_part_2') ? {
+        ...getInitialState(),
+        getIntl,
+        api
+      } : getInitialState();
     case FindReplaceActionTypes.BLUR:
       return {
         ...state,

package/dist/es2019/pm-plugins/utils/index.js

@@ -1,6 +1,8 @@
 import { timestampToString } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { isPromise, MentionNameStatus } from '@atlaskit/mention/types';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { searchMatchClass, selectedSearchMatchClass } from '../../ui/styles';
 export function getSelectedText(selection) {
@@ -24,7 +26,14 @@ export const createDecoration = (start, end, isSelected) => {
     class: className
   });
 };
-export function findMatches(content, searchText, shouldMatchCase, contentIndex = 0, getIntl) {
+export function findMatches({
+  content,
+  searchText,
+  shouldMatchCase,
+  contentIndex = 0,
+  getIntl,
+  api
+}) {
   const matches = [];
   const searchTextLength = searchText.length;
   let textGrouping = null;
@@ -88,7 +97,7 @@ export function findMatches(content, searchText, shouldMatchCase, contentIndex =
       });
     }
   };
-  const collectDateMatch = (textGrouping, nodeSize) => {
+  const collectDateOrMentionMatch = (textGrouping, nodeSize) => {
     if (!textGrouping) {
       return;
     }
@@ -136,12 +145,43 @@ export function findMatches(content, searchText, shouldMatchCase, contentIndex =
               break;
             case 'date':
               if (fg('platform_editor_find_and_replace_part_2')) {
-                collectDateMatch({
+                collectDateOrMentionMatch({
                   text: timestampToString(node.attrs.timestamp, getIntl ? getIntl() : null),
                   pos
                 }, node.nodeSize);
               }
               break;
+            case 'mention':
+              if (fg('platform_editor_find_and_replace_part_2')) {
+                let text;
+                if (node.attrs.text) {
+                  text = node.attrs.text;
+                } else {
+                  var _api$mention, _api$mention$sharedSt;
+                  // the text may be sanitised from the node for privacy reasons
+                  // so we need to use the mentionProvider to resolve it
+                  const mentionProvider = api === null || api === void 0 ? void 0 : (_api$mention = api.mention) === null || _api$mention === void 0 ? void 0 : (_api$mention$sharedSt = _api$mention.sharedState.currentState()) === null || _api$mention$sharedSt === void 0 ? void 0 : _api$mention$sharedSt.mentionProvider;
+                  if (isResolvingMentionProvider(mentionProvider)) {
+                    const nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
+                    if (isPromise(nameDetail)) {
+                      text = '@...';
+                    } else {
+                      if (nameDetail.status === MentionNameStatus.OK) {
+                        text = `@${nameDetail.name || ''}`;
+                      } else {
+                        text = '@_|unknown|_';
+                      }
+                    }
+                  }
+                }
+                if (text) {
+                  collectDateOrMentionMatch({
+                    text,
+                    pos
+                  }, node.nodeSize);
+                }
+              }
+              break;
             default:
               break;
           }

package/dist/esm/findReplacePlugin.js

@@ -61,7 +61,7 @@ export var findReplacePlugin = function findReplacePlugin(_ref) {
         plugin: function plugin(_ref3) {
           var dispatch = _ref3.dispatch,
             getIntl = _ref3.getIntl;
-          return createPlugin(dispatch, getIntl);
+          return createPlugin(dispatch, getIntl, api);
         }
       }, {
         name: 'findReplaceKeymap',

package/dist/esm/pm-plugins/commands.js

@@ -18,8 +18,15 @@ export var activate = function activate() {
       findText = getSelectedText(selection);
       var _getPluginState = getPluginState(state),
         shouldMatchCase = _getPluginState.shouldMatchCase,
-        getIntl = _getPluginState.getIntl;
-      matches = findMatches(state.doc, findText, shouldMatchCase, undefined, getIntl);
+        getIntl = _getPluginState.getIntl,
+        api = _getPluginState.api;
+      matches = findMatches({
+        content: state.doc,
+        searchText: findText,
+        shouldMatchCase: shouldMatchCase,
+        getIntl: getIntl,
+        api: api
+      });
       index = findSearchIndex(selection.from, matches);
     }
     return {
@@ -35,8 +42,15 @@ export var find = function find(editorView, containerElement, keyword) {
     var selection = state.selection;
     var _getPluginState2 = getPluginState(state),
       shouldMatchCase = _getPluginState2.shouldMatchCase,
-      getIntl = _getPluginState2.getIntl;
-    var matches = keyword !== undefined ? findMatches(state.doc, keyword, shouldMatchCase, undefined, getIntl) : [];
+      getIntl = _getPluginState2.getIntl,
+      api = _getPluginState2.api;
+    var matches = keyword !== undefined ? findMatches({
+      content: state.doc,
+      searchText: keyword,
+      shouldMatchCase: shouldMatchCase,
+      getIntl: getIntl,
+      api: api
+    }) : [];
     var index = findSearchIndex(selection.from, matches);
 
     // we can't just apply all the decorations to highlight the search results at once
@@ -56,8 +70,15 @@ export var find = function find(editorView, containerElement, keyword) {
     var selection = state.selection;
     var _getPluginState3 = getPluginState(state),
       shouldMatchCase = _getPluginState3.shouldMatchCase,
-      getIntl = _getPluginState3.getIntl;
-    var matches = keyword !== undefined ? findMatches(state.doc, keyword, shouldMatchCase, undefined, getIntl) : [];
+      getIntl = _getPluginState3.getIntl,
+      api = _getPluginState3.api;
+    var matches = keyword !== undefined ? findMatches({
+      content: state.doc,
+      searchText: keyword,
+      shouldMatchCase: shouldMatchCase,
+      getIntl: getIntl,
+      api: api
+    }) : [];
     if (matches.length > 0) {
       var index = findSearchIndex(selection.from, matches);
       return tr.setSelection(getSelectionForMatch(tr.selection, tr.doc, index, matches));

package/dist/esm/pm-plugins/main.js

@@ -16,12 +16,13 @@ export var initialState = {
   decorationSet: DecorationSet.empty,
   shouldMatchCase: false
 };
-export var createPlugin = function createPlugin(dispatch, getIntl) {
+export var createPlugin = function createPlugin(dispatch, getIntl, api) {
   return new SafePlugin({
     key: findReplacePluginKey,
     state: createPluginState(dispatch, function () {
       return fg('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, initialState), {}, {
-        getIntl: getIntl
+        getIntl: getIntl,
+        api: api
       }) : _objectSpread({}, initialState);
     }),
     props: {

package/dist/esm/pm-plugins/plugin-factory.js

@@ -26,8 +26,15 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
     decorationSet = pluginState.decorationSet,
     matches = pluginState.matches,
     shouldMatchCase = pluginState.shouldMatchCase,
-    getIntl = pluginState.getIntl;
-  var newMatches = findMatches(tr.doc, findText, shouldMatchCase, undefined, getIntl);
+    getIntl = pluginState.getIntl,
+    api = pluginState.api;
+  var newMatches = findMatches({
+    content: tr.doc,
+    searchText: findText,
+    shouldMatchCase: shouldMatchCase,
+    getIntl: getIntl,
+    api: api
+  });
   decorationSet = decorationSet.map(tr.mapping, tr.doc);
   var numDecorations = decorationSet.find().length;
   var mappedMatches = matches.map(function (match) {

package/dist/esm/pm-plugins/reducer.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _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 { fg } from '@atlaskit/platform-feature-flags';
 import { FindReplaceActionTypes } from './actions';
 var reducer = function reducer(getInitialState) {
   return function (state, action) {
@@ -37,7 +38,12 @@ var reducer = function reducer(getInitialState) {
           index: action.index
         });
       case FindReplaceActionTypes.CANCEL:
-        return getInitialState();
+        var getIntl = state.getIntl,
+          api = state.api;
+        return fg('platform_editor_find_and_replace_part_2') ? _objectSpread(_objectSpread({}, getInitialState()), {}, {
+          getIntl: getIntl,
+          api: api
+        }) : getInitialState();
       case FindReplaceActionTypes.BLUR:
         return _objectSpread(_objectSpread({}, state), {}, {
           shouldFocus: false

package/dist/esm/pm-plugins/utils/index.js

@@ -1,6 +1,8 @@
 import { timestampToString } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { isResolvingMentionProvider } from '@atlaskit/mention/resource';
+import { isPromise, MentionNameStatus } from '@atlaskit/mention/types';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { searchMatchClass, selectedSearchMatchClass } from '../../ui/styles';
 export function getSelectedText(selection) {
@@ -27,9 +29,14 @@ export var createDecoration = function createDecoration(start, end, isSelected)
     class: className
   });
 };
-export function findMatches(content, searchText, shouldMatchCase) {
-  var contentIndex = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  var getIntl = arguments.length > 4 ? arguments[4] : undefined;
+export function findMatches(_ref2) {
+  var content = _ref2.content,
+    searchText = _ref2.searchText,
+    shouldMatchCase = _ref2.shouldMatchCase,
+    _ref2$contentIndex = _ref2.contentIndex,
+    contentIndex = _ref2$contentIndex === void 0 ? 0 : _ref2$contentIndex,
+    getIntl = _ref2.getIntl,
+    api = _ref2.api;
   var matches = [];
   var searchTextLength = searchText.length;
   var textGrouping = null;
@@ -85,7 +92,7 @@ export function findMatches(content, searchText, shouldMatchCase) {
       });
     }
   };
-  var collectDateMatch = function collectDateMatch(textGrouping, nodeSize) {
+  var collectDateOrMentionMatch = function collectDateOrMentionMatch(textGrouping, nodeSize) {
     if (!textGrouping) {
       return;
     }
@@ -129,12 +136,43 @@ export function findMatches(content, searchText, shouldMatchCase) {
               break;
             case 'date':
               if (fg('platform_editor_find_and_replace_part_2')) {
-                collectDateMatch({
+                collectDateOrMentionMatch({
                   text: timestampToString(node.attrs.timestamp, getIntl ? getIntl() : null),
                   pos: pos
                 }, node.nodeSize);
               }
               break;
+            case 'mention':
+              if (fg('platform_editor_find_and_replace_part_2')) {
+                var text;
+                if (node.attrs.text) {
+                  text = node.attrs.text;
+                } else {
+                  var _api$mention;
+                  // the text may be sanitised from the node for privacy reasons
+                  // so we need to use the mentionProvider to resolve it
+                  var mentionProvider = api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.sharedState.currentState()) === null || _api$mention === void 0 ? void 0 : _api$mention.mentionProvider;
+                  if (isResolvingMentionProvider(mentionProvider)) {
+                    var nameDetail = mentionProvider.resolveMentionName(node.attrs.id);
+                    if (isPromise(nameDetail)) {
+                      text = '@...';
+                    } else {
+                      if (nameDetail.status === MentionNameStatus.OK) {
+                        text = "@".concat(nameDetail.name || '');
+                      } else {
+                        text = '@_|unknown|_';
+                      }
+                    }
+                  }
+                }
+                if (text) {
+                  collectDateOrMentionMatch({
+                    text: text,
+                    pos: pos
+                  }, node.nodeSize);
+                }
+              }
+              break;
             default:
               break;
           }

package/dist/types/findReplacePluginType.d.ts

@@ -2,6 +2,7 @@
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { MentionsPlugin } from '@atlaskit/editor-plugin-mentions';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { FindReplacePluginState, FindReplaceToolbarButtonActionProps } from './types';
 export type FindReplacePluginOptions = {
@@ -10,7 +11,8 @@ export type FindReplacePluginOptions = {
 };
 export type FindReplacePluginDependencies = [
     OptionalPlugin<AnalyticsPlugin>,
-    OptionalPlugin<PrimaryToolbarPlugin>
+    OptionalPlugin<PrimaryToolbarPlugin>,
+    OptionalPlugin<MentionsPlugin>
 ];
 export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: FindReplacePluginOptions;

package/dist/types/pm-plugins/main.d.ts

@@ -1,6 +1,7 @@
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import { FindReplacePlugin } from '../findReplacePluginType';
 import type { FindReplacePluginState } from '../types';
 export declare const initialState: FindReplacePluginState;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: PMPluginFactoryParams['getIntl']) => SafePlugin<FindReplacePluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: PMPluginFactoryParams['getIntl'], api?: ExtractInjectionAPI<FindReplacePlugin>) => SafePlugin<FindReplacePluginState>;

package/dist/types/pm-plugins/utils/index.d.ts

@@ -1,10 +1,12 @@
 import { IntlShape } from 'react-intl-next';
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Fragment, Node as PmNode, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { ReadonlyTransaction, Selection } from '@atlaskit/editor-prosemirror/state';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { FindReplacePlugin } from '../../findReplacePluginType';
 import type { Match } from '../../types';
 export declare function getSelectedText(selection: TextSelection): string;
 export declare const createDecorations: (selectedIndex: number, matches: {
@@ -12,7 +14,15 @@ export declare const createDecorations: (selectedIndex: number, matches: {
     end: number;
 }[]) => Decoration[];
 export declare const createDecoration: (start: number, end: number, isSelected?: boolean) => Decoration;
-export declare function findMatches(content: PmNode | Fragment, searchText: string, shouldMatchCase: boolean, contentIndex?: number, getIntl?: () => IntlShape): Match[];
+type FindMatchesType = {
+    content: PmNode | Fragment;
+    searchText: string;
+    shouldMatchCase: boolean;
+    contentIndex?: number;
+    getIntl?: () => IntlShape;
+    api?: ExtractInjectionAPI<FindReplacePlugin>;
+};
+export declare function findMatches({ content, searchText, shouldMatchCase, contentIndex, getIntl, api }: FindMatchesType): Match[];
 /**
  * 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.
@@ -48,3 +58,4 @@ export declare const isMatchAffectedByStep: (match: Match, step: Step & {
     to: number;
     slice: Slice;
 }, tr: ReadonlyTransaction) => boolean;
+export {};

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

@@ -25,6 +25,8 @@ export interface FindReplacePluginState {
     shouldMatchCase: boolean;
     /** Intl object */
     getIntl?: () => IntlShape;
+    /** api */
+    api?: ExtractInjectionAPI<FindReplacePlugin>;
 }
 export type FindReplaceToolbarButtonWithStateProps = {
     popupsBoundariesElement?: HTMLElement;

package/dist/types-ts4.5/findReplacePluginType.d.ts

@@ -2,6 +2,7 @@
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { MentionsPlugin } from '@atlaskit/editor-plugin-mentions';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { FindReplacePluginState, FindReplaceToolbarButtonActionProps } from './types';
 export type FindReplacePluginOptions = {
@@ -10,7 +11,8 @@ export type FindReplacePluginOptions = {
 };
 export type FindReplacePluginDependencies = [
     OptionalPlugin<AnalyticsPlugin>,
-    OptionalPlugin<PrimaryToolbarPlugin>
+    OptionalPlugin<PrimaryToolbarPlugin>,
+    OptionalPlugin<MentionsPlugin>
 ];
 export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: FindReplacePluginOptions;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -1,6 +1,7 @@
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import { FindReplacePlugin } from '../findReplacePluginType';
 import type { FindReplacePluginState } from '../types';
 export declare const initialState: FindReplacePluginState;
-export declare const createPlugin: (dispatch: Dispatch, getIntl: PMPluginFactoryParams['getIntl']) => SafePlugin<FindReplacePluginState>;
+export declare const createPlugin: (dispatch: Dispatch, getIntl: PMPluginFactoryParams['getIntl'], api?: ExtractInjectionAPI<FindReplacePlugin>) => SafePlugin<FindReplacePluginState>;

package/dist/types-ts4.5/pm-plugins/utils/index.d.ts

@@ -1,10 +1,12 @@
 import { IntlShape } from 'react-intl-next';
+import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Fragment, Node as PmNode, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { ReadonlyTransaction, Selection } from '@atlaskit/editor-prosemirror/state';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { FindReplacePlugin } from '../../findReplacePluginType';
 import type { Match } from '../../types';
 export declare function getSelectedText(selection: TextSelection): string;
 export declare const createDecorations: (selectedIndex: number, matches: {
@@ -12,7 +14,15 @@ export declare const createDecorations: (selectedIndex: number, matches: {
     end: number;
 }[]) => Decoration[];
 export declare const createDecoration: (start: number, end: number, isSelected?: boolean) => Decoration;
-export declare function findMatches(content: PmNode | Fragment, searchText: string, shouldMatchCase: boolean, contentIndex?: number, getIntl?: () => IntlShape): Match[];
+type FindMatchesType = {
+    content: PmNode | Fragment;
+    searchText: string;
+    shouldMatchCase: boolean;
+    contentIndex?: number;
+    getIntl?: () => IntlShape;
+    api?: ExtractInjectionAPI<FindReplacePlugin>;
+};
+export declare function findMatches({ content, searchText, shouldMatchCase, contentIndex, getIntl, api }: FindMatchesType): Match[];
 /**
  * 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.
@@ -48,3 +58,4 @@ export declare const isMatchAffectedByStep: (match: Match, step: Step & {
     to: number;
     slice: Slice;
 }, tr: ReadonlyTransaction) => boolean;
+export {};

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

@@ -25,6 +25,8 @@ export interface FindReplacePluginState {
     shouldMatchCase: boolean;
     /** Intl object */
     getIntl?: () => IntlShape;
+    /** api */
+    api?: ExtractInjectionAPI<FindReplacePlugin>;
 }
 export type FindReplaceToolbarButtonWithStateProps = {
     popupsBoundariesElement?: HTMLElement;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "2.6.1",
+	"version": "2.7.0",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,17 +35,19 @@
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/editor-common": "^107.0.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
+		"@atlaskit/editor-plugin-mentions": "^4.7.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/icon": "^27.0.0",
+		"@atlaskit/mention": "^24.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.8.0",
+		"@atlaskit/primitives": "^14.9.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^7.1.0",
-		"@atlaskit/tokens": "^5.2.0",
+		"@atlaskit/tmp-editor-statsig": "^7.2.0",
+		"@atlaskit/tokens": "^5.3.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",