@atlaskit/editor-plugin-block-type 1.0.3 → 3.0.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 (90) hide show
  1. package/CHANGELOG.md +40 -0
  2. package/dist/cjs/i18n/cs.js +2 -3
  3. package/dist/cjs/i18n/da.js +2 -3
  4. package/dist/cjs/i18n/de.js +2 -3
  5. package/dist/cjs/i18n/en.js +2 -3
  6. package/dist/cjs/i18n/en_GB.js +2 -3
  7. package/dist/cjs/i18n/en_ZZ.js +2 -3
  8. package/dist/cjs/i18n/es.js +2 -3
  9. package/dist/cjs/i18n/fi.js +2 -3
  10. package/dist/cjs/i18n/fr.js +2 -3
  11. package/dist/cjs/i18n/hu.js +2 -3
  12. package/dist/cjs/i18n/it.js +2 -3
  13. package/dist/cjs/i18n/ja.js +2 -3
  14. package/dist/cjs/i18n/ko.js +2 -3
  15. package/dist/cjs/i18n/nb.js +2 -3
  16. package/dist/cjs/i18n/nl.js +8 -9
  17. package/dist/cjs/i18n/pl.js +2 -3
  18. package/dist/cjs/i18n/pt_BR.js +2 -3
  19. package/dist/cjs/i18n/ru.js +2 -3
  20. package/dist/cjs/i18n/sv.js +2 -3
  21. package/dist/cjs/i18n/th.js +2 -3
  22. package/dist/cjs/i18n/tr.js +2 -3
  23. package/dist/cjs/i18n/uk.js +2 -3
  24. package/dist/cjs/i18n/vi.js +2 -3
  25. package/dist/cjs/i18n/zh.js +2 -3
  26. package/dist/cjs/i18n/zh_TW.js +2 -3
  27. package/dist/cjs/plugin/block-types.js +29 -45
  28. package/dist/cjs/plugin/commands/block-type.js +95 -60
  29. package/dist/cjs/plugin/commands/delete-and-move-cursor.js +2 -3
  30. package/dist/cjs/plugin/commands/index.js +1 -8
  31. package/dist/cjs/plugin/consts.js +1 -2
  32. package/dist/cjs/plugin/index.js +26 -26
  33. package/dist/cjs/plugin/pm-plugins/input-rule.js +1 -2
  34. package/dist/cjs/plugin/pm-plugins/main.js +12 -12
  35. package/dist/cjs/plugin/styles.js +2 -3
  36. package/dist/cjs/plugin/ui/ToolbarBlockType/blocktype-button.js +5 -13
  37. package/dist/cjs/plugin/ui/ToolbarBlockType/index.js +2 -3
  38. package/dist/cjs/plugin/ui/ToolbarBlockType/styled.js +7 -14
  39. package/dist/cjs/plugin/utils.js +3 -6
  40. package/dist/es2019/i18n/nl.js +6 -6
  41. package/dist/es2019/plugin/block-types.js +1 -1
  42. package/dist/es2019/plugin/commands/block-type.js +101 -46
  43. package/dist/es2019/plugin/commands/index.js +1 -6
  44. package/dist/es2019/plugin/index.js +18 -19
  45. package/dist/es2019/plugin/pm-plugins/main.js +10 -8
  46. package/dist/es2019/plugin/ui/ToolbarBlockType/blocktype-button.js +3 -9
  47. package/dist/es2019/plugin/ui/ToolbarBlockType/index.js +1 -1
  48. package/dist/esm/i18n/nl.js +6 -6
  49. package/dist/esm/plugin/block-types.js +1 -1
  50. package/dist/esm/plugin/commands/block-type.js +90 -53
  51. package/dist/esm/plugin/commands/index.js +1 -6
  52. package/dist/esm/plugin/index.js +20 -19
  53. package/dist/esm/plugin/pm-plugins/main.js +10 -8
  54. package/dist/esm/plugin/ui/ToolbarBlockType/blocktype-button.js +3 -9
  55. package/dist/esm/plugin/ui/ToolbarBlockType/index.js +1 -1
  56. package/dist/types/index.d.ts +1 -0
  57. package/dist/types/plugin/block-types.d.ts +1 -0
  58. package/dist/types/plugin/commands/block-type.d.ts +8 -6
  59. package/dist/types/plugin/commands/index.d.ts +0 -5
  60. package/dist/types/plugin/index.d.ts +5 -2
  61. package/dist/types/plugin/pm-plugins/main.d.ts +3 -2
  62. package/dist/types/plugin/ui/ToolbarBlockType/blocktype-button.d.ts +0 -7
  63. package/dist/types/plugin/ui/ToolbarBlockType/index.d.ts +2 -1
  64. package/dist/types-ts4.5/index.d.ts +1 -0
  65. package/dist/types-ts4.5/plugin/block-types.d.ts +1 -0
  66. package/dist/types-ts4.5/plugin/commands/block-type.d.ts +8 -6
  67. package/dist/types-ts4.5/plugin/commands/index.d.ts +0 -5
  68. package/dist/types-ts4.5/plugin/index.d.ts +5 -2
  69. package/dist/types-ts4.5/plugin/pm-plugins/main.d.ts +3 -2
  70. package/dist/types-ts4.5/plugin/ui/ToolbarBlockType/blocktype-button.d.ts +0 -7
  71. package/dist/types-ts4.5/plugin/ui/ToolbarBlockType/index.d.ts +2 -1
  72. package/package.json +3 -4
  73. package/report.api.md +17 -1
  74. package/tmp/api-report-tmp.d.ts +7 -1
  75. package/dist/cjs/messages.js +0 -19
  76. package/dist/cjs/plugin/messages.js +0 -160
  77. package/dist/cjs/plugin/ui/ToolbarBlockType/toolbar-messages.js +0 -15
  78. package/dist/es2019/messages.js +0 -2
  79. package/dist/es2019/plugin/messages.js +0 -153
  80. package/dist/es2019/plugin/ui/ToolbarBlockType/toolbar-messages.js +0 -8
  81. package/dist/esm/messages.js +0 -2
  82. package/dist/esm/plugin/messages.js +0 -153
  83. package/dist/esm/plugin/ui/ToolbarBlockType/toolbar-messages.js +0 -8
  84. package/dist/types/messages.d.ts +0 -2
  85. package/dist/types/plugin/messages.d.ts +0 -152
  86. package/dist/types/plugin/ui/ToolbarBlockType/toolbar-messages.d.ts +0 -7
  87. package/dist/types-ts4.5/messages.d.ts +0 -2
  88. package/dist/types-ts4.5/plugin/messages.d.ts +0 -152
  89. package/dist/types-ts4.5/plugin/ui/ToolbarBlockType/toolbar-messages.d.ts +0 -7
  90. package/messages/package.json +0 -15
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.insertBlockQuoteWithAnalytics = exports.cleanUpAtTheStartOfDocument = void 0;
7
7
  exports.setBlockType = setBlockType;
8
8
  exports.setBlockTypeWithAnalytics = setBlockTypeWithAnalytics;
9
+ exports.setHeading = setHeading;
9
10
  exports.setHeadingWithAnalytics = void 0;
10
11
  exports.setNormalText = setNormalText;
11
12
  exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
12
13
  var _analytics = require("@atlaskit/editor-common/analytics");
13
- var _commands = require("@atlaskit/editor-common/commands");
14
14
  var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
15
15
  var _utils = require("@atlaskit/editor-common/utils");
16
16
  var _editorTables = require("@atlaskit/editor-tables");
@@ -19,55 +19,79 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
19
19
  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); }
20
20
  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; }
21
21
  function setBlockType(name) {
22
- return function (state, dispatch) {
23
- var nodes = state.schema.nodes;
22
+ return function (_ref) {
23
+ var tr = _ref.tr;
24
+ var nodes = tr.doc.type.schema.nodes;
24
25
  if (name === _blockTypes.NORMAL_TEXT.name && nodes.paragraph) {
25
- return setNormalText()(state, dispatch);
26
+ return setNormalText()({
27
+ tr: tr
28
+ });
26
29
  }
27
30
  var headingBlockType = _blockTypes.HEADINGS_BY_NAME[name];
28
31
  if (headingBlockType && nodes.heading && headingBlockType.level) {
29
- return (0, _commands.setHeading)(headingBlockType.level)(state, dispatch);
32
+ return setHeading(headingBlockType.level)({
33
+ tr: tr
34
+ });
30
35
  }
31
- return false;
36
+ return null;
37
+ };
38
+ }
39
+ function setHeading(level) {
40
+ return function (_ref2) {
41
+ var tr = _ref2.tr;
42
+ var selection = tr.selection,
43
+ schema = tr.doc.type.schema;
44
+ var ranges = selection instanceof _editorTables.CellSelection ? selection.ranges : [selection];
45
+ ranges.forEach(function (_ref3) {
46
+ var $from = _ref3.$from,
47
+ $to = _ref3.$to;
48
+ tr.setBlockType($from.pos, $to.pos, schema.nodes.heading, {
49
+ level: level
50
+ });
51
+ });
52
+ return tr;
32
53
  };
33
54
  }
34
55
  function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
35
- return function (state, dispatch) {
36
- var nodes = state.schema.nodes;
37
- if (name === _blockTypes.NORMAL_TEXT.name && nodes.paragraph) {
38
- return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)(state, dispatch);
56
+ return function (_ref4) {
57
+ var tr = _ref4.tr;
58
+ var nodes = tr.doc.type.schema.nodes;
59
+ if (name === 'normal' && nodes.paragraph) {
60
+ return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)({
61
+ tr: tr
62
+ });
39
63
  }
40
64
  var headingBlockType = _blockTypes.HEADINGS_BY_NAME[name];
41
65
  if (headingBlockType && nodes.heading && headingBlockType.level) {
42
- return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi)(state, dispatch);
66
+ return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi)({
67
+ tr: tr
68
+ });
43
69
  }
44
- return false;
70
+ return null;
45
71
  };
46
72
  }
47
73
  function setNormalText() {
48
- return function (state, dispatch) {
49
- var selection = state.selection,
50
- schema = state.schema,
51
- tr = state.tr;
74
+ return function (_ref5) {
75
+ var tr = _ref5.tr;
76
+ var selection = tr.selection,
77
+ schema = tr.doc.type.schema;
52
78
  var ranges = selection instanceof _editorTables.CellSelection ? selection.ranges : [selection];
53
- ranges.forEach(function (_ref) {
54
- var $from = _ref.$from,
55
- $to = _ref.$to;
79
+ ranges.forEach(function (_ref6) {
80
+ var $from = _ref6.$from,
81
+ $to = _ref6.$to;
56
82
  tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
57
83
  });
58
- if (dispatch) {
59
- dispatch(tr);
60
- }
61
- return true;
84
+ return tr;
62
85
  };
63
86
  }
64
87
  function withCurrentHeadingLevel(fn) {
65
- return function (state, dispatch, view) {
88
+ return function (_ref7) {
89
+ var tr = _ref7.tr;
66
90
  // Find all headings and paragraphs of text
67
- var _state$schema$nodes = state.schema.nodes,
68
- heading = _state$schema$nodes.heading,
69
- paragraph = _state$schema$nodes.paragraph;
70
- var nodes = (0, _utils.filterChildrenBetween)(state.doc, state.selection.from, state.selection.to, function (node) {
91
+ var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
92
+ heading = _tr$doc$type$schema$n.heading,
93
+ paragraph = _tr$doc$type$schema$n.paragraph;
94
+ var nodes = (0, _utils.filterChildrenBetween)(tr.doc, tr.selection.from, tr.selection.to, function (node) {
71
95
  return node.type === heading || node.type === paragraph;
72
96
  });
73
97
 
@@ -92,40 +116,53 @@ function withCurrentHeadingLevel(fn) {
92
116
  } finally {
93
117
  _iterator.f();
94
118
  }
95
- return fn(level)(state, dispatch, view);
119
+ return fn(level)({
120
+ tr: tr
121
+ });
96
122
  };
97
123
  }
98
124
  function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
99
125
  return withCurrentHeadingLevel(function (previousHeadingLevel) {
100
- return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
101
- action: _analytics.ACTION.FORMATTED,
102
- actionSubject: _analytics.ACTION_SUBJECT.TEXT,
103
- eventType: _analytics.EVENT_TYPE.TRACK,
104
- actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
105
- attributes: {
106
- inputMethod: inputMethod,
107
- newHeadingLevel: 0,
108
- previousHeadingLevel: previousHeadingLevel
109
- }
110
- })(setNormalText());
126
+ return function (_ref8) {
127
+ var tr = _ref8.tr;
128
+ editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
129
+ action: _analytics.ACTION.FORMATTED,
130
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
131
+ eventType: _analytics.EVENT_TYPE.TRACK,
132
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
133
+ attributes: {
134
+ inputMethod: inputMethod,
135
+ newHeadingLevel: 0,
136
+ previousHeadingLevel: previousHeadingLevel
137
+ }
138
+ })(tr);
139
+ return setNormalText()({
140
+ tr: tr
141
+ });
142
+ };
111
143
  });
112
144
  }
113
- var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
145
+ var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
114
146
  return withCurrentHeadingLevel(function (previousHeadingLevel) {
115
- return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
116
- action: _analytics.ACTION.FORMATTED,
117
- actionSubject: _analytics.ACTION_SUBJECT.TEXT,
118
- eventType: _analytics.EVENT_TYPE.TRACK,
119
- actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
120
- attributes: {
121
- inputMethod: inputMethod,
122
- newHeadingLevel: newHeadingLevel,
123
- previousHeadingLevel: previousHeadingLevel
124
- }
125
- })((0, _commands.setHeading)(newHeadingLevel));
147
+ return function (_ref9) {
148
+ var tr = _ref9.tr;
149
+ editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
150
+ action: _analytics.ACTION.FORMATTED,
151
+ actionSubject: _analytics.ACTION_SUBJECT.TEXT,
152
+ eventType: _analytics.EVENT_TYPE.TRACK,
153
+ actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
154
+ attributes: {
155
+ inputMethod: inputMethod,
156
+ newHeadingLevel: newHeadingLevel,
157
+ previousHeadingLevel: previousHeadingLevel
158
+ }
159
+ })(tr);
160
+ return setHeading(newHeadingLevel)({
161
+ tr: tr
162
+ });
163
+ };
126
164
  });
127
165
  };
128
- exports.setHeadingWithAnalytics = setHeadingWithAnalytics;
129
166
  function insertBlockQuote() {
130
167
  return function (state, dispatch) {
131
168
  var nodes = state.schema.nodes;
@@ -144,7 +181,7 @@ function insertBlockQuote() {
144
181
  * otherwise Editor becomes very sad and crashes
145
182
  * @returns - command that inserts block type
146
183
  */
147
- var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytics(inputMethod, editorAnalyticsApi) {
184
+ var insertBlockQuoteWithAnalytics = exports.insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytics(inputMethod, editorAnalyticsApi) {
148
185
  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
149
186
  action: _analytics.ACTION.FORMATTED,
150
187
  actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -155,10 +192,9 @@ var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytics(input
155
192
  }
156
193
  })(insertBlockQuote());
157
194
  };
158
- exports.insertBlockQuoteWithAnalytics = insertBlockQuoteWithAnalytics;
159
- var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
160
- var _ref2 = state.selection,
161
- $cursor = _ref2.$cursor;
195
+ var cleanUpAtTheStartOfDocument = exports.cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
196
+ var _ref10 = state.selection,
197
+ $cursor = _ref10.$cursor;
162
198
  if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
163
199
  var tr = state.tr,
164
200
  schema = state.schema;
@@ -179,5 +215,4 @@ var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, di
179
215
  return true;
180
216
  }
181
217
  return false;
182
- };
183
- exports.cleanUpAtTheStartOfDocument = cleanUpAtTheStartOfDocument;
218
+ };
@@ -33,7 +33,7 @@ var shouldMoveCursorAfterDelete = function shouldMoveCursorAfterDelete(state) {
33
33
  * @param dispatch CommandDispatch
34
34
  * @returns boolean
35
35
  */
36
- var deleteAndMoveCursor = function deleteAndMoveCursor(state, dispatch) {
36
+ var deleteAndMoveCursor = exports.deleteAndMoveCursor = function deleteAndMoveCursor(state, dispatch) {
37
37
  if (state.selection.empty || !(state.selection instanceof _state.TextSelection)) {
38
38
  return false;
39
39
  }
@@ -52,5 +52,4 @@ var deleteAndMoveCursor = function deleteAndMoveCursor(state, dispatch) {
52
52
  dispatch(tr.scrollIntoView());
53
53
  }
54
54
  return true;
55
- };
56
- exports.deleteAndMoveCursor = deleteAndMoveCursor;
55
+ };
@@ -39,12 +39,6 @@ Object.defineProperty(exports, "setBlockTypeWithAnalytics", {
39
39
  return _blockType.setBlockTypeWithAnalytics;
40
40
  }
41
41
  });
42
- Object.defineProperty(exports, "setHeading", {
43
- enumerable: true,
44
- get: function get() {
45
- return _commands.setHeading;
46
- }
47
- });
48
42
  Object.defineProperty(exports, "setHeadingWithAnalytics", {
49
43
  enumerable: true,
50
44
  get: function get() {
@@ -65,5 +59,4 @@ Object.defineProperty(exports, "setNormalTextWithAnalytics", {
65
59
  });
66
60
  var _blockType = require("./block-type");
67
61
  var _deleteAndMoveCursor = require("./delete-and-move-cursor");
68
- var _deleteBlockContent = require("./delete-block-content");
69
- var _commands = require("@atlaskit/editor-common/commands");
62
+ var _deleteBlockContent = require("./delete-block-content");
@@ -11,5 +11,4 @@ var KEY_3 = 51;
11
11
  var KEY_4 = 52;
12
12
  var KEY_5 = 53;
13
13
  var KEY_6 = 54;
14
- var HEADING_KEYS = [KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6];
15
- exports.HEADING_KEYS = HEADING_KEYS;
14
+ var HEADING_KEYS = exports.HEADING_KEYS = [KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6];
@@ -16,12 +16,12 @@ var _react = _interopRequireDefault(require("react"));
16
16
  var _adfSchema = require("@atlaskit/adf-schema");
17
17
  var _analytics = require("@atlaskit/editor-common/analytics");
18
18
  var _keymaps = require("@atlaskit/editor-common/keymaps");
19
+ var _messages = require("@atlaskit/editor-common/messages");
19
20
  var _quickInsert = require("@atlaskit/editor-common/quick-insert");
20
21
  var _types = require("@atlaskit/editor-common/types");
21
22
  var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
22
23
  var _commands = require("./commands");
23
24
  var _blockType = require("./commands/block-type");
24
- var _messages = require("./messages");
25
25
  var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
26
26
  var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
27
27
  var _main = require("./pm-plugins/main");
@@ -36,14 +36,14 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editor
36
36
  }, function (_v, idx) {
37
37
  var level = idx + 1;
38
38
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
39
- var descriptionDescriptor = _messages.messages["heading".concat(level, "Description")];
39
+ var descriptionDescriptor = _messages.blockTypeMessages["heading".concat(level, "Description")];
40
40
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
41
41
  var keyshortcut = (0, _keymaps.tooltip)(_keymaps.keymap["toggleHeading".concat(level)]);
42
42
  var id = "heading".concat(level);
43
43
  return {
44
44
  id: id,
45
45
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
46
- title: formatMessage(_messages.messages[id]),
46
+ title: formatMessage(_messages.blockTypeMessages[id]),
47
47
  description: formatMessage(descriptionDescriptor),
48
48
  priority: 1300,
49
49
  keywords: ["h".concat(level)],
@@ -57,7 +57,7 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editor
57
57
  var tr = insert(state.schema.nodes.heading.createChecked({
58
58
  level: level
59
59
  }));
60
- editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
60
+ editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
61
61
  action: _analytics.ACTION.FORMATTED,
62
62
  actionSubject: _analytics.ACTION_SUBJECT.TEXT,
63
63
  eventType: _analytics.EVENT_TYPE.TRACK,
@@ -79,8 +79,8 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
79
79
  }
80
80
  return [{
81
81
  id: 'blockquote',
82
- title: formatMessage(_messages.messages.blockquote),
83
- description: formatMessage(_messages.messages.blockquoteDescription),
82
+ title: formatMessage(_messages.blockTypeMessages.blockquote),
83
+ description: formatMessage(_messages.blockTypeMessages.blockquoteDescription),
84
84
  priority: 1300,
85
85
  keyshortcut: (0, _keymaps.tooltip)(_keymaps.toggleBlockQuote),
86
86
  icon: function icon() {
@@ -88,7 +88,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
88
88
  },
89
89
  action: function action(insert, state) {
90
90
  var tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
91
- editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
91
+ editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
92
92
  action: _analytics.ACTION.FORMATTED,
93
93
  actionSubject: _analytics.ACTION_SUBJECT.TEXT,
94
94
  eventType: _analytics.EVENT_TYPE.TRACK,
@@ -101,7 +101,7 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
101
101
  }
102
102
  }];
103
103
  };
104
- var blockTypePlugin = function blockTypePlugin(_ref3) {
104
+ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3) {
105
105
  var options = _ref3.config,
106
106
  api = _ref3.api;
107
107
  return {
@@ -129,17 +129,16 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
129
129
  return [{
130
130
  name: 'blockType',
131
131
  plugin: function plugin(_ref4) {
132
- var _api$analytics;
133
132
  var dispatch = _ref4.dispatch;
134
- return (0, _main.createPlugin)(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, dispatch, options && options.lastNodeMustBeParagraph);
133
+ return (0, _main.createPlugin)(api, dispatch, options && options.lastNodeMustBeParagraph);
135
134
  }
136
135
  }, {
137
136
  name: 'blockTypeInputRule',
138
137
  plugin: function plugin(_ref5) {
139
- var _api$analytics2;
138
+ var _api$analytics;
140
139
  var schema = _ref5.schema,
141
140
  featureFlags = _ref5.featureFlags;
142
- return (0, _inputRule.default)(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
141
+ return (0, _inputRule.default)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, schema, featureFlags);
143
142
  }
144
143
  },
145
144
  // Needs to be lower priority than editor-tables.tableEditing
@@ -147,21 +146,23 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
147
146
  {
148
147
  name: 'blockTypeKeyMap',
149
148
  plugin: function plugin(_ref6) {
150
- var _api$analytics3;
149
+ var _api$analytics2;
151
150
  var schema = _ref6.schema,
152
151
  featureFlags = _ref6.featureFlags;
153
- return (0, _keymap.default)(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, schema, featureFlags);
152
+ return (0, _keymap.default)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
154
153
  }
155
154
  }];
156
155
  },
157
156
  actions: {
158
157
  insertBlockQuote: function insertBlockQuote(inputMethod) {
158
+ var _api$analytics3;
159
+ return (0, _blockType.insertBlockQuoteWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
160
+ }
161
+ },
162
+ commands: {
163
+ setTextLevel: function setTextLevel(level, inputMethod) {
159
164
  var _api$analytics4;
160
- return (0, _blockType.insertBlockQuoteWithAnalytics)(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
161
- },
162
- setBlockType: function setBlockType(name, inputMethod) {
163
- var _api$analytics5;
164
- return (0, _commands.setBlockTypeWithAnalytics)(name, inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
165
+ return (0, _commands.setBlockTypeWithAnalytics)(level, inputMethod, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
165
166
  }
166
167
  },
167
168
  getSharedState: function getSharedState(editorState) {
@@ -181,8 +182,8 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
181
182
  eventDispatcher = _ref7.eventDispatcher;
182
183
  var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < _types.ToolbarSize.XXL : toolbarSize < _types.ToolbarSize.XL;
183
184
  var boundSetBlockType = function boundSetBlockType(name) {
184
- var _api$analytics6;
185
- return (0, _commands.setBlockTypeWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(editorView.state, editorView.dispatch);
185
+ var _api$analytics5;
186
+ api === null || api === void 0 || api.core.actions.execute((0, _commands.setBlockTypeWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions));
186
187
  };
187
188
  return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
188
189
  editorView: editorView,
@@ -196,7 +197,7 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
196
197
  isSmall: isSmall,
197
198
  isDisabled: disabled,
198
199
  isReducedSpacing: isToolbarReducedSpacing,
199
- setBlockType: boundSetBlockType,
200
+ setTextLevel: boundSetBlockType,
200
201
  pluginState: pluginState,
201
202
  popupsMountPoint: popupsMountPoint,
202
203
  popupsBoundariesElement: popupsBoundariesElement,
@@ -207,11 +208,10 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
207
208
  },
208
209
  pluginsOptions: {
209
210
  quickInsert: function quickInsert(intl) {
210
- var _api$analytics7, _api$analytics8;
211
+ var _api$analytics6, _api$analytics7;
211
212
  var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
212
- return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions)));
213
+ return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)));
213
214
  }
214
215
  }
215
216
  };
216
- };
217
- exports.blockTypePlugin = blockTypePlugin;
217
+ };
@@ -100,5 +100,4 @@ function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
100
100
  }
101
101
  return;
102
102
  }
103
- var _default = inputRulePlugin;
104
- exports.default = _default;
103
+ var _default = exports.default = inputRulePlugin;
@@ -70,17 +70,16 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
70
70
  });
71
71
  return blockType || _blockTypes.OTHER;
72
72
  };
73
- var autoformatHeading = function autoformatHeading(headingLevel, view, editorAnalyticsApi) {
73
+ var autoformatHeading = function autoformatHeading(headingLevel, editorAnalyticsApi) {
74
74
  if (headingLevel === 0) {
75
- (0, _commands.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
76
- } else {
77
- (0, _commands.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
75
+ return (0, _commands.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
78
76
  }
79
- return true;
77
+ return (0, _commands.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
80
78
  };
81
- var pluginKey = new _state.PluginKey('blockTypePlugin');
82
- exports.pluginKey = pluginKey;
83
- var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) {
79
+ var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
80
+ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph) {
81
+ var _editorAPI$analytics;
82
+ var editorAnalyticsApi = editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
84
83
  var altKeyLocation = 0;
85
84
  return new _safePlugin.SafePlugin({
86
85
  appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
@@ -131,9 +130,11 @@ var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeM
131
130
  var headingLevel = _consts.HEADING_KEYS.indexOf(event.keyCode);
132
131
  if (headingLevel > -1 && event.altKey) {
133
132
  if (_utils.browser.mac && event.metaKey) {
134
- return autoformatHeading(headingLevel, view, editorAnalyticsApi);
133
+ var _editorAPI$core$actio;
134
+ return (_editorAPI$core$actio = editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio !== void 0 ? _editorAPI$core$actio : false;
135
135
  } else if (!_utils.browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
136
- return autoformatHeading(headingLevel, view, editorAnalyticsApi);
136
+ var _editorAPI$core$actio2;
137
+ return (_editorAPI$core$actio2 = editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio2 !== void 0 ? _editorAPI$core$actio2 : false;
137
138
  }
138
139
  } else if (event.key === 'Alt') {
139
140
  // event.location is for the current key only; when a user hits Ctrl-Alt-1 the
@@ -147,5 +148,4 @@ var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeM
147
148
  }
148
149
  }
149
150
  });
150
- };
151
- exports.createPlugin = createPlugin;
151
+ };
@@ -9,7 +9,6 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
9
9
  var _react = require("@emotion/react");
10
10
  var _styles = require("@atlaskit/editor-common/styles");
11
11
  var _templateObject;
12
- var blocktypeStyles = function blocktypeStyles(props) {
12
+ var blocktypeStyles = exports.blocktypeStyles = function blocktypeStyles(props) {
13
13
  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n .ProseMirror {\n ", ";\n ", ";\n }\n"])), _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)(props));
14
- };
15
- exports.blocktypeStyles = blocktypeStyles;
14
+ };
@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.messages = exports.BlockTypeButton = void 0;
7
+ exports.BlockTypeButton = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
  var _react2 = require("@emotion/react");
10
10
  var _reactIntlNext = require("react-intl-next");
11
+ var _messages = require("@atlaskit/editor-common/messages");
11
12
  var _styles = require("@atlaskit/editor-common/styles");
12
13
  var _uiMenu = require("@atlaskit/editor-common/ui-menu");
13
14
  var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
@@ -16,16 +17,8 @@ var _blockTypes = require("../../block-types");
16
17
  var _styled = require("./styled");
17
18
  /** @jsx jsx */
18
19
 
19
- var messages = (0, _reactIntlNext.defineMessages)({
20
- textStyles: {
21
- id: 'fabric.editor.textStyles',
22
- defaultMessage: 'Text styles',
23
- description: 'Menu provides access to various heading styles or normal text'
24
- }
25
- });
26
- exports.messages = messages;
27
- var BlockTypeButton = function BlockTypeButton(props) {
28
- var labelTextStyles = props.formatMessage(messages.textStyles);
20
+ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props) {
21
+ var labelTextStyles = props.formatMessage(_messages.toolbarMessages.textStyles);
29
22
  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
30
23
  spacing: props.isReducedSpacing ? 'none' : 'default',
31
24
  selected: props.selected,
@@ -56,5 +49,4 @@ var BlockTypeButton = function BlockTypeButton(props) {
56
49
  // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
57
50
  props.isReducedSpacing && _styled.buttonContentReducedSpacingStyle]
58
51
  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, props.title || _blockTypes.NORMAL_TEXT.title)));
59
- };
60
- exports.BlockTypeButton = BlockTypeButton;
52
+ };
@@ -100,7 +100,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
100
100
  _ref$shouldCloseMenu = _ref.shouldCloseMenu,
101
101
  shouldCloseMenu = _ref$shouldCloseMenu === void 0 ? true : _ref$shouldCloseMenu;
102
102
  var blockType = item.value;
103
- _this.props.setBlockType(blockType.name);
103
+ _this.props.setTextLevel(blockType.name);
104
104
  if (shouldCloseMenu) {
105
105
  _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
106
106
  active: false
@@ -204,5 +204,4 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
204
204
  }]);
205
205
  return ToolbarBlockType;
206
206
  }(_react.default.PureComponent);
207
- var _default = (0, _reactIntlNext.injectIntl)(ToolbarBlockType);
208
- exports.default = _default;
207
+ var _default = exports.default = (0, _reactIntlNext.injectIntl)(ToolbarBlockType);
@@ -12,23 +12,16 @@ var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
12
12
  var _colors = require("@atlaskit/theme/colors");
13
13
  var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
14
14
  /** @jsx jsx */
15
- var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected) {
15
+ var blockTypeMenuItemStyle = exports.blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected) {
16
16
  // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
17
17
  var selectedStyle = selected ? "".concat(tagName, " { color: ", "var(--ds-text, white)", " !important; }") : '';
18
18
  return function (themeProps) {
19
19
  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n ", ";\n > {\n h1,\n h2,\n h3,\n h4,\n h5,\n h6 {\n margin-top: 0;\n }\n }\n ", ";\n "])), (0, _styles.headingsSharedStyles)(themeProps), selectedStyle);
20
20
  };
21
21
  };
22
- exports.blockTypeMenuItemStyle = blockTypeMenuItemStyle;
23
- var keyboardShortcut = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n ", "\n margin-left: ", ";\n"])), _shortcut.shortcutStyle, "var(--ds-space-200, 16px)");
24
- exports.keyboardShortcut = keyboardShortcut;
25
- var keyboardShortcutSelect = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n"])), "var(--ds-icon, ".concat(_colors.N400, ")"));
26
- exports.keyboardShortcutSelect = keyboardShortcutSelect;
27
- var buttonContentStyle = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n min-width: 80px;\n align-items: center;\n overflow: hidden;\n justify-content: center;\n flex-direction: column;\n padding: ", ";\n"])), "var(--ds-space-075, 6px)");
28
- exports.buttonContentStyle = buttonContentStyle;
29
- var buttonContentReducedSpacingStyle = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n padding: ", ";\n"])), "var(--ds-space-100, 8px)");
30
- exports.buttonContentReducedSpacingStyle = buttonContentReducedSpacingStyle;
31
- var wrapperSmallStyle = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n margin-left: ", ";\n min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
32
- exports.wrapperSmallStyle = wrapperSmallStyle;
33
- var expandIconWrapperStyle = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n margin-left: -8px;\n"])));
34
- exports.expandIconWrapperStyle = expandIconWrapperStyle;
22
+ var keyboardShortcut = exports.keyboardShortcut = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n ", "\n margin-left: ", ";\n"])), _shortcut.shortcutStyle, "var(--ds-space-200, 16px)");
23
+ var keyboardShortcutSelect = exports.keyboardShortcutSelect = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n"])), "var(--ds-icon, ".concat(_colors.N400, ")"));
24
+ var buttonContentStyle = exports.buttonContentStyle = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n min-width: 80px;\n align-items: center;\n overflow: hidden;\n justify-content: center;\n flex-direction: column;\n padding: ", ";\n"])), "var(--ds-space-075, 6px)");
25
+ var buttonContentReducedSpacingStyle = exports.buttonContentReducedSpacingStyle = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n padding: ", ";\n"])), "var(--ds-space-100, 8px)");
26
+ var wrapperSmallStyle = exports.wrapperSmallStyle = (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n margin-left: ", ";\n min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
27
+ var expandIconWrapperStyle = exports.expandIconWrapperStyle = (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n margin-left: -8px;\n"])));
@@ -8,7 +8,7 @@ exports.isNodeAWrappingBlockNode = exports.createWrappingTextBlockRule = exports
8
8
  var _utils = require("@atlaskit/editor-common/utils");
9
9
  var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
10
10
  var _blockTypes = require("./block-types");
11
- var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
11
+ var isNodeAWrappingBlockNode = exports.isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
12
12
  if (!node) {
13
13
  return false;
14
14
  }
@@ -16,8 +16,7 @@ var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
16
16
  return blockNode.name === node.type.name;
17
17
  });
18
18
  };
19
- exports.isNodeAWrappingBlockNode = isNodeAWrappingBlockNode;
20
- var createJoinNodesRule = function createJoinNodesRule(match, nodeType) {
19
+ var createJoinNodesRule = exports.createJoinNodesRule = function createJoinNodesRule(match, nodeType) {
21
20
  return (0, _utils.createWrappingJoinRule)({
22
21
  nodeType: nodeType,
23
22
  match: match,
@@ -27,8 +26,7 @@ var createJoinNodesRule = function createJoinNodesRule(match, nodeType) {
27
26
  }
28
27
  });
29
28
  };
30
- exports.createJoinNodesRule = createJoinNodesRule;
31
- var createWrappingTextBlockRule = function createWrappingTextBlockRule(_ref) {
29
+ var createWrappingTextBlockRule = exports.createWrappingTextBlockRule = function createWrappingTextBlockRule(_ref) {
32
30
  var match = _ref.match,
33
31
  nodeType = _ref.nodeType,
34
32
  getAttrs = _ref.getAttrs;
@@ -48,7 +46,6 @@ var createWrappingTextBlockRule = function createWrappingTextBlockRule(_ref) {
48
46
  /**
49
47
  * Function will create a list of wrapper blocks present in a selection.
50
48
  */
51
- exports.createWrappingTextBlockRule = createWrappingTextBlockRule;
52
49
  function getSelectedWrapperNodes(state) {
53
50
  var nodes = [];
54
51
  if (state.selection) {