@atlaskit/editor-synced-block-provider 0.4.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 0.5.1
+
+### Patch Changes
+
+- [`1256b3dd0431e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1256b3dd0431e) -
+  Fix isSource check in provider
+
+## 0.5.0
+
+### Minor Changes
+
+- [`3ebbf8e97e2d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3ebbf8e97e2d9) -
+  Simplify provider API
+
 ## 0.4.0
 
 ### Minor Changes

package/dist/cjs/common/syncBlockProvider.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useMemoizedSyncedBlockProvider = exports.useFetchDocNode = exports.SyncBlockProvider = void 0;
+exports.useMemoizedSyncedBlockProvider = exports.useHandleContentChanges = exports.useFetchDocNode = exports.SyncBlockProvider = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -50,7 +50,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           resourceIds.push(Promise.reject('No Synced Blockcontent to write'));
           return;
         }
-        var resourceId = _this.writeProvider.writeData(_this.sourceId, node.attrs.localId, data[index].content, node.attrs.resourceId);
+        var resourceId = _this.writeProvider.writeData(data[index]);
         resourceIds.push(resourceId);
       });
       return Promise.all(resourceIds);
@@ -101,4 +101,21 @@ var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = fu
   return (0, _react.useMemo)(function () {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
+};
+var useHandleContentChanges = exports.useHandleContentChanges = function useHandleContentChanges(updatedDoc, isSource, node, provider) {
+  (0, _react.useEffect)(function () {
+    if (!isSource) {
+      return;
+    }
+    if (!provider) {
+      return;
+    }
+    var syncBlockNode = (0, _utils.convertSyncBlockPMNodeToSyncBlockData)(node, false);
+    var data = {
+      content: updatedDoc.toJSON(),
+      resourceId: node.attrs.resourceId,
+      localId: node.attrs.localId
+    };
+    provider === null || provider === void 0 || provider.writeNodesData([syncBlockNode], [data]);
+  }, [isSource, node, provider, updatedDoc]);
 };

package/dist/cjs/common/syncBlockStoreManager.js

@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _uuid = _interopRequireDefault(require("uuid"));
+var _ari = require("../utils/ari");
 var _rebaseTransaction2 = require("./rebase-transaction");
 // Do this typedef to make it clear that
 // this is a local identifier for a resource for local use
@@ -32,13 +33,18 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
   }, {
     key: "isSourceBlock",
     value: function isSourceBlock(node) {
+      var _this$dataProvider;
       if (node.type.name !== 'syncBlock') {
         return false;
       }
       var _node$attrs = node.attrs,
         resourceId = _node$attrs.resourceId,
         localId = _node$attrs.localId;
-      return resourceId.includes(localId);
+      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
+      if (!sourceId) {
+        return false;
+      }
+      return typeof resourceId === 'string' && typeof sourceId === 'string' && typeof localId === 'string' && resourceId === (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
     }
   }, {
     key: "registerConfirmationCallback",
@@ -57,15 +63,10 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
   }, {
     key: "createSyncBlockNode",
     value: function createSyncBlockNode() {
-      var _this$dataProvider;
-      // TODO: EDITOR-1644 - properly implement creation of the synced block
-      // below is a temporary implementation for the creation of the synced block
-      // the resource id needs to have pageId and content property key in it
-      // Note: If the data provider is not set, the resource id will be the local id
-
+      var _this$dataProvider2;
       var localId = (0, _uuid.default)();
-      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      var resourceId = sourceId ? "".concat(sourceId, "/").concat(localId) : localId;
+      var sourceId = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.getSourceId();
+      var resourceId = sourceId ? (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId) : localId;
       var syncBlockNode = {
         attrs: {
           resourceId: resourceId,

package/dist/cjs/index.js

@@ -69,6 +69,12 @@ Object.defineProperty(exports, "useFetchDocNode", {
     return _syncBlockProvider.useFetchDocNode;
   }
 });
+Object.defineProperty(exports, "useHandleContentChanges", {
+  enumerable: true,
+  get: function get() {
+    return _syncBlockProvider.useHandleContentChanges;
+  }
+});
 Object.defineProperty(exports, "useMemoizedContentAPIProviders", {
   enumerable: true,
   get: function get() {

package/dist/cjs/providers/confluenceContentAPI.js

@@ -47,11 +47,11 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
     key: "fetchData",
     value: function () {
       var _fetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(resourceId) {
-        var _contentProperty$data, pageId, localId, key, options, contentProperty, value, syncedBlockData;
+        var _contentProperty$data;
+        var pageId, localId, key, options, contentProperty, value, syncedBlockData;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.prev = 0;
               pageId = (0, _ari.getPageIdFromAri)(resourceId);
               localId = (0, _ari.getLocalIdFromAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
@@ -60,35 +60,29 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
                 key: key,
                 cloudId: this.config.cloudId
               };
-              _context.next = 7;
+              _context.next = 6;
               return (0, _contentProperty.getContentProperty)(options);
-            case 7:
+            case 6:
               contentProperty = _context.sent;
               value = (_contentProperty$data = contentProperty.data.confluence.page.properties) === null || _contentProperty$data === void 0 || (_contentProperty$data = _contentProperty$data[0]) === null || _contentProperty$data === void 0 ? void 0 : _contentProperty$data.value;
               if (value) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
               throw new Error('Content property value does not exist');
-            case 11:
+            case 10:
               // Parse the synced block content from the property value
               syncedBlockData = parseSyncedBlockContentPropertyValue(value);
               return _context.abrupt("return", {
-                content: syncedBlockData.content
-              });
-            case 15:
-              _context.prev = 15;
-              _context.t0 = _context["catch"](0);
-              // eslint-disable-next-line no-console
-              console.error('Failed to fetch synced block data:', _context.t0);
-              return _context.abrupt("return", {
-                content: undefined
+                content: syncedBlockData.content,
+                resourceId: resourceId,
+                localId: localId
               });
-            case 19:
+            case 12:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[0, 15]]);
+        }, _callee, this);
       }));
       function fetchData(_x) {
         return _fetchData.apply(this, arguments);
@@ -142,68 +136,64 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   return (0, _createClass2.default)(ConfluenceADFWriteProvider, [{
     key: "writeData",
     value: function () {
-      var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(sourceId, localId, data, resourceId) {
-        var pageId, syncedBlockValue, _contentProperty$data3, _localId, key, contentProperty, _key;
+      var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
+        var pageId, syncedBlockValue, _contentProperty$data3, localId, key, contentProperty, _key;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
-              pageId = (0, _ari.getPageIdFromAri)(sourceId);
+              pageId = (0, _ari.getPageIdFromAri)(data.resourceId);
+              if (!(data.sourceDocumentAri && data.resourceId !== (0, _ari.resourceIdFromSourceAndLocalId)(data.sourceDocumentAri, data.localId))) {
+                _context3.next = 3;
+                break;
+              }
+              return _context3.abrupt("return", Promise.reject('Resource ARI differs from source document ARI'));
+            case 3:
               syncedBlockValue = JSON.stringify({
-                content: data
+                content: data.content
               });
-              if (!resourceId) {
-                _context3.next = 20;
+              if (!data.resourceId) {
+                _context3.next = 21;
                 break;
               }
               // Update existing content property
-              _localId = (0, _ari.getLocalIdFromAri)(resourceId);
-              key = getContentPropertyKey(this.config.contentPropertyKey, _localId);
-              _context3.next = 8;
+              localId = (0, _ari.getLocalIdFromAri)(data.resourceId);
+              key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              _context3.next = 9;
               return (0, _contentProperty.updateContentProperty)({
                 pageId: pageId,
                 key: key,
                 value: syncedBlockValue,
                 cloudId: this.config.cloudId
               });
-            case 8:
+            case 9:
               contentProperty = _context3.sent;
               if (!(((_contentProperty$data3 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
-                _context3.next = 13;
+                _context3.next = 14;
                 break;
               }
               return _context3.abrupt("return", key);
-            case 13:
+            case 14:
               if (!(contentProperty.data.confluence.updateValuePageProperty.pageProperty === null)) {
-                _context3.next = 17;
+                _context3.next = 18;
                 break;
               }
               return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue));
-            case 17:
-              throw new Error('Failed to update content property');
             case 18:
-              _context3.next = 22;
+              throw new Error('Failed to update content property');
+            case 19:
+              _context3.next = 23;
               break;
-            case 20:
+            case 21:
               // Create new content property
-              _key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              _key = getContentPropertyKey(this.config.contentPropertyKey, data.localId);
               return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, syncedBlockValue));
-            case 22:
-              _context3.next = 28;
-              break;
-            case 24:
-              _context3.prev = 24;
-              _context3.t0 = _context3["catch"](0);
-              // eslint-disable-next-line no-console
-              console.error('Failed to write synced block data:', _context3.t0);
-              return _context3.abrupt("return", Promise.reject(_context3.t0));
-            case 28:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 24]]);
+        }, _callee3, this);
       }));
-      function writeData(_x5, _x6, _x7, _x8) {
+      function writeData(_x5) {
         return _writeData.apply(this, arguments);
       }
       return writeData;

package/dist/cjs/providers/inMemory.js

@@ -7,16 +7,18 @@ exports.inMemoryWriteProvider = exports.inMemoryFetchProvider = void 0;
 var inMemStore = new Map();
 var inMemoryFetchProvider = exports.inMemoryFetchProvider = {
   fetchData: function fetchData(resourceId) {
-    return Promise.resolve({
-      content: inMemStore.get(resourceId)
-    });
+    var data = inMemStore.get(resourceId);
+    if (!data) {
+      return Promise.reject(new Error('Data not found'));
+    }
+    return Promise.resolve(data);
   }
 };
 var inMemoryWriteProvider = exports.inMemoryWriteProvider = {
-  writeData: function writeData(_sourceId, _localId, data, resourceId) {
-    if (resourceId) {
-      inMemStore.set(resourceId, data);
-      return Promise.resolve(resourceId);
+  writeData: function writeData(data) {
+    if (data.resourceId) {
+      inMemStore.set(data.resourceId, data);
+      return Promise.resolve(data.resourceId);
     } else {
       var uuid = crypto.randomUUID();
       inMemStore.set(uuid, data);

package/dist/cjs/utils/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPageIdFromAri = exports.getLocalIdFromAri = exports.getContentPropertyIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
+exports.resourceIdFromSourceAndLocalId = exports.getPageIdFromAri = exports.getLocalIdFromAri = exports.getContentPropertyIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
 var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
   return "ari:cloud:confluence:".concat(cloudId, ":page/").concat(pageId);
 };
@@ -39,4 +39,7 @@ var getContentPropertyIdFromAri = exports.getContentPropertyIdFromAri = function
     return match[1];
   }
   throw new Error("Invalid content property ARI: ".concat(ari));
+};
+var resourceIdFromSourceAndLocalId = exports.resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
+  return sourceId + '/' + localId;
 };

package/dist/es2019/common/syncBlockProvider.js

@@ -27,7 +27,7 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
           resourceIds.push(Promise.reject('No Synced Blockcontent to write'));
           return;
         }
-        const resourceId = this.writeProvider.writeData(this.sourceId, node.attrs.localId, data[index].content, node.attrs.resourceId);
+        const resourceId = this.writeProvider.writeData(data[index]);
         resourceIds.push(resourceId);
       });
       return Promise.all(resourceIds);
@@ -73,4 +73,21 @@ export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sou
   return useMemo(() => {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
+};
+export const useHandleContentChanges = (updatedDoc, isSource, node, provider) => {
+  useEffect(() => {
+    if (!isSource) {
+      return;
+    }
+    if (!provider) {
+      return;
+    }
+    const syncBlockNode = convertSyncBlockPMNodeToSyncBlockData(node, false);
+    const data = {
+      content: updatedDoc.toJSON(),
+      resourceId: node.attrs.resourceId,
+      localId: node.attrs.localId
+    };
+    provider === null || provider === void 0 ? void 0 : provider.writeNodesData([syncBlockNode], [data]);
+  }, [isSource, node, provider, updatedDoc]);
 };

package/dist/es2019/common/syncBlockStoreManager.js

@@ -1,4 +1,5 @@
 import uuid from 'uuid';
+import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { rebaseTransaction } from './rebase-transaction';
 
 // Do this typedef to make it clear that
@@ -18,6 +19,7 @@ export class SyncBlockStoreManager {
     this.editorView = editorView;
   }
   isSourceBlock(node) {
+    var _this$dataProvider;
     if (node.type.name !== 'syncBlock') {
       return false;
     }
@@ -25,7 +27,11 @@ export class SyncBlockStoreManager {
       resourceId,
       localId
     } = node.attrs;
-    return resourceId.includes(localId);
+    const sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
+    if (!sourceId) {
+      return false;
+    }
+    return typeof resourceId === 'string' && typeof sourceId === 'string' && typeof localId === 'string' && resourceId === resourceIdFromSourceAndLocalId(sourceId, localId);
   }
   registerConfirmationCallback(callback) {
     this.confirmationCallback = callback;
@@ -37,15 +43,10 @@ export class SyncBlockStoreManager {
     return !!this.confirmationCallback;
   }
   createSyncBlockNode() {
-    var _this$dataProvider;
-    // TODO: EDITOR-1644 - properly implement creation of the synced block
-    // below is a temporary implementation for the creation of the synced block
-    // the resource id needs to have pageId and content property key in it
-    // Note: If the data provider is not set, the resource id will be the local id
-
+    var _this$dataProvider2;
     const localId = uuid();
-    const sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-    const resourceId = sourceId ? `${sourceId}/${localId}` : localId;
+    const sourceId = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.getSourceId();
+    const resourceId = sourceId ? resourceIdFromSourceAndLocalId(sourceId, localId) : localId;
     const syncBlockNode = {
       attrs: {
         resourceId,

package/dist/es2019/index.js

@@ -1,6 +1,6 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 
-export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useMemoizedSyncedBlockProvider } from './common/syncBlockProvider';
+export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useHandleContentChanges, useMemoizedSyncedBlockProvider } from './common/syncBlockProvider';
 export { SyncBlockStoreManager } from './common/syncBlockStoreManager';
 export { inMemoryFetchProvider, inMemoryWriteProvider } from './providers/inMemory';
 export { getDefaultSyncBlockSchema } from './common/schema';

package/dist/es2019/providers/confluenceContentAPI.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
-import { getLocalIdFromAri, getPageIdFromAri } from '../utils/ari';
+import { getLocalIdFromAri, getPageIdFromAri, resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty } from '../utils/contentProperty';
 
 /**
@@ -33,34 +33,28 @@ class ConfluenceADFFetchProvider {
     this.config = config;
   }
   async fetchData(resourceId) {
-    try {
-      var _contentProperty$data, _contentProperty$data2;
-      const pageId = getPageIdFromAri(resourceId);
-      const localId = getLocalIdFromAri(resourceId);
-      const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
-      const options = {
-        pageId,
-        key,
-        cloudId: this.config.cloudId
-      };
-      const contentProperty = await getContentProperty(options);
-      const value = (_contentProperty$data = contentProperty.data.confluence.page.properties) === null || _contentProperty$data === void 0 ? void 0 : (_contentProperty$data2 = _contentProperty$data[0]) === null || _contentProperty$data2 === void 0 ? void 0 : _contentProperty$data2.value;
-      if (!value) {
-        throw new Error('Content property value does not exist');
-      }
-
-      // Parse the synced block content from the property value
-      const syncedBlockData = parseSyncedBlockContentPropertyValue(value);
-      return {
-        content: syncedBlockData.content
-      };
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('Failed to fetch synced block data:', error);
-      return {
-        content: undefined
-      };
+    var _contentProperty$data, _contentProperty$data2;
+    const pageId = getPageIdFromAri(resourceId);
+    const localId = getLocalIdFromAri(resourceId);
+    const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+    const options = {
+      pageId,
+      key,
+      cloudId: this.config.cloudId
+    };
+    const contentProperty = await getContentProperty(options);
+    const value = (_contentProperty$data = contentProperty.data.confluence.page.properties) === null || _contentProperty$data === void 0 ? void 0 : (_contentProperty$data2 = _contentProperty$data[0]) === null || _contentProperty$data2 === void 0 ? void 0 : _contentProperty$data2.value;
+    if (!value) {
+      throw new Error('Content property value does not exist');
     }
+
+    // Parse the synced block content from the property value
+    const syncedBlockData = parseSyncedBlockContentPropertyValue(value);
+    return {
+      content: syncedBlockData.content,
+      resourceId,
+      localId
+    };
   }
 }
 
@@ -85,39 +79,36 @@ class ConfluenceADFWriteProvider {
     });
     this.config = config;
   }
-  async writeData(sourceId, localId, data, resourceId) {
-    try {
-      const pageId = getPageIdFromAri(sourceId);
-      const syncedBlockValue = JSON.stringify({
-        content: data
+  async writeData(data) {
+    const pageId = getPageIdFromAri(data.resourceId);
+    if (data.sourceDocumentAri && data.resourceId !== resourceIdFromSourceAndLocalId(data.sourceDocumentAri, data.localId)) {
+      return Promise.reject('Resource ARI differs from source document ARI');
+    }
+    const syncedBlockValue = JSON.stringify({
+      content: data.content
+    });
+    if (data.resourceId) {
+      var _contentProperty$data4;
+      // Update existing content property
+      const localId = getLocalIdFromAri(data.resourceId);
+      const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+      const contentProperty = await updateContentProperty({
+        pageId,
+        key,
+        value: syncedBlockValue,
+        cloudId: this.config.cloudId
       });
-      if (resourceId) {
-        var _contentProperty$data4;
-        // Update existing content property
-        const localId = getLocalIdFromAri(resourceId);
-        const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
-        const contentProperty = await updateContentProperty({
-          pageId,
-          key,
-          value: syncedBlockValue,
-          cloudId: this.config.cloudId
-        });
-        if (((_contentProperty$data4 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data4 === void 0 ? void 0 : _contentProperty$data4.key) === key) {
-          return key;
-        } else if (contentProperty.data.confluence.updateValuePageProperty.pageProperty === null) {
-          return this.createNewContentProperty(pageId, key, syncedBlockValue);
-        } else {
-          throw new Error('Failed to update content property');
-        }
-      } else {
-        // Create new content property
-        const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+      if (((_contentProperty$data4 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data4 === void 0 ? void 0 : _contentProperty$data4.key) === key) {
+        return key;
+      } else if (contentProperty.data.confluence.updateValuePageProperty.pageProperty === null) {
         return this.createNewContentProperty(pageId, key, syncedBlockValue);
+      } else {
+        throw new Error('Failed to update content property');
       }
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('Failed to write synced block data:', error);
-      return Promise.reject(error);
+    } else {
+      // Create new content property
+      const key = getContentPropertyKey(this.config.contentPropertyKey, data.localId);
+      return this.createNewContentProperty(pageId, key, syncedBlockValue);
     }
   }
 }

package/dist/es2019/providers/inMemory.js

@@ -1,16 +1,18 @@
 const inMemStore = new Map();
 export const inMemoryFetchProvider = {
   fetchData: resourceId => {
-    return Promise.resolve({
-      content: inMemStore.get(resourceId)
-    });
+    const data = inMemStore.get(resourceId);
+    if (!data) {
+      return Promise.reject(new Error('Data not found'));
+    }
+    return Promise.resolve(data);
   }
 };
 export const inMemoryWriteProvider = {
-  writeData: (_sourceId, _localId, data, resourceId) => {
-    if (resourceId) {
-      inMemStore.set(resourceId, data);
-      return Promise.resolve(resourceId);
+  writeData: data => {
+    if (data.resourceId) {
+      inMemStore.set(data.resourceId, data);
+      return Promise.resolve(data.resourceId);
     } else {
       const uuid = crypto.randomUUID();
       inMemStore.set(uuid, data);

package/dist/es2019/utils/ari.js

@@ -29,4 +29,7 @@ export const getContentPropertyIdFromAri = ari => {
     return match[1];
   }
   throw new Error(`Invalid content property ARI: ${ari}`);
+};
+export const resourceIdFromSourceAndLocalId = (sourceId, localId) => {
+  return sourceId + '/' + localId;
 };

package/dist/esm/common/syncBlockProvider.js

@@ -43,7 +43,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
           resourceIds.push(Promise.reject('No Synced Blockcontent to write'));
           return;
         }
-        var resourceId = _this.writeProvider.writeData(_this.sourceId, node.attrs.localId, data[index].content, node.attrs.resourceId);
+        var resourceId = _this.writeProvider.writeData(data[index]);
         resourceIds.push(resourceId);
       });
       return Promise.all(resourceIds);
@@ -94,4 +94,21 @@ export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvi
   return useMemo(function () {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
+};
+export var useHandleContentChanges = function useHandleContentChanges(updatedDoc, isSource, node, provider) {
+  useEffect(function () {
+    if (!isSource) {
+      return;
+    }
+    if (!provider) {
+      return;
+    }
+    var syncBlockNode = convertSyncBlockPMNodeToSyncBlockData(node, false);
+    var data = {
+      content: updatedDoc.toJSON(),
+      resourceId: node.attrs.resourceId,
+      localId: node.attrs.localId
+    };
+    provider === null || provider === void 0 || provider.writeNodesData([syncBlockNode], [data]);
+  }, [isSource, node, provider, updatedDoc]);
 };

package/dist/esm/common/syncBlockStoreManager.js

@@ -3,6 +3,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import uuid from 'uuid';
+import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { rebaseTransaction as _rebaseTransaction } from './rebase-transaction';
 
 // Do this typedef to make it clear that
@@ -27,13 +28,18 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "isSourceBlock",
     value: function isSourceBlock(node) {
+      var _this$dataProvider;
       if (node.type.name !== 'syncBlock') {
         return false;
       }
       var _node$attrs = node.attrs,
         resourceId = _node$attrs.resourceId,
         localId = _node$attrs.localId;
-      return resourceId.includes(localId);
+      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
+      if (!sourceId) {
+        return false;
+      }
+      return typeof resourceId === 'string' && typeof sourceId === 'string' && typeof localId === 'string' && resourceId === resourceIdFromSourceAndLocalId(sourceId, localId);
     }
   }, {
     key: "registerConfirmationCallback",
@@ -52,15 +58,10 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "createSyncBlockNode",
     value: function createSyncBlockNode() {
-      var _this$dataProvider;
-      // TODO: EDITOR-1644 - properly implement creation of the synced block
-      // below is a temporary implementation for the creation of the synced block
-      // the resource id needs to have pageId and content property key in it
-      // Note: If the data provider is not set, the resource id will be the local id
-
+      var _this$dataProvider2;
       var localId = uuid();
-      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      var resourceId = sourceId ? "".concat(sourceId, "/").concat(localId) : localId;
+      var sourceId = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.getSourceId();
+      var resourceId = sourceId ? resourceIdFromSourceAndLocalId(sourceId, localId) : localId;
       var syncBlockNode = {
         attrs: {
           resourceId: resourceId,

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 
-export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useMemoizedSyncedBlockProvider } from './common/syncBlockProvider';
+export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useHandleContentChanges, useMemoizedSyncedBlockProvider } from './common/syncBlockProvider';
 export { SyncBlockStoreManager } from './common/syncBlockStoreManager';
 export { inMemoryFetchProvider, inMemoryWriteProvider } from './providers/inMemory';
 export { getDefaultSyncBlockSchema } from './common/schema';

package/dist/esm/providers/confluenceContentAPI.js

@@ -4,7 +4,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
-import { getLocalIdFromAri, getPageIdFromAri } from '../utils/ari';
+import { getLocalIdFromAri, getPageIdFromAri, resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty } from '../utils/contentProperty';
 
 /**
@@ -41,11 +41,11 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
     key: "fetchData",
     value: function () {
       var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(resourceId) {
-        var _contentProperty$data, pageId, localId, key, options, contentProperty, value, syncedBlockData;
+        var _contentProperty$data;
+        var pageId, localId, key, options, contentProperty, value, syncedBlockData;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.prev = 0;
               pageId = getPageIdFromAri(resourceId);
               localId = getLocalIdFromAri(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
@@ -54,35 +54,29 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
                 key: key,
                 cloudId: this.config.cloudId
               };
-              _context.next = 7;
+              _context.next = 6;
               return getContentProperty(options);
-            case 7:
+            case 6:
               contentProperty = _context.sent;
               value = (_contentProperty$data = contentProperty.data.confluence.page.properties) === null || _contentProperty$data === void 0 || (_contentProperty$data = _contentProperty$data[0]) === null || _contentProperty$data === void 0 ? void 0 : _contentProperty$data.value;
               if (value) {
-                _context.next = 11;
+                _context.next = 10;
                 break;
               }
               throw new Error('Content property value does not exist');
-            case 11:
+            case 10:
               // Parse the synced block content from the property value
               syncedBlockData = parseSyncedBlockContentPropertyValue(value);
               return _context.abrupt("return", {
-                content: syncedBlockData.content
-              });
-            case 15:
-              _context.prev = 15;
-              _context.t0 = _context["catch"](0);
-              // eslint-disable-next-line no-console
-              console.error('Failed to fetch synced block data:', _context.t0);
-              return _context.abrupt("return", {
-                content: undefined
+                content: syncedBlockData.content,
+                resourceId: resourceId,
+                localId: localId
               });
-            case 19:
+            case 12:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[0, 15]]);
+        }, _callee, this);
       }));
       function fetchData(_x) {
         return _fetchData.apply(this, arguments);
@@ -136,68 +130,64 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   return _createClass(ConfluenceADFWriteProvider, [{
     key: "writeData",
     value: function () {
-      var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(sourceId, localId, data, resourceId) {
-        var pageId, syncedBlockValue, _contentProperty$data3, _localId, key, contentProperty, _key;
+      var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
+        var pageId, syncedBlockValue, _contentProperty$data3, localId, key, contentProperty, _key;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.prev = 0;
-              pageId = getPageIdFromAri(sourceId);
+              pageId = getPageIdFromAri(data.resourceId);
+              if (!(data.sourceDocumentAri && data.resourceId !== resourceIdFromSourceAndLocalId(data.sourceDocumentAri, data.localId))) {
+                _context3.next = 3;
+                break;
+              }
+              return _context3.abrupt("return", Promise.reject('Resource ARI differs from source document ARI'));
+            case 3:
               syncedBlockValue = JSON.stringify({
-                content: data
+                content: data.content
               });
-              if (!resourceId) {
-                _context3.next = 20;
+              if (!data.resourceId) {
+                _context3.next = 21;
                 break;
               }
               // Update existing content property
-              _localId = getLocalIdFromAri(resourceId);
-              key = getContentPropertyKey(this.config.contentPropertyKey, _localId);
-              _context3.next = 8;
+              localId = getLocalIdFromAri(data.resourceId);
+              key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              _context3.next = 9;
               return updateContentProperty({
                 pageId: pageId,
                 key: key,
                 value: syncedBlockValue,
                 cloudId: this.config.cloudId
               });
-            case 8:
+            case 9:
               contentProperty = _context3.sent;
               if (!(((_contentProperty$data3 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
-                _context3.next = 13;
+                _context3.next = 14;
                 break;
               }
               return _context3.abrupt("return", key);
-            case 13:
+            case 14:
               if (!(contentProperty.data.confluence.updateValuePageProperty.pageProperty === null)) {
-                _context3.next = 17;
+                _context3.next = 18;
                 break;
               }
               return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue));
-            case 17:
-              throw new Error('Failed to update content property');
             case 18:
-              _context3.next = 22;
+              throw new Error('Failed to update content property');
+            case 19:
+              _context3.next = 23;
               break;
-            case 20:
+            case 21:
               // Create new content property
-              _key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              _key = getContentPropertyKey(this.config.contentPropertyKey, data.localId);
               return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, syncedBlockValue));
-            case 22:
-              _context3.next = 28;
-              break;
-            case 24:
-              _context3.prev = 24;
-              _context3.t0 = _context3["catch"](0);
-              // eslint-disable-next-line no-console
-              console.error('Failed to write synced block data:', _context3.t0);
-              return _context3.abrupt("return", Promise.reject(_context3.t0));
-            case 28:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 24]]);
+        }, _callee3, this);
       }));
-      function writeData(_x5, _x6, _x7, _x8) {
+      function writeData(_x5) {
         return _writeData.apply(this, arguments);
       }
       return writeData;

package/dist/esm/providers/inMemory.js

@@ -1,16 +1,18 @@
 var inMemStore = new Map();
 export var inMemoryFetchProvider = {
   fetchData: function fetchData(resourceId) {
-    return Promise.resolve({
-      content: inMemStore.get(resourceId)
-    });
+    var data = inMemStore.get(resourceId);
+    if (!data) {
+      return Promise.reject(new Error('Data not found'));
+    }
+    return Promise.resolve(data);
   }
 };
 export var inMemoryWriteProvider = {
-  writeData: function writeData(_sourceId, _localId, data, resourceId) {
-    if (resourceId) {
-      inMemStore.set(resourceId, data);
-      return Promise.resolve(resourceId);
+  writeData: function writeData(data) {
+    if (data.resourceId) {
+      inMemStore.set(data.resourceId, data);
+      return Promise.resolve(data.resourceId);
     } else {
       var uuid = crypto.randomUUID();
       inMemStore.set(uuid, data);

package/dist/esm/utils/ari.js

@@ -33,4 +33,7 @@ export var getContentPropertyIdFromAri = function getContentPropertyIdFromAri(ar
     return match[1];
   }
   throw new Error("Invalid content property ARI: ".concat(ari));
+};
+export var resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
+  return sourceId + '/' + localId;
 };

package/dist/types/common/syncBlockProvider.d.ts

@@ -24,3 +24,4 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
 }
 export declare const useFetchDocNode: (editorView: EditorView, node: PMNode, defaultDocNode: DocNode, provider?: SyncBlockDataProvider) => DocNode;
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string) => SyncBlockProvider;
+export declare const useHandleContentChanges: (updatedDoc: PMNode, isSource: boolean, node: PMNode, provider?: SyncBlockDataProvider) => void;

package/dist/types/common/types.d.ts

@@ -12,13 +12,20 @@ export type SyncBlockNode = {
 };
 export type SyncBlockData = {
     content: ADFEntity | undefined;
-    resourceId?: string;
+    createdAt?: string;
+    createdBy?: string;
+    isSynced?: boolean;
+    localId: string;
+    resourceId: string;
+    sourceDocumentAri?: string;
+    status?: 'deleted' | 'active';
+    updatedAt?: string;
 };
 export interface ADFFetchProvider {
     fetchData: (resourceId: string) => Promise<SyncBlockData>;
 }
 export interface ADFWriteProvider {
-    writeData: (sourceId: string, localId: string, data: ADFEntity, resourceId?: string) => Promise<string>;
+    writeData: (data: SyncBlockData) => Promise<string>;
 }
 export declare abstract class SyncBlockDataProvider extends NodeDataProvider<SyncBlockNode, SyncBlockData> {
     abstract writeNodesData: (nodes: SyncBlockNode[], data: SyncBlockData[]) => Promise<Array<string | undefined>>;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useMemoizedSyncedBlockProvider, } from './common/syncBlockProvider';
+export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useHandleContentChanges, useMemoizedSyncedBlockProvider, } from './common/syncBlockProvider';
 export { SyncBlockStoreManager } from './common/syncBlockStoreManager';
 export type { SyncBlockDataProvider, ADFFetchProvider, ADFWriteProvider, SyncBlockData, SyncBlockNode, } from './common/types';
 export { inMemoryFetchProvider, inMemoryWriteProvider } from './providers/inMemory';

package/dist/types/providers/confluenceContentAPI.d.ts

@@ -25,7 +25,7 @@ declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private config;
     constructor(config: ContentAPIConfig);
     private createNewContentProperty;
-    writeData(sourceId: string, localId: string, data: ADFEntity, resourceId?: string): Promise<string>;
+    writeData(data: SyncBlockData): Promise<string>;
 }
 /**
  * Convenience function to create providers with default content property key

package/dist/types/utils/ari.d.ts

@@ -8,3 +8,4 @@ export declare const getPageIdFromAri: (ari: string) => string;
 export declare const getLocalIdFromAri: (ari: string) => string;
 export declare const getContentPropertyAri: (contentPropertyId: string, cloudId: string) => string;
 export declare const getContentPropertyIdFromAri: (ari: string) => string;
+export declare const resourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;

package/dist/types-ts4.5/common/syncBlockProvider.d.ts

@@ -24,3 +24,4 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
 }
 export declare const useFetchDocNode: (editorView: EditorView, node: PMNode, defaultDocNode: DocNode, provider?: SyncBlockDataProvider) => DocNode;
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string) => SyncBlockProvider;
+export declare const useHandleContentChanges: (updatedDoc: PMNode, isSource: boolean, node: PMNode, provider?: SyncBlockDataProvider) => void;

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

@@ -12,13 +12,20 @@ export type SyncBlockNode = {
 };
 export type SyncBlockData = {
     content: ADFEntity | undefined;
-    resourceId?: string;
+    createdAt?: string;
+    createdBy?: string;
+    isSynced?: boolean;
+    localId: string;
+    resourceId: string;
+    sourceDocumentAri?: string;
+    status?: 'deleted' | 'active';
+    updatedAt?: string;
 };
 export interface ADFFetchProvider {
     fetchData: (resourceId: string) => Promise<SyncBlockData>;
 }
 export interface ADFWriteProvider {
-    writeData: (sourceId: string, localId: string, data: ADFEntity, resourceId?: string) => Promise<string>;
+    writeData: (data: SyncBlockData) => Promise<string>;
 }
 export declare abstract class SyncBlockDataProvider extends NodeDataProvider<SyncBlockNode, SyncBlockData> {
     abstract writeNodesData: (nodes: SyncBlockNode[], data: SyncBlockData[]) => Promise<Array<string | undefined>>;

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

@@ -1,4 +1,4 @@
-export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useMemoizedSyncedBlockProvider, } from './common/syncBlockProvider';
+export { SyncBlockProvider as SyncedBlockProvider, useFetchDocNode, useHandleContentChanges, useMemoizedSyncedBlockProvider, } from './common/syncBlockProvider';
 export { SyncBlockStoreManager } from './common/syncBlockStoreManager';
 export type { SyncBlockDataProvider, ADFFetchProvider, ADFWriteProvider, SyncBlockData, SyncBlockNode, } from './common/types';
 export { inMemoryFetchProvider, inMemoryWriteProvider } from './providers/inMemory';

package/dist/types-ts4.5/providers/confluenceContentAPI.d.ts

@@ -25,7 +25,7 @@ declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private config;
     constructor(config: ContentAPIConfig);
     private createNewContentProperty;
-    writeData(sourceId: string, localId: string, data: ADFEntity, resourceId?: string): Promise<string>;
+    writeData(data: SyncBlockData): Promise<string>;
 }
 /**
  * Convenience function to create providers with default content property key

package/dist/types-ts4.5/utils/ari.d.ts

@@ -8,3 +8,4 @@ export declare const getPageIdFromAri: (ari: string) => string;
 export declare const getLocalIdFromAri: (ari: string) => string;
 export declare const getContentPropertyAri: (contentPropertyId: string, cloudId: string) => string;
 export declare const getContentPropertyIdFromAri: (ari: string) => string;
+export declare const resourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;

package/package.json

@@ -82,7 +82,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "0.4.0",
+	"version": "0.5.1",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",