@atlaskit/editor-plugin-synced-block 5.3.36 → 5.4.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.4.0
+
+### Minor Changes
+
+- [`e9b20ca59c789`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e9b20ca59c789) -
+  EDITOR-5666 fix first node bodied synced block selection
+
+### Patch Changes
+
+- Updated dependencies
+
+## 5.3.37
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.3.36
 
 ### Patch Changes

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

@@ -306,9 +306,20 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           selectionDecorationSet = currentPluginState.selectionDecorationSet,
           bodiedSyncBlockDeletionStatus = currentPluginState.bodiedSyncBlockDeletionStatus,
           retryCreationPosMap = currentPluginState.retryCreationPosMap;
-        var newDecorationSet = selectionDecorationSet.map(tr.mapping, tr.doc);
+        var newDecorationSet = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? tr.docChanged ? selectionDecorationSet.map(tr.mapping, tr.doc) // only map if document changed
+        : selectionDecorationSet : selectionDecorationSet.map(tr.mapping, tr.doc);
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = (0, _selectionDecorations.calculateDecorations)(tr.doc, tr.selection, tr.doc.type.schema);
+        } else if (tr.docChanged && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
+          var existingDecorationsLength = selectionDecorationSet.find().length;
+          var newDecorationsLength = newDecorationSet.find().length;
+
+          // Edge case: When document nodes are replaced, the mapping can lose decorations
+          // We rebuild decorations when the document changes but the selection hasn't.
+          // We can do this check because we only expect 1 decoration for the selection
+          if (existingDecorationsLength !== newDecorationsLength) {
+            newDecorationSet = (0, _selectionDecorations.calculateDecorations)(tr.doc, tr.selection, tr.doc.type.schema);
+          }
         }
         var newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
         var newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));

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

@@ -270,9 +270,20 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           bodiedSyncBlockDeletionStatus,
           retryCreationPosMap
         } = currentPluginState;
-        let newDecorationSet = selectionDecorationSet.map(tr.mapping, tr.doc);
+        let newDecorationSet = fg('platform_synced_block_patch_5') ? tr.docChanged ? selectionDecorationSet.map(tr.mapping, tr.doc) // only map if document changed
+        : selectionDecorationSet : selectionDecorationSet.map(tr.mapping, tr.doc);
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
+        } else if (tr.docChanged && fg('platform_synced_block_patch_5')) {
+          const existingDecorationsLength = selectionDecorationSet.find().length;
+          const newDecorationsLength = newDecorationSet.find().length;
+
+          // Edge case: When document nodes are replaced, the mapping can lose decorations
+          // We rebuild decorations when the document changes but the selection hasn't.
+          // We can do this check because we only expect 1 decoration for the selection
+          if (existingDecorationsLength !== newDecorationsLength) {
+            newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
+          }
         }
         const newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
         const newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));

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

@@ -299,9 +299,20 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           selectionDecorationSet = currentPluginState.selectionDecorationSet,
           bodiedSyncBlockDeletionStatus = currentPluginState.bodiedSyncBlockDeletionStatus,
           retryCreationPosMap = currentPluginState.retryCreationPosMap;
-        var newDecorationSet = selectionDecorationSet.map(tr.mapping, tr.doc);
+        var newDecorationSet = fg('platform_synced_block_patch_5') ? tr.docChanged ? selectionDecorationSet.map(tr.mapping, tr.doc) // only map if document changed
+        : selectionDecorationSet : selectionDecorationSet.map(tr.mapping, tr.doc);
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
+        } else if (tr.docChanged && fg('platform_synced_block_patch_5')) {
+          var existingDecorationsLength = selectionDecorationSet.find().length;
+          var newDecorationsLength = newDecorationSet.find().length;
+
+          // Edge case: When document nodes are replaced, the mapping can lose decorations
+          // We rebuild decorations when the document changes but the selection hasn't.
+          // We can do this check because we only expect 1 decoration for the selection
+          if (existingDecorationsLength !== newDecorationsLength) {
+            newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
+          }
         }
         var newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
         var newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "5.3.36",
+	"version": "5.4.0",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/spinner": "19.0.10",
-		"@atlaskit/tokens": "11.0.1",
+		"@atlaskit/tokens": "11.0.2",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -61,7 +61,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.21.0",
+		"@atlaskit/editor-common": "^111.22.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {