@atlaskit/editor-common 133.7.0 → 133.7.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-common
 
+## 133.7.2
+
+### Patch Changes
+
+- [`ba1d65046dd55`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ba1d65046dd55) -
+  Include optional originating generation batch instrumentation in suggestion analytics.
+
+## 133.7.1
+
+### Patch Changes
+
+- [`f546ba7760cde`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f546ba7760cde) -
+  Clean up experiment confluence_native_tabs_m15: MultiBodiedExtension now always moves the
+  selection into the target frame on `changeActive` and always shows the empty frame placeholder.
+- Updated dependencies
+
 ## 133.7.0
 
 ### Minor Changes

package/dist/cjs/extensibility/MultiBodiedExtension/action-api.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _analytics = require("../../analytics");
 var _utils = require("./utils");
@@ -34,9 +33,6 @@ var useMultiBodiedExtensionActions = exports.useMultiBodiedExtensionActions = fu
           (0, _utils.sendMBEAnalyticsEvent)(_analytics.ACTION.CHANGE_ACTIVE, node, eventDispatcher);
         }
         var selection = (_options$selection = options === null || options === void 0 ? void 0 : options.selection) !== null && _options$selection !== void 0 ? _options$selection : 'none';
-        if (selection === 'none' && !(0, _isExperimentEnabled.isExperimentEnabled)('confluence_native_tabs_m15')) {
-          return updateActiveChildResult;
-        }
         var pos = getPos();
         if (typeof pos !== 'number') {
           return updateActiveChildResult;

package/dist/cjs/extensibility/MultiBodiedExtension/index.js

@@ -17,7 +17,6 @@ var _bindEventListener = require("bind-event-listener");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntl = require("react-intl");
 var _file = _interopRequireDefault(require("@atlaskit/icon/core/file"));
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _hooks = require("../../hooks");
 var _placeholderText = require("../../messages/placeholder-text");
@@ -75,13 +74,12 @@ var MultiBodiedExtensionFrames = function MultiBodiedExtensionFrames(_ref) {
   var activeChildIndex = _ref.activeChildIndex,
     articleRef = _ref.articleRef,
     emptyFramePlaceholderText = _ref.emptyFramePlaceholderText,
-    shouldShowEmptyFramePlaceholder = _ref.shouldShowEmptyFramePlaceholder,
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
   return (0, _react2.jsx)("article", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: "multiBodiedExtension--frames",
     css: [/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
-    getFramesActiveFrameStyles(activeChildIndex, showMacroInteractionDesignUpdates), shouldShowEmptyFramePlaceholder && getEmptyFramePlaceholderStyles(activeChildIndex, emptyFramePlaceholderText)
+    getFramesActiveFrameStyles(activeChildIndex, showMacroInteractionDesignUpdates), getEmptyFramePlaceholderStyles(activeChildIndex, emptyFramePlaceholderText)
     /* eslint-enable @atlaskit/design-system/consistent-css-prop-usage */],
     "data-testid": "multiBodiedExtension--frames",
     "data-multibodiedextension-frames": true,
@@ -228,7 +226,6 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
   var articleRef = _react.default.useCallback(function (node) {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  var shouldShowEmptyFramePlaceholder = (0, _isExperimentEnabled.isExperimentEnabled)('confluence_native_tabs_m15');
   var emptyFramePlaceholderText = _react.default.useMemo(function () {
     return JSON.stringify(formatMessage(_placeholderText.placeholderTextMessages.multiBodiedExtensionEmptyFramePlaceholderText));
   }, [formatMessage]);
@@ -237,10 +234,9 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       activeChildIndex: activeChildIndex,
       articleRef: articleRef,
       emptyFramePlaceholderText: emptyFramePlaceholderText,
-      shouldShowEmptyFramePlaceholder: shouldShowEmptyFramePlaceholder,
       showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
     });
-  }, [activeChildIndex, articleRef, emptyFramePlaceholderText, shouldShowEmptyFramePlaceholder, showMacroInteractionDesignUpdates]);
+  }, [activeChildIndex, articleRef, emptyFramePlaceholderText, showMacroInteractionDesignUpdates]);
   var actions = (0, _actionApi.useMultiBodiedExtensionActions)({
     updateActiveChild: updateActiveChild,
     editorView: editorView,

package/dist/cjs/monitoring/error.js

@@ -27,7 +27,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "133.6.1";
+var packageVersion = "133.7.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "133.6.1";
+var packageVersion = "133.7.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/extensibility/MultiBodiedExtension/action-api.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACTION } from '../../analytics';
 import { sendMBEAnalyticsEvent } from './utils';
@@ -26,9 +25,6 @@ export const useMultiBodiedExtensionActions = ({
           sendMBEAnalyticsEvent(ACTION.CHANGE_ACTIVE, node, eventDispatcher);
         }
         const selection = (_options$selection = options === null || options === void 0 ? void 0 : options.selection) !== null && _options$selection !== void 0 ? _options$selection : 'none';
-        if (selection === 'none' && !isExperimentEnabled('confluence_native_tabs_m15')) {
-          return updateActiveChildResult;
-        }
         const pos = getPos();
         if (typeof pos !== 'number') {
           return updateActiveChildResult;

package/dist/es2019/extensibility/MultiBodiedExtension/index.js

@@ -13,7 +13,6 @@ import { bind } from 'bind-event-listener';
 import classnames from 'classnames';
 import { useIntl } from 'react-intl';
 import EditorFileIcon from '@atlaskit/icon/core/file';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useSharedPluginStateWithSelector } from '../../hooks';
 import { placeholderTextMessages } from '../../messages/placeholder-text';
@@ -69,14 +68,13 @@ const MultiBodiedExtensionFrames = ({
   activeChildIndex,
   articleRef,
   emptyFramePlaceholderText,
-  shouldShowEmptyFramePlaceholder,
   showMacroInteractionDesignUpdates
 }) => {
   return jsx("article", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: "multiBodiedExtension--frames",
     css: [/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
-    getFramesActiveFrameStyles(activeChildIndex, showMacroInteractionDesignUpdates), shouldShowEmptyFramePlaceholder && getEmptyFramePlaceholderStyles(activeChildIndex, emptyFramePlaceholderText)
+    getFramesActiveFrameStyles(activeChildIndex, showMacroInteractionDesignUpdates), getEmptyFramePlaceholderStyles(activeChildIndex, emptyFramePlaceholderText)
     /* eslint-enable @atlaskit/design-system/consistent-css-prop-usage */],
     "data-testid": "multiBodiedExtension--frames",
     "data-multibodiedextension-frames": true,
@@ -220,17 +218,15 @@ const MultiBodiedExtensionWithWidth = ({
   const articleRef = React.useCallback(node => {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  const shouldShowEmptyFramePlaceholder = isExperimentEnabled('confluence_native_tabs_m15');
   const emptyFramePlaceholderText = React.useMemo(() => JSON.stringify(formatMessage(placeholderTextMessages.multiBodiedExtensionEmptyFramePlaceholderText)), [formatMessage]);
   const childrenContainer = React.useMemo(() => {
     return jsx(MultiBodiedExtensionFrames, {
       activeChildIndex: activeChildIndex,
       articleRef: articleRef,
       emptyFramePlaceholderText: emptyFramePlaceholderText,
-      shouldShowEmptyFramePlaceholder: shouldShowEmptyFramePlaceholder,
       showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
     });
-  }, [activeChildIndex, articleRef, emptyFramePlaceholderText, shouldShowEmptyFramePlaceholder, showMacroInteractionDesignUpdates]);
+  }, [activeChildIndex, articleRef, emptyFramePlaceholderText, showMacroInteractionDesignUpdates]);
   const actions = useMultiBodiedExtensionActions({
     updateActiveChild,
     editorView,

package/dist/es2019/monitoring/error.js

@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "133.6.1";
+const packageVersion = "133.7.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "133.6.1";
+const packageVersion = "133.7.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/extensibility/MultiBodiedExtension/action-api.js

@@ -4,7 +4,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 React from 'react';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACTION } from '../../analytics';
 import { sendMBEAnalyticsEvent } from './utils';
@@ -27,9 +26,6 @@ export var useMultiBodiedExtensionActions = function useMultiBodiedExtensionActi
           sendMBEAnalyticsEvent(ACTION.CHANGE_ACTIVE, node, eventDispatcher);
         }
         var selection = (_options$selection = options === null || options === void 0 ? void 0 : options.selection) !== null && _options$selection !== void 0 ? _options$selection : 'none';
-        if (selection === 'none' && !isExperimentEnabled('confluence_native_tabs_m15')) {
-          return updateActiveChildResult;
-        }
         var pos = getPos();
         if (typeof pos !== 'number') {
           return updateActiveChildResult;

package/dist/esm/extensibility/MultiBodiedExtension/index.js

@@ -18,7 +18,6 @@ import { bind } from 'bind-event-listener';
 import classnames from 'classnames';
 import { useIntl } from 'react-intl';
 import EditorFileIcon from '@atlaskit/icon/core/file';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useSharedPluginStateWithSelector } from '../../hooks';
 import { placeholderTextMessages } from '../../messages/placeholder-text';
@@ -68,13 +67,12 @@ var MultiBodiedExtensionFrames = function MultiBodiedExtensionFrames(_ref) {
   var activeChildIndex = _ref.activeChildIndex,
     articleRef = _ref.articleRef,
     emptyFramePlaceholderText = _ref.emptyFramePlaceholderText,
-    shouldShowEmptyFramePlaceholder = _ref.shouldShowEmptyFramePlaceholder,
     showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
   return jsx("article", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: "multiBodiedExtension--frames",
     css: [/* eslint-disable @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766 */
-    getFramesActiveFrameStyles(activeChildIndex, showMacroInteractionDesignUpdates), shouldShowEmptyFramePlaceholder && getEmptyFramePlaceholderStyles(activeChildIndex, emptyFramePlaceholderText)
+    getFramesActiveFrameStyles(activeChildIndex, showMacroInteractionDesignUpdates), getEmptyFramePlaceholderStyles(activeChildIndex, emptyFramePlaceholderText)
     /* eslint-enable @atlaskit/design-system/consistent-css-prop-usage */],
     "data-testid": "multiBodiedExtension--frames",
     "data-multibodiedextension-frames": true,
@@ -221,7 +219,6 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
   var articleRef = React.useCallback(function (node) {
     return handleContentDOMRef(node);
   }, [handleContentDOMRef]);
-  var shouldShowEmptyFramePlaceholder = isExperimentEnabled('confluence_native_tabs_m15');
   var emptyFramePlaceholderText = React.useMemo(function () {
     return JSON.stringify(formatMessage(placeholderTextMessages.multiBodiedExtensionEmptyFramePlaceholderText));
   }, [formatMessage]);
@@ -230,10 +227,9 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref2
       activeChildIndex: activeChildIndex,
       articleRef: articleRef,
       emptyFramePlaceholderText: emptyFramePlaceholderText,
-      shouldShowEmptyFramePlaceholder: shouldShowEmptyFramePlaceholder,
       showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
     });
-  }, [activeChildIndex, articleRef, emptyFramePlaceholderText, shouldShowEmptyFramePlaceholder, showMacroInteractionDesignUpdates]);
+  }, [activeChildIndex, articleRef, emptyFramePlaceholderText, showMacroInteractionDesignUpdates]);
   var actions = useMultiBodiedExtensionActions({
     updateActiveChild: updateActiveChild,
     editorView: editorView,

package/dist/esm/monitoring/error.js

@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "133.6.1";
+var packageVersion = "133.7.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "133.6.1";
+var packageVersion = "133.7.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/types/analytics/types/ai-suggestions-events.d.ts

@@ -52,6 +52,7 @@ type TimeSinceGenerationAttribute = {
 type RegenerationSuggestionDetails = SuggestionRemixAttributes & TimeSinceGenerationAttribute & {
     actionKind: string;
     outcome?: AiSuggestionsRegenerationOutcome;
+    singleInstrumentationId?: string;
     suggestionId: string;
     suggestionType?: string;
 };
@@ -62,6 +63,7 @@ type RegenerationCommonAttributes = {
     trigger: AiSuggestionsRegenerationTrigger;
 };
 type NoDiffSuggestionAEP = OperationalAEP<ACTION.NO_DIFF_FOUND, ACTION_SUBJECT.AI_SUGGESTIONS, undefined, {
+    singleInstrumentationId?: string;
     suggestionType?: string;
     toolCalls: {
         localIds: string[];
@@ -106,6 +108,7 @@ type SuggestionLifecycleAttributes = SuggestionRemixAttributes & TimeSinceGenera
     agentId?: string;
     hasSources: boolean;
     interactionPoint: AiSuggestionInteractionPoint;
+    singleInstrumentationId?: string;
     suggestionId: string;
     suggestionType?: string;
 };
@@ -116,6 +119,7 @@ type AcceptSuggestionAEP = TrackAEP<ACTION.ACCEPTED, ACTION_SUBJECT.AI_SUGGESTIO
 }, undefined>;
 type UndoAcceptedSuggestionAEP = TrackAEP<ACTION.UNDO_PERFORMED, ACTION_SUBJECT.AI_SUGGESTIONS, undefined, TimeSinceGenerationAttribute & {
     actionKind: string;
+    singleInstrumentationId?: string;
     suggestionId: string;
     suggestionType?: string;
 }, undefined>;
@@ -141,6 +145,7 @@ type RightRailViewedAEP = TrackAEP<ACTION.RIGHT_RAIL_VIEWED, ACTION_SUBJECT.AI_S
     suggestionDetails: Array<SuggestionRemixAttributes & TimeSinceGenerationAttribute & {
         actionKind: string;
         affectedBlocks: number;
+        singleInstrumentationId?: string;
         suggestionType?: string;
     }>;
 }, undefined>;
@@ -152,6 +157,7 @@ type ViewSuggestionReasoningAEP = TrackAEP<ACTION.REASONING_VIEWED, ACTION_SUBJE
     hasSources: boolean;
     interactionPoint: AiSuggestionInteractionPoint;
     reasoningCharacterCount: number;
+    singleInstrumentationId?: string;
     suggestionId: string;
     suggestionType?: string;
 }, undefined>;
@@ -164,6 +170,7 @@ type SuggestionsGeneratedAEP = TrackAEP<ACTION.GENERATED, ACTION_SUBJECT.AI_SUGG
         affectedBlocks: number;
         agentId?: string;
         hasSources: boolean;
+        singleInstrumentationId?: string;
         suggestionId: string;
         suggestionType?: string;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "133.7.0",
+	"version": "133.7.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -85,7 +85,7 @@
 		"@atlaskit/task-decision": "^21.13.0",
 		"@atlaskit/teams-app-config": "^3.1.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^246.0.0",
+		"@atlaskit/tmp-editor-statsig": "^246.1.0",
 		"@atlaskit/tokens": "^20.7.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@atlaskit/width-detector": "^7.2.0",