@atlaskit/editor-core 174.0.0 → 175.0.1

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "174.0.0",
+	"version": "175.0.1",
 	"sideEffects": false
 }

package/dist/es2019/actions/index.js

@@ -12,6 +12,7 @@ import { findNodePosWithLocalId } from '../plugins/extension/utils';
 import { getFeatureFlags } from '../plugins/feature-flags-context/get-feature-flags';
 import { getCollabProvider } from '../plugins/collab-edit/native-collab-provider-plugin';
 import deprecationWarnings from '../utils/deprecation-warnings';
+import { findNodePosByFragmentLocalIds } from '../utils/nodes-by-localIds';
 export default class EditorActions {
   constructor() {
     _defineProperty(this, "listeners", []);
@@ -187,6 +188,17 @@ export default class EditorActions {
       return (_findNodePosWithLocal = findNodePosWithLocalId((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, id)) === null || _findNodePosWithLocal === void 0 ? void 0 : _findNodePosWithLocal.node;
     }
   }
+
+  getNodeByFragmentLocalId(id) {
+    var _this$editorView3;
+
+    if ((_this$editorView3 = this.editorView) !== null && _this$editorView3 !== void 0 && _this$editorView3.state) {
+      var _this$editorView4;
+
+      let nodes = findNodePosByFragmentLocalIds((_this$editorView4 = this.editorView) === null || _this$editorView4 === void 0 ? void 0 : _this$editorView4.state, [id]);
+      return nodes.length > 0 ? nodes[0].node : undefined;
+    }
+  }
   /**
    * This method will return the currently selected `Node` if the selection is a `Node`.
    * Otherwise, if the selection is textual or a non-selectable `Node` within another selectable `Node`, the closest selectable parent `Node` will be returned.
@@ -194,9 +206,9 @@ export default class EditorActions {
 
 
   getSelectedNode() {
-    var _this$editorView3, _this$editorView3$sta;
+    var _this$editorView5, _this$editorView5$sta;
 
-    if ((_this$editorView3 = this.editorView) !== null && _this$editorView3 !== void 0 && (_this$editorView3$sta = _this$editorView3.state) !== null && _this$editorView3$sta !== void 0 && _this$editorView3$sta.selection) {
+    if ((_this$editorView5 = this.editorView) !== null && _this$editorView5 !== void 0 && (_this$editorView5$sta = _this$editorView5.state) !== null && _this$editorView5$sta !== void 0 && _this$editorView5$sta.selection) {
       var _findParentNode;
 
       const {

package/dist/es2019/create-editor/ErrorBoundary.js

@@ -1,15 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import memoizeOne from 'memoize-one';
 import React from 'react';
 import uuid from 'uuid';
-import memoizeOne from 'memoize-one';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
 import { ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { IntlErrorBoundary } from '@atlaskit/editor-common/ui';
+import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../plugins/analytics';
 import { editorAnalyticsChannel } from '../plugins/analytics/consts';
 import { getFeatureFlags } from '../plugins/feature-flags-context';
 import { getDocStructure } from '../utils/document-logger';
 import { WithEditorView } from './WithEditorView';
+import { isOutdatedBrowser } from '@atlaskit/editor-common/utils';
 export class ErrorBoundaryWithEditorView extends React.Component {
   // Memoizing this as react alternative suggestion of https://reactjs.org/docs/react-component.html#unsafe_componentwillreceiveprops
   get featureFlags() {
@@ -34,6 +35,8 @@ export class ErrorBoundaryWithEditorView extends React.Component {
     }));
 
     _defineProperty(this, "sendErrorData", async analyticsErrorPayload => {
+      var _window, _window$navigator;
+
       const product = await this.getProductName();
       const {
         error,
@@ -41,16 +44,18 @@ export class ErrorBoundaryWithEditorView extends React.Component {
         errorStack
       } = analyticsErrorPayload;
       const sharedId = uuid();
+      const browserInfo = ((_window = window) === null || _window === void 0 ? void 0 : (_window$navigator = _window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userAgent) || 'unknown';
       const attributes = {
         product,
-        browserInfo: window && window.navigator && window.navigator.userAgent ? window.navigator.userAgent : 'unknown',
+        browserInfo,
         error: error,
         errorInfo,
         errorId: sharedId,
         browserExtensions: this.browserExtensions,
         docStructure: this.featureFlags.errorBoundaryDocStructure && this.props.editorView ? getDocStructure(this.props.editorView.state.doc, {
           compact: true
-        }) : undefined
+        }) : undefined,
+        outdatedBrowser: isOutdatedBrowser(browserInfo)
       };
       this.fireAnalyticsEvent({
         action: ACTION.EDITOR_CRASHED,

package/dist/es2019/create-editor/ReactEditorView.js

@@ -30,7 +30,6 @@ import { EVENT_NAME_DISPATCH_TRANSACTION, EVENT_NAME_STATE_APPLY, EVENT_NAME_UPD
 import { PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD, DEFAULT_SAMPLING_RATE_VALID_TRANSACTIONS } from './consts';
 import { getContextIdentifier } from '../plugins/base/pm-plugins/context-identifier';
 import ReactEditorViewContext from './ReactEditorViewContext';
-import { pluginKey as widthPluginKey } from '../plugins/width';
 import { createInsertNodeAPI } from '../insert-api/api';
 import { createEditorAnalyticsAPI } from '../analytics-api/api';
 import { createEditorSelectionAPI } from '../selection-api/api';
@@ -57,7 +56,7 @@ export function shouldReconfigureState(props, nextProps) {
   }
 
   const mobileProperties = props.appearance === 'mobile' ? ['featureFlags', 'quickInsert'] : [];
-  const properties = ['appearance', 'persistScrollGutter', 'UNSAFE_allowUndoRedoButtons', 'placeholder', ...mobileProperties];
+  const properties = ['appearance', 'persistScrollGutter', 'allowUndoRedoButtons', 'placeholder', ...mobileProperties];
   return properties.reduce((acc, curr) => acc || props[curr] !== nextProps[curr], false);
 }
 export class ReactEditorView extends React.Component {
@@ -737,19 +736,7 @@ export class ReactEditorView extends React.Component {
       getCreateUIAnalyticsEvent: () => createAnalyticsEvent
     });
     const editorSelectionAPI = createEditorSelectionAPI();
-
-    const getEditorContainerWidth = () => {
-      if (!this.view) {
-        return null;
-      }
-
-      const {
-        state
-      } = this.view;
-      return widthPluginKey.getState(state) || null;
-    };
-
-    const builtinPlugins = createPluginList(editorProps, prevEditorProps, createAnalyticsEvent, insertNodeAPI, editorAnalyticsAPI, editorSelectionAPI, getEditorContainerWidth);
+    const builtinPlugins = createPluginList(editorProps, prevEditorProps, createAnalyticsEvent, insertNodeAPI, editorAnalyticsAPI, editorSelectionAPI);
 
     if (editorPlugins && editorPlugins.length > 0) {
       builtinPlugins.push(...editorPlugins);

package/dist/es2019/create-editor/create-plugins-list.js

@@ -1,6 +1,5 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, // tablesPlugin,
-tablesPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin } from '../plugins'; // import { tablesPlugin } from '@atlaskit/editor-plugin-table';
-
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, cardPlugin, gridPlugin, statusPlugin, alignmentPlugin, indentationPlugin, analyticsPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, contextPanelPlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin } from '../plugins';
+import { tablesPlugin } from '@atlaskit/editor-plugin-table';
 import { isFullPage as fullPageCheck } from '../utils/is-full-page';
 import { GUTTER_SIZE_MOBILE_IN_PX } from '../plugins/base/pm-plugins/scroll-gutter';
 import { createFeatureFlagsFromProps } from '../plugins/feature-flags-context/feature-flags-from-props';
@@ -67,7 +66,7 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
     blockType: {
       lastNodeMustBeParagraph: appearance === 'comment' || appearance === 'chromeless',
       allowBlockType: props.allowBlockType,
-      isUndoRedoButtonsEnabled: props.UNSAFE_allowUndoRedoButtons
+      isUndoRedoButtonsEnabled: props.allowUndoRedoButtons
     },
     placeholder: {
       placeholder: props.placeholder,
@@ -75,7 +74,7 @@ export function getDefaultPresetOptionsFromEditorProps(props, createAnalyticsEve
       placeholderBracketHint: props.placeholderBracketHint
     },
     textFormatting: { ...(props.textFormatting || {}),
-      responsiveToolbarMenu: ((_props$textFormatting = props.textFormatting) === null || _props$textFormatting === void 0 ? void 0 : _props$textFormatting.responsiveToolbarMenu) != null ? props.textFormatting.responsiveToolbarMenu : props.UNSAFE_allowUndoRedoButtons
+      responsiveToolbarMenu: ((_props$textFormatting = props.textFormatting) === null || _props$textFormatting === void 0 ? void 0 : _props$textFormatting.responsiveToolbarMenu) != null ? props.textFormatting.responsiveToolbarMenu : props.allowUndoRedoButtons
     },
     annotationProviders: props.annotationProviders,
     submitEditor: props.onSave,
@@ -218,7 +217,6 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
       wasFullWidthEnabled: prevProps && prevProps.appearance === 'full-width',
       editorAnalyticsAPI,
       editorSelectionAPI,
-      getEditorContainerWidth,
       getEditorFeatureFlags
     }]);
   }
@@ -369,7 +367,7 @@ export default function createPluginsList(props, prevProps, createAnalyticsEvent
     preset.add(scrollIntoViewPlugin);
   }
 
-  if (isMobile || props.UNSAFE_allowUndoRedoButtons) {
+  if (isMobile || props.allowUndoRedoButtons) {
     preset.add(historyPlugin);
   }
 

package/dist/es2019/editor.js

@@ -509,7 +509,7 @@ export default class Editor extends React.Component {
               contextPanel: this.props.contextPanel,
               collabEdit: this.props.collabEdit,
               persistScrollGutter: this.props.persistScrollGutter,
-              enableToolbarMinWidth: ((_this$props$featureFl5 = this.props.featureFlags) === null || _this$props$featureFl5 === void 0 ? void 0 : _this$props$featureFl5.toolbarMinWidthOverflow) != null ? !!((_this$props$featureFl6 = this.props.featureFlags) !== null && _this$props$featureFl6 !== void 0 && _this$props$featureFl6.toolbarMinWidthOverflow) : this.props.UNSAFE_allowUndoRedoButtons,
+              enableToolbarMinWidth: ((_this$props$featureFl5 = this.props.featureFlags) === null || _this$props$featureFl5 === void 0 ? void 0 : _this$props$featureFl5.toolbarMinWidthOverflow) != null ? !!((_this$props$featureFl6 = this.props.featureFlags) !== null && _this$props$featureFl6 !== void 0 && _this$props$featureFl6.toolbarMinWidthOverflow) : this.props.allowUndoRedoButtons,
               useStickyToolbar: this.props.useStickyToolbar,
               featureFlags: featureFlags
             }));

package/dist/es2019/extensibility.js

@@ -4,7 +4,7 @@ export { toJSON } from './utils';
 export { default as Extension } from './plugins/extension/ui/Extension';
 export { default as ExtensionNodeWrapper } from './plugins/extension/ui/Extension/ExtensionNodeWrapper';
 export { ExtensionNode } from './plugins/extension/nodeviews/extension';
-export { pluginKey as tablePluginKey } from './plugins/table/pm-plugins/plugin-key';
+export { pluginKey as tablePluginKey } from '@atlaskit/editor-plugin-table/plugin-key';
 export const EmitterEvents = {
   TABLE_DELETED: 'TABLE_DELETED'
 };

package/dist/es2019/index.js

@@ -28,7 +28,7 @@ export { toggleSuperscript, toggleSuperscriptWithAnalytics, toggleSubscript, tog
 export { subscribeToToolbarAndPickerUpdates } from './plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates';
 export { subscribeTypeAheadUpdates } from './plugins/view-update-subscription/subscribe/type-ahead-updates';
 export { insertBlockType, insertBlockTypesWithAnalytics, setBlockType, setBlockTypeWithAnalytics } from './plugins/block-type/commands';
-export { createTable } from './plugins/table/commands';
+export { createTable } from '@atlaskit/editor-plugin-table/commands';
 export { insertTaskDecisionCommand } from './plugins/tasks-and-decisions/commands';
 export { EventDispatcher } from './event-dispatcher';
 export { pluginKey as statusPluginKey } from './plugins/status/plugin';

package/dist/es2019/labs/next/full-page.js

@@ -13,7 +13,7 @@ import ContentStyles from '../../ui/ContentStyles';
 import WidthEmitter from '../../ui/WidthEmitter';
 import { ClickAreaBlock } from '../../ui/Addon';
 import { scrollbarStyles } from '../../ui/styles';
-import { tableFullPageEditorStyles } from '../../plugins/table/ui/common-styles';
+import { tableFullPageEditorStyles } from '@atlaskit/editor-plugin-table/ui/common-styles';
 import AvatarsWithPluginState from '../../plugins/collab-edit/ui';
 import { Editor, EditorContent, useEditorSharedConfig } from './Editor';
 import { Toolbar } from './Toolbar';

package/dist/es2019/labs/next/presets/cxhtml.js

@@ -1,6 +1,7 @@
 // #region Imports
 import React from 'react';
-import { tablesPlugin, panelPlugin, listPlugin, textColorPlugin, breakoutPlugin, jiraIssuePlugin, extensionPlugin, rulePlugin, datePlugin, layoutPlugin, indentationPlugin, cardPlugin, statusPlugin, mediaPlugin, mentionsPlugin, tasksAndDecisionsPlugin, insertBlockPlugin, basePlugin, placeholderPlugin } from '../../../plugins';
+import { tablesPlugin } from '@atlaskit/editor-plugin-table';
+import { panelPlugin, listPlugin, textColorPlugin, breakoutPlugin, jiraIssuePlugin, extensionPlugin, rulePlugin, datePlugin, layoutPlugin, indentationPlugin, cardPlugin, statusPlugin, mediaPlugin, mentionsPlugin, tasksAndDecisionsPlugin, insertBlockPlugin, basePlugin, placeholderPlugin } from '../../../plugins';
 import { PresetProvider } from '../Editor';
 import { useDefaultPreset } from './default'; // #endregion
 

package/dist/es2019/labs/next/presets/mobile.js

@@ -16,7 +16,7 @@ import panelPlugin from '../../../plugins/panel';
 import placeholderPlugin from '../../../plugins/placeholder';
 import rulePlugin from '../../../plugins/rule';
 import statusPlugin from '../../../plugins/status';
-import tablesPlugin from '../../../plugins/table';
+import { tablesPlugin } from '@atlaskit/editor-plugin-table';
 import tasksAndDecisionsPlugin from '../../../plugins/tasks-and-decisions';
 import textColorPlugin from '../../../plugins/text-color';
 import maxContentSizePlugin from '../../../plugins/max-content-size';

package/dist/es2019/nodeviews/getPerformanceOptions.js

@@ -1,47 +1,2 @@
-import { startMeasure, stopMeasure } from '@atlaskit/editor-common/utils';
-import { getParticipantsCount } from '../plugins/collab-edit/get-participants-count';
-import { analyticsPluginKey } from '../plugins/analytics/plugin-key';
-import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../plugins/analytics'; // This was existing logic when converting from ReactNodeView
-// our current sampling for this event is not bound by node.type
-
-export let nodeViewRenderedEventsCounter = 0;
-const DEFAULT_SAMPLING_RATE = 100;
-const DEFAULT_SLOW_THRESHOLD = 7;
-export function getPerformanceOptions(view) {
-  const pluginState = analyticsPluginKey.getState(view.state);
-  const nodeViewTracking = pluginState && pluginState.performanceTracking ? pluginState.performanceTracking.nodeViewTracking || {} : {};
-  const samplingRate = nodeViewTracking.samplingRate || DEFAULT_SAMPLING_RATE;
-  const slowThreshold = nodeViewTracking.slowThreshold || DEFAULT_SLOW_THRESHOLD;
-  return {
-    trackingEnabled: !!nodeViewTracking.enabled,
-    samplingRate,
-    slowThreshold
-  };
-}
-export function startMeasureReactNodeViewRendered({
-  nodeTypeName
-}) {
-  startMeasure(`🦉${nodeTypeName}::ReactNodeView`);
-}
-export function stopMeasureReactNodeViewRendered({
-  nodeTypeName,
-  dispatchAnalyticsEvent,
-  editorState,
-  samplingRate,
-  slowThreshold
-}) {
-  stopMeasure(`🦉${nodeTypeName}::ReactNodeView`, duration => {
-    if (++nodeViewRenderedEventsCounter % samplingRate === 0 && duration > slowThreshold) {
-      dispatchAnalyticsEvent({
-        action: ACTION.REACT_NODEVIEW_RENDERED,
-        actionSubject: ACTION_SUBJECT.EDITOR,
-        eventType: EVENT_TYPE.OPERATIONAL,
-        attributes: {
-          node: nodeTypeName,
-          duration,
-          participants: getParticipantsCount(editorState)
-        }
-      });
-    }
-  });
-}
+import { getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered } from '@atlaskit/editor-common/utils';
+export { getPerformanceOptions, startMeasureReactNodeViewRendered, stopMeasureReactNodeViewRendered };

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

@@ -75,13 +75,13 @@ const calculateToolbarPositionAboveSelection = toolbarTitle => (editorView, next
       left = Math.min(topCoords.left, bottomCoords.left);
     }
     /*
-      short selection above a long paragraph
-       eg. short {<}heading
-      The purpose of this text is to show the selection range{>}.
-       The horizontal positioning should center around "heading",
-      not where it ends at "range".
-       Note: if it was "head<b>ing</b>" then it would only center
-      around "head". Undesireable but matches the current renderer.
+    short selection above a long paragraph
+     eg. short {<}heading
+    The purpose of this text is to show the selection range{>}.
+     The horizontal positioning should center around "heading",
+    not where it ends at "range".
+     Note: if it was "head<b>ing</b>" then it would only center
+    around "head". Undesireable but matches the current renderer.
     */
 
 

package/dist/es2019/plugins/block-type/commands/block-type.js

@@ -1,4 +1,3 @@
-import { Selection } from 'prosemirror-state';
 import { findWrapping } from 'prosemirror-transform';
 import { safeInsert } from 'prosemirror-utils';
 import { CODE_BLOCK, BLOCK_QUOTE, PANEL, HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
@@ -8,6 +7,7 @@ import { withAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE }
 import { filterChildrenBetween } from '../../../utils';
 import { PanelType } from '@atlaskit/adf-schema';
 import { CellSelection } from '@atlaskit/editor-tables';
+import { transformToCodeBlockAction } from './transform-to-code-block';
 export function setBlockType(name) {
   return (state, dispatch) => {
     const {
@@ -223,7 +223,7 @@ export const insertBlockTypesWithAnalytics = (name, inputMethod) => {
 };
 /**
  * Function will add wrapping node.
- * 1. If currently selected blocks can be wrapped in the warpper type it will wrap them.
+ * 1. If currently selected blocks can be wrapped in the wrapper type it will wrap them.
  * 2. If current block can not be wrapped inside wrapping block it will create a new block below selection,
  *  and set selection on it.
  */
@@ -271,25 +271,31 @@ function insertCodeBlock() {
   return function (state, dispatch) {
     var _state$selection$$fro;
 
-    const {
+    let {
       tr
     } = state;
     const {
-      $to,
-      $from
+      from
     } = state.selection;
     const {
       codeBlock
     } = state.schema.nodes;
-    const grandParentType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
-    const parentType = state.selection.$from.parent.type;
-    /** We always want to append a block type unless we're inserting into a paragraph
-     * AND it's a valid child of the grandparent node
+    const grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
+    const parentNodeType = state.selection.$from.parent.type;
+    /** We always want to append a codeBlock unless we're inserting into a paragraph
+     * AND it's a valid child of the grandparent node.
+     * Insert the current selection as codeBlock content unless it contains nodes other
+     * than paragraphs and inline.
      */
 
-    if (shouldSplitSelectedNodeOnNodeInsertion(parentType, grandParentType, codeBlock.createAndFill())) {
-      tr.replaceRangeWith($from.pos, $to.pos, codeBlock.createAndFill());
-      tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to)));
+    const canInsertCodeBlock = shouldSplitSelectedNodeOnNodeInsertion({
+      parentNodeType,
+      grandParentNodeType,
+      content: codeBlock.createAndFill()
+    }) && contentAllowedInCodeBlock(state);
+
+    if (canInsertCodeBlock) {
+      tr = transformToCodeBlockAction(state, from);
     } else {
       safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
     }
@@ -301,6 +307,28 @@ function insertCodeBlock() {
     return true;
   };
 }
+/**
+ * Check if the current selection contains any nodes that are not permitted
+ * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
+ * as we extract their text content.
+ */
+
+
+function contentAllowedInCodeBlock(state) {
+  const {
+    $from,
+    $to
+  } = state.selection;
+  let isAllowedChild = true;
+  state.doc.nodesBetween($from.pos, $to.pos, node => {
+    if (!isAllowedChild) {
+      return false;
+    }
+
+    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.isText;
+  });
+  return isAllowedChild;
+}
 
 export const cleanUpAtTheStartOfDocument = (state, dispatch) => {
   const {

package/dist/es2019/plugins/block-type/commands/transform-to-code-block.js

@@ -1,34 +1,59 @@
 import { TextSelection } from 'prosemirror-state';
 import { mapSlice } from '../../../utils/slice';
-export function transformToCodeBlockAction(state, start, end, attrs) {
-  if (!state.selection.empty) {
-    // Don't do anything, if there is something selected
-    return state.tr;
-  }
-
+import { Fragment } from 'prosemirror-model';
+import { timestampToString } from '@atlaskit/editor-common/utils';
+export function transformToCodeBlockAction(state, start, attrs) {
   const startOfCodeBlockText = state.selection.$from;
-  const endLinePosition = startOfCodeBlockText.end();
-  const startLinePosition = startOfCodeBlockText.start();
-  const parentStartPosition = startOfCodeBlockText.before();
-  const codeBlockSlice = mapSlice(state.doc.slice(startOfCodeBlockText.pos, endLinePosition), node => {
+  const endPosition = state.selection.empty ? startOfCodeBlockText.end() : state.selection.$to.pos;
+  const startLinePosition = startOfCodeBlockText.start(); //when cmd+A is used to select the content. start position should be 0.
+
+  const parentStartPosition = startOfCodeBlockText.depth === 0 ? 0 : startOfCodeBlockText.before();
+  const contentSlice = state.doc.slice(startOfCodeBlockText.pos, endPosition);
+  const codeBlockSlice = mapSlice(contentSlice, (node, parent, index) => {
     if (node.type === state.schema.nodes.hardBreak) {
       return state.schema.text('\n');
     }
 
     if (node.isText) {
       return node.mark([]);
-    } else if (node.isInline) {
+    }
+
+    if (node.isInline) {
+      // Convert dates
+      if (node.attrs.timestamp) {
+        return state.schema.text(timestampToString(node.attrs.timestamp, null));
+      } // Convert links
+
+
+      if (node.attrs.url) {
+        return state.schema.text(node.attrs.url);
+      }
+
       return node.attrs.text ? state.schema.text(node.attrs.text) : null;
-    } else {
-      return node.content.childCount ? node.content : null;
+    } // if the current node is the last child of the Slice exit early to prevent
+    // adding additional line breaks
+
+
+    if (contentSlice.content.childCount - 1 === index) {
+      return node.content;
+    } //useful to decide whether to append line breaks when the content has list items.
+
+
+    const isParentLastChild = parent && contentSlice.content.childCount - 1 === index; // add line breaks at the end of each paragraph to mimic layout of selected content
+    // do not add line breaks when the 'paragraph' parent is last child.
+
+    if (node.content.childCount && node.type === state.schema.nodes.paragraph && !isParentLastChild) {
+      return node.content.append(Fragment.from(state.schema.text('\n\n')));
     }
+
+    return node.content.childCount ? node.content : null;
   });
   const tr = state.tr; // Replace current block node
 
   const startMapped = startLinePosition === start ? parentStartPosition : start;
   const codeBlock = state.schema.nodes.codeBlock;
   const codeBlockNode = codeBlock.createChecked(attrs, codeBlockSlice.content);
-  tr.replaceWith(startMapped, Math.min(endLinePosition, tr.doc.content.size), codeBlockNode); // Reposition cursor when inserting into layouts or table headers
+  tr.replaceWith(startMapped, Math.min(endPosition, tr.doc.content.size), codeBlockNode); // Reposition cursor when inserting into layouts or table headers
 
   const mapped = tr.doc.resolve(tr.mapping.map(startMapped) + 1);
   const selection = TextSelection.findFrom(mapped, 1, true);

package/dist/es2019/plugins/block-type/pm-plugins/input-rule.js

@@ -101,7 +101,14 @@ function getCodeBlockRules(schema) {
     },
     eventType: EVENT_TYPE.TRACK
   });
+
+  const validMatchLength = match => match.length > 0 && match[0].length === 3;
+
   const threeTildeRule = createRule(/(?!\s)(`{3,})$/, (state, match, start, end) => {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+
     const attributes = {};
 
     if (match[4]) {
@@ -109,7 +116,7 @@ function getCodeBlockRules(schema) {
     }
 
     if (isConvertableToCodeBlock(state)) {
-      return transformToCodeBlockAction(state, start, end, attributes);
+      return transformToCodeBlockAction(state, start, attributes);
     }
 
     const tr = state.tr;
@@ -119,6 +126,10 @@ function getCodeBlockRules(schema) {
     return tr;
   });
   const leftNodeReplacementThreeTildeRule = createRule(new RegExp(`((${leafNodeReplacementCharacter}\`{3,})|^\\s(\`{3,}))(\\S*)$`), (state, match, start, end) => {
+    if (!validMatchLength(match)) {
+      return null;
+    }
+
     const attributes = {};
 
     if (match[4]) {
@@ -148,8 +159,7 @@ export function inputRulePlugin(schema, featureFlags) {
 
   if (rules.length !== 0) {
     return createPlugin('block-type', rules, {
-      isBlockNodeRule: true,
-      useUnpredictableInputRule: featureFlags.useUnpredictableInputRule
+      isBlockNodeRule: true
     });
   }
 

package/dist/es2019/plugins/block-type/pm-plugins/keymap.js

@@ -1,21 +1,22 @@
-import { chainCommands } from 'prosemirror-commands';
-import { undoInputRule } from 'prosemirror-inputrules';
 import { redo, undo } from 'prosemirror-history';
 import * as keymaps from '../../../keymaps';
 import * as commands from '../../../commands';
 import * as blockTypes from '../types';
 import { keymap } from '../../../utils/keymap';
-import { cleanUpAtTheStartOfDocument, insertBlockTypesWithAnalytics } from '../../block-type/commands';
+import { cleanUpAtTheStartOfDocument, insertBlockTypesWithAnalytics } from '../commands';
+import { deleteEmptyParagraphAndMoveBlockUp } from '../../../utils/commands';
 import { INPUT_METHOD } from '../../analytics';
-const tryUndoInputRuleElseUndoHistory = chainCommands(undoInputRule, undo);
+import { isNodeAWrappingBlockNode } from '../utils';
 export default function keymapPlugin(schema, featureFlags) {
   const list = {};
   keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);
   keymaps.bindKeymapWithCommand(keymaps.moveUp.common, commands.createNewParagraphAbove, list);
   keymaps.bindKeymapWithCommand(keymaps.moveDown.common, commands.createNewParagraphBelow, list);
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), redo, list);
-  keymaps.bindKeymapWithCommand(keymaps.undo.common, featureFlags.useUnpredictableInputRule ? tryUndoInputRuleElseUndoHistory : undo, list);
+  keymaps.bindKeymapWithCommand(keymaps.undo.common, undo, list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, cleanUpAtTheStartOfDocument, list);
+  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), list);
+  keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), list);
 
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
     keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), insertBlockTypesWithAnalytics(blockTypes.BLOCK_QUOTE.name, INPUT_METHOD.KEYBOARD), list);

package/dist/es2019/plugins/block-type/utils.js

@@ -0,0 +1,8 @@
+import { WRAPPER_BLOCK_TYPES } from './types';
+export const isNodeAWrappingBlockNode = node => {
+  if (!node) {
+    return false;
+  }
+
+  return WRAPPER_BLOCK_TYPES.some(blockNode => blockNode.name === node.type.name);
+};