@atlaskit/editor-plugin-extension 1.4.2 → 1.4.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-extension
 
+## 1.4.4
+
+### Patch Changes
+
+-   [#97599](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97599)
+    [`32c3130b08fe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/32c3130b08fe) -
+    [ED-22282] Bump adf-schema to 36.1.0
+
+## 1.4.3
+
+### Patch Changes
+
+-   [#97158](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97158)
+    [`5568b03ef792`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5568b03ef792) -
+    [ux] EDF-661: Fix AI Panels Undo behaviour during insert flows (revert extension insertion) and
+    regenerate flows (revert content changes)
+-   Updated dependencies
+
 ## 1.4.2
 
 ### Patch Changes

package/dist/cjs/commands.js

@@ -57,7 +57,7 @@ var forceAutoSave = exports.forceAutoSave = function forceAutoSave(applyChangeTo
     }, applyChangeToContextPanel);
   };
 };
-var updateExtensionLayout = exports.updateExtensionLayout = function updateExtensionLayout(layout) {
+var updateExtensionLayout = exports.updateExtensionLayout = function updateExtensionLayout(layout, analyticsApi) {
   return (0, _pluginFactory.createCommand)({
     type: 'UPDATE_STATE',
     data: {
@@ -70,6 +70,22 @@ var updateExtensionLayout = exports.updateExtensionLayout = function updateExten
         layout: layout
       }));
       trWithNewNodeMarkup.setMeta('scrollIntoView', false);
+      if (analyticsApi) {
+        analyticsApi.attachAnalyticsEvent({
+          action: _analytics.ACTION.UPDATED,
+          actionSubject: _analytics.ACTION_SUBJECT.EXTENSION,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.EXTENSION,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            extensionType: selectedExtension.node.attrs.extensionType,
+            extensionKey: selectedExtension.node.attrs.extensionKey,
+            localId: selectedExtension.node.attrs.localId,
+            layout: layout,
+            selection: tr.selection.toJSON(),
+            targetSelectionSource: _analytics.TARGET_SELECTION_SOURCE.CURRENT_SELECTION
+          }
+        })(tr);
+      }
       return trWithNewNodeMarkup;
     }
     return tr;

package/dist/cjs/extension-api.js

@@ -176,7 +176,7 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       tr = tr.scrollIntoView();
       dispatch(tr);
     },
-    update: function update(localId, mutationCallback) {
+    update: function update(localId, mutationCallback, opts) {
       var _changedValues$marks;
       var _ensureNodePosByLocal = ensureNodePosByLocalId(localId, {
           opName: 'update'
@@ -252,6 +252,9 @@ var createExtensionAPI = exports.createExtensionAPI = function createExtensionAP
       // Analytics - tracking the api call
       var apiCallPayload = extensionAPICallPayload('update');
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
+        tr.setMeta('addToHistory', opts.addToHistory);
+      }
       dispatch(tr);
     }
   };

package/dist/cjs/toolbar.js

@@ -42,7 +42,7 @@ var isLayoutSupported = function isLayoutSupported(state, selectedExtNode) {
   // and not inside a layoutSection
   return !!((isMultiBodiedExtension || isNonEmbeddedBodiedExtension || isNonEmbeddedExtension) && !(0, _utils2.hasParentNodeOfType)([layoutSection])(selection));
 };
-var breakoutOptions = function breakoutOptions(state, formatMessage, extensionState, breakoutEnabled) {
+var breakoutOptions = function breakoutOptions(state, formatMessage, extensionState, breakoutEnabled, editorAnalyticsAPI) {
   var nodeWithPos = (0, _utils3.getSelectedExtension)(state, true);
 
   // we should only return breakout options when breakouts are enabled and the node supports them
@@ -51,21 +51,21 @@ var breakoutOptions = function breakoutOptions(state, formatMessage, extensionSt
     return [{
       type: 'button',
       icon: _mediaCenter.default,
-      onClick: (0, _commands.updateExtensionLayout)('default'),
+      onClick: (0, _commands.updateExtensionLayout)('default', editorAnalyticsAPI),
       selected: layout === 'default',
       title: formatMessage(_messages.default.layoutFixedWidth),
       tabIndex: null
     }, {
       type: 'button',
       icon: _mediaWide.default,
-      onClick: (0, _commands.updateExtensionLayout)('wide'),
+      onClick: (0, _commands.updateExtensionLayout)('wide', editorAnalyticsAPI),
       selected: layout === 'wide',
       title: formatMessage(_messages.default.layoutWide),
       tabIndex: null
     }, {
       type: 'button',
       icon: _mediaFullWidth.default,
-      onClick: (0, _commands.updateExtensionLayout)('full-width'),
+      onClick: (0, _commands.updateExtensionLayout)('full-width', editorAnalyticsAPI),
       selected: layout === 'full-width',
       title: formatMessage(_messages.default.layoutFullWidth),
       tabIndex: null
@@ -107,7 +107,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(_ref
     if (extensionState && !extensionState.showContextPanel && extensionState.element) {
       var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension, state.schema.nodes.multiBodiedExtension];
       var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel, editorAnalyticsAPI);
-      var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
+      var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled, editorAnalyticsAPI);
       var extensionObj = (0, _utils3.getSelectedExtension)(state, true);
 
       // Check if we need to show confirm dialog for delete button

package/dist/es2019/commands.js

@@ -1,4 +1,4 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
@@ -39,7 +39,7 @@ export const forceAutoSave = applyChangeToContextPanel => (resolve, reject) => c
     autoSaveReject: reject
   }
 }, applyChangeToContextPanel);
-export const updateExtensionLayout = layout => createCommand({
+export const updateExtensionLayout = (layout, analyticsApi) => createCommand({
   type: 'UPDATE_STATE',
   data: {
     layout
@@ -52,6 +52,22 @@ export const updateExtensionLayout = layout => createCommand({
       layout
     });
     trWithNewNodeMarkup.setMeta('scrollIntoView', false);
+    if (analyticsApi) {
+      analyticsApi.attachAnalyticsEvent({
+        action: ACTION.UPDATED,
+        actionSubject: ACTION_SUBJECT.EXTENSION,
+        actionSubjectId: ACTION_SUBJECT_ID.EXTENSION,
+        eventType: EVENT_TYPE.TRACK,
+        attributes: {
+          extensionType: selectedExtension.node.attrs.extensionType,
+          extensionKey: selectedExtension.node.attrs.extensionKey,
+          localId: selectedExtension.node.attrs.localId,
+          layout,
+          selection: tr.selection.toJSON(),
+          targetSelectionSource: TARGET_SELECTION_SOURCE.CURRENT_SELECTION
+        }
+      })(tr);
+    }
     return trWithNewNodeMarkup;
   }
   return tr;

package/dist/es2019/extension-api.js

@@ -183,7 +183,7 @@ export const createExtensionAPI = options => {
       tr = tr.scrollIntoView();
       dispatch(tr);
     },
-    update: (localId, mutationCallback) => {
+    update: (localId, mutationCallback, opts) => {
       var _changedValues$marks;
       const {
         node,
@@ -270,6 +270,9 @@ export const createExtensionAPI = options => {
       // Analytics - tracking the api call
       const apiCallPayload = extensionAPICallPayload('update');
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
+        tr.setMeta('addToHistory', opts.addToHistory);
+      }
       dispatch(tr);
     }
   };

package/dist/es2019/toolbar.js

@@ -39,7 +39,7 @@ const isLayoutSupported = (state, selectedExtNode) => {
   // and not inside a layoutSection
   return !!((isMultiBodiedExtension || isNonEmbeddedBodiedExtension || isNonEmbeddedExtension) && !hasParentNodeOfType([layoutSection])(selection));
 };
-const breakoutOptions = (state, formatMessage, extensionState, breakoutEnabled) => {
+const breakoutOptions = (state, formatMessage, extensionState, breakoutEnabled, editorAnalyticsAPI) => {
   const nodeWithPos = getSelectedExtension(state, true);
 
   // we should only return breakout options when breakouts are enabled and the node supports them
@@ -50,21 +50,21 @@ const breakoutOptions = (state, formatMessage, extensionState, breakoutEnabled)
     return [{
       type: 'button',
       icon: CenterIcon,
-      onClick: updateExtensionLayout('default'),
+      onClick: updateExtensionLayout('default', editorAnalyticsAPI),
       selected: layout === 'default',
       title: formatMessage(commonMessages.layoutFixedWidth),
       tabIndex: null
     }, {
       type: 'button',
       icon: WideIcon,
-      onClick: updateExtensionLayout('wide'),
+      onClick: updateExtensionLayout('wide', editorAnalyticsAPI),
       selected: layout === 'wide',
       title: formatMessage(commonMessages.layoutWide),
       tabIndex: null
     }, {
       type: 'button',
       icon: FullWidthIcon,
-      onClick: updateExtensionLayout('full-width'),
+      onClick: updateExtensionLayout('full-width', editorAnalyticsAPI),
       selected: layout === 'full-width',
       title: formatMessage(commonMessages.layoutFullWidth),
       tabIndex: null
@@ -108,7 +108,7 @@ export const getToolbarConfig = ({
   if (extensionState && !extensionState.showContextPanel && extensionState.element) {
     const nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension, state.schema.nodes.multiBodiedExtension];
     const editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel, editorAnalyticsAPI);
-    const breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
+    const breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled, editorAnalyticsAPI);
     const extensionObj = getSelectedExtension(state, true);
 
     // Check if we need to show confirm dialog for delete button

package/dist/esm/commands.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, TARGET_SELECTION_SOURCE } from '@atlaskit/editor-common/analytics';
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
@@ -48,7 +48,7 @@ export var forceAutoSave = function forceAutoSave(applyChangeToContextPanel) {
     }, applyChangeToContextPanel);
   };
 };
-export var updateExtensionLayout = function updateExtensionLayout(layout) {
+export var updateExtensionLayout = function updateExtensionLayout(layout, analyticsApi) {
   return createCommand({
     type: 'UPDATE_STATE',
     data: {
@@ -61,6 +61,22 @@ export var updateExtensionLayout = function updateExtensionLayout(layout) {
         layout: layout
       }));
       trWithNewNodeMarkup.setMeta('scrollIntoView', false);
+      if (analyticsApi) {
+        analyticsApi.attachAnalyticsEvent({
+          action: ACTION.UPDATED,
+          actionSubject: ACTION_SUBJECT.EXTENSION,
+          actionSubjectId: ACTION_SUBJECT_ID.EXTENSION,
+          eventType: EVENT_TYPE.TRACK,
+          attributes: {
+            extensionType: selectedExtension.node.attrs.extensionType,
+            extensionKey: selectedExtension.node.attrs.extensionKey,
+            localId: selectedExtension.node.attrs.localId,
+            layout: layout,
+            selection: tr.selection.toJSON(),
+            targetSelectionSource: TARGET_SELECTION_SOURCE.CURRENT_SELECTION
+          }
+        })(tr);
+      }
       return trWithNewNodeMarkup;
     }
     return tr;

package/dist/esm/extension-api.js

@@ -169,7 +169,7 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       tr = tr.scrollIntoView();
       dispatch(tr);
     },
-    update: function update(localId, mutationCallback) {
+    update: function update(localId, mutationCallback, opts) {
       var _changedValues$marks;
       var _ensureNodePosByLocal = ensureNodePosByLocalId(localId, {
           opName: 'update'
@@ -245,6 +245,9 @@ export var createExtensionAPI = function createExtensionAPI(options) {
       // Analytics - tracking the api call
       var apiCallPayload = extensionAPICallPayload('update');
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(apiCallPayload)(tr);
+      if (typeof (opts === null || opts === void 0 ? void 0 : opts.addToHistory) === 'boolean') {
+        tr.setMeta('addToHistory', opts.addToHistory);
+      }
       dispatch(tr);
     }
   };

package/dist/esm/toolbar.js

@@ -35,7 +35,7 @@ var isLayoutSupported = function isLayoutSupported(state, selectedExtNode) {
   // and not inside a layoutSection
   return !!((isMultiBodiedExtension || isNonEmbeddedBodiedExtension || isNonEmbeddedExtension) && !hasParentNodeOfType([layoutSection])(selection));
 };
-var breakoutOptions = function breakoutOptions(state, formatMessage, extensionState, breakoutEnabled) {
+var breakoutOptions = function breakoutOptions(state, formatMessage, extensionState, breakoutEnabled, editorAnalyticsAPI) {
   var nodeWithPos = getSelectedExtension(state, true);
 
   // we should only return breakout options when breakouts are enabled and the node supports them
@@ -44,21 +44,21 @@ var breakoutOptions = function breakoutOptions(state, formatMessage, extensionSt
     return [{
       type: 'button',
       icon: CenterIcon,
-      onClick: updateExtensionLayout('default'),
+      onClick: updateExtensionLayout('default', editorAnalyticsAPI),
       selected: layout === 'default',
       title: formatMessage(commonMessages.layoutFixedWidth),
       tabIndex: null
     }, {
       type: 'button',
       icon: WideIcon,
-      onClick: updateExtensionLayout('wide'),
+      onClick: updateExtensionLayout('wide', editorAnalyticsAPI),
       selected: layout === 'wide',
       title: formatMessage(commonMessages.layoutWide),
       tabIndex: null
     }, {
       type: 'button',
       icon: FullWidthIcon,
-      onClick: updateExtensionLayout('full-width'),
+      onClick: updateExtensionLayout('full-width', editorAnalyticsAPI),
       selected: layout === 'full-width',
       title: formatMessage(commonMessages.layoutFullWidth),
       tabIndex: null
@@ -100,7 +100,7 @@ export var getToolbarConfig = function getToolbarConfig(_ref) {
     if (extensionState && !extensionState.showContextPanel && extensionState.element) {
       var nodeType = [state.schema.nodes.extension, state.schema.nodes.inlineExtension, state.schema.nodes.bodiedExtension, state.schema.nodes.multiBodiedExtension];
       var editButtonArray = editButton(formatMessage, extensionState, applyChangeToContextPanel, editorAnalyticsAPI);
-      var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled);
+      var breakoutButtonArray = breakoutOptions(state, formatMessage, extensionState, breakoutEnabled, editorAnalyticsAPI);
       var extensionObj = getSelectedExtension(state, true);
 
       // Check if we need to show confirm dialog for delete button

package/dist/types/commands.d.ts

@@ -9,7 +9,7 @@ export declare function updateState(state: Partial<ExtensionState>): import("@at
 export declare function setEditingContextToContextPanel<T extends Parameters = Parameters>(processParametersBefore: TransformBefore<T>, processParametersAfter: TransformAfter<T>, applyChangeToContextPanel: ApplyChangeHandler | undefined): import("@atlaskit/editor-common/types").Command;
 export declare const clearEditingContext: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => import("@atlaskit/editor-common/types").Command;
 export declare const forceAutoSave: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => (resolve: () => void, reject?: RejectSave) => import("@atlaskit/editor-common/types").Command;
-export declare const updateExtensionLayout: (layout: ExtensionLayout) => import("@atlaskit/editor-common/types").Command;
+export declare const updateExtensionLayout: (layout: ExtensionLayout, analyticsApi?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
 export declare const removeExtension: (editorAnalyticsAPI?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
 export declare const removeDescendantNodes: (sourceNode?: PMNode) => import("@atlaskit/editor-common/types").Command;
 export declare const removeSelectedNodeWithAnalytics: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI) => Transaction;

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

@@ -9,7 +9,7 @@ export declare function updateState(state: Partial<ExtensionState>): import("@at
 export declare function setEditingContextToContextPanel<T extends Parameters = Parameters>(processParametersBefore: TransformBefore<T>, processParametersAfter: TransformAfter<T>, applyChangeToContextPanel: ApplyChangeHandler | undefined): import("@atlaskit/editor-common/types").Command;
 export declare const clearEditingContext: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => import("@atlaskit/editor-common/types").Command;
 export declare const forceAutoSave: (applyChangeToContextPanel: ApplyChangeHandler | undefined) => (resolve: () => void, reject?: RejectSave) => import("@atlaskit/editor-common/types").Command;
-export declare const updateExtensionLayout: (layout: ExtensionLayout) => import("@atlaskit/editor-common/types").Command;
+export declare const updateExtensionLayout: (layout: ExtensionLayout, analyticsApi?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
 export declare const removeExtension: (editorAnalyticsAPI?: EditorAnalyticsAPI) => import("@atlaskit/editor-common/types").Command;
 export declare const removeDescendantNodes: (sourceNode?: PMNode) => import("@atlaskit/editor-common/types").Command;
 export declare const removeSelectedNodeWithAnalytics: (state: EditorState, tr: Transaction, analyticsApi?: EditorAnalyticsAPI) => Transaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-extension",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "editor-plugin-extension plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -24,15 +24,15 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.12.2",
-    "@atlaskit/adf-utils": "^19.0.0",
+    "@atlaskit/adf-schema": "^36.1.0",
+    "@atlaskit/adf-utils": "^19.1.0",
     "@atlaskit/analytics-next": "^9.3.0",
-    "@atlaskit/avatar": "^21.6.0",
+    "@atlaskit/avatar": "^21.8.0",
     "@atlaskit/button": "^17.14.0",
     "@atlaskit/checkbox": "^13.3.0",
     "@atlaskit/datetime-picker": "^13.5.0",
-    "@atlaskit/editor-common": "^79.1.0",
-    "@atlaskit/editor-json-transformer": "^8.11.0",
+    "@atlaskit/editor-common": "^79.2.0",
+    "@atlaskit/editor-json-transformer": "^8.12.0",
     "@atlaskit/editor-plugin-analytics": "^1.1.0",
     "@atlaskit/editor-plugin-context-identifier": "^1.1.0",
     "@atlaskit/editor-plugin-context-panel": "^1.1.0",
@@ -55,9 +55,9 @@
     "@atlaskit/tabs": "^16.1.0",
     "@atlaskit/textarea": "^5.4.0",
     "@atlaskit/textfield": "^6.3.0",
-    "@atlaskit/theme": "^12.7.0",
+    "@atlaskit/theme": "^12.8.0",
     "@atlaskit/toggle": "^13.1.0",
-    "@atlaskit/tokens": "^1.45.0",
+    "@atlaskit/tokens": "^1.46.0",
     "@atlaskit/tooltip": "^18.3.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",