@atlaskit/editor-core 187.10.8 → 187.11.0

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 (88) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/index.js +2 -94
  3. package/dist/cjs/plugins/help-dialog/ui/index.js +42 -42
  4. package/dist/cjs/plugins/paste/handlers.js +4 -6
  5. package/dist/cjs/plugins/text-formatting/actions.js +188 -0
  6. package/dist/cjs/plugins/text-formatting/commands/text-formatting.js +1 -180
  7. package/dist/cjs/plugins/text-formatting/index.js +17 -0
  8. package/dist/cjs/plugins/text-formatting/pm-plugins/keymap.js +8 -8
  9. package/dist/cjs/plugins/text-formatting/pm-plugins/main.js +8 -8
  10. package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/clear-formatting-icon.js +2 -2
  11. package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js +16 -16
  12. package/dist/cjs/plugins/text-formatting/ui/Toolbar/index.js +8 -8
  13. package/dist/cjs/plugins/text-formatting/utils.js +8 -36
  14. package/dist/cjs/ui/ContentStyles/index.js +8 -9
  15. package/dist/cjs/version-wrapper.js +1 -1
  16. package/dist/cjs/version.json +1 -1
  17. package/dist/es2019/index.js +0 -2
  18. package/dist/es2019/plugins/help-dialog/ui/index.js +1 -1
  19. package/dist/es2019/plugins/paste/handlers.js +5 -7
  20. package/dist/es2019/plugins/text-formatting/actions.js +161 -0
  21. package/dist/es2019/plugins/text-formatting/commands/text-formatting.js +1 -159
  22. package/dist/es2019/plugins/text-formatting/index.js +17 -0
  23. package/dist/es2019/plugins/text-formatting/pm-plugins/keymap.js +8 -8
  24. package/dist/es2019/plugins/text-formatting/pm-plugins/main.js +1 -1
  25. package/dist/es2019/plugins/text-formatting/ui/Toolbar/hooks/clear-formatting-icon.js +1 -1
  26. package/dist/es2019/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js +9 -9
  27. package/dist/es2019/plugins/text-formatting/ui/Toolbar/index.js +1 -1
  28. package/dist/es2019/plugins/text-formatting/utils.js +1 -29
  29. package/dist/es2019/ui/ContentStyles/index.js +2 -3
  30. package/dist/es2019/version-wrapper.js +1 -1
  31. package/dist/es2019/version.json +1 -1
  32. package/dist/esm/index.js +0 -2
  33. package/dist/esm/plugins/help-dialog/ui/index.js +1 -1
  34. package/dist/esm/plugins/paste/handlers.js +5 -7
  35. package/dist/esm/plugins/text-formatting/actions.js +168 -0
  36. package/dist/esm/plugins/text-formatting/commands/text-formatting.js +1 -166
  37. package/dist/esm/plugins/text-formatting/index.js +17 -0
  38. package/dist/esm/plugins/text-formatting/pm-plugins/keymap.js +8 -8
  39. package/dist/esm/plugins/text-formatting/pm-plugins/main.js +1 -1
  40. package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/clear-formatting-icon.js +1 -1
  41. package/dist/esm/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js +9 -9
  42. package/dist/esm/plugins/text-formatting/ui/Toolbar/index.js +1 -1
  43. package/dist/esm/plugins/text-formatting/utils.js +6 -33
  44. package/dist/esm/ui/ContentStyles/index.js +2 -3
  45. package/dist/esm/version-wrapper.js +1 -1
  46. package/dist/esm/version.json +1 -1
  47. package/dist/types/index.d.ts +6 -4
  48. package/dist/types/labs/next/presets/default.d.ts +78 -15
  49. package/dist/types/plugins/media/ui/ResizableMediaSingle/guidelines.d.ts +1 -1
  50. package/dist/types/plugins/paste/handlers.d.ts +1 -2
  51. package/dist/types/plugins/text-formatting/actions.d.ts +20 -0
  52. package/dist/types/plugins/text-formatting/commands/text-formatting.d.ts +0 -31
  53. package/dist/types/plugins/text-formatting/index.d.ts +18 -2
  54. package/dist/types/plugins/text-formatting/pm-plugins/main.d.ts +1 -2
  55. package/dist/types/plugins/text-formatting/pm-plugins/plugin-key.d.ts +1 -1
  56. package/dist/types/plugins/text-formatting/utils.d.ts +1 -5
  57. package/dist/types/types/editor-props.d.ts +1 -2
  58. package/dist/types/ui/ContentStyles/index.d.ts +1 -1
  59. package/dist/types-ts4.5/index.d.ts +6 -4
  60. package/dist/types-ts4.5/labs/next/presets/default.d.ts +78 -15
  61. package/dist/types-ts4.5/plugins/media/ui/ResizableMediaSingle/guidelines.d.ts +1 -1
  62. package/dist/types-ts4.5/plugins/paste/handlers.d.ts +1 -2
  63. package/dist/types-ts4.5/plugins/text-formatting/actions.d.ts +20 -0
  64. package/dist/types-ts4.5/plugins/text-formatting/commands/text-formatting.d.ts +0 -31
  65. package/dist/types-ts4.5/plugins/text-formatting/index.d.ts +18 -2
  66. package/dist/types-ts4.5/plugins/text-formatting/pm-plugins/main.d.ts +1 -2
  67. package/dist/types-ts4.5/plugins/text-formatting/pm-plugins/plugin-key.d.ts +1 -1
  68. package/dist/types-ts4.5/plugins/text-formatting/utils.d.ts +1 -5
  69. package/dist/types-ts4.5/types/editor-props.d.ts +1 -2
  70. package/dist/types-ts4.5/ui/ContentStyles/index.d.ts +1 -1
  71. package/package.json +2 -2
  72. package/report.api.md +31 -145
  73. package/tmp/api-report-tmp.d.ts +30 -118
  74. package/dist/cjs/plugins/text-formatting/styles.js +0 -15
  75. package/dist/cjs/plugins/text-formatting/types.js +0 -5
  76. package/dist/cjs/plugins/text-formatting/ui/Toolbar/toolbar-messages.js +0 -95
  77. package/dist/es2019/plugins/text-formatting/styles.js +0 -5
  78. package/dist/es2019/plugins/text-formatting/types.js +0 -1
  79. package/dist/es2019/plugins/text-formatting/ui/Toolbar/toolbar-messages.js +0 -88
  80. package/dist/esm/plugins/text-formatting/styles.js +0 -7
  81. package/dist/esm/plugins/text-formatting/types.js +0 -1
  82. package/dist/esm/plugins/text-formatting/ui/Toolbar/toolbar-messages.js +0 -88
  83. package/dist/types/plugins/text-formatting/styles.d.ts +0 -2
  84. package/dist/types/plugins/text-formatting/types.d.ts +0 -30
  85. package/dist/types/plugins/text-formatting/ui/Toolbar/toolbar-messages.d.ts +0 -87
  86. package/dist/types-ts4.5/plugins/text-formatting/styles.d.ts +0 -2
  87. package/dist/types-ts4.5/plugins/text-formatting/types.d.ts +0 -30
  88. package/dist/types-ts4.5/plugins/text-formatting/ui/Toolbar/toolbar-messages.d.ts +0 -87
package/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 187.11.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`c6c3b7e43d3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c6c3b7e43d3) - [ED-19202] Remove direct dependency of editor-core code on text-formatting plugin
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies
12
+
3
13
  ## 187.10.8
4
14
 
5
15
  ### Patch Changes
package/dist/cjs/index.js CHANGED
@@ -344,7 +344,7 @@ Object.defineProperty(exports, "lightModeStatusColorPalette", {
344
344
  Object.defineProperty(exports, "listStateKey", {
345
345
  enumerable: true,
346
346
  get: function get() {
347
- return _main3.pluginKey;
347
+ return _main2.pluginKey;
348
348
  }
349
349
  });
350
350
  Object.defineProperty(exports, "measurements", {
@@ -485,96 +485,6 @@ Object.defineProperty(exports, "textColorPluginKey", {
485
485
  return _textColor.textColorPluginKey;
486
486
  }
487
487
  });
488
- Object.defineProperty(exports, "textFormattingStateKey", {
489
- enumerable: true,
490
- get: function get() {
491
- return _main2.pluginKey;
492
- }
493
- });
494
- Object.defineProperty(exports, "toggleCode", {
495
- enumerable: true,
496
- get: function get() {
497
- return _textFormatting.toggleCode;
498
- }
499
- });
500
- Object.defineProperty(exports, "toggleCodeWithAnalytics", {
501
- enumerable: true,
502
- get: function get() {
503
- return _textFormatting.toggleCodeWithAnalytics;
504
- }
505
- });
506
- Object.defineProperty(exports, "toggleEm", {
507
- enumerable: true,
508
- get: function get() {
509
- return _textFormatting.toggleEm;
510
- }
511
- });
512
- Object.defineProperty(exports, "toggleEmWithAnalytics", {
513
- enumerable: true,
514
- get: function get() {
515
- return _textFormatting.toggleEmWithAnalytics;
516
- }
517
- });
518
- Object.defineProperty(exports, "toggleStrike", {
519
- enumerable: true,
520
- get: function get() {
521
- return _textFormatting.toggleStrike;
522
- }
523
- });
524
- Object.defineProperty(exports, "toggleStrikeWithAnalytics", {
525
- enumerable: true,
526
- get: function get() {
527
- return _textFormatting.toggleStrikeWithAnalytics;
528
- }
529
- });
530
- Object.defineProperty(exports, "toggleStrong", {
531
- enumerable: true,
532
- get: function get() {
533
- return _textFormatting.toggleStrong;
534
- }
535
- });
536
- Object.defineProperty(exports, "toggleStrongWithAnalytics", {
537
- enumerable: true,
538
- get: function get() {
539
- return _textFormatting.toggleStrongWithAnalytics;
540
- }
541
- });
542
- Object.defineProperty(exports, "toggleSubscript", {
543
- enumerable: true,
544
- get: function get() {
545
- return _textFormatting.toggleSubscript;
546
- }
547
- });
548
- Object.defineProperty(exports, "toggleSubscriptWithAnalytics", {
549
- enumerable: true,
550
- get: function get() {
551
- return _textFormatting.toggleSubscriptWithAnalytics;
552
- }
553
- });
554
- Object.defineProperty(exports, "toggleSuperscript", {
555
- enumerable: true,
556
- get: function get() {
557
- return _textFormatting.toggleSuperscript;
558
- }
559
- });
560
- Object.defineProperty(exports, "toggleSuperscriptWithAnalytics", {
561
- enumerable: true,
562
- get: function get() {
563
- return _textFormatting.toggleSuperscriptWithAnalytics;
564
- }
565
- });
566
- Object.defineProperty(exports, "toggleUnderline", {
567
- enumerable: true,
568
- get: function get() {
569
- return _textFormatting.toggleUnderline;
570
- }
571
- });
572
- Object.defineProperty(exports, "toggleUnderlineWithAnalytics", {
573
- enumerable: true,
574
- get: function get() {
575
- return _textFormatting.toggleUnderlineWithAnalytics;
576
- }
577
- });
578
488
  Object.defineProperty(exports, "typeAheadPluginKey", {
579
489
  enumerable: true,
580
490
  get: function get() {
@@ -616,13 +526,11 @@ var _teamResource = require("@atlaskit/mention/team-resource");
616
526
  var _annotation = require("./plugins/annotation");
617
527
  var _main = require("./plugins/media/pm-plugins/main");
618
528
  var _mentions = require("./plugins/mentions");
619
- var _main2 = require("./plugins/text-formatting/pm-plugins/main");
620
529
  var _textColor = require("./plugins/text-color");
621
530
  var _changeColor = require("./plugins/text-color/commands/change-color");
622
531
  var _commands2 = require("./plugins/rule/commands");
623
532
  var _plugins = require("./plugins");
624
- var _main3 = require("./plugins/list/pm-plugins/main");
625
- var _textFormatting = require("./plugins/text-formatting/commands/text-formatting");
533
+ var _main2 = require("./plugins/list/pm-plugins/main");
626
534
  var _toolbarAndPickerUpdates = require("./plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates");
627
535
  var _typeAheadUpdates = require("./plugins/view-update-subscription/subscribe/type-ahead-updates");
628
536
  var _commands3 = require("./plugins/block-type/commands");
@@ -24,12 +24,12 @@ var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
24
24
  var _styles = require("./styles");
25
25
  var keymaps = _interopRequireWildcard(require("../../../keymaps"));
26
26
  var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton"));
27
- var _toolbarMessages = require("../../text-formatting/ui/Toolbar/toolbar-messages");
28
- var _messages = require("../../list/messages");
29
- var _messages2 = require("../../insert-block/ui/ToolbarInsertBlock/messages");
30
- var _messages3 = require("../../block-type/messages");
31
- var _messages4 = require("../../undo-redo/messages");
32
- var _messages5 = require("../../../ui/Alignment/messages");
27
+ var _messages = require("@atlaskit/editor-common/messages");
28
+ var _messages2 = require("../../list/messages");
29
+ var _messages3 = require("../../insert-block/ui/ToolbarInsertBlock/messages");
30
+ var _messages4 = require("../../block-type/messages");
31
+ var _messages5 = require("../../undo-redo/messages");
32
+ var _messages6 = require("../../../ui/Alignment/messages");
33
33
  var _commands = require("../commands");
34
34
  var _toolbar = require("../../annotation/toolbar");
35
35
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -82,13 +82,13 @@ var messages = (0, _reactIntlNext.defineMessages)({
82
82
  var navigationKeymaps = function navigationKeymaps(_ref) {
83
83
  var formatMessage = _ref.formatMessage;
84
84
  return [{
85
- name: formatMessage(_toolbarMessages.toolbarMessages.navigateToEditorToolbar),
85
+ name: formatMessage(_messages.toolbarMessages.navigateToEditorToolbar),
86
86
  type: 'navigation',
87
87
  keymap: function keymap() {
88
88
  return keymaps.navToEditorToolbar;
89
89
  }
90
90
  }, {
91
- name: formatMessage(_toolbarMessages.toolbarMessages.navigateToFloatingToolbar),
91
+ name: formatMessage(_messages.toolbarMessages.navigateToFloatingToolbar),
92
92
  type: 'navigation',
93
93
  keymap: function keymap() {
94
94
  return keymaps.navToFloatingToolbar;
@@ -98,7 +98,7 @@ var navigationKeymaps = function navigationKeymaps(_ref) {
98
98
  var formatting = function formatting(_ref2) {
99
99
  var formatMessage = _ref2.formatMessage;
100
100
  return [{
101
- name: formatMessage(_toolbarMessages.toolbarMessages.bold),
101
+ name: formatMessage(_messages.toolbarMessages.bold),
102
102
  type: 'strong',
103
103
  keymap: function keymap() {
104
104
  return keymaps.toggleBold;
@@ -106,10 +106,10 @@ var formatting = function formatting(_ref2) {
106
106
  autoFormatting: function autoFormatting() {
107
107
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
108
108
  css: _styles.codeLg
109
- }, "**", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.bold), "**"));
109
+ }, "**", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.bold), "**"));
110
110
  }
111
111
  }, {
112
- name: formatMessage(_toolbarMessages.toolbarMessages.italic),
112
+ name: formatMessage(_messages.toolbarMessages.italic),
113
113
  type: 'em',
114
114
  keymap: function keymap() {
115
115
  return keymaps.toggleItalic;
@@ -117,16 +117,16 @@ var formatting = function formatting(_ref2) {
117
117
  autoFormatting: function autoFormatting() {
118
118
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
119
119
  css: _styles.codeLg
120
- }, "*", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.italic), "*"));
120
+ }, "*", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.italic), "*"));
121
121
  }
122
122
  }, {
123
- name: formatMessage(_toolbarMessages.toolbarMessages.underline),
123
+ name: formatMessage(_messages.toolbarMessages.underline),
124
124
  type: 'underline',
125
125
  keymap: function keymap() {
126
126
  return keymaps.toggleUnderline;
127
127
  }
128
128
  }, {
129
- name: formatMessage(_toolbarMessages.toolbarMessages.strike),
129
+ name: formatMessage(_messages.toolbarMessages.strike),
130
130
  type: 'strike',
131
131
  keymap: function keymap() {
132
132
  return keymaps.toggleStrikethrough;
@@ -134,22 +134,22 @@ var formatting = function formatting(_ref2) {
134
134
  autoFormatting: function autoFormatting() {
135
135
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
136
136
  css: _styles.codeLg
137
- }, "~~", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.strike), "~~"));
137
+ }, "~~", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.strike), "~~"));
138
138
  }
139
139
  }, {
140
- name: formatMessage(_toolbarMessages.toolbarMessages.subscript),
140
+ name: formatMessage(_messages.toolbarMessages.subscript),
141
141
  type: 'subsup',
142
142
  keymap: function keymap() {
143
143
  return keymaps.toggleSubscript;
144
144
  }
145
145
  }, {
146
- name: formatMessage(_toolbarMessages.toolbarMessages.superscript),
146
+ name: formatMessage(_messages.toolbarMessages.superscript),
147
147
  type: 'subsup',
148
148
  keymap: function keymap() {
149
149
  return keymaps.toggleSuperscript;
150
150
  }
151
151
  }, {
152
- name: formatMessage(_messages3.messages.heading1),
152
+ name: formatMessage(_messages4.messages.heading1),
153
153
  type: 'heading',
154
154
  keymap: function keymap() {
155
155
  return keymaps.toggleHeading1;
@@ -162,7 +162,7 @@ var formatting = function formatting(_ref2) {
162
162
  }, "Space"));
163
163
  }
164
164
  }, {
165
- name: formatMessage(_messages3.messages.heading2),
165
+ name: formatMessage(_messages4.messages.heading2),
166
166
  type: 'heading',
167
167
  keymap: function keymap() {
168
168
  return keymaps.toggleHeading2;
@@ -175,7 +175,7 @@ var formatting = function formatting(_ref2) {
175
175
  }, "Space"));
176
176
  }
177
177
  }, {
178
- name: formatMessage(_messages3.messages.heading3),
178
+ name: formatMessage(_messages4.messages.heading3),
179
179
  type: 'heading',
180
180
  keymap: function keymap() {
181
181
  return keymaps.toggleHeading3;
@@ -188,7 +188,7 @@ var formatting = function formatting(_ref2) {
188
188
  }, "Space"));
189
189
  }
190
190
  }, {
191
- name: formatMessage(_messages3.messages.heading4),
191
+ name: formatMessage(_messages4.messages.heading4),
192
192
  type: 'heading',
193
193
  keymap: function keymap() {
194
194
  return keymaps.toggleHeading4;
@@ -201,7 +201,7 @@ var formatting = function formatting(_ref2) {
201
201
  }, "Space"));
202
202
  }
203
203
  }, {
204
- name: formatMessage(_messages3.messages.heading5),
204
+ name: formatMessage(_messages4.messages.heading5),
205
205
  type: 'heading',
206
206
  keymap: function keymap() {
207
207
  return keymaps.toggleHeading5;
@@ -214,7 +214,7 @@ var formatting = function formatting(_ref2) {
214
214
  }, "Space"));
215
215
  }
216
216
  }, {
217
- name: formatMessage(_messages3.messages.heading6),
217
+ name: formatMessage(_messages4.messages.heading6),
218
218
  type: 'heading',
219
219
  keymap: function keymap() {
220
220
  return keymaps.toggleHeading6;
@@ -227,13 +227,13 @@ var formatting = function formatting(_ref2) {
227
227
  }, "Space"));
228
228
  }
229
229
  }, {
230
- name: formatMessage(_messages3.messages.normal),
230
+ name: formatMessage(_messages4.messages.normal),
231
231
  type: 'paragraph',
232
232
  keymap: function keymap() {
233
233
  return keymaps.setNormalText;
234
234
  }
235
235
  }, {
236
- name: formatMessage(_messages.messages.orderedList),
236
+ name: formatMessage(_messages2.messages.orderedList),
237
237
  type: 'orderedList',
238
238
  keymap: function keymap() {
239
239
  return keymaps.toggleOrderedList;
@@ -246,7 +246,7 @@ var formatting = function formatting(_ref2) {
246
246
  }, "Space"));
247
247
  }
248
248
  }, {
249
- name: formatMessage(_messages.messages.unorderedList),
249
+ name: formatMessage(_messages2.messages.unorderedList),
250
250
  type: 'bulletList',
251
251
  keymap: function keymap() {
252
252
  return keymaps.toggleBulletList;
@@ -259,7 +259,7 @@ var formatting = function formatting(_ref2) {
259
259
  }, "Space"));
260
260
  }
261
261
  }, {
262
- name: formatMessage(_messages3.messages.blockquote),
262
+ name: formatMessage(_messages4.messages.blockquote),
263
263
  type: 'blockquote',
264
264
  keymap: function keymap() {
265
265
  return keymaps.toggleBlockQuote;
@@ -272,7 +272,7 @@ var formatting = function formatting(_ref2) {
272
272
  }, "Space"));
273
273
  }
274
274
  }, {
275
- name: formatMessage(_messages3.messages.codeblock),
275
+ name: formatMessage(_messages4.messages.codeblock),
276
276
  type: 'codeBlock',
277
277
  autoFormatting: function autoFormatting() {
278
278
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -280,7 +280,7 @@ var formatting = function formatting(_ref2) {
280
280
  }, "```"));
281
281
  }
282
282
  }, {
283
- name: formatMessage(_messages2.messages.horizontalRule),
283
+ name: formatMessage(_messages3.messages.horizontalRule),
284
284
  type: 'rule',
285
285
  keymap: function keymap() {
286
286
  return keymaps.insertRule;
@@ -291,7 +291,7 @@ var formatting = function formatting(_ref2) {
291
291
  }, "---"));
292
292
  }
293
293
  }, {
294
- name: formatMessage(_messages2.messages.link),
294
+ name: formatMessage(_messages3.messages.link),
295
295
  type: 'link',
296
296
  keymap: function keymap() {
297
297
  return keymaps.addLink;
@@ -299,10 +299,10 @@ var formatting = function formatting(_ref2) {
299
299
  autoFormatting: function autoFormatting() {
300
300
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
301
301
  css: _styles.codeLg
302
- }, "[", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages2.messages.link), "](http://a.com)"));
302
+ }, "[", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.messages.link), "](http://a.com)"));
303
303
  }
304
304
  }, {
305
- name: formatMessage(_toolbarMessages.toolbarMessages.code),
305
+ name: formatMessage(_messages.toolbarMessages.code),
306
306
  type: 'code',
307
307
  keymap: function keymap() {
308
308
  return keymaps.toggleCode;
@@ -310,10 +310,10 @@ var formatting = function formatting(_ref2) {
310
310
  autoFormatting: function autoFormatting() {
311
311
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
312
312
  css: _styles.codeLg
313
- }, "`", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.code), "`"));
313
+ }, "`", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.code), "`"));
314
314
  }
315
315
  }, {
316
- name: formatMessage(_messages2.messages.action),
316
+ name: formatMessage(_messages3.messages.action),
317
317
  type: 'taskItem',
318
318
  autoFormatting: function autoFormatting() {
319
319
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -323,7 +323,7 @@ var formatting = function formatting(_ref2) {
323
323
  }, "Space"));
324
324
  }
325
325
  }, {
326
- name: formatMessage(_messages2.messages.decision),
326
+ name: formatMessage(_messages3.messages.decision),
327
327
  type: 'decisionItem',
328
328
  autoFormatting: function autoFormatting() {
329
329
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -333,7 +333,7 @@ var formatting = function formatting(_ref2) {
333
333
  }, "Space"));
334
334
  }
335
335
  }, {
336
- name: formatMessage(_messages2.messages.emoji),
336
+ name: formatMessage(_messages3.messages.emoji),
337
337
  type: 'emoji',
338
338
  autoFormatting: function autoFormatting() {
339
339
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -341,7 +341,7 @@ var formatting = function formatting(_ref2) {
341
341
  }, ":"));
342
342
  }
343
343
  }, {
344
- name: formatMessage(_messages2.messages.mention),
344
+ name: formatMessage(_messages3.messages.mention),
345
345
  type: 'mention',
346
346
  autoFormatting: function autoFormatting() {
347
347
  return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -349,13 +349,13 @@ var formatting = function formatting(_ref2) {
349
349
  }, "@"));
350
350
  }
351
351
  }, {
352
- name: formatMessage(_messages5.alignmentMessages.alignLeft),
352
+ name: formatMessage(_messages6.alignmentMessages.alignLeft),
353
353
  type: 'alignment',
354
354
  keymap: function keymap() {
355
355
  return keymaps.alignLeft;
356
356
  }
357
357
  }, {
358
- name: formatMessage(_messages5.alignmentMessages.alignRight),
358
+ name: formatMessage(_messages6.alignmentMessages.alignRight),
359
359
  type: 'alignment'
360
360
  }];
361
361
  };
@@ -364,19 +364,19 @@ var shortcutNamesWithoutKeymap = ['emoji', 'mention', 'quickInsert'];
364
364
  var otherFormatting = function otherFormatting(_ref3) {
365
365
  var formatMessage = _ref3.formatMessage;
366
366
  return [{
367
- name: formatMessage(_toolbarMessages.toolbarMessages.clearFormatting),
367
+ name: formatMessage(_messages.toolbarMessages.clearFormatting),
368
368
  type: 'clearFormatting',
369
369
  keymap: function keymap() {
370
370
  return keymaps.clearFormatting;
371
371
  }
372
372
  }, {
373
- name: formatMessage(_messages4.messages.undo),
373
+ name: formatMessage(_messages5.messages.undo),
374
374
  type: 'undo',
375
375
  keymap: function keymap() {
376
376
  return keymaps.undo;
377
377
  }
378
378
  }, {
379
- name: formatMessage(_messages4.messages.redo),
379
+ name: formatMessage(_messages5.messages.redo),
380
380
  type: 'redo',
381
381
  keymap: function keymap() {
382
382
  return keymaps.redo;
@@ -34,15 +34,15 @@ var _utils3 = require("../../utils");
34
34
  var _slice = require("../../utils/slice");
35
35
  var _analytics = require("../analytics");
36
36
  var _gapCursorSelection = require("../selection/gap-cursor-selection");
37
- var _utils4 = require("@atlaskit/editor-common/utils");
38
37
  var _macro = require("../macro");
39
38
  var _mediaSingle = require("../media/utils/media-single");
40
- var _main = require("../text-formatting/pm-plugins/main");
41
39
  var _util = require("./util");
40
+ var _utils4 = require("@atlaskit/editor-common/utils");
42
41
  var _edgeCases = require("./edge-cases");
43
42
  var _commands = require("./commands");
44
43
  var _pluginFactory = require("./pm-plugins/plugin-factory");
45
44
  var _lists = require("../../utils/lists");
45
+ var _mark = require("@atlaskit/editor-common/mark");
46
46
  function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
47
47
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
48
48
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -108,8 +108,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
108
108
  }
109
109
  var filters = [(0, _utils4.linkifyContent)(schema)];
110
110
  var selectionMarks = selection.$head.marks();
111
- var textFormattingState = _main.pluginKey.getState(state);
112
- if (selection instanceof _state.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeActive) // for codeMarks let's make sure mark is active
111
+ if (selection instanceof _state.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || (0, _mark.anyMarkActive)(state, codeMark)) // check if there is a code mark anywhere in the selection
113
112
  ) {
114
113
  filters.push((0, _util.applyTextMarksToSlice)(schema, selection.$head.marks()));
115
114
  }
@@ -384,11 +383,10 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
384
383
  if (selectionMarks.length === 0) {
385
384
  return false;
386
385
  }
387
- var textFormattingState = _main.pluginKey.getState(state);
388
386
 
389
387
  // special case for codeMark: will preserve mark only if codeMark is currently active
390
388
  // won't preserve mark if cursor is on the edge on the mark (namely inactive)
391
- if (codeMark.isInSet(selectionMarks) && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeActive)) {
389
+ if (codeMark.isInSet(selectionMarks) && !(0, _mark.anyMarkActive)(state, codeMark)) {
392
390
  return false;
393
391
  }
394
392
  var isPlainTextSlice = slice.content.childCount === 1 && slice.content.firstChild.type === paragraph && slice.content.firstChild.content.childCount === 1 && slice.content.firstChild.firstChild.type === text;
@@ -0,0 +1,188 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = void 0;
7
+ var _analytics = require("@atlaskit/editor-common/analytics");
8
+ var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
9
+ var _mark = require("@atlaskit/editor-common/mark");
10
+ var toggleEm = function toggleEm() {
11
+ return function (state, dispatch) {
12
+ var em = state.schema.marks.em;
13
+ if (em) {
14
+ return (0, _mark.toggleMark)(em)(state, dispatch);
15
+ }
16
+ return false;
17
+ };
18
+ };
19
+ exports.toggleEm = toggleEm;
20
+ var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
21
+ return function (_ref) {
22
+ var inputMethod = _ref.inputMethod;
23
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
24
+ action: _analytics.ACTION.FORMATTED,
25
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
26
+ eventType: _analytics.EVENT_TYPE.TRACK,
27
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
28
+ attributes: {
29
+ inputMethod: inputMethod
30
+ }
31
+ })(toggleEm());
32
+ };
33
+ };
34
+ exports.toggleEmWithAnalytics = toggleEmWithAnalytics;
35
+ var toggleStrike = function toggleStrike() {
36
+ return function (state, dispatch) {
37
+ var strike = state.schema.marks.strike;
38
+ if (strike) {
39
+ return (0, _mark.toggleMark)(strike)(state, dispatch);
40
+ }
41
+ return false;
42
+ };
43
+ };
44
+ exports.toggleStrike = toggleStrike;
45
+ var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
46
+ return function (_ref2) {
47
+ var inputMethod = _ref2.inputMethod;
48
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
49
+ action: _analytics.ACTION.FORMATTED,
50
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
51
+ eventType: _analytics.EVENT_TYPE.TRACK,
52
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
53
+ attributes: {
54
+ inputMethod: inputMethod
55
+ }
56
+ })(toggleStrike());
57
+ };
58
+ };
59
+ exports.toggleStrikeWithAnalytics = toggleStrikeWithAnalytics;
60
+ var toggleStrong = function toggleStrong() {
61
+ return function (state, dispatch) {
62
+ var strong = state.schema.marks.strong;
63
+ if (strong) {
64
+ return (0, _mark.toggleMark)(strong)(state, dispatch);
65
+ }
66
+ return false;
67
+ };
68
+ };
69
+ exports.toggleStrong = toggleStrong;
70
+ var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
71
+ return function (_ref3) {
72
+ var inputMethod = _ref3.inputMethod;
73
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
74
+ action: _analytics.ACTION.FORMATTED,
75
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
76
+ eventType: _analytics.EVENT_TYPE.TRACK,
77
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
78
+ attributes: {
79
+ inputMethod: inputMethod
80
+ }
81
+ })(toggleStrong());
82
+ };
83
+ };
84
+ exports.toggleStrongWithAnalytics = toggleStrongWithAnalytics;
85
+ var toggleUnderline = function toggleUnderline() {
86
+ return function (state, dispatch) {
87
+ var underline = state.schema.marks.underline;
88
+ if (underline) {
89
+ return (0, _mark.toggleMark)(underline)(state, dispatch);
90
+ }
91
+ return false;
92
+ };
93
+ };
94
+ exports.toggleUnderline = toggleUnderline;
95
+ var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
96
+ return function (_ref4) {
97
+ var inputMethod = _ref4.inputMethod;
98
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
99
+ action: _analytics.ACTION.FORMATTED,
100
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
101
+ eventType: _analytics.EVENT_TYPE.TRACK,
102
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
103
+ attributes: {
104
+ inputMethod: inputMethod
105
+ }
106
+ })(toggleUnderline());
107
+ };
108
+ };
109
+ exports.toggleUnderlineWithAnalytics = toggleUnderlineWithAnalytics;
110
+ var toggleSuperscript = function toggleSuperscript() {
111
+ return function (state, dispatch) {
112
+ var subsup = state.schema.marks.subsup;
113
+ if (subsup) {
114
+ return (0, _mark.toggleMark)(subsup, {
115
+ type: 'sup'
116
+ })(state, dispatch);
117
+ }
118
+ return false;
119
+ };
120
+ };
121
+ exports.toggleSuperscript = toggleSuperscript;
122
+ var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
123
+ return function (_ref5) {
124
+ var inputMethod = _ref5.inputMethod;
125
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
126
+ action: _analytics.ACTION.FORMATTED,
127
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
128
+ eventType: _analytics.EVENT_TYPE.TRACK,
129
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SUPER,
130
+ attributes: {
131
+ inputMethod: inputMethod
132
+ }
133
+ })(toggleSuperscript());
134
+ };
135
+ };
136
+ exports.toggleSuperscriptWithAnalytics = toggleSuperscriptWithAnalytics;
137
+ var toggleSubscript = function toggleSubscript() {
138
+ return function (state, dispatch) {
139
+ var subsup = state.schema.marks.subsup;
140
+ if (subsup) {
141
+ return (0, _mark.toggleMark)(subsup, {
142
+ type: 'sub'
143
+ })(state, dispatch);
144
+ }
145
+ return false;
146
+ };
147
+ };
148
+ exports.toggleSubscript = toggleSubscript;
149
+ var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
150
+ return function (_ref6) {
151
+ var inputMethod = _ref6.inputMethod;
152
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
153
+ action: _analytics.ACTION.FORMATTED,
154
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
155
+ eventType: _analytics.EVENT_TYPE.TRACK,
156
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SUB,
157
+ attributes: {
158
+ inputMethod: inputMethod
159
+ }
160
+ })(toggleSubscript());
161
+ };
162
+ };
163
+ exports.toggleSubscriptWithAnalytics = toggleSubscriptWithAnalytics;
164
+ var toggleCode = function toggleCode() {
165
+ return function (state, dispatch) {
166
+ var code = state.schema.marks.code;
167
+ if (code) {
168
+ return (0, _mark.toggleMark)(code)(state, dispatch);
169
+ }
170
+ return false;
171
+ };
172
+ };
173
+ exports.toggleCode = toggleCode;
174
+ var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
175
+ return function (_ref7) {
176
+ var inputMethod = _ref7.inputMethod;
177
+ return (0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, {
178
+ action: _analytics.ACTION.FORMATTED,
179
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
180
+ eventType: _analytics.EVENT_TYPE.TRACK,
181
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
182
+ attributes: {
183
+ inputMethod: inputMethod
184
+ }
185
+ })(toggleCode());
186
+ };
187
+ };
188
+ exports.toggleCodeWithAnalytics = toggleCodeWithAnalytics;