@atlaskit/editor-plugin-annotation 10.0.1 → 10.1.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-annotation
 
+## 10.1.0
+
+### Minor Changes
+
+- [`e5cdd96dcf4f9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e5cdd96dcf4f9) -
+  Clean up platform_editor_hydratable_ui experiment (shipped as enabled)
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.0.1
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("./editor-commands");
 var _annotationMark = require("./nodeviews/annotationMark");
@@ -134,7 +133,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
     contentComponent: function contentComponent(_ref3) {
       var editorView = _ref3.editorView,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-      if (!annotationProviders || !editorView || (0, _coreUtils.isSSR)() && (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true)) {
+      if (!annotationProviders || !editorView || (0, _coreUtils.isSSR)()) {
         return null;
       }
       return /*#__PURE__*/_react.default.createElement(AnnotationContentComponent, {

package/dist/cjs/ui/InlineCommentView.js

@@ -1,13 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineCommentView = InlineCommentView;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -20,7 +19,6 @@ var _editorCommands = require("../editor-commands");
 var _utils3 = require("../pm-plugins/utils");
 var _types = require("../types");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
     from = sel.from;
@@ -59,7 +57,6 @@ function InlineCommentView(_ref) {
   var inlineCommentProvider = providers.inlineComment;
   var state = editorView.state,
     dispatch = editorView.dispatch;
-  var lastSelectedAnnotationId = (0, _react.useRef)();
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(editorAPI, ['annotation'], selector),
@@ -108,17 +105,9 @@ function InlineCommentView(_ref) {
 
   // Create Component
   if (bookmark) {
-    var _selectedAnnotations$;
     if (!CreateComponent) {
       return null;
     }
-    var currentlySelectedAnnotation = selectedAnnotations === null || selectedAnnotations === void 0 || (_selectedAnnotations$ = selectedAnnotations[0]) === null || _selectedAnnotations$ === void 0 ? void 0 : _selectedAnnotations$.id;
-    var isAnnotationSelectionChanged = currentlySelectedAnnotation !== lastSelectedAnnotationId.current;
-
-    // Update the last selected annotation ID if the selection was updated
-    if (isAnnotationSelectionChanged) {
-      lastSelectedAnnotationId.current = currentlySelectedAnnotation;
-    }
     var inlineNodeTypes = (0, _utils.getRangeInlineNodeNames)({
       doc: state.doc,
       pos: selection
@@ -131,8 +120,7 @@ function InlineCommentView(_ref) {
       "data-editor-popup": "true"
     }, /*#__PURE__*/_react.default.createElement(CreateComponent, {
       dom: dom,
-      textSelection: textSelection,
-      wasNewAnnotationSelected: !!currentlySelectedAnnotation && isAnnotationSelectionChanged
+      textSelection: textSelection
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
       onCreate: function onCreate(id) {

package/dist/es2019/annotationPlugin.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
@@ -127,7 +126,7 @@ export const annotationPlugin = ({
       editorView,
       dispatchAnalyticsEvent
     }) {
-      if (!annotationProviders || !editorView || isSSR() && expValEquals('platform_editor_hydratable_ui', 'isEnabled', true)) {
+      if (!annotationProviders || !editorView || isSSR()) {
         return null;
       }
       return /*#__PURE__*/React.createElement(AnnotationContentComponent, {

package/dist/es2019/ui/InlineCommentView.js

@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
@@ -54,7 +54,6 @@ export function InlineCommentView({
     state,
     dispatch
   } = editorView;
-  const lastSelectedAnnotationId = useRef();
   const {
     createComponent: CreateComponent,
     viewComponent: ViewComponent
@@ -106,17 +105,9 @@ export function InlineCommentView({
 
   // Create Component
   if (bookmark) {
-    var _selectedAnnotations$;
     if (!CreateComponent) {
       return null;
     }
-    const currentlySelectedAnnotation = selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : (_selectedAnnotations$ = selectedAnnotations[0]) === null || _selectedAnnotations$ === void 0 ? void 0 : _selectedAnnotations$.id;
-    const isAnnotationSelectionChanged = currentlySelectedAnnotation !== lastSelectedAnnotationId.current;
-
-    // Update the last selected annotation ID if the selection was updated
-    if (isAnnotationSelectionChanged) {
-      lastSelectedAnnotationId.current = currentlySelectedAnnotation;
-    }
     const inlineNodeTypes = getRangeInlineNodeNames({
       doc: state.doc,
       pos: selection
@@ -129,8 +120,7 @@ export function InlineCommentView({
       "data-editor-popup": "true"
     }, /*#__PURE__*/React.createElement(CreateComponent, {
       dom: dom,
-      textSelection: textSelection,
-      wasNewAnnotationSelected: !!currentlySelectedAnnotation && isAnnotationSelectionChanged
+      textSelection: textSelection
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
       onCreate: id => {

package/dist/esm/annotationPlugin.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { annotationWithToDOMFix } from './nodeviews/annotationMark';
@@ -127,7 +126,7 @@ export var annotationPlugin = function annotationPlugin(_ref) {
     contentComponent: function contentComponent(_ref3) {
       var editorView = _ref3.editorView,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent;
-      if (!annotationProviders || !editorView || isSSR() && expValEquals('platform_editor_hydratable_ui', 'isEnabled', true)) {
+      if (!annotationProviders || !editorView || isSSR()) {
         return null;
       }
       return /*#__PURE__*/React.createElement(AnnotationContentComponent, {

package/dist/esm/ui/InlineCommentView.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React, { useRef } from 'react';
+import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
@@ -50,7 +50,6 @@ export function InlineCommentView(_ref) {
   var inlineCommentProvider = providers.inlineComment;
   var state = editorView.state,
     dispatch = editorView.dispatch;
-  var lastSelectedAnnotationId = useRef();
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
   var _useSharedPluginState = useSharedPluginStateWithSelector(editorAPI, ['annotation'], selector),
@@ -99,17 +98,9 @@ export function InlineCommentView(_ref) {
 
   // Create Component
   if (bookmark) {
-    var _selectedAnnotations$;
     if (!CreateComponent) {
       return null;
     }
-    var currentlySelectedAnnotation = selectedAnnotations === null || selectedAnnotations === void 0 || (_selectedAnnotations$ = selectedAnnotations[0]) === null || _selectedAnnotations$ === void 0 ? void 0 : _selectedAnnotations$.id;
-    var isAnnotationSelectionChanged = currentlySelectedAnnotation !== lastSelectedAnnotationId.current;
-
-    // Update the last selected annotation ID if the selection was updated
-    if (isAnnotationSelectionChanged) {
-      lastSelectedAnnotationId.current = currentlySelectedAnnotation;
-    }
     var inlineNodeTypes = getRangeInlineNodeNames({
       doc: state.doc,
       pos: selection
@@ -122,8 +113,7 @@ export function InlineCommentView(_ref) {
       "data-editor-popup": "true"
     }, /*#__PURE__*/React.createElement(CreateComponent, {
       dom: dom,
-      textSelection: textSelection,
-      wasNewAnnotationSelected: !!currentlySelectedAnnotation && isAnnotationSelectionChanged
+      textSelection: textSelection
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
       onCreate: function onCreate(id) {

package/dist/types/types/index.d.ts

@@ -44,7 +44,6 @@ export type InlineCommentCreateComponentProps = AnnotationComponentProps & {
      * Creates an annotation mark in the document with the given id.
      */
     onCreate: (id: string) => void;
-    wasNewAnnotationSelected?: boolean;
 };
 export type InlineCommentViewComponentProps = AnnotationComponentProps & {
     /**
@@ -145,11 +144,11 @@ export declare enum AnnotationSelectionType {
     VALID = "valid"
 }
 export declare const AnnotationTestIds: {
-    prefix: string;
+    componentClose: string;
+    componentSave: string;
     floatingComponent: string;
     floatingToolbarCreateButton: string;
-    componentSave: string;
-    componentClose: string;
+    prefix: string;
 };
 export type CoordsAtPos = {
     bottom: number;

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

@@ -44,7 +44,6 @@ export type InlineCommentCreateComponentProps = AnnotationComponentProps & {
      * Creates an annotation mark in the document with the given id.
      */
     onCreate: (id: string) => void;
-    wasNewAnnotationSelected?: boolean;
 };
 export type InlineCommentViewComponentProps = AnnotationComponentProps & {
     /**
@@ -145,11 +144,11 @@ export declare enum AnnotationSelectionType {
     VALID = "valid"
 }
 export declare const AnnotationTestIds: {
-    prefix: string;
+    componentClose: string;
+    componentSave: string;
     floatingComponent: string;
     floatingToolbarCreateButton: string;
-    componentSave: string;
-    componentClose: string;
+    prefix: string;
 };
 export type CoordsAtPos = {
     bottom: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "10.0.1",
+	"version": "10.1.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,11 +39,11 @@
 		"@atlaskit/editor-toolbar-model": "^0.4.0",
 		"@atlaskit/icon": "^34.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^63.0.0",
+		"@atlaskit/tmp-editor-statsig": "^65.0.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.2.0",
+		"@atlaskit/editor-common": "^114.6.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"