@atlaskit/editor-plugin-synced-block 12.0.4 → 12.0.6

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

@@ -9,9 +9,8 @@ import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
-import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
+import { convertPMNodesToSyncBlockNodes } from '@atlaskit/editor-synced-block-provider';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { bodiedSyncBlockNodeView } from '../nodeviews/bodiedSyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
@@ -32,8 +31,7 @@ export const syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
  * `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.
  */
 export const deleteMechanismMetaKey = new PluginKey('syncedBlockDeleteMechanism');
 const syncedBlockPromptedFeedbackMetaKey = new PluginKey('syncedBlockPromptedFeedback');
@@ -42,8 +40,7 @@ const syncedBlockPromptedFeedbackMetaKey = new PluginKey('syncedBlockPromptedFee
  * 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.
  */
 
 export const creationMetaKey = new PluginKey('syncedBlockCreationMeta');
@@ -288,17 +285,9 @@ const filterTransactionOnline = ({
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    if (!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.
-    const mechanism = 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.
+    const mechanism = getDeleteMechanism(tr, state);
     const feedbackContext = entryPoint && getDeleteReason(tr) !== 'source-block-unsynced' ? {
       blockType: 'source',
       entryPoint
@@ -330,7 +319,7 @@ const filterTransactionOnline = ({
     // 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 && fg('platform_synced_block_patch_13')) {
+    if (isPasteOrDrop) {
       return true;
     }
 
@@ -635,8 +624,8 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           const syncBlockNodes = instance.doc.children.filter(syncBlockStore.referenceManager.isReferenceBlock);
           syncBlockStore.referenceManager.fetchSyncBlocksData(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(node => {
             if (syncBlockStore.sourceManager.isSourceBlock(node)) {
               syncBlockStore.sourceManager.updateSyncBlockData(node, false);
@@ -867,18 +856,12 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           return false;
         },
         cut: () => {
-          if (fg('platform_synced_block_patch_13') || Boolean(options === null || options === void 0 ? void 0 : options.onGiveFeedback) && expValEqualsNoExposure('platform_editor_sync_block_activation', 'isEnabled', true)) {
-            ctx.consumeCutEvent();
-            ctx.markCutEvent();
-          }
+          ctx.consumeCutEvent();
+          ctx.markCutEvent();
           return false;
         }
       },
       transformPasted: (slice, _view) => {
-        if (!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).
@@ -907,9 +890,8 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           schema
         } = state;
         const isCopy = ctx.consumeCopyEvent();
-        const isSyncedBlockPatch13Enabled = fg('platform_synced_block_patch_13');
         const wasCut = ctx.consumeCutEvent();
-        const isCut = isSyncedBlockPatch13Enabled && wasCut;
+        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;
@@ -947,7 +929,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             if (!sliceFullyContainsNode(slice, node)) {
               return node.content;
             }
-            if (isSyncedBlockPatch13Enabled && isCut) {
+            if (isCut) {
               return node;
             }
             const newResourceId = syncBlockStore.referenceManager.generateResourceIdForReference(node.attrs.resourceId);
@@ -1094,16 +1076,9 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         });
       }
 
-      // 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 (!fg('platform_editor_blocks_patch_4')) {
-        trs.filter(tr => tr.docChanged).forEach(tr => {
-          if (confirmationTransactionRef.current) {
-            confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
-          }
-        });
-      }
+      // 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/pm-plugins/utils/handle-bodied-sync-block-removal.js

@@ -30,64 +30,46 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
   // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
   // proceed with deletion.
   syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(node => node.attrs), deletionReason, () => {
-    var _api$core3;
-    if (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 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
-        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.
-        const isUnsync = fg('platform_editor_blocks_patch_6') && deletionReason === 'source-block-unsynced';
-        const recomputedTr = isUnsync ? recomputeUnsyncTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => node.attrs)) : recomputeDeleteTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => 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 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+      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.
+      const isUnsync = fg('platform_editor_blocks_patch_6') && deletionReason === 'source-block-unsynced';
+      const recomputedTr = isUnsync ? recomputeUnsyncTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => node.attrs)) : recomputeDeleteTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => 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 ? void 0 : feedbackCallbacks.onDeleteTransaction(recomputedTr);
-        if (!recomputedTr.getMeta(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;
-    }
-    const confirmationTransaction = confirmationTransactionRef.current;
-    if (!confirmationTransaction) {
-      return;
-    }
-    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(() => {
-      const trToDispatch = confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
-      feedbackCallbacks === null || feedbackCallbacks === void 0 ? void 0 : feedbackCallbacks.onDeleteTransaction(trToDispatch);
-      if (!trToDispatch.getMeta(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 ? void 0 : feedbackCallbacks.onDeleteTransaction(recomputedTr);
+      if (!recomputedTr.getMeta(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;
     });
   }, success => {
-    var _api$core4;
+    var _api$core3;
     feedbackCallbacks === null || feedbackCallbacks === void 0 ? void 0 : feedbackCallbacks.onDeleteCompleted(success);
-    api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(({
+    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
       tr
     }) => {
       let newState;

package/dist/es2019/syncedBlockPlugin.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { flushBodiedSyncBlocks, flushSyncBlocks, discardUnpublishedSyncBlocks } from './editor-actions';
 import { copySyncedBlockReferenceToClipboardEditorCommand, createSyncedBlock } from './editor-commands';
@@ -187,9 +186,7 @@ export const syncedBlockPlugin = ({
     // Destroy the SyncBlockStoreManager on editor unmount to cancel
     // pending timers, subscriptions, and in-flight fetches.
     destroy() {
-      if (fg('platform_synced_block_patch_14')) {
-        syncBlockStore.destroy();
-      }
+      syncBlockStore.destroy();
     }
   };
 };

package/dist/es2019/ui/CreateSyncedBlockButton.js

@@ -6,7 +6,6 @@ import { syncBlockMessages } from '@atlaskit/editor-common/messages';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
 import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { canBeConvertedToSyncBlock } from '../pm-plugins/utils/utils';
 import { SYNCED_BLOCK_BUTTON_TEST_ID } from '../types';
 export const CreateSyncedBlockButton = ({
@@ -30,45 +29,35 @@ export const CreateSyncedBlockButton = ({
   const canInsertEmptyBlock = Boolean(selection === null || selection === void 0 ? void 0 : selection.empty);
   const isDisabled = Boolean(isOfflineMode(mode) || !canBeConverted && !canInsertEmptyBlock);
   const onClick = useCallback(() => {
-    var _api$core3, _api$core4;
-    if (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).
-      const dispatched = api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+    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).
+    const dispatched = api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+      tr
+    }) => {
+      var _api$blockControls, _api$blockControls$co;
+      const result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(INPUT_METHOD.SYNCED_BLOCK_TB)({
         tr
-      }) => {
-        var _api$blockControls, _api$blockControls$co;
-        const result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(INPUT_METHOD.SYNCED_BLOCK_TB)({
-          tr
-        });
-        if (!result) {
-          return null;
-        }
-        api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.stopPreservingSelection()({
-          tr
-        });
-        return tr;
       });
-      if (dispatched) {
-        var _api$core2;
-        api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.focus();
+      if (!result) {
+        return null;
       }
-      return;
+      api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.stopPreservingSelection()({
+        tr
+      });
+      return tr;
+    });
+    if (dispatched) {
+      var _api$core2;
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.focus();
     }
-    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
-      tr
-    }) => api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(INPUT_METHOD.SYNCED_BLOCK_TB)({
-      tr
-    }));
-    api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.focus();
   }, [api]);
   const message = intl.formatMessage(syncBlockMessages.syncBlockLabel);
   return /*#__PURE__*/React.createElement(ToolbarTooltip, {

package/dist/es2019/ui/CreateSyncedBlockDropdownItem.js

@@ -39,54 +39,43 @@ const CreateSyncedBlockDropdownItem = ({
     return null;
   }
   const onClick = () => {
-    var _api$core3, _api$core4, _api$blockControls3, _api$blockControls3$c;
-    if (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.
-      const dispatched = api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+    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.
+    const dispatched = api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+      tr
+    }) => {
+      var _api$blockControls, _api$blockControls$co, _api$blockControls2, _api$blockControls2$c;
+      // 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.
+      const result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(INPUT_METHOD.BLOCK_MENU)({
         tr
-      }) => {
-        var _api$blockControls, _api$blockControls$co, _api$blockControls2, _api$blockControls2$c;
-        // 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.
-        const result = api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(INPUT_METHOD.BLOCK_MENU)({
-          tr
-        });
-        if (!result) {
-          return null;
-        }
-        api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr
-        });
-        api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.stopPreservingSelection()({
-          tr
-        });
-        return tr;
       });
-      if (dispatched) {
-        var _api$core2;
-        api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.focus();
+      if (!result) {
+        return null;
       }
-      return;
+      api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.toggleBlockMenu({
+        closeMenu: true
+      })({
+        tr
+      });
+      api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : (_api$blockControls2$c = _api$blockControls2.commands) === null || _api$blockControls2$c === void 0 ? void 0 : _api$blockControls2$c.stopPreservingSelection()({
+        tr
+      });
+      return tr;
+    });
+    if (dispatched) {
+      var _api$core2;
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? 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 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 ? void 0 : api.syncedBlock.commands.insertSyncedBlock(INPUT_METHOD.BLOCK_MENU));
-    api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : (_api$blockControls3$c = _api$blockControls3.commands) === null || _api$blockControls3$c === void 0 ? void 0 : _api$blockControls3$c.toggleBlockMenu({
-      closeMenu: true
-    }));
   };
   const isOffline = isOfflineMode(mode);
   const lozenge = /*#__PURE__*/React.createElement(SyncedBlockNewLozenge, {
@@ -118,9 +107,9 @@ const CopySyncedBlockDropdownItem = ({
     };
   });
   const onClick = () => {
-    var _api$core5, _api$core6, _api$blockControls4, _api$blockControls4$c;
-    api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(api === null || api === void 0 ? void 0 : api.syncedBlock.commands.copySyncedBlockReferenceToClipboard(INPUT_METHOD.BLOCK_MENU));
-    api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : (_api$blockControls4$c = _api$blockControls4.commands) === null || _api$blockControls4$c === void 0 ? void 0 : _api$blockControls4$c.toggleBlockMenu({
+    var _api$core3, _api$core4, _api$blockControls3, _api$blockControls3$c;
+    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 ? void 0 : api.syncedBlock.commands.copySyncedBlockReferenceToClipboard(INPUT_METHOD.BLOCK_MENU));
+    api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : (_api$blockControls3$c = _api$blockControls3.commands) === null || _api$blockControls3$c === void 0 ? void 0 : _api$blockControls3$c.toggleBlockMenu({
       closeMenu: true
     }));
   };

package/dist/es2019/ui/SyncBlockLabel.js

@@ -3,7 +3,6 @@ import { useIntl } from 'react-intl';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Text } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip';
@@ -32,7 +31,7 @@ const SyncBlockLabelComponent = ({
     let tooltipContent = tooltipMessage;
     if (contentUpdatedAt) {
       const elapsedTime = formatElapsedTime(contentUpdatedAt, intl);
-      tooltipContent = fg('platform_synced_block_patch_13') ? /*#__PURE__*/React.createElement("div", null, title ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
+      tooltipContent = /*#__PURE__*/React.createElement("div", null, title ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Text, {
         size: "small",
         color: "color.text.inverse",
         weight: "bold"
@@ -49,17 +48,7 @@ const SyncBlockLabelComponent = ({
       }, formatMessage(messages.referenceSyncBlockLastEdited)), /*#__PURE__*/React.createElement(Text, {
         size: "small",
         color: "color.text.inverse"
-      }, ' ', elapsedTime)) : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Text, {
-        size: "small",
-        color: "color.text.inverse"
-      }, tooltipMessage), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(Text, {
-        size: "small",
-        color: "color.text.inverse",
-        weight: "bold"
-      }, formatMessage(messages.referenceSyncBlockLastEdited)), /*#__PURE__*/React.createElement(Text, {
-        size: "small",
-        color: "color.text.inverse"
-      }, elapsedTime));
+      }, ' ', elapsedTime));
     }
     setTooltipContent(tooltipContent);
   }, [contentUpdatedAt, formatMessage, intl, title, tooltipMessage]);

package/dist/es2019/ui/SyncBlockRendererWrapper.js

@@ -2,7 +2,6 @@ import React, { useCallback, useEffect, useRef } from 'react';
 import { bind } from 'bind-event-listener';
 import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import { SyncBlockError, useFetchSyncBlockData, useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { SyncBlockLabel } from './SyncBlockLabel';
 const SyncBlockRendererWrapperDataId = 'sync-block-plugin-renderer-wrapper';
@@ -20,7 +19,6 @@ const SyncBlockRendererWrapperComponent = ({
   const contentUpdatedAt = syncBlockFetchResult === null || syncBlockFetchResult === void 0 ? void 0 : (_syncBlockFetchResult = syncBlockFetchResult.syncBlockInstance) === null || _syncBlockFetchResult === void 0 ? void 0 : (_syncBlockFetchResult2 = _syncBlockFetchResult.data) === null || _syncBlockFetchResult2 === void 0 ? void 0 : _syncBlockFetchResult2.contentUpdatedAt;
   const isUnpublishedBlock = ((_syncBlockFetchResult3 = syncBlockFetchResult.syncBlockInstance) === null || _syncBlockFetchResult3 === void 0 ? void 0 : (_syncBlockFetchResult4 = _syncBlockFetchResult3.data) === null || _syncBlockFetchResult4 === void 0 ? void 0 : _syncBlockFetchResult4.status) === 'unpublished';
   const isUnsyncedBlock = isUnpublishedBlock || (syncBlockFetchResult === null || syncBlockFetchResult === void 0 ? void 0 : (_syncBlockFetchResult5 = syncBlockFetchResult.syncBlockInstance) === null || _syncBlockFetchResult5 === void 0 ? void 0 : (_syncBlockFetchResult6 = _syncBlockFetchResult5.error) === null || _syncBlockFetchResult6 === void 0 ? void 0 : _syncBlockFetchResult6.type) === SyncBlockError.NotFound;
-  const isTextSelectionEnabled = fg('platform_synced_block_patch_14');
 
   // Evaluated unconditionally so the experiment exposure is tracked correctly
   // (recorded on every render, not lazily on first click).
@@ -43,7 +41,7 @@ const SyncBlockRendererWrapperComponent = ({
   const rendererRef = useRef(null);
   useEffect(() => {
     const containerEl = rendererRef.current;
-    if (!containerEl || !isTextSelectionEnabled || !isSyncBlockActivationEnabled) {
+    if (!containerEl || !isSyncBlockActivationEnabled) {
       return;
     }
     const unbind = bind(containerEl, {
@@ -63,25 +61,25 @@ const SyncBlockRendererWrapperComponent = ({
       }
     });
     return unbind;
-  }, [isTextSelectionEnabled, isSyncBlockActivationEnabled]);
+  }, [isSyncBlockActivationEnabled]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     ref: rendererRef,
     "data-testid": SyncBlockRendererWrapperDataId
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop
     ,
     className: SyncBlockSharedCssClassName.renderer,
-    contentEditable: isTextSelectionEnabled || undefined,
+    contentEditable: true,
     suppressContentEditableWarning: true
     // Prevent the contentEditable div from being keyboard-focusable.
     // It is only used to enable text selection, not as an input target.
     // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
     ,
-    tabIndex: isTextSelectionEnabled ? -1 : undefined,
-    onBeforeInput: isTextSelectionEnabled ? preventInput : undefined,
-    onPaste: isTextSelectionEnabled ? preventInput : undefined
+    tabIndex: -1,
+    onBeforeInput: preventInput,
+    onPaste: preventInput
     // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
     ,
-    onDrop: isTextSelectionEnabled ? preventInput : undefined
+    onDrop: preventInput
   }, syncedBlockRenderer({
     syncBlockFetchResult,
     api

package/dist/es2019/ui/SyncedLocationDropdown.js

@@ -1,11 +1,10 @@
 /* SyncedLocationDropdown.tsx generated by @compiled/babel-plugin v2.0.0 */
-import _extends from "@babel/runtime/helpers/extends";
 import "./SyncedLocationDropdown.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { cx } from '@compiled/react';
-import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
+import { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { SYNCED_BLOCKS_DOCUMENTATION_URL } from '@atlaskit/editor-common/sync-block';
@@ -26,7 +25,6 @@ import SubtaskIcon from '@atlaskit/icon/core/subtasks';
 import TaskIcon from '@atlaskit/icon/core/task';
 import { ConfluenceIcon, JiraIcon, AtlassianIcon } from '@atlaskit/logo';
 import Lozenge from '@atlaskit/lozenge';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Text, Inline, Anchor, Stack } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -297,16 +295,6 @@ export const SyncedLocationDropdown = ({
   api,
   floatingToolbarRenderContext
 }) => {
-  if (!fg('platform_synced_block_patch_13')) {
-    return /*#__PURE__*/React.createElement(LegacySyncedLocationDropdown, {
-      syncBlockStore: syncBlockStore,
-      resourceId: resourceId,
-      intl: intl,
-      isSource: isSource,
-      localId: localId,
-      api: api
-    });
-  }
   return /*#__PURE__*/React.createElement(EditorPositionedSyncedLocationDropdown, {
     syncBlockStore: syncBlockStore,
     resourceId: resourceId,
@@ -381,51 +369,6 @@ const EditorPositionedSyncedLocationDropdown = ({
     }
   }, content);
 };
-const LegacySyncedLocationDropdown = ({
-  syncBlockStore,
-  resourceId,
-  intl,
-  isSource,
-  localId,
-  api
-}) => {
-  const triggerTitle = intl.formatMessage(messages.syncedLocationDropdownTitle);
-  const [isOpen, setIsOpen] = useState(false);
-  const content = isOpen ? /*#__PURE__*/React.createElement(DropdownContent, {
-    syncBlockStore: syncBlockStore,
-    resourceId: resourceId,
-    intl: intl,
-    isSource: isSource,
-    localId: localId,
-    api: api
-  }) : null;
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    isOpen: isOpen
-    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-    ,
-    onOpenChange: ({
-      isOpen
-    }) => setIsOpen(isOpen),
-    testId: SYNCED_LOCATIONS_DROPDOWN_TEST_ID
-    // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-    ,
-    trigger: ({
-      triggerRef,
-      ...triggerProps
-    }) => /*#__PURE__*/React.createElement(Button, _extends({
-      ref: triggerRef,
-      areAnyNewToolbarFlagsEnabled: true,
-      selected: isOpen,
-      iconAfter: /*#__PURE__*/React.createElement(ChevronDownIcon, {
-        color: "currentColor",
-        spacing: "spacious",
-        label: "",
-        size: "small"
-      })
-      // eslint-disable-next-line react/jsx-props-no-spreading
-    }, triggerProps), triggerTitle)
-  }, content);
-};
 export const SyncedLocationDropdownWithCount = ({
   syncBlockStore,
   resourceId,