@atlaskit/editor-core 189.3.20 → 189.3.23

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

@@ -1,23 +1,55 @@
 import { indentation } from '@atlaskit/adf-schema';
 import { keymapPlugin } from './pm-plugins/keymap';
+import { getOutdentCommand, getIndentCommand, isIndentationAllowed } from './commands';
+import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 const indentationPlugin = ({
   api
-}) => ({
-  name: 'indentation',
-  marks() {
-    return [{
-      name: 'indentation',
-      mark: indentation
-    }];
-  },
-  pmPlugins() {
-    return [{
-      name: 'indentationKeymap',
-      plugin: () => {
-        var _api$analytics;
-        return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+}) => {
+  var _api$analytics, _api$analytics2;
+  return {
+    name: 'indentation',
+    marks() {
+      return [{
+        name: 'indentation',
+        mark: indentation
+      }];
+    },
+    actions: {
+      indentParagraphOrHeading: getIndentCommand(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      outdentParagraphOrHeading: getOutdentCommand(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
+    },
+    getSharedState(editorState) {
+      var _ref;
+      if (!editorState) {
+        return undefined;
       }
-    }];
-  }
-});
+      const {
+        tr: {
+          selection
+        },
+        schema: {
+          marks: {
+            indentation
+          }
+        }
+      } = editorState;
+      const node = selection.$from.node();
+      const indentationMark = node.marks.find(mark => mark.type === indentation);
+      return {
+        isIndentationAllowed: isIndentationAllowed(editorState.schema, node),
+        indentDisabled: (_ref = (indentationMark === null || indentationMark === void 0 ? void 0 : indentationMark.attrs.level) >= MAX_INDENTATION_LEVEL) !== null && _ref !== void 0 ? _ref : false,
+        outdentDisabled: !indentationMark
+      };
+    },
+    pmPlugins() {
+      return [{
+        name: 'indentationKeymap',
+        plugin: () => {
+          var _api$analytics3;
+          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+        }
+      }];
+    }
+  };
+};
 export default indentationPlugin;

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

@@ -1,6 +1,6 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { bindKeymapWithCommand, findShortcutByKeymap, outdent, indent, backspace } from '@atlaskit/editor-common/keymaps';
-import { isTextSelection } from '../../../utils';
+import { isTextSelection } from '@atlaskit/editor-common/utils';
 import { getIndentCommand, getOutdentCommand } from '../commands';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 export function keymapPlugin(editorAnalyticsAPI) {

package/dist/es2019/plugins/tasks-and-decisions/index.js

@@ -11,6 +11,8 @@ import keymap from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
 import ToolbarDecision from './ui/ToolbarDecision';
 import ToolbarTask from './ui/ToolbarTask';
+import { getCurrentIndentLevel, getTaskItemIndex, isInsideTask } from './pm-plugins/helpers';
+import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 const taskDecisionToolbarGroup = css`
   display: flex;
 `;
@@ -57,8 +59,13 @@ const tasksAndDecisionsPlugin = ({
       return undefined;
     }
     const pluginState = taskPluginKey.getState(editorState);
+    const indentLevel = getCurrentIndentLevel(editorState.selection) || 0;
+    const itemIndex = getTaskItemIndex(editorState);
     return {
-      focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null
+      focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null,
+      isInsideTask: isInsideTask(editorState),
+      indentDisabled: itemIndex === 0 || indentLevel >= MAX_INDENTATION_LEVEL,
+      outdentDisabled: indentLevel <= 1
     };
   },
   pmPlugins() {

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

@@ -1,8 +1,8 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ToolbarListsIndentation from './ui';
 import { ToolbarSize } from '../../ui/Toolbar/types';
-import { createPlugin as indentationButtonsPlugin } from './pm-plugins/indentation-buttons';
+import { getIndentationButtonsState } from './pm-plugins/indentation-buttons';
 import { pluginKey as indentationButtonPluginKey } from './pm-plugins/indentation-buttons';
 const toolbarListsIndentationPlugin = ({
   config,
@@ -22,19 +22,6 @@ const toolbarListsIndentationPlugin = ({
       }
       return indentationButtonPluginKey.getState(editorState);
     },
-    pmPlugins() {
-      return [{
-        name: 'indentationButtons',
-        plugin: ({
-          dispatch
-        }) => indentationButtonsPlugin({
-          dispatch,
-          showIndentationButtons,
-          allowHeadingAndParagraphIndentation,
-          api
-        })
-      }];
-    },
     primaryToolbarComponent({
       editorView,
       popupsMountPoint,
@@ -55,12 +42,13 @@ const toolbarListsIndentationPlugin = ({
         disabled: disabled,
         editorView: editorView,
         showIndentationButtons: showIndentationButtons,
-        pluginInjectionApi: api
+        pluginInjectionApi: api,
+        allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation
       });
     }
   };
 };
-function PrimaryToolbarComponent({
+export function PrimaryToolbarComponent({
   featureFlags,
   popupsMountPoint,
   popupsBoundariesElement,
@@ -70,12 +58,17 @@ function PrimaryToolbarComponent({
   disabled,
   editorView,
   showIndentationButtons,
-  pluginInjectionApi
+  pluginInjectionApi,
+  allowHeadingAndParagraphIndentation
 }) {
   const {
     listState,
-    toolbarListsIndentationState
-  } = useSharedPluginState(pluginInjectionApi, ['list', 'toolbarListsIndentation']);
+    indentationState,
+    taskDecisionState
+  } = useSharedPluginState(pluginInjectionApi, ['list', 'indentation', 'taskDecision']);
+  const toolbarListsIndentationState = useMemo(() => {
+    return getIndentationButtonsState(editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem);
+  }, [editorView.state, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.actions.isInsideListItem]);
   if (!listState) {
     return null;
   }
@@ -95,6 +88,7 @@ function PrimaryToolbarComponent({
     showIndentationButtons: !!showIndentationButtons,
     indentDisabled: toolbarListsIndentationState.indentDisabled,
     outdentDisabled: toolbarListsIndentationState.outdentDisabled,
+    indentationStateNode: toolbarListsIndentationState === null || toolbarListsIndentationState === void 0 ? void 0 : toolbarListsIndentationState.node,
     pluginInjectionApi: pluginInjectionApi
   });
 }

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

@@ -1,12 +1,10 @@
 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 { 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';
+import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 export const pluginKey = new PluginKey('indentationButtonsPlugin');
-function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, api) {
+export function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
+  var _indentationState$isI;
   const state = {
     indentDisabled: true,
     outdentDisabled: true,
@@ -15,13 +13,12 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   const {
     selection
   } = editorState;
-  const node = selection.$from.node();
 
   // Handle bullet and numbered lists seperately as they do
   // 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 (api !== null && api !== void 0 && api.list.actions.isInsideListItem(editorState.tr)) {
+  if (isInsideListItem !== null && isInsideListItem !== void 0 && isInsideListItem(editorState.tr)) {
     const {
       indentLevel,
       itemIndex
@@ -36,12 +33,10 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
 
   // Handle tasks seperately as they do not use the indentation mark
   // and have different behaviour for outdent compared to lists
-  if (isInsideTask(editorState)) {
-    const indentLevel = getTaskListIndentLevel(selection) || 0;
-    const itemIndex = getTaskItemIndex(editorState);
+  if (taskDecisionState !== null && taskDecisionState !== void 0 && taskDecisionState.isInsideTask) {
     return {
-      indentDisabled: itemIndex === 0 || indentLevel >= MAX_INDENTATION_LEVEL,
-      outdentDisabled: indentLevel <= 1,
+      indentDisabled: taskDecisionState.indentDisabled,
+      outdentDisabled: taskDecisionState.outdentDisabled,
       node: 'taskList'
     };
   }
@@ -49,48 +44,12 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   const isInLayoutNode = hasParentNodeOfType(editorState.schema.nodes.layoutColumn)(selection) &&
   // depth of non-nested paragraphs and headings in layouts will always be 3
   selection.$from.depth === 3;
-  if (allowHeadingAndParagraphIndentation && isIndentationAllowed(editorState.schema, node) && (isTopLevelParagraphOrHeading || isInLayoutNode)) {
-    const indentationMark = node.marks.find(mark => mark.type === editorState.schema.marks.indentation);
-    if (!indentationMark) {
-      return {
-        outdentDisabled: true,
-        indentDisabled: false,
-        node: 'paragraph_heading'
-      };
-    }
+  if (allowHeadingAndParagraphIndentation && ((_indentationState$isI = indentationState === null || indentationState === void 0 ? void 0 : indentationState.isIndentationAllowed) !== null && _indentationState$isI !== void 0 ? _indentationState$isI : false) && (isTopLevelParagraphOrHeading || isInLayoutNode) && indentationState) {
     return {
-      indentDisabled: indentationMark.attrs.level >= MAX_INDENTATION_LEVEL,
-      outdentDisabled: false,
+      indentDisabled: indentationState.indentDisabled,
+      outdentDisabled: indentationState.outdentDisabled,
       node: 'paragraph_heading'
     };
   }
   return state;
-}
-export const createPlugin = ({
-  dispatch,
-  showIndentationButtons,
-  allowHeadingAndParagraphIndentation,
-  api
-}) => new SafePlugin({
-  state: {
-    init(_config, state) {
-      const initialState = {
-        indentDisabled: true,
-        outdentDisabled: true,
-        node: null
-      };
-      return showIndentationButtons ? getIndentationButtonsState(state, allowHeadingAndParagraphIndentation, api) : initialState;
-    },
-    apply(_tr, pluginState, _oldState, newState) {
-      if (showIndentationButtons) {
-        const state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation, api);
-        if (!shallowEqual(pluginState, state)) {
-          dispatch(pluginKey, state);
-          return state;
-        }
-      }
-      return pluginState;
-    }
-  },
-  key: pluginKey
-});
+}

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

@@ -7,8 +7,7 @@ import IndentIcon from '@atlaskit/icon/glyph/editor/indent';
 import OutdentIcon from '@atlaskit/icon/glyph/editor/outdent';
 import { toggleBulletList as toggleBulletListKeymap, toggleOrderedList as toggleOrderedListKeymap, indent as toggleIndentKeymap, outdent as toggleOutdentKeymap, ToolTipContent, tooltip } from '../../../keymaps';
 import ToolbarButton, { TOOLBAR_BUTTON } from '../../../ui/ToolbarButton';
-import { listMessages as messages } from '@atlaskit/editor-common/messages';
-import { messages as indentationMessages } from '../../indentation/messages';
+import { listMessages as messages, indentationMessages } from '@atlaskit/editor-common/messages';
 import { separatorStyles, buttonGroupStyle } from '@atlaskit/editor-common/styles';
 import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 import { useEffect, useRef } from 'react';

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

@@ -10,8 +10,7 @@ import ToolbarButton from '../../../ui/ToolbarButton';
 import { shortcutStyle } from '../../../ui/styles';
 import { expandIconWrapperStyle } from '@atlaskit/editor-common/styles';
 import { wrapperStyle, separatorStyles } from '@atlaskit/editor-common/styles';
-import { listMessages } from '@atlaskit/editor-common/messages';
-import { messages as indentationMessages } from '../../indentation/messages';
+import { listMessages, indentationMessages } from '@atlaskit/editor-common/messages';
 export function ToolbarDropdown(props) {
   const {
     formatMessage

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

@@ -18,6 +18,7 @@ export default function ToolbarListsIndentation(props) {
     popupsScrollableElement,
     indentDisabled,
     outdentDisabled,
+    indentationStateNode,
     featureFlags,
     pluginInjectionApi
   } = props;
@@ -36,7 +37,7 @@ export default function ToolbarListsIndentation(props) {
       indentDisabled: indentDisabled,
       outdentDisabled: outdentDisabled,
       disabled: disabled,
-      onItemActivated: onItemActivated(pluginInjectionApi),
+      onItemActivated: onItemActivated(pluginInjectionApi, indentationStateNode),
       featureFlags: featureFlags
     });
   }
@@ -51,7 +52,7 @@ export default function ToolbarListsIndentation(props) {
     indentDisabled: indentDisabled,
     outdentDisabled: outdentDisabled,
     disabled: disabled,
-    onItemActivated: onItemActivated(pluginInjectionApi),
+    onItemActivated: onItemActivated(pluginInjectionApi, indentationStateNode),
     featureFlags: featureFlags
   });
 }

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

@@ -1,8 +1,6 @@
-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 '@atlaskit/editor-common/analytics';
-import { pluginKey as indentationButtonsPluginKey } from '../pm-plugins/indentation-buttons';
-export const onItemActivated = pluginInjectionApi => ({
+export const onItemActivated = (pluginInjectionApi, indentationStateNode) => ({
   buttonName,
   editorView
 }) => {
@@ -15,35 +13,33 @@ export const onItemActivated = pluginInjectionApi => ({
       break;
     case 'indent':
       {
-        var _indentationButtonsPl;
-        const node = (_indentationButtonsPl = indentationButtonsPluginKey.getState(editorView.state)) === null || _indentationButtonsPl === void 0 ? void 0 : _indentationButtonsPl.node;
+        const node = indentationStateNode;
         if (node === 'paragraph_heading') {
-          var _pluginInjectionApi$a;
-          indentParagraphOrHeading(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          var _pluginInjectionApi$i;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$i = pluginInjectionApi.indentation) === null || _pluginInjectionApi$i === void 0 ? void 0 : _pluginInjectionApi$i.actions.indentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (node === 'list') {
           pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.indentList(INPUT_METHOD.TOOLBAR));
         }
         if (node === 'taskList') {
-          var _pluginInjectionApi$a2;
-          indentTaskList(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          var _pluginInjectionApi$a;
+          indentTaskList(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         break;
       }
     case 'outdent':
       {
-        var _indentationButtonsPl2;
-        const node = (_indentationButtonsPl2 = indentationButtonsPluginKey.getState(editorView.state)) === null || _indentationButtonsPl2 === void 0 ? void 0 : _indentationButtonsPl2.node;
+        const node = indentationStateNode;
         if (node === 'paragraph_heading') {
-          var _pluginInjectionApi$a3;
-          outdentParagraphOrHeading(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          var _pluginInjectionApi$i2;
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$i2 = pluginInjectionApi.indentation) === null || _pluginInjectionApi$i2 === void 0 ? void 0 : _pluginInjectionApi$i2.actions.outdentParagraphOrHeading(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         if (node === 'list') {
           pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.list.commands.outdentList(INPUT_METHOD.TOOLBAR));
         }
         if (node === 'taskList') {
-          var _pluginInjectionApi$a4;
-          outdentTaskList(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          var _pluginInjectionApi$a2;
+          outdentTaskList(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a2 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.actions)(INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
         }
         break;
       }

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.3.20";
+export const version = "189.3.23";

package/dist/esm/plugins/find-replace/ui/Find.js

@@ -17,7 +17,7 @@ import ChevronDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-down';
 import ChevronUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-up';
 import MatchCaseIcon from '@atlaskit/icon/glyph/emoji/keyboard';
 import Textfield from '@atlaskit/textfield';
-import { countStyles, sectionWrapperStyles } from './styles';
+import { countStyles, countWrapperStyles, sectionWrapperStyles } from './styles';
 import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
 import rafSchd from 'raf-schd';
@@ -266,10 +266,13 @@ var Find = /*#__PURE__*/function (_React$Component) {
         onBlur: this.props.onFindBlur,
         onCompositionStart: this.handleCompositionStart,
         onCompositionEnd: this.handleCompositionEnd
-      }), findText && jsx("span", {
+      }), jsx("div", {
+        css: countWrapperStyles,
+        "aria-live": "polite"
+      }, findText && jsx("span", {
         "data-testid": "textfield-count",
         css: countStyles
-      }, count.total === 0 ? this.noResultsFound : resultsCount), allowMatchCase && jsx(FindReplaceTooltipButton, {
+      }, count.total === 0 ? this.noResultsFound : resultsCount)), allowMatchCase && jsx(FindReplaceTooltipButton, {
         title: this.matchCase,
         icon: this.matchCaseIcon,
         onClick: this.handleMatchCaseClick,

package/dist/esm/plugins/find-replace/ui/styles.js

@@ -5,13 +5,13 @@ import { css } from '@emotion/react';
 import { N60, N30A } from '@atlaskit/theme/colors';
 import { relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
 export var replaceSectionButtonStyles = css({
-  marginLeft: '4px'
+  marginLeft: "var(--ds-space-050, 4px)"
 });
 export var ruleStyles = css({
   width: '100%',
   border: 'none',
   backgroundColor: "".concat("var(--ds-border, ".concat(N30A, ")")),
-  margin: '4px 0px',
+  margin: "var(--ds-space-050, 4px)".concat(" 0px"),
   height: '1px',
   borderRadius: '1px'
 });
@@ -19,7 +19,7 @@ export var wrapperStyles = css({
   display: 'flex',
   flexDirection: 'column',
   '> *:not(#replace-hr-element)': {
-    margin: '0px 4px'
+    margin: "0px ".concat("var(--ds-space-050, 4px)")
   }
 });
 export var sectionWrapperStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n\n  & > * {\n    display: inline-flex;\n    height: 32px;\n    flex: 0 0 auto;\n  }\n\n  & > [data-ds--text-field--container] {\n    display: flex;\n    flex: 1 1 auto;\n  }\n"])));
@@ -29,6 +29,9 @@ export var countStyles = css({
   flex: '0 0 auto',
   justifyContent: 'center',
   alignItems: 'center',
-  marginLeft: '4px',
-  marginRight: '8px'
+  marginLeft: "var(--ds-space-050, 4px)",
+  marginRight: "var(--ds-space-100, 8px)"
+});
+export var countWrapperStyles = css({
+  alignItems: 'center'
 });

package/dist/esm/plugins/indentation/commands/index.js

@@ -1,8 +1,8 @@
-import { toggleBlockMark } from '../../../commands';
+import { toggleBlockMark } from '@atlaskit/editor-common/commands';
 import { createAnalyticsDispatch } from './utils';
 import { INDENT_DIRECTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import getAttrsWithChangesRecorder from '../../../utils/getAttrsWithChangesRecorder';
-export var MAX_INDENTATION_LEVEL = 6;
+import getAttrsWithChangesRecorder from '../getAttrsWithChangesRecorder';
+import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 export var isIndentationAllowed = function isIndentationAllowed(schema, node) {
   var _schema$nodes = schema.nodes,
     paragraph = _schema$nodes.paragraph,

package/dist/esm/plugins/indentation/index.js

@@ -1,6 +1,9 @@
 import { indentation } from '@atlaskit/adf-schema';
 import { keymapPlugin } from './pm-plugins/keymap';
+import { getOutdentCommand, getIndentCommand, isIndentationAllowed } from './commands';
+import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 var indentationPlugin = function indentationPlugin(_ref) {
+  var _api$analytics, _api$analytics2;
   var api = _ref.api;
   return {
     name: 'indentation',
@@ -10,12 +13,33 @@ var indentationPlugin = function indentationPlugin(_ref) {
         mark: indentation
       }];
     },
+    actions: {
+      indentParagraphOrHeading: getIndentCommand(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions),
+      outdentParagraphOrHeading: getOutdentCommand(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
+    },
+    getSharedState: function getSharedState(editorState) {
+      var _ref2;
+      if (!editorState) {
+        return undefined;
+      }
+      var selection = editorState.tr.selection,
+        indentation = editorState.schema.marks.indentation;
+      var node = selection.$from.node();
+      var indentationMark = node.marks.find(function (mark) {
+        return mark.type === indentation;
+      });
+      return {
+        isIndentationAllowed: isIndentationAllowed(editorState.schema, node),
+        indentDisabled: (_ref2 = (indentationMark === null || indentationMark === void 0 ? void 0 : indentationMark.attrs.level) >= MAX_INDENTATION_LEVEL) !== null && _ref2 !== void 0 ? _ref2 : false,
+        outdentDisabled: !indentationMark
+      };
+    },
     pmPlugins: function pmPlugins() {
       return [{
         name: 'indentationKeymap',
         plugin: function plugin() {
-          var _api$analytics;
-          return keymapPlugin(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions);
+          var _api$analytics3;
+          return keymapPlugin(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
       }];
     }

package/dist/esm/plugins/indentation/pm-plugins/keymap.js

@@ -1,6 +1,6 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { bindKeymapWithCommand, findShortcutByKeymap, outdent, indent, backspace } from '@atlaskit/editor-common/keymaps';
-import { isTextSelection } from '../../../utils';
+import { isTextSelection } from '@atlaskit/editor-common/utils';
 import { getIndentCommand, getOutdentCommand } from '../commands';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 export function keymapPlugin(editorAnalyticsAPI) {

package/dist/esm/plugins/tasks-and-decisions/index.js

@@ -13,6 +13,8 @@ import keymap from './pm-plugins/keymaps';
 import { createPlugin } from './pm-plugins/main';
 import ToolbarDecision from './ui/ToolbarDecision';
 import ToolbarTask from './ui/ToolbarTask';
+import { getCurrentIndentLevel, getTaskItemIndex, isInsideTask } from './pm-plugins/helpers';
+import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
 var taskDecisionToolbarGroup = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n"])));
 var addItem = function addItem(insert, listType, schema) {
   return function (_ref) {
@@ -57,8 +59,13 @@ var tasksAndDecisionsPlugin = function tasksAndDecisionsPlugin(_ref2) {
         return undefined;
       }
       var pluginState = taskPluginKey.getState(editorState);
+      var indentLevel = getCurrentIndentLevel(editorState.selection) || 0;
+      var itemIndex = getTaskItemIndex(editorState);
       return {
-        focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null
+        focusedTaskItemLocalId: (pluginState === null || pluginState === void 0 ? void 0 : pluginState.focusedTaskItemLocalId) || null,
+        isInsideTask: isInsideTask(editorState),
+        indentDisabled: itemIndex === 0 || indentLevel >= MAX_INDENTATION_LEVEL,
+        outdentDisabled: indentLevel <= 1
       };
     },
     pmPlugins: function pmPlugins() {