@atlaskit/editor-plugin-synced-block 12.0.7 → 12.0.8

package/AGENTS.md

@@ -48,7 +48,6 @@ src/
 │       ├── has-synced-blocks.ts                    # O(childCount) presence check (EDITOR-6928 lazy init)
 │       ├── transaction-inserts-synced-block.ts     # Detect tr inserts a synced block (lazy init)
 │       ├── selection-decorations.ts                # Selection decoration helpers
-│       ├── rebase-transaction.ts                   # Rebase helpers used by main.ts
 │       ├── ignore-dom-event.ts                     # DOM event guard
 │       └── utils.ts                                # Misc shared helpers
 ├── ui/                          # (grep the dir for the full current list — it grows often)

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 12.0.8
+
+### Patch Changes
+
+- [`1f0dab65b6efd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1f0dab65b6efd) -
+  Remove unreachable cut-handling branch and duplicated synced block node view setup left over from
+  feature gate cleanup
+- Updated dependencies
+
 ## 12.0.7
 
 ### Patch Changes

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -9,7 +9,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
@@ -43,20 +42,13 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
     this.dom = dom;
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     this.contentDOM = contentDOM;
-    var labelContainer;
-    if ((0, _coreUtils.isSSR)() && (0, _coreUtils.isSSRStreaming)()) {
-      // During SSR, the portal's renderToStaticMarkup + innerHTML clobbers
-      // contentDOM. Render the label into a separate container to prevent this.
-      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
-      labelContainer = document.createElement('div');
-      this.dom.appendChild(labelContainer);
-    } else {
-      // Render the label into a separate container so portal implementations
-      // that write directly into the target do not clobber contentDOM.
-      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
-      labelContainer = document.createElement('div');
-      this.dom.appendChild(labelContainer);
-    }
+
+    // Render the label into a separate container so portal implementations that
+    // write directly into the target do not clobber contentDOM. This also covers
+    // SSR, where the portal's renderToStaticMarkup + innerHTML would clobber it.
+    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
+    var labelContainer = document.createElement('div');
+    this.dom.appendChild(labelContainer);
     this.labelKey = crypto.randomUUID();
     this.nodeViewPortalProviderAPI.render(function () {
       var _this$api;

package/dist/cjs/pm-plugins/main.js

@@ -950,23 +950,10 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
         var schema = state.schema;
         var isCopy = ctx.consumeCopyEvent();
-        var wasCut = ctx.consumeCutEvent();
-        var isCut = wasCut;
-        var isPromptedFeedbackCut = Boolean(syncBlockStore && (options === null || options === void 0 ? void 0 : options.onGiveFeedback) && wasCut) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_sync_block_activation', 'isEnabled', true);
-        if (!syncBlockStore || !isCopy && !isCut && !isPromptedFeedbackCut) {
-          return slice;
-        }
-        if (isPromptedFeedbackCut && !isCut) {
-          var _containsCutSyncBlock = false;
-          (0, _utils.mapSlice)(slice, function (node) {
-            if (syncBlockStore.referenceManager.isReferenceBlock(node) || node.type.name === 'bodiedSyncBlock' && (0, _utils3.sliceFullyContainsNode)(slice, node)) {
-              _containsCutSyncBlock = true;
-            }
-            return node;
-          });
-          if (_containsCutSyncBlock) {
-            ctx.markCutRemovalPending();
-          }
+        var isCut = ctx.consumeCutEvent();
+        // A prompted feedback cut is always a cut, so the two never need combining.
+        var isPromptedFeedbackCut = Boolean(syncBlockStore && (options === null || options === void 0 ? void 0 : options.onGiveFeedback) && isCut) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_sync_block_activation', 'isEnabled', true);
+        if (!syncBlockStore || !isCopy && !isCut) {
           return slice;
         }
         var containsCutSyncBlock = false;
@@ -981,7 +968,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             return node;
           }
           if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
-            if (isPromptedFeedbackCut && isCut && (0, _utils3.sliceFullyContainsNode)(slice, node)) {
+            if (isPromptedFeedbackCut && (0, _utils3.sliceFullyContainsNode)(slice, node)) {
               containsCutSyncBlock = true;
             }
             // if we only selected part of the bodied sync block content,
@@ -1145,9 +1132,6 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           }
         });
       }
-
-      // Delete is recomputed fresh from the live document on confirm.
-      // See EDITOR-7889.
       var _iterator2 = _createForOfIteratorHelper(trs),
         _step2;
       try {

package/dist/cjs/ui/SyncedLocationDropdown.js

@@ -244,9 +244,8 @@ var ItemIcon = function ItemIcon(_ref3) {
     });
   }
 
-  // Render a Jira issue-type icon when we have one, gated by the shared rollout flag.
+  // Render a Jira issue-type icon when we have one.
   // Falls through to the generic product icon when:
-  //   - the gate is off,
   //   - we don't have access (issueType is not surfaced for no-access references),
   //   - AGG returned no `issueType` (partial index, deleted, etc.), or
   //   - the issue type is unrecognised AND has no `iconUrl`.

package/dist/es2019/nodeviews/bodiedSyncedBlock.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
@@ -31,20 +30,13 @@ export class BodiedSyncBlock {
     this.dom = dom;
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     this.contentDOM = contentDOM;
-    let labelContainer;
-    if (isSSR() && isSSRStreaming()) {
-      // During SSR, the portal's renderToStaticMarkup + innerHTML clobbers
-      // contentDOM. Render the label into a separate container to prevent this.
-      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
-      labelContainer = document.createElement('div');
-      this.dom.appendChild(labelContainer);
-    } else {
-      // Render the label into a separate container so portal implementations
-      // that write directly into the target do not clobber contentDOM.
-      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
-      labelContainer = document.createElement('div');
-      this.dom.appendChild(labelContainer);
-    }
+
+    // Render the label into a separate container so portal implementations that
+    // write directly into the target do not clobber contentDOM. This also covers
+    // SSR, where the portal's renderToStaticMarkup + innerHTML would clobber it.
+    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
+    const labelContainer = document.createElement('div');
+    this.dom.appendChild(labelContainer);
     this.labelKey = crypto.randomUUID();
     this.nodeViewPortalProviderAPI.render(() => {
       var _this$api, _this$api$analytics;

package/dist/es2019/pm-plugins/main.js

@@ -890,23 +890,10 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           schema
         } = state;
         const isCopy = ctx.consumeCopyEvent();
-        const wasCut = ctx.consumeCutEvent();
-        const isCut = wasCut;
-        const isPromptedFeedbackCut = Boolean(syncBlockStore && (options === null || options === void 0 ? void 0 : options.onGiveFeedback) && wasCut) && expValEqualsNoExposure('platform_editor_sync_block_activation', 'isEnabled', true);
-        if (!syncBlockStore || !isCopy && !isCut && !isPromptedFeedbackCut) {
-          return slice;
-        }
-        if (isPromptedFeedbackCut && !isCut) {
-          let containsCutSyncBlock = false;
-          mapSlice(slice, node => {
-            if (syncBlockStore.referenceManager.isReferenceBlock(node) || node.type.name === 'bodiedSyncBlock' && sliceFullyContainsNode(slice, node)) {
-              containsCutSyncBlock = true;
-            }
-            return node;
-          });
-          if (containsCutSyncBlock) {
-            ctx.markCutRemovalPending();
-          }
+        const isCut = ctx.consumeCutEvent();
+        // A prompted feedback cut is always a cut, so the two never need combining.
+        const isPromptedFeedbackCut = Boolean(syncBlockStore && (options === null || options === void 0 ? void 0 : options.onGiveFeedback) && isCut) && expValEqualsNoExposure('platform_editor_sync_block_activation', 'isEnabled', true);
+        if (!syncBlockStore || !isCopy && !isCut) {
           return slice;
         }
         let containsCutSyncBlock = false;
@@ -921,7 +908,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             return node;
           }
           if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
-            if (isPromptedFeedbackCut && isCut && sliceFullyContainsNode(slice, node)) {
+            if (isPromptedFeedbackCut && sliceFullyContainsNode(slice, node)) {
               containsCutSyncBlock = true;
             }
             // if we only selected part of the bodied sync block content,
@@ -1075,10 +1062,6 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           }
         });
       }
-
-      // Delete is recomputed fresh from the live document on confirm.
-      // See EDITOR-7889.
-
       for (const tr of trs) {
         if (tr.getMeta(pmHistoryPluginKey)) {
           const {

package/dist/es2019/ui/SyncedLocationDropdown.js

@@ -234,9 +234,8 @@ const ItemIcon = ({
     });
   }
 
-  // Render a Jira issue-type icon when we have one, gated by the shared rollout flag.
+  // Render a Jira issue-type icon when we have one.
   // Falls through to the generic product icon when:
-  //   - the gate is off,
   //   - we don't have access (issueType is not surfaced for no-access references),
   //   - AGG returned no `issueType` (partial index, deleted, etc.), or
   //   - the issue type is unrecognised AND has no `iconUrl`.

package/dist/esm/nodeviews/bodiedSyncedBlock.js

@@ -2,7 +2,6 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import React from 'react';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { isSSR, isSSRStreaming } from '@atlaskit/editor-common/core-utils';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
@@ -36,20 +35,13 @@ export var BodiedSyncBlock = /*#__PURE__*/function () {
     this.dom = dom;
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
     this.contentDOM = contentDOM;
-    var labelContainer;
-    if (isSSR() && isSSRStreaming()) {
-      // During SSR, the portal's renderToStaticMarkup + innerHTML clobbers
-      // contentDOM. Render the label into a separate container to prevent this.
-      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
-      labelContainer = document.createElement('div');
-      this.dom.appendChild(labelContainer);
-    } else {
-      // Render the label into a separate container so portal implementations
-      // that write directly into the target do not clobber contentDOM.
-      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
-      labelContainer = document.createElement('div');
-      this.dom.appendChild(labelContainer);
-    }
+
+    // Render the label into a separate container so portal implementations that
+    // write directly into the target do not clobber contentDOM. This also covers
+    // SSR, where the portal's renderToStaticMarkup + innerHTML would clobber it.
+    // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
+    var labelContainer = document.createElement('div');
+    this.dom.appendChild(labelContainer);
     this.labelKey = crypto.randomUUID();
     this.nodeViewPortalProviderAPI.render(function () {
       var _this$api;

package/dist/esm/pm-plugins/main.js

@@ -943,23 +943,10 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
         var schema = state.schema;
         var isCopy = ctx.consumeCopyEvent();
-        var wasCut = ctx.consumeCutEvent();
-        var isCut = wasCut;
-        var isPromptedFeedbackCut = Boolean(syncBlockStore && (options === null || options === void 0 ? void 0 : options.onGiveFeedback) && wasCut) && expValEqualsNoExposure('platform_editor_sync_block_activation', 'isEnabled', true);
-        if (!syncBlockStore || !isCopy && !isCut && !isPromptedFeedbackCut) {
-          return slice;
-        }
-        if (isPromptedFeedbackCut && !isCut) {
-          var _containsCutSyncBlock = false;
-          mapSlice(slice, function (node) {
-            if (syncBlockStore.referenceManager.isReferenceBlock(node) || node.type.name === 'bodiedSyncBlock' && sliceFullyContainsNode(slice, node)) {
-              _containsCutSyncBlock = true;
-            }
-            return node;
-          });
-          if (_containsCutSyncBlock) {
-            ctx.markCutRemovalPending();
-          }
+        var isCut = ctx.consumeCutEvent();
+        // A prompted feedback cut is always a cut, so the two never need combining.
+        var isPromptedFeedbackCut = Boolean(syncBlockStore && (options === null || options === void 0 ? void 0 : options.onGiveFeedback) && isCut) && expValEqualsNoExposure('platform_editor_sync_block_activation', 'isEnabled', true);
+        if (!syncBlockStore || !isCopy && !isCut) {
           return slice;
         }
         var containsCutSyncBlock = false;
@@ -974,7 +961,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
             return node;
           }
           if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
-            if (isPromptedFeedbackCut && isCut && sliceFullyContainsNode(slice, node)) {
+            if (isPromptedFeedbackCut && sliceFullyContainsNode(slice, node)) {
               containsCutSyncBlock = true;
             }
             // if we only selected part of the bodied sync block content,
@@ -1138,9 +1125,6 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           }
         });
       }
-
-      // Delete is recomputed fresh from the live document on confirm.
-      // See EDITOR-7889.
       var _iterator2 = _createForOfIteratorHelper(trs),
         _step2;
       try {

package/dist/esm/ui/SyncedLocationDropdown.js

@@ -236,9 +236,8 @@ var ItemIcon = function ItemIcon(_ref3) {
     });
   }
 
-  // Render a Jira issue-type icon when we have one, gated by the shared rollout flag.
+  // Render a Jira issue-type icon when we have one.
   // Falls through to the generic product icon when:
-  //   - the gate is off,
   //   - we don't have access (issueType is not surfaced for no-access references),
   //   - AGG returned no `issueType` (partial index, deleted, etc.), or
   //   - the issue type is unrecognised AND has no `iconUrl`.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "12.0.7",
+	"version": "12.0.8",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/spinner": "20.1.2",
-		"@atlaskit/tmp-editor-statsig": "^145.0.0",
+		"@atlaskit/tmp-editor-statsig": "^146.0.0",
 		"@atlaskit/tokens": "16.6.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@atlaskit/visually-hidden": "^4.2.0",

package/dist/cjs/pm-plugins/utils/rebase-transaction.js

@@ -1,26 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.rebaseTransaction = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _transform = require("@atlaskit/editor-prosemirror/transform");
-var rebaseTransaction = exports.rebaseTransaction = function rebaseTransaction(currentTr, incomingTr, state) {
-  if (!incomingTr.docChanged) {
-    return currentTr;
-  }
-  var currentMapping = new _transform.Mapping((0, _toConsumableArray2.default)(currentTr.mapping.maps).reverse().map(function (map) {
-    return map.invert();
-  }));
-  var rebasedTransaction = state.tr;
-  currentTr.steps.forEach(function (step) {
-    var mappedStep = step.map(currentMapping);
-    if (mappedStep) {
-      rebasedTransaction.step(mappedStep);
-      currentMapping.appendMap(mappedStep.getMap());
-    }
-  });
-  return rebasedTransaction;
-};

package/dist/es2019/pm-plugins/utils/rebase-transaction.js

@@ -1,16 +0,0 @@
-import { Mapping } from '@atlaskit/editor-prosemirror/transform';
-export const rebaseTransaction = (currentTr, incomingTr, state) => {
-  if (!incomingTr.docChanged) {
-    return currentTr;
-  }
-  const currentMapping = new Mapping([...currentTr.mapping.maps].reverse().map(map => map.invert()));
-  const rebasedTransaction = state.tr;
-  currentTr.steps.forEach(step => {
-    const mappedStep = step.map(currentMapping);
-    if (mappedStep) {
-      rebasedTransaction.step(mappedStep);
-      currentMapping.appendMap(mappedStep.getMap());
-    }
-  });
-  return rebasedTransaction;
-};

package/dist/esm/pm-plugins/utils/rebase-transaction.js

@@ -1,19 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { Mapping } from '@atlaskit/editor-prosemirror/transform';
-export var rebaseTransaction = function rebaseTransaction(currentTr, incomingTr, state) {
-  if (!incomingTr.docChanged) {
-    return currentTr;
-  }
-  var currentMapping = new Mapping(_toConsumableArray(currentTr.mapping.maps).reverse().map(function (map) {
-    return map.invert();
-  }));
-  var rebasedTransaction = state.tr;
-  currentTr.steps.forEach(function (step) {
-    var mappedStep = step.map(currentMapping);
-    if (mappedStep) {
-      rebasedTransaction.step(mappedStep);
-      currentMapping.appendMap(mappedStep.getMap());
-    }
-  });
-  return rebasedTransaction;
-};

package/dist/types/pm-plugins/utils/rebase-transaction.d.ts

@@ -1,2 +0,0 @@
-import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const rebaseTransaction: (currentTr: Transaction, incomingTr: Transaction, state: EditorState) => Transaction;