@modusoperandi/licit 1.3.4 → 1.3.6

package/BlockquoteInsertNewLineCommand.js

@@ -15,10 +15,9 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { Fragment, Schema } from 'prosemirror-model';
 import { EditorState, TextSelection } from 'prosemirror-state';
 import { Transform } from 'prosemirror-transform';
-import { findParentNodeOfType } from 'prosemirror-utils';
 import { EditorView } from 'prosemirror-view';
 import * as React from 'react';
-import { BLOCKQUOTE, HARD_BREAK } from './NodeNames';
+import { HARD_BREAK } from './NodeNames';
 import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
 
 // This handles the case when user press SHIFT + ENTER key to insert a new line
@@ -38,11 +37,6 @@ function insertNewLine(tr, schema) {
   if (!br) {
     return tr;
   }
-  var blockquote = schema.nodes[BLOCKQUOTE];
-  var result = findParentNodeOfType(blockquote)(selection);
-  if (!result) {
-    return tr;
-  }
   tr = tr.insert(from, Fragment.from(br.create()));
   tr = tr.setSelection(TextSelection.create(tr.doc, from + 1, from + 1));
   return tr;

package/BlockquoteInsertNewLineCommand.js.flow

@@ -3,10 +3,9 @@
 import { Fragment, Schema } from 'prosemirror-model';
 import { EditorState, TextSelection } from 'prosemirror-state';
 import { Transform } from 'prosemirror-transform';
-import { findParentNodeOfType } from 'prosemirror-utils';
 import { EditorView } from 'prosemirror-view';
 import * as React from 'react';
-import { BLOCKQUOTE, HARD_BREAK } from './NodeNames';
+import { HARD_BREAK } from './NodeNames';
 import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
 
 // This handles the case when user press SHIFT + ENTER key to insert a new line
@@ -24,11 +23,6 @@ function insertNewLine(tr: Transform, schema: Schema): Transform {
   if (!br) {
     return tr;
   }
-  const blockquote = schema.nodes[BLOCKQUOTE];
-  const result = findParentNodeOfType(blockquote)(selection);
-  if (!result) {
-    return tr;
-  }
   tr = tr.insert(from, Fragment.from(br.create()));
   tr = tr.setSelection(TextSelection.create(tr.doc, from + 1, from + 1));
   return tr;

package/EditorCommands.js

@@ -1,7 +1,7 @@
 import * as ProsemirrorTables from 'prosemirror-tables';
 // [FS][07-MAY-2020][IRAD-956]
-// import BlockquoteInsertNewLineCommand from './BlockquoteInsertNewLineCommand';
-// import BlockquoteToggleCommand from './BlockquoteToggleCommand';
+import BlockquoteInsertNewLineCommand from './BlockquoteInsertNewLineCommand.js';
+import BlockquoteToggleCommand from './BlockquoteToggleCommand.js';
 import DocLayoutCommand from './DocLayoutCommand.js';
 import HistoryRedoCommand from './HistoryRedoCommand.js';
 import HistoryUndoCommand from './HistoryUndoCommand.js';
@@ -47,8 +47,8 @@ var MARK_STRONG = MarkNames.MARK_STRONG,
 document.execCommand('enableObjectResizing', false, 'false');
 document.execCommand('enableInlineTableEditing', false, 'false');
 // [FS][07-MAY-2020][IRAD-956]
-//  export const BLOCKQUOTE_TOGGLE = new BlockquoteToggleCommand();
-//  export const BLOCKQUOTE_INSERT_NEW_LINE = new BlockquoteInsertNewLineCommand();
+export var BLOCKQUOTE_TOGGLE = new BlockquoteToggleCommand();
+export var BLOCKQUOTE_INSERT_NEW_LINE = new BlockquoteInsertNewLineCommand();
 export var CLEAR_FORMAT = new MarksClearCommand();
 export var DOC_LAYOUT = new DocLayoutCommand();
 export var EM = new MarkToggleCommand(MARK_EM);

package/EditorCommands.js.flow

@@ -2,8 +2,8 @@
 
 import * as ProsemirrorTables from 'prosemirror-tables';
 // [FS][07-MAY-2020][IRAD-956]
-// import BlockquoteInsertNewLineCommand from './BlockquoteInsertNewLineCommand';
-// import BlockquoteToggleCommand from './BlockquoteToggleCommand';
+import BlockquoteInsertNewLineCommand from './BlockquoteInsertNewLineCommand.js';
+import BlockquoteToggleCommand from './BlockquoteToggleCommand.js';
 import DocLayoutCommand from './DocLayoutCommand.js';
 import HistoryRedoCommand from './HistoryRedoCommand.js';
 import HistoryUndoCommand from './HistoryUndoCommand.js';
@@ -69,8 +69,8 @@ const {
 document.execCommand('enableObjectResizing', false, 'false');
 document.execCommand('enableInlineTableEditing', false, 'false');
 // [FS][07-MAY-2020][IRAD-956]
-//  export const BLOCKQUOTE_TOGGLE = new BlockquoteToggleCommand();
-//  export const BLOCKQUOTE_INSERT_NEW_LINE = new BlockquoteInsertNewLineCommand();
+export const BLOCKQUOTE_TOGGLE = new BlockquoteToggleCommand();
+export const BLOCKQUOTE_INSERT_NEW_LINE = new BlockquoteInsertNewLineCommand();
 export const CLEAR_FORMAT = new MarksClearCommand();
 export const DOC_LAYOUT = new DocLayoutCommand();
 export const EM = new MarkToggleCommand(MARK_EM);

package/EditorKeyMap.js

@@ -24,13 +24,7 @@ export function findShortcutByKeymap(keymap) {
 export var KEY_BACK_DELETE = makeKeyMapWithCommon('', 'Backspace');
 export var KEY_FORWARD_DELETE = makeKeyMapWithCommon('', 'Delete');
 export var KEY_INSERT_HORIZONTAL_RULE = makeKeyMapWithCommon('Insert horizontal rule', 'Mod-Shift--');
-export var KEY_INSERT_NEW_LINE = makeKeyMapWithCommon('Insert new line', 'Shift-Enter');
-// [FS][07-MAY-2020][IRAD-956]
-// export const KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE = makeKeyMapWithCommon(
-//   'Insert new line in blockquote',
-//   'Shift-Enter'
-// );
-export var KEY_INSERT_NEW_LINE_IN_LIST_ITEM = makeKeyMapWithCommon('Insert new line in list item', 'Shift-Enter');
+export var KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE = makeKeyMapWithCommon('Insert new line in blockquote', 'Shift-Enter');
 export var KEY_REDO = makeKeyMapWithCommon('Redo', 'Mod-Shift-z');
 export var KEY_SET_NORMAL_TEXT = makeKeyMap('Normal text', 'Ctrl-0', 'Cmd-Alt-0');
 export var KEY_SHIFT_BACKSPACE = makeKeyMapWithCommon('Shift Backspace', 'Shift-Backspace');
@@ -54,10 +48,7 @@ export var KEY_TOGGLE_ORDERED_LIST = makeKeyMapWithCommon('Toggle ordered list',
 export var KEY_TOGGLE_STRIKETHROUGH = makeKeyMapWithCommon('Toggle strikethrough', 'Mod-Shift-s');
 export var KEY_TOGGLE_UNDERLINE = makeKeyMapWithCommon('Toggle underline', 'Mod-u');
 export var KEY_UNDO = makeKeyMapWithCommon('Undo', 'Mod-z');
-export var ALL_KEYS = [KEY_BACK_DELETE, KEY_FORWARD_DELETE, KEY_INSERT_HORIZONTAL_RULE, KEY_INSERT_NEW_LINE,
-// [FS][07-MAY-2020][IRAD-956]
-// KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE,
-KEY_INSERT_NEW_LINE_IN_LIST_ITEM, KEY_SET_NORMAL_TEXT, KEY_SHIFT_BACKSPACE, KEY_SPLIT_LIST_ITEM, KEY_TAB_SHIFT, KEY_TAB, KEY_TOGGLE_BLOCK_QUOTE, KEY_TOGGLE_BOLD, KEY_TOGGLE_BULLET_LIST, KEY_TOGGLE_BULLET_LIST, KEY_TOGGLE_CODE_BLOCK, KEY_TOGGLE_HEADING_1, KEY_TOGGLE_HEADING_2, KEY_TOGGLE_HEADING_3, KEY_TOGGLE_HEADING_4, KEY_TOGGLE_HEADING_5, KEY_TOGGLE_HEADING_6, KEY_TOGGLE_ITALIC, KEY_TOGGLE_MONOSPACE, KEY_TOGGLE_ORDERED_LIST, KEY_TOGGLE_STRIKETHROUGH, KEY_TOGGLE_UNDERLINE, KEY_UNDO];
+export var ALL_KEYS = [KEY_BACK_DELETE, KEY_FORWARD_DELETE, KEY_INSERT_HORIZONTAL_RULE, KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE, KEY_SET_NORMAL_TEXT, KEY_SHIFT_BACKSPACE, KEY_SPLIT_LIST_ITEM, KEY_TAB_SHIFT, KEY_TAB, KEY_TOGGLE_BLOCK_QUOTE, KEY_TOGGLE_BOLD, KEY_TOGGLE_BULLET_LIST, KEY_TOGGLE_BULLET_LIST, KEY_TOGGLE_CODE_BLOCK, KEY_TOGGLE_HEADING_1, KEY_TOGGLE_HEADING_2, KEY_TOGGLE_HEADING_3, KEY_TOGGLE_HEADING_4, KEY_TOGGLE_HEADING_5, KEY_TOGGLE_HEADING_6, KEY_TOGGLE_ITALIC, KEY_TOGGLE_MONOSPACE, KEY_TOGGLE_ORDERED_LIST, KEY_TOGGLE_STRIKETHROUGH, KEY_TOGGLE_UNDERLINE, KEY_UNDO];
 export function findKeymapByDescription(description) {
   var matches = ALL_KEYS.filter(function (keymap) {
     return keymap.description.toUpperCase() === description.toUpperCase();

package/EditorKeyMap.js.flow

@@ -40,17 +40,8 @@ export const KEY_INSERT_HORIZONTAL_RULE = makeKeyMapWithCommon(
   'Insert horizontal rule',
   'Mod-Shift--'
 );
-export const KEY_INSERT_NEW_LINE = makeKeyMapWithCommon(
-  'Insert new line',
-  'Shift-Enter'
-);
-// [FS][07-MAY-2020][IRAD-956]
-// export const KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE = makeKeyMapWithCommon(
-//   'Insert new line in blockquote',
-//   'Shift-Enter'
-// );
-export const KEY_INSERT_NEW_LINE_IN_LIST_ITEM = makeKeyMapWithCommon(
-  'Insert new line in list item',
+export const KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE = makeKeyMapWithCommon(
+  'Insert new line in blockquote',
   'Shift-Enter'
 );
 export const KEY_REDO = makeKeyMapWithCommon('Redo', 'Mod-Shift-z');
@@ -141,10 +132,7 @@ export const ALL_KEYS = [
   KEY_BACK_DELETE,
   KEY_FORWARD_DELETE,
   KEY_INSERT_HORIZONTAL_RULE,
-  KEY_INSERT_NEW_LINE,
-  // [FS][07-MAY-2020][IRAD-956]
-  // KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE,
-  KEY_INSERT_NEW_LINE_IN_LIST_ITEM,
+  KEY_INSERT_NEW_LINE_IN_BLOCKQUOTE,
   KEY_SET_NORMAL_TEXT,
   KEY_SHIFT_BACKSPACE,
   KEY_SPLIT_LIST_ITEM,