@atlaskit/editor-core 187.7.2 → 187.8.0

package/dist/es2019/plugins/list/commands/listBackspace.js

@@ -1,5 +1,5 @@
 import { insertContentDeleteRange, isEmptySelectionAtStart, walkPrevNode } from '../../../utils/commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, LIST_TEXT_SCENARIOS, addAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, DELETE_DIRECTION, LIST_TEXT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { findParentNodeOfType } from 'prosemirror-utils';
 import { isListNode, isParagraphNode } from '@atlaskit/editor-common/utils';
 import { isPosInsideList, isPosInsideParagraph } from '../utils/selection';
@@ -238,7 +238,7 @@ export const calcJoinListScenario = (walkNode, $head, tr) => {
   }
   return false;
 };
-export const listBackspace = (state, dispatch) => {
+export const listBackspace = editorAnalyticsAPI => (state, dispatch) => {
   const {
     tr,
     selection: {
@@ -262,7 +262,7 @@ export const listBackspace = (state, dispatch) => {
   if (listParent && listParent.node.type === orderedList) {
     actionSubjectId = ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
   }
-  addAnalytics(state, tr, {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.LIST_ITEM_JOINED,
     actionSubject: ACTION_SUBJECT.LIST,
     actionSubjectId,
@@ -272,6 +272,6 @@ export const listBackspace = (state, dispatch) => {
       direction: DELETE_DIRECTION.BACKWARD,
       scenario: scenario[0]
     }
-  });
+  })(tr);
   return BACKSPACE_COMMANDS[scenario[0]](tr, dispatch, walkNode.$pos, $head, scenario[1]);
 };

package/dist/es2019/plugins/list/commands/outdent-list.js

@@ -1,12 +1,11 @@
-import { OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
-import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, OUTDENT_SCENARIOS } from '@atlaskit/editor-common/analytics';
 import { isInsideListItem, isInsideTableCell } from '../utils/selection';
 import { isBulletList } from '../utils/node';
 import { findFirstParentListNode } from '../utils/find';
 import { getCommonListAnalyticsAttributes, getRestartListsAttributes } from '../utils/analytics';
 import { outdentListItemsSelected as outdentListAction } from '../actions/outdent-list-items-selected';
 import { closeHistory } from 'prosemirror-history';
-export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD, featureFlags) {
+export const outdentList = editorAnalyticsAPI => (inputMethod = INPUT_METHOD.KEYBOARD, featureFlags) => {
   return function (state, dispatch) {
     if (!isInsideListItem(state)) {
       return false;
@@ -41,7 +40,7 @@ export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD, featureFlags) {
         restartListsAttributes.splitListStartNumber = splitListStartNumber;
       }
     }
-    addAnalytics(state, customTr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.OUTDENTED,
       actionSubject: ACTION_SUBJECT.LIST,
       actionSubjectId,
@@ -51,10 +50,10 @@ export function outdentList(inputMethod = INPUT_METHOD.KEYBOARD, featureFlags) {
         ...restartListsAttributes,
         inputMethod
       }
-    });
+    })(customTr);
     if (dispatch) {
       dispatch(customTr);
     }
     return true;
   };
-}
+};

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

@@ -4,7 +4,7 @@ import { createPlugin } from './pm-plugins/main';
 import inputRulePlugin from './pm-plugins/input-rules';
 import keymapPlugin from './pm-plugins/keymap';
 import { messages } from './messages';
-import { addAnalytics, ACTION, EVENT_TYPE, INPUT_METHOD, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
+import { ACTION, EVENT_TYPE, INPUT_METHOD, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../analytics';
 import { tooltip, toggleBulletList, toggleOrderedList } from '../../keymaps';
 import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
 /*
@@ -12,7 +12,9 @@ import { IconList, IconListNumber } from '@atlaskit/editor-common/quick-insert';
   packages/editor/editor-core/src/plugins/toolbar-lists-indentation/ui/Toolbar.tsx
  */
 const listPlugin = (options, api) => {
+  var _api$dependencies$ana;
   const featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
+  const 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;
   return {
     name: 'list',
     nodes() {
@@ -41,7 +43,10 @@ const listPlugin = (options, api) => {
         }) => inputRulePlugin(schema, featureFlags)
       }, {
         name: 'listKeymap',
-        plugin: () => keymapPlugin(featureFlags)
+        plugin: () => {
+          var _api$dependencies$ana2;
+          return keymapPlugin(featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions);
+        }
       }];
     },
     pluginsOptions: {
@@ -57,7 +62,7 @@ const listPlugin = (options, api) => {
         icon: () => /*#__PURE__*/React.createElement(IconList, null),
         action(insert, state) {
           const tr = insert(state.schema.nodes.bulletList.createChecked({}, state.schema.nodes.listItem.createChecked({}, state.schema.nodes.paragraph.createChecked())));
-          return addAnalytics(state, tr, {
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
             action: ACTION.INSERTED,
             actionSubject: ACTION_SUBJECT.LIST,
             actionSubjectId: ACTION_SUBJECT_ID.FORMAT_LIST_BULLET,
@@ -65,7 +70,8 @@ const listPlugin = (options, api) => {
             attributes: {
               inputMethod: INPUT_METHOD.QUICK_INSERT
             }
-          });
+          })(tr);
+          return tr;
         }
       }, {
         id: 'orderedList',
@@ -77,7 +83,7 @@ const listPlugin = (options, api) => {
         icon: () => /*#__PURE__*/React.createElement(IconListNumber, null),
         action(insert, state) {
           const tr = insert(state.schema.nodes.orderedList.createChecked({}, state.schema.nodes.listItem.createChecked({}, state.schema.nodes.paragraph.createChecked())));
-          return addAnalytics(state, tr, {
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
             action: ACTION.INSERTED,
             actionSubject: ACTION_SUBJECT.LIST,
             actionSubjectId: ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER,
@@ -85,7 +91,8 @@ const listPlugin = (options, api) => {
             attributes: {
               inputMethod: INPUT_METHOD.QUICK_INSERT
             }
-          });
+          })(tr);
+          return tr;
         }
       }]
     }

package/dist/es2019/plugins/list/pm-plugins/input-rules/create-list-input-rule.js

@@ -1,6 +1,6 @@
 import { ruleWithAnalytics } from '../../../../utils/input-rules';
 import { createWrappingJoinRule } from './wrapping-join-rule';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
 const getOrder = matchResult => Number(matchResult[1]);
 export function createRuleForListType({

package/dist/es2019/plugins/list/pm-plugins/keymap.js

@@ -1,20 +1,20 @@
 import { keymap } from 'prosemirror-keymap';
 import * as keymaps from '../../../keymaps';
 import { indentList, enterKeyCommand, toggleList, backspaceKeyCommand, deleteKeyCommand } from '../commands';
-import { outdentList } from '../commands/outdent-list';
-import { INPUT_METHOD } from '../../analytics';
-export function keymapPlugin(featureFlags) {
+import { outdentList } from '../commands';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+export function keymapPlugin(featureFlags, editorAnalyticsAPI) {
   const list = {};
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleOrderedList), toggleList(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
-  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBulletList), toggleList(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
-  keymaps.bindKeymapWithCommand(keymaps.indentList.common, indentList(INPUT_METHOD.KEYBOARD), list);
-  keymaps.bindKeymapWithCommand(keymaps.outdentList.common, outdentList(INPUT_METHOD.KEYBOARD, featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.enter.common, enterKeyCommand(featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspaceKeyCommand(featureFlags), list);
-  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteKeyCommand, list);
+  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleOrderedList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'orderedList'), list);
+  keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBulletList), toggleList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, 'bulletList'), list);
+  keymaps.bindKeymapWithCommand(keymaps.indentList.common, indentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD), list);
+  keymaps.bindKeymapWithCommand(keymaps.outdentList.common, outdentList(editorAnalyticsAPI)(INPUT_METHOD.KEYBOARD, featureFlags), list);
+  keymaps.bindKeymapWithCommand(keymaps.enter.common, enterKeyCommand(editorAnalyticsAPI)(featureFlags), list);
+  keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspaceKeyCommand(editorAnalyticsAPI)(featureFlags), list);
+  keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, deleteKeyCommand(editorAnalyticsAPI), list);
 
   // This shortcut is Mac only
-  keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.forwardDelete), deleteKeyCommand, list);
+  keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.forwardDelete), deleteKeyCommand(editorAnalyticsAPI), list);
   return keymap(list);
 }
 export default keymapPlugin;

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

@@ -8,7 +8,9 @@ const toolbarListsIndentationPlugin = ({
   showIndentationButtons,
   allowHeadingAndParagraphIndentation
 }, api) => {
+  var _api$dependencies$ana;
   const featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
+  const 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;
   return {
     name: 'toolbarListsIndentation',
     pmPlugins() {
@@ -60,7 +62,8 @@ const toolbarListsIndentationPlugin = ({
             orderedListDisabled: listState.orderedListDisabled,
             showIndentationButtons: !!showIndentationButtons,
             indentDisabled: indentationState.indentDisabled,
-            outdentDisabled: indentationState.outdentDisabled
+            outdentDisabled: indentationState.outdentDisabled,
+            editorAnalyticsAPI: editorAnalyticsAPI
           });
         }
       });

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

@@ -18,7 +18,8 @@ export default function ToolbarListsIndentation(props) {
     popupsScrollableElement,
     indentDisabled,
     outdentDisabled,
-    featureFlags
+    featureFlags,
+    editorAnalyticsAPI
   } = props;
   if (isSmall) {
     return jsx(ToolbarDropdown, {
@@ -35,7 +36,7 @@ export default function ToolbarListsIndentation(props) {
       indentDisabled: indentDisabled,
       outdentDisabled: outdentDisabled,
       disabled: disabled,
-      onItemActivated: onItemActivated,
+      onItemActivated: onItemActivated(editorAnalyticsAPI),
       featureFlags: featureFlags
     });
   }
@@ -50,7 +51,7 @@ export default function ToolbarListsIndentation(props) {
     indentDisabled: indentDisabled,
     outdentDisabled: outdentDisabled,
     disabled: disabled,
-    onItemActivated: onItemActivated,
+    onItemActivated: onItemActivated(editorAnalyticsAPI),
     featureFlags: featureFlags
   });
 }

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

@@ -3,17 +3,17 @@ import { getIndentCommand as indentParagraphOrHeading, getOutdentCommand as outd
 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 function onItemActivated({
+export const onItemActivated = editorAnalyticsAPI => ({
   buttonName,
   editorView,
   featureFlags
-}) {
+}) => {
   switch (buttonName) {
     case 'bullet_list':
-      toggleBulletList(editorView, INPUT_METHOD.TOOLBAR);
+      toggleBulletList(editorAnalyticsAPI)(editorView, INPUT_METHOD.TOOLBAR);
       break;
     case 'ordered_list':
-      toggleOrderedList(editorView, INPUT_METHOD.TOOLBAR);
+      toggleOrderedList(editorAnalyticsAPI)(editorView, INPUT_METHOD.TOOLBAR);
       break;
     case 'indent':
       {
@@ -23,7 +23,7 @@ export function onItemActivated({
           indentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (node === 'list') {
-          indentList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          indentList(editorAnalyticsAPI)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (node === 'taskList') {
           indentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
@@ -38,7 +38,7 @@ export function onItemActivated({
           outdentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (node === 'list') {
-          outdentList(INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
+          outdentList(editorAnalyticsAPI)(INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
         }
         if (node === 'taskList') {
           outdentTaskList(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
@@ -46,4 +46,4 @@ export function onItemActivated({
         break;
       }
   }
-}
+};

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.7.2";
+export const version = "187.8.0";
 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": "187.7.2",
+	"version": "187.8.0",
 	"sideEffects": false
 }

package/dist/esm/plugins/list/commands/indent-list.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, addAnalytics } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { hasValidListIndentationLevel } from '../utils/indentation';
 import { indentListItemsSelected as indentListAction } from '../actions/indent-list-items-selected';
 import { isBulletList } from '../utils/node';
@@ -10,53 +10,55 @@ import { MAX_NESTED_LIST_INDENTATION } from '../types';
 import { isInsideListItem, isInsideTableCell, getListItemAttributes } from '../utils/selection';
 import { getCommonListAnalyticsAttributes } from '../utils/analytics';
 import { closeHistory } from 'prosemirror-history';
-export function indentList() {
-  var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
-  return function (state, dispatch) {
-    var tr = state.tr,
-      $from = state.selection.$from;
+export var indentList = function indentList(editorAnalyticsAPI) {
+  return function () {
+    var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INPUT_METHOD.KEYBOARD;
+    return function (state, dispatch) {
+      var tr = state.tr,
+        $from = state.selection.$from;
 
-    // don't indent if selection is not inside a list
-    if (!isInsideListItem(state)) {
-      return false;
-    }
-
-    // Save the history, so it could undo/revert to the same state before the indent, see https://product-fabric.atlassian.net/browse/ED-14753
-    closeHistory(tr);
-    var firstListItemSelectedAttributes = getListItemAttributes($from);
-    var parentListNode = findFirstParentListNode($from);
-    if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {
-      if (isInsideTableCell(state)) {
-        // dont consume tab, as table-keymap should move cursor to next cell
+      // don't indent if selection is not inside a list
+      if (!isInsideListItem(state)) {
         return false;
-      } else {
+      }
+
+      // Save the history, so it could undo/revert to the same state before the indent, see https://product-fabric.atlassian.net/browse/ED-14753
+      closeHistory(tr);
+      var firstListItemSelectedAttributes = getListItemAttributes($from);
+      var parentListNode = findFirstParentListNode($from);
+      if (!parentListNode || firstListItemSelectedAttributes && firstListItemSelectedAttributes.indentLevel === 0 && firstListItemSelectedAttributes.itemIndex === 0) {
+        if (isInsideTableCell(state)) {
+          // dont consume tab, as table-keymap should move cursor to next cell
+          return false;
+        } else {
+          // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
+          return true;
+        }
+      }
+      var currentListNode = parentListNode.node;
+      var actionSubjectId = isBulletList(currentListNode) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
+      indentListAction(tr);
+      var maximimunNestedLevelReached = !hasValidListIndentationLevel({
+        tr: tr,
+        maxIndentation: MAX_NESTED_LIST_INDENTATION
+      });
+      if (maximimunNestedLevelReached || !tr.docChanged) {
         // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
         return true;
       }
-    }
-    var currentListNode = parentListNode.node;
-    var actionSubjectId = isBulletList(currentListNode) ? ACTION_SUBJECT_ID.FORMAT_LIST_BULLET : ACTION_SUBJECT_ID.FORMAT_LIST_NUMBER;
-    indentListAction(tr);
-    var maximimunNestedLevelReached = !hasValidListIndentationLevel({
-      tr: tr,
-      maxIndentation: MAX_NESTED_LIST_INDENTATION
-    });
-    if (maximimunNestedLevelReached || !tr.docChanged) {
-      // Even though this is a non-operation, we don't want to send this event to the browser. Because if we return false, the browser will move the focus to another place
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+        action: ACTION.INDENTED,
+        actionSubject: ACTION_SUBJECT.LIST,
+        actionSubjectId: actionSubjectId,
+        eventType: EVENT_TYPE.TRACK,
+        attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), {}, {
+          inputMethod: inputMethod
+        })
+      })(tr);
+      if (dispatch) {
+        dispatch(tr);
+      }
       return true;
-    }
-    addAnalytics(state, tr, {
-      action: ACTION.INDENTED,
-      actionSubject: ACTION_SUBJECT.LIST,
-      actionSubjectId: actionSubjectId,
-      eventType: EVENT_TYPE.TRACK,
-      attributes: _objectSpread(_objectSpread({}, getCommonListAnalyticsAttributes(state)), {}, {
-        inputMethod: inputMethod
-      })
-    });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    };
   };
-}
+};