@atlaskit/editor-common 107.2.3 → 107.2.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-common
 
+## 107.2.4
+
+### Patch Changes
+
+- [#176907](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/176907)
+  [`b3cdb5aa072a9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b3cdb5aa072a9) -
+  [ux] Adjust non-empty selection validation logic for the renderer, to disallow annotations on
+  empty block nodes like table cells and expands
+
 ## 107.2.3
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 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 = "107.2.2";
+var packageVersion = "107.2.3";
 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 = "107.2.2";
+var packageVersion = "107.2.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/cjs/utils/annotation/index.js

@@ -12,6 +12,7 @@ exports.getAnnotationMarksForPos = getAnnotationMarksForPos;
 exports.getRangeInlineNodeNames = getRangeInlineNodeNames;
 exports.hasAnnotationMark = hasAnnotationMark;
 exports.isEmptyTextSelection = isEmptyTextSelection;
+exports.isEmptyTextSelectionRenderer = isEmptyTextSelectionRenderer;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -191,4 +192,38 @@ function isEmptyTextSelection(selection, schema) {
     return !hasContent;
   });
   return !hasContent;
+}
+
+/**
+ * This is a modified version of the `isEmptyTextSelection` function (above), fixing some unexpected behavior in the renderer.
+ *
+ * This function does NOT consider non-inline nodes as non-empty.
+ * With this change, the function continues descending into block nodes, like tables or expands. Without this change for
+ * the renderer, block nodes containing empty text were not considered empty.
+ */
+function isEmptyTextSelectionRenderer(selection, schema) {
+  var _schema$nodes2 = schema.nodes,
+    text = _schema$nodes2.text,
+    paragraph = _schema$nodes2.paragraph;
+  var hasContent = false;
+  selection.content().content.descendants(function (node) {
+    // for empty paragraph - consider empty (nothing to comment on)
+    if (node.type === paragraph && !node.content.size) {
+      return false;
+    }
+
+    // for inline elements - consider nonempty
+    if (node.type !== text && node.type.isInline) {
+      hasContent = true;
+    }
+
+    // for nonempty text - consider nonempty (can comment if the node is supported for annotations)
+    if (node.type === text && !!node.textContent) {
+      hasContent = true;
+    }
+
+    // for other non-text nodes - continue descending
+    return !hasContent;
+  });
+  return !hasContent;
 }

package/dist/cjs/utils/index.js

@@ -686,6 +686,12 @@ Object.defineProperty(exports, "isEmptyTextSelection", {
     return _annotation.isEmptyTextSelection;
   }
 });
+Object.defineProperty(exports, "isEmptyTextSelectionRenderer", {
+  enumerable: true,
+  get: function get() {
+    return _annotation.isEmptyTextSelectionRenderer;
+  }
+});
 Object.defineProperty(exports, "isFromCurrentDomain", {
   enumerable: true,
   get: function get() {

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "107.2.2";
+const packageVersion = "107.2.3";
 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 = "107.2.2";
+const packageVersion = "107.2.3";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/utils/annotation/index.js

@@ -186,4 +186,39 @@ export function isEmptyTextSelection(selection, schema) {
     return !hasContent;
   });
   return !hasContent;
+}
+
+/**
+ * This is a modified version of the `isEmptyTextSelection` function (above), fixing some unexpected behavior in the renderer.
+ *
+ * This function does NOT consider non-inline nodes as non-empty.
+ * With this change, the function continues descending into block nodes, like tables or expands. Without this change for
+ * the renderer, block nodes containing empty text were not considered empty.
+ */
+export function isEmptyTextSelectionRenderer(selection, schema) {
+  const {
+    text,
+    paragraph
+  } = schema.nodes;
+  let hasContent = false;
+  selection.content().content.descendants(node => {
+    // for empty paragraph - consider empty (nothing to comment on)
+    if (node.type === paragraph && !node.content.size) {
+      return false;
+    }
+
+    // for inline elements - consider nonempty
+    if (node.type !== text && node.type.isInline) {
+      hasContent = true;
+    }
+
+    // for nonempty text - consider nonempty (can comment if the node is supported for annotations)
+    if (node.type === text && !!node.textContent) {
+      hasContent = true;
+    }
+
+    // for other non-text nodes - continue descending
+    return !hasContent;
+  });
+  return !hasContent;
 }

package/dist/es2019/utils/index.js

@@ -5,7 +5,7 @@ import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { hasDocAsParent } from './document';
 import { isEmptyParagraph } from './editor-core-utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection, isEmptyTextSelectionRenderer } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export {
 /**

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "107.2.2";
+var packageVersion = "107.2.3";
 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 = "107.2.2";
+var packageVersion = "107.2.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/utils/annotation/index.js

@@ -177,4 +177,38 @@ export function isEmptyTextSelection(selection, schema) {
     return !hasContent;
   });
   return !hasContent;
+}
+
+/**
+ * This is a modified version of the `isEmptyTextSelection` function (above), fixing some unexpected behavior in the renderer.
+ *
+ * This function does NOT consider non-inline nodes as non-empty.
+ * With this change, the function continues descending into block nodes, like tables or expands. Without this change for
+ * the renderer, block nodes containing empty text were not considered empty.
+ */
+export function isEmptyTextSelectionRenderer(selection, schema) {
+  var _schema$nodes2 = schema.nodes,
+    text = _schema$nodes2.text,
+    paragraph = _schema$nodes2.paragraph;
+  var hasContent = false;
+  selection.content().content.descendants(function (node) {
+    // for empty paragraph - consider empty (nothing to comment on)
+    if (node.type === paragraph && !node.content.size) {
+      return false;
+    }
+
+    // for inline elements - consider nonempty
+    if (node.type !== text && node.type.isInline) {
+      hasContent = true;
+    }
+
+    // for nonempty text - consider nonempty (can comment if the node is supported for annotations)
+    if (node.type === text && !!node.textContent) {
+      hasContent = true;
+    }
+
+    // for other non-text nodes - continue descending
+    return !hasContent;
+  });
+  return !hasContent;
 }

package/dist/esm/utils/index.js

@@ -5,7 +5,7 @@ import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { hasDocAsParent } from './document';
 import { isEmptyParagraph } from './editor-core-utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection, isEmptyTextSelectionRenderer } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export {
 /**

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

@@ -36,4 +36,12 @@ export declare function getAnnotationMarksForPos(pos: ResolvedPos): Mark[] | und
  * e.g. when you select across multiple empty paragraphs
  */
 export declare function isEmptyTextSelection(selection: TextSelection | AllSelection, schema: Schema): boolean;
+/**
+ * This is a modified version of the `isEmptyTextSelection` function (above), fixing some unexpected behavior in the renderer.
+ *
+ * This function does NOT consider non-inline nodes as non-empty.
+ * With this change, the function continues descending into block nodes, like tables or expands. Without this change for
+ * the renderer, block nodes containing empty text were not considered empty.
+ */
+export declare function isEmptyTextSelectionRenderer(selection: TextSelection | AllSelection, schema: Schema): boolean;
 export {};

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

@@ -2,7 +2,7 @@ import type { Node as PMNode, ResolvedPos, Schema } from '@atlaskit/editor-prose
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection, } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection, isEmptyTextSelectionRenderer, } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export type { Params } from './macro';
 export { 

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

@@ -36,4 +36,12 @@ export declare function getAnnotationMarksForPos(pos: ResolvedPos): Mark[] | und
  * e.g. when you select across multiple empty paragraphs
  */
 export declare function isEmptyTextSelection(selection: TextSelection | AllSelection, schema: Schema): boolean;
+/**
+ * This is a modified version of the `isEmptyTextSelection` function (above), fixing some unexpected behavior in the renderer.
+ *
+ * This function does NOT consider non-inline nodes as non-empty.
+ * With this change, the function continues descending into block nodes, like tables or expands. Without this change for
+ * the renderer, block nodes containing empty text were not considered empty.
+ */
+export declare function isEmptyTextSelectionRenderer(selection: TextSelection | AllSelection, schema: Schema): boolean;
 export {};

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

@@ -2,7 +2,7 @@ import type { Node as PMNode, ResolvedPos, Schema } from '@atlaskit/editor-prose
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export { shouldAutoLinkifyMatch } from './should-auto-linkify-tld';
-export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection, } from './annotation';
+export { getAnnotationMarksForPos, canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, hasAnnotationMark, getRangeInlineNodeNames, isEmptyTextSelection, isEmptyTextSelectionRenderer, } from './annotation';
 export { getExtensionLozengeData } from './macro';
 export type { Params } from './macro';
 export { 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "107.2.3",
+	"version": "107.2.4",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"