@atlaskit/editor-core 162.0.1 → 163.0.0

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/index.js

@@ -1,11 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ToolbarButton from '../../../../ui/ToolbarButton';
 import Dropdown from '../../../../ui/Dropdown';
 import Alignment from '../../../../ui/Alignment';
-import { ExpandIconWrapper, Separator, TriggerWrapper, Wrapper } from './styles';
+import { expandIconWrapper, separator, triggerWrapper, wrapper } from './styles';
 import { IconMap } from './icon-map';
 import { messages } from './messages';
 export class AlignmentToolbar extends React.Component {
@@ -58,7 +61,9 @@ export class AlignmentToolbar extends React.Component {
       intl
     } = this.props;
     const title = intl.formatMessage(messages.alignment);
-    return /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(Dropdown, {
+    return jsx("span", {
+      css: wrapper
+    }, jsx(Dropdown, {
       mountTo: popupsMountPoint,
       boundariesElement: popupsBoundariesElement,
       scrollableElement: popupsScrollableElement,
@@ -67,7 +72,7 @@ export class AlignmentToolbar extends React.Component {
       handleEscapeKeydown: this.hide,
       fitWidth: 112,
       fitHeight: 80,
-      trigger: /*#__PURE__*/React.createElement(ToolbarButton, {
+      trigger: jsx(ToolbarButton, {
         spacing: isReducedSpacing ? 'none' : 'default',
         disabled: disabled,
         selected: isOpen,
@@ -77,16 +82,22 @@ export class AlignmentToolbar extends React.Component {
         "aria-expanded": isOpen,
         "aria-haspopup": true,
         onClick: this.toggleOpen,
-        iconBefore: /*#__PURE__*/React.createElement(TriggerWrapper, null, /*#__PURE__*/React.createElement(IconMap, {
+        iconBefore: jsx("div", {
+          css: triggerWrapper
+        }, jsx(IconMap, {
           alignment: pluginState.align
-        }), /*#__PURE__*/React.createElement(ExpandIconWrapper, null, /*#__PURE__*/React.createElement(ExpandIcon, {
+        }), jsx("span", {
+          css: expandIconWrapper
+        }, jsx(ExpandIcon, {
           label: ""
         })))
       })
-    }, /*#__PURE__*/React.createElement(Alignment, {
+    }, jsx(Alignment, {
       onClick: align => this.changeAlignment(align),
       selectedAlignment: pluginState.align
-    })), /*#__PURE__*/React.createElement(Separator, null));
+    })), jsx("span", {
+      css: separator
+    }));
   }
 
 }

package/dist/es2019/plugins/alignment/ui/ToolbarAlignment/styles.js

@@ -1,22 +1,22 @@
-import styled from 'styled-components';
+import { css } from '@emotion/react';
 import { N30 } from '@atlaskit/theme/colors';
-export const TriggerWrapper = styled.div`
+export const triggerWrapper = css`
   display: flex;
 `;
-export const Separator = styled.span`
+export const separator = css`
   background: ${N30};
   width: 1px;
   height: 24px;
   display: inline-block;
   margin: 0 8px;
 `;
-export const Wrapper = styled.span`
+export const wrapper = css`
   display: flex;
   align-items: center;
   div {
     display: flex;
   }
 `;
-export const ExpandIconWrapper = styled.span`
+export const expandIconWrapper = css`
   margin-left: -8px;
 `;

package/dist/es2019/plugins/analytics/types/enums.js

@@ -43,6 +43,7 @@ export let ACTION;
   ACTION["RE_RENDERED"] = "reRendered";
   ACTION["ENTERED"] = "entered";
   ACTION["ERRORED"] = "errored";
+  ACTION["EXPOSED"] = "exposed";
   ACTION["FAILED_TO_UNMOUNT"] = "failedToUnmount";
   ACTION["FIND_NEXT_PERFORMED"] = "findNextPerformed";
   ACTION["FIND_PERFORMED"] = "findPerformed";
@@ -158,6 +159,7 @@ export let ACTION_SUBJECT;
   ACTION_SUBJECT["EMBEDS"] = "embeds";
   ACTION_SUBJECT["EXPAND"] = "expand";
   ACTION_SUBJECT["EXTENSION"] = "extension";
+  ACTION_SUBJECT["FEATURE"] = "feature";
   ACTION_SUBJECT["FEEDBACK_DIALOG"] = "feedbackDialog";
   ACTION_SUBJECT["FIND_REPLACE_DIALOG"] = "findReplaceDialog";
   ACTION_SUBJECT["FLOATING_CONTEXTUAL_BUTTON"] = "floatingContextualButton";

package/dist/es2019/plugins/avatar-group/ui/AvatarGroupPluginWrapper.js

@@ -1,18 +1,23 @@
-import React, { useEffect } from 'react';
+/** @jsx jsx */
+import { useEffect } from 'react';
+import { css, jsx } from '@emotion/react';
 import AvatarsWithPluginState from '../../collab-edit/ui/avatars-with-plugin-state';
-import styled from 'styled-components';
 import { useIntl } from 'react-intl-next';
 import { avatarGroupMessages } from '../messages';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '../../analytics';
-const ToolbarButtonWrapper = styled.div`
+const toolbarButtonWrapper = css`
   display: flex;
-  flex-grow: ${props => props.takeFullWidth ? 1 : 0};
   justify-content: flex-end;
+  flex-grow: 0;
   align-items: center;
   & > div {
     margin-right: 0;
   }
 `;
+const toolbarButtonWrapperFullWidth = css`
+  ${toolbarButtonWrapper}
+  flex-grow: 1;
+`;
 
 const AvatarGroupPluginWrapper = props => {
   const {
@@ -31,11 +36,11 @@ const AvatarGroupPluginWrapper = props => {
       eventType: EVENT_TYPE.UI
     });
   }, [dispatchAnalyticsEvent]);
-  return /*#__PURE__*/React.createElement(ToolbarButtonWrapper, {
+  return jsx("div", {
     "aria-label": intl.formatMessage(avatarGroupMessages.editors),
     "data-testid": 'avatar-group-in-plugin',
-    takeFullWidth: props.takeFullWidth
-  }, /*#__PURE__*/React.createElement(AvatarsWithPluginState, {
+    css: props.takeFullWidth ? toolbarButtonWrapperFullWidth : toolbarButtonWrapper
+  }, jsx(AvatarsWithPluginState, {
     editorView: props.editorView,
     eventDispatcher: props.eventDispatcher,
     inviteToEditComponent: props.collabEdit && props.collabEdit.inviteToEditComponent,

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

@@ -27,10 +27,29 @@ const basePlugin = options => ({
       plugin: ({
         dispatchAnalyticsEvent
       }) => filterStepsPlugin(dispatchAnalyticsEvent)
-    }, {
-      name: 'inlineCursorTargetPlugin',
-      plugin: () => options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined
-    }, {
+    }]; // In Chrome, when the selection is placed between adjacent nodes which are not contenteditatble
+    // the cursor appears at the right most point of the parent container.
+    // In Firefox, when the selection is placed between adjacent nodes which are not contenteditatble
+    // no cursor is presented to users.
+    // In Safari, when the selection is placed between adjacent nodes which are not contenteditatble
+    // the cursor appears inside the adjacent nodes.
+    // This plugin workarounds the issues with chrome and firefox by inserting decorations between
+    // inline nodes which are set as contenteditable, and have a zero width space.
+    // At time of development, using this workaround in Safari caused additional issues;
+    // - visual artifacts when moving across inline nodes (ie. using the arrow key to traverse a
+    //   series of inline nodes)
+    // - blocking the right arrow key when at the start of a line from moving to the end of the
+    //   previous line.
+    // As such we only apply the workaround for firefox and chrome.
+
+    if (browser.chrome || browser.gecko) {
+      plugins.push({
+        name: 'inlineCursorTargetPlugin',
+        plugin: () => options && options.allowInlineCursorTarget ? inlineCursorTargetPlugin() : undefined
+      });
+    }
+
+    plugins.push({
       name: 'focusHandlerPlugin',
       plugin: ({
         dispatch
@@ -75,7 +94,7 @@ const basePlugin = options => ({
         dispatch,
         providerFactory
       }) => betterTypeHistoryPlugin()
-    }];
+    });
 
     if (options && options.allowScrollGutter) {
       plugins.push({

package/dist/es2019/plugins/base/pm-plugins/inline-cursor-target.js

@@ -2,65 +2,21 @@ import { DecorationSet, Decoration } from 'prosemirror-view';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from 'prosemirror-state';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
+import { isTextSelection } from '../../../utils';
 export const inlineCursorTargetStateKey = new PluginKey('inlineCursorTargetPlugin');
-export const SPECIAL_NODES = ['mention', 'emoji'];
-export const isSpecial = node => {
-  return node && SPECIAL_NODES.indexOf(node.type.name) !== -1;
-};
-export const findSpecialNodeAfter = ($pos, tr) => {
-  if (isSpecial($pos.nodeAfter)) {
-    return $pos.pos + 1;
-  }
-
-  const {
-    parentOffset,
-    parent
-  } = $pos;
-  const docSize = tr.doc.nodeSize - 2;
-
-  if (parentOffset === parent.content.size && $pos.pos + 1 < docSize - 2) {
-    const {
-      nodeAfter
-    } = tr.doc.resolve($pos.pos + 1);
-
-    if (nodeAfter && isSpecial(nodeAfter.firstChild)) {
-      return $pos.pos + 2;
-    }
-  }
-
-  return;
-};
-export const findSpecialNodeBefore = ($pos, tr) => {
-  if (isSpecial($pos.nodeBefore)) {
-    return $pos.pos - 1;
-  }
-
-  if ($pos.pos === 0) {
-    return;
-  }
-
-  const {
-    parentOffset
-  } = $pos;
-
-  if (parentOffset === 0) {
-    const {
-      nodeBefore
-    } = tr.doc.resolve($pos.pos - 1);
-
-    if (nodeBefore && isSpecial(nodeBefore.firstChild)) {
-      return $pos.pos - 2;
-    }
-  }
-
-  return;
+export const isInlineNodeView = node => {
+  return node && node.type.isInline && !node.type.isText;
 };
+export const findInlineNodeViewAfter = $pos => isInlineNodeView($pos.nodeAfter);
+export const findInlineNodeViewBefore = $pos => isInlineNodeView($pos.nodeBefore) || // This prevents the cursor from disappearing when at the beginning
+// of a paragraph and next to an inline node view.
+$pos.parentOffset === 0 && isInlineNodeView($pos.nodeAfter);
 export default (() => {
   return new SafePlugin({
     key: inlineCursorTargetStateKey,
     state: {
       init: () => ({
-        positions: []
+        cursorTarget: undefined
       }),
 
       apply(tr) {
@@ -68,22 +24,45 @@ export default (() => {
           selection
         } = tr;
         const {
-          $from
+          $from,
+          $to
         } = selection;
-        const positions = [];
-        const posAfter = findSpecialNodeAfter($from, tr);
-        const posBefore = findSpecialNodeBefore($from, tr);
-
-        if (posAfter !== undefined) {
-          positions.push(posAfter);
-        }
 
-        if (posBefore !== undefined) {
-          positions.push(posBefore);
+        if (selection && isTextSelection(selection)) {
+          const hasInlineNodeViewAfter = findInlineNodeViewAfter($from);
+          const hasInlineNodeViewBefore = findInlineNodeViewBefore($from); // Create editable widgets either side of the cursor to allow
+          // text input. This prevents issues with the cursor disappearing
+          // or apperaing in the wrong place when positioned between
+          // non contenteditable nodes.
+          // We check beforeInput events below to prevent content
+          // being added to the decorations.
+
+          if (hasInlineNodeViewAfter && hasInlineNodeViewBefore) {
+            const createWidget = side => {
+              const node = document.createElement('span');
+              node.contentEditable = 'true';
+              node.appendChild(document.createTextNode(ZERO_WIDTH_SPACE));
+              return Decoration.widget(selection.from, node, {
+                raw: true,
+                side: side === 'left' ? -1 : 1,
+                key: 'inlineCursor'
+              });
+            };
+
+            return {
+              cursorTarget: {
+                decorations: [createWidget('left'), createWidget('right')],
+                positions: {
+                  from: $from.pos,
+                  to: $to.pos
+                }
+              }
+            };
+          }
         }
 
         return {
-          positions
+          cursorTarget: undefined
         };
       }
 
@@ -94,25 +73,104 @@ export default (() => {
           doc
         } = state;
         const {
-          positions
+          cursorTarget
         } = inlineCursorTargetStateKey.getState(state);
 
-        if (positions && positions.length) {
-          const decorations = positions.map(position => {
-            const node = document.createElement('span');
-            node.appendChild(document.createTextNode(ZERO_WIDTH_SPACE));
-            return Decoration.widget(position, node, {
-              raw: true,
-              side: -1,
-              key: 'inlineCursor'
-            });
-          });
-          return DecorationSet.create(doc, decorations);
+        if (cursorTargetHasValidDecorations(cursorTarget)) {
+          return DecorationSet.create(doc, cursorTarget.decorations);
         }
 
         return null;
-      }
+      },
+
+      handleDOMEvents: {
+        // Check the DOM to see if there are inline cursor targets
+        // after a composition event ends. If so, manually insert the
+        // event data in order to prevent contents ending up inside
+        // of the cursor target decorations.
+        compositionend: (view, incorrectlyTypedEvent) => {
+          // This is typed by the prosemirror definitions as Event,
+          // this type is incorrect, and it is actually an InputEvent
+          const event = incorrectlyTypedEvent;
+          const {
+            state
+          } = view;
+          const {
+            cursorTarget
+          } = inlineCursorTargetStateKey.getState(state);
+
+          if (cursorTarget !== undefined) {
+            handleTextInputInsideCursorTargetDecoration({
+              event,
+              cursorTarget,
+              view
+            });
+            return true;
+          }
+
+          return false;
+        },
+        // Check the DOM to see if there are inline cursor targets
+        // before any input event. If so, manually insert the
+        // event data in order to prevent contents ending up inside
+        // of the cursor target decorations.
+        beforeinput: (view, incorrectlyTypedEvent) => {
+          // This is typed by the prosemirror definitions as Event,
+          // this type is incorrect, and it is actually an InputEvent
+          const event = incorrectlyTypedEvent;
+          const {
+            state
+          } = view;
+          const {
+            cursorTarget
+          } = inlineCursorTargetStateKey.getState(state);
+
+          if (!event.isComposing && cursorTarget !== undefined) {
+            handleTextInputInsideCursorTargetDecoration({
+              event,
+              cursorTarget,
+              view
+            });
+            return true;
+          }
 
+          return false;
+        }
+      }
     }
   });
-});
+});
+
+function cursorTargetHasValidDecorations(cursorTarget) {
+  if (!cursorTarget || // Decorations can end up as null when the decorations prop is
+  // called after the decorations have been removed from the dom.
+  // https://github.com/ProseMirror/prosemirror-view/blob/8f0d313a6389b86a335274fba36534ba1cb21f12/src/decoration.js#L30
+  cursorTarget.decorations.includes(null)) {
+    return false;
+  }
+
+  return true;
+}
+
+function handleTextInputInsideCursorTargetDecoration({
+  event,
+  view,
+  cursorTarget
+}) {
+  event.stopPropagation();
+  event.preventDefault();
+  const content = event.data || '';
+  const tr = view.state.tr; // ensure any custom handleTextInput handlers are called for the input event
+  // ie. type ahead, emoji shortcuts.
+
+  const potentiallyHandleByHandleTextInput = view.someProp('handleTextInput', f => f(view, cursorTarget.positions.from, cursorTarget.positions.to, content));
+
+  if (potentiallyHandleByHandleTextInput) {
+    // if a handleTextInput handler has handled the event, we don't want to
+    // manually update the document.
+    return;
+  }
+
+  tr.insertText(content);
+  view.dispatch(tr);
+}

package/dist/es2019/plugins/before-primaryToolbar/ui/BeforePrimaryToolbarWrapper.js

@@ -1,12 +1,13 @@
-import React from 'react';
-import styled from 'styled-components';
-export const BeforePrimaryToolbarPluginWrapper = styled.div`
+/** @jsx jsx */
+import { css, jsx } from '@emotion/react';
+const beforePrimaryToolbarPluginWrapper = css`
   display: flex;
   margin-right: 8px;
   flex-grow: 1;
   justify-content: flex-end;
   align-items: center;
 `;
-export const BeforePrimaryToolbarWrapper = props => /*#__PURE__*/React.createElement(BeforePrimaryToolbarPluginWrapper, {
+export const BeforePrimaryToolbarWrapper = props => jsx("div", {
+  css: beforePrimaryToolbarPluginWrapper,
   "data-testid": 'before-primary-toolbar-components-plugin'
 }, props.beforePrimaryToolbarComponents);

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

@@ -1,7 +1,9 @@
 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';
 import { removeBlockMarks } from '../../../utils/mark';
+import { shouldSplitSelectedNodeOnNodeInsertion } from '../../../utils/insert';
 import { withAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../../analytics';
 import { filterChildrenBetween } from '../../../utils';
 import { PanelType } from '@atlaskit/adf-schema';
@@ -226,9 +228,6 @@ function wrapSelectionIn(type) {
       $from,
       $to
     } = state.selection;
-    const {
-      paragraph
-    } = state.schema.nodes;
     const {
       alignment,
       indentation
@@ -244,8 +243,7 @@ function wrapSelectionIn(type) {
       tr.wrap(range, wrapping).scrollIntoView();
     } else {
       /** We always want to append a block type */
-      tr.replaceRangeWith($to.pos + 1, $to.pos + 1, type.createAndFill({}, paragraph.create()));
-      tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to + 1)));
+      safeInsert(type.createAndFill())(tr).scrollIntoView();
     }
 
     if (dispatch) {
@@ -262,21 +260,30 @@ function wrapSelectionIn(type) {
 
 function insertCodeBlock() {
   return function (state, dispatch) {
+    var _state$selection$$fro;
+
     const {
       tr
     } = state;
     const {
-      $to
+      $to,
+      $from
     } = state.selection;
     const {
       codeBlock
     } = state.schema.nodes;
-    const getNextNode = state.doc.nodeAt($to.pos + 1);
-    const addPos = getNextNode && getNextNode.isText ? 0 : 1;
-    /** We always want to append a block type */
+    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
+     */
 
-    tr.replaceRangeWith($to.pos + addPos, $to.pos + addPos, codeBlock.createAndFill());
-    tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to + addPos)));
+    if (shouldSplitSelectedNodeOnNodeInsertion(parentType, grandParentType, codeBlock.createAndFill())) {
+      tr.replaceRangeWith($from.pos, $to.pos, codeBlock.createAndFill());
+      tr.setSelection(Selection.near(tr.doc.resolve(state.selection.to)));
+    } else {
+      safeInsert(codeBlock.createAndFill())(tr).scrollIntoView();
+    }
 
     if (dispatch) {
       dispatch(tr);

package/dist/es2019/plugins/breakout/ui/LayoutButton.js

@@ -1,5 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+/** @jsx jsx */
 import React from 'react';
+import { css, jsx } from '@emotion/react';
 import * as colors from '@atlaskit/theme/colors';
 import { injectIntl } from 'react-intl-next';
 import { findParentDomRefOfType, findDomRefAtPos } from 'prosemirror-utils';
@@ -7,7 +10,6 @@ import { Popup } from '@atlaskit/editor-common/ui';
 import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
 import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import ToolbarButton from '../../../ui/ToolbarButton';
-import styled from 'styled-components';
 import { getBreakoutMode } from '../utils/get-breakout-mode';
 import { setBreakoutMode } from '../commands/set-breakout-mode';
 import { removeBreakout } from '../commands/remove-breakout';
@@ -22,7 +24,7 @@ const {
   N300,
   N20A
 } = colors;
-const Wrapper = styled.div`
+const toolbarButtonWrapper = css`
   && button {
     background: ${N20A};
     color: ${N300};
@@ -123,7 +125,7 @@ class LayoutButton extends React.Component {
       element = closestEl.firstChild;
     }
 
-    return /*#__PURE__*/React.createElement(Popup, {
+    return jsx(Popup, {
       ariaLabel: title,
       target: element,
       offset: [5, 0],
@@ -134,13 +136,15 @@ class LayoutButton extends React.Component {
       scrollableElement: scrollableElement,
       stick: true,
       forcePlacement: true
-    }, /*#__PURE__*/React.createElement(Wrapper, null, /*#__PURE__*/React.createElement(ToolbarButton, {
+    }, jsx("div", {
+      css: toolbarButtonWrapper
+    }, jsx(ToolbarButton, {
       title: title,
       testId: titleMessage.id,
       onClick: this.handleClick(nextBreakoutMode),
-      iconBefore: breakoutMode === BREAKOUT_MODE.FULL_WIDTH ? /*#__PURE__*/React.createElement(CollapseIcon, {
+      iconBefore: breakoutMode === BREAKOUT_MODE.FULL_WIDTH ? jsx(CollapseIcon, {
         label: title
-      }) : /*#__PURE__*/React.createElement(ExpandIcon, {
+      }) : jsx(ExpandIcon, {
         label: title
       })
     })));

package/dist/es2019/plugins/card/nodeviews/genericCard.js

@@ -4,11 +4,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { titleUrlPairFromNode } from '../utils';
-import { changeSelectedCardToLink } from '../pm-plugins/doc';
+import { changeSelectedCardToLinkFallback } from '../pm-plugins/doc';
 export function Card(SmartCardComponent, UnsupportedComponent) {
-  var _class, _temp;
+  var _class;
 
-  return _temp = _class = class extends React.Component {
+  return _class = class extends React.Component {
     constructor(...args) {
       super(...args);
 
@@ -69,7 +69,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           return;
         }
 
-        changeSelectedCardToLink(undefined, url, true, node, getPos())(view.state, view.dispatch);
+        changeSelectedCardToLinkFallback(undefined, url, true, node, getPos())(view.state, view.dispatch);
         return null;
       } else {
         // Otherwise, render a blue link as fallback (above in render()).
@@ -81,5 +81,5 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
 
   }, _defineProperty(_class, "contextTypes", {
     contextAdapter: PropTypes.object
-  }), _temp;
+  }), _class;
 }