@atlaskit/editor-core 195.9.1 → 196.1.0

package/CHANGELOG.md

@@ -1,5 +1,58 @@
 # @atlaskit/editor-core
 
+## 196.1.0
+
+### Minor Changes
+
+- [`c4d2eb3f9f965`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c4d2eb3f9f965) -
+  [ux] Fix issue with card provider not updating asynchronously
+
+### Patch Changes
+
+- [`84c0869e8c5c6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/84c0869e8c5c6) -
+  remove unused cardview refactor FF and components
+- Updated dependencies
+
+## 196.0.0
+
+### Major Changes
+
+- [#133449](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/133449)
+  [`e71e7162cf5c2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e71e7162cf5c2) -
+  [ux] Add new parameter for ContextPanel component: "editorAPI". This only affects
+  `full-page`/`full-width` appearance
+
+  WHAT? `ContextPanel` previously used a deprecated method `WithPluginState` to listen to plugin
+  changes.
+
+  The behaviour now uses the new `editorAPI` to listen to plugin updates and display the UI
+  accordingly.
+
+  WHY? The old approach is deprecated and no longer supported.
+
+  HOW? Generally this only affects consumers using `full-page`/`full-width` appearances. If you are
+  not using the `contextPanel` prop as well, this does not apply.
+
+  Currently you can pass a `contextPanel` to the editor to override the default. If you are doing
+  this you will now need to pass the `editorAPI` (or `undefined` if you are not using the
+  `extensionPlugin` with your context panel)
+
+  Example:
+
+  ```tsx
+  function Editor() {
+    const { preset, editorApi } = usePreset(...);
+
+    return (
+      <ComposableEditor
+        preset={preset}
+        contextPanel={<ContextPanel editorAPI={editorApi} visible={...} />}
+      />
+    );
+  }
+
+  ```
+
 ## 195.9.1
 
 ### Patch Changes

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

@@ -147,7 +147,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
   }), (0, _react2.jsx)(PortalRenderer, null))))))));
 });
 function ReactEditorViewContextWrapper(props) {
-  var _props$editorProps$me;
+  var _props$editorProps$me, _props$editorProps$li;
   var setInternalEditorAPI = (0, _context.useSetPresetContext)();
   var setExternalEditorAPI = props.setEditorApi;
 
@@ -165,9 +165,14 @@ function ReactEditorViewContextWrapper(props) {
     setInternalEditorAPI === null || setInternalEditorAPI === void 0 || setInternalEditorAPI(api);
     setExternalEditorAPI === null || setExternalEditorAPI === void 0 || setExternalEditorAPI(api);
   }, [setInternalEditorAPI, setExternalEditorAPI]);
+
+  // 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.editorProps.UNSAFE_cards;
+  var smartLinks = props.editorProps.smartLinks;
   (0, _useProviders.useProviders)({
     contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
-    mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider
+    mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider,
+    cardProvider: ((_props$editorProps$li = props.editorProps.linking) === null || _props$editorProps$li === void 0 || (_props$editorProps$li = _props$editorProps$li.smartLinks) === null || _props$editorProps$li === void 0 ? void 0 : _props$editorProps$li.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider
   });
   return (0, _react2.jsx)(_ReactEditorView.default, (0, _extends2.default)({}, props, {
     setEditorApi: setEditorAPI

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

@@ -19,7 +19,8 @@ var _context2 = require("../../presets/context");
  */
 var useProviders = exports.useProviders = function useProviders(_ref) {
   var contextIdentifierProvider = _ref.contextIdentifierProvider,
-    mediaProvider = _ref.mediaProvider;
+    mediaProvider = _ref.mediaProvider,
+    cardProvider = _ref.cardProvider;
   var editorApi = (0, _context2.usePresetContext)();
   (0, _react.useEffect)(function () {
     function setProvider() {
@@ -61,4 +62,10 @@ var useProviders = exports.useProviders = function useProviders(_ref) {
       editorApi === null || editorApi === void 0 || (_editorApi$media = editorApi.media) === null || _editorApi$media === void 0 || _editorApi$media.actions.setProvider(mediaProvider);
     }
   }, [mediaProvider, editorApi]);
+  (0, _react.useEffect)(function () {
+    if (cardProvider) {
+      var _editorApi$card;
+      editorApi === null || editorApi === void 0 || (_editorApi$card = editorApi.card) === null || _editorApi$card === void 0 || _editorApi$card.actions.setProvider(cardProvider);
+    }
+  }, [cardProvider, editorApi]);
 };

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = handleProviders;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  *
  * Utility to set all the providers on a provider factory
@@ -37,7 +38,7 @@ function handleProviders(providerFactory, _ref, extensionProvider, quickInsertPr
   providerFactory.setProvider('searchProvider', searchProvider);
   providerFactory.setProvider('presenceProvider', presenceProvider);
   providerFactory.setProvider('macroProvider', macroProvider);
-  if (cardProvider) {
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_card_provider_from_plugin_config')) {
     providerFactory.setProvider('cardProvider', cardProvider);
   }
   providerFactory.setProvider('autoformattingProvider', autoformattingProvider);

package/dist/cjs/index.js

@@ -37,7 +37,7 @@ Object.defineProperty(exports, "CollapsedEditor", {
 Object.defineProperty(exports, "ContextPanel", {
   enumerable: true,
   get: function get() {
-    return _deprecated.default;
+    return _ContextPanel.default;
   }
 });
 Object.defineProperty(exports, "EVENT_TYPE", {
@@ -156,7 +156,7 @@ var _WithHelpTrigger = _interopRequireDefault(require("./ui/WithHelpTrigger"));
 var _CollapsedEditor = _interopRequireDefault(require("./ui/CollapsedEditor"));
 var _ToolbarHelp = _interopRequireDefault(require("./ui/ToolbarHelp"));
 var _ToolbarFeedback = _interopRequireDefault(require("./ui/ToolbarFeedback"));
-var _deprecated = _interopRequireDefault(require("./ui/ContextPanel/deprecated"));
+var _ContextPanel = _interopRequireDefault(require("./ui/ContextPanel"));
 var _resource = require("@atlaskit/emoji/resource");
 var _resource2 = require("@atlaskit/mention/resource");
 var _teamResource = require("@atlaskit/mention/team-resource");

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "195.9.1";
+var version = exports.version = "196.1.0";

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

@@ -139,7 +139,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
   }), jsx(PortalRenderer, null))))))));
 });
 function ReactEditorViewContextWrapper(props) {
-  var _props$editorProps$me;
+  var _props$editorProps$me, _props$editorProps$li, _props$editorProps$li2;
   const setInternalEditorAPI = useSetPresetContext();
   const {
     setEditorApi: setExternalEditorAPI
@@ -159,9 +159,14 @@ function ReactEditorViewContextWrapper(props) {
     setInternalEditorAPI === null || setInternalEditorAPI === void 0 ? void 0 : setInternalEditorAPI(api);
     setExternalEditorAPI === null || setExternalEditorAPI === void 0 ? void 0 : setExternalEditorAPI(api);
   }, [setInternalEditorAPI, setExternalEditorAPI]);
+
+  // 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.editorProps.UNSAFE_cards;
+  const smartLinks = props.editorProps.smartLinks;
   useProviders({
     contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
-    mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider
+    mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider,
+    cardProvider: ((_props$editorProps$li = props.editorProps.linking) === null || _props$editorProps$li === void 0 ? void 0 : (_props$editorProps$li2 = _props$editorProps$li.smartLinks) === null || _props$editorProps$li2 === void 0 ? void 0 : _props$editorProps$li2.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider
   });
   return jsx(ReactEditorView, _extends({}, props, {
     setEditorApi: setEditorAPI

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

@@ -10,7 +10,8 @@ import { usePresetContext } from '../../presets/context';
  */
 export const useProviders = ({
   contextIdentifierProvider,
-  mediaProvider
+  mediaProvider,
+  cardProvider
 }) => {
   const editorApi = usePresetContext();
   useEffect(() => {
@@ -32,4 +33,10 @@ export const useProviders = ({
       editorApi === null || editorApi === void 0 ? void 0 : (_editorApi$media = editorApi.media) === null || _editorApi$media === void 0 ? void 0 : _editorApi$media.actions.setProvider(mediaProvider);
     }
   }, [mediaProvider, editorApi]);
+  useEffect(() => {
+    if (cardProvider) {
+      var _editorApi$card;
+      editorApi === null || editorApi === void 0 ? void 0 : (_editorApi$card = editorApi.card) === null || _editorApi$card === void 0 ? void 0 : _editorApi$card.actions.setProvider(cardProvider);
+    }
+  }, [cardProvider, editorApi]);
 };

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

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+
 /**
  *
  * Utility to set all the providers on a provider factory
@@ -32,7 +34,7 @@ export default function handleProviders(providerFactory, {
   providerFactory.setProvider('searchProvider', searchProvider);
   providerFactory.setProvider('presenceProvider', presenceProvider);
   providerFactory.setProvider('macroProvider', macroProvider);
-  if (cardProvider) {
+  if (!fg('platform_editor_card_provider_from_plugin_config')) {
     providerFactory.setProvider('cardProvider', cardProvider);
   }
   providerFactory.setProvider('autoformattingProvider', autoformattingProvider);

package/dist/es2019/index.js

@@ -12,7 +12,7 @@ export {
  * @deprecated
  * DO NOT USE THIS WILL BE REMOVED SOON. This was intended for internal usage only
  */
-default as ContextPanel } from './ui/ContextPanel/deprecated';
+default as ContextPanel } from './ui/ContextPanel';
 export { EmojiResource } from '@atlaskit/emoji/resource';
 export { MentionResource } from '@atlaskit/mention/resource';
 export { TeamMentionResource } from '@atlaskit/mention/team-resource';

package/dist/es2019/version-wrapper.js

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

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

@@ -143,7 +143,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
   }), jsx(PortalRenderer, null))))))));
 });
 function ReactEditorViewContextWrapper(props) {
-  var _props$editorProps$me;
+  var _props$editorProps$me, _props$editorProps$li;
   var setInternalEditorAPI = useSetPresetContext();
   var setExternalEditorAPI = props.setEditorApi;
 
@@ -161,9 +161,14 @@ function ReactEditorViewContextWrapper(props) {
     setInternalEditorAPI === null || setInternalEditorAPI === void 0 || setInternalEditorAPI(api);
     setExternalEditorAPI === null || setExternalEditorAPI === void 0 || setExternalEditorAPI(api);
   }, [setInternalEditorAPI, setExternalEditorAPI]);
+
+  // 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.editorProps.UNSAFE_cards;
+  var smartLinks = props.editorProps.smartLinks;
   useProviders({
     contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
-    mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider
+    mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider,
+    cardProvider: ((_props$editorProps$li = props.editorProps.linking) === null || _props$editorProps$li === void 0 || (_props$editorProps$li = _props$editorProps$li.smartLinks) === null || _props$editorProps$li === void 0 ? void 0 : _props$editorProps$li.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider
   });
   return jsx(ReactEditorView, _extends({}, props, {
     setEditorApi: setEditorAPI

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

@@ -12,7 +12,8 @@ import { usePresetContext } from '../../presets/context';
  */
 export var useProviders = function useProviders(_ref) {
   var contextIdentifierProvider = _ref.contextIdentifierProvider,
-    mediaProvider = _ref.mediaProvider;
+    mediaProvider = _ref.mediaProvider,
+    cardProvider = _ref.cardProvider;
   var editorApi = usePresetContext();
   useEffect(function () {
     function setProvider() {
@@ -54,4 +55,10 @@ export var useProviders = function useProviders(_ref) {
       editorApi === null || editorApi === void 0 || (_editorApi$media = editorApi.media) === null || _editorApi$media === void 0 || _editorApi$media.actions.setProvider(mediaProvider);
     }
   }, [mediaProvider, editorApi]);
+  useEffect(function () {
+    if (cardProvider) {
+      var _editorApi$card;
+      editorApi === null || editorApi === void 0 || (_editorApi$card = editorApi.card) === null || _editorApi$card === void 0 || _editorApi$card.actions.setProvider(cardProvider);
+    }
+  }, [cardProvider, editorApi]);
 };

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

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+
 /**
  *
  * Utility to set all the providers on a provider factory
@@ -31,7 +33,7 @@ export default function handleProviders(providerFactory, _ref, extensionProvider
   providerFactory.setProvider('searchProvider', searchProvider);
   providerFactory.setProvider('presenceProvider', presenceProvider);
   providerFactory.setProvider('macroProvider', macroProvider);
-  if (cardProvider) {
+  if (!fg('platform_editor_card_provider_from_plugin_config')) {
     providerFactory.setProvider('cardProvider', cardProvider);
   }
   providerFactory.setProvider('autoformattingProvider', autoformattingProvider);

package/dist/esm/index.js

@@ -12,7 +12,7 @@ export {
  * @deprecated
  * DO NOT USE THIS WILL BE REMOVED SOON. This was intended for internal usage only
  */
-default as ContextPanel } from './ui/ContextPanel/deprecated';
+default as ContextPanel } from './ui/ContextPanel';
 export { EmojiResource } from '@atlaskit/emoji/resource';
 export { MentionResource } from '@atlaskit/mention/resource';
 export { TeamMentionResource } from '@atlaskit/mention/team-resource';

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "195.9.1";
+export var version = "196.1.0";

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

@@ -1,7 +1,8 @@
-import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
+import type { CardProvider, ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
 interface UseProvidersProps {
     contextIdentifierProvider: Promise<ContextIdentifierProvider> | undefined;
     mediaProvider: Promise<MediaProvider> | undefined;
+    cardProvider: Promise<CardProvider> | undefined;
 }
 /**
  * This hook is used to replace the old approach of using the `providerFactory`.
@@ -11,5 +12,5 @@ interface UseProvidersProps {
  *
  * In the future ideally consumers implement this behaviour themselves.
  */
-export declare const useProviders: ({ contextIdentifierProvider, mediaProvider }: UseProvidersProps) => void;
+export declare const useProviders: ({ contextIdentifierProvider, mediaProvider, cardProvider, }: UseProvidersProps) => void;
 export {};

package/dist/types/index.d.ts

@@ -11,7 +11,7 @@ export {
  * @deprecated
  * DO NOT USE THIS WILL BE REMOVED SOON. This was intended for internal usage only
  */
-default as ContextPanel, } from './ui/ContextPanel/deprecated';
+default as ContextPanel, } from './ui/ContextPanel';
 export { EmojiResource } from '@atlaskit/emoji/resource';
 export { MentionResource } from '@atlaskit/mention/resource';
 export type { MentionProvider, PresenceProvider } from '@atlaskit/mention/resource';

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

@@ -1,7 +1,8 @@
-import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
+import type { CardProvider, ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-common/provider-factory';
 interface UseProvidersProps {
     contextIdentifierProvider: Promise<ContextIdentifierProvider> | undefined;
     mediaProvider: Promise<MediaProvider> | undefined;
+    cardProvider: Promise<CardProvider> | undefined;
 }
 /**
  * This hook is used to replace the old approach of using the `providerFactory`.
@@ -11,5 +12,5 @@ interface UseProvidersProps {
  *
  * In the future ideally consumers implement this behaviour themselves.
  */
-export declare const useProviders: ({ contextIdentifierProvider, mediaProvider }: UseProvidersProps) => void;
+export declare const useProviders: ({ contextIdentifierProvider, mediaProvider, cardProvider, }: UseProvidersProps) => void;
 export {};

package/dist/types-ts4.5/index.d.ts

@@ -11,7 +11,7 @@ export {
  * @deprecated
  * DO NOT USE THIS WILL BE REMOVED SOON. This was intended for internal usage only
  */
-default as ContextPanel, } from './ui/ContextPanel/deprecated';
+default as ContextPanel, } from './ui/ContextPanel';
 export { EmojiResource } from '@atlaskit/emoji/resource';
 export { MentionResource } from '@atlaskit/mention/resource';
 export type { MentionProvider, PresenceProvider } from '@atlaskit/mention/resource';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "195.9.1",
+	"version": "196.1.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -45,13 +45,13 @@
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^88.3.0",
+		"@atlaskit/editor-common": "^88.4.0",
 		"@atlaskit/editor-plugins": "^4.2.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/emoji": "^67.7.0",
 		"@atlaskit/icon": "^22.15.0",
-		"@atlaskit/media-card": "^78.1.0",
+		"@atlaskit/media-card": "^78.2.0",
 		"@atlaskit/mention": "^23.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/spinner": "^16.3.0",
@@ -80,7 +80,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
-		"@af/editor-examples-helpers": "0.3.2",
+		"@af/editor-examples-helpers": "0.3.4",
 		"@af/editor-libra": "*",
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-utils": "^19.8.0",
@@ -88,7 +88,7 @@
 		"@atlaskit/collab-provider": "9.37.4",
 		"@atlaskit/editor-json-transformer": "^8.18.0",
 		"@atlaskit/editor-plugin-annotation": "1.19.3",
-		"@atlaskit/editor-plugin-card": "^2.13.0",
+		"@atlaskit/editor-plugin-card": "^2.14.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-list": "^3.8.0",
 		"@atlaskit/editor-plugin-paste": "^1.11.0",
@@ -169,10 +169,6 @@
 		"platform.editor.table-sticky-scrollbar": {
 			"type": "boolean"
 		},
-		"platform.media-experience.card-views-refactor_b91lr": {
-			"type": "boolean",
-			"referenceOnly": "true"
-		},
 		"platform.editor.multi-bodied-extension_0rygg": {
 			"type": "boolean",
 			"referenceOnly": "true"
@@ -280,6 +276,9 @@
 		},
 		"platform_editor_remove_hide_avatar_group_prop": {
 			"type": "boolean"
+		},
+		"platform_editor_card_provider_from_plugin_config": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {