@atlaskit/editor-plugin-quick-insert 1.6.1 → 1.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-plugin-quick-insert
2
2
 
3
+ ## 1.7.1
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 1.7.0
10
+
11
+ ### Minor Changes
12
+
13
+ - [`e9f1406d9e6fb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e9f1406d9e6fb) -
14
+ Use getSuggestions from quickInsert plugin so the search behavior is consistent amongst surface
15
+ areas
16
+
3
17
  ## 1.6.1
4
18
 
5
19
  ### Patch Changes
@@ -9,7 +9,6 @@ exports.default = void 0;
9
9
  var _react = _interopRequireWildcard(require("react"));
10
10
  var _hooks = require("@atlaskit/editor-common/hooks");
11
11
  var _commands = require("../../pm-plugins/commands");
12
- var _search = require("../search");
13
12
  var _ModalElementBrowser = _interopRequireDefault(require("./ModalElementBrowser"));
14
13
  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); }
15
14
  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; }
@@ -17,13 +16,18 @@ var Modal = function Modal(_ref) {
17
16
  var quickInsertState = _ref.quickInsertState,
18
17
  editorView = _ref.editorView,
19
18
  helpUrl = _ref.helpUrl,
20
- insertItem = _ref.insertItem;
19
+ insertItem = _ref.insertItem,
20
+ getSuggestions = _ref.getSuggestions;
21
21
  var getItems = (0, _react.useCallback)(function (query, category) {
22
- return (0, _search.getQuickInsertSuggestions)({
22
+ var _getSuggestions;
23
+ return (_getSuggestions = getSuggestions === null || getSuggestions === void 0 ? void 0 : getSuggestions({
23
24
  query: query,
24
25
  category: category
25
- }, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems);
26
- }, [quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems]);
26
+ })) !== null && _getSuggestions !== void 0 ? _getSuggestions : [];
27
+ },
28
+ // See: https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/157796/overview?commentId=8559952
29
+ // eslint-disable-next-line react-hooks/exhaustive-deps
30
+ [getSuggestions, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems]);
27
31
  var focusInEditor = (0, _react.useCallback)(function () {
28
32
  if (!editorView.hasFocus()) {
29
33
  editorView.focus();
@@ -64,7 +68,7 @@ var Modal = function Modal(_ref) {
64
68
  });
65
69
  };
66
70
  var _default = exports.default = function _default(_ref2) {
67
- var _pluginInjectionAPI$q;
71
+ var _pluginInjectionAPI$q, _pluginInjectionAPI$q2;
68
72
  var editorView = _ref2.editorView,
69
73
  helpUrl = _ref2.helpUrl,
70
74
  pluginInjectionAPI = _ref2.pluginInjectionAPI;
@@ -74,6 +78,7 @@ var _default = exports.default = function _default(_ref2) {
74
78
  quickInsertState: quickInsertState !== null && quickInsertState !== void 0 ? quickInsertState : undefined,
75
79
  editorView: editorView,
76
80
  helpUrl: helpUrl,
77
- insertItem: pluginInjectionAPI === null || pluginInjectionAPI === void 0 || (_pluginInjectionAPI$q = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q === void 0 || (_pluginInjectionAPI$q = _pluginInjectionAPI$q.actions) === null || _pluginInjectionAPI$q === void 0 ? void 0 : _pluginInjectionAPI$q.insertItem
81
+ insertItem: pluginInjectionAPI === null || pluginInjectionAPI === void 0 || (_pluginInjectionAPI$q = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q === void 0 || (_pluginInjectionAPI$q = _pluginInjectionAPI$q.actions) === null || _pluginInjectionAPI$q === void 0 ? void 0 : _pluginInjectionAPI$q.insertItem,
82
+ getSuggestions: pluginInjectionAPI === null || pluginInjectionAPI === void 0 || (_pluginInjectionAPI$q2 = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q2 === void 0 || (_pluginInjectionAPI$q2 = _pluginInjectionAPI$q2.actions) === null || _pluginInjectionAPI$q2 === void 0 ? void 0 : _pluginInjectionAPI$q2.getSuggestions
78
83
  });
79
84
  };
@@ -1,18 +1,24 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
3
3
  import { closeElementBrowserModal } from '../../pm-plugins/commands';
4
- import { getQuickInsertSuggestions } from '../search';
5
4
  import ModalElementBrowser from './ModalElementBrowser';
6
5
  const Modal = ({
7
6
  quickInsertState,
8
7
  editorView,
9
8
  helpUrl,
10
- insertItem
9
+ insertItem,
10
+ getSuggestions
11
11
  }) => {
12
- const getItems = useCallback((query, category) => getQuickInsertSuggestions({
13
- query,
14
- category
15
- }, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems), [quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems]);
12
+ const getItems = useCallback((query, category) => {
13
+ var _getSuggestions;
14
+ return (_getSuggestions = getSuggestions === null || getSuggestions === void 0 ? void 0 : getSuggestions({
15
+ query,
16
+ category
17
+ })) !== null && _getSuggestions !== void 0 ? _getSuggestions : [];
18
+ },
19
+ // See: https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/157796/overview?commentId=8559952
20
+ // eslint-disable-next-line react-hooks/exhaustive-deps
21
+ [getSuggestions, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems]);
16
22
  const focusInEditor = useCallback(() => {
17
23
  if (!editorView.hasFocus()) {
18
24
  editorView.focus();
@@ -57,7 +63,7 @@ export default (({
57
63
  helpUrl,
58
64
  pluginInjectionAPI
59
65
  }) => {
60
- var _pluginInjectionAPI$q, _pluginInjectionAPI$q2;
66
+ var _pluginInjectionAPI$q, _pluginInjectionAPI$q2, _pluginInjectionAPI$q3, _pluginInjectionAPI$q4;
61
67
  const {
62
68
  quickInsertState
63
69
  } = useSharedPluginState(pluginInjectionAPI, ['quickInsert']);
@@ -65,6 +71,7 @@ export default (({
65
71
  quickInsertState: quickInsertState !== null && quickInsertState !== void 0 ? quickInsertState : undefined,
66
72
  editorView: editorView,
67
73
  helpUrl: helpUrl,
68
- insertItem: pluginInjectionAPI === null || pluginInjectionAPI === void 0 ? void 0 : (_pluginInjectionAPI$q = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q === void 0 ? void 0 : (_pluginInjectionAPI$q2 = _pluginInjectionAPI$q.actions) === null || _pluginInjectionAPI$q2 === void 0 ? void 0 : _pluginInjectionAPI$q2.insertItem
74
+ insertItem: pluginInjectionAPI === null || pluginInjectionAPI === void 0 ? void 0 : (_pluginInjectionAPI$q = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q === void 0 ? void 0 : (_pluginInjectionAPI$q2 = _pluginInjectionAPI$q.actions) === null || _pluginInjectionAPI$q2 === void 0 ? void 0 : _pluginInjectionAPI$q2.insertItem,
75
+ getSuggestions: pluginInjectionAPI === null || pluginInjectionAPI === void 0 ? void 0 : (_pluginInjectionAPI$q3 = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q3 === void 0 ? void 0 : (_pluginInjectionAPI$q4 = _pluginInjectionAPI$q3.actions) === null || _pluginInjectionAPI$q4 === void 0 ? void 0 : _pluginInjectionAPI$q4.getSuggestions
69
76
  });
70
77
  });
@@ -1,19 +1,23 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
3
3
  import { closeElementBrowserModal } from '../../pm-plugins/commands';
4
- import { getQuickInsertSuggestions } from '../search';
5
4
  import ModalElementBrowser from './ModalElementBrowser';
6
5
  var Modal = function Modal(_ref) {
7
6
  var quickInsertState = _ref.quickInsertState,
8
7
  editorView = _ref.editorView,
9
8
  helpUrl = _ref.helpUrl,
10
- insertItem = _ref.insertItem;
9
+ insertItem = _ref.insertItem,
10
+ getSuggestions = _ref.getSuggestions;
11
11
  var getItems = useCallback(function (query, category) {
12
- return getQuickInsertSuggestions({
12
+ var _getSuggestions;
13
+ return (_getSuggestions = getSuggestions === null || getSuggestions === void 0 ? void 0 : getSuggestions({
13
14
  query: query,
14
15
  category: category
15
- }, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems);
16
- }, [quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems]);
16
+ })) !== null && _getSuggestions !== void 0 ? _getSuggestions : [];
17
+ },
18
+ // See: https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/157796/overview?commentId=8559952
19
+ // eslint-disable-next-line react-hooks/exhaustive-deps
20
+ [getSuggestions, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.lazyDefaultItems, quickInsertState === null || quickInsertState === void 0 ? void 0 : quickInsertState.providedItems]);
17
21
  var focusInEditor = useCallback(function () {
18
22
  if (!editorView.hasFocus()) {
19
23
  editorView.focus();
@@ -54,7 +58,7 @@ var Modal = function Modal(_ref) {
54
58
  });
55
59
  };
56
60
  export default (function (_ref2) {
57
- var _pluginInjectionAPI$q;
61
+ var _pluginInjectionAPI$q, _pluginInjectionAPI$q2;
58
62
  var editorView = _ref2.editorView,
59
63
  helpUrl = _ref2.helpUrl,
60
64
  pluginInjectionAPI = _ref2.pluginInjectionAPI;
@@ -64,6 +68,7 @@ export default (function (_ref2) {
64
68
  quickInsertState: quickInsertState !== null && quickInsertState !== void 0 ? quickInsertState : undefined,
65
69
  editorView: editorView,
66
70
  helpUrl: helpUrl,
67
- insertItem: pluginInjectionAPI === null || pluginInjectionAPI === void 0 || (_pluginInjectionAPI$q = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q === void 0 || (_pluginInjectionAPI$q = _pluginInjectionAPI$q.actions) === null || _pluginInjectionAPI$q === void 0 ? void 0 : _pluginInjectionAPI$q.insertItem
71
+ insertItem: pluginInjectionAPI === null || pluginInjectionAPI === void 0 || (_pluginInjectionAPI$q = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q === void 0 || (_pluginInjectionAPI$q = _pluginInjectionAPI$q.actions) === null || _pluginInjectionAPI$q === void 0 ? void 0 : _pluginInjectionAPI$q.insertItem,
72
+ getSuggestions: pluginInjectionAPI === null || pluginInjectionAPI === void 0 || (_pluginInjectionAPI$q2 = pluginInjectionAPI.quickInsert) === null || _pluginInjectionAPI$q2 === void 0 || (_pluginInjectionAPI$q2 = _pluginInjectionAPI$q2.actions) === null || _pluginInjectionAPI$q2 === void 0 ? void 0 : _pluginInjectionAPI$q2.getSuggestions
68
73
  });
69
74
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-quick-insert",
3
- "version": "1.6.1",
3
+ "version": "1.7.1",
4
4
  "description": "Quick insert plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -32,13 +32,13 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@atlaskit/button": "^20.3.0",
35
- "@atlaskit/editor-common": "^94.12.0",
35
+ "@atlaskit/editor-common": "^95.0.0",
36
36
  "@atlaskit/editor-plugin-type-ahead": "^1.10.0",
37
37
  "@atlaskit/editor-prosemirror": "6.0.0",
38
38
  "@atlaskit/icon": "^22.24.0",
39
39
  "@atlaskit/modal-dialog": "^12.17.0",
40
40
  "@atlaskit/theme": "^14.0.0",
41
- "@atlaskit/tokens": "^2.1.0",
41
+ "@atlaskit/tokens": "^2.3.0",
42
42
  "@babel/runtime": "^7.0.0",
43
43
  "@emotion/react": "^11.7.1"
44
44
  },