@atlaskit/editor-core 188.0.2 → 188.0.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 188.0.4
+
+### Patch Changes
+
+- [#40655](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40655) [`e08f00068b8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e08f00068b8) - [ECA11Y-76] Typeahead List - Improvement for screen reader users, now it correctly reads the position of the selected item in the list
+- [#40774](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40774) [`c61db65ea25`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c61db65ea25) - [ED-17196] Refactored provider factory initialisation
+
 ## 188.0.2
 
 ### Patch Changes

package/dist/cjs/composable-editor/hooks/useProviderFactory.js

@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = useProviderFactory;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _prepareExtensionProvider = _interopRequireDefault(require("../../utils/prepare-extension-provider"));
 var _prepareQuickInsertProvider = _interopRequireDefault(require("../../utils/prepare-quick-insert-provider"));
 var _getProvidersFromEditorProps = _interopRequireDefault(require("../utils/getProvidersFromEditorProps"));
 var _handleProviders = _interopRequireDefault(require("../utils/handleProviders"));
-function createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent) {
+function prepareProviders(editorActions, quickInsert, extensionProviders, createAnalyticsEvent) {
   var extensionProvider = (0, _prepareExtensionProvider.default)(function () {
     return editorActions;
   })(extensionProviders);
@@ -34,9 +32,7 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
  * @returns ProviderFactory for Editor
  */
 function useProviderFactory(props, editorActions, createAnalyticsEvent) {
-  var extensionProviders = props.extensionProviders,
-    quickInsert = props.quickInsert,
-    linking = props.linking,
+  var linking = props.linking,
     autoformattingProvider = props.autoformattingProvider,
     media = props.media,
     emojiProvider = props.emojiProvider,
@@ -49,47 +45,15 @@ function useProviderFactory(props, editorActions, createAnalyticsEvent) {
     activityProvider = props.activityProvider,
     collabEdit = props.collabEdit,
     collabEditProvider = props.collabEditProvider,
-    presenceProvider = props.presenceProvider;
+    presenceProvider = props.presenceProvider,
+    quickInsert = props.quickInsert,
+    extensionProviders = props.extensionProviders;
+
+  // TODO: Remove these when we deprecate these props from editor-props - smartLinks is unfortunately still used in some places, we can sidestep this problem if we move everyone across to ComposableEditor and deprecate Editor
   var UNSAFE_cards = props.UNSAFE_cards;
   var smartLinks = props.smartLinks;
-  var providerFactory = (0, _react.useRef)(new _providerFactory.ProviderFactory());
-  var _useState = (0, _react.useState)(createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent)),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    providerState = _useState2[0],
-    setProviderState = _useState2[1];
-  var prevProps = (0, _hooks.usePreviousState)({
-    extensionProviders: extensionProviders,
-    quickInsert: quickInsert
-  });
-  (0, _react.useEffect)(function () {
-    if (extensionProviders && extensionProviders !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders) ||
-    // Though this will introduce some performance regression related to quick insert
-    // loading but we can remove it soon when Forge will move to new API.
-    // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
-    quickInsert && quickInsert !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert)) {
-      var newState = createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent);
-      setProviderState(newState);
-      (0, _handleProviders.default)(providerFactory.current, (0, _getProvidersFromEditorProps.default)({
-        linking: linking,
-        smartLinks: smartLinks,
-        UNSAFE_cards: UNSAFE_cards,
-        autoformattingProvider: autoformattingProvider,
-        media: media,
-        emojiProvider: emojiProvider,
-        mentionProvider: mentionProvider,
-        legacyImageUploadProvider: legacyImageUploadProvider,
-        taskDecisionProvider: taskDecisionProvider,
-        contextIdentifierProvider: contextIdentifierProvider,
-        searchProvider: searchProvider,
-        macroProvider: macroProvider,
-        activityProvider: activityProvider,
-        collabEdit: collabEdit,
-        collabEditProvider: collabEditProvider,
-        presenceProvider: presenceProvider
-      }), newState.extensionProvider, newState.quickInsertProvider);
-      return;
-    }
-    (0, _handleProviders.default)(providerFactory.current, (0, _getProvidersFromEditorProps.default)({
+  var providers = (0, _react.useMemo)(function () {
+    return (0, _getProvidersFromEditorProps.default)({
       linking: linking,
       smartLinks: smartLinks,
       UNSAFE_cards: UNSAFE_cards,
@@ -106,8 +70,20 @@ function useProviderFactory(props, editorActions, createAnalyticsEvent) {
       collabEdit: collabEdit,
       collabEditProvider: collabEditProvider,
       presenceProvider: presenceProvider
-    }), providerState.extensionProvider, providerState.quickInsertProvider);
-  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
+    });
+  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider]);
+  var providerFactory = (0, _react.useRef)(new _providerFactory.ProviderFactory());
+  var preparedProviders = (0, _react.useMemo)(function () {
+    return (
+      // Though this will introduce some performance regression related to quick insert
+      // loading but we can remove it soon when Forge will move to new API.
+      // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
+      prepareProviders(editorActions, quickInsert, extensionProviders, createAnalyticsEvent)
+    );
+  }, [extensionProviders, quickInsert, editorActions, createAnalyticsEvent]);
+  (0, _react.useEffect)(function () {
+    (0, _handleProviders.default)(providerFactory.current, providers, preparedProviders.extensionProvider, preparedProviders.quickInsertProvider);
+  }, [providers, preparedProviders]);
 
   // componentWillUnmount equivalent
   (0, _react.useEffect)(function () {

package/dist/cjs/composable-editor/utils/getProvidersFromEditorProps.js

@@ -36,6 +36,6 @@ function getProvidersFromEditorProps(_ref) {
     searchProvider: searchProvider,
     presenceProvider: presenceProvider,
     macroProvider: macroProvider,
-    collabEditProvider: collabEdit && collabEdit.provider ? collabEdit.provider : collabEditProvider
+    collabEditProvider: collabEdit !== null && collabEdit !== void 0 && collabEdit.provider ? collabEdit.provider : collabEditProvider
   };
 }

package/dist/cjs/plugins/type-ahead/ui/TypeAheadListItem.js

@@ -128,6 +128,7 @@ var TypeAheadListItem = function TypeAheadListItem(_ref3) {
       role: "option",
       "aria-label": ariaLabel,
       "aria-setsize": itemsLength,
+      "aria-posinset": itemIndex,
       tabIndex: 0,
       css: listItemClasses,
       className: "ak-typeahead-item ".concat(isSelected ? 'typeahead-selected-item' : '')
@@ -142,7 +143,7 @@ var TypeAheadListItem = function TypeAheadListItem(_ref3) {
       ,
       onHover: noop
     })));
-  }, [customRenderItem, isSelected, ariaLabel, itemsLength, customItemRef, insertSelectedItem]);
+  }, [customRenderItem, isSelected, ariaLabel, itemsLength, customItemRef, insertSelectedItem, itemIndex]);
   if (customItem) {
     return customItem;
   }
@@ -156,6 +157,7 @@ var TypeAheadListItem = function TypeAheadListItem(_ref3) {
     "aria-selected": isSelected,
     "aria-label": title,
     "aria-setsize": itemsLength,
+    "aria-posinset": itemIndex,
     role: "option",
     ref: buttonItemRef,
     css: listItemClasses

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "188.0.2";
+var version = "188.0.4";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/composable-editor/hooks/useProviderFactory.js

@@ -1,11 +1,10 @@
-import { useEffect, useRef, useState } from 'react';
-import { usePreviousState } from '@atlaskit/editor-common/hooks';
+import { useEffect, useMemo, useRef } from 'react';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import prepareExtensionProvider from '../../utils/prepare-extension-provider';
 import prepareQuickInsertProvider from '../../utils/prepare-quick-insert-provider';
 import getProvidersFromEditorProps from '../utils/getProvidersFromEditorProps';
 import handleProviders from '../utils/handleProviders';
-function createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent) {
+function prepareProviders(editorActions, quickInsert, extensionProviders, createAnalyticsEvent) {
   const extensionProvider = prepareExtensionProvider(() => editorActions)(extensionProviders);
   const quickInsertProvider = prepareQuickInsertProvider(editorActions, extensionProvider, quickInsert, createAnalyticsEvent);
   return {
@@ -25,8 +24,6 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
  */
 export default function useProviderFactory(props, editorActions, createAnalyticsEvent) {
   const {
-    extensionProviders,
-    quickInsert,
     linking,
     autoformattingProvider,
     media,
@@ -40,63 +37,41 @@ export default function useProviderFactory(props, editorActions, createAnalytics
     activityProvider,
     collabEdit,
     collabEditProvider,
-    presenceProvider
+    presenceProvider,
+    quickInsert,
+    extensionProviders
   } = props;
+
+  // TODO: Remove these when we deprecate these props from editor-props - smartLinks is unfortunately still used in some places, we can sidestep this problem if we move everyone across to ComposableEditor and deprecate Editor
   const UNSAFE_cards = props.UNSAFE_cards;
   const smartLinks = props.smartLinks;
+  const providers = useMemo(() => getProvidersFromEditorProps({
+    linking,
+    smartLinks,
+    UNSAFE_cards,
+    autoformattingProvider,
+    media,
+    emojiProvider,
+    mentionProvider,
+    legacyImageUploadProvider,
+    taskDecisionProvider,
+    contextIdentifierProvider,
+    searchProvider,
+    macroProvider,
+    activityProvider,
+    collabEdit,
+    collabEditProvider,
+    presenceProvider
+  }), [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider]);
   const providerFactory = useRef(new ProviderFactory());
-  const [providerState, setProviderState] = useState(createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent));
-  const prevProps = usePreviousState({
-    extensionProviders,
-    quickInsert
-  });
+  const preparedProviders = useMemo(() =>
+  // Though this will introduce some performance regression related to quick insert
+  // loading but we can remove it soon when Forge will move to new API.
+  // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
+  prepareProviders(editorActions, quickInsert, extensionProviders, createAnalyticsEvent), [extensionProviders, quickInsert, editorActions, createAnalyticsEvent]);
   useEffect(() => {
-    if (extensionProviders && extensionProviders !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders) ||
-    // Though this will introduce some performance regression related to quick insert
-    // loading but we can remove it soon when Forge will move to new API.
-    // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
-    quickInsert && quickInsert !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert)) {
-      const newState = createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent);
-      setProviderState(newState);
-      handleProviders(providerFactory.current, getProvidersFromEditorProps({
-        linking,
-        smartLinks,
-        UNSAFE_cards,
-        autoformattingProvider,
-        media,
-        emojiProvider,
-        mentionProvider,
-        legacyImageUploadProvider,
-        taskDecisionProvider,
-        contextIdentifierProvider,
-        searchProvider,
-        macroProvider,
-        activityProvider,
-        collabEdit,
-        collabEditProvider,
-        presenceProvider
-      }), newState.extensionProvider, newState.quickInsertProvider);
-      return;
-    }
-    handleProviders(providerFactory.current, getProvidersFromEditorProps({
-      linking,
-      smartLinks,
-      UNSAFE_cards,
-      autoformattingProvider,
-      media,
-      emojiProvider,
-      mentionProvider,
-      legacyImageUploadProvider,
-      taskDecisionProvider,
-      contextIdentifierProvider,
-      searchProvider,
-      macroProvider,
-      activityProvider,
-      collabEdit,
-      collabEditProvider,
-      presenceProvider
-    }), providerState.extensionProvider, providerState.quickInsertProvider);
-  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
+    handleProviders(providerFactory.current, providers, preparedProviders.extensionProvider, preparedProviders.quickInsertProvider);
+  }, [providers, preparedProviders]);
 
   // componentWillUnmount equivalent
   useEffect(() => {

package/dist/es2019/composable-editor/utils/getProvidersFromEditorProps.js

@@ -23,7 +23,7 @@ export default function getProvidersFromEditorProps({
     emojiProvider: emojiProvider,
     mentionProvider: mentionProvider,
     autoformattingProvider: autoformattingProvider,
-    cardProvider: cardProvider,
+    cardProvider,
     activityProvider: activityProvider,
     imageUploadProvider: legacyImageUploadProvider,
     taskDecisionProvider: taskDecisionProvider,
@@ -31,6 +31,6 @@ export default function getProvidersFromEditorProps({
     searchProvider: searchProvider,
     presenceProvider: presenceProvider,
     macroProvider: macroProvider,
-    collabEditProvider: collabEdit && collabEdit.provider ? collabEdit.provider : collabEditProvider
+    collabEditProvider: collabEdit !== null && collabEdit !== void 0 && collabEdit.provider ? collabEdit.provider : collabEditProvider
   };
 }

package/dist/es2019/plugins/type-ahead/ui/TypeAheadListItem.js

@@ -159,6 +159,7 @@ export const TypeAheadListItem = ({
       role: "option",
       "aria-label": ariaLabel,
       "aria-setsize": itemsLength,
+      "aria-posinset": itemIndex,
       tabIndex: 0,
       css: listItemClasses,
       className: `ak-typeahead-item ${isSelected ? 'typeahead-selected-item' : ''}`
@@ -173,7 +174,7 @@ export const TypeAheadListItem = ({
       ,
       onHover: noop
     })));
-  }, [customRenderItem, isSelected, ariaLabel, itemsLength, customItemRef, insertSelectedItem]);
+  }, [customRenderItem, isSelected, ariaLabel, itemsLength, customItemRef, insertSelectedItem, itemIndex]);
   if (customItem) {
     return customItem;
   }
@@ -187,6 +188,7 @@ export const TypeAheadListItem = ({
     "aria-selected": isSelected,
     "aria-label": title,
     "aria-setsize": itemsLength,
+    "aria-posinset": itemIndex,
     role: "option",
     ref: buttonItemRef,
     css: listItemClasses

package/dist/es2019/version-wrapper.js

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

package/dist/esm/composable-editor/hooks/useProviderFactory.js

@@ -1,12 +1,10 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import { useEffect, useRef, useState } from 'react';
-import { usePreviousState } from '@atlaskit/editor-common/hooks';
+import { useEffect, useMemo, useRef } from 'react';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import prepareExtensionProvider from '../../utils/prepare-extension-provider';
 import prepareQuickInsertProvider from '../../utils/prepare-quick-insert-provider';
 import getProvidersFromEditorProps from '../utils/getProvidersFromEditorProps';
 import handleProviders from '../utils/handleProviders';
-function createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent) {
+function prepareProviders(editorActions, quickInsert, extensionProviders, createAnalyticsEvent) {
   var extensionProvider = prepareExtensionProvider(function () {
     return editorActions;
   })(extensionProviders);
@@ -27,9 +25,7 @@ function createNewState(editorActions, quickInsert, extensionProviders, createAn
  * @returns ProviderFactory for Editor
  */
 export default function useProviderFactory(props, editorActions, createAnalyticsEvent) {
-  var extensionProviders = props.extensionProviders,
-    quickInsert = props.quickInsert,
-    linking = props.linking,
+  var linking = props.linking,
     autoformattingProvider = props.autoformattingProvider,
     media = props.media,
     emojiProvider = props.emojiProvider,
@@ -42,47 +38,15 @@ export default function useProviderFactory(props, editorActions, createAnalytics
     activityProvider = props.activityProvider,
     collabEdit = props.collabEdit,
     collabEditProvider = props.collabEditProvider,
-    presenceProvider = props.presenceProvider;
+    presenceProvider = props.presenceProvider,
+    quickInsert = props.quickInsert,
+    extensionProviders = props.extensionProviders;
+
+  // TODO: Remove these when we deprecate these props from editor-props - smartLinks is unfortunately still used in some places, we can sidestep this problem if we move everyone across to ComposableEditor and deprecate Editor
   var UNSAFE_cards = props.UNSAFE_cards;
   var smartLinks = props.smartLinks;
-  var providerFactory = useRef(new ProviderFactory());
-  var _useState = useState(createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent)),
-    _useState2 = _slicedToArray(_useState, 2),
-    providerState = _useState2[0],
-    setProviderState = _useState2[1];
-  var prevProps = usePreviousState({
-    extensionProviders: extensionProviders,
-    quickInsert: quickInsert
-  });
-  useEffect(function () {
-    if (extensionProviders && extensionProviders !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders) ||
-    // Though this will introduce some performance regression related to quick insert
-    // loading but we can remove it soon when Forge will move to new API.
-    // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
-    quickInsert && quickInsert !== (prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert)) {
-      var newState = createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent);
-      setProviderState(newState);
-      handleProviders(providerFactory.current, getProvidersFromEditorProps({
-        linking: linking,
-        smartLinks: smartLinks,
-        UNSAFE_cards: UNSAFE_cards,
-        autoformattingProvider: autoformattingProvider,
-        media: media,
-        emojiProvider: emojiProvider,
-        mentionProvider: mentionProvider,
-        legacyImageUploadProvider: legacyImageUploadProvider,
-        taskDecisionProvider: taskDecisionProvider,
-        contextIdentifierProvider: contextIdentifierProvider,
-        searchProvider: searchProvider,
-        macroProvider: macroProvider,
-        activityProvider: activityProvider,
-        collabEdit: collabEdit,
-        collabEditProvider: collabEditProvider,
-        presenceProvider: presenceProvider
-      }), newState.extensionProvider, newState.quickInsertProvider);
-      return;
-    }
-    handleProviders(providerFactory.current, getProvidersFromEditorProps({
+  var providers = useMemo(function () {
+    return getProvidersFromEditorProps({
       linking: linking,
       smartLinks: smartLinks,
       UNSAFE_cards: UNSAFE_cards,
@@ -99,8 +63,20 @@ export default function useProviderFactory(props, editorActions, createAnalytics
       collabEdit: collabEdit,
       collabEditProvider: collabEditProvider,
       presenceProvider: presenceProvider
-    }), providerState.extensionProvider, providerState.quickInsertProvider);
-  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider, prevProps === null || prevProps === void 0 ? void 0 : prevProps.quickInsert, prevProps === null || prevProps === void 0 ? void 0 : prevProps.extensionProviders, createAnalyticsEvent, editorActions, providerState.extensionProvider, providerState.quickInsertProvider, extensionProviders, quickInsert]);
+    });
+  }, [linking, smartLinks, UNSAFE_cards, autoformattingProvider, media, emojiProvider, mentionProvider, legacyImageUploadProvider, taskDecisionProvider, contextIdentifierProvider, searchProvider, macroProvider, activityProvider, collabEdit, collabEditProvider, presenceProvider]);
+  var providerFactory = useRef(new ProviderFactory());
+  var preparedProviders = useMemo(function () {
+    return (
+      // Though this will introduce some performance regression related to quick insert
+      // loading but we can remove it soon when Forge will move to new API.
+      // quickInsert={Promise.resolve(consumerQuickInsert)} is one of the main reason behind this performance issue.
+      prepareProviders(editorActions, quickInsert, extensionProviders, createAnalyticsEvent)
+    );
+  }, [extensionProviders, quickInsert, editorActions, createAnalyticsEvent]);
+  useEffect(function () {
+    handleProviders(providerFactory.current, providers, preparedProviders.extensionProvider, preparedProviders.quickInsertProvider);
+  }, [providers, preparedProviders]);
 
   // componentWillUnmount equivalent
   useEffect(function () {

package/dist/esm/composable-editor/utils/getProvidersFromEditorProps.js

@@ -30,6 +30,6 @@ export default function getProvidersFromEditorProps(_ref) {
     searchProvider: searchProvider,
     presenceProvider: presenceProvider,
     macroProvider: macroProvider,
-    collabEditProvider: collabEdit && collabEdit.provider ? collabEdit.provider : collabEditProvider
+    collabEditProvider: collabEdit !== null && collabEdit !== void 0 && collabEdit.provider ? collabEdit.provider : collabEditProvider
   };
 }

package/dist/esm/plugins/type-ahead/ui/TypeAheadListItem.js

@@ -114,6 +114,7 @@ export var TypeAheadListItem = function TypeAheadListItem(_ref3) {
       role: "option",
       "aria-label": ariaLabel,
       "aria-setsize": itemsLength,
+      "aria-posinset": itemIndex,
       tabIndex: 0,
       css: listItemClasses,
       className: "ak-typeahead-item ".concat(isSelected ? 'typeahead-selected-item' : '')
@@ -128,7 +129,7 @@ export var TypeAheadListItem = function TypeAheadListItem(_ref3) {
       ,
       onHover: noop
     })));
-  }, [customRenderItem, isSelected, ariaLabel, itemsLength, customItemRef, insertSelectedItem]);
+  }, [customRenderItem, isSelected, ariaLabel, itemsLength, customItemRef, insertSelectedItem, itemIndex]);
   if (customItem) {
     return customItem;
   }
@@ -142,6 +143,7 @@ export var TypeAheadListItem = function TypeAheadListItem(_ref3) {
     "aria-selected": isSelected,
     "aria-label": title,
     "aria-setsize": itemsLength,
+    "aria-posinset": itemIndex,
     role: "option",
     ref: buttonItemRef,
     css: listItemClasses

package/dist/esm/version-wrapper.js

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

package/dist/types/composable-editor/hooks/useProviderFactory.d.ts

@@ -1,13 +1,7 @@
 import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import type { ExtensionProvider } from '@atlaskit/editor-common/extensions';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type EditorActions from '../../actions';
-import type { QuickInsertProvider } from '@atlaskit/editor-common/provider-factory';
 import type { EditorNextProps } from '../../types/editor-props';
-export type ProviderFactoryState = {
-    extensionProvider?: ExtensionProvider;
-    quickInsertProvider?: Promise<QuickInsertProvider>;
-};
 /**
  *
  * This hook is used to create the provider factory object.

package/dist/types/types/editor-props.d.ts

@@ -252,9 +252,9 @@ export interface EditorPluginFeatureProps {
     allowTextColor?: boolean | TextColorPluginConfig;
     allowTables?: boolean | TablesPluginConfig;
     insertMenuItems?: MenuItem[];
-    /** @deprecated Use smartLinks instead. */
+    /** @deprecated Use linking.smartLinks prop instead. */
     UNSAFE_cards?: CardOptions;
-    /** @deprecated Use linking instead. */
+    /** @deprecated Use linking.smartLinks prop instead. */
     smartLinks?: CardOptions;
     allowAnalyticsGASV3?: boolean;
     codeBlock?: CodeBlockOptions;

package/dist/types/utils/prepare-extension-provider.d.ts

@@ -1,5 +1,5 @@
 import type { ExtensionProvider } from '@atlaskit/editor-common/extensions';
-import EditorActions from '../actions';
-import { ExtensionProvidersProp } from '../types/editor-props';
+import type EditorActions from '../actions';
+import type { ExtensionProvidersProp } from '../types/editor-props';
 declare const prepareExtensionProvider: (getEditorActions: () => EditorActions) => (extensionProviders?: ExtensionProvidersProp) => ExtensionProvider | undefined;
 export default prepareExtensionProvider;

package/dist/types-ts4.5/composable-editor/hooks/useProviderFactory.d.ts

@@ -1,13 +1,7 @@
 import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
-import type { ExtensionProvider } from '@atlaskit/editor-common/extensions';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type EditorActions from '../../actions';
-import type { QuickInsertProvider } from '@atlaskit/editor-common/provider-factory';
 import type { EditorNextProps } from '../../types/editor-props';
-export type ProviderFactoryState = {
-    extensionProvider?: ExtensionProvider;
-    quickInsertProvider?: Promise<QuickInsertProvider>;
-};
 /**
  *
  * This hook is used to create the provider factory object.

package/dist/types-ts4.5/types/editor-props.d.ts

@@ -252,9 +252,9 @@ export interface EditorPluginFeatureProps {
     allowTextColor?: boolean | TextColorPluginConfig;
     allowTables?: boolean | TablesPluginConfig;
     insertMenuItems?: MenuItem[];
-    /** @deprecated Use smartLinks instead. */
+    /** @deprecated Use linking.smartLinks prop instead. */
     UNSAFE_cards?: CardOptions;
-    /** @deprecated Use linking instead. */
+    /** @deprecated Use linking.smartLinks prop instead. */
     smartLinks?: CardOptions;
     allowAnalyticsGASV3?: boolean;
     codeBlock?: CodeBlockOptions;

package/dist/types-ts4.5/utils/prepare-extension-provider.d.ts

@@ -1,5 +1,5 @@
 import type { ExtensionProvider } from '@atlaskit/editor-common/extensions';
-import EditorActions from '../actions';
-import { ExtensionProvidersProp } from '../types/editor-props';
+import type EditorActions from '../actions';
+import type { ExtensionProvidersProp } from '../types/editor-props';
 declare const prepareExtensionProvider: (getEditorActions: () => EditorActions) => (extensionProviders?: ExtensionProvidersProp) => ExtensionProvider | undefined;
 export default prepareExtensionProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "188.0.2",
+  "version": "188.0.4",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"