@atlaskit/editor-core 150.0.2 → 151.1.1

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

@@ -1,4 +1,3 @@
-import { defineMessages } from 'react-intl';
 import SuccessIcon from '@atlaskit/icon/glyph/editor/success';
 import InfoIcon from '@atlaskit/icon/glyph/editor/info';
 import NoteIcon from '@atlaskit/icon/glyph/editor/note';
@@ -16,44 +15,16 @@ import { findDomRefAtPos } from 'prosemirror-utils';
 import { DEFAULT_BORDER_COLOR } from '../../ui/ColorPalette/Palettes';
 import { PanelType } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID, withAnalytics } from '../analytics';
-export const messages = defineMessages({
-  info: {
-    id: 'fabric.editor.info',
-    defaultMessage: 'Info',
-    description: 'Panels provide a way to highlight text. The info panel has a blue background.'
-  },
-  note: {
-    id: 'fabric.editor.note',
-    defaultMessage: 'Note',
-    description: 'Panels provide a way to highlight text. The note panel has a purple background.'
-  },
-  success: {
-    id: 'fabric.editor.success',
-    defaultMessage: 'Success',
-    description: 'Panels provide a way to highlight text. The success panel has a green background.'
-  },
-  warning: {
-    id: 'fabric.editor.warning',
-    defaultMessage: 'Warning',
-    description: 'Panels provide a way to highlight text. The warning panel has a yellow background.'
-  },
-  error: {
-    id: 'fabric.editor.error',
-    defaultMessage: 'Error',
-    description: 'Panels provide a way to highlight text. The error panel has a red background.'
-  },
-  emoji: {
-    id: 'fabric.editor.panel.emoji',
-    defaultMessage: 'Add emoji',
-    description: 'Select the panel icon'
-  },
-  backgroundColor: {
-    id: 'fabric.editor.panel.backgroundColor',
-    defaultMessage: 'Background color',
-    description: 'Select the panel background color.'
-  }
-});
-export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, providerFactory, activePanelType, activePanelColor, activePanelIcon) => {
+import { messages } from './message';
+export const panelIconMap = {
+  [PanelType.INFO]: ':info:',
+  [PanelType.NOTE]: ':note:',
+  [PanelType.WARNING]: ':warning:',
+  [PanelType.ERROR]: ':error:',
+  [PanelType.SUCCESS]: ':success:',
+  [PanelType.TIP]: ':tip:'
+};
+export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabled, isCustomPanelEditable, providerFactory, activePanelType, activePanelColor, activePanelIcon) => {
   const items = [{
     id: 'editor.panel.info',
     type: 'button',
@@ -100,10 +71,16 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
       }
 
       let previousColor = panelNode.node.attrs.panelColor || getPanelTypeBackground(panelNode.node.attrs.panelType);
+      const emojiInfo = panelNode.node.attrs.panelType;
+      const panelInfo = panelIconMap[emojiInfo];
+      const previousEmoji = panelInfo ? {
+        emoji: panelInfo
+      } : {};
 
       if (previousColor === color) {
         changePanelType(PanelType.CUSTOM, {
-          color
+          color,
+          ...previousEmoji
         }, isCustomPanelEnabled)(state, dispatch);
         return false;
       }
@@ -119,7 +96,8 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
         eventType: EVENT_TYPE.TRACK
       };
       withAnalytics(payload)(changePanelType(PanelType.CUSTOM, {
-        color
+        color,
+        ...previousEmoji
       }, isCustomPanelEnabled))(state, dispatch);
       return false;
     };
@@ -188,35 +166,38 @@ export const getToolbarItems = (formatMessage, panelNodeType, isCustomPanelEnabl
       value: panelColor,
       border: DEFAULT_BORDER_COLOR
     };
-    const colorPicker = {
-      id: 'editor.panel.colorPicker',
-      title: formatMessage(messages.backgroundColor),
-      type: 'select',
-      selectType: 'color',
-      defaultValue: defaultPalette,
-      options: panelBackgroundPalette,
-      onChange: option => changeColor(option.value)
-    };
-    const emojiPicker = {
-      id: 'editor.panel.emojiPicker',
-      title: formatMessage(messages.emoji),
-      type: 'select',
-      selectType: 'emoji',
-      options: [],
-      selected: activePanelType === PanelType.CUSTOM && !!activePanelIcon,
-      onChange: emojiShortName => changeEmoji(emojiShortName)
-    };
-    const removeEmojiButton = {
-      id: 'editor.panel.removeEmoji',
-      type: 'button',
-      icon: RemoveEmojiIcon,
-      onClick: removeEmoji(),
-      title: formatMessage(commonMessages.removeEmoji),
-      disabled: activePanelIcon ? false : true
-    };
-    items.push(emojiPicker, removeEmojiButton, {
-      type: 'separator'
-    }, colorPicker);
+
+    if (isCustomPanelEditable) {
+      const colorPicker = {
+        id: 'editor.panel.colorPicker',
+        title: formatMessage(messages.backgroundColor),
+        type: 'select',
+        selectType: 'color',
+        defaultValue: defaultPalette,
+        options: panelBackgroundPalette,
+        onChange: option => changeColor(option.value)
+      };
+      const emojiPicker = {
+        id: 'editor.panel.emojiPicker',
+        title: formatMessage(messages.emoji),
+        type: 'select',
+        selectType: 'emoji',
+        options: [],
+        selected: activePanelType === PanelType.CUSTOM && !!activePanelIcon,
+        onChange: emojiShortName => changeEmoji(emojiShortName)
+      };
+      const removeEmojiButton = {
+        id: 'editor.panel.removeEmoji',
+        type: 'button',
+        icon: RemoveEmojiIcon,
+        onClick: removeEmoji(),
+        title: formatMessage(commonMessages.removeEmoji),
+        disabled: activePanelIcon ? false : true
+      };
+      items.push(emojiPicker, removeEmojiButton, {
+        type: 'separator'
+      }, colorPicker);
+    }
   }
 
   items.push({
@@ -249,7 +230,7 @@ export const getToolbarConfig = (state, intl, options = {}, providerFactory) =>
       panelIcon
     } = panelObject.node.attrs; // force toolbar to be turned on
 
-    const items = getToolbarItems(formatMessage, nodeType, options.UNSAFE_allowCustomPanel || false, providerFactory, panelType, options.UNSAFE_allowCustomPanel ? panelColor : undefined, options.UNSAFE_allowCustomPanel ? panelIcon : undefined);
+    const items = getToolbarItems(formatMessage, nodeType, options.UNSAFE_allowCustomPanel || false, options.UNSAFE_allowCustomPanel && options.UNSAFE_allowCustomPanelEdit || false, providerFactory, panelType, options.UNSAFE_allowCustomPanel ? panelColor : undefined, options.UNSAFE_allowCustomPanel ? panelIcon : undefined);
 
     const getDomRef = editorView => {
       const domAtPos = editorView.domAtPos.bind(editorView);

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

@@ -21,7 +21,7 @@ export const panelAttrsToDom = (attrs, allowCustomPanel) => {
     'data-panel-type': panelType || PanelType.INFO,
     style
   };
-  const iconSpan = ['span', {
+  const iconDiv = ['div', {
     class: PanelSharedCssClassName.icon
   }];
   const contentDiv = ['div', {
@@ -29,7 +29,7 @@ export const panelAttrsToDom = (attrs, allowCustomPanel) => {
   }, 0];
 
   if (hasIcon) {
-    return ['div', panelAttrs, iconSpan, contentDiv];
+    return ['div', panelAttrs, iconDiv, contentDiv];
   } else {
     return ['div', panelAttrs, contentDiv];
   }

package/dist/es2019/plugins/paste/linkify-md-plugin.js

@@ -1,5 +1,5 @@
-import LinkifyIt from 'linkify-it';
-import { linkifyMatch } from '../hyperlink/utils'; // modified version of the original Linkify plugin
+import { linkifyMatch } from '@atlaskit/adf-schema';
+import LinkifyIt from 'linkify-it'; // modified version of the original Linkify plugin
 // https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js
 
 const arrayReplaceAt = (src, pos, newElements) => {

package/dist/es2019/plugins/rank.js

@@ -6,7 +6,7 @@ export default {
   // https://product-fabric.atlassian.net/wiki/spaces/E/pages/1113098008/Selection+Guide#Special-Cases
   'expandKeymap', 'tableSelectionKeymap', 'tableKeymap', 'captionKeymap', // selection keymap needs to be above gap cursor keymap so it can set node selections from
   // left/right arrows
-  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaKeymap', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription'],
+  'selectionKeymap', 'gapCursorKeymap', 'gapCursor', 'syncUrlText', 'fakeCursorToolbarPlugin', 'hyperLink', 'table', 'tableDecorations', 'hyperlinkInputRule', 'tablePMColResizing', 'hyperlinkKeymap', 'tableColResizing', 'undoRedoKeyMap', 'blockTypeKeyMap', 'tableEditing', 'filterStepsPlugin', 'pmCollab', 'collab', 'ruleInputRule', 'ruleKeymap', 'panel', 'media', 'mediaKeymap', 'mediaSingleKeymap', 'mediaEditor', 'unsupportedContent', 'jiraIssue', 'fakeTextCursor', 'helpDialog', 'helpDialogKeymap', 'macro', 'expand', 'extension', 'layout', 'contextPanel', 'floatingToolbar', 'clearMarksOnChange', 'reactNodeView', 'history', 'undoRedoPlugin', 'codeBlockIndent', 'placeholder', 'width', 'maxContentSize', 'multilineContent', 'grid', 'mobileDimensions', 'scrollGutterPlugin', 'analytics', 'findReplace', 'selection', 'avatarGroup', 'viewUpdateSubscription', 'inlineCode'],
   nodes: ['doc', 'paragraph', 'text', 'bulletList', 'orderedList', 'listItem', 'heading', 'blockquote', 'codeBlock', 'rule', 'panel', 'mention', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'unsupportedBlock', 'unsupportedInline', 'confluenceJiraIssue', 'hardBreak', 'emoji', 'placeholder', 'mediaSingle', 'mediaGroup', 'table', 'expand', 'nestedExpand', 'media', 'tableHeader', 'decisionList', 'tableRow', 'decisionItem', 'tableCell', 'taskList', 'taskItem', 'extension', 'bodiedExtension', 'inlineExtension', 'layoutSection', 'layoutColumn', 'inlineCard', 'blockCard', 'embedCard'],
   marks: [// Inline marks
   'link', 'em', 'strong', 'textColor', 'strike', 'subsup', 'underline', 'code', 'typeAheadQuery', // Block marks

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

@@ -3,6 +3,8 @@ import { StatusSharedCssClassName } from '@atlaskit/editor-common';
 import { SelectionStyle, getSelectionStyles, akEditorDeleteBackgroundWithOpacity, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 export const statusStyles = css`
   .${StatusSharedCssClassName.STATUS_CONTAINER} {
+    display: inline-block;
+
     > span {
       display: inline-block;
       cursor: pointer;

package/dist/es2019/plugins/table/pm-plugins/sticky-headers/nodeviews/tableRow.js

@@ -462,10 +462,26 @@ export class TableRowNodeView {
      * so it should be safe to ignore mutations that we cause
      * by updating styles and classnames on this DOM element
      *
-     * Update: should allow mutations for row selection to avoid known issue with table selection highlight in firefox
+     * Update: should not ignore mutations for row selection to avoid known issue with table selection highlight in firefox
      * Related bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1289673
      * */
-    return !(mutationRecord.type === 'selection' && mutationRecord.target.tagName === 'TR');
+    const isTableSelection = mutationRecord.type === 'selection' && mutationRecord.target.nodeName === 'TR';
+    /**
+     * Update: should not ignore mutations when an node is added, as this interferes with
+     * prosemirrors handling of some language inputs in Safari (ie. Pinyin, Hiragana).
+     *
+     * In paticular, when a composition occurs at the start of the first node inside a table cell, if the resulting mutation
+     * from the composition end is ignored than prosemirror will end up with; invalid table markup nesting and a misplaced
+     * selection and insertion.
+     */
+
+    const isNodeInsertion = mutationRecord.type === 'childList' && mutationRecord.target.nodeName === 'TR' && mutationRecord.addedNodes.length;
+
+    if (isTableSelection || isNodeInsertion) {
+      return false;
+    }
+
+    return true;
   }
   /* receive external events */
 

package/dist/es2019/profiler/render-count.js

@@ -0,0 +1,60 @@
+import React, { useRef } from 'react';
+import uuid from 'uuid';
+import { useComponentRenderTracking } from '../utils/react-hooks/use-component-renderer-tracking';
+import { RenderCountProfiler as RenderCountProfilerClass } from '@atlaskit/editor-common';
+export let ProfiledComponentIds;
+
+(function (ProfiledComponentIds) {
+  ProfiledComponentIds["editor"] = "Editor";
+  ProfiledComponentIds["appearance"] = "FullPageEditor";
+  ProfiledComponentIds["reactEditorView"] = "ReactEditorView";
+  ProfiledComponentIds["contentArea"] = "FullPageContentArea";
+  ProfiledComponentIds["toolbar"] = "FullPageToolbar";
+  ProfiledComponentIds["mention"] = "MentionNodeView";
+})(ProfiledComponentIds || (ProfiledComponentIds = {}));
+
+const CoreRenderCountProfiler = ({
+  componentId
+}) => {
+  const {
+    current: instanceId
+  } = useRef(uuid());
+
+  const onRender = ({
+    renderCount
+  }) => {
+    const profiler = RenderCountProfilerClass.getInstance({
+      store: window
+    });
+    profiler.setRenderCount({
+      componentId,
+      instanceId,
+      renderCount
+    });
+  };
+
+  useComponentRenderTracking({
+    onRender,
+    propsDiffingOptions: {
+      enabled: false
+    },
+    zeroBasedCount: false
+  });
+  return null;
+};
+
+export const RenderCountProfiler = ({
+  componentId
+}) => {
+  const profiler = RenderCountProfilerClass.getInstance({
+    store: window
+  });
+
+  if (profiler.isEnabled()) {
+    return /*#__PURE__*/React.createElement(CoreRenderCountProfiler, {
+      componentId: componentId
+    });
+  }
+
+  return null;
+};

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -37,7 +37,7 @@ const CommentEditor = styled.div`
   /* calc(2px + 40px + 24px + ( 20px + (32px * 2))) */
   min-height: 150px;
   height: auto;
-  ${props => props.maxHeight ? 'max-height: ' + props.maxHeight + 'px;' : ''} background-color: white;
+  background-color: white;
   border: 1px solid ${N40};
   box-sizing: border-box;
   border-radius: ${borderRadius()}px;
@@ -51,6 +51,7 @@ const ContentArea = styled(ContentStyles)`
   overflow-x: hidden;
   overflow-y: auto;
   line-height: 24px;
+  ${props => props.maxHeight ? 'max-height: ' + props.maxHeight + 'px;' : ''};
 
   /** Hack for Bitbucket to ensure entire editorView gets drop event; see ED-3294 **/
   /** Hack for tables controlls. Otherwise marging collapse and controlls are misplaced. **/
@@ -155,7 +156,8 @@ class Editor extends React.Component {
           innerRef: ref => this.containerElement = ref,
           className: classnames('ak-editor-content-area', {
             'less-margin': width < akEditorMobileBreakoutPoint
-          })
+          }),
+          maxHeight: maxHeight
         }, customContentComponents, /*#__PURE__*/React.createElement(PluginSlot, {
           editorView: editorView,
           editorActions: editorActions,

package/dist/es2019/utils/react-hooks/use-component-renderer-tracking/index.js

@@ -1,33 +1,66 @@
-import { useEffect, useRef } from 'react';
+import { useMemo, useEffect, useRef } from 'react';
+import debounce from 'lodash/debounce';
 import { getShallowPropsDifference, getPropsDifference } from '../../compare';
 import { EVENT_TYPE } from '../../../plugins/analytics';
-export function useComponentRenderTracking(props, action, actionSubject, handleAnalyticsEvent, propsToIgnore = [], useShallow) {
+export function useComponentRenderTracking({
+  onRender,
+  propsDiffingOptions,
+  zeroBasedCount = true
+}) {
   const propsRef = useRef();
-  const renderCountRef = useRef(0);
+  const renderCountRef = useRef(zeroBasedCount ? 0 : 1);
   useEffect(() => {
     const lastProps = propsRef.current;
     const renderCount = renderCountRef.current;
+    let propsDifference;
 
-    if (lastProps) {
-      let difference = useShallow ? getShallowPropsDifference(lastProps, props) : getPropsDifference(lastProps, props, 0, 2, propsToIgnore);
-      handleAnalyticsEvent({
-        payload: {
-          action,
-          actionSubject,
-          attributes: {
-            propsDifference: difference,
-            count: renderCount
-          },
-          eventType: EVENT_TYPE.OPERATIONAL
-        }
-      });
+    if (propsDiffingOptions !== null && propsDiffingOptions !== void 0 && propsDiffingOptions.enabled && lastProps) {
+      propsDifference = propsDiffingOptions !== null && propsDiffingOptions !== void 0 && propsDiffingOptions.useShallow ? getShallowPropsDifference(lastProps, propsDiffingOptions.props) : getPropsDifference(lastProps, propsDiffingOptions.props, 0, 2, propsDiffingOptions === null || propsDiffingOptions === void 0 ? void 0 : propsDiffingOptions.propsToIgnore);
+    }
+
+    const result = {
+      renderCount,
+      propsDifference
+    };
+    onRender(result);
+
+    if (propsDiffingOptions !== null && propsDiffingOptions !== void 0 && propsDiffingOptions.enabled) {
+      propsRef.current = propsDiffingOptions.props;
     }
 
-    propsRef.current = props;
     renderCountRef.current = renderCountRef.current + 1;
   }); // No dependencies run on each render
 }
 export function RenderTracking(props) {
-  useComponentRenderTracking(props.componentProps, props.action, props.actionSubject, props.handleAnalyticsEvent, props.propsToIgnore, props.useShallow);
+  const debouncedHandleAnalyticsEvent = useMemo(() => debounce(props.handleAnalyticsEvent, 500), [props.handleAnalyticsEvent]);
+  useComponentRenderTracking({
+    onRender: ({
+      renderCount,
+      propsDifference
+    }) => {
+      if (!renderCount) {
+        return;
+      }
+
+      debouncedHandleAnalyticsEvent({
+        payload: {
+          action: props.action,
+          actionSubject: props.actionSubject,
+          attributes: {
+            count: renderCount,
+            propsDifference: propsDifference
+          },
+          eventType: EVENT_TYPE.OPERATIONAL
+        }
+      });
+    },
+    propsDiffingOptions: {
+      enabled: true,
+      props: props.componentProps,
+      propsToIgnore: props.propsToIgnore,
+      useShallow: props.useShallow
+    },
+    zeroBasedCount: true
+  });
   return null;
 }

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "150.0.2";
+export const version = "151.1.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/actions/index.js

@@ -4,7 +4,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Node } from 'prosemirror-model';
-import { TextSelection, Selection } from 'prosemirror-state';
+import { TextSelection } from 'prosemirror-state';
 import { toJSON } from '../utils';
 import { processRawValue, isEmptyDocument } from '../utils/document';
 import { getEditorValueWithMedia, __temporaryFixForConfigPanel as _temporaryFixForConfigPanel } from '../utils/action';
@@ -244,31 +244,13 @@ var EditorActions = /*#__PURE__*/function () {
         return false;
       }
 
-      var state = this.editorView.state;
-      var schema = state.schema;
-      var content = processRawValue(schema, rawValue, undefined, undefined, this.contentTransformer, this.dispatchAnalyticsEvent);
-
-      if (!content) {
-        return false;
-      } // In case of replacing a whole document, we only need a content of a top level node e.g. document.
-
-
-      var tr = state.tr.replaceWith(0, state.doc.nodeSize - 2, content.content);
-
-      if (!shouldScrollToBottom && !tr.selectionSet) {
-        // Restore selection at start of document instead of the end.
-        tr.setSelection(Selection.atStart(tr.doc));
-      }
-
-      if (shouldScrollToBottom) {
-        tr = tr.scrollIntoView();
-      }
-
-      if (!shouldAddToHistory) {
-        tr.setMeta('addToHistory', false);
+      if (this.eventDispatcher) {
+        this.eventDispatcher.emit('resetEditorState', {
+          doc: rawValue,
+          shouldScrollToBottom: shouldScrollToBottom
+        });
       }
 
-      this.editorView.dispatch(tr);
       return true;
     }
   }, {