@atlaskit/editor-plugin-synced-block 9.1.21 → 10.0.1

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 10.0.1
+
+### Patch Changes
+
+- [`e7ba9d5fba7d0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e7ba9d5fba7d0) -
+  Scroll to same-page synced block source when editing source behind platform_editor_blocks_patch_2.
+- Updated dependencies
+
+## 10.0.0
+
+### Major Changes
+
+- [`f2dc9097319f0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2dc9097319f0) - ###
+  Dropped support for _legacy_ Typescript 4 types. **Typescript 5 is now the new minimum**.
+
+  Removes the `typesVersions` property and `dist/types-ts4.5` directory from the dist.
+
+  Types are now exclusively via the `"types": "dist/types/index.d.ts"` property.
+
+  ```diff
+  - "typesVersions": {
+  -    ">=4.5 <4.9": {
+  -        "*": [
+  -            "dist/types-ts4.5/*",
+  -            "dist/types-ts4.5/index.d.ts"
+  -        ]
+  -    }
+  - },
+  ```
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.1.21
 
 ### Patch Changes

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

@@ -10,6 +10,7 @@ var _copyButton = require("@atlaskit/editor-common/copy-button");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _main = require("../pm-plugins/main");
 var _utils2 = require("../pm-plugins/utils/utils");
 var _types = require("../types");
@@ -178,13 +179,14 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
 };
 var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {
   return function (state, dispatch, _view) {
-    var _syncBlock$node;
+    var _syncBlock$node, _syncBlockStore$refer;
     var syncBlock = (0, _utils2.findSyncBlock)(state.schema, state.selection);
     var resourceId = syncBlock === null || syncBlock === void 0 || (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 || (_syncBlock$node = _syncBlock$node.attrs) === null || _syncBlock$node === void 0 ? void 0 : _syncBlock$node.resourceId;
     if (!resourceId) {
       return false;
     }
     var syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
+    var syncBlockData = (_syncBlockStore$refer = syncBlockStore.referenceManager.getFromCache(resourceId)) === null || _syncBlockStore$refer === void 0 ? void 0 : _syncBlockStore$refer.data;
     if (syncBlockURL) {
       var _api$analytics5;
       api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || _api$analytics5.actions.fireAnalyticsEvent({
@@ -196,10 +198,18 @@ var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedB
           resourceId: resourceId
         }
       });
+      if (syncBlockData !== null && syncBlockData !== void 0 && syncBlockData.onSameDocument && (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_2')) {
+        var sourceBlock = (0, _utils3.findBodiedSyncBlockByLocalId)(state, syncBlockData.blockInstanceId);
+        if (sourceBlock) {
+          var tr = state.tr.setSelection(_state.NodeSelection.create(state.doc, sourceBlock.pos)).scrollIntoView();
+          dispatch === null || dispatch === void 0 || dispatch(tr);
+          return true;
+        }
+      }
       window.open(syncBlockURL, '_blank');
     } else {
       var _api$analytics6;
-      var tr = state.tr;
+      var _tr = state.tr;
       api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.attachAnalyticsEvent({
         eventType: _analytics.EVENT_TYPE.OPERATIONAL,
         action: _analytics.ACTION.ERROR,
@@ -208,8 +218,8 @@ var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedB
         attributes: {
           error: 'No URL resolved for synced block'
         }
-      })(tr);
-      dispatch === null || dispatch === void 0 || dispatch(tr);
+      })(_tr);
+      dispatch === null || dispatch === void 0 || dispatch(_tr);
     }
     return true;
   };

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

@@ -3,7 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pasteSyncBlockHTMLContent = void 0;
+exports.pasteSyncBlockHTMLContent = exports.findBodiedSyncBlockByLocalId = void 0;
+var findBodiedSyncBlockByLocalId = exports.findBodiedSyncBlockByLocalId = function findBodiedSyncBlockByLocalId(state, localId) {
+  var result;
+  state.doc.descendants(function (node, pos) {
+    if (result) {
+      return false;
+    }
+    if (node.type === state.schema.nodes.bodiedSyncBlock && node.attrs.localId === localId) {
+      result = {
+        node: node,
+        pos: pos
+      };
+      return false;
+    }
+    return true;
+  });
+  return result;
+};
 var pasteSyncBlockHTMLContent = exports.pasteSyncBlockHTMLContent = function pasteSyncBlockHTMLContent(contentDOM, view) {
   var tmpDiv = document.createElement('div');
   tmpDiv.appendChild(contentDOM);

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

@@ -2,12 +2,13 @@ import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
 import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, deferDispatch, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { FLAG_ID } from '../types';
-import { pasteSyncBlockHTMLContent } from './utils';
+import { findBodiedSyncBlockByLocalId, pasteSyncBlockHTMLContent } from './utils';
 export const createSyncedBlock = ({
   tr,
   syncBlockStore,
@@ -177,13 +178,14 @@ const copySyncedBlockReferenceToClipboardInternal = (schema, selection, syncBloc
   return true;
 };
 export const editSyncedBlockSource = (syncBlockStore, api) => (state, dispatch, _view) => {
-  var _syncBlock$node, _syncBlock$node$attrs;
+  var _syncBlock$node, _syncBlock$node$attrs, _syncBlockStore$refer;
   const syncBlock = findSyncBlock(state.schema, state.selection);
   const resourceId = syncBlock === null || syncBlock === void 0 ? void 0 : (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 ? void 0 : (_syncBlock$node$attrs = _syncBlock$node.attrs) === null || _syncBlock$node$attrs === void 0 ? void 0 : _syncBlock$node$attrs.resourceId;
   if (!resourceId) {
     return false;
   }
   const syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
+  const syncBlockData = (_syncBlockStore$refer = syncBlockStore.referenceManager.getFromCache(resourceId)) === null || _syncBlockStore$refer === void 0 ? void 0 : _syncBlockStore$refer.data;
   if (syncBlockURL) {
     var _api$analytics5;
     api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions.fireAnalyticsEvent({
@@ -195,6 +197,14 @@ export const editSyncedBlockSource = (syncBlockStore, api) => (state, dispatch,
         resourceId: resourceId
       }
     });
+    if (syncBlockData !== null && syncBlockData !== void 0 && syncBlockData.onSameDocument && fg('platform_editor_blocks_patch_2')) {
+      const sourceBlock = findBodiedSyncBlockByLocalId(state, syncBlockData.blockInstanceId);
+      if (sourceBlock) {
+        const tr = state.tr.setSelection(NodeSelection.create(state.doc, sourceBlock.pos)).scrollIntoView();
+        dispatch === null || dispatch === void 0 ? void 0 : dispatch(tr);
+        return true;
+      }
+    }
     window.open(syncBlockURL, '_blank');
   } else {
     var _api$analytics6, _api$analytics6$actio;

package/dist/es2019/editor-commands/utils.js

@@ -1,3 +1,20 @@
+export const findBodiedSyncBlockByLocalId = (state, localId) => {
+  let result;
+  state.doc.descendants((node, pos) => {
+    if (result) {
+      return false;
+    }
+    if (node.type === state.schema.nodes.bodiedSyncBlock && node.attrs.localId === localId) {
+      result = {
+        node,
+        pos
+      };
+      return false;
+    }
+    return true;
+  });
+  return result;
+};
 export const pasteSyncBlockHTMLContent = (contentDOM, view) => {
   const tmpDiv = document.createElement('div');
   tmpDiv.appendChild(contentDOM);

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

@@ -2,12 +2,13 @@ import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
 import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, deferDispatch, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { FLAG_ID } from '../types';
-import { pasteSyncBlockHTMLContent } from './utils';
+import { findBodiedSyncBlockByLocalId, pasteSyncBlockHTMLContent } from './utils';
 export var createSyncedBlock = function createSyncedBlock(_ref) {
   var tr = _ref.tr,
     syncBlockStore = _ref.syncBlockStore,
@@ -172,13 +173,14 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
 };
 export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {
   return function (state, dispatch, _view) {
-    var _syncBlock$node;
+    var _syncBlock$node, _syncBlockStore$refer;
     var syncBlock = findSyncBlock(state.schema, state.selection);
     var resourceId = syncBlock === null || syncBlock === void 0 || (_syncBlock$node = syncBlock.node) === null || _syncBlock$node === void 0 || (_syncBlock$node = _syncBlock$node.attrs) === null || _syncBlock$node === void 0 ? void 0 : _syncBlock$node.resourceId;
     if (!resourceId) {
       return false;
     }
     var syncBlockURL = syncBlockStore.referenceManager.getSyncBlockURL(resourceId);
+    var syncBlockData = (_syncBlockStore$refer = syncBlockStore.referenceManager.getFromCache(resourceId)) === null || _syncBlockStore$refer === void 0 ? void 0 : _syncBlockStore$refer.data;
     if (syncBlockURL) {
       var _api$analytics5;
       api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || _api$analytics5.actions.fireAnalyticsEvent({
@@ -190,10 +192,18 @@ export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore
           resourceId: resourceId
         }
       });
+      if (syncBlockData !== null && syncBlockData !== void 0 && syncBlockData.onSameDocument && fg('platform_editor_blocks_patch_2')) {
+        var sourceBlock = findBodiedSyncBlockByLocalId(state, syncBlockData.blockInstanceId);
+        if (sourceBlock) {
+          var tr = state.tr.setSelection(NodeSelection.create(state.doc, sourceBlock.pos)).scrollIntoView();
+          dispatch === null || dispatch === void 0 || dispatch(tr);
+          return true;
+        }
+      }
       window.open(syncBlockURL, '_blank');
     } else {
       var _api$analytics6;
-      var tr = state.tr;
+      var _tr = state.tr;
       api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.attachAnalyticsEvent({
         eventType: EVENT_TYPE.OPERATIONAL,
         action: ACTION.ERROR,
@@ -202,8 +212,8 @@ export var editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore
         attributes: {
           error: 'No URL resolved for synced block'
         }
-      })(tr);
-      dispatch === null || dispatch === void 0 || dispatch(tr);
+      })(_tr);
+      dispatch === null || dispatch === void 0 || dispatch(_tr);
     }
     return true;
   };

package/dist/esm/editor-commands/utils.js

@@ -1,3 +1,20 @@
+export var findBodiedSyncBlockByLocalId = function findBodiedSyncBlockByLocalId(state, localId) {
+  var result;
+  state.doc.descendants(function (node, pos) {
+    if (result) {
+      return false;
+    }
+    if (node.type === state.schema.nodes.bodiedSyncBlock && node.attrs.localId === localId) {
+      result = {
+        node: node,
+        pos: pos
+      };
+      return false;
+    }
+    return true;
+  });
+  return result;
+};
 export var pasteSyncBlockHTMLContent = function pasteSyncBlockHTMLContent(contentDOM, view) {
   var tmpDiv = document.createElement('div');
   tmpDiv.appendChild(contentDOM);

package/dist/types/editor-commands/utils.d.ts

@@ -1,2 +1,5 @@
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+export declare const findBodiedSyncBlockByLocalId: (state: EditorState, localId: string) => NodeWithPos | undefined;
 export declare const pasteSyncBlockHTMLContent: (contentDOM: HTMLElement | DocumentFragment, view: EditorView) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "9.1.21",
+	"version": "10.0.1",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -17,54 +17,46 @@
 	"module": "dist/esm/index.js",
 	"module:es2019": "dist/es2019/index.js",
 	"types": "dist/types/index.d.ts",
-	"typesVersions": {
-		">=4.5 <4.9": {
-			"*": [
-				"dist/types-ts4.5/*",
-				"dist/types-ts4.5/index.d.ts"
-			]
-		}
-	},
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^54.0.0",
-		"@atlaskit/button": "23.11.8",
-		"@atlaskit/dropdown-menu": "16.10.6",
-		"@atlaskit/editor-json-transformer": "^8.33.0",
-		"@atlaskit/editor-plugin-analytics": "^11.0.0",
-		"@atlaskit/editor-plugin-block-menu": "^10.1.0",
-		"@atlaskit/editor-plugin-connectivity": "11.0.0",
-		"@atlaskit/editor-plugin-content-format": "^5.0.0",
-		"@atlaskit/editor-plugin-decorations": "^11.0.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^13.0.0",
-		"@atlaskit/editor-plugin-focus": "^10.0.0",
-		"@atlaskit/editor-plugin-selection": "^11.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^9.1.0",
-		"@atlaskit/editor-prosemirror": "^7.3.0",
-		"@atlaskit/editor-shared-styles": "^3.11.0",
-		"@atlaskit/editor-synced-block-provider": "^7.0.0",
-		"@atlaskit/editor-toolbar": "^1.10.0",
-		"@atlaskit/flag": "^17.13.0",
-		"@atlaskit/icon": "35.4.0",
-		"@atlaskit/icon-lab": "^6.14.0",
-		"@atlaskit/logo": "^20.2.0",
-		"@atlaskit/lozenge": "^13.9.0",
-		"@atlaskit/modal-dialog": "^15.3.0",
-		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^19.0.0",
-		"@atlaskit/spinner": "19.1.2",
-		"@atlaskit/tmp-editor-statsig": "^103.0.0",
-		"@atlaskit/tokens": "13.4.0",
-		"@atlaskit/tooltip": "^22.6.0",
-		"@atlaskit/visually-hidden": "^3.1.0",
+		"@atlaskit/adf-schema": "^55.0.0",
+		"@atlaskit/button": "24.0.0",
+		"@atlaskit/dropdown-menu": "17.0.0",
+		"@atlaskit/editor-json-transformer": "^9.0.0",
+		"@atlaskit/editor-plugin-analytics": "^12.0.0",
+		"@atlaskit/editor-plugin-block-menu": "^11.0.0",
+		"@atlaskit/editor-plugin-connectivity": "12.0.0",
+		"@atlaskit/editor-plugin-content-format": "^6.0.0",
+		"@atlaskit/editor-plugin-decorations": "^12.0.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^14.0.0",
+		"@atlaskit/editor-plugin-focus": "^11.0.0",
+		"@atlaskit/editor-plugin-selection": "^12.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^10.0.0",
+		"@atlaskit/editor-prosemirror": "^8.0.0",
+		"@atlaskit/editor-shared-styles": "^4.0.0",
+		"@atlaskit/editor-synced-block-provider": "^8.0.0",
+		"@atlaskit/editor-toolbar": "^2.0.0",
+		"@atlaskit/flag": "^18.0.0",
+		"@atlaskit/icon": "36.0.0",
+		"@atlaskit/icon-lab": "^7.0.0",
+		"@atlaskit/logo": "^21.0.0",
+		"@atlaskit/lozenge": "^14.0.0",
+		"@atlaskit/modal-dialog": "^16.0.0",
+		"@atlaskit/platform-feature-flags": "^2.0.0",
+		"@atlaskit/primitives": "^20.0.0",
+		"@atlaskit/spinner": "20.0.0",
+		"@atlaskit/tmp-editor-statsig": "^105.0.0",
+		"@atlaskit/tokens": "14.0.0",
+		"@atlaskit/tooltip": "^23.0.0",
+		"@atlaskit/visually-hidden": "^4.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"bind-event-listener": "^3.0.0",
 		"date-fns": "^2.17.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^115.16.0",
+		"@atlaskit/editor-common": "^116.1.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -113,6 +105,9 @@
 		"confluence_fronend_labels_categorization_migration": {
 			"type": "boolean"
 		},
+		"platform_editor_blocks_patch_2": {
+			"type": "boolean"
+		},
 		"platform_synced_block_patch_13": {
 			"type": "boolean"
 		},