@atlaskit/editor-core 166.0.3 → 166.0.4

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.
Files changed (82) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/cjs/plugins/annotation/pm-plugins/inline-comment.js +2 -2
  3. package/dist/cjs/plugins/annotation/pm-plugins/plugin-factory.js +0 -1
  4. package/dist/cjs/plugins/collab-edit/index.js +2 -2
  5. package/dist/cjs/plugins/collab-edit/provider/channel.js +2 -2
  6. package/dist/cjs/plugins/extension/context-panel.js +2 -2
  7. package/dist/cjs/plugins/extension/plugin-factory.js +1 -4
  8. package/dist/cjs/plugins/extension/pm-plugins/main.js +13 -36
  9. package/dist/cjs/plugins/extension/utils.js +12 -57
  10. package/dist/cjs/plugins/feedback-dialog/index.js +0 -1
  11. package/dist/cjs/plugins/find-replace/utils/batch-decorations.js +0 -1
  12. package/dist/cjs/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js +2 -2
  13. package/dist/cjs/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js +2 -2
  14. package/dist/cjs/plugins/macro/actions.js +2 -2
  15. package/dist/cjs/plugins/media/nodeviews/mediaInline.js +2 -2
  16. package/dist/cjs/plugins/media/nodeviews/mediaSingle.js +2 -2
  17. package/dist/cjs/plugins/media/ui/ResizableMediaSingle/index.js +2 -2
  18. package/dist/cjs/ui/ConfigPanel/ConfigPanel.js +2 -2
  19. package/dist/cjs/ui/ConfigPanel/Fields/CustomSelect.js +2 -2
  20. package/dist/cjs/ui/ConfigPanel/Fields/UserSelect.js +2 -2
  21. package/dist/cjs/ui/ConfigPanel/transformers.js +2 -2
  22. package/dist/cjs/version-wrapper.js +1 -1
  23. package/dist/cjs/version.json +1 -1
  24. package/dist/es2019/plugins/extension/plugin-factory.js +1 -3
  25. package/dist/es2019/plugins/extension/pm-plugins/main.js +12 -38
  26. package/dist/es2019/plugins/extension/utils.js +2 -37
  27. package/dist/es2019/version-wrapper.js +1 -1
  28. package/dist/es2019/version.json +1 -1
  29. package/dist/esm/actions/index.js +1 -1
  30. package/dist/esm/create-editor/ErrorBoundary.js +1 -1
  31. package/dist/esm/editor.js +1 -2
  32. package/dist/esm/plugins/annotation/pm-plugins/inline-comment.js +1 -1
  33. package/dist/esm/plugins/annotation/pm-plugins/plugin-factory.js +0 -1
  34. package/dist/esm/plugins/collab-edit/index.js +1 -1
  35. package/dist/esm/plugins/collab-edit/provider/channel.js +1 -1
  36. package/dist/esm/plugins/custom-autoformat/doc.js +1 -1
  37. package/dist/esm/plugins/custom-autoformat/index.js +1 -1
  38. package/dist/esm/plugins/extension/actions.js +1 -1
  39. package/dist/esm/plugins/extension/context-panel.js +1 -1
  40. package/dist/esm/plugins/extension/plugin-factory.js +1 -3
  41. package/dist/esm/plugins/extension/pm-plugins/main.js +12 -35
  42. package/dist/esm/plugins/extension/ui/Extension/ExtensionComponent.js +1 -1
  43. package/dist/esm/plugins/extension/utils.js +9 -51
  44. package/dist/esm/plugins/feedback-dialog/index.js +1 -2
  45. package/dist/esm/plugins/feedback-dialog/loadJiraCollectorDialogScript.js +1 -1
  46. package/dist/esm/plugins/find-replace/utils/batch-decorations.js +1 -2
  47. package/dist/esm/plugins/floating-toolbar/ui/ExtensionsPlaceholder.js +1 -1
  48. package/dist/esm/plugins/hyperlink/HyperlinkToolbarAppearance.js +1 -1
  49. package/dist/esm/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js +1 -2
  50. package/dist/esm/plugins/image-upload/pm-plugins/main.js +1 -1
  51. package/dist/esm/plugins/macro/actions.js +1 -1
  52. package/dist/esm/plugins/media/nodeviews/mediaGroup.js +1 -1
  53. package/dist/esm/plugins/media/nodeviews/mediaInline.js +1 -2
  54. package/dist/esm/plugins/media/nodeviews/mediaNodeUpdater.js +1 -1
  55. package/dist/esm/plugins/media/nodeviews/mediaNodeView/media.js +1 -1
  56. package/dist/esm/plugins/media/nodeviews/mediaSingle.js +1 -1
  57. package/dist/esm/plugins/media/picker-facade.js +1 -1
  58. package/dist/esm/plugins/media/pm-plugins/main.js +1 -1
  59. package/dist/esm/plugins/media/toolbar/utils.js +1 -1
  60. package/dist/esm/plugins/media/ui/MediaPicker/PickerFacadeProvider.js +1 -1
  61. package/dist/esm/plugins/media/ui/ResizableMediaSingle/index.js +1 -1
  62. package/dist/esm/plugins/media/utils/check-media-type.js +1 -1
  63. package/dist/esm/plugins/paste/handlers.js +1 -1
  64. package/dist/esm/plugins/paste/pm-plugins/main.js +1 -1
  65. package/dist/esm/plugins/quick-insert/index.js +1 -1
  66. package/dist/esm/plugins/tasks-and-decisions/ui/Task/task-item-with-providers.js +1 -1
  67. package/dist/esm/ui/ConfigPanel/ConfigPanel.js +1 -1
  68. package/dist/esm/ui/ConfigPanel/Fields/CustomSelect.js +1 -1
  69. package/dist/esm/ui/ConfigPanel/Fields/UserSelect.js +1 -1
  70. package/dist/esm/ui/ConfigPanel/FormErrorBoundary.js +1 -1
  71. package/dist/esm/ui/ConfigPanel/transformers.js +1 -1
  72. package/dist/esm/ui/LinkSearch/index.js +1 -1
  73. package/dist/esm/ui/ToolbarFeedback/index.js +1 -1
  74. package/dist/esm/utils/action.js +1 -1
  75. package/dist/esm/utils/clipboard.js +1 -1
  76. package/dist/esm/utils/extensions.js +1 -1
  77. package/dist/esm/version-wrapper.js +1 -1
  78. package/dist/esm/version.json +1 -1
  79. package/dist/types/plugins/extension/pm-plugins/main.d.ts +1 -2
  80. package/dist/types/plugins/extension/types.d.ts +0 -1
  81. package/dist/types/plugins/extension/utils.d.ts +1 -3
  82. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 166.0.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [`08b3ceadbe3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/08b3ceadbe3) - [Hotfix] Revert of ED-14241
8
+
3
9
  ## 166.0.3
4
10
 
5
11
  ### Patch Changes
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.inlineCommentPlugin = void 0;
9
9
 
10
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
11
 
12
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
+
14
14
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
15
 
16
16
  var _inlineCommentEvents = require("./../../analytics/types/inline-comment-events");
@@ -63,7 +63,6 @@ var _pluginFactory = (0, _pluginStateFactory.pluginFactory)(_utils.inlineComment
63
63
  } // return same pluginState if mappings did not change
64
64
 
65
65
 
66
- // return same pluginState if mappings did not change
67
66
  if (mappedBookmark === bookmark && mappedDecorationSet === draftDecorationSet) {
68
67
  return pluginState;
69
68
  }
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "pluginKey", {
13
13
  }
14
14
  });
15
15
 
16
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
17
-
18
16
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
19
17
 
18
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
19
+
20
20
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
21
21
 
22
22
  var _prosemirrorCollab = require("prosemirror-collab");
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.Channel = void 0;
9
9
 
10
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
10
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
13
11
 
12
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
+
14
14
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
15
 
16
16
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.getContextPanel = void 0;
9
9
  exports.onChangeAction = onChangeAction;
10
10
 
11
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
12
-
13
11
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
14
12
 
13
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
14
+
15
15
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
16
16
 
17
17
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -15,8 +15,6 @@ var _reducer = _interopRequireDefault(require("./reducer"));
15
15
 
16
16
  var _pluginKey = require("./plugin-key");
17
17
 
18
- var _utils = require("./utils");
19
-
20
18
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
21
19
 
22
20
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -39,8 +37,7 @@ var factory = (0, _pluginStateFactory.pluginFactory)(_pluginKey.pluginKey, _redu
39
37
  return _objectSpread(_objectSpread({}, state), {}, {
40
38
  positions: positions
41
39
  });
42
- },
43
- onSelectionChanged: _utils.onSelectionChanged
40
+ }
44
41
  });
45
42
  var createPluginState = factory.createPluginState;
46
43
  exports.createPluginState = createPluginState;
@@ -26,10 +26,10 @@ Object.defineProperty(exports, "pluginKey", {
26
26
  });
27
27
  exports.updateEditButton = void 0;
28
28
 
29
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
30
-
31
29
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
32
30
 
31
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
32
+
33
33
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
34
34
 
35
35
  var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
@@ -296,7 +296,6 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
296
296
  var useLongPressSelection = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
297
297
  var options = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
298
298
  var state = (0, _pluginFactory.createPluginState)(dispatch, {
299
- shouldRefreshEditButton: false,
300
299
  showEditButton: false,
301
300
  showContextPanel: false
302
301
  });
@@ -320,45 +319,25 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
320
319
  element = _getPluginState.element,
321
320
  localId = _getPluginState.localId,
322
321
  extensionProvider = _getPluginState.extensionProvider,
323
- showContextPanel = _getPluginState.showContextPanel,
324
- shouldRefreshEditButton = _getPluginState.shouldRefreshEditButton;
322
+ showContextPanel = _getPluginState.showContextPanel; // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
325
323
 
326
- if (!shouldRefreshEditButton) {
327
- return false;
328
- } // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
329
324
 
330
-
331
- var selectedExtension = (0, _utils2.getSelectedExtension)(state, true); // If our selection isn't on an extension node, clear some state and hide the config panel
325
+ var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
332
326
 
333
327
  if (!selectedExtension) {
334
328
  if (showContextPanel) {
335
329
  (0, _commands.clearEditingContext)(state, dispatch);
336
330
  }
337
331
 
338
- (0, _commands.updateState)({
339
- shouldRefreshEditButton: false,
340
- localId: undefined,
341
- element: undefined,
342
- showEditButton: false,
343
- updateExtension: undefined
344
- })(state, dispatch);
345
332
  return;
346
- } // By this point we're certain we've selected an extension node.
347
- // But we need to determine if the selection has changed to another
348
- // extension node or remained on the same node.
349
-
333
+ }
350
334
 
351
335
  var node = selectedExtension.node;
352
336
  var newElement = (0, _utils2.getSelectedDomElement)(state.schema, domAtPos, selectedExtension); // New node is selection
353
337
 
354
- var hasSelectedNodeChanged = node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
338
+ if (node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
355
339
  // as fallback in case we need to turn off `allowLocalIdGeneration`
356
- element !== newElement;
357
- var nextState = {
358
- shouldRefreshEditButton: false
359
- };
360
-
361
- if (hasSelectedNodeChanged) {
340
+ element !== newElement) {
362
341
  if (showContextPanel) {
363
342
  (0, _commands.clearEditingContext)(state, dispatch);
364
343
  }
@@ -369,20 +348,20 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
369
348
  var showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
370
349
  var updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(function () {// do nothing;
371
350
  });
372
- Object.assign(nextState, {
351
+ (0, _commands.updateState)({
373
352
  localId: node.attrs.localId,
353
+ showContextPanel: false,
374
354
  element: newElement,
375
355
  showEditButton: showEditButton,
376
356
  updateExtension: updateExtension
377
- });
357
+ })(state, dispatch);
378
358
  } // New DOM element doesn't necessarily mean it's a new Node
379
359
  else if (element !== newElement) {
380
- Object.assign(nextState, {
360
+ (0, _commands.updateState)({
381
361
  element: newElement
382
- });
362
+ })(state, dispatch);
383
363
  }
384
364
 
385
- (0, _commands.updateState)(nextState)(state, dispatch);
386
365
  return true;
387
366
  },
388
367
  destroy: function destroy() {
@@ -399,9 +378,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
399
378
  inlineExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions)
400
379
  },
401
380
  handleClickOn: (0, _utils.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
402
- // Clicked on anything around the extension content
403
- // or specifically on the content border of a bodied extension
404
- return !target.closest('.extension-content') || target.classList.contains('extension-content');
381
+ return !target.closest('.extension-content');
405
382
  }, {
406
383
  useLongPressSelection: useLongPressSelection
407
384
  })
@@ -1,13 +1,9 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
3
  Object.defineProperty(exports, "__esModule", {
6
4
  value: true
7
5
  });
8
- exports.onSelectionChanged = exports.getSelectedExtension = exports.getSelectedDomElement = exports.getNodeTypesReferenced = exports.getDataConsumerMark = exports.findNodePosWithLocalId = exports.findExtensionWithLocalId = void 0;
9
-
10
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
6
+ exports.getSelectedExtension = exports.getSelectedDomElement = exports.getNodeTypesReferenced = exports.getDataConsumerMark = exports.findNodePosWithLocalId = exports.findExtensionWithLocalId = void 0;
11
7
 
12
8
  var _prosemirrorUtils = require("prosemirror-utils");
13
9
 
@@ -15,31 +11,18 @@ var _dom = require("../../utils/dom");
15
11
 
16
12
  var _nodesByLocalIds = require("../../utils/nodes-by-localIds");
17
13
 
18
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
19
-
20
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
21
-
22
- var getSelectedExtensionByTransaction = function getSelectedExtensionByTransaction(transaction) {
23
- var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
24
- return _getSelectedExtension(transaction.doc.type.schema, transaction.selection, searchParent);
25
- };
26
-
27
14
  var getSelectedExtension = function getSelectedExtension(state) {
28
15
  var searchParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
29
- return _getSelectedExtension(state.schema, state.selection, searchParent);
16
+ var _state$schema$nodes = state.schema.nodes,
17
+ inlineExtension = _state$schema$nodes.inlineExtension,
18
+ extension = _state$schema$nodes.extension,
19
+ bodiedExtension = _state$schema$nodes.bodiedExtension;
20
+ var nodeTypes = [extension, bodiedExtension, inlineExtension];
21
+ return (0, _prosemirrorUtils.findSelectedNodeOfType)(nodeTypes)(state.selection) || searchParent && (0, _prosemirrorUtils.findParentNodeOfType)(nodeTypes)(state.selection) || undefined;
30
22
  };
31
23
 
32
24
  exports.getSelectedExtension = getSelectedExtension;
33
25
 
34
- var _getSelectedExtension = function _getSelectedExtension(schema, selection, searchParent) {
35
- var _schema$nodes = schema.nodes,
36
- inlineExtension = _schema$nodes.inlineExtension,
37
- extension = _schema$nodes.extension,
38
- bodiedExtension = _schema$nodes.bodiedExtension;
39
- var nodeTypes = [extension, bodiedExtension, inlineExtension];
40
- return (0, _prosemirrorUtils.findSelectedNodeOfType)(nodeTypes)(selection) || searchParent && (0, _prosemirrorUtils.findParentNodeOfType)(nodeTypes)(selection) || undefined;
41
- };
42
-
43
26
  var findExtensionWithLocalId = function findExtensionWithLocalId(state, localId) {
44
27
  var selectedExtension = getSelectedExtension(state, true);
45
28
 
@@ -51,10 +34,10 @@ var findExtensionWithLocalId = function findExtensionWithLocalId(state, localId)
51
34
  return selectedExtension;
52
35
  }
53
36
 
54
- var _state$schema$nodes = state.schema.nodes,
55
- inlineExtension = _state$schema$nodes.inlineExtension,
56
- extension = _state$schema$nodes.extension,
57
- bodiedExtension = _state$schema$nodes.bodiedExtension;
37
+ var _state$schema$nodes2 = state.schema.nodes,
38
+ inlineExtension = _state$schema$nodes2.inlineExtension,
39
+ extension = _state$schema$nodes2.extension,
40
+ bodiedExtension = _state$schema$nodes2.bodiedExtension;
58
41
  var nodeTypes = [extension, bodiedExtension, inlineExtension];
59
42
  var matched;
60
43
  state.doc.descendants(function (node, pos) {
@@ -108,32 +91,4 @@ var findNodePosWithLocalId = function findNodePosWithLocalId(state, localId) {
108
91
  return nodes.length >= 1 ? nodes[0] : undefined;
109
92
  };
110
93
 
111
- exports.findNodePosWithLocalId = findNodePosWithLocalId;
112
-
113
- var onSelectionChanged = function onSelectionChanged(tr, state) {
114
- var selectedExtension = getSelectedExtensionByTransaction(tr, true);
115
- var hasUnselectedExtension = !!state.element && !selectedExtension;
116
- /*
117
- * We use this to indicate to our plugin that the selection has changed.
118
- *
119
- * - ignore if shouldRefreshEditButton already set
120
- * - restrict to scenarios when an extension is
121
- * - a) actually selected
122
- * - b) or un-selected (not accounting for selection extensionA -> extensionB)
123
- *
124
- * The rest of the logic will be handled in Extension main plugin view update().
125
- *
126
- * Known issue: typing inside of a bodiedExtension will trigger state changes each keystroke
127
- * as the toolbar always being open while it is focused.
128
- */
129
-
130
- if (!state.shouldRefreshEditButton && (selectedExtension || hasUnselectedExtension)) {
131
- return _objectSpread(_objectSpread({}, state), {}, {
132
- shouldRefreshEditButton: true
133
- });
134
- }
135
-
136
- return state;
137
- };
138
-
139
- exports.onSelectionChanged = onSelectionChanged;
94
+ exports.findNodePosWithLocalId = findNodePosWithLocalId;
@@ -94,7 +94,6 @@ var openFeedbackDialog = /*#__PURE__*/function () {
94
94
  case 13:
95
95
  timeoutId = window.setTimeout(showJiraCollectorDialog, 0); // Return the timoutId for consumers to call clearTimeout if they need to.
96
96
 
97
- // Return the timoutId for consumers to call clearTimeout if they need to.
98
97
  resolve(timeoutId);
99
98
 
100
99
  case 15:
@@ -263,7 +263,6 @@ var BatchDecorations = /*#__PURE__*/function () {
263
263
  } // only get those decorations whose from >= startPos
264
264
 
265
265
 
266
- // only get those decorations whose from >= startPos
267
266
  for (var i = 0; i < decorationsToRemove.length; i++) {
268
267
  if (decorationsToRemove[i].from >= startPos) {
269
268
  break;
@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.ExtensionsPlaceholder = void 0;
11
11
 
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
12
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _react = _interopRequireWildcard(require("react"));
@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.messages = exports.default = exports.RECENT_SEARCH_LIST_SIZE = exports.HyperlinkLinkAddToolbarWithIntl = exports.HyperlinkLinkAddToolbar = void 0;
11
11
 
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
12
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
16
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
17
17
 
18
18
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.setMacroProvider = exports.runMacroAutoConvert = exports.resolveMacro = exports.insertMacroFromMacroBrowser = void 0;
9
9
 
10
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
11
 
12
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
+
14
14
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
15
15
 
16
16
  var _assert = _interopRequireDefault(require("assert"));
@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.updateMediaNodeAttributes = exports.handleNewNode = exports.createMediaNodeUpdater = exports.ReactMediaInlineNode = exports.MediaInlineNodeView = exports.MediaInline = void 0;
11
11
 
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
12
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
15
13
 
16
14
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -25,6 +23,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
25
23
 
26
24
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
27
25
 
26
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
27
+
28
28
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
29
29
 
30
30
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = exports.ReactMediaSingleNode = void 0;
9
9
 
10
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
10
  var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
13
11
 
14
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.calcOffsetLeft = calcOffsetLeft;
9
9
  exports.default = void 0;
10
10
 
11
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
12
-
13
11
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
14
12
 
13
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
14
+
15
15
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
16
16
 
17
17
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = void 0;
11
11
 
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = void 0;
11
11
 
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -9,10 +9,10 @@ Object.defineProperty(exports, "__esModule", {
9
9
  });
10
10
  exports.default = UserSelect;
11
11
 
12
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
-
14
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.serialize = exports.findDuplicateFields = exports.deserialize = void 0;
9
9
 
10
- var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
10
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
11
 
12
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
13
+
14
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
15
 
16
16
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.version = exports.nextMajorVersion = exports.name = void 0;
7
7
  var name = "@atlaskit/editor-core";
8
8
  exports.name = name;
9
- var version = "166.0.3";
9
+ var version = "166.0.4";
10
10
  exports.version = version;
11
11
 
12
12
  var nextMajorVersion = function nextMajorVersion() {
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "166.0.3",
3
+ "version": "166.0.4",
4
4
  "sideEffects": false
5
5
  }
@@ -1,7 +1,6 @@
1
1
  import { pluginFactory } from '../../utils/plugin-state-factory';
2
2
  import reducer from './reducer';
3
3
  import { pluginKey } from './plugin-key';
4
- import { onSelectionChanged } from './utils';
5
4
  const factory = pluginFactory(pluginKey, reducer, {
6
5
  mapping(tr, state) {
7
6
  const {
@@ -22,9 +21,8 @@ const factory = pluginFactory(pluginKey, reducer, {
22
21
  return { ...state,
23
22
  positions
24
23
  };
25
- },
24
+ }
26
25
 
27
- onSelectionChanged: onSelectionChanged
28
26
  });
29
27
  export const createPluginState = factory.createPluginState;
30
28
  export const createCommand = factory.createCommand;
@@ -97,7 +97,6 @@ export const createContextIdentifierProviderHandler = view => async (name, provi
97
97
 
98
98
  const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, useLongPressSelection = false, options = {}) => {
99
99
  const state = createPluginState(dispatch, {
100
- shouldRefreshEditButton: false,
101
100
  showEditButton: false,
102
101
  showContextPanel: false
103
102
  });
@@ -122,48 +121,27 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
122
121
  element,
123
122
  localId,
124
123
  extensionProvider,
125
- showContextPanel,
126
- shouldRefreshEditButton
127
- } = getPluginState(state);
124
+ showContextPanel
125
+ } = getPluginState(state); // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
128
126
 
129
- if (!shouldRefreshEditButton) {
130
- return false;
131
- } // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
132
-
133
-
134
- const selectedExtension = getSelectedExtension(state, true); // If our selection isn't on an extension node, clear some state and hide the config panel
127
+ const selectedExtension = getSelectedExtension(state, true);
135
128
 
136
129
  if (!selectedExtension) {
137
130
  if (showContextPanel) {
138
131
  clearEditingContext(state, dispatch);
139
132
  }
140
133
 
141
- updateState({
142
- shouldRefreshEditButton: false,
143
- localId: undefined,
144
- element: undefined,
145
- showEditButton: false,
146
- updateExtension: undefined
147
- })(state, dispatch);
148
134
  return;
149
- } // By this point we're certain we've selected an extension node.
150
- // But we need to determine if the selection has changed to another
151
- // extension node or remained on the same node.
152
-
135
+ }
153
136
 
154
137
  const {
155
138
  node
156
139
  } = selectedExtension;
157
140
  const newElement = getSelectedDomElement(state.schema, domAtPos, selectedExtension); // New node is selection
158
141
 
159
- const hasSelectedNodeChanged = node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
142
+ if (node.attrs.localId ? localId !== node.attrs.localId : // This is the current assumption and it's wrong but we are keeping it
160
143
  // as fallback in case we need to turn off `allowLocalIdGeneration`
161
- element !== newElement;
162
- const nextState = {
163
- shouldRefreshEditButton: false
164
- };
165
-
166
- if (hasSelectedNodeChanged) {
144
+ element !== newElement) {
167
145
  if (showContextPanel) {
168
146
  clearEditingContext(state, dispatch);
169
147
  }
@@ -176,20 +154,20 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
176
154
  const showEditButton = shouldShowEditButton(extensionHandler, extensionProvider);
177
155
  const updateExtension = getUpdateExtensionPromise(view, extensionHandler, extensionProvider).catch(() => {// do nothing;
178
156
  });
179
- Object.assign(nextState, {
157
+ updateState({
180
158
  localId: node.attrs.localId,
159
+ showContextPanel: false,
181
160
  element: newElement,
182
161
  showEditButton,
183
162
  updateExtension
184
- });
163
+ })(state, dispatch);
185
164
  } // New DOM element doesn't necessarily mean it's a new Node
186
165
  else if (element !== newElement) {
187
- Object.assign(nextState, {
166
+ updateState({
188
167
  element: newElement
189
- });
168
+ })(state, dispatch);
190
169
  }
191
170
 
192
- updateState(nextState)(state, dispatch);
193
171
  return true;
194
172
  },
195
173
  destroy: () => {
@@ -205,11 +183,7 @@ const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProvid
205
183
  bodiedExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions),
206
184
  inlineExtension: ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions)
207
185
  },
208
- handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension'], target => {
209
- // Clicked on anything around the extension content
210
- // or specifically on the content border of a bodied extension
211
- return !target.closest('.extension-content') || target.classList.contains('extension-content');
212
- }, {
186
+ handleClickOn: createSelectionClickHandler(['extension', 'bodiedExtension'], target => !target.closest('.extension-content'), {
213
187
  useLongPressSelection
214
188
  })
215
189
  }