@atlaskit/editor-core 193.10.12 → 193.10.21

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 193.10.21
+
+### Patch Changes
+
+- [#92945](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92945) [`929153e0da60`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/929153e0da60) - Cleanup analytics feature flag for queued analytics.
+
+## 193.10.19
+
+### Patch Changes
+
+- [#92786](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92786) [`1dc6fc4f1a1d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1dc6fc4f1a1d) - fix: onPluginObservation type error with collab plugin state being empty
+
 ## 193.10.12
 
 ### Patch Changes

package/dist/cjs/create-editor/ReactEditorView.js

@@ -102,7 +102,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
         eventType: _analytics.EVENT_TYPE.OPERATIONAL,
         attributes: {
           report: report,
-          participants: ((_this$pluginInjection = _this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.sharedState.currentState().participants.size()) || 1
+          participants: ((_this$pluginInjection = _this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 || (_this$pluginInjection = _this$pluginInjection.sharedState.currentState()) === null || _this$pluginInjection === void 0 || (_this$pluginInjection = _this$pluginInjection.participants) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.size()) || 1
         }
       });
     });
@@ -561,12 +561,6 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
     _this.featureFlags = (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(_this.props.editorProps);
     var featureFlagsEnabled = _this.featureFlags ? (0, _normalizeFeatureFlags.getEnabledFeatureFlagKeys)(_this.featureFlags) : [];
 
-    // START TEMPORARY CODE ED-10584
-    if (_this.props.createAnalyticsEvent) {
-      _this.props.createAnalyticsEvent.__queueAnalytics = _this.featureFlags.queueAnalytics;
-    }
-    // END TEMPORARY CODE ED-10584
-
     // This needs to be before initialising editorState because
     // we dispatch analytics events in plugin initialisation
     _this.eventDispatcher.on(_utils.analyticsEventKey, _this.handleAnalyticsEvent);
@@ -628,13 +622,6 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
   }, {
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      // START TEMPORARY CODE ED-10584
-      if (nextProps.createAnalyticsEvent && nextProps.createAnalyticsEvent !== this.props.createAnalyticsEvent) {
-        var featureFlags = (0, _featureFlagsFromProps.createFeatureFlagsFromProps)(nextProps.editorProps);
-        nextProps.createAnalyticsEvent.__queueAnalytics = featureFlags.queueAnalytics;
-      }
-      // END TEMPORARY CODE ED-10584
-
       if (this.view && this.props.editorProps.disabled !== nextProps.editorProps.disabled) {
         // Disables the contentEditable attribute of the editor if the editor is disabled
         this.view.setProps({

package/dist/cjs/ui/ContentStyles/extension.js

@@ -10,6 +10,7 @@ var _react = require("@emotion/react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _colors = require("@atlaskit/theme/colors");
 var _templateObject, _templateObject2;
+// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
 var extensionLabelStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  &.danger > span > div > .extension-label {\n    background-color: ", ";\n    color: ", ";\n    opacity: 1;\n  }\n\n  &:not(.danger).", "\n    > span\n    > div\n    > .extension-label {\n    background-color: ", ";\n    color: ", ";\n    opacity: 1;\n  }\n"])), "var(--ds-background-accent-red-subtler, ".concat(_colors.R200, ")"), "var(--ds-text-danger, ".concat(_colors.R400, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, "var(--ds-background-selected, ".concat(_colors.B50, ")"), "var(--ds-text-selected, ".concat(_colors.B400, ")"));
 var dangerOverlayStyles = (0, _react.css)({
   opacity: 0.3,

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 = "193.10.12";
+var version = exports.version = "193.10.21";

package/dist/es2019/create-editor/ReactEditorView.js

@@ -93,14 +93,14 @@ export class ReactEditorView extends React.Component {
     // so we allow transactions by default, to avoid discarding the initial one.
     _defineProperty(this, "canDispatchTransactions", true);
     _defineProperty(this, "onPluginObservation", report => {
-      var _this$pluginInjection;
+      var _this$pluginInjection, _this$pluginInjection2, _this$pluginInjection3;
       this.dispatchAnalyticsEvent({
         action: ACTION.TRANSACTION_DISPATCHED,
         actionSubject: ACTION_SUBJECT.EDITOR,
         eventType: EVENT_TYPE.OPERATIONAL,
         attributes: {
           report,
-          participants: ((_this$pluginInjection = this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.sharedState.currentState().participants.size()) || 1
+          participants: ((_this$pluginInjection = this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 ? void 0 : (_this$pluginInjection2 = _this$pluginInjection.sharedState.currentState()) === null || _this$pluginInjection2 === void 0 ? void 0 : (_this$pluginInjection3 = _this$pluginInjection2.participants) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.size()) || 1
         }
       });
     });
@@ -398,10 +398,10 @@ export class ReactEditorView extends React.Component {
         const forceSeverityTracking = typeof proseMirrorRenderedTracking === 'undefined' && shouldForceTracking();
         this.proseMirrorRenderedSeverity = !!forceSeverityTracking || proseMirrorRenderedTracking !== null && proseMirrorRenderedTracking !== void 0 && proseMirrorRenderedTracking.trackSeverity ? getAnalyticsEventSeverity(duration, (_proseMirrorRenderedT = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityNormalThreshold) !== null && _proseMirrorRenderedT !== void 0 ? _proseMirrorRenderedT : PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, (_proseMirrorRenderedT2 = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityDegradedThreshold) !== null && _proseMirrorRenderedT2 !== void 0 ? _proseMirrorRenderedT2 : PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD) : undefined;
         if (this.view) {
-          var _this$pluginInjection2, _this$experienceStore10;
+          var _this$pluginInjection4, _this$experienceStore10;
           const nodes = getNodesCount(this.view.state.doc);
           const ttfb = getResponseEndTime();
-          const contextIdentifier = (_this$pluginInjection2 = this.pluginInjectionAPI.api().base) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
+          const contextIdentifier = (_this$pluginInjection4 = this.pluginInjectionAPI.api().base) === null || _this$pluginInjection4 === void 0 ? void 0 : _this$pluginInjection4.sharedState.currentState();
           this.dispatchAnalyticsEvent({
             action: ACTION.PROSEMIRROR_RENDERED,
             actionSubject: ACTION_SUBJECT.EDITOR,
@@ -548,12 +548,6 @@ export class ReactEditorView extends React.Component {
     this.featureFlags = createFeatureFlagsFromProps(this.props.editorProps);
     const featureFlagsEnabled = this.featureFlags ? getEnabledFeatureFlagKeys(this.featureFlags) : [];
 
-    // START TEMPORARY CODE ED-10584
-    if (this.props.createAnalyticsEvent) {
-      this.props.createAnalyticsEvent.__queueAnalytics = this.featureFlags.queueAnalytics;
-    }
-    // END TEMPORARY CODE ED-10584
-
     // This needs to be before initialising editorState because
     // we dispatch analytics events in plugin initialisation
     this.eventDispatcher.on(analyticsEventKey, this.handleAnalyticsEvent);
@@ -583,13 +577,6 @@ export class ReactEditorView extends React.Component {
     }
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
-    // START TEMPORARY CODE ED-10584
-    if (nextProps.createAnalyticsEvent && nextProps.createAnalyticsEvent !== this.props.createAnalyticsEvent) {
-      const featureFlags = createFeatureFlagsFromProps(nextProps.editorProps);
-      nextProps.createAnalyticsEvent.__queueAnalytics = featureFlags.queueAnalytics;
-    }
-    // END TEMPORARY CODE ED-10584
-
     if (this.view && this.props.editorProps.disabled !== nextProps.editorProps.disabled) {
       // Disables the contentEditable attribute of the editor if the editor is disabled
       this.view.setProps({

package/dist/es2019/ui/ContentStyles/extension.js

@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
 import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, getSelectionStyles, SelectionStyle } from '@atlaskit/editor-shared-styles';
 import { B400, B50, R200, R400 } from '@atlaskit/theme/colors';
+// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
 const extensionLabelStyles = css`
   &.danger > span > div > .extension-label {
     background-color: ${`var(--ds-background-accent-red-subtler, ${R200})`};

package/dist/es2019/version-wrapper.js

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

package/dist/esm/create-editor/ReactEditorView.js

@@ -96,7 +96,7 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
         eventType: EVENT_TYPE.OPERATIONAL,
         attributes: {
           report: report,
-          participants: ((_this$pluginInjection = _this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.sharedState.currentState().participants.size()) || 1
+          participants: ((_this$pluginInjection = _this.pluginInjectionAPI.api().collabEdit) === null || _this$pluginInjection === void 0 || (_this$pluginInjection = _this$pluginInjection.sharedState.currentState()) === null || _this$pluginInjection === void 0 || (_this$pluginInjection = _this$pluginInjection.participants) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.size()) || 1
         }
       });
     });
@@ -555,12 +555,6 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
     _this.featureFlags = createFeatureFlagsFromProps(_this.props.editorProps);
     var featureFlagsEnabled = _this.featureFlags ? getEnabledFeatureFlagKeys(_this.featureFlags) : [];
 
-    // START TEMPORARY CODE ED-10584
-    if (_this.props.createAnalyticsEvent) {
-      _this.props.createAnalyticsEvent.__queueAnalytics = _this.featureFlags.queueAnalytics;
-    }
-    // END TEMPORARY CODE ED-10584
-
     // This needs to be before initialising editorState because
     // we dispatch analytics events in plugin initialisation
     _this.eventDispatcher.on(analyticsEventKey, _this.handleAnalyticsEvent);
@@ -622,13 +616,6 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      // START TEMPORARY CODE ED-10584
-      if (nextProps.createAnalyticsEvent && nextProps.createAnalyticsEvent !== this.props.createAnalyticsEvent) {
-        var featureFlags = createFeatureFlagsFromProps(nextProps.editorProps);
-        nextProps.createAnalyticsEvent.__queueAnalytics = featureFlags.queueAnalytics;
-      }
-      // END TEMPORARY CODE ED-10584
-
       if (this.view && this.props.editorProps.disabled !== nextProps.editorProps.disabled) {
         // Disables the contentEditable attribute of the editor if the editor is disabled
         this.view.setProps({

package/dist/esm/ui/ContentStyles/extension.js

@@ -3,6 +3,7 @@ var _templateObject, _templateObject2;
 import { css } from '@emotion/react';
 import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, getSelectionStyles, SelectionStyle } from '@atlaskit/editor-shared-styles';
 import { B400, B50, R200, R400 } from '@atlaskit/theme/colors';
+// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation
 var extensionLabelStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.danger > span > div > .extension-label {\n    background-color: ", ";\n    color: ", ";\n    opacity: 1;\n  }\n\n  &:not(.danger).", "\n    > span\n    > div\n    > .extension-label {\n    background-color: ", ";\n    color: ", ";\n    opacity: 1;\n  }\n"])), "var(--ds-background-accent-red-subtler, ".concat(R200, ")"), "var(--ds-text-danger, ".concat(R400, ")"), akEditorSelectedNodeClassName, "var(--ds-background-selected, ".concat(B50, ")"), "var(--ds-text-selected, ".concat(B400, ")"));
 var dangerOverlayStyles = css({
   opacity: 0.3,

package/dist/esm/version-wrapper.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "193.10.12",
+  "version": "193.10.21",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -45,9 +45,9 @@
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/analytics-next-stable-react-context": "1.0.1",
     "@atlaskit/button": "^17.12.0",
-    "@atlaskit/editor-common": "^78.29.0",
+    "@atlaskit/editor-common": "^78.30.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
-    "@atlaskit/editor-plugins": "^2.2.0",
+    "@atlaskit/editor-plugins": "^2.3.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/emoji": "^67.6.0",
@@ -87,9 +87,9 @@
     "@atlaskit/adf-utils": "^19.0.0",
     "@atlaskit/analytics-listeners": "^8.9.1",
     "@atlaskit/checkbox": "^13.1.0",
-    "@atlaskit/collab-provider": "9.26.3",
+    "@atlaskit/collab-provider": "9.26.6",
     "@atlaskit/dropdown-menu": "^12.9.0",
-    "@atlaskit/editor-plugin-annotation": "1.5.9",
+    "@atlaskit/editor-plugin-annotation": "1.5.10",
     "@atlaskit/editor-plugin-card": "^1.8.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
     "@atlaskit/editor-plugin-list": "^3.1.5",
@@ -106,7 +106,7 @@
     "@atlaskit/primitives": "^5.5.0",
     "@atlaskit/renderer": "^109.19.0",
     "@atlaskit/select": "^17.6.0",
-    "@atlaskit/smart-card": "^26.56.0",
+    "@atlaskit/smart-card": "^26.57.0",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
     "@atlaskit/util-data-test": "^17.9.0",
     "@atlaskit/visual-regression": "*",