@atlaskit/editor-core 174.0.0 → 175.0.0

package/dist/es2019/plugins/help-dialog/ui/index.js

@@ -7,8 +7,8 @@ import { jsx } from '@emotion/react';
 import { injectIntl, defineMessages, FormattedMessage } from 'react-intl-next';
 import { browser } from '@atlaskit/editor-common/utils';
 import CrossIcon from '@atlaskit/icon/glyph/cross';
-import AkModalDialog, { ModalTransition, ModalBody, useModal } from '@atlaskit/modal-dialog';
-import { header, footer, contentWrapper, line, content, columnRight, columnLeft, row, codeSm, codeMd, codeLg, title } from './styles';
+import AkModalDialog, { ModalTransition, useModal } from '@atlaskit/modal-dialog';
+import { header, footer, contentWrapper, line, content, row, codeSm, codeMd, codeLg, title, column, dialogHeader } from './styles';
 import * as keymaps from '../../../keymaps';
 import ToolbarButton from '../../../ui/ToolbarButton';
 import { toolbarMessages } from '../../text-formatting/ui/Toolbar/toolbar-messages';
@@ -290,38 +290,42 @@ const quickInsertAutoFormat = ({
   }, "/"))
 });
 
-export const getSupportedFormatting = (schema, intl, imageEnabled, quickInsertEnabled) => {
-  const supportedBySchema = formatting(intl).filter(format => schema.nodes[format.type] || schema.marks[format.type]);
-  return [...supportedBySchema, ...(imageEnabled ? [imageAutoFormat] : []), ...(quickInsertEnabled ? [quickInsertAutoFormat(intl)] : []), ...otherFormatting(intl)];
-};
-export const getComponentFromKeymap = keymap => {
+const getKeyParts = keymap => {
   let shortcut = keymap[browser.mac ? 'mac' : 'windows'];
 
   if (browser.mac) {
     shortcut = shortcut.replace('Alt', 'Opt');
   }
 
-  const keyParts = shortcut.replace(/\-(?=.)/g, ' + ').split(' ');
+  return shortcut.replace(/\-(?=.)/g, ' + ').split(' ');
+};
+
+export const getSupportedFormatting = (schema, intl, imageEnabled, quickInsertEnabled) => {
+  const supportedBySchema = formatting(intl).filter(format => schema.nodes[format.type] || schema.marks[format.type]);
+  return [...supportedBySchema, ...(imageEnabled ? [imageAutoFormat] : []), ...(quickInsertEnabled ? [quickInsertAutoFormat(intl)] : []), ...otherFormatting(intl)];
+};
+export const getComponentFromKeymap = keymap => {
+  const keyParts = getKeyParts(keymap);
   return jsx("span", null, keyParts.map((part, index) => {
     if (part === '+') {
       return jsx("span", {
-        key: `${shortcut}-${index}`
+        key: `${keyParts}-${index}`
       }, ' + ');
     } else if (part === 'Cmd') {
       return jsx("span", {
         css: codeSm,
-        key: `${shortcut}-${index}`
+        key: `${keyParts}-${index}`
       }, "\u2318");
     } else if (['ctrl', 'alt', 'opt', 'shift'].indexOf(part.toLowerCase()) >= 0) {
       return jsx("span", {
         css: codeMd,
-        key: `${shortcut}-${index}`
+        key: `${keyParts}-${index}`
       }, part);
     }
 
     return jsx("span", {
       css: codeSm,
-      key: `${shortcut}-${index}`
+      key: `${keyParts}-${index}`
     }, part.toUpperCase());
   }));
 };
@@ -335,7 +339,9 @@ const ModalHeader = injectIntl(({
   } = useModal();
   return jsx("div", {
     css: header
-  }, jsx(FormattedMessage, messages.editorHelp), jsx("div", null, jsx(ToolbarButton // @ts-ignore
+  }, jsx("h1", {
+    css: dialogHeader
+  }, jsx(FormattedMessage, messages.editorHelp)), jsx("div", null, jsx(ToolbarButton // @ts-ignore
   , {
     onClick: onClose,
     title: formatMessage(messages.closeHelpDialog),
@@ -398,35 +404,35 @@ class HelpDialog extends React.Component {
       width: "large",
       onClose: this.closeDialog,
       testId: "help-modal-dialog"
-    }, jsx(ModalHeader, null), jsx(ModalBody, null, jsx("div", {
+    }, jsx(ModalHeader, null), jsx("div", {
       css: contentWrapper
     }, jsx("div", {
       css: line
     }), jsx("div", {
       css: content
     }, jsx("div", {
-      css: columnLeft
-    }, jsx("div", {
+      css: column
+    }, jsx("h2", {
       css: title
-    }, jsx(FormattedMessage, messages.keyboardShortcuts)), jsx("div", null, this.formatting.filter(form => {
+    }, jsx(FormattedMessage, messages.keyboardShortcuts)), jsx("ul", null, this.formatting.filter(form => {
       const keymap = form.keymap && form.keymap(this.props);
       return keymap && keymap[browser.mac ? 'mac' : 'windows'];
-    }).map(form => jsx("div", {
+    }).map(form => jsx("li", {
       css: row,
       key: `textFormatting-${form.name}`
-    }, jsx("span", null, form.name), getComponentFromKeymap(form.keymap()))), this.formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) !== -1).filter(form => form.autoFormatting).map(form => jsx("div", {
+    }, jsx("span", null, form.name), getComponentFromKeymap(form.keymap()))), this.formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) !== -1).filter(form => form.autoFormatting).map(form => jsx("li", {
       css: row,
       key: `autoFormatting-${form.name}`
     }, jsx("span", null, form.name), form.autoFormatting())))), jsx("div", {
       css: line
     }), jsx("div", {
-      css: columnRight
-    }, jsx("div", {
+      css: column
+    }, jsx("h2", {
       css: title
-    }, jsx(FormattedMessage, messages.markdown)), jsx("div", null, this.formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) === -1).map(form => form.autoFormatting && jsx("div", {
-      css: row,
-      key: `autoFormatting-${form.name}`
-    }, jsx("span", null, form.name), form.autoFormatting()))))))), jsx(ModalFooter, null)) : null);
+    }, jsx(FormattedMessage, messages.markdown)), jsx("ul", null, this.formatting.filter(form => shortcutNamesWithoutKeymap.indexOf(form.type) === -1).map(form => form.autoFormatting && jsx("li", {
+      key: `autoFormatting-${form.name}`,
+      css: row
+    }, jsx("span", null, form.name), form.autoFormatting())))))), jsx(ModalFooter, null)) : null);
   }
 
 }

package/dist/es2019/plugins/help-dialog/ui/styles.js

@@ -3,6 +3,7 @@ import { borderRadius } from '@atlaskit/theme/constants';
 import * as colors from '@atlaskit/theme/colors';
 import { akEditorUnitZIndex, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 import { token } from '@atlaskit/tokens';
+import { N400 } from '@atlaskit/theme/colors';
 export const header = css`
   z-index: ${akEditorUnitZIndex};
   min-height: 24px;
@@ -26,7 +27,7 @@ export const footer = css`
   box-shadow: 'none';
 `;
 export const contentWrapper = css`
-  padding: 18px 20px;
+  padding: 20px 44px;
   border-bottom-right-radius: ${borderRadius()}px;
   overflow: auto;
   position: relative;
@@ -52,21 +53,35 @@ export const content = css`
   display: flex;
   justify-content: space-between;
 `;
-export const columnLeft = css`
-  width: 44%;
-`;
-export const columnRight = css`
-  width: 44%;
-`;
+export const column = {
+  width: '44%',
+  '& > ul': {
+    padding: 0
+  }
+};
 export const row = css`
   margin: 20px 0;
   display: flex;
   justify-content: space-between;
 `;
-export const title = css`
-  font-size: ${relativeFontSizeToBase16(18)};
-  font-weight: 400;
-`;
+export const dialogHeader = {
+  '&': {
+    fontSize: relativeFontSizeToBase16(24),
+    fontWeight: 400,
+    color: token('color.text.subtle', N400),
+    letterSpacing: 'normal',
+    lineHeight: 1.42857142857143
+  }
+};
+export const title = {
+  '&': {
+    fontSize: relativeFontSizeToBase16(18),
+    fontWeight: 400,
+    color: token('color.text.subtle', N400),
+    letterSpacing: 'normal',
+    lineHeight: 1.42857142857143
+  }
+};
 export const codeSm = css`
   background-color: ${token('color.background.neutral', colors.N20)};
   border-radius: ${borderRadius()}px;

package/dist/es2019/plugins/hyperlink/Toolbar.js

@@ -12,7 +12,6 @@ import { RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '../../ui/
 import { HyperlinkToolbarAppearance } from './HyperlinkToolbarAppearance';
 import { addAnalytics, ACTION_SUBJECT_ID } from '../analytics';
 import { buildVisitedLinkPayload, buildOpenedSettingsPayload } from '../../utils/linking-utils';
-import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
 import { getFeatureFlags } from '../feature-flags-context';
 /* type guard for edit links */
 
@@ -52,12 +51,6 @@ function getLinkText(activeLinkMark, state) {
   return activeLinkMark.node.text;
 }
 
-const getCopyButtonGroup = (state, intl, nodeType) => {
-  return state && showCopyButton(state) ? [{
-    type: 'separator'
-  }, getCopyButtonConfig(state, intl.formatMessage, nodeType)] : [];
-};
-
 const getSettingsButtonGroup = (state, intl) => {
   const {
     floatingToolbarLinkSettingsButton
@@ -167,7 +160,17 @@ export const getToolbarConfig = options => (state, intl, providerFactory) => {
               title: labelUnlink,
               icon: UnlinkIcon,
               tabIndex: null
-            }, ...getCopyButtonGroup(state, intl, hyperLinkToolbar.nodeType), ...getSettingsButtonGroup(state, intl)]
+            }, {
+              type: 'copy-button',
+              items: [{
+                type: 'separator'
+              }, {
+                state,
+                formatMessage: formatMessage,
+                markType: state.schema.marks.link
+              }]
+            }, ...getSettingsButtonGroup(state, intl)],
+            scrollable: true
           };
         }
 
@@ -188,6 +191,7 @@ export const getToolbarConfig = options => (state, intl, providerFactory) => {
             items: [{
               type: 'custom',
               fallback: [],
+              disableArrowNavigation: true,
               render: (view, idx) => {
                 if (!view) {
                   return null;

package/dist/es2019/plugins/hyperlink/pm-plugins/input-rule.js

@@ -2,7 +2,7 @@ import { createRule, createPlugin } from '../../../utils/input-rules';
 import { findFilepaths, isLinkInMatches, LinkMatcher, normalizeUrl } from '../utils';
 import { INPUT_METHOD, addAnalytics } from '../../analytics';
 import { getLinkCreationAnalyticsEvent } from '../analytics';
-export function createLinkInputRule(regexp, skipAnalytics = false, useUnpredictableInputRule = true) {
+export function createLinkInputRule(regexp, skipAnalytics = false) {
   // Plain typed text (eg, typing 'www.google.com') should convert to a hyperlink
   return createRule(regexp, (state, match, start, end) => {
     const {
@@ -31,12 +31,6 @@ export function createLinkInputRule(regexp, skipAnalytics = false, useUnpredicta
 
     if (isLinkInMatches(start, filepaths)) {
       const tr = state.tr;
-
-      if (useUnpredictableInputRule) {
-        tr.insertText(' ');
-      } // To keep consistent with original behaviour.
-
-
       return tr;
     }
 
@@ -44,7 +38,7 @@ export function createLinkInputRule(regexp, skipAnalytics = false, useUnpredicta
     const to = Math.min(start + link.text.length, state.doc.content.size);
     const tr = state.tr.addMark(from, to, markType); // Keep old behavior that will delete the space after the link
 
-    if (useUnpredictableInputRule || to === end) {
+    if (to === end) {
       tr.insertText(' ');
     }
 
@@ -60,9 +54,7 @@ export function createInputRulePlugin(schema, skipAnalytics = false, featureFlag
     return;
   }
 
-  const hasUseUnpredictableFlag = typeof featureFlags.useUnpredictableInputRule === 'boolean';
-  const useUnpredictableInputRule = hasUseUnpredictableFlag ? Boolean(featureFlags.useUnpredictableInputRule) : true;
-  const urlWithASpaceRule = createLinkInputRule(LinkMatcher.create(useUnpredictableInputRule), skipAnalytics, featureFlags.useUnpredictableInputRule); // [something](link) should convert to a hyperlink
+  const urlWithASpaceRule = createLinkInputRule(LinkMatcher.create(), skipAnalytics); // [something](link) should convert to a hyperlink
 
   const markdownLinkRule = createRule(/(^|[^!])\[(.*?)\]\((\S+)\)$/, (state, match, start, end) => {
     const {
@@ -81,8 +73,6 @@ export function createInputRulePlugin(schema, skipAnalytics = false, featureFlag
 
     return addAnalytics(state, tr, getLinkCreationAnalyticsEvent(INPUT_METHOD.FORMATTING, url));
   });
-  return createPlugin('hyperlink', [urlWithASpaceRule, markdownLinkRule], {
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-  });
+  return createPlugin('hyperlink', [urlWithASpaceRule, markdownLinkRule]);
 }
 export default createInputRulePlugin;

package/dist/es2019/plugins/hyperlink/utils.js

@@ -1,7 +1,9 @@
 import { mapSlice } from '../../utils/slice';
 import { isSafeUrl, linkify, normalizeUrl as normaliseLinkHref } from '@atlaskit/adf-schema'; // Regular expression for a windows filepath in the format <DRIVE LETTER>:\<folder name>\
 
-export const FILEPATH_REGEXP = /([a-zA-Z]:|\\)([^\/:*?<>"|]+\\)?([^\/:*?<>"| ]+(?=\s?))?/gim;
+export const FILEPATH_REGEXP = /([a-zA-Z]:|\\)([^\/:*?<>"|]+\\)?([^\/:*?<>"| ]+(?=\s?))?/gim; // Don't linkify if starts with $ or {
+
+export const DONTLINKIFY_REGEXP = /^(\$|{)/;
 /**
  * Instance of class LinkMatcher are used in autoformatting in place of Regex.
  * Hence it has been made similar to regex with an exec method.
@@ -9,7 +11,7 @@ export const FILEPATH_REGEXP = /([a-zA-Z]:|\\)([^\/:*?<>"|]+\\)?([^\/:*?<>"| ]+(
  */
 
 export class LinkMatcher {
-  static create(useUnpredictableInputRule) {
+  static create() {
     class LinkMatcherRegex {
       exec(str) {
         const stringsBySpace = str.slice(0, str.length - 1).split(' ');
@@ -20,6 +22,10 @@ export class LinkMatcher {
           return null;
         }
 
+        if (DONTLINKIFY_REGEXP.test(lastStringBeforeSpace)) {
+          return null;
+        }
+
         const links = linkify.match(lastStringBeforeSpace);
 
         if (!links || links.length === 0) {
@@ -31,15 +37,6 @@ export class LinkMatcher {
         lastLink.input = str.substring(lastMatch.index);
         lastLink.length = lastLink.lastIndex - lastLink.index + 1;
         lastLink.index = str.lastIndexOf(lastStringBeforeSpace) + lastMatch.index;
-
-        if (useUnpredictableInputRule) {
-          // ugly hack to make this works with unpredictable input rules
-          // prosemirror does this to find the positions:
-          // `(match[0].length - text.length)`
-          // @ts-ignore
-          lastLink[0] = lastLink;
-        }
-
         return lastLink;
       }
 

package/dist/es2019/plugins/image-upload/pm-plugins/input-rule.js

@@ -22,8 +22,6 @@ export function inputRulePlugin(schema, featureFlags) {
 
     return null;
   });
-  return createPlugin('image-upload', [imageRule], {
-    useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-  });
+  return createPlugin('image-upload', [imageRule]);
 }
 export default inputRulePlugin;

package/dist/es2019/plugins/index.js

@@ -28,7 +28,6 @@ export { default as rulePlugin } from './rule';
 export { default as quickInsertPlugin } from './quick-insert';
 export { default as saveOnEnterPlugin } from './save-on-enter';
 export { default as submitEditorPlugin } from './submit-editor';
-export { default as tablesPlugin } from './table';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as textColorPlugin } from './text-color';
 export { default as textFormattingPlugin } from './text-formatting';

package/dist/es2019/plugins/layout/styles.js

@@ -4,8 +4,8 @@ import { N40A, N50A } from '@atlaskit/theme/colors';
 import { columnLayoutSharedStyle, LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '@atlaskit/editor-common/styles';
 import { gridMediumMaxWidth, akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akLayoutGutterOffset, akEditorSwoopCubicBezier, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { token } from '@atlaskit/tokens';
-import { TableCssClassName } from '../table/types';
-import { tableMarginFullWidthMode } from '../table/ui/consts';
+import { TableCssClassName } from '@atlaskit/editor-plugin-table/types';
+import { tableMarginFullWidthMode } from '@atlaskit/editor-plugin-table/ui/consts';
 export { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN };
 export const layoutStyles = css`
   .ProseMirror {
@@ -18,7 +18,6 @@ export const layoutStyles = css`
       [data-layout-column] {
         flex: 1;
         min-width: 0;
-        // TODO: https://product-fabric.atlassian.net/browse/DSP-4353
         border: ${akEditorSelectedBorderSize}px solid
           ${token('color.border', N40A)};
         border-radius: 4px;
@@ -31,15 +30,17 @@ export const layoutStyles = css`
             margin-top: 0;
           }
 
-          > .ProseMirror-gapcursor.-right:first-of-type + * {
+          > .ProseMirror-gapcursor:first-child + *,
+          > style:first-child + .ProseMirror-gapcursor + * {
             margin-top: 0;
           }
 
-          > .ProseMirror-gapcursord:first-of-type + span + * {
+          > .ProseMirror-gapcursor:first-child + span + *,
+          > style:first-child + .ProseMirror-gapcursor:first-child + span + * {
             margin-top: 0;
           }
 
-          .rich-media-item {
+          > .embedCardView-content-wrap:first-of-type .rich-media-item {
             margin-top: 0;
           }
 
@@ -47,13 +48,25 @@ export const layoutStyles = css`
             margin-top: 0;
           }
 
-          > .ProseMirror-gapcursor.-right:first-of-type
+          > .ProseMirror-gapcursor.-right:first-child
+            + .mediaSingleView-content-wrap
+            .rich-media-item,
+          > style:first-child
+            + .ProseMirror-gapcursor.-right
             + .mediaSingleView-content-wrap
+            .rich-media-item,
+          > .ProseMirror-gapcursor.-right:first-of-type
+            + .embedCardView-content-wrap
             .rich-media-item {
             margin-top: 0;
           }
 
-          > .ProseMirror-gapcursor:first-of-type
+          > .ProseMirror-gapcursor:first-child
+            + span
+            + .mediaSingleView-content-wrap
+            .rich-media-item,
+          > style:first-child
+            + .ProseMirror-gapcursor
             + span
             + .mediaSingleView-content-wrap
             .rich-media-item {
@@ -87,7 +100,9 @@ export const layoutStyles = css`
         }
       }
 
-      // TODO: https://product-fabric.atlassian.net/browse/DSP-4441
+      // TODO: Remove the border styles below once design tokens have been enabled and fallbacks are no longer triggered.
+      // This is because the default state already uses the same token and, as such, the hover style won't change anything.
+      // https://product-fabric.atlassian.net/browse/DSP-4441
       /* Shows the border when cursor is inside a layout */
       &.selected [data-layout-column],
       &:hover [data-layout-column] {

package/dist/es2019/plugins/layout/toolbar.js

@@ -10,7 +10,6 @@ import { toolbarMessages } from './toolbar-messages';
 import commonMessages from '../../messages';
 import { setPresetLayout, deleteActiveLayoutNode, getPresetLayout } from './actions';
 import { hoverDecoration } from '../base/pm-plugins/decoration';
-import { getCopyButtonConfig, showCopyButton } from '../copy-button/toolbar';
 const LAYOUT_TYPES = [{
   id: 'editor.layout.twoEquals',
   type: 'two_equal',
@@ -85,7 +84,15 @@ export const buildToolbar = (state, intl, pos, _allowBreakout, addSidebarLayouts
       title: layoutToolbarTitle,
       getDomRef: view => findDomRefAtPos(pos, view.domAtPos.bind(view)),
       nodeType,
-      items: [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout)) : []), ...(state && showCopyButton(state) ? [separator, getCopyButtonConfig(state, intl.formatMessage, nodeType)] : []), separator, deleteButton]
+      items: [...layoutTypes.map(i => buildLayoutButton(intl, i, currentLayout)), ...(addSidebarLayouts ? SIDEBAR_LAYOUT_TYPES.map(i => buildLayoutButton(intl, i, currentLayout)) : []), {
+        type: 'copy-button',
+        items: [separator, {
+          state,
+          formatMessage: intl.formatMessage,
+          nodeType
+        }]
+      }, separator, deleteButton],
+      scrollable: true
     };
   }
 

package/dist/es2019/plugins/list/actions/conversions.js

@@ -5,6 +5,7 @@ import { findParentNodeClosestToPos } from 'prosemirror-utils';
 import { isListNode, joinSiblingLists } from '../utils/node';
 import { isEmptyParagraph } from '../../../utils';
 import { findFirstParentListNode } from '../utils/find';
+import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 export function convertListType({
   tr,
   nextListNodeType
@@ -16,7 +17,16 @@ export function convertListType({
       $to
     }
   } = tr;
-  const listRange = $from.blockRange($to, isListNode);
+  let listRange;
+
+  if (tr.selection instanceof GapCursorSelection) {
+    var _$from$nodeAfter;
+
+    const nodeSize = ((_$from$nodeAfter = $from.nodeAfter) === null || _$from$nodeAfter === void 0 ? void 0 : _$from$nodeAfter.nodeSize) || 1;
+    listRange = $from.blockRange($from.doc.resolve($from.pos + nodeSize));
+  } else {
+    listRange = $from.blockRange($to, isListNode);
+  }
 
   if (listRange) {
     return convertSelectedList({
@@ -25,7 +35,7 @@ export function convertListType({
     });
   }
 
-  const nodeRangeAroundList = $from.blockRange($to);
+  let nodeRangeAroundList = $from.blockRange($to);
 
   if (!nodeRangeAroundList) {
     return;
@@ -66,7 +76,7 @@ export function convertListType({
     const currentNodeNotWrappedInList = node;
     const isNotAnEmptyParagraphAndIsParagraphOrLeafNode = !isEmptyParagraph(currentNodeNotWrappedInList) && (!node.type.isBlock || node.type.name === 'paragraph');
 
-    if (isNotAnEmptyParagraphAndIsParagraphOrLeafNode) {
+    if (isNotAnEmptyParagraphAndIsParagraphOrLeafNode && nodeRangeAroundList) {
       const remainingNodeRange = new NodeRange(tr.doc.resolve(tr.mapping.map(pos)), tr.doc.resolve(tr.mapping.map(pos) + currentNodeNotWrappedInList.nodeSize), nodeRangeAroundList.depth);
       convertAroundList({
         tr,
@@ -99,16 +109,20 @@ const convertSelectedList = ({
       from,
       to
     }
-  } = tr; // get the positions of all the leaf nodes within the selection
+  } = tr;
+  const {
+    codeBlock
+  } = tr.doc.type.schema.nodes; // get the positions of all the leaf nodes within the selection
 
   const nodePositions = [];
 
-  if (selection instanceof TextSelection && selection.$cursor) {
+  if (selection instanceof TextSelection && selection.$cursor || selection instanceof GapCursorSelection) {
     nodePositions.push(from);
   } else {
     // nodesBetween doesn't return leaf nodes that are outside of from and to
     tr.doc.nodesBetween(from, to, (node, pos) => {
-      if (!node.isLeaf) {
+      // isLeaf is false for empty codeBlock so adding additional check for childCount
+      if (!node.isLeaf && !(node.type === codeBlock && node.childCount === 0)) {
         return true;
       }
 

package/dist/es2019/plugins/list/actions/wrap-and-join-lists.js

@@ -1,6 +1,8 @@
 import { Fragment, Slice, NodeRange } from 'prosemirror-model';
 import { ReplaceAroundStep, findWrapping, canSplit } from 'prosemirror-transform';
 import { autoJoinTr } from '../../../utils/prosemirror/autojoin';
+import { GapCursorSelection } from '../../selection/gap-cursor-selection';
+import { isWrappingPossible } from '../utils/selection';
 /**
  * Wraps the selection in a list with the given type. If this results in
  * two adjacent lists of the same type, those will be joined together.
@@ -22,7 +24,15 @@ export function wrapInList(listType, attrs) {
       $from,
       $to
     } = tr.selection;
-    let range = $from.blockRange($to);
+    let range;
+
+    if (tr.selection instanceof GapCursorSelection && $from.nodeAfter && isWrappingPossible(listType, tr.selection)) {
+      const nodeSize = $from.nodeAfter.nodeSize || 1;
+      range = $from.blockRange($from.doc.resolve($from.pos + nodeSize));
+    } else {
+      range = $from.blockRange($to);
+    }
+
     let doJoin = false;
     let outerRange = range;
 

package/dist/es2019/plugins/list/commands/index.js

@@ -1,11 +1,11 @@
 import { Fragment, Slice } from 'prosemirror-model';
-import { TextSelection } from 'prosemirror-state';
+import { NodeSelection, TextSelection } from 'prosemirror-state';
 import * as baseCommand from 'prosemirror-commands';
 import { hasParentNodeOfType, findPositionOfNodeBefore } from 'prosemirror-utils';
-import { hasVisibleContent, isNodeEmpty } from '../../../utils/document';
+import { hasVisibleContent } from '../../../utils/document';
 import { findCutBefore, isEmptySelectionAtStart, isFirstChildOfParent, filter } from '../../../utils/commands';
 import { sanitiseMarksInSelection } from '../../../utils';
-import { liftFollowingList, liftSelectionList } from '../transforms';
+import { liftFollowingList, liftTextSelectionList, liftNodeSelectionList } from '../transforms';
 import { GapCursorSelection } from '../../selection/gap-cursor-selection';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, addAnalytics } from '../../analytics';
 import { isInsideListItem, canJoinToPreviousListItem, selectionContainsList } from '../utils/selection';
@@ -31,14 +31,13 @@ export const enterKeyCommand = (state, dispatch) => {
       listItem,
       codeBlock
     } = state.schema.nodes;
-    const node = $from.node($from.depth);
     const wrapper = $from.node($from.depth - 1);
 
     if (wrapper && wrapper.type === listItem) {
       /** Check if the wrapper has any visible content */
       const wrapperHasContent = hasVisibleContent(wrapper);
 
-      if (isNodeEmpty(node) && !wrapperHasContent) {
+      if (!wrapperHasContent) {
         return outdentList(INPUT_METHOD.KEYBOARD)(state, dispatch);
       } else if (!hasParentNodeOfType(codeBlock)(selection)) {
         return splitListItem(listItem)(state, dispatch);
@@ -87,7 +86,12 @@ function untoggleSelectedList(tr) {
   } = tr;
   const depth = rootListDepth(selection.$to, tr.doc.type.schema.nodes);
   tr = liftFollowingList(selection.$to.pos, selection.$to.end(depth), depth || 0, tr);
-  tr = liftSelectionList(selection, tr);
+
+  if (selection instanceof NodeSelection || selection instanceof GapCursorSelection) {
+    return liftNodeSelectionList(selection, tr);
+  }
+
+  return liftTextSelectionList(selection, tr);
 }
 
 export function toggleList(inputMethod, listType) {
@@ -100,9 +104,12 @@ export function toggleList(inputMethod, listType) {
     if (listInsideSelection) {
       const {
         selection
-      } = state;
-      const fromNode = selection.$from.node(selection.$from.depth - 2);
-      const toNode = selection.$to.node(selection.$to.depth - 2);
+      } = state; // for gap cursor or node selection - list is expected 1 level up (listItem -> list)
+      // for text selection - list is expected 2 levels up (paragraph -> listItem -> list)
+
+      const positionDiff = selection instanceof GapCursorSelection || selection instanceof NodeSelection ? 1 : 2;
+      const fromNode = selection.$from.node(selection.$from.depth - positionDiff);
+      const toNode = selection.$to.node(selection.$to.depth - positionDiff);
       const transformedFrom = listInsideSelection.type.name === 'bulletList' ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
 
       if ((fromNode === null || fromNode === void 0 ? void 0 : fromNode.type.name) === listType && (toNode === null || toNode === void 0 ? void 0 : toNode.type.name) === listType) {

package/dist/es2019/plugins/list/pm-plugins/input-rules/index.js

@@ -27,9 +27,7 @@ export default function inputRulePlugin(schema, featureFlags) {
   }
 
   if (rules.length !== 0) {
-    return createPlugin('lists', rules, {
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
-    });
+    return createPlugin('lists', rules);
   }
 
   return;