@atlaskit/editor-plugin-extension 3.3.0 → 3.5.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-extension
 
+## 3.5.0
+
+### Minor Changes
+
+- [#113205](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113205)
+  [`74786973d6de2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/74786973d6de2) -
+  ED-26443 LCM: Add scrollIntoView option on extension API 'update' function. This allows you to
+  disable scrollIntoView.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.4.0
+
+### Minor Changes
+
+- [#111831](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/111831)
+  [`66895944dfac9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/66895944dfac9) -
+  [ED-26430] Block drag-and-drop of legacy content macro extension
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.3.0
 
 ### Minor Changes

package/dist/cjs/extensionPlugin.js

@@ -72,7 +72,7 @@ var extensionPlugin = exports.extensionPlugin = function extensionPlugin(_ref) {
           var extensionHandlers = options.extensionHandlers || {};
           return (0, _main.createPlugin)(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, _api, options.useLongPressSelection, {
             appearance: options.appearance
-          }, featureFlags, options.allowDragAndDrop, options === null || options === void 0 ? void 0 : options.__rendererExtensionOptions);
+          }, featureFlags, options === null || options === void 0 ? void 0 : options.__rendererExtensionOptions);
         }
       }, {
         name: 'extensionKeymap',

package/dist/cjs/pm-plugins/extension-api.js

@@ -14,6 +14,7 @@ var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../editor-commands/commands");
 var _actions = require("./macro/actions");
 var _pluginKey = require("./macro/plugin-key");
@@ -259,6 +260,9 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
         tr.setMeta('addToHistory', opts.addToHistory);
       }
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean' && (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
+        tr.setMeta('scrollIntoView', opts.scrollIntoView);
+      }
       dispatch(tr);
     }
   };

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

@@ -172,8 +172,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
   var useLongPressSelection = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var options = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : {};
   var featureFlags = arguments.length > 8 ? arguments[8] : undefined;
-  var allowDragAndDrop = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : true;
-  var __rendererExtensionOptions = arguments.length > 10 ? arguments[10] : undefined;
+  var __rendererExtensionOptions = arguments.length > 9 ? arguments[9] : undefined;
   var state = (0, _pluginFactory.createPluginState)(dispatch, {
     showEditButton: false,
     showContextPanel: false
@@ -316,19 +315,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, provid
       // It's to enable nested extensions selection
       {
         useLongPressSelection: useLongPressSelection
-      }),
-      handleDrop: function handleDrop(view, event, slice, moved) {
-        if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
-          if (!allowDragAndDrop) {
-            var _slice$content$firstC;
-            // Completely disable DND for extension nodes when allowDragAndDrop is false
-            var isExtension = slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === view.state.schema.nodes.extension;
-            return isExtension;
-          }
-          return false;
-        }
-        return false;
-      }
+      })
     }
   });
 };

package/dist/es2019/extensionPlugin.js

@@ -66,7 +66,7 @@ export const extensionPlugin = ({
           const extensionHandlers = options.extensionHandlers || {};
           return createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, api, options.useLongPressSelection, {
             appearance: options.appearance
-          }, featureFlags, options.allowDragAndDrop, options === null || options === void 0 ? void 0 : options.__rendererExtensionOptions);
+          }, featureFlags, options === null || options === void 0 ? void 0 : options.__rendererExtensionOptions);
         }
       }, {
         name: 'extensionKeymap',

package/dist/es2019/pm-plugins/extension-api.js

@@ -5,6 +5,7 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { setEditingContextToContextPanel } from '../editor-commands/commands';
 import { insertMacroFromMacroBrowser } from './macro/actions';
 import { pluginKey as macroPluginKey } from './macro/plugin-key';
@@ -277,6 +278,9 @@ export const createExtensionAPI = options => {
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
         tr.setMeta('addToHistory', opts.addToHistory);
       }
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean' && fg('platform_editor_legacy_content_macro')) {
+        tr.setMeta('scrollIntoView', opts.scrollIntoView);
+      }
       dispatch(tr);
     }
   };

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

@@ -115,7 +115,7 @@ export const handleUpdate = ({
   }
   return true;
 };
-export const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, pluginInjectionApi, useLongPressSelection = false, options = {}, featureFlags, allowDragAndDrop = true, __rendererExtensionOptions) => {
+export const createPlugin = (dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, pluginInjectionApi, useLongPressSelection = false, options = {}, featureFlags, __rendererExtensionOptions) => {
   var _featureFlags$macroIn;
   const state = createPluginState(dispatch, {
     showEditButton: false,
@@ -269,19 +269,7 @@ export const createPlugin = (dispatch, providerFactory, extensionHandlers, porta
       // It's to enable nested extensions selection
       {
         useLongPressSelection
-      }),
-      handleDrop(view, event, slice, moved) {
-        if (fg('platform_editor_legacy_content_macro')) {
-          if (!allowDragAndDrop) {
-            var _slice$content$firstC;
-            // Completely disable DND for extension nodes when allowDragAndDrop is false
-            const isExtension = slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === view.state.schema.nodes.extension;
-            return isExtension;
-          }
-          return false;
-        }
-        return false;
-      }
+      })
     }
   });
 };

package/dist/esm/extensionPlugin.js

@@ -65,7 +65,7 @@ export var extensionPlugin = function extensionPlugin(_ref) {
           var extensionHandlers = options.extensionHandlers || {};
           return createPlugin(dispatch, providerFactory, extensionHandlers, portalProviderAPI, eventDispatcher, _api, options.useLongPressSelection, {
             appearance: options.appearance
-          }, featureFlags, options.allowDragAndDrop, options === null || options === void 0 ? void 0 : options.__rendererExtensionOptions);
+          }, featureFlags, options === null || options === void 0 ? void 0 : options.__rendererExtensionOptions);
         }
       }, {
         name: 'extensionKeymap',

package/dist/esm/pm-plugins/extension-api.js

@@ -9,6 +9,7 @@ import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { Fragment, Mark } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { setEditingContextToContextPanel } from '../editor-commands/commands';
 import { insertMacroFromMacroBrowser } from './macro/actions';
 import { pluginKey as macroPluginKey } from './macro/plugin-key';
@@ -252,6 +253,9 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
         tr.setMeta('addToHistory', opts.addToHistory);
       }
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.scrollIntoView) === 'boolean' && fg('platform_editor_legacy_content_macro')) {
+        tr.setMeta('scrollIntoView', opts.scrollIntoView);
+      }
       dispatch(tr);
     }
   };

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

@@ -165,8 +165,7 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, exten
   var useLongPressSelection = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var options = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : {};
   var featureFlags = arguments.length > 8 ? arguments[8] : undefined;
-  var allowDragAndDrop = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : true;
-  var __rendererExtensionOptions = arguments.length > 10 ? arguments[10] : undefined;
+  var __rendererExtensionOptions = arguments.length > 9 ? arguments[9] : undefined;
   var state = createPluginState(dispatch, {
     showEditButton: false,
     showContextPanel: false
@@ -309,19 +308,7 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, exten
       // It's to enable nested extensions selection
       {
         useLongPressSelection: useLongPressSelection
-      }),
-      handleDrop: function handleDrop(view, event, slice, moved) {
-        if (fg('platform_editor_legacy_content_macro')) {
-          if (!allowDragAndDrop) {
-            var _slice$content$firstC;
-            // Completely disable DND for extension nodes when allowDragAndDrop is false
-            var isExtension = slice.content.childCount === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type) === view.state.schema.nodes.extension;
-            return isExtension;
-          }
-          return false;
-        }
-        return false;
-      }
+      })
     }
   });
 };

package/dist/types/extensionPluginType.d.ts

@@ -42,7 +42,6 @@ export interface ExtensionPluginOptions extends LongPressSelectionPluginOptions
     breakoutEnabled?: boolean;
     extensionHandlers?: ExtensionHandlers;
     appearance?: EditorAppearance;
-    allowDragAndDrop?: boolean;
     __rendererExtensionOptions?: {
         rendererExtensionHandlers?: ExtensionHandlers;
         isAllowedToUseRendererView: (node: ADFEntity) => boolean;

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

@@ -18,4 +18,4 @@ export declare const handleUpdate: ({ view, prevState, domAtPos, extensionHandle
 }) => true | undefined;
 export declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, pluginInjectionApi: ExtractInjectionAPI<ExtensionPlugin> | undefined, useLongPressSelection?: boolean, options?: {
     appearance?: EditorAppearance;
-}, featureFlags?: FeatureFlags, allowDragAndDrop?: boolean, __rendererExtensionOptions?: ExtensionPluginOptions['__rendererExtensionOptions']) => SafePlugin<import("../extensionPluginType").ExtensionState>;
+}, featureFlags?: FeatureFlags, __rendererExtensionOptions?: ExtensionPluginOptions['__rendererExtensionOptions']) => SafePlugin<import("../extensionPluginType").ExtensionState>;

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

@@ -42,7 +42,6 @@ export interface ExtensionPluginOptions extends LongPressSelectionPluginOptions
     breakoutEnabled?: boolean;
     extensionHandlers?: ExtensionHandlers;
     appearance?: EditorAppearance;
-    allowDragAndDrop?: boolean;
     __rendererExtensionOptions?: {
         rendererExtensionHandlers?: ExtensionHandlers;
         isAllowedToUseRendererView: (node: ADFEntity) => boolean;

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

@@ -18,4 +18,4 @@ export declare const handleUpdate: ({ view, prevState, domAtPos, extensionHandle
 }) => true | undefined;
 export declare const createPlugin: (dispatch: Dispatch, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, pluginInjectionApi: ExtractInjectionAPI<ExtensionPlugin> | undefined, useLongPressSelection?: boolean, options?: {
     appearance?: EditorAppearance;
-}, featureFlags?: FeatureFlags, allowDragAndDrop?: boolean, __rendererExtensionOptions?: ExtensionPluginOptions['__rendererExtensionOptions']) => SafePlugin<import("../extensionPluginType").ExtensionState>;
+}, featureFlags?: FeatureFlags, __rendererExtensionOptions?: ExtensionPluginOptions['__rendererExtensionOptions']) => SafePlugin<import("../extensionPluginType").ExtensionState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-extension",
-	"version": "3.3.0",
+	"version": "3.5.0",
 	"description": "editor-plugin-extension plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,7 +30,7 @@
 		"@atlaskit/button": "^20.5.0",
 		"@atlaskit/checkbox": "^15.3.0",
 		"@atlaskit/datetime-picker": "^15.12.0",
-		"@atlaskit/editor-common": "^99.11.0",
+		"@atlaskit/editor-common": "^99.13.0",
 		"@atlaskit/editor-json-transformer": "^8.23.0",
 		"@atlaskit/editor-plugin-analytics": "^1.12.0",
 		"@atlaskit/editor-plugin-context-identifier": "^1.4.0",