@atlaskit/editor-core 187.28.0 → 187.28.2

package/dist/esm/plugins/media/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -17,12 +17,12 @@ import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit
 import { getMediaClient } from '@atlaskit/media-client';
 import { calcPctFromPx, wrappedLayouts, handleSides, imageAlignmentMap } from '@atlaskit/editor-common/ui';
 import { nonWrappedLayouts, setNodeSelection } from '@atlaskit/editor-common/utils';
-import { akEditorFullWidthLayoutWidth, akEditorGutterPadding } from '@atlaskit/editor-shared-styles';
+import { akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { wrapperStyle } from './styled';
 import { ResizerNext } from '@atlaskit/editor-common/resizer';
 import classnames from 'classnames';
 import { richMediaClassName, resizerStyles } from '@atlaskit/editor-common/styles';
-import { MEDIA_SINGLE_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, calculateOffsetLeft, DEFAULT_IMAGE_WIDTH, calcMediaSingleMaxWidth } from '@atlaskit/editor-common/media-single';
+import { MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, MEDIA_SINGLE_SNAP_GAP, MEDIA_SINGLE_RESIZE_THROTTLE_TIME, calculateOffsetLeft, DEFAULT_IMAGE_WIDTH, calcMediaSingleMaxWidth } from '@atlaskit/editor-common/media-single';
 import { findClosestSnap, getGuidelinesWithHighlights, generateDefaultGuidelines, generateDynamicGuidelines, getGuidelineSnaps, getGuidelineTypeFromKey, getRelativeGuideSnaps, getRelativeGuidelines } from '@atlaskit/editor-common/guideline';
 import memoizeOne from 'memoize-one';
 import { getMediaResizeAnalyticsEvent } from '../../utils/analytics';
@@ -142,6 +142,9 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
       }
       return calcMediaSingleMaxWidth(containerWidth);
     }));
+    _defineProperty(_assertThisInitialized(_this), "calcMinWidth", memoizeOne(function (isVideoFile, contentWidth) {
+      return Math.min(contentWidth || akEditorDefaultLayoutWidth, isVideoFile ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH);
+    }));
     _defineProperty(_assertThisInitialized(_this), "getRelativeGuides", function () {
       var $pos = _this.$pos;
       var relativeGuides = $pos && $pos.nodeAfter && _this.state.size.width ? getRelativeGuidelines(_this.state.relativeGuides, {
@@ -485,7 +488,8 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
         lineLength = _this$props8.lineLength;
       var _this$state = this.state,
         isResizing = _this$state.isResizing,
-        size = _this$state.size;
+        size = _this$state.size,
+        isVideoFile = _this$state.isVideoFile;
       var enable = {};
       handleSides.forEach(function (side) {
         var oppositeSide = side === 'left' ? 'right' : 'left';
@@ -503,6 +507,7 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
       });
       var resizerNextClassName = classnames(className, resizerStyles);
       var maxWidth = this.calcMaxWidth(lineLength, containerWidth, fullWidthMode);
+      var minWidth = this.calcMinWidth(isVideoFile, lineLength);
       return jsx("div", {
         ref: this.saveWrapper,
         css: wrapperStyle({
@@ -515,7 +520,7 @@ var ResizableMediaSingleNext = /*#__PURE__*/function (_React$Component) {
           isExtendedResizeExperienceOn: true
         })
       }, jsx(ResizerNext, {
-        minWidth: MEDIA_SINGLE_MIN_PIXEL_WIDTH,
+        minWidth: minWidth,
         maxWidth: maxWidth,
         className: resizerNextClassName,
         snapGap: MEDIA_SINGLE_SNAP_GAP,

package/dist/esm/plugins/media/utils/media-single.js

@@ -4,8 +4,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { checkNodeDown } from '../../../utils';
+import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
 import { isEmptyParagraph, floatingLayouts } from '@atlaskit/editor-common/utils';
-import { getMediaSingleInitialWidth } from '@atlaskit/editor-common/media-single';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { mapSlice } from '../../../utils/slice';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
@@ -92,9 +92,7 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
   // add undefined as fallback as we don't want media single width to have upper limit as 0
   // if widthPluginState.width is 0, default 760 will be used
   var contentWidth = (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
-  var node = createMediaSingleNode(state.schema, collection, contentWidth,
-  // pass undefined to use default min width
-  undefined, alignLeftOnInsert)(mediaState);
+  var node = createMediaSingleNode(state.schema, collection, contentWidth, mediaState.status !== 'error' && isVideo(mediaState.fileMimeType) ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, alignLeftOnInsert)(mediaState);
   var fileExtension;
   if (mediaState.fileName) {
     var extensionIdx = mediaState.fileName.lastIndexOf('.');
@@ -210,6 +208,9 @@ export function isCaptionNode(editorView) {
   }
   return false;
 }
+export var isVideo = function isVideo(fileType) {
+  return !!fileType && fileType.includes('video');
+};
 export var getParentWidthForNestedMediaSingleNode = function getParentWidthForNestedMediaSingleNode(resolvedPos, view) {
   var domNode = view.nodeDOM(resolvedPos.pos);
   if (resolvedPos.nodeAfter && floatingLayouts.includes(resolvedPos.nodeAfter.attrs.layout) && domNode && domNode.parentElement) {

package/dist/esm/plugins/paste/handlers.js

@@ -23,7 +23,6 @@ import { linkifyContent, isListItemNode, isListNode, canLinkBeCreatedInRange } f
 import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
-import { doesSelectionWhichStartsOrEndsInListContainEntireList } from '../../utils/lists';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 // remove text attribute from mention for copy/paste (GDPR)
 export function handleMention(slice, schema) {
@@ -224,7 +223,30 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     return false;
   };
 }
-export function handlePastePanelOrDecisionContentIntoList(slice) {
+export var doesSelectionWhichStartsOrEndsInListContainEntireList = function doesSelectionWhichStartsOrEndsInListContainEntireList(selection, findRootParentListNode) {
+  var $from = selection.$from,
+    $to = selection.$to,
+    from = selection.from,
+    to = selection.to;
+  var selectionParentListItemNodeResolvedPos = findRootParentListNode ? findRootParentListNode($from) || findRootParentListNode($to) : null;
+  var selectionParentListNode = selectionParentListItemNodeResolvedPos === null || selectionParentListItemNodeResolvedPos === void 0 ? void 0 : selectionParentListItemNodeResolvedPos.parent;
+  if (!selectionParentListItemNodeResolvedPos || !selectionParentListNode) {
+    return false;
+  }
+  var startOfEntireList = $from.pos < $to.pos ? selectionParentListItemNodeResolvedPos.pos + $from.depth - 1 : selectionParentListItemNodeResolvedPos.pos + $to.depth - 1;
+  var endOfEntireList = $from.pos < $to.pos ? selectionParentListItemNodeResolvedPos.pos + selectionParentListNode.nodeSize - $to.depth - 1 : selectionParentListItemNodeResolvedPos.pos + selectionParentListNode.nodeSize - $from.depth - 1;
+  if (!startOfEntireList || !endOfEntireList) {
+    return false;
+  }
+  if (from < to) {
+    return startOfEntireList >= $from.pos && endOfEntireList <= $to.pos;
+  } else if (from > to) {
+    return startOfEntireList >= $to.pos && endOfEntireList <= $from.pos;
+  } else {
+    return false;
+  }
+};
+export function handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode) {
   return function (state, dispatch) {
     var schema = state.schema,
       tr = state.tr;
@@ -233,7 +255,7 @@ export function handlePastePanelOrDecisionContentIntoList(slice) {
     var blockNode = slice.content.firstChild;
     var isSliceWholeNode = slice.openStart === 0 && slice.openEnd === 0;
     var selectionParentListItemNode = selection.$to.node(selection.$to.depth - 1);
-    var sliceIsWholeNodeButShouldNotReplaceSelection = isSliceWholeNode && !doesSelectionWhichStartsOrEndsInListContainEntireList(selection);
+    var sliceIsWholeNodeButShouldNotReplaceSelection = isSliceWholeNode && !doesSelectionWhichStartsOrEndsInListContainEntireList(selection, findRootParentListNode);
     if (!selectionParentListItemNode || (selectionParentListItemNode === null || selectionParentListItemNode === void 0 ? void 0 : selectionParentListItemNode.type) !== schema.nodes.listItem || !blockNode || !['panel', 'decisionList'].includes(blockNode === null || blockNode === void 0 ? void 0 : blockNode.type.name) || slice.content.childCount > 1 || (blockNode === null || blockNode === void 0 ? void 0 : blockNode.content.firstChild) === undefined || sliceIsWholeNodeButShouldNotReplaceSelection) {
       return false;
     }

package/dist/esm/plugins/paste/pm-plugins/analytics.js

@@ -283,10 +283,10 @@ function injectAnalyticsPayloadBeforeCommand(createPayloadByTransaction) {
     };
   };
 }
-export var handlePastePanelOrDecisionIntoListWithAnalytics = function handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice) {
+export var handlePastePanelOrDecisionIntoListWithAnalytics = function handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice, findRootParentListNode) {
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {
     type: PasteTypes.richText
-  }))(handlePastePanelOrDecisionContentIntoList(slice));
+  }))(handlePastePanelOrDecisionContentIntoList(slice, findRootParentListNode));
 };
 export var handlePasteNonNestableBlockNodesIntoListWithAnalytics = function handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice) {
   return injectAnalyticsPayloadBeforeCommand(createPasteAnalyticsPayloadBySelection(event, slice, {

package/dist/esm/plugins/paste/pm-plugins/main.js

@@ -299,7 +299,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
 
         // finally, handle rich-text copy-paste
         if (isRichText) {
-          var _pluginInjectionApi$d6, _pluginInjectionApi$d7;
+          var _pluginInjectionApi$d6, _pluginInjectionApi$d7, _pluginInjectionApi$d8;
           // linkify the text where possible
           slice = linkifyContent(state.schema)(slice);
           if (handlePasteLinkOnSelectedTextWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
@@ -364,7 +364,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           if (handlePasteIntoCaptionWithAnalytics(view, event, slice, PasteTypes.richText)(state, dispatch)) {
             return true;
           }
-          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice)(state, dispatch)) {
+          if (handlePastePanelOrDecisionIntoListWithAnalytics(view, event, slice, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d8 = pluginInjectionApi.dependencies.list) === null || _pluginInjectionApi$d8 === void 0 ? void 0 : _pluginInjectionApi$d8.actions.findRootParentListNode)(state, dispatch)) {
             return true;
           }
           if (featureFlags !== null && featureFlags !== void 0 && featureFlags.restartNumberedLists && handlePasteNonNestableBlockNodesIntoListWithAnalytics(view, event, slice)(state, dispatch)) {

package/dist/esm/plugins/toolbar-lists-indentation/index.js

@@ -1,17 +1,22 @@
 import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ToolbarListsIndentation from './ui';
-import WithPluginState from '../../ui/WithPluginState';
 import { ToolbarSize } from '../../ui/Toolbar/types';
-import { pluginKey as listPluginKey } from '../list/pm-plugins/main';
-import { pluginKey as indentationButtonsPluginKey, createPlugin as indentationButtonsPlugin } from './pm-plugins/indentation-buttons';
+import { createPlugin as indentationButtonsPlugin } from './pm-plugins/indentation-buttons';
+import { pluginKey as indentationButtonPluginKey } from './pm-plugins/indentation-buttons';
 var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref, api) {
-  var _api$dependencies$ana;
+  var _api$dependencies$fea;
   var showIndentationButtons = _ref.showIndentationButtons,
     allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation;
-  var featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
-  var editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions;
+  var featureFlags = (api === null || api === void 0 ? void 0 : (_api$dependencies$fea = api.dependencies.featureFlags) === null || _api$dependencies$fea === void 0 ? void 0 : _api$dependencies$fea.sharedState.currentState()) || {};
   return {
     name: 'toolbarListsIndentation',
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      return indentationButtonPluginKey.getState(editorState);
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'indentationButtons',
@@ -20,7 +25,8 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref,
           return indentationButtonsPlugin({
             dispatch: dispatch,
             showIndentationButtons: showIndentationButtons,
-            allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation
+            allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
+            api: api
           });
         }
       }];
@@ -34,38 +40,55 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref,
         disabled = _ref3.disabled,
         isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing;
       var isSmall = toolbarSize < ToolbarSize.L;
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          listState: listPluginKey,
-          indentationState: indentationButtonsPluginKey
-        },
-        render: function render(_ref4) {
-          var listState = _ref4.listState,
-            indentationState = _ref4.indentationState;
-          if (!listState) {
-            return null;
-          }
-          return /*#__PURE__*/React.createElement(ToolbarListsIndentation, {
-            featureFlags: featureFlags,
-            isSmall: isSmall,
-            isReducedSpacing: isToolbarReducedSpacing,
-            disabled: disabled,
-            editorView: editorView,
-            popupsMountPoint: popupsMountPoint,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsScrollableElement: popupsScrollableElement,
-            bulletListActive: listState.bulletListActive,
-            bulletListDisabled: listState.bulletListDisabled,
-            orderedListActive: listState.orderedListActive,
-            orderedListDisabled: listState.orderedListDisabled,
-            showIndentationButtons: !!showIndentationButtons,
-            indentDisabled: indentationState.indentDisabled,
-            outdentDisabled: indentationState.outdentDisabled,
-            editorAnalyticsAPI: editorAnalyticsAPI
-          });
-        }
+      return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
+        featureFlags: featureFlags,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        isSmall: isSmall,
+        isToolbarReducedSpacing: isToolbarReducedSpacing,
+        disabled: disabled,
+        editorView: editorView,
+        showIndentationButtons: showIndentationButtons,
+        pluginInjectionApi: api
       });
     }
   };
 };
+function PrimaryToolbarComponent(_ref4) {
+  var featureFlags = _ref4.featureFlags,
+    popupsMountPoint = _ref4.popupsMountPoint,
+    popupsBoundariesElement = _ref4.popupsBoundariesElement,
+    popupsScrollableElement = _ref4.popupsScrollableElement,
+    isSmall = _ref4.isSmall,
+    isToolbarReducedSpacing = _ref4.isToolbarReducedSpacing,
+    disabled = _ref4.disabled,
+    editorView = _ref4.editorView,
+    showIndentationButtons = _ref4.showIndentationButtons,
+    pluginInjectionApi = _ref4.pluginInjectionApi;
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['list', 'toolbarListsIndentation']),
+    listState = _useSharedPluginState.listState,
+    toolbarListsIndentationState = _useSharedPluginState.toolbarListsIndentationState;
+  if (!listState) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarListsIndentation, {
+    featureFlags: featureFlags,
+    isSmall: isSmall,
+    isReducedSpacing: isToolbarReducedSpacing,
+    disabled: disabled,
+    editorView: editorView,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    bulletListActive: listState.bulletListActive,
+    bulletListDisabled: listState.bulletListDisabled,
+    orderedListActive: listState.orderedListActive,
+    orderedListDisabled: listState.orderedListDisabled,
+    showIndentationButtons: !!showIndentationButtons,
+    indentDisabled: toolbarListsIndentationState.indentDisabled,
+    outdentDisabled: toolbarListsIndentationState.outdentDisabled,
+    pluginInjectionApi: pluginInjectionApi
+  });
+}
 export default toolbarListsIndentationPlugin;

package/dist/esm/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -2,12 +2,11 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
-import { isInsideListItem } from '../../list/utils/selection';
 import { getCurrentIndentLevel as getTaskListIndentLevel, getTaskItemIndex, isInsideTask } from '../../tasks-and-decisions/pm-plugins/helpers';
 import { isIndentationAllowed, MAX_INDENTATION_LEVEL } from '../../indentation/commands';
 import { getListItemAttributes } from '@atlaskit/editor-common/lists';
 export var pluginKey = new PluginKey('indentationButtonsPlugin');
-function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation) {
+function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, api) {
   var state = {
     indentDisabled: true,
     outdentDisabled: true,
@@ -20,7 +19,7 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   // not use the indentation mark.
   // Check for lists before paragraphs and headings in case
   // the selection is in a list nested in a layout column.
-  if (isInsideListItem(editorState)) {
+  if (api !== null && api !== void 0 && api.dependencies.list.actions.isInsideListItem(editorState)) {
     var _getListItemAttribute = getListItemAttributes(selection.$head),
       indentLevel = _getListItemAttribute.indentLevel,
       itemIndex = _getListItemAttribute.itemIndex;
@@ -69,7 +68,8 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
 export var createPlugin = function createPlugin(_ref) {
   var dispatch = _ref.dispatch,
     showIndentationButtons = _ref.showIndentationButtons,
-    allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation;
+    allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation,
+    api = _ref.api;
   return new SafePlugin({
     state: {
       init: function init(_config, state) {
@@ -78,11 +78,11 @@ export var createPlugin = function createPlugin(_ref) {
           outdentDisabled: true,
           node: null
         };
-        return showIndentationButtons ? getIndentationButtonsState(state, allowHeadingAndParagraphIndentation) : initialState;
+        return showIndentationButtons ? getIndentationButtonsState(state, allowHeadingAndParagraphIndentation, api) : initialState;
       },
       apply: function apply(_tr, pluginState, _oldState, newState) {
         if (showIndentationButtons) {
-          var state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation);
+          var state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation, api);
           if (!shallowEqual(pluginState, state)) {
             dispatch(pluginKey, state);
             return state;

package/dist/esm/plugins/toolbar-lists-indentation/ui/index.js

@@ -18,7 +18,7 @@ export default function ToolbarListsIndentation(props) {
     indentDisabled = props.indentDisabled,
     outdentDisabled = props.outdentDisabled,
     featureFlags = props.featureFlags,
-    editorAnalyticsAPI = props.editorAnalyticsAPI;
+    pluginInjectionApi = props.pluginInjectionApi;
   if (isSmall) {
     return jsx(ToolbarDropdown, {
       editorView: props.editorView,
@@ -34,7 +34,7 @@ export default function ToolbarListsIndentation(props) {
       indentDisabled: indentDisabled,
       outdentDisabled: outdentDisabled,
       disabled: disabled,
-      onItemActivated: onItemActivated(editorAnalyticsAPI),
+      onItemActivated: onItemActivated(pluginInjectionApi),
       featureFlags: featureFlags
     });
   }
@@ -49,7 +49,7 @@ export default function ToolbarListsIndentation(props) {
     indentDisabled: indentDisabled,
     outdentDisabled: outdentDisabled,
     disabled: disabled,
-    onItemActivated: onItemActivated(editorAnalyticsAPI),
+    onItemActivated: onItemActivated(pluginInjectionApi),
     featureFlags: featureFlags
   });
 }

package/dist/esm/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -1,19 +1,18 @@
-import { indentList, outdentList, toggleBulletList, toggleOrderedList } from '../../list/commands';
 import { getIndentCommand as indentParagraphOrHeading, getOutdentCommand as outdentParagraphOrHeading } from '../../indentation/commands';
 import { getIndentCommand as indentTaskList, getUnindentCommand as outdentTaskList } from '../../tasks-and-decisions/pm-plugins/keymaps';
 import { INPUT_METHOD } from '../../analytics';
 import { pluginKey as indentationButtonsPluginKey } from '../pm-plugins/indentation-buttons';
-export var onItemActivated = function onItemActivated(editorAnalyticsAPI) {
+export var onItemActivated = function onItemActivated(pluginInjectionApi) {
   return function (_ref) {
     var buttonName = _ref.buttonName,
       editorView = _ref.editorView,
       featureFlags = _ref.featureFlags;
     switch (buttonName) {
       case 'bullet_list':
-        toggleBulletList(editorAnalyticsAPI)(editorView, INPUT_METHOD.TOOLBAR);
+        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.list.actions.toggleBulletList(editorView, INPUT_METHOD.TOOLBAR);
         break;
       case 'ordered_list':
-        toggleOrderedList(editorAnalyticsAPI)(editorView, INPUT_METHOD.TOOLBAR);
+        pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.list.actions.toggleOrderedList(editorView, INPUT_METHOD.TOOLBAR);
         break;
       case 'indent':
         {
@@ -23,7 +22,7 @@ export var onItemActivated = function onItemActivated(editorAnalyticsAPI) {
             indentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           if (node === 'list') {
-            indentList(editorAnalyticsAPI)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.list.actions.indentList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           if (node === 'taskList') {
             indentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
@@ -38,7 +37,7 @@ export var onItemActivated = function onItemActivated(editorAnalyticsAPI) {
             outdentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
           }
           if (_node === 'list') {
-            outdentList(editorAnalyticsAPI)(INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
+            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.list.actions.outdentList(INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
           }
           if (_node === 'taskList') {
             outdentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);

package/dist/esm/test-utils.js

@@ -7,7 +7,7 @@ import { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
 import { createSchema } from './create-editor/create-schema';
 import { sortByOrder } from './create-editor/sort-by-order';
 import { analyticsPluginKey } from './plugins/analytics/plugin-key';
-import basePlugin from './plugins/base';
+import { basePlugin } from './plugins/base';
 export { createTypeAheadTools } from './plugins/type-ahead/api';
 export function getFireAnalytics(editorView) {
   var _analyticsPluginKey$g;

package/dist/esm/ui/ContentStyles/index.js

@@ -1,10 +1,10 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 /** @jsx jsx */
 import React, { useMemo } from 'react';
 import { jsx, css, useTheme } from '@emotion/react';
-import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles, textColorStyles, resizerStyles, gridStyles, smartCardStyles, embedCardStyles } from '@atlaskit/editor-common/styles';
-import { editorFontSize } from '@atlaskit/editor-shared-styles';
+import { whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, shadowSharedStyle, dateSharedStyle, tasksAndDecisionsStyles, annotationSharedStyles, smartCardSharedStyles, textColorStyles, resizerStyles, gridStyles, smartCardStyles, embedCardStyles, codeBlockInListSafariFix } from '@atlaskit/editor-common/styles';
+import { blockNodesVerticalMargin, editorFontSize } from '@atlaskit/editor-shared-styles';
 import { unsupportedStyles } from '../../plugins/unsupported-content/styles';
 import { telepointerStyle } from '../../plugins/collab-edit/styles';
 import { gapCursorStyles } from '../../plugins/selection/gap-cursor/styles';
@@ -12,7 +12,6 @@ import { tableStyles } from '@atlaskit/editor-plugin-table/ui/common-styles';
 import { placeholderStyles } from '../../plugins/placeholder/styles';
 import { blocktypeStyles } from '../../plugins/block-type/styles';
 import { codeBlockStyles } from '../../plugins/code-block/styles';
-import { listsStyles } from '../../plugins/list/styles';
 import { ruleStyles } from '../../plugins/rule/styles';
 import { mediaStyles } from '../../plugins/media/styles';
 import { layoutStyles } from '../../plugins/layout/styles';
@@ -30,9 +29,11 @@ import { statusStyles } from '../../plugins/status/styles';
 import { dateStyles } from '../../plugins/date/styles';
 import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
 import { linkSharedStyle, codeMarkSharedStyles } from '@atlaskit/editor-common/styles';
+import { browser } from '@atlaskit/editor-common/utils';
 export var linkStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", "\n  }\n"])), linkSharedStyle);
+var listsStyles = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .ProseMirror {\n    li {\n      position: relative;\n\n      > p:not(:first-child) {\n        margin: 4px 0 0 0;\n      }\n\n      // In SSR the above rule will apply to all p tags because first-child would be a style tag.\n      // The following rule resets the first p tag back to its original margin\n      // defined in packages/editor/editor-common/src/styles/shared/paragraph.ts\n      > style:first-child + p {\n        margin-top: ", ";\n      }\n    }\n\n    & :not([data-node-type='decisionList']) > li {\n      ", "\n    }\n  }\n"])), blockNodesVerticalMargin, browser.safari ? codeBlockInListSafariFix : '');
 var contentStyles = function contentStyles(props) {
-  return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), editorFontSize({
+  return css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), editorFontSize({
     theme: props.theme
   }), whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", placeholderTextStyles, placeholderStyles, codeBlockStyles(props), blocktypeStyles(props), codeMarkSharedStyles(props), textColorStyles, listsStyles, ruleStyles(props), mediaStyles, layoutStyles(props), telepointerStyle, gapCursorStyles, tableStyles(props), panelStyles(props), fakeCursorStyles, mentionsStyles, emojiStyles, tasksAndDecisionsStyles, gridStyles, linkStyles, blockMarksSharedStyles, dateSharedStyle, extensionStyles, expandStyles(props), findReplaceStyles, taskDecisionStyles, statusStyles, annotationSharedStyles(props), smartCardStyles, smartCardSharedStyles, dateStyles, embedCardStyles, unsupportedStyles, resizerStyles, ClassNames.FLOATING_TOOLBAR_COMPONENT);
 };

package/dist/esm/ui/ToolbarFeedback/index.js

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -29,7 +30,7 @@ import { openFeedbackDialog } from '../../plugins/feedback-dialog';
 import deprecationWarnings from '../../utils/deprecation-warnings';
 import pickBy from '../../utils/pick-by';
 import { analyticsEventKey } from '../../plugins/analytics/consts';
-import { getContextIdentifier } from '../../plugins/base/pm-plugins/context-identifier';
+import { usePresetContext } from '../../presets/context';
 var PopupWithOutsideListeners = withOuterListeners(Popup);
 var POPUP_HEIGHT = 388;
 var POPUP_WIDTH = 280;
@@ -50,12 +51,12 @@ var deprecations = [{
 var isNullOrUndefined = function isNullOrUndefined(attr) {
   return attr === null || attr === undefined;
 };
-var ToolbarFeedback = /*#__PURE__*/function (_PureComponent) {
-  _inherits(ToolbarFeedback, _PureComponent);
-  var _super = _createSuper(ToolbarFeedback);
-  function ToolbarFeedback(props) {
+var ToolbarFeedbackInternal = /*#__PURE__*/function (_PureComponent) {
+  _inherits(ToolbarFeedbackInternal, _PureComponent);
+  var _super = _createSuper(ToolbarFeedbackInternal);
+  function ToolbarFeedbackInternal(props) {
     var _this;
-    _classCallCheck(this, ToolbarFeedback);
+    _classCallCheck(this, ToolbarFeedbackInternal);
     _this = _super.call(this, props);
     _defineProperty(_assertThisInitialized(_this), "state", {
       jiraIssueCollectorScriptLoading: false,
@@ -92,8 +93,8 @@ var ToolbarFeedback = /*#__PURE__*/function (_PureComponent) {
       });
     });
     _defineProperty(_assertThisInitialized(_this), "openJiraIssueCollector", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _window$localStorage$, _getContextIdentifier;
-      var editorView, sessionId, contentId, tabId;
+      var _this$props$api, _window$localStorage$, _basePluginState$cont;
+      var basePluginState, sessionId, contentId, tabId;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -101,9 +102,9 @@ var ToolbarFeedback = /*#__PURE__*/function (_PureComponent) {
               jiraIssueCollectorScriptLoading: true,
               showOptOutOption: false
             });
-            editorView = _this.context.editorActions.editorView;
+            basePluginState = (_this$props$api = _this.props.api) === null || _this$props$api === void 0 ? void 0 : _this$props$api.dependencies.base.sharedState.currentState();
             sessionId = (_window$localStorage$ = window.localStorage.getItem('awc.session.id')) === null || _window$localStorage$ === void 0 ? void 0 : _window$localStorage$.toString();
-            contentId = (_getContextIdentifier = getContextIdentifier(editorView === null || editorView === void 0 ? void 0 : editorView.state)) === null || _getContextIdentifier === void 0 ? void 0 : _getContextIdentifier.objectId;
+            contentId = basePluginState === null || basePluginState === void 0 ? void 0 : (_basePluginState$cont = basePluginState.contextIdentifier) === null || _basePluginState$cont === void 0 ? void 0 : _basePluginState$cont.objectId;
             tabId = window.sessionStorage['awc.tab.id'];
             _context.next = 7;
             return openFeedbackDialog(_objectSpread(_objectSpread({}, _this.getFeedbackInfo()), {}, {
@@ -144,7 +145,7 @@ var ToolbarFeedback = /*#__PURE__*/function (_PureComponent) {
     deprecationWarnings(ToolbarFeedback.name, props, deprecations);
     return _this;
   }
-  _createClass(ToolbarFeedback, [{
+  _createClass(ToolbarFeedbackInternal, [{
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -191,9 +192,14 @@ var ToolbarFeedback = /*#__PURE__*/function (_PureComponent) {
       }, "Learn more")))))) : null;
     }
   }]);
-  return ToolbarFeedback;
+  return ToolbarFeedbackInternal;
 }(PureComponent);
-_defineProperty(ToolbarFeedback, "contextTypes", {
+_defineProperty(ToolbarFeedbackInternal, "contextTypes", {
   editorActions: PropTypes.object.isRequired
 });
-export { ToolbarFeedback as default };
+export default function ToolbarFeedback(props) {
+  var api = usePresetContext();
+  return jsx(ToolbarFeedbackInternal, _extends({
+    api: api
+  }, props));
+}

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.28.0";
+export var version = "187.28.2";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/index.d.ts

@@ -63,7 +63,6 @@ export { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, }
 export type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 export { setKeyboardHeight, setMobilePaddingTop, setIsExpanded, } from './plugins/mobile-dimensions/commands';
 export { setTextSelection, dedupe, getNodesCount, measurements } from './utils';
-export { getListCommands } from './utils/list-commands';
 export { ReactEditorView, BaseReactEditorView } from './create-editor';
 export { getDefaultPresetOptionsFromEditorProps } from './create-editor';
 export type { Command, EditorPlugin, EditorProps, EditorInstance, CommandDispatch, } from './types';

package/dist/types/plugins/base/index.d.ts

@@ -1,17 +1,5 @@
-import type { NextEditorPlugin } from '../../types';
+import basePlugin from './plugin';
+import type { BasePlugin, BasePluginState, BasePluginOptions } from './plugin';
 import type { ScrollGutterPluginOptions } from './pm-plugins/scroll-gutter';
-import type { InputTracking, BrowserFreezetracking } from '../../types/performance-tracking';
-import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
-export interface BasePluginOptions {
-    allowScrollGutter?: ScrollGutterPluginOptions;
-    allowInlineCursorTarget?: boolean;
-    inputTracking?: InputTracking;
-    browserFreezeTracking?: BrowserFreezetracking;
-    ufo?: boolean;
-}
-export declare const isChromeWithSelectionBug: any;
-declare const basePlugin: NextEditorPlugin<'base', {
-    pluginConfiguration: BasePluginOptions | undefined;
-    dependencies: [typeof featureFlagsPlugin];
-}>;
-export default basePlugin;
+export { basePlugin };
+export type { BasePlugin, BasePluginState, BasePluginOptions, ScrollGutterPluginOptions, };

package/dist/types/plugins/base/plugin.d.ts

@@ -0,0 +1,23 @@
+import type { NextEditorPlugin } from '../../types';
+import type { ScrollGutterPluginOptions } from './pm-plugins/scroll-gutter';
+import type { InputTracking, BrowserFreezetracking } from '../../types/performance-tracking';
+import type featureFlagsPlugin from '@atlaskit/editor-plugin-feature-flags';
+import type { ContextIdentifierProvider } from '@atlaskit/editor-common/provider-factory';
+export interface BasePluginOptions {
+    allowScrollGutter?: ScrollGutterPluginOptions;
+    allowInlineCursorTarget?: boolean;
+    inputTracking?: InputTracking;
+    browserFreezeTracking?: BrowserFreezetracking;
+    ufo?: boolean;
+}
+export type BasePluginState = {
+    contextIdentifier: ContextIdentifierProvider | undefined;
+};
+export type BasePlugin = NextEditorPlugin<'base', {
+    pluginConfiguration: BasePluginOptions | undefined;
+    dependencies: [typeof featureFlagsPlugin];
+    sharedState: BasePluginState;
+}>;
+export declare const isChromeWithSelectionBug: any;
+declare const basePlugin: BasePlugin;
+export default basePlugin;

package/dist/types/plugins/base/pm-plugins/scroll-gutter.d.ts

@@ -1,8 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-export declare const GUTTER_SIZE_IN_PX = 120;
-export declare const GUTTER_SIZE_MOBILE_IN_PX = 36;
-export declare const GUTTER_SELECTOR = "#editor-scroll-gutter";
 export type ScrollGutterPluginOptions = {
     /** Element the page uses for scrolling */
     getScrollElement?: (view: EditorView) => HTMLElement | null;

package/dist/types/plugins/index.d.ts

@@ -1,4 +1,4 @@
-export { default as basePlugin } from './base';
+export { basePlugin } from './base';
 export { default as blockTypePlugin } from './block-type';
 export { pluginKey as blockPluginStateKey } from './block-type';
 export type { BlockTypeState } from './block-type';