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

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 12.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 12.0.6
+
+### Patch Changes
+
+- [`0b4753c0a8c07`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b4753c0a8c07) -
+  Clean up feature gates from completed rollout
+- Updated dependencies
+
 ## 12.0.5
 
 ### Patch Changes

package/dist/cjs/editor-commands/index.js

@@ -13,7 +13,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-synced-block-provider/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _main = require("../pm-plugins/main");
 var _utils3 = require("../pm-plugins/utils/utils");
@@ -115,9 +114,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
       // safeInsert does not move the selection into the new block, so place the
       // caret inside the block's empty paragraph so typing continues inside the
       // synced block (EDITOR-7949).
-      if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-        tr = placeCaretInsideBodiedSyncBlock(tr, newBodiedSyncBlockNode.attrs.localId);
-      }
+      tr = placeCaretInsideBodiedSyncBlock(tr, newBodiedSyncBlockNode.attrs.localId);
     }
   } else {
     var conversionInfo = (0, _utils3.canBeConvertedToSyncBlock)(tr.selection);
@@ -148,14 +145,10 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
       return false;
     }
     tr.replaceWith(conversionInfo.from, conversionInfo.to, _newBodiedSyncBlockNode).scrollIntoView();
-    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-      // Place the caret on the first editable position inside the converted
-      // content so typing continues inside the synced block (EDITOR-7949).
-      tr = placeCaretInsideBodiedSyncBlock(tr, _newBodiedSyncBlockNode.attrs.localId);
-    } else {
-      // set selection to the start of the previous selection for the position taken up by the start of the new synced block
-      tr.setSelection(_state.TextSelection.create(tr.doc, conversionInfo.from));
-    }
+
+    // Place the caret on the first editable position inside the converted
+    // content so typing continues inside the synced block (EDITOR-7949).
+    tr = placeCaretInsideBodiedSyncBlock(tr, _newBodiedSyncBlockNode.attrs.localId);
   }
 
   // Stash creation-type signals on the final transaction (after any typeahead
@@ -259,7 +252,7 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
         attributes: _objectSpread({
           resourceId: referenceSyncBlockNode.attrs.resourceId,
           inputMethod: inputMethod
-        }, sourceJoinKey && (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4') && {
+        }, sourceJoinKey && {
           blockInstanceId: sourceJoinKey
         })
       });
@@ -340,11 +333,8 @@ var removeSyncedBlock = exports.removeSyncedBlock = function removeSyncedBlock(a
     }
 
     // Tag the transaction so analytics can report this as `deleteButton` rather
-    // than a keyboard delete (both produce a plain ReplaceStep). Gated so the
-    // gate-off transaction is unchanged.
-    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-      removeTr.setMeta(_main.deleteMechanismMetaKey, 'deleteButton');
-    }
+    // than a keyboard delete (both produce a plain ReplaceStep).
+    removeTr.setMeta(_main.deleteMechanismMetaKey, 'deleteButton');
     dispatch(removeTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -14,7 +14,6 @@ var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _SyncBlockLabel = require("../ui/SyncBlockLabel");
 var _isEmptySourceSyncBlock = require("./isEmptySourceSyncBlock");
 var toDOM = function toDOM(node) {
@@ -51,15 +50,12 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
       // 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 if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_14')) {
-      // Render the label into a separate container for the patch path so
-      // portal implementations that write directly into the target do not clobber
-      // the ProseMirror contentDOM.
+    } 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);
-    } else {
-      labelContainer = this.dom;
     }
     this.labelKey = crypto.randomUUID();
     this.nodeViewPortalProviderAPI.render(function () {

package/dist/cjs/nodeviews/syncedBlock.js

@@ -18,7 +18,6 @@ var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorCommands = require("../editor-commands");
 var _SyncBlockRendererWrapper = require("../ui/SyncBlockRendererWrapper");
 var _SyncBlockSSRReactContextsProvider = require("../ui/SyncBlockSSRReactContextsProvider");
@@ -68,17 +67,15 @@ var SyncBlock = exports.SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage -- NodeView DOM must be created against active runtime document
       var domRef = document.createElement('div');
       domRef.classList.add(_syncBlock.SyncBlockSharedCssClassName.prefix);
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_14')) {
-        // Prevent native browser drag on the contentEditable="false" wrapper.
-        // Without this, clicking in empty space (outside the contentEditable
-        // renderer but inside the domRef) initiates a native element drag.
-        domRef.draggable = false;
-        this.dragStartHandler = function (e) {
-          e.preventDefault();
-        };
-        // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop, @repo/internal/dom-events/no-unsafe-event-listeners
-        domRef.addEventListener('dragstart', this.dragStartHandler);
-      }
+      // Prevent native browser drag on the contentEditable="false" wrapper.
+      // Without this, clicking in empty space (outside the contentEditable
+      // renderer but inside the domRef) initiates a native element drag.
+      domRef.draggable = false;
+      this.dragStartHandler = function (e) {
+        e.preventDefault();
+      };
+      // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop, @repo/internal/dom-events/no-unsafe-event-listeners
+      domRef.addEventListener('dragstart', this.dragStartHandler);
       return domRef;
     }
 
@@ -111,9 +108,6 @@ var SyncBlock = exports.SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "stopEvent",
     value: function stopEvent(event) {
-      if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_14')) {
-        return false;
-      }
       var target = event.target;
       if (!(target instanceof Element)) {
         return false;

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

@@ -22,7 +22,6 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _utils2 = require("@atlaskit/editor-synced-block-provider/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _bodiedSyncedBlock = require("../nodeviews/bodiedSyncedBlock");
 var _syncedBlock = require("../nodeviews/syncedBlock");
@@ -48,8 +47,7 @@ var syncedBlockPluginKey = exports.syncedBlockPluginKey = new _state.PluginKey('
  * `deleteButton` (otherwise indistinguishable from a keyboard delete — both are
  * plain ReplaceSteps). A separate key (rather than `syncedBlockPluginKey`, which
  * carries plugin-state transitions read in `apply()`, or a bare string) keeps
- * this transient signal uniquely namespaced and isolated. Only read behind
- * `platform_editor_blocks_patch_4`.
+ * this transient signal uniquely namespaced and isolated.
  */
 var deleteMechanismMetaKey = exports.deleteMechanismMetaKey = new _state.PluginKey('syncedBlockDeleteMechanism');
 var syncedBlockPromptedFeedbackMetaKey = new _state.PluginKey('syncedBlockPromptedFeedback');
@@ -58,8 +56,7 @@ var syncedBlockPromptedFeedbackMetaKey = new _state.PluginKey('syncedBlockPrompt
  * Creation-type signals set by {@link createSyncedBlock} on the creating
  * transaction. The async creation handler forwards them to the store manager,
  * which attaches them to the `syncedBlockCreate` event. A dedicated key keeps
- * this transient signal isolated from plugin state. Consumed behind
- * `platform_editor_blocks_patch_4`.
+ * this transient signal isolated from plugin state.
  */
 
 var creationMetaKey = exports.creationMetaKey = new _state.PluginKey('syncedBlockCreationMeta');
@@ -315,17 +312,9 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-      // Legacy stash-and-rebase path: store the original delete transaction so it
-      // can be rebased against intervening edits and replayed on confirm. When
-      // platform_editor_blocks_patch_4 is on we instead recompute the delete fresh
-      // from the live document on confirm (see handleBodiedSyncBlockRemoval), so
-      // there is no need to stash the transaction here. See EDITOR-7889.
-      // eslint-disable-next-line no-param-reassign
-      confirmationTransactionRef.current = tr;
-    }
-    // Only derive the mechanism behind the gate — discarded gate-off.
-    var mechanism = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4') ? getDeleteMechanism(tr, state) : undefined;
+    // Recompute the delete fresh from the live document on confirm
+    // (see handleBodiedSyncBlockRemoval). See EDITOR-7889.
+    var mechanism = getDeleteMechanism(tr, state);
     var feedbackContext = entryPoint && getDeleteReason(tr) !== 'source-block-unsynced' ? {
       blockType: 'source',
       entryPoint: entryPoint
@@ -363,7 +352,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     // be wrong. The bodiedSyncBlock content will still be inserted but will
     // not be registered as a source block in Block Service, which is safer
     // than creating a zombie block under the wrong ARI.
-    if (isPasteOrDrop && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_13')) {
+    if (isPasteOrDrop) {
       return true;
     }
 
@@ -697,8 +686,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           var syncBlockNodes = instance.doc.children.filter(syncBlockStore.referenceManager.isReferenceBlock);
           syncBlockStore.referenceManager.fetchSyncBlocksData((0, _editorSyncedBlockProvider.convertPMNodesToSyncBlockNodes)(syncBlockNodes));
 
-          // Populate source sync block cache from initial document
-          // When fg is ON, this replaces the constructor call in the nodeview
+          // Populate source sync block cache from initial document.
+          // This replaces the constructor call in the nodeview.
           instance.doc.forEach(function (node) {
             if (syncBlockStore.sourceManager.isSourceBlock(node)) {
               syncBlockStore.sourceManager.updateSyncBlockData(node, false);
@@ -930,18 +919,12 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           return false;
         },
         cut: function cut() {
-          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_13') || Boolean(options === null || options === void 0 ? void 0 : options.onGiveFeedback) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_sync_block_activation', 'isEnabled', true)) {
-            ctx.consumeCutEvent();
-            ctx.markCutEvent();
-          }
+          ctx.consumeCutEvent();
+          ctx.markCutEvent();
           return false;
         }
       },
       transformPasted: function transformPasted(slice, _view) {
-        if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_13')) {
-          return slice;
-        }
-
         // Defense against bodiedSyncBlock nodes arriving via paste
         // (e.g. drag-and-drop, cut-paste, or browser-level clipboard
         // operations that bypass the transformCopied handler).
@@ -967,9 +950,8 @@ 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 isSyncedBlockPatch13Enabled = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_13');
         var wasCut = ctx.consumeCutEvent();
-        var isCut = isSyncedBlockPatch13Enabled && wasCut;
+        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;
@@ -1007,7 +989,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             if (!(0, _utils3.sliceFullyContainsNode)(slice, node)) {
               return node.content;
             }
-            if (isSyncedBlockPatch13Enabled && isCut) {
+            if (isCut) {
               return node;
             }
             var newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
@@ -1164,18 +1146,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         });
       }
 
-      // Legacy stash-and-rebase path. When platform_editor_blocks_patch_4 is on the
-      // delete is recomputed fresh from the live document on confirm, so there is
-      // no stashed transaction to rebase here. See EDITOR-7889.
-      if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-        trs.filter(function (tr) {
-          return tr.docChanged;
-        }).forEach(function (tr) {
-          if (confirmationTransactionRef.current) {
-            confirmationTransactionRef.current = (0, _editorSyncedBlockProvider.rebaseTransaction)(confirmationTransactionRef.current, tr, newState);
-          }
-        });
-      }
+      // Delete is recomputed fresh from the live document on confirm.
+      // See EDITOR-7889.
       var _iterator2 = _createForOfIteratorHelper(trs),
         _step2;
       try {

package/dist/cjs/pm-plugins/utils/handle-bodied-sync-block-removal.js

@@ -45,67 +45,49 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
   syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(function (node) {
     return node.attrs;
   }), deletionReason, function () {
-    var _api$core3;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-      var _api$core2;
-      // Recompute the delete fresh from the live document instead of
-      // replaying a stashed-and-rebased transaction. The stash/rebase
-      // approach produced stale, schema-invalid transactions when the
-      // document changed shape (local edits or remote collab) while the
-      // confirmation modal was open — the dominant signature being
-      // "Invalid content for node bodiedSyncBlock: <>". See EDITOR-7889.
-      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref2) {
-        var tr = _ref2.tr;
-        // EDITOR-8230: unsync must remove only the sync wrapper and keep the block's
-        // content inline, whereas delete removes the whole block. Before this branch,
-        // the confirm path always recomputed a full delete, so unsyncing a source block
-        // silently deleted its content. When the deletion was actually triggered by
-        // unsync, recompute an unwrap (replaceWith content) instead of a delete.
-        var isUnsync = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_6') && deletionReason === 'source-block-unsynced';
-        var recomputedTr = isUnsync ? (0, _recomputeDeleteTransaction.recomputeUnsyncTransaction)(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
-          return node.attrs;
-        })) : (0, _recomputeDeleteTransaction.recomputeDeleteTransaction)(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
-          return node.attrs;
-        }));
+    var _api$core2;
+    // Recompute the delete fresh from the live document instead of
+    // replaying a stashed-and-rebased transaction. The stash/rebase
+    // approach produced stale, schema-invalid transactions when the
+    // document changed shape (local edits or remote collab) while the
+    // confirmation modal was open — the dominant signature being
+    // "Invalid content for node bodiedSyncBlock: <>". See EDITOR-7889.
+    api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref2) {
+      var tr = _ref2.tr;
+      // EDITOR-8230: unsync must remove only the sync wrapper and keep the block's
+      // content inline, whereas delete removes the whole block. Before this branch,
+      // the confirm path always recomputed a full delete, so unsyncing a source block
+      // silently deleted its content. When the deletion was actually triggered by
+      // unsync, recompute an unwrap (replaceWith content) instead of a delete.
+      var isUnsync = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_6') && deletionReason === 'source-block-unsynced';
+      var recomputedTr = isUnsync ? (0, _recomputeDeleteTransaction.recomputeUnsyncTransaction)(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
+        return node.attrs;
+      })) : (0, _recomputeDeleteTransaction.recomputeDeleteTransaction)(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
+        return node.attrs;
+      }));
 
-        // The target node(s) no longer exist in the live document (e.g.
-        // a remote collaborator already removed them). There is nothing
-        // to delete locally, so return `null` to skip the dispatch
-        // entirely — dispatching the untouched transaction would be a
-        // no-op that still runs the plugin's filter/append hooks. The
-        // backend deletion has already been issued by the store manager.
-        if (!recomputedTr) {
-          return null;
-        }
-        recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
-        feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteTransaction(recomputedTr);
-        if (!recomputedTr.getMeta(_utils.pmHistoryPluginKey)) {
-          // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
-          // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
-          recomputedTr.setMeta('addToHistory', false);
-        }
-        return recomputedTr;
-      });
-      return;
-    }
-    var confirmationTransaction = confirmationTransactionRef.current;
-    if (!confirmationTransaction) {
-      return;
-    }
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function () {
-      var trToDispatch = confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
-      feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteTransaction(trToDispatch);
-      if (!trToDispatch.getMeta(_utils.pmHistoryPluginKey)) {
+      // The target node(s) no longer exist in the live document (e.g.
+      // a remote collaborator already removed them). There is nothing
+      // to delete locally, so return `null` to skip the dispatch
+      // entirely — dispatching the untouched transaction would be a
+      // no-op that still runs the plugin's filter/append hooks. The
+      // backend deletion has already been issued by the store manager.
+      if (!recomputedTr) {
+        return null;
+      }
+      recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
+      feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteTransaction(recomputedTr);
+      if (!recomputedTr.getMeta(_utils.pmHistoryPluginKey)) {
         // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
         // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
-        trToDispatch.setMeta('addToHistory', false);
+        recomputedTr.setMeta('addToHistory', false);
       }
-      return trToDispatch;
+      return recomputedTr;
     });
   }, function (success) {
-    var _api$core4;
+    var _api$core3;
     feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteCompleted(success);
-    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref3) {
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
       var tr = _ref3.tr;
       var newState;
       if (!success) {

package/dist/cjs/syncedBlockPlugin.js

@@ -9,7 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorActions = require("./editor-actions");
 var _editorCommands = require("./editor-commands");
@@ -195,9 +194,7 @@ var syncedBlockPlugin = exports.syncedBlockPlugin = function syncedBlockPlugin(_
     // Destroy the SyncBlockStoreManager on editor unmount to cancel
     // pending timers, subscriptions, and in-flight fetches.
     destroy: function destroy() {
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_14')) {
-        syncBlockStore.destroy();
-      }
+      syncBlockStore.destroy();
     }
   };
 };

package/dist/cjs/ui/CreateSyncedBlockButton.js

@@ -14,7 +14,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _blockSynced = _interopRequireDefault(require("@atlaskit/icon-lab/core/block-synced"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../pm-plugins/utils/utils");
 var _types = require("../types");
 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); }
@@ -37,45 +36,34 @@ var CreateSyncedBlockButton = exports.CreateSyncedBlockButton = function CreateS
   var canInsertEmptyBlock = Boolean(selection === null || selection === void 0 ? void 0 : selection.empty);
   var isDisabled = Boolean((0, _editorPluginConnectivity.isOfflineMode)(mode) || !canBeConverted && !canInsertEmptyBlock);
   var onClick = (0, _react.useCallback)(function () {
-    var _api$core3, _api$core4;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-      var _api$core;
-      // Insert the synced block and stop preserving the selection in a single
-      // transaction so the caret that insertSyncedBlock places inside the new
-      // block survives (EDITOR-7949). The toolbar is not normally opened via the
-      // block menu, but stopping preservation is defensive and keeps behaviour
-      // consistent with the block-menu create item should preservation ever be
-      // active (e.g. a block is selected via block-controls). Then re-focus so
-      // the caret is active, but only when the transaction was actually
-      // dispatched — otherwise a failed insertion would still steal DOM focus
-      // into the editor (mirrors CreateSyncedBlockDropdownItem).
-      var dispatched = api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(function (_ref2) {
-        var _api$blockControls;
-        var tr = _ref2.tr;
-        var result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(_analytics.INPUT_METHOD.SYNCED_BLOCK_TB)({
-          tr: tr
-        });
-        if (!result) {
-          return null;
-        }
-        api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.stopPreservingSelection()({
-          tr: tr
-        });
-        return tr;
+    var _api$core;
+    // Insert the synced block and stop preserving the selection in a single
+    // transaction so the caret that insertSyncedBlock places inside the new
+    // block survives (EDITOR-7949). The toolbar is not normally opened via the
+    // block menu, but stopping preservation is defensive and keeps behaviour
+    // consistent with the block-menu create item should preservation ever be
+    // active (e.g. a block is selected via block-controls). Then re-focus so
+    // the caret is active, but only when the transaction was actually
+    // dispatched — otherwise a failed insertion would still steal DOM focus
+    // into the editor (mirrors CreateSyncedBlockDropdownItem).
+    var dispatched = api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(function (_ref2) {
+      var _api$blockControls;
+      var tr = _ref2.tr;
+      var result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(_analytics.INPUT_METHOD.SYNCED_BLOCK_TB)({
+        tr: tr
       });
-      if (dispatched) {
-        var _api$core2;
-        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
+      if (!result) {
+        return null;
       }
-      return;
-    }
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
-      var tr = _ref3.tr;
-      return api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(_analytics.INPUT_METHOD.SYNCED_BLOCK_TB)({
+      api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.stopPreservingSelection()({
         tr: tr
       });
+      return tr;
     });
-    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.focus();
+    if (dispatched) {
+      var _api$core2;
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
+    }
   }, [api]);
   var message = intl.formatMessage(_messages.syncBlockMessages.syncBlockLabel);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {

package/dist/cjs/ui/CreateSyncedBlockDropdownItem.js

@@ -48,53 +48,42 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref2
     return null;
   }
   var onClick = function onClick() {
-    var _api$core3, _api$core4, _api$blockControls3;
-    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
-      var _api$core;
-      // Insert the synced block, close the block menu, and stop preserving the
-      // selection — all in a single transaction, mirroring the block-menu delete
-      // item. Stopping preservation is required so the caret that
-      // insertSyncedBlock places inside the new block survives; otherwise
-      // block-controls restores a whole-node NodeSelection over it, hiding the
-      // caret (EDITOR-7949). Then re-focus the editor so the caret is active,
-      // but only when the transaction was actually dispatched — otherwise a
-      // failed insertion would still steal DOM focus into the editor.
-      var dispatched = api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(function (_ref3) {
-        var _api$blockControls, _api$blockControls2;
-        var tr = _ref3.tr;
-        // If the insertion fails, bail out without closing the menu or
-        // stopping selection preservation — otherwise we would dispatch an
-        // effectively-empty transaction and close the menu despite nothing
-        // having been inserted.
-        var result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(_analytics.INPUT_METHOD.BLOCK_MENU)({
-          tr: tr
-        });
-        if (!result) {
-          return null;
-        }
-        api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr: tr
-        });
-        api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.stopPreservingSelection()({
-          tr: tr
-        });
-        return tr;
+    var _api$core;
+    // Insert the synced block, close the block menu, and stop preserving the
+    // selection — all in a single transaction, mirroring the block-menu delete
+    // item. Stopping preservation is required so the caret that
+    // insertSyncedBlock places inside the new block survives; otherwise
+    // block-controls restores a whole-node NodeSelection over it, hiding the
+    // caret (EDITOR-7949). Then re-focus the editor so the caret is active,
+    // but only when the transaction was actually dispatched — otherwise a
+    // failed insertion would still steal DOM focus into the editor.
+    var dispatched = api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(function (_ref3) {
+      var _api$blockControls, _api$blockControls2;
+      var tr = _ref3.tr;
+      // If the insertion fails, bail out without closing the menu or
+      // stopping selection preservation — otherwise we would dispatch an
+      // effectively-empty transaction and close the menu despite nothing
+      // having been inserted.
+      var result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(_analytics.INPUT_METHOD.BLOCK_MENU)({
+        tr: tr
       });
-      if (dispatched) {
-        var _api$core2;
-        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
+      if (!result) {
+        return null;
       }
-      return;
+      api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.toggleBlockMenu({
+        closeMenu: true
+      })({
+        tr: tr
+      });
+      api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.stopPreservingSelection()({
+        tr: tr
+      });
+      return tr;
+    });
+    if (dispatched) {
+      var _api$core2;
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
     }
-
-    // Legacy behaviour: insert then close the block menu as two separate executes
-    // (batching them caused selection collisions — EDITOR-2751).
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(_analytics.INPUT_METHOD.BLOCK_MENU));
-    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || (_api$blockControls3 = _api$blockControls3.commands) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.toggleBlockMenu({
-      closeMenu: true
-    }));
   };
   var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(mode);
   var lozenge = /*#__PURE__*/_react.default.createElement(SyncedBlockNewLozenge, {
@@ -123,9 +112,9 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref4) {
     }),
     mode = _useSharedPluginState2.mode;
   var onClick = function onClick() {
-    var _api$core5, _api$core6, _api$blockControls4;
-    api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(api === null || api === void 0 ? void 0 : api.syncedBlock.commands.copySyncedBlockReferenceToClipboard(_analytics.INPUT_METHOD.BLOCK_MENU));
-    api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || (_api$blockControls4 = _api$blockControls4.commands) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.toggleBlockMenu({
+    var _api$core3, _api$core4, _api$blockControls3;
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 ? void 0 : api.syncedBlock.commands.copySyncedBlockReferenceToClipboard(_analytics.INPUT_METHOD.BLOCK_MENU));
+    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || (_api$blockControls3 = _api$blockControls3.commands) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.toggleBlockMenu({
       closeMenu: true
     }));
   };