@atlaskit/editor-plugin-show-diff 17.0.0 → 17.0.2

package/dist/esm/pm-plugins/utils/emptyTextBlocks.js

@@ -0,0 +1,60 @@
+/**
+ * The textblock types whose empty form is a blank line the author put there deliberately, and so
+ * worth marking when a change removes it.
+ *
+ * Deliberately not every textblock: an empty `codeBlock` is an empty code block, which renders as a
+ * visible box of its own and needs no stand-in.
+ */
+var BLANK_LINE_NODE_NAMES = new Set(['paragraph', 'heading']);
+
+/**
+ * Structurally empty: no children at all, not merely no measurable content. The two coincide for a
+ * real node, and testing both keeps a node whose children report no size from passing as blank.
+ */
+var isEmptyTextBlock = function isEmptyTextBlock(node) {
+  return BLANK_LINE_NODE_NAMES.has(node.type.name) && node.content.childCount === 0 && node.content.size === 0;
+};
+
+/**
+ * How many empty textblocks a slice holds, or 0 unless that is *all* it holds.
+ *
+ * Counted rather than tested for one, because a run of adjacent blank lines is reported as a single
+ * change covering all of them — the case that made a single-block test miss.
+ */
+export var countEmptyTextBlockOnlySlice = function countEmptyTextBlockOnlySlice(slice) {
+  var _slice$content$childC;
+  var childCount = (_slice$content$childC = slice === null || slice === void 0 ? void 0 : slice.content.childCount) !== null && _slice$content$childC !== void 0 ? _slice$content$childC : 0;
+  if (!slice || childCount === 0) {
+    return 0;
+  }
+  for (var index = 0; index < childCount; index++) {
+    if (!isEmptyTextBlock(slice.content.child(index))) {
+      return 0;
+    }
+  }
+  return childCount;
+};
+
+/**
+ * The content position of every empty textblock lying wholly within `[from, to]`.
+ *
+ * Used to place a marker on each blank line a change removes. Partially covered blocks are skipped:
+ * the change only took part of one, so it still has text of its own, which the inline decoration
+ * already marks.
+ */
+export var emptyTextBlockContentPositions = function emptyTextBlockContentPositions(doc, from, to) {
+  var positions = [];
+  doc.nodesBetween(from, to, function (node, pos) {
+    if (node.isTextblock) {
+      if (isEmptyTextBlock(node) && pos >= from && pos + node.nodeSize <= to) {
+        // +1 steps over the block's own open token, into its (empty) content.
+        positions.push(pos + 1);
+      }
+      // A textblock holds inline content only, so there is nothing below it to visit.
+      return false;
+    }
+    // Keep descending: blank lines nest inside cells, columns and panels.
+    return true;
+  });
+  return positions;
+};

package/dist/types/pm-plugins/calculateDiff/groupDeletedColumnChanges.d.ts

@@ -0,0 +1,9 @@
+import type { Change } from 'prosemirror-changeset';
+import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Mapping } from '@atlaskit/editor-prosemirror/transform';
+export type ColumnAwareChange = Change & {
+    deletedColumns?: number[];
+};
+export declare const CELL_CONTENT_OFFSET = 2;
+/** Groups a deleted column's cell changes into one whole-table change. */
+export declare const groupDeletedColumnChanges: (changes: readonly Change[], originalDoc: PMNode, newDoc: PMNode, mapping: Mapping, isInverted: boolean) => ColumnAwareChange[];

package/dist/types/pm-plugins/decorations/createChangedRowDecorationWidgets.d.ts

@@ -1,4 +1,5 @@
 import type { Change } from 'prosemirror-changeset';
+import type { IntlShape } from 'react-intl';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { DiffType } from '../../showDiffPluginType';
@@ -9,11 +10,12 @@ type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export declare const createChangedRowDecorationWidgets: ({ attributionKey, changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isActive, isInserted, diffType, showIndicators, showContributorTags, tagMountContext, }: {
+export declare const createChangedRowDecorationWidgets: ({ attributionKey, changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isActive, isInserted, diffType, intl, showIndicators, showContributorTags, tagMountContext, }: {
     attributionKey?: string;
     changes: SimpleChange[];
     colorScheme?: ColorScheme;
     diffType?: DiffType;
+    intl?: IntlShape;
     isActive?: boolean;
     isInserted?: boolean;
     newDoc: PMNode;

package/dist/types/pm-plugins/decorations/createContributorTagWidget.d.ts

@@ -39,7 +39,11 @@ export declare const unmountContributorTag: (mount: ContributorTagMount | undefi
  * The host for a tag on deleted content, which renders inside its own widget decoration rather than
  * needing one of its own. Unmount with `unmountContributorTag` from that widget's `destroy`.
  */
-export declare const createContributorTagHost: (diffId: string, mountContext?: ContributorTagMountContext) => {
+export declare const createContributorTagHost: ({ anchorName, diffId, mountContext, }: {
+    anchorName?: string;
+    diffId: string;
+    mountContext?: ContributorTagMountContext;
+}) => {
     host: HTMLSpanElement;
     mount: ContributorTagMount | undefined;
 } | undefined;

package/dist/types/pm-plugins/decorations/createNodeChangedDecorationWidget.d.ts

@@ -10,7 +10,7 @@ import type { ColorScheme } from './colorSchemes/types';
  * This function is used to create a decoration widget to show content
  * that is not in the current document.
  */
-export declare const createNodeChangedDecorationWidget: ({ attributionKey, change, doc, nodeViewSerializer, colorScheme, newDoc, intl, activeIndexPos, isInserted, showContributorTags, showIndicators, placeBelow, diffType, hideAddedDiffsUnderline, reveal, tagMountContext, }: {
+export declare const createNodeChangedDecorationWidget: ({ attributionKey, change, doc, nodeViewSerializer, colorScheme, newDoc, intl, activeIndexPos, isInserted, showContributorTags, showIndicators, placeBelow, diffType, hideAddedDiffsUnderline, reveal, tagMountContext, deletedColumns, }: {
     activeIndexPos?: {
         from: number;
         to: number;
@@ -18,6 +18,7 @@ export declare const createNodeChangedDecorationWidget: ({ attributionKey, chang
     attributionKey?: string;
     change: Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted' | 'toB'>;
     colorScheme?: ColorScheme;
+    deletedColumns?: readonly number[];
     diffType?: DiffType;
     doc: PMNode;
     hideAddedDiffsUnderline?: boolean;

package/dist/types/pm-plugins/decorations/utils/createDeletedLineBreakWidget.d.ts

@@ -0,0 +1,50 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import type { DiffType, RevealOptions } from '../../../showDiffPluginType';
+import type { ColorScheme } from '../colorSchemes/types';
+/**
+ * U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS — the return-key glyph.
+ *
+ * Exported so tests assert against the glyph actually rendered rather than a copy of it.
+ */
+export declare const RETURN_GLYPH = "\u2936";
+/**
+ * The DOM for a removed blank line: the return glyph, struck through in the deleted colours.
+ *
+ * An empty paragraph or heading is a line the author deliberately added, but it has no content for
+ * the deleted-content widget to serialize, so a deletion of one used to render nothing at all — the
+ * reviewer saw the surrounding text close up with no sign of what was removed. Standing the glyph
+ * in for the absent content keeps the deletion visible without inventing content that was not there.
+ *
+ * `createContentWrapper` supplies the highlight and the strikethrough line, so the glyph is styled
+ * exactly like any other run of deleted inline content, including the active and reveal states.
+ *
+ * Hidden from assistive technology: the glyph is a picture of a key, and read out it is announced as
+ * its Unicode name rather than as a removed line.
+ */
+export declare const createDeletedLineBreakWidget: ({ colorScheme, count, diffType, isActive, reveal, }: {
+    colorScheme?: ColorScheme;
+    /** One glyph per removed blank line, for a run of adjacent ones. */
+    count?: number;
+    diffType?: DiffType;
+    isActive?: boolean;
+    reveal?: RevealOptions;
+}) => HTMLElement;
+/**
+ * The glyph as a widget decoration anchored at `pos`.
+ *
+ * Shared by the two shapes a blank-line removal arrives in. On a forward diff the block is gone from
+ * the new document, so the change lands on the deleted side and the glyph is anchored where the
+ * block used to be. On an inverted diff — what AI suggested edits renders — the block is still in
+ * the displayed document and the change lands on the *inserted* side, so the glyph is anchored
+ * inside the surviving block, on the blank line itself.
+ */
+export declare const createDeletedLineBreakDecoration: ({ attributionKey, colorScheme, count, diffType, isActive, pos, reveal, side, }: {
+    attributionKey?: string;
+    colorScheme?: ColorScheme;
+    count?: number;
+    diffType?: DiffType;
+    isActive?: boolean;
+    pos: number;
+    reveal?: RevealOptions;
+    side?: number;
+}) => Decoration;

package/dist/types/pm-plugins/decorations/utils/tableDiffMode.d.ts

@@ -0,0 +1,26 @@
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
+export type TableDiffMode = 
+/** Add table headers, or replace whole cells. Draws one content widget per cell. */
+{
+    kind: 'cells';
+}
+/** Delete a row, or replace a whole row. Draws a row copy inside the table. */
+ | {
+    kind: 'rows';
+}
+/** Delete a column, or replace a whole table. Draws a table copy next to the live table. */
+ | {
+    kind: 'wholeTable';
+}
+/** Delete cells with no replacement. The new document has no cell to anchor to, so nothing draws. */
+ | {
+    kind: 'none';
+}
+/** Any change outside a table, such as a paragraph edit. Draws the generic block widget. */
+ | {
+    kind: 'generic';
+};
+export declare const getTableDiffMode: ({ slice, isInserted, }: {
+    isInserted: boolean;
+    slice: Slice;
+}) => TableDiffMode;

package/dist/types/pm-plugins/decorations/utils/wrapBlockNodeView.d.ts

@@ -2,6 +2,10 @@ import type { IntlShape } from 'react-intl';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { DiffType, RevealOptions } from '../../../showDiffPluginType';
 import type { ColorScheme } from '../colorSchemes/types';
+/**
+ * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
+ */
+export declare const createRemovedLozenge: (intl: IntlShape, isActive?: boolean, colorScheme?: ColorScheme, inCell?: boolean) => HTMLElement;
 /**
  * Handles all block node rendering with appropriate deleted styling.
  * For heading nodes, applies styles directly to preserve natural margins.

package/dist/types/pm-plugins/utils/emptyTextBlocks.d.ts

@@ -0,0 +1,16 @@
+import type { Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
+/**
+ * How many empty textblocks a slice holds, or 0 unless that is *all* it holds.
+ *
+ * Counted rather than tested for one, because a run of adjacent blank lines is reported as a single
+ * change covering all of them — the case that made a single-block test miss.
+ */
+export declare const countEmptyTextBlockOnlySlice: (slice: Slice | undefined) => number;
+/**
+ * The content position of every empty textblock lying wholly within `[from, to]`.
+ *
+ * Used to place a marker on each blank line a change removes. Partially covered blocks are skipped:
+ * the change only took part of one, so it still has text of its own, which the inline decoration
+ * already marks.
+ */
+export declare const emptyTextBlockContentPositions: (doc: PMNode, from: number, to: number) => number[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "17.0.0",
+	"version": "17.0.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^199.0.0",
+		"@atlaskit/tmp-editor-statsig": "^200.0.0",
 		"@atlaskit/tokens": "^18.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -64,14 +64,14 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^33.0.0",
-		"@atlassian/editor-plugin-ai": "^73.0.0",
+		"@atlassian/editor-plugin-ai": "^73.2.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.0.0",
+		"@atlaskit/editor-common": "^123.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"