@atlaskit/editor-core 151.2.0 → 152.0.1

package/dist/es2019/plugins/find-replace/index.js

@@ -1,13 +1,7 @@
 import React from 'react';
 import { createPlugin } from './plugin';
-import { findReplacePluginKey } from './types';
 import keymapPlugin from './keymap';
-import WithPluginState from '../../ui/WithPluginState';
-import { cancelSearchWithAnalytics, replaceWithAnalytics, replaceAllWithAnalytics, findWithAnalytics, findNextWithAnalytics, findPrevWithAnalytics, activateWithAnalytics } from './commands-with-analytics';
-import { blur, toggleMatchCase } from './commands';
-import FindReplaceToolbarButton from './ui/FindReplaceToolbarButton';
-import { TRIGGER_METHOD } from '../analytics';
-import { getFeatureFlags } from '../feature-flags-context';
+import FindReplaceToolbarButtonWithState from './FindReplaceToolbarButtonWithState';
 export const findReplacePlugin = props => {
   return {
     name: 'findReplace',
@@ -33,127 +27,20 @@ export const findReplacePlugin = props => {
       containerElement,
       dispatchAnalyticsEvent
     }) {
-      // we need the editor to be in focus for scrollIntoView() to work
-      // so we focus it while we run the command, then put focus back into
-      // whatever element was previously focused in find replace component
-      const runWithEditorFocused = fn => {
-        const activeElement = document.activeElement;
-        editorView.focus();
-        fn();
-        activeElement === null || activeElement === void 0 ? void 0 : activeElement.focus();
-      };
-
-      const dispatchCommand = cmd => {
-        const {
-          state,
-          dispatch
-        } = editorView;
-        cmd(state, dispatch);
-      };
-
-      const handleActivate = () => {
-        runWithEditorFocused(() => dispatchCommand(activateWithAnalytics({
-          triggerMethod: TRIGGER_METHOD.TOOLBAR
-        })));
-      };
-
-      const handleFind = keyword => {
-        runWithEditorFocused(() => dispatchCommand(findWithAnalytics({
-          editorView,
-          containerElement,
-          keyword
-        })));
-      };
-
-      const handleFindNext = ({
-        triggerMethod
-      }) => {
-        runWithEditorFocused(() => dispatchCommand(findNextWithAnalytics({
-          triggerMethod
-        })));
-      };
-
-      const handleFindPrev = ({
-        triggerMethod
-      }) => {
-        runWithEditorFocused(() => dispatchCommand(findPrevWithAnalytics({
-          triggerMethod
-        })));
-      };
-
-      const handleReplace = ({
-        triggerMethod,
-        replaceText
-      }) => {
-        runWithEditorFocused(() => dispatchCommand(replaceWithAnalytics({
-          triggerMethod,
-          replaceText
-        })));
-      };
-
-      const handleReplaceAll = ({
-        replaceText
-      }) => {
-        runWithEditorFocused(() => dispatchCommand(replaceAllWithAnalytics({
-          replaceText
-        })));
-      };
-
-      const handleFindBlur = () => {
-        dispatchCommand(blur());
-      };
-
-      const handleCancel = ({
-        triggerMethod
-      }) => {
-        dispatchCommand(cancelSearchWithAnalytics({
-          triggerMethod
-        }));
-        editorView.focus();
-      };
-
-      const handleToggleMatchCase = () => {
-        dispatchCommand(toggleMatchCase());
-      };
-
-      const {
-        findReplaceMatchCase
-      } = getFeatureFlags(editorView.state);
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        debounce: false,
-        plugins: {
-          findReplaceState: findReplacePluginKey
-        },
-        render: ({
-          findReplaceState
-        }) => {
-          return /*#__PURE__*/React.createElement(FindReplaceToolbarButton, {
-            allowMatchCase: findReplaceMatchCase,
-            shouldMatchCase: findReplaceState.shouldMatchCase,
-            onToggleMatchCase: handleToggleMatchCase,
-            isActive: findReplaceState.isActive,
-            findText: findReplaceState.findText,
-            index: findReplaceState.index,
-            numMatches: findReplaceState.matches.length,
-            replaceText: findReplaceState.replaceText,
-            shouldFocus: findReplaceState.shouldFocus,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsMountPoint: popupsMountPoint,
-            popupsScrollableElement: popupsScrollableElement,
-            isReducedSpacing: isToolbarReducedSpacing,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            onFindBlur: handleFindBlur,
-            onCancel: handleCancel,
-            onActivate: handleActivate,
-            onFind: handleFind,
-            onFindNext: handleFindNext,
-            onFindPrev: handleFindPrev,
-            onReplace: handleReplace,
-            onReplaceAll: handleReplaceAll,
-            takeFullWidth: props.takeFullWidth
-          });
-        }
-      });
+      if (props.twoLineEditorToolbar) {
+        return null;
+      } else {
+        return /*#__PURE__*/React.createElement(FindReplaceToolbarButtonWithState, {
+          popupsBoundariesElement: popupsBoundariesElement,
+          popupsMountPoint: popupsMountPoint,
+          popupsScrollableElement: popupsScrollableElement,
+          isToolbarReducedSpacing: isToolbarReducedSpacing,
+          editorView: editorView,
+          containerElement: containerElement,
+          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+          takeFullWidth: props.takeFullWidth
+        });
+      }
     }
 
   };

package/dist/es2019/plugins/find-replace/ui/Find.js

@@ -1,12 +1,15 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/core';
 import { defineMessages, injectIntl } from 'react-intl';
 import EditorCloseIcon from '@atlaskit/icon/glyph/editor/close';
 import ChevronDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-down';
 import ChevronUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-up';
 import MatchCaseIcon from '@atlaskit/icon/glyph/emoji/keyboard';
 import Textfield from '@atlaskit/textfield';
-import { SectionWrapper, Count } from './styles';
+import { countStyles, sectionWrapperStyles } from './styles';
 import { TRIGGER_METHOD } from '../../analytics/types';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
 const messages = defineMessages({
@@ -147,16 +150,16 @@ class Find extends React.Component {
     this.findNext = formatMessage(messages.findNext);
     this.findPrevious = formatMessage(messages.findPrevious);
     this.matchCase = formatMessage(messages.matchCase);
-    this.matchCaseIcon = /*#__PURE__*/React.createElement(MatchCaseIcon, {
+    this.matchCaseIcon = jsx(MatchCaseIcon, {
       label: this.matchCase
     });
-    this.findNextIcon = /*#__PURE__*/React.createElement(ChevronDownIcon, {
+    this.findNextIcon = jsx(ChevronDownIcon, {
       label: this.findNext
     });
-    this.findPrevIcon = /*#__PURE__*/React.createElement(ChevronUpIcon, {
+    this.findPrevIcon = jsx(ChevronUpIcon, {
       label: this.findPrevious
     });
-    this.closeIcon = /*#__PURE__*/React.createElement(EditorCloseIcon, {
+    this.closeIcon = jsx(EditorCloseIcon, {
       label: this.closeFindReplaceDialog
     }); // We locally manage the value of the input inside this component in order to support compositions.
     // This requires some additional work inside componentDidUpdate to ensure we support changes that
@@ -200,7 +203,9 @@ class Find extends React.Component {
       selectedMatchPosition: count.index + 1,
       totalResultsCount: count.total
     });
-    return /*#__PURE__*/React.createElement(SectionWrapper, null, /*#__PURE__*/React.createElement(Textfield, {
+    return jsx("div", {
+      css: sectionWrapperStyles
+    }, jsx(Textfield, {
       name: "find",
       appearance: "none",
       placeholder: this.find,
@@ -212,24 +217,27 @@ class Find extends React.Component {
       onBlur: this.props.onFindBlur,
       onCompositionStart: this.handleCompositionStart,
       onCompositionEnd: this.handleCompositionEnd
-    }), findText && /*#__PURE__*/React.createElement(Count, null, count.total === 0 ? this.noResultsFound : resultsCount), allowMatchCase && /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
+    }), findText && jsx("span", {
+      "data-testid": "textfield-count",
+      css: countStyles
+    }, count.total === 0 ? this.noResultsFound : resultsCount), allowMatchCase && jsx(FindReplaceTooltipButton, {
       title: this.matchCase,
       icon: this.matchCaseIcon,
       onClick: this.handleMatchCaseClick,
       isPressed: shouldMatchCase
-    }), /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
+    }), jsx(FindReplaceTooltipButton, {
       title: this.findNext,
       icon: this.findNextIcon,
       keymapDescription: 'Enter',
       onClick: this.handleFindNextClick,
       disabled: count.total <= 1
-    }), /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
+    }), jsx(FindReplaceTooltipButton, {
       title: this.findPrevious,
       icon: this.findPrevIcon,
       keymapDescription: 'Shift Enter',
       onClick: this.handleFindPrevClick,
       disabled: count.total <= 1
-    }), /*#__PURE__*/React.createElement(FindReplaceTooltipButton, {
+    }), jsx(FindReplaceTooltipButton, {
       title: this.closeFindReplaceDialog,
       icon: this.closeIcon,
       keymapDescription: 'Escape',

package/dist/es2019/plugins/find-replace/ui/FindReplace.js

@@ -1,8 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/core';
 import Find from './Find';
 import Replace from './Replace';
-import { Rule, Wrapper } from './styles';
+import { ruleStyles, wrapperStyles } from './styles';
 
 class FindReplace extends React.PureComponent {
   constructor(...args) {
@@ -51,7 +54,9 @@ class FindReplace extends React.PureComponent {
       shouldMatchCase,
       onToggleMatchCase
     } = this.props;
-    return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(Find, {
+    return jsx("div", {
+      css: wrapperStyles
+    }, jsx(Find, {
       allowMatchCase: allowMatchCase,
       shouldMatchCase: shouldMatchCase,
       onToggleMatchCase: onToggleMatchCase,
@@ -65,7 +70,10 @@ class FindReplace extends React.PureComponent {
       onFindTextfieldRefSet: this.setFindTextfieldRef,
       onCancel: onCancel,
       onArrowDown: this.setFocusToReplace
-    }), /*#__PURE__*/React.createElement(Rule, null), /*#__PURE__*/React.createElement(Replace, {
+    }), jsx("hr", {
+      css: ruleStyles,
+      id: "replace-hr-element"
+    }), jsx(Replace, {
       canReplace: count.total > 0,
       replaceText: replaceText,
       onReplace: onReplace,

package/dist/es2019/plugins/find-replace/ui/Replace.js

@@ -1,8 +1,12 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/core';
+import Button from '@atlaskit/button/standard-button';
 import { defineMessages, injectIntl } from 'react-intl';
 import Textfield from '@atlaskit/textfield';
-import { SectionWrapper, ReplaceSectionButton } from './styles';
+import { sectionWrapperStyles, replaceSectionButtonStyles } from './styles';
 import { EVENT_TYPE, ACTION, ACTION_SUBJECT, TRIGGER_METHOD } from '../../analytics/types';
 const messages = defineMessages({
   replaceWith: {
@@ -138,7 +142,9 @@ class Replace extends React.PureComponent {
     const {
       canReplace
     } = this.props;
-    return /*#__PURE__*/React.createElement(SectionWrapper, null, /*#__PURE__*/React.createElement(Textfield, {
+    return jsx("div", {
+      css: sectionWrapperStyles
+    }, jsx(Textfield, {
       name: "replace",
       appearance: "none",
       placeholder: this.replaceWith,
@@ -149,11 +155,13 @@ class Replace extends React.PureComponent {
       onKeyDown: this.handleReplaceKeyDown,
       onCompositionStart: this.handleCompositionStart,
       onCompositionEnd: this.handleCompositionEnd
-    }), /*#__PURE__*/React.createElement(ReplaceSectionButton, {
+    }), jsx(Button, {
+      css: replaceSectionButtonStyles,
       testId: this.replace,
       onClick: this.handleReplaceClick,
       isDisabled: !canReplace
-    }, this.replace), /*#__PURE__*/React.createElement(ReplaceSectionButton, {
+    }, this.replace), jsx(Button, {
+      css: replaceSectionButtonStyles,
       testId: this.replaceAll,
       onClick: this.handleReplaceAllClick,
       isDisabled: !canReplace

package/dist/es2019/plugins/find-replace/ui/styles.js

@@ -1,50 +1,40 @@
-import React from 'react';
-import styled from 'styled-components';
+/** @jsx jsx */
+import { css } from '@emotion/core';
 import { N60, N30A } from '@atlaskit/theme/colors';
-import Button from '@atlaskit/button/standard-button';
-import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles'; // This is a workaround because React.memo does not play well with styled-components
-
-function StyledComponentsButton(props) {
-  return /*#__PURE__*/React.createElement(Button, props);
-}
-
-export const ReplaceSectionButton = styled(StyledComponentsButton)`
-  /* increase specificity to override default Button styles */
-  && {
-    margin-left: 4px;
+import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
+export const replaceSectionButtonStyles = css({
+  marginLeft: '4px'
+});
+export const ruleStyles = css({
+  width: '100%',
+  border: 'none',
+  backgroundColor: `${N30A}`,
+  margin: '4px 0px',
+  height: '1px',
+  borderRadius: '1px'
+});
+export const wrapperStyles = css({
+  display: 'flex',
+  flexDirection: 'column',
+  '> *:not(#replace-hr-element)': {
+    margin: '0px 4px'
   }
-`;
-export const Rule = styled.hr`
-  width: 100%;
-  border: none;
-  background-color: ${N30A};
-  margin: 4px 0px;
-  height: 1px;
-  border-radius: 1px;
-`;
-export const Wrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  > *:not(${Rule}) {
-    margin: 0px 4px;
+});
+export const sectionWrapperStyles = css({
+  display: 'flex',
+  alignItems: 'column',
+  '> *': {
+    display: 'inline-flex',
+    height: '32px',
+    flex: '0 0 auto'
   }
-`;
-export const SectionWrapper = styled.div`
-  display: flex;
-  align-items: center;
-
-  > * {
-    flex: 0 0 auto;
-    display: inline-flex;
-    height: 32px;
-  }
-`;
-export const Count = styled.span`
-  color: ${N60};
-  font-size: ${relativeFontSizeToBase16(12)};
-  flex: 0 0 auto;
-  justify-content: center;
-  align-items: center;
-  margin-left: 4px;
-  margin-right: 8px;
-`;
+});
+export const countStyles = css({
+  color: `${N60}`,
+  fontSize: `${relativeFontSizeToBase16(12)}`,
+  flex: '0 0 auto',
+  justifyContent: 'center',
+  alignItems: 'center',
+  marginLeft: '4px',
+  marginRight: '8px'
+});

package/dist/es2019/plugins/floating-toolbar/ui/DropdownMenu.js

@@ -2,7 +2,8 @@ import React from 'react';
 import { Component } from 'react';
 import styled, { ThemeProvider } from 'styled-components';
 import { gridSize } from '@atlaskit/theme/constants';
-import { B400 } from '@atlaskit/theme/colors';
+import { B400 } from '@atlaskit/theme/colors'; // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
+
 import Item, { itemThemeNamespace } from '@atlaskit/item';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
 import Tooltip from '@atlaskit/tooltip';

package/dist/es2019/plugins/floating-toolbar/ui/EmojiPickerButton.js

@@ -8,6 +8,13 @@ import EditorEmojiAddIcon from './EditorEmojiAddIcon'; // helps adjusts position
 
 const EmojiPickerButtonWrapper = styled.div`
   position: relative;
+`; // helps to vertically align emoji picker
+// both top and bottom margin should be 2px
+// https://product-fabric.atlassian.net/browse/CETI-148
+
+const EmojiPickerWrapper = styled.div`
+  margin-bottom: -12px;
+  margin-top: -4px;
 `;
 export const EmojiPickerButton = props => {
   const buttonRef = React.useRef(null);
@@ -20,6 +27,7 @@ export const EmojiPickerButton = props => {
 
   const updateEmoji = emoji => {
     setIsPopupOpen(false);
+    props.editorView && props.editorView.focus();
     props.onChange && props.onChange(emoji);
   };
 
@@ -47,11 +55,11 @@ export const EmojiPickerButton = props => {
       fitHeight: 350,
       fitWidth: 350,
       offset: [0, 10]
-    }, /*#__PURE__*/React.createElement(WithProviders, {
+    }, /*#__PURE__*/React.createElement(EmojiPickerWrapper, null, /*#__PURE__*/React.createElement(WithProviders, {
       providers: ['emojiProvider'],
       providerFactory: props.providerFactory,
       renderNode: renderPicker
-    }));
+    })));
   };
 
   const title = props.title || '';

package/dist/es2019/plugins/floating-toolbar/ui/Toolbar.js

@@ -224,7 +224,7 @@ export default class Toolbar extends Component {
           if (item.selectType === 'emoji') {
             return /*#__PURE__*/React.createElement(EmojiPickerButton, {
               key: idx,
-              view: editorView,
+              editorView: editorView,
               title: item.title,
               providerFactory: providerFactory,
               isSelected: item.selected,

package/dist/es2019/plugins/fragment/index.js

@@ -0,0 +1,22 @@
+import { fragment } from '@atlaskit/adf-schema';
+import { Plugin } from 'prosemirror-state';
+import { pluginKey } from './plugin-key';
+export function createPlugin() {
+  return new Plugin({
+    key: pluginKey
+  });
+}
+
+const fragmentMarkPlugin = () => ({
+  name: 'fragmentPlugin',
+
+  marks() {
+    return [{
+      name: 'fragment',
+      mark: fragment
+    }];
+  }
+
+});
+
+export default fragmentMarkPlugin;

package/dist/es2019/plugins/fragment/plugin-key.js

@@ -0,0 +1,2 @@
+import { PluginKey } from 'prosemirror-state';
+export const pluginKey = new PluginKey('fragmentMarkPlugin');

package/dist/es2019/plugins/hyperlink/ui/HyperlinkAddToolbar/HyperlinkAddToolbar.js

@@ -4,7 +4,7 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import EditorAlignLeftIcon from '@atlaskit/icon/glyph/editor/align-left';
 import LinkIcon from '@atlaskit/icon/glyph/link';
-import { N80, N30 } from '@atlaskit/theme/colors';
+import { N90, N80, N30 } from '@atlaskit/theme/colors';
 import Page16Icon from '@atlaskit/icon-object/glyph/page/16';
 import Tooltip from '@atlaskit/tooltip';
 import { PureComponent } from 'react';
@@ -27,7 +27,7 @@ export const RECENT_SEARCH_LIST_SIZE = 5;
 const ClearText = styled.span`
   cursor: pointer;
   padding-right: 8px;
-  color: ${N80};
+  color: ${N90};
 `;
 const TextInputWrapper = styled.div`
   ${InputWrapper};

package/dist/es2019/plugins/index.js

@@ -42,6 +42,7 @@ export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
 export { default as editorDisabledPlugin } from './editor-disabled';
+export { default as fragmentMarkPlugin } from './fragment';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
@@ -61,4 +62,5 @@ export { default as clipboardPlugin } from './clipboard';
 export { default as undoRedoPlugin } from './undo-redo';
 export { default as avatarGroupPlugin } from './avatar-group';
 export { default as viewUpdateSubscriptionPlugin } from './view-update-subscription';
+export { default as beforePrimaryToolbarPlugin } from './before-primaryToolbar';
 export { default as codeBidiWarningPlugin } from './code-bidi-warning';

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

@@ -4,6 +4,7 @@ import { findWrapping } from 'prosemirror-transform';
 import { findParentNodeClosestToPos } from 'prosemirror-utils';
 import { isListNode, joinSiblingLists } from '../utils/node';
 import { isEmptyParagraph } from '../../../utils';
+import { findFirstParentListNode } from '../utils/find';
 export function convertListType({
   tr,
   nextListNodeType
@@ -35,82 +36,50 @@ export function convertListType({
     startIndex,
     endIndex,
     depth
-  } = nodeRangeAroundList;
-  const before = {
-    from: !isListNode(parentNode.child(startIndex)) ? // @ts-ignore
-    doc.resolve(nodeRangeAroundList.$from.posAtIndex(startIndex, depth) + 1) : null,
-    to: null
-  };
-  const after = {
-    from: null,
-    to: !isListNode(parentNode.child(endIndex - 1)) ? doc.resolve( // @ts-ignore
-    nodeRangeAroundList.$from.posAtIndex(endIndex - 1, depth) + 1) : null
-  };
-  let isListNodeFound = false;
-  let firstEmptyParagraphAfterListFound = false;
-
-  for (let i = startIndex; i < endIndex; i++) {
-    // @ts-ignore posAtIndex is a public API but has no type yet
-    const position = nodeRangeAroundList.$from.posAtIndex(i, depth);
-    const resolvedPosition = doc.resolve(position);
-
-    if (isEmptyParagraph(parentNode.child(i)) && !isListNodeFound) {
-      before.from = doc.resolve( // @ts-ignore posAtIndex is a public API but has no type yet
-      nodeRangeAroundList.$from.posAtIndex(i, depth) + 2);
-    }
-
-    if (isEmptyParagraph(parentNode.child(i)) && isListNodeFound && !firstEmptyParagraphAfterListFound) {
-      after.to = resolvedPosition;
-      firstEmptyParagraphAfterListFound = true;
-    }
-
-    if (!isListNode(parentNode.child(i)) && !isListNodeFound) {
-      before.to = doc.resolve(resolvedPosition.pos + 1);
-    } else if (!isListNodeFound) {
-      isListNodeFound = true;
-      const endNodePosition = doc.resolve(resolvedPosition.pos + 1).end() + 1;
-
-      if (doc.resolve(endNodePosition).nodeAfter) {
-        after.from = doc.resolve(endNodePosition + 1);
+  } = nodeRangeAroundList; // Checking for invalid nodes to prevent conversion
+  // eg. a panel cannot be wrapped in a list so return
+  // It will skip this check if the selection begins within a list
+  // This is to match the behaviour of the toolbar buttons being disabled
+
+  if (!findFirstParentListNode($from)) {
+    for (let i = startIndex; i < endIndex; i++) {
+      const position = nodeRangeAroundList.$from.posAtIndex(i, depth);
+      const resolvedPosition = doc.resolve(position);
+      const currentChild = parentNode.child(i);
+      const currentNodeRange = resolvedPosition.blockRange(tr.doc.resolve(position + currentChild.nodeSize));
+
+      if (currentNodeRange && !isListNode(currentChild) && !findWrapping(currentNodeRange, nextListNodeType)) {
+        return;
       }
     }
-  }
+  } // Checking for any non list nodes and wrapping them in a list
+  // so they can be converted
 
-  let beforeConversionArgs, beforeRange, afterConversionArgs, afterRange;
-
-  if (after.from && after.to) {
-    const mappedFrom = tr.mapping.map(after.from.pos);
-    const mappedTo = tr.mapping.map(after.to.pos);
-    afterRange = new NodeRange(tr.doc.resolve(mappedFrom), tr.doc.resolve(mappedTo), nodeRangeAroundList.depth);
-    afterConversionArgs = {
-      tr,
-      nextListNodeType,
-      nodeRange: afterRange
-    };
-  }
 
-  if (before.from && before.to) {
-    const mappedFrom = tr.mapping.map(before.from.pos);
-    const mappedTo = tr.mapping.map(before.to.pos);
-    beforeRange = new NodeRange(tr.doc.resolve(mappedFrom), tr.doc.resolve(mappedTo), nodeRangeAroundList.depth);
-    beforeConversionArgs = {
-      tr,
-      nextListNodeType,
-      nodeRange: beforeRange
-    };
-  }
+  tr.doc.nodesBetween(nodeRangeAroundList.start, nodeRangeAroundList.end, (node, pos) => {
+    // Skip over any nodes that are part of a list
+    if (findFirstParentListNode(tr.doc.resolve(tr.mapping.map(pos)))) {
+      return false;
+    } // The following applies to suitable nodes that are not within a list
 
-  if (!afterRange && !beforeRange || afterRange && !findWrapping(afterRange, nextListNodeType) || beforeRange && !findWrapping(beforeRange, nextListNodeType)) {
-    return;
-  }
 
-  if (afterConversionArgs) {
-    convertAroundList(afterConversionArgs);
-  }
+    const currentNodeNotWrappedInList = node;
+    const isNotAnEmptyParagraphAndIsParagraphOrLeafNode = !isEmptyParagraph(currentNodeNotWrappedInList) && (!node.type.isBlock || node.type.name === 'paragraph');
 
-  if (beforeConversionArgs) {
-    convertAroundList(beforeConversionArgs);
-  }
+    if (isNotAnEmptyParagraphAndIsParagraphOrLeafNode) {
+      const remainingNodeRange = new NodeRange(tr.doc.resolve(tr.mapping.map(pos)), tr.doc.resolve(tr.mapping.map(pos) + currentNodeNotWrappedInList.nodeSize), nodeRangeAroundList.depth);
+      convertAroundList({
+        tr,
+        nextListNodeType,
+        nodeRange: remainingNodeRange
+      });
+      return false;
+    }
+  });
+  convertSelectedList({
+    tr,
+    nextListNodeType
+  });
 
   if (tr.docChanged) {
     joinSiblingLists({

package/dist/es2019/plugins/list/transforms.js

@@ -195,9 +195,13 @@ const extractListFromParagraph = (node, parent, schema) => {
     } // Return false to prevent replaceWith from wrapping the text node in a paragraph
     // paragraph since that will be done later. If it's done here, it will fail
     // the paragraph.validContent check.
+    // Dont return false if there are lists, as they arent validContent for paragraphs
+    // and will result in hanging textNodes
 
 
-    if (listified.some(node => node.isText)) {
+    const containsList = listified.some(node => node.type === bulletList || node.type === orderedList);
+
+    if (listified.some(node => node.isText) && !containsList) {
       return false;
     }