@atlaskit/editor-core 188.8.0 → 188.9.2

package/dist/es2019/labs/next/presets/default.js

@@ -10,7 +10,7 @@ import { unsupportedContentPlugin } from '@atlaskit/editor-plugin-unsupported-co
 import { basePlugin } from '@atlaskit/editor-plugin-base';
 import { focusPlugin } from '@atlaskit/editor-plugin-focus';
 import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
-import typeAheadPlugin from '../../../plugins/type-ahead';
+import { typeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
 import fakeTextCursorPlugin from '../../../plugins/fake-text-cursor';
 import { featureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';

package/dist/es2019/labs/next/presets/universal.js

@@ -1,4 +1,5 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, textColorPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../../../plugins';
+import { statusPlugin } from '@atlaskit/editor-plugin-status';
 import { datePlugin } from '../../../plugins/date';
 import { captionPlugin } from '@atlaskit/editor-plugin-caption';
 import { borderPlugin } from '@atlaskit/editor-plugin-border';
@@ -15,6 +16,8 @@ import { cardPlugin } from '@atlaskit/editor-plugin-card';
 import { tablesPlugin } from '@atlaskit/editor-plugin-table';
 import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
+import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
 import { isFullPage as fullPageCheck } from '../../../utils/is-full-page';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { createDefaultPreset } from './default';

package/dist/es2019/plugins/index.js

@@ -15,12 +15,9 @@ export { default as mentionsPlugin } from './mentions';
 export { default as panelPlugin } from './panel';
 export { default as pastePlugin } from './paste';
 export { default as placeholderTextPlugin } from './placeholder-text';
-export { default as saveOnEnterPlugin } from './save-on-enter';
 export { default as submitEditorPlugin } from './submit-editor';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as textColorPlugin } from './text-color';
-export { default as typeAheadPlugin } from './type-ahead';
-export { default as statusPlugin } from './status';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
@@ -32,7 +29,6 @@ export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
 export { default as historyPlugin } from './history';
 export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
-export { default as scrollIntoViewPlugin } from './scroll-into-view';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';
 export { default as mobileSelectionPlugin } from './mobile-selection';

package/dist/es2019/plugins/insert-block/index.js

@@ -1,11 +1,9 @@
 import React from 'react';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
-import { isTypeAheadAllowed } from '../type-ahead/utils';
 import { pluginKey as layoutStateKey } from '../layout';
 import { insertMacroFromMacroBrowser } from '../macro';
 import WithPluginState from '../../ui/WithPluginState';
 import ToolbarInsertBlock from './ui/ToolbarInsertBlock';
-import { pluginKey as typeAheadPluginKey } from '../type-ahead/pm-plugins/key';
 import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
 import { INPUT_METHOD } from '../analytics';
 import { pluginKey as placeholderTextStateKey } from '../placeholder-text/plugin-key';
@@ -69,7 +67,6 @@ const insertBlockPlugin = ({
         // `ToolbarInsertBlockWithInjectionApi` and remove `WithPluginState`
         return /*#__PURE__*/React.createElement(WithPluginState, {
           plugins: {
-            typeAheadState: typeAheadPluginKey,
             macroState: macroStateKey,
             placeholderTextState: placeholderTextStateKey,
             layoutState: layoutStateKey
@@ -138,14 +135,15 @@ function ToolbarInsertBlockWithInjectionApi({
     mentionState,
     emojiState,
     blockTypeState,
-    mediaState
-  } = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media']);
+    mediaState,
+    typeAheadState
+  } = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead']);
   return /*#__PURE__*/React.createElement(ToolbarInsertBlock, {
     pluginInjectionApi: pluginInjectionApi,
     buttons: buttons,
     isReducedSpacing: isToolbarReducedSpacing,
     isDisabled: disabled,
-    isTypeAheadAllowed: isTypeAheadAllowed(editorView.state),
+    isTypeAheadAllowed: Boolean(typeAheadState === null || typeAheadState === void 0 ? void 0 : typeAheadState.isAllowed),
     editorView: editorView,
     tableSupported: !!editorView.state.schema.nodes.table,
     actionSupported: !!editorView.state.schema.nodes.taskItem,

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

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import { css, jsx } from '@emotion/react';
 import { decisionItem, decisionList, taskItem, taskList } from '@atlaskit/adf-schema';
-import { INPUT_METHOD } from '../analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { messages as insertBlockMessages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { IconAction, IconDecision } from '@atlaskit/editor-common/quick-insert';
 import { insertTaskDecisionAction, getListTypes } from './commands';
@@ -32,7 +32,8 @@ const tasksAndDecisionsPlugin = ({
     allowNestedTasks,
     consumeTabs,
     useLongPressSelection
-  } = {}
+  } = {},
+  api
 }) => ({
   name: 'taskDecision',
   nodes() {
@@ -59,7 +60,7 @@ const tasksAndDecisionsPlugin = ({
         eventDispatcher,
         dispatch
       }) => {
-        return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, useLongPressSelection);
+        return createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection);
       }
     }, {
       name: 'tasksAndDecisionsInputRule',

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/decisionItem.js

@@ -1,11 +1,29 @@
 import React from 'react';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import DecisionItem from '../ui/Decision';
-import { isTypeAheadOpen } from '../../type-ahead/utils';
+const DecisionItemWrapper = ({
+  api,
+  forwardRef,
+  isContentNodeEmpty
+}) => {
+  const {
+    typeAheadState
+  } = useSharedPluginState(api, ['typeAhead']);
+  return /*#__PURE__*/React.createElement(DecisionItem, {
+    contentRef: forwardRef,
+    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen)
+  });
+};
 class Decision extends ReactNodeView {
   isContentEmpty(node) {
     return node.content.childCount === 0;
   }
+  initWithAPI(api) {
+    this.init();
+    this.api = api;
+    return this;
+  }
   createDomRef() {
     const domRef = document.createElement('li');
     domRef.style['list-style-type'] = 'none';
@@ -21,9 +39,11 @@ class Decision extends ReactNodeView {
     };
   }
   render(_props, forwardRef) {
-    return /*#__PURE__*/React.createElement(DecisionItem, {
-      contentRef: forwardRef,
-      showPlaceholder: this.isContentEmpty(this.node) && !isTypeAheadOpen(this.view.state)
+    const isContentNodeEmpty = this.isContentEmpty(this.node);
+    return /*#__PURE__*/React.createElement(DecisionItemWrapper, {
+      forwardRef: forwardRef,
+      isContentNodeEmpty: isContentNodeEmpty,
+      api: this.api
     });
   }
   viewShouldUpdate(nextNode) {
@@ -40,7 +60,7 @@ class Decision extends ReactNodeView {
     (_currentNode, _newNode) => !this.isContentEmpty(_newNode));
   }
 }
-export const decisionItemNodeView = (portalProviderAPI, eventDispatcher) => (node, view, getPos) => {
+export const decisionItemNodeView = (portalProviderAPI, eventDispatcher, api) => (node, view, getPos) => {
   const hasIntlContext = true;
-  return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();
+  return new Decision(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
 };

package/dist/es2019/plugins/tasks-and-decisions/nodeviews/taskItem.js

@@ -2,11 +2,37 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import WithPluginState from '../../../ui/WithPluginState';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { stateKey as taskPluginKey } from '../pm-plugins/plugin-key';
 import TaskItem from '../ui/Task';
-import { isTypeAheadOpen } from '../../type-ahead/utils';
+
+//import { isTypeAheadOpen } from '../../type-ahead/utils';
+
+const TaskItemWrapper = ({
+  localId,
+  forwardRef,
+  isDone,
+  onChange,
+  isFocused,
+  isContentNodeEmpty,
+  providerFactory,
+  api
+}) => {
+  const {
+    typeAheadState
+  } = useSharedPluginState(api, ['typeAhead']);
+  return /*#__PURE__*/React.createElement(TaskItem, {
+    taskId: localId,
+    contentRef: forwardRef,
+    isDone: isDone,
+    onChange: onChange,
+    isFocused: isFocused,
+    showPlaceholder: isContentNodeEmpty && !(typeAheadState !== null && typeAheadState !== void 0 && typeAheadState.isOpen),
+    providers: providerFactory
+  });
+};
 class Task extends ReactNodeView {
   constructor(...args) {
     super(...args);
@@ -73,6 +99,11 @@ class Task extends ReactNodeView {
       }
     });
   }
+  initWithAPI(api) {
+    this.init();
+    this.api = api;
+    return this;
+  }
   isContentEmpty(node) {
     return node.content.childCount === 0;
   }
@@ -95,6 +126,7 @@ class Task extends ReactNodeView {
       localId,
       state
     } = this.node.attrs;
+    const isContentNodeEmpty = this.isContentEmpty(this.node);
     return /*#__PURE__*/React.createElement(AnalyticsListener, {
       channel: "fabric-elements",
       onEvent: this.addListAnalyticsData
@@ -105,14 +137,15 @@ class Task extends ReactNodeView {
       render: ({
         taskDecisionPlugin
       }) => {
-        return /*#__PURE__*/React.createElement(TaskItem, {
-          taskId: localId,
-          contentRef: forwardRef,
+        return /*#__PURE__*/React.createElement(TaskItemWrapper, {
+          localId: localId,
+          forwardRef: forwardRef,
           isDone: state === 'DONE',
           onChange: this.handleOnChange,
-          isFocused: (taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId,
-          showPlaceholder: this.isContentEmpty(this.node) && !isTypeAheadOpen(this.view.state),
-          providers: props.providerFactory
+          isFocused: Boolean((taskDecisionPlugin === null || taskDecisionPlugin === void 0 ? void 0 : taskDecisionPlugin.focusedTaskItemLocalId) === localId),
+          isContentNodeEmpty: isContentNodeEmpty,
+          providerFactory: props.providerFactory,
+          api: this.api
         });
       }
     }));
@@ -131,11 +164,11 @@ class Task extends ReactNodeView {
     !this.isContentEmpty(newNode) && !!(currentNode.attrs.state === newNode.attrs.state));
   }
 }
-export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory) {
+export function taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api) {
   return (node, view, getPos) => {
     const hasIntlContext = true;
     return new Task(node, view, getPos, portalProviderAPI, eventDispatcher, {
       providerFactory
-    }, undefined, undefined, undefined, hasIntlContext).init();
+    }, undefined, undefined, undefined, hasIntlContext).initWithAPI(api);
   };
 }

package/dist/es2019/plugins/tasks-and-decisions/pm-plugins/main.js

@@ -1,14 +1,21 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
-import { nodesBetweenChanged, SetAttrsStep } from '../../../utils';
-import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
+import { getStepRange } from '@atlaskit/editor-common/utils';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { createSelectionClickHandler, GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { decisionItemNodeView } from '../nodeviews/decisionItem';
 import { taskItemNodeViewFactory } from '../nodeviews/taskItem';
 import { stateKey } from './plugin-key';
 import { getTaskItemDataToFocus, getTaskItemDataAtPos, focusCheckboxAndUpdateSelection, removeCheckboxFocus } from './helpers';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { ACTIONS } from './types';
+function nodesBetweenChanged(tr, f, startPos) {
+  const stepRange = getStepRange(tr);
+  if (!stepRange) {
+    return;
+  }
+  tr.doc.nodesBetween(stepRange.from, stepRange.to, f, startPos);
+}
 const setContextIdentifierProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(stateKey, {
@@ -18,12 +25,12 @@ const setContextIdentifierProvider = provider => (state, dispatch) => {
   }
   return true;
 };
-export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, useLongPressSelection = false) {
+export function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispatch, api, useLongPressSelection = false) {
   return new SafePlugin({
     props: {
       nodeViews: {
-        taskItem: taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory),
-        decisionItem: decisionItemNodeView(portalProviderAPI, eventDispatcher)
+        taskItem: taskItemNodeViewFactory(portalProviderAPI, eventDispatcher, providerFactory, api),
+        decisionItem: decisionItemNodeView(portalProviderAPI, eventDispatcher, api)
       },
       handleTextInput(view, from, to, text) {
         // When a decision item is selected and the user starts typing, the entire node

package/dist/es2019/version-wrapper.js

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

package/dist/esm/composable-editor/editor-internal.js

@@ -10,7 +10,7 @@ import { BaseTheme, WidthProvider } from '@atlaskit/editor-common/ui';
 import { getUiComponent } from '../create-editor';
 import ErrorBoundary from '../create-editor/ErrorBoundary';
 import { createFeatureFlagsFromProps } from '../create-editor/feature-flags-from-props';
-import ReactEditorView from '../create-editor/ReactEditorViewNext';
+import ReactEditorView from '../create-editor/ReactEditorView';
 import { ContextAdapter } from '../nodeviews/context-adapter';
 import EditorContext from '../ui/EditorContext';
 import { useSetPresetContext } from '../presets/context';