@atlaskit/editor-plugin-synced-block 6.0.44 → 6.0.46

package/AGENTS.md

@@ -1,133 +1,54 @@
-# Synced Blocks — Developer Agent Guide
+# Synced Blocks Plugin — Developer Agent Guide
 
-> **Purpose**: This guide helps AI agents and developers implement features, fix bugs, and clean up
-> feature gates in the Synced Blocks codebase. It provides architectural context, key file
-> locations, common patterns, and debugging guidance.
->
-> **Full Knowledge Base**:
-> [Synced Blocks — Comprehensive Knowledge Base](https://hello.atlassian.net/wiki/spaces/egcuc/pages/6679548384)
-> (Confluence)
+> **For workflow guidance, debugging, and cross-package task guides, load the `synced-blocks` skill:**
+> `get_skill(skill_name_or_path="platform/packages/editor/.rovodev/skills/synced-blocks/SKILL.md")`
 
 ---
 
 ## Quick Context
 
 **Synced Blocks** lets users create reusable content blocks (source) that can be referenced across
-Confluence pages and Jira issue descriptions. Edits to the source propagate to all references in
-near real-time via the Block Service backend and AGG GraphQL WebSocket subscriptions.
+Confluence pages and Jira issue descriptions. This package is the core editor plugin — it registers
+ADF nodes, toolbar/menu integration, commands, and ProseMirror plugins.
 
 **Two ADF node types:**
 
 - `bodiedSyncBlock` — **Source** sync block (contains the editable content)
-- `syncBlock` — **Reference** sync block (renders content fetched from block service)
+- `syncBlock` — **Reference** sync block (renders content fetched from Block Service)
 
 ---
 
-## Package Map
-
-### Platform (shared across products)
-
-| Package            | Path                                                           | Purpose                                                                                          |
-| ------------------ | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------ |
-| **Plugin**         | `platform/packages/editor/editor-plugin-synced-block/`         | Core editor plugin — registers nodes, toolbar, commands, block menu integration                  |
-| **Provider**       | `platform/packages/editor/editor-synced-block-provider/`       | Data layer — store managers, block service API client, ARI generation, permissions, media tokens |
-| **Renderer**       | `platform/packages/editor/editor-synced-block-renderer/`       | View-mode rendering of reference sync blocks using nested renderer                               |
-| **Plugin Tests**   | `platform/packages/editor/editor-plugin-synced-block-tests/`   | Integration tests for the plugin                                                                 |
-| **Provider Tests** | `platform/packages/editor/editor-synced-block-provider-tests/` | Tests for store managers and provider hooks                                                      |
-| **Renderer Tests** | `platform/packages/editor/editor-synced-block-renderer-tests/` | Tests for renderer components                                                                    |
-
-Also touches:
-
-- `platform/packages/editor/editor-common` — shared types
-- `platform/packages/editor/editor-core` — plugin registration
-- `platform/packages/renderer` — reference rendering in view mode
-
-### Confluence
-
-| File/Package        | Path                                                                                   | Purpose                                                                                  |
-| ------------------- | -------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
-| SyncedBlockProvider | `confluence/next/packages/fabric-providers/src/SyncedBlockProvider.ts`                 | Wraps platform provider with Confluence config (AGG endpoint, media tokens, permissions) |
-| SyncedBlockPreload  | `confluence/next/packages/fabric-providers/src/SyncedBlockPreload.ts`                  | Preloads sync block data for SSR                                                         |
-| SSR Data Loading    | `confluence/next/packages/fabric-providers/src/SyncedBlockLoadSSRData.ts`              | Loads SSR data                                                                           |
-| Edit Page Preload   | `confluence/next/packages/load-edit-page/src/preload/preloadSyncedBlocksData.ts`       | Preloads data for edit page                                                              |
-| Editor Preload      | `confluence/next/packages/load-edit-page/src/preload/preloadEditorSyncedBlocksData.ts` | Editor-specific preloading                                                               |
-| Full Page Editor    | `confluence/next/packages/full-page-editor/src/FullPageEditorComponent.tsx`            | Integrates sync block plugin into editor                                                 |
-
-### Jira
-
-| File/Package        | Path                                                        | Purpose                                       |
-| ------------------- | ----------------------------------------------------------- | --------------------------------------------- |
-| Provider Package    | `jira/src/packages/issue/issue-view-synced-block-provider/` | Core Jira integration package                 |
-| Node Component Hook | `src/useSyncedBlockProviderNodeComponent.tsx`               | Creates synced block node components for Jira |
-| Editor HOC          | `src/withSyncedBlockProviderEditor.tsx`                     | Wraps Jira editor with sync block support     |
-| Renderer HOC        | `src/withSyncedBlockProviderRenderer.tsx`                   | Wraps Jira renderer with sync block support   |
-| Prefetch            | `src/prefetchSyncedBlocks.ts`                               | Prefetches sync block data in issue view      |
-| Relay Fetch         | `src/useRelaySyncBlockFetchProvider.tsx`                    | Real-time updates via Relay subscriptions     |
-
----
-
-## Key Concepts
-
-### Source vs Reference
-
-- **Source** (`bodiedSyncBlock`): The original content block. Content is stored in the page ADF AND
-  in the Block Service. Editable inline.
-- **Reference** (`syncBlock`): A read-only copy that fetches content from Block Service. Rendered
-  via nested renderer. Shows "Synced from [page]" label.
-
-### Data Flow
-
-1. **Create source** → Content saved to Block Service via API → ARI generated from page ID + local
-   ID
-2. **Create reference** → Copy source link → Paste → `syncBlock` node inserted with `resourceId`
-3. **Edit source** → Content pushed to Block Service → AGG subscription notifies references →
-   References re-fetch and re-render
-4. **SSR** → On page load, Confluence/Jira preloads sync block data from Block Service in bulk
-
-### ARI Format
-
-- Confluence: `ari:cloud:block::{cloudId}/confluence-page:{pageId}/{localId}`
-- Jira: `ari:cloud:block::{cloudId}/jira-work-item:{issueId}/{localId}`
-
-### Store Managers
-
-- `SyncBlockStoreManager` — Manages source sync block state (create, update, delete, flush)
-- `ReferenceSyncBlockStoreManager` — Manages reference sync block state (fetch, subscribe, cache)
-- `SyncBlockInMemorySessionCache` — Caches data for view→edit transitions
-
----
-
-## Plugin Internals (`editor-plugin-synced-block/src/`)
-
-The plugin follows a layered architecture:
+## Plugin Internals (`src/`)
 
 ```
-syncedBlockPlugin.tsx          ← Top-level: registers nodes, commands, UI, pm-plugins
-├── syncedBlockPluginType.ts   ← TypeScript interfaces for options, shared state, dependencies
+src/
+├── index.ts                    # Re-exports plugin + type
+├── syncedBlockPlugin.tsx       # Top-level: registers nodes, commands, UI, pm-plugins
+├── syncedBlockPluginType.ts    # TypeScript interfaces for options, shared state, dependencies
 ├── editor-commands/
-│   └── index.ts               ← createSyncedBlock, copySyncedBlockReferenceToClipboardEditorCommand,
+│   └── index.ts                # createSyncedBlock, copySyncedBlockReferenceToClipboardEditorCommand,
 │                                 removeSyncedBlockAtPos, unsyncSyncBlock
 ├── nodeviews/
-│   ├── syncedBlock.tsx        ← NodeView for reference (syncBlock) — read-only, fetches from BE
-│   ├── bodiedSyncedBlock.tsx  ← NodeView for source (bodiedSyncBlock) — nested editor with content
-│   └── bodiedSyncBlockNodeWithToDOMFixed.ts ← DOM serialization fix variant (experiment-gated)
+│   ├── syncedBlock.tsx         # NodeView for reference (syncBlock) — read-only, fetches from BE
+│   ├── bodiedSyncedBlock.tsx   # NodeView for source (bodiedSyncBlock) — nested editor with content
+│   └── bodiedSyncBlockNodeWithToDOMFixed.ts # DOM serialization fix variant (experiment-gated)
 ├── pm-plugins/
-│   ├── main.ts                ← Core state machine: sync block lifecycle, creation, deletion, cache
-│   ├── menu-and-toolbar-experiences.ts ← Experience tracking for menu/toolbar interactions
+│   ├── main.ts                 # Core state machine: sync block lifecycle, creation, deletion, cache
+│   ├── menu-and-toolbar-experiences.ts # Experience tracking for menu/toolbar interactions
 │   └── utils/
-│       ├── track-sync-blocks.ts              ← Tracks mutations, updates shared state
-│       ├── handle-bodied-sync-block-creation.ts ← Creation flow, local cache, retry logic
-│       └── handle-bodied-sync-block-removal.ts  ← Deletion flow, BE synchronization
+│       ├── track-sync-blocks.ts              # Tracks mutations, updates shared state
+│       ├── handle-bodied-sync-block-creation.ts # Creation flow, local cache, retry logic
+│       └── handle-bodied-sync-block-removal.ts  # Deletion flow, BE synchronization
 ├── ui/
-│   ├── toolbar-components.tsx    ← Primary toolbar button ("Create Synced Block")
-│   ├── floating-toolbar.tsx      ← Node-level actions: delete, unsync, copy link, view locations
-│   ├── block-menu-components.tsx ← Block menu entry
-│   ├── quick-insert.tsx          ← Slash command / quick insert config
-│   ├── DeleteConfirmationModal.tsx ← Deletion confirmation dialog
-│   ├── SyncBlockRefresher.tsx    ← Periodic data refresh from backend
-│   └── Flag.tsx                  ← Error/info flags (offline, copy notifications)
+│   ├── toolbar-components.tsx    # Primary toolbar button ("Create Synced Block")
+│   ├── floating-toolbar.tsx      # Node-level actions: delete, unsync, copy link, view locations
+│   ├── block-menu-components.tsx # Block menu entry
+│   ├── quick-insert.tsx          # Slash command / quick insert config
+│   ├── DeleteConfirmationModal.tsx # Deletion confirmation dialog
+│   ├── SyncBlockRefresher.tsx    # Periodic data refresh from backend
+│   └── Flag.tsx                  # Error/info flags (offline, copy notifications)
 └── types/
-    └── index.ts               ← FLAG_ID, SyncedBlockSharedState, BodiedSyncBlockDeletionStatus
+    └── index.ts                # FLAG_ID, SyncedBlockSharedState, BodiedSyncBlockDeletionStatus
 ```
 
 ### Key Code Patterns
@@ -147,124 +68,3 @@ syncedBlockPlugin.tsx          ← Top-level: registers nodes, commands, UI, pm-
 2. Calls `ReferenceSyncBlockStoreManager.fetch(resourceId)` → Block Service API
 3. Renders content via nested renderer from `editor-synced-block-renderer`
 4. Subscribes to AGG WebSocket for real-time updates
-
----
-
-## Common Tasks
-
-### Implementing a new feature in sync blocks
-
-1. **Identify scope**: Does it affect source, reference, or both? Editor, renderer, or both?
-2. **Platform first**: Make changes in `editor-plugin-synced-block` or
-   `editor-synced-block-provider`
-3. **Product integration**: Update Confluence (`fabric-providers`) and/or Jira
-   (`issue-view-synced-block-provider`)
-4. **Feature gate**: Use a DnH **Experiment** (not a feature gate) for production changes. See
-   [Experiment and gates page](https://hello.atlassian.net/wiki/spaces/egcuc/pages/6390978659)
-5. **Analytics**: Add experience tracking events (see `EDITOR-1665` pattern)
-6. **Test**: Add tests in the corresponding test package
-
-### Fixing a bug
-
-1. **Check supported node types**:
-   [Edit at source](https://hello.atlassian.net/wiki/spaces/egcuc/pages/5926568979) |
-   [Edit anywhere](https://hello.atlassian.net/wiki/spaces/egcuc/pages/5864526866)
-2. **Check unsupported content handling**:
-   [Unsupported content](https://hello.atlassian.net/wiki/spaces/egcuc/pages/5687277297)
-3. **Debug with analytics**:
-   [HOW-TO: Use analytics to debug errors](https://hello.atlassian.net/wiki/spaces/egcuc/pages/6342760320)
-4. **Gate the fix**: Use DnH Experiment, not a feature gate
-5. **Test on staging**: Verify on Hello (hello.atlassian.net) with experiment enabled
-
-### Cleaning up a feature gate
-
-1. Find the gate key in
-   [Experiment and gates](https://hello.atlassian.net/wiki/spaces/egcuc/pages/6390978659)
-2. Search codebase: `grep -r "gate_key_name" platform/ confluence/ jira/`
-3. Remove conditional logic, keep the "enabled" code path
-4. Remove the Switcheroo/Statsig configuration
-5. Update the Confluence page to mark as "Cleaned up"
-
-### Adding support for a new node type in sync blocks
-
-1. Check if node is in the supported list:
-   [Supported node types](https://hello.atlassian.net/wiki/spaces/egcuc/pages/5926568979)
-2. For **source**: Update the allowed node schema in `editor-plugin-synced-block`
-3. For **reference**: Ensure nested renderer in `editor-synced-block-renderer` can render the node
-4. Test in both classic pages and live pages
-5. Test in Jira issue description renderer
-
----
-
-## Performance Considerations
-
-- **VC90**: Sync blocks can regress VC90 due to content shift (CLS). Reference blocks fetch content
-  async and shift the page. Use SSR preloading to mitigate.
-- **SSR**: Bulk fetch endpoint reduces waterfall. Configurable via
-  `platform_editor_sync_block_ssr_config`.
-- **View→Edit transition**: Cache sync block data in session storage (see
-  `SyncBlockInMemorySessionCache`)
-- **Criterion tests**:
-  [Perf test page](https://hello.atlassian.net/wiki/spaces/egcuc/pages/6498888237)
-
----
-
-## Analytics Events Quick Reference
-
-**Experience events** (SLO-driving): `asyncOperation` type
-
-- `fetchSyncedBlock`, `fetchSyncedBlockSourceInfo`, `fetchSyncedBlockReferencesInfo`
-- `syncedBlockCreate`, `syncedBlockUpdate`, `syncedBlockDelete`
-- `referenceSyncedBlockUpdate`
-
-**Menu/toolbar events**: `menuAction` and `toolbarAction` types
-
-- `syncedBlockCreate` (quickInsertMenu, blockMenu, primaryToolbar)
-- `syncedBlockDelete`, `referenceSyncedBlockDelete` (syncedBlockToolbar)
-- `syncedBlockUnsync`, `referenceSyncedBlockUnsync` (syncedBlockToolbar)
-- `syncedBlockViewLocations`, `syncedBlockEditSource` (syncedBlockToolbar)
-
-**Standard analytics events**: Track individual sync block operations
-
-- `fetched/fetchSyncedBlock` — attributes: `resourceId`, `blockInstanceId`, `sourceProduct`
-- `rendered/renderSyncedBlock` — attributes: `resourceId`, `sourceProduct`, state
-  (`loaded`/`error`/`permissionDenied`/`missingSource`)
-- `inserted/documentInserted` (page save) — attributes: `numberOfSyncedBlocks`,
-  `numberOfReferencedSyncedBlocks`
-
-Full catalogue:
-[Synced Block Analytics Catalogue](https://hello.atlassian.net/wiki/spaces/egcuc/pages/6332253480)
-
----
-
-## Key Jira Queries
-
-```
-# All synced block tickets
-"Epic Link" in (EDITOR-1519, EDITOR-2441, EDITOR-1783, EDITOR-3936, EDITOR-3586, EDITOR-5010)
-
-# Open bugs
-... AND type = Bug AND status not in (Done, "Won't do") ORDER BY priority DESC
-
-# M2 (Jira source creation)
-"Epic Link" = EDITOR-5010 ORDER BY created DESC
-```
-
----
-
-## Key Confluence Pages
-
-- **Architecture**: https://hello.atlassian.net/wiki/spaces/egcuc/pages/5505188521
-- **Implementation view**: https://hello.atlassian.net/wiki/spaces/egcuc/pages/5997083214
-- **Decisions record**: https://hello.atlassian.net/wiki/spaces/egcuc/pages/5882558842
-- **Feature flags**: https://hello.atlassian.net/wiki/spaces/egcuc/pages/6390978659
-- **Analytics catalogue**: https://hello.atlassian.net/wiki/spaces/egcuc/pages/6332253480
-- **Debug errors HOW-TO**: https://hello.atlassian.net/wiki/spaces/egcuc/pages/6342760320
-
----
-
-## Slack Channels
-
-- **Engineering**: https://atlassian.enterprise.slack.com/archives/C09DZT1TBNW
-- **Product & Design**: https://atlassian.enterprise.slack.com/archives/C091Y69RBGU
-- **M2 / Jira**: https://atlassian.enterprise.slack.com/archives/C09RS7JCBED

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 6.0.46
+
+### Patch Changes
+
+- [`20b51bc2e61a4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/20b51bc2e61a4) -
+  Remove duplicate source synced blocks when inserting block templates with existing resourceIds and
+  show error flag
+- [`15deee785151b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/15deee785151b) -
+  EDITOR-6174 Pass node to createBodiedSyncBlockNode to cache content on creation, preventing false
+  unsaved changes on page refresh
+- Updated dependencies
+
+## 6.0.45
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.0.44
 
 ### Patch Changes

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

@@ -17,6 +17,7 @@ var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -576,11 +577,85 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           _ret = _loop();
           if (_ret) return _ret.v;
         }
+
+        // Detect and remove duplicate bodiedSyncBlock resourceIds.
+        // When a block template containing a source sync block is inserted into the
+        // same document, it creates a duplicate with the same resourceId. We keep the
+        // first occurrence and delete subsequent duplicates entirely (including their
+        // contents), since a document must not contain two source sync blocks with the
+        // same resourceId.
       } catch (err) {
         _iterator2.e(err);
       } finally {
         _iterator2.f();
       }
+      if (trs.some(function (tr) {
+        return tr.docChanged && !tr.getMeta('isRemote');
+      }) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_8')) {
+        // Quick check: only walk the full document when at least one
+        // transaction inserted a source synced block. This avoids an
+        // expensive descendants() traversal on every local edit.
+        var hasInsertedSourceBlock = trs.some(function (tr) {
+          if (!tr.docChanged || tr.getMeta('isRemote')) {
+            return false;
+          }
+          return tr.steps.some(function (step) {
+            if (!(step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep) || !('slice' in step)) {
+              return false;
+            }
+            var _ref0 = step,
+              slice = _ref0.slice;
+            var found = false;
+            slice.content.descendants(function (node) {
+              if (syncBlockStore.sourceManager.isSourceBlock(node) && node.attrs.resourceId) {
+                found = true;
+              }
+              return false;
+            });
+            return found;
+          });
+        });
+        if (!hasInsertedSourceBlock) {
+          return null;
+        }
+        var seenResourceIds = new Set();
+        var duplicates = [];
+        newState.doc.descendants(function (node, pos) {
+          if (syncBlockStore.sourceManager.isSourceBlock(node) && node.attrs.resourceId) {
+            if (seenResourceIds.has(node.attrs.resourceId)) {
+              duplicates.push({
+                pos: pos,
+                nodeSize: node.nodeSize
+              });
+            } else {
+              seenResourceIds.add(node.attrs.resourceId);
+            }
+            return false;
+          }
+        });
+        if (duplicates.length > 0) {
+          var tr = newState.tr;
+
+          // Delete in reverse document order so positions remain valid
+          for (var i = duplicates.length - 1; i >= 0; i--) {
+            var dup = duplicates[i];
+            tr.delete(dup.pos, dup.pos + dup.nodeSize);
+          }
+          tr.setMeta('addToHistory', false);
+          (0, _utils2.deferDispatch)(function () {
+            var _api$core;
+            api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref1) {
+              var tr = _ref1.tr;
+              return tr.setMeta(syncedBlockPluginKey, {
+                activeFlag: {
+                  id: _types.FLAG_ID.DUPLICATE_SOURCE_SYNC_BLOCK
+                }
+              });
+            });
+          });
+          return tr;
+        }
+      }
       return null;
     }
   });

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

@@ -99,7 +99,7 @@ var handleBodiedSyncBlockCreation = exports.handleBodiedSyncBlockCreation = func
         });
       });
     });
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, function (success) {
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, node.node, function (success) {
       if (success) {
         var _api$core4, _api$core5;
         api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref3) {

package/dist/cjs/types/index.js

@@ -14,6 +14,7 @@ var FLAG_ID = exports.FLAG_ID = /*#__PURE__*/function (FLAG_ID) {
   FLAG_ID["CANNOT_CREATE_SYNC_BLOCK"] = "cannot-create-sync-block";
   FLAG_ID["INLINE_EXTENSION_IN_SYNC_BLOCK"] = "inline-extension-in-sync-block";
   FLAG_ID["EXTENSION_IN_SYNC_BLOCK"] = "extension-in-sync-block";
+  FLAG_ID["DUPLICATE_SOURCE_SYNC_BLOCK"] = "duplicate-source-sync-block";
   return FLAG_ID;
 }({});
 var SYNCED_BLOCK_BUTTON_TEST_ID = exports.SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/cjs/ui/Flag.js

@@ -21,7 +21,7 @@ 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); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var flagMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
+var flagMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
   title: _messages.syncBlockMessages.failToDeleteTitle,
   description: _messages.syncBlockMessages.failToDeleteWhenOfflineDescription,
   type: 'error'
@@ -56,6 +56,10 @@ var flagMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _d
   title: _messages.syncBlockMessages.inlineExtensionInSyncBlockTitle,
   description: _messages.syncBlockMessages.inlineExtensionInSyncBlockDescription,
   type: 'error'
+}), _types.FLAG_ID.DUPLICATE_SOURCE_SYNC_BLOCK, {
+  title: _messages.syncBlockMessages.duplicateSourceSyncBlockTitle,
+  description: _messages.syncBlockMessages.duplicateSourceSyncBlockDescription,
+  type: 'error'
 });
 var Flag = exports.Flag = function Flag(_ref) {
   var api = _ref.api;

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

@@ -7,6 +7,7 @@ import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@
 import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { 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 { fg } from '@atlaskit/platform-feature-flags';
@@ -526,6 +527,80 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           }
         }
       }
+
+      // Detect and remove duplicate bodiedSyncBlock resourceIds.
+      // When a block template containing a source sync block is inserted into the
+      // same document, it creates a duplicate with the same resourceId. We keep the
+      // first occurrence and delete subsequent duplicates entirely (including their
+      // contents), since a document must not contain two source sync blocks with the
+      // same resourceId.
+      if (trs.some(tr => tr.docChanged && !tr.getMeta('isRemote')) && fg('platform_synced_block_patch_8')) {
+        // Quick check: only walk the full document when at least one
+        // transaction inserted a source synced block. This avoids an
+        // expensive descendants() traversal on every local edit.
+        const hasInsertedSourceBlock = trs.some(tr => {
+          if (!tr.docChanged || tr.getMeta('isRemote')) {
+            return false;
+          }
+          return tr.steps.some(step => {
+            if (!(step instanceof ReplaceStep || step instanceof ReplaceAroundStep) || !('slice' in step)) {
+              return false;
+            }
+            const {
+              slice
+            } = step;
+            let found = false;
+            slice.content.descendants(node => {
+              if (syncBlockStore.sourceManager.isSourceBlock(node) && node.attrs.resourceId) {
+                found = true;
+              }
+              return false;
+            });
+            return found;
+          });
+        });
+        if (!hasInsertedSourceBlock) {
+          return null;
+        }
+        const seenResourceIds = new Set();
+        const duplicates = [];
+        newState.doc.descendants((node, pos) => {
+          if (syncBlockStore.sourceManager.isSourceBlock(node) && node.attrs.resourceId) {
+            if (seenResourceIds.has(node.attrs.resourceId)) {
+              duplicates.push({
+                pos,
+                nodeSize: node.nodeSize
+              });
+            } else {
+              seenResourceIds.add(node.attrs.resourceId);
+            }
+            return false;
+          }
+        });
+        if (duplicates.length > 0) {
+          const {
+            tr
+          } = newState;
+
+          // Delete in reverse document order so positions remain valid
+          for (let i = duplicates.length - 1; i >= 0; i--) {
+            const dup = duplicates[i];
+            tr.delete(dup.pos, dup.pos + dup.nodeSize);
+          }
+          tr.setMeta('addToHistory', false);
+          deferDispatch(() => {
+            var _api$core;
+            api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+              tr
+            }) => tr.setMeta(syncedBlockPluginKey, {
+              activeFlag: {
+                id: FLAG_ID.DUPLICATE_SOURCE_SYNC_BLOCK
+              }
+            }));
+          });
+          return tr;
+        }
+      }
       return null;
     }
   });

package/dist/es2019/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -91,7 +91,7 @@ export const handleBodiedSyncBlockCreation = (bodiedSyncBlockAdded, editorState,
         });
       });
     });
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, success => {
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, node.node, success => {
       if (success) {
         var _api$core4, _api$core5;
         api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(({

package/dist/es2019/types/index.js

@@ -8,6 +8,7 @@ export let FLAG_ID = /*#__PURE__*/function (FLAG_ID) {
   FLAG_ID["CANNOT_CREATE_SYNC_BLOCK"] = "cannot-create-sync-block";
   FLAG_ID["INLINE_EXTENSION_IN_SYNC_BLOCK"] = "inline-extension-in-sync-block";
   FLAG_ID["EXTENSION_IN_SYNC_BLOCK"] = "extension-in-sync-block";
+  FLAG_ID["DUPLICATE_SOURCE_SYNC_BLOCK"] = "duplicate-source-sync-block";
   return FLAG_ID;
 }({});
 export const SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/es2019/ui/Flag.js

@@ -53,6 +53,11 @@ const flagMap = {
     title: messages.inlineExtensionInSyncBlockTitle,
     description: messages.inlineExtensionInSyncBlockDescription,
     type: 'error'
+  },
+  [FLAG_ID.DUPLICATE_SOURCE_SYNC_BLOCK]: {
+    title: messages.duplicateSourceSyncBlockTitle,
+    description: messages.duplicateSourceSyncBlockDescription,
+    type: 'error'
   }
 };
 export const Flag = ({

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

@@ -15,6 +15,7 @@ import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@
 import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { 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 { fg } from '@atlaskit/platform-feature-flags';
@@ -569,11 +570,85 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           _ret = _loop();
           if (_ret) return _ret.v;
         }
+
+        // Detect and remove duplicate bodiedSyncBlock resourceIds.
+        // When a block template containing a source sync block is inserted into the
+        // same document, it creates a duplicate with the same resourceId. We keep the
+        // first occurrence and delete subsequent duplicates entirely (including their
+        // contents), since a document must not contain two source sync blocks with the
+        // same resourceId.
       } catch (err) {
         _iterator2.e(err);
       } finally {
         _iterator2.f();
       }
+      if (trs.some(function (tr) {
+        return tr.docChanged && !tr.getMeta('isRemote');
+      }) && fg('platform_synced_block_patch_8')) {
+        // Quick check: only walk the full document when at least one
+        // transaction inserted a source synced block. This avoids an
+        // expensive descendants() traversal on every local edit.
+        var hasInsertedSourceBlock = trs.some(function (tr) {
+          if (!tr.docChanged || tr.getMeta('isRemote')) {
+            return false;
+          }
+          return tr.steps.some(function (step) {
+            if (!(step instanceof ReplaceStep || step instanceof ReplaceAroundStep) || !('slice' in step)) {
+              return false;
+            }
+            var _ref0 = step,
+              slice = _ref0.slice;
+            var found = false;
+            slice.content.descendants(function (node) {
+              if (syncBlockStore.sourceManager.isSourceBlock(node) && node.attrs.resourceId) {
+                found = true;
+              }
+              return false;
+            });
+            return found;
+          });
+        });
+        if (!hasInsertedSourceBlock) {
+          return null;
+        }
+        var seenResourceIds = new Set();
+        var duplicates = [];
+        newState.doc.descendants(function (node, pos) {
+          if (syncBlockStore.sourceManager.isSourceBlock(node) && node.attrs.resourceId) {
+            if (seenResourceIds.has(node.attrs.resourceId)) {
+              duplicates.push({
+                pos: pos,
+                nodeSize: node.nodeSize
+              });
+            } else {
+              seenResourceIds.add(node.attrs.resourceId);
+            }
+            return false;
+          }
+        });
+        if (duplicates.length > 0) {
+          var tr = newState.tr;
+
+          // Delete in reverse document order so positions remain valid
+          for (var i = duplicates.length - 1; i >= 0; i--) {
+            var dup = duplicates[i];
+            tr.delete(dup.pos, dup.pos + dup.nodeSize);
+          }
+          tr.setMeta('addToHistory', false);
+          deferDispatch(function () {
+            var _api$core;
+            api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref1) {
+              var tr = _ref1.tr;
+              return tr.setMeta(syncedBlockPluginKey, {
+                activeFlag: {
+                  id: FLAG_ID.DUPLICATE_SOURCE_SYNC_BLOCK
+                }
+              });
+            });
+          });
+          return tr;
+        }
+      }
       return null;
     }
   });

package/dist/esm/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -92,7 +92,7 @@ export var handleBodiedSyncBlockCreation = function handleBodiedSyncBlockCreatio
         });
       });
     });
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, function (success) {
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, node.node, function (success) {
       if (success) {
         var _api$core4, _api$core5;
         api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref3) {

package/dist/esm/types/index.js

@@ -8,6 +8,7 @@ export var FLAG_ID = /*#__PURE__*/function (FLAG_ID) {
   FLAG_ID["CANNOT_CREATE_SYNC_BLOCK"] = "cannot-create-sync-block";
   FLAG_ID["INLINE_EXTENSION_IN_SYNC_BLOCK"] = "inline-extension-in-sync-block";
   FLAG_ID["EXTENSION_IN_SYNC_BLOCK"] = "extension-in-sync-block";
+  FLAG_ID["DUPLICATE_SOURCE_SYNC_BLOCK"] = "duplicate-source-sync-block";
   return FLAG_ID;
 }({});
 export var SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/esm/ui/Flag.js

@@ -12,7 +12,7 @@ import StatusSuccessIcon from '@atlaskit/icon/core/status-success';
 import StatusWarningIcon from '@atlaskit/icon/core/status-warning';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
 import { FLAG_ID } from '../types';
-var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
+var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
   title: messages.failToDeleteTitle,
   description: messages.failToDeleteWhenOfflineDescription,
   type: 'error'
@@ -47,6 +47,10 @@ var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_d
   title: messages.inlineExtensionInSyncBlockTitle,
   description: messages.inlineExtensionInSyncBlockDescription,
   type: 'error'
+}), FLAG_ID.DUPLICATE_SOURCE_SYNC_BLOCK, {
+  title: messages.duplicateSourceSyncBlockTitle,
+  description: messages.duplicateSourceSyncBlockDescription,
+  type: 'error'
 });
 export var Flag = function Flag(_ref) {
   var api = _ref.api;

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

@@ -10,7 +10,8 @@ export declare enum FLAG_ID {
     UNPUBLISHED_SYNC_BLOCK_PASTED = "unpublished-sync-block-pasted",
     CANNOT_CREATE_SYNC_BLOCK = "cannot-create-sync-block",
     INLINE_EXTENSION_IN_SYNC_BLOCK = "inline-extension-in-sync-block",
-    EXTENSION_IN_SYNC_BLOCK = "extension-in-sync-block"
+    EXTENSION_IN_SYNC_BLOCK = "extension-in-sync-block",
+    DUPLICATE_SOURCE_SYNC_BLOCK = "duplicate-source-sync-block"
 }
 type FlagConfig = {
     id: FLAG_ID;

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

@@ -10,7 +10,8 @@ export declare enum FLAG_ID {
     UNPUBLISHED_SYNC_BLOCK_PASTED = "unpublished-sync-block-pasted",
     CANNOT_CREATE_SYNC_BLOCK = "cannot-create-sync-block",
     INLINE_EXTENSION_IN_SYNC_BLOCK = "inline-extension-in-sync-block",
-    EXTENSION_IN_SYNC_BLOCK = "extension-in-sync-block"
+    EXTENSION_IN_SYNC_BLOCK = "extension-in-sync-block",
+    DUPLICATE_SOURCE_SYNC_BLOCK = "duplicate-source-sync-block"
 }
 type FlagConfig = {
     id: FLAG_ID;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "6.0.44",
+	"version": "6.0.46",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,8 +29,8 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^52.4.0",
-		"@atlaskit/button": "23.10.9",
-		"@atlaskit/dropdown-menu": "16.8.5",
+		"@atlaskit/button": "23.10.10",
+		"@atlaskit/dropdown-menu": "16.8.6",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-plugin-analytics": "^8.0.0",
 		"@atlaskit/editor-plugin-block-menu": "^7.0.0",
@@ -46,16 +46,16 @@
 		"@atlaskit/editor-synced-block-provider": "^4.3.0",
 		"@atlaskit/editor-toolbar": "^0.20.0",
 		"@atlaskit/flag": "^17.9.0",
-		"@atlaskit/icon": "34.0.1",
-		"@atlaskit/icon-lab": "^6.3.0",
+		"@atlaskit/icon": "34.0.2",
+		"@atlaskit/icon-lab": "^6.4.0",
 		"@atlaskit/logo": "^19.10.0",
 		"@atlaskit/lozenge": "^13.5.0",
 		"@atlaskit/modal-dialog": "^14.14.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.1.0",
-		"@atlaskit/spinner": "19.0.13",
-		"@atlaskit/tmp-editor-statsig": "^54.1.0",
-		"@atlaskit/tokens": "11.4.2",
+		"@atlaskit/spinner": "19.0.14",
+		"@atlaskit/tmp-editor-statsig": "^54.4.0",
+		"@atlaskit/tokens": "11.4.3",
 		"@atlaskit/tooltip": "^21.1.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -65,7 +65,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.16.0",
+		"@atlaskit/editor-common": "^112.18.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {