@atlaskit/editor-plugin-media 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-plugin-media
 
+## 1.2.0
+
+### Minor Changes
+
+- [#72122](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72122) [`c3186450404a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c3186450404a) - Breaking change:
+
+  ## WHAT?:
+
+  Removing feature flags:
+
+  - singleLayout
+  - newInsertionBehaviour
+  - interactiveExpand
+  - findReplace
+  - findReplaceMatchCase
+  - extendFloatingToolbar
+
+  ## WHY?:
+
+  Because the flags and props are unused/by default active. Removing them will reduce our maintenance burden
+
+  ## HOW to update your code:
+
+  - If you were using the feature flag - the behaviour is now default and you can remove the flags
+  - If you were not using the feature flag - the behaviour is now default.
+  - If you have opted out of using the feature flag - we have been careful to ensure no-one has opted out of the behaviours. If you do have an issue please reach out to #help-editor.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/cjs/plugin.js

@@ -53,11 +53,9 @@ var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_re
   });
 };
 var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref2) {
-  var _api$featureFlags;
   var _ref2$config = _ref2.config,
     options = _ref2$config === void 0 ? {} : _ref2$config,
     api = _ref2.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'media',
     getSharedState: function getSharedState(editorState) {
@@ -141,7 +139,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref2) {
             customDropzoneContainer: options && options.customDropzoneContainer,
             customMediaPicker: options && options.customMediaPicker,
             allowResizing: !!(options && options.allowResizing)
-          }, reactContext, getIntl, api, dispatch, options, featureFlags.newInsertionBehaviour);
+          }, reactContext, getIntl, api, dispatch, options);
         }
       }, {
         name: 'mediaKeymap',

package/dist/cjs/pm-plugins/main.js

@@ -228,7 +228,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
         case 'block':
           // read width state right before inserting to get up-to-date and define values
           var widthPluginState = (_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.width) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
-          (0, _mediaSingle2.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState, editorAnalyticsAPI);
+          (0, _mediaSingle2.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI);
           break;
         case 'group':
           (0, _mediaFiles.insertMediaGroupNode)(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
@@ -467,7 +467,6 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     });
     this.options = options;
     this.mediaOptions = mediaOptions;
-    this.newInsertionBehaviour = newInsertionBehaviour;
     this.dispatch = _dispatch;
     this.pluginInjectionApi = pluginInjectionApi;
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;

package/dist/cjs/utils/media-single.js

@@ -113,7 +113,7 @@ var getFileExtension = function getFileExtension(fileName) {
   }
   return undefined;
 };
-var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, newInsertionBehaviour, widthPluginState, editorAnalyticsAPI) {
+var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI) {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -145,9 +145,7 @@ var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMedia
     }, editorAnalyticsAPI)(state, dispatch);
   } else {
     var tr = null;
-    if (newInsertionBehaviour) {
-      tr = (0, _insert.safeInsert)(node, state.selection.from)(state.tr);
-    }
+    tr = (0, _insert.safeInsert)(node, state.selection.from)(state.tr);
     if (!tr) {
       var content = shouldAddParagraph(view.state) ? _model.Fragment.fromArray([node, state.schema.nodes.paragraph.create()]) : node;
       tr = (0, _utils2.safeInsert)(content, undefined, true)(state.tr);

package/dist/es2019/plugin.js

@@ -47,8 +47,6 @@ export const mediaPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags;
-  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'media',
     getSharedState(editorState) {
@@ -132,7 +130,7 @@ export const mediaPlugin = ({
             customDropzoneContainer: options && options.customDropzoneContainer,
             customMediaPicker: options && options.customMediaPicker,
             allowResizing: !!(options && options.allowResizing)
-          }, reactContext, getIntl, api, dispatch, options, featureFlags.newInsertionBehaviour);
+          }, reactContext, getIntl, api, dispatch, options);
         }
       }, {
         name: 'mediaKeymap',

package/dist/es2019/pm-plugins/main.js

@@ -176,7 +176,7 @@ export class MediaPluginStateImplementation {
         case 'block':
           // read width state right before inserting to get up-to-date and define values
           const widthPluginState = (_this$pluginInjection3 = this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 ? void 0 : (_this$pluginInjection4 = _this$pluginInjection3.width) === null || _this$pluginInjection4 === void 0 ? void 0 : _this$pluginInjection4.sharedState.currentState();
-          insertMediaSingleNode(this.view, mediaStateWithContext, this.getInputMethod(pickerType), collection, this.mediaOptions && this.mediaOptions.alignLeftOnInsert, this.newInsertionBehaviour, widthPluginState, editorAnalyticsAPI);
+          insertMediaSingleNode(this.view, mediaStateWithContext, this.getInputMethod(pickerType), collection, this.mediaOptions && this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI);
           break;
         case 'group':
           insertMediaGroupNode(editorAnalyticsAPI)(this.view, [mediaStateWithContext], collection, this.getInputMethod(pickerType));
@@ -414,7 +414,6 @@ export class MediaPluginStateImplementation {
     });
     this.options = options;
     this.mediaOptions = mediaOptions;
-    this.newInsertionBehaviour = newInsertionBehaviour;
     this.dispatch = _dispatch;
     this.pluginInjectionApi = pluginInjectionApi;
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;

package/dist/es2019/utils/media-single.js

@@ -102,7 +102,7 @@ const getFileExtension = fileName => {
   }
   return undefined;
 };
-export const insertMediaSingleNode = (view, mediaState, inputMethod, collection, alignLeftOnInsert, newInsertionBehaviour, widthPluginState, editorAnalyticsAPI) => {
+export const insertMediaSingleNode = (view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI) => {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -136,9 +136,7 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
     }, editorAnalyticsAPI)(state, dispatch);
   } else {
     let tr = null;
-    if (newInsertionBehaviour) {
-      tr = safeInsert(node, state.selection.from)(state.tr);
-    }
+    tr = safeInsert(node, state.selection.from)(state.tr);
     if (!tr) {
       const content = shouldAddParagraph(view.state) ? Fragment.fromArray([node, state.schema.nodes.paragraph.create()]) : node;
       tr = pmSafeInsert(content, undefined, true)(state.tr);

package/dist/esm/plugin.js

@@ -42,11 +42,9 @@ var MediaPickerFunctionalComponent = function MediaPickerFunctionalComponent(_re
   });
 };
 export var mediaPlugin = function mediaPlugin(_ref2) {
-  var _api$featureFlags;
   var _ref2$config = _ref2.config,
     options = _ref2$config === void 0 ? {} : _ref2$config,
     api = _ref2.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'media',
     getSharedState: function getSharedState(editorState) {
@@ -130,7 +128,7 @@ export var mediaPlugin = function mediaPlugin(_ref2) {
             customDropzoneContainer: options && options.customDropzoneContainer,
             customMediaPicker: options && options.customMediaPicker,
             allowResizing: !!(options && options.allowResizing)
-          }, reactContext, getIntl, api, dispatch, options, featureFlags.newInsertionBehaviour);
+          }, reactContext, getIntl, api, dispatch, options);
         }
       }, {
         name: 'mediaKeymap',

package/dist/esm/pm-plugins/main.js

@@ -213,7 +213,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
         case 'block':
           // read width state right before inserting to get up-to-date and define values
           var widthPluginState = (_this$pluginInjection2 = _this.pluginInjectionApi) === null || _this$pluginInjection2 === void 0 || (_this$pluginInjection2 = _this$pluginInjection2.width) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
-          insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState, editorAnalyticsAPI);
+          insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, widthPluginState, editorAnalyticsAPI);
           break;
         case 'group':
           insertMediaGroupNode(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
@@ -452,7 +452,6 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     });
     this.options = options;
     this.mediaOptions = mediaOptions;
-    this.newInsertionBehaviour = newInsertionBehaviour;
     this.dispatch = _dispatch;
     this.pluginInjectionApi = pluginInjectionApi;
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;

package/dist/esm/utils/media-single.js

@@ -104,7 +104,7 @@ var getFileExtension = function getFileExtension(fileName) {
   }
   return undefined;
 };
-export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, newInsertionBehaviour, widthPluginState, editorAnalyticsAPI) {
+export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inputMethod, collection, alignLeftOnInsert, widthPluginState, editorAnalyticsAPI) {
   var _state$selection$$fro;
   if (collection === undefined) {
     return false;
@@ -136,9 +136,7 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
     }, editorAnalyticsAPI)(state, dispatch);
   } else {
     var tr = null;
-    if (newInsertionBehaviour) {
-      tr = safeInsert(node, state.selection.from)(state.tr);
-    }
+    tr = safeInsert(node, state.selection.from)(state.tr);
     if (!tr) {
       var content = shouldAddParagraph(view.state) ? Fragment.fromArray([node, state.schema.nodes.paragraph.create()]) : node;
       tr = pmSafeInsert(content, undefined, true)(state.tr);

package/dist/types/next-plugin-type.d.ts

@@ -3,7 +3,6 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-identifier';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
 import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
@@ -16,7 +15,6 @@ import type { InsertMediaAsMediaSingle } from './utils/media-single';
 export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
     pluginConfiguration: MediaOptions | undefined;
     dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<ContextIdentifierPlugin>,
         GuidelinePlugin,

package/dist/types/pm-plugins/main.d.ts

@@ -33,7 +33,6 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     mediaNodes: MediaNodeWithPosHandler[];
     options: MediaPluginOptions;
     mediaProvider?: MediaProvider;
-    newInsertionBehaviour?: boolean;
     isResizing: boolean;
     resizingWidth: number;
     currentMaxWidth?: number;

package/dist/types/utils/media-single.d.ts

@@ -14,7 +14,7 @@ export interface MediaSingleState extends MediaState {
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
 export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia) => boolean;
 export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => boolean;
-export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, newInsertionBehaviour?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
+export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const createMediaSingleNode: (schema: Schema, collection: string, maxWidth?: number, minWidth?: number, alignLeftOnInsert?: boolean) => (mediaState: MediaSingleState) => PMNode;
 export declare function isCaptionNode(editorView: EditorView): boolean;

package/dist/types-ts4.5/next-plugin-type.d.ts

@@ -3,7 +3,6 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { ContextIdentifierPlugin } from '@atlaskit/editor-plugin-context-identifier';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
 import type { GridPlugin } from '@atlaskit/editor-plugin-grid';
@@ -16,7 +15,6 @@ import type { InsertMediaAsMediaSingle } from './utils/media-single';
 export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
     pluginConfiguration: MediaOptions | undefined;
     dependencies: [
-        OptionalPlugin<FeatureFlagsPlugin>,
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<ContextIdentifierPlugin>,
         GuidelinePlugin,

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -33,7 +33,6 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     mediaNodes: MediaNodeWithPosHandler[];
     options: MediaPluginOptions;
     mediaProvider?: MediaProvider;
-    newInsertionBehaviour?: boolean;
     isResizing: boolean;
     resizingWidth: number;
     currentMaxWidth?: number;

package/dist/types-ts4.5/utils/media-single.d.ts

@@ -14,7 +14,7 @@ export interface MediaSingleState extends MediaState {
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
 export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia) => boolean;
 export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => boolean;
-export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, newInsertionBehaviour?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
+export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined) => boolean;
 export declare const createMediaSingleNode: (schema: Schema, collection: string, maxWidth?: number, minWidth?: number, alignLeftOnInsert?: boolean) => (mediaState: MediaSingleState) => PMNode;
 export declare function isCaptionNode(editorView: EditorView): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -36,14 +36,13 @@
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.2.0",
-    "@atlaskit/button": "^17.3.0",
-    "@atlaskit/editor-common": "^77.4.0",
+    "@atlaskit/button": "^17.4.0",
+    "@atlaskit/editor-common": "^78.0.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-editor-disabled": "^1.0.0",
-    "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
-    "@atlaskit/editor-plugin-floating-toolbar": "^1.0.0",
+    "@atlaskit/editor-plugin-floating-toolbar": "^1.1.0",
     "@atlaskit/editor-plugin-focus": "^1.0.0",
     "@atlaskit/editor-plugin-grid": "^1.0.0",
     "@atlaskit/editor-plugin-guideline": "^1.0.0",