@atlaskit/editor-plugin-annotation 1.26.12 → 1.26.14

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.26.14
+
+### Patch Changes
+
+- [#105009](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105009)
+  [`a4039ebf7ed11`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a4039ebf7ed11) -
+  [ux] Implement variant 2 cohorts experience for platform_editor_contextual_formatting_toolbar_v2
+  experiment
+- Updated dependencies
+
+## 1.26.13
+
+### Patch Changes
+
+- [#104018](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104018)
+  [`80879ff079752`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/80879ff079752) -
+  Fix annotation state for new todom node view
+
 ## 1.26.12
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -97,7 +97,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
             return undefined;
           } else {
             return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
-              rank: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) ? 1 : undefined
+              rank: (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true) || (0, _experiments.editorExperiment)('platform_editor_contextual_formatting_toolbar_v2', 'variant2') ? 1 : undefined
             });
           }
         }

package/dist/cjs/nodeviews/annotationMark.js

@@ -9,28 +9,21 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _adfSchema = require("@atlaskit/adf-schema");
 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) { (0, _defineProperty2.default)(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; }
-function buildDataAttributes(_ref) {
-  var id = _ref.id,
-    annotationType = _ref.annotationType;
-  return {
-    'data-mark-type': 'annotation',
-    'data-mark-annotation-type': annotationType,
-    'data-id': id
-  };
-}
-
 /**
  * Annotation mark lifted from adf-schema with modified `toDOM` to work with
  * existing nodeview
  */
 var annotationWithToDOMFix = exports.annotationWithToDOMFix = _objectSpread(_objectSpread({}, _adfSchema.annotation), {}, {
   toDOM: function toDOM(node) {
-    return ['span', _objectSpread({
+    return ['span', {
       // Needs id as a reference point
-      id: node.attrs.id
-    }, buildDataAttributes({
       id: node.attrs.id,
-      annotationType: node.attrs.annotationType
-    })), 0];
+      // Used to determine if the annotation is active
+      annotationType: node.attrs.annotationType,
+      // Below are used for prosemirror (ie. copy/paste behaviour)
+      'data-mark-type': 'annotation',
+      'data-mark-annotation-type': node.attrs.annotationType,
+      'data-id': node.attrs.id
+    }, 0];
   }
 });

package/dist/es2019/annotationPlugin.js

@@ -90,7 +90,7 @@ export const annotationPlugin = ({
           } else {
             return {
               ...toolbarConfig,
-              rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
+              rank: editorExperiment('contextual_formatting_toolbar', true) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant2') ? 1 : undefined
             };
           }
         }

package/dist/es2019/nodeviews/annotationMark.js

@@ -1,15 +1,4 @@
 import { annotation } from '@atlaskit/adf-schema';
-function buildDataAttributes({
-  id,
-  annotationType
-}) {
-  return {
-    'data-mark-type': 'annotation',
-    'data-mark-annotation-type': annotationType,
-    'data-id': id
-  };
-}
-
 /**
  * Annotation mark lifted from adf-schema with modified `toDOM` to work with
  * existing nodeview
@@ -20,10 +9,12 @@ export const annotationWithToDOMFix = {
     return ['span', {
       // Needs id as a reference point
       id: node.attrs.id,
-      ...buildDataAttributes({
-        id: node.attrs.id,
-        annotationType: node.attrs.annotationType
-      })
+      // Used to determine if the annotation is active
+      annotationType: node.attrs.annotationType,
+      // Below are used for prosemirror (ie. copy/paste behaviour)
+      'data-mark-type': 'annotation',
+      'data-mark-annotation-type': node.attrs.annotationType,
+      'data-id': node.attrs.id
     }, 0];
   }
 };

package/dist/esm/annotationPlugin.js

@@ -90,7 +90,7 @@ export var annotationPlugin = function annotationPlugin(_ref) {
             return undefined;
           } else {
             return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
-              rank: editorExperiment('contextual_formatting_toolbar', true) ? 1 : undefined
+              rank: editorExperiment('contextual_formatting_toolbar', true) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant2') ? 1 : undefined
             });
           }
         }

package/dist/esm/nodeviews/annotationMark.js

@@ -2,28 +2,21 @@ 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 { annotation } from '@atlaskit/adf-schema';
-function buildDataAttributes(_ref) {
-  var id = _ref.id,
-    annotationType = _ref.annotationType;
-  return {
-    'data-mark-type': 'annotation',
-    'data-mark-annotation-type': annotationType,
-    'data-id': id
-  };
-}
-
 /**
  * Annotation mark lifted from adf-schema with modified `toDOM` to work with
  * existing nodeview
  */
 export var annotationWithToDOMFix = _objectSpread(_objectSpread({}, annotation), {}, {
   toDOM: function toDOM(node) {
-    return ['span', _objectSpread({
+    return ['span', {
       // Needs id as a reference point
-      id: node.attrs.id
-    }, buildDataAttributes({
       id: node.attrs.id,
-      annotationType: node.attrs.annotationType
-    })), 0];
+      // Used to determine if the annotation is active
+      annotationType: node.attrs.annotationType,
+      // Below are used for prosemirror (ie. copy/paste behaviour)
+      'data-mark-type': 'annotation',
+      'data-mark-annotation-type': node.attrs.annotationType,
+      'data-id': node.attrs.id
+    }, 0];
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "1.26.12",
+	"version": "1.26.14",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,8 +32,8 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.3.0",
-		"@atlaskit/editor-plugin-analytics": "^1.10.0",
+		"@atlaskit/editor-common": "^99.5.0",
+		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-connectivity": "^1.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^1.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/icon": "^23.4.0",
 		"@atlaskit/onboarding": "^12.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^2.37.0",
+		"@atlaskit/tmp-editor-statsig": "^2.39.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {