@atlaskit/editor-synced-block-provider 6.6.0 → 6.6.1

package/dist/esm/store-manager/sourceSyncBlockStoreManager.js

@@ -9,10 +9,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
-import isEqual from 'lodash/isEqual';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getCreateSourceExperience, getDeleteSourceExperience, getSaveSourceExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
@@ -28,7 +25,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     _classCallCheck(this, SourceSyncBlockStoreManager);
     _defineProperty(this, "hasReceivedContentChange", false);
     _defineProperty(this, "setPendingDeletion", function (Ids, value) {
-      if (_this.viewMode === 'view' && fg('platform_synced_block_patch_8')) {
+      if (_this.viewMode === 'view') {
         return;
       }
       var syncBlock = _this.syncBlockCache.get(Ids.resourceId);
@@ -76,7 +73,8 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     key: "updateSyncBlockData",
     value: function updateSyncBlockData(syncBlockNode, isRemote) {
       try {
-        if (this.viewMode === 'view' && fg('platform_synced_block_patch_8')) {
+        var _cachedBlock$contentF;
+        if (this.viewMode === 'view') {
           return false;
         }
         if (!this.isSourceBlock(syncBlockNode)) {
@@ -89,36 +87,23 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           throw new Error('Local ID or resource ID is not set');
         }
         var cachedBlock = this.syncBlockCache.get(resourceId);
-        if (fg('platform_synced_block_update_refactor')) {
-          var _cachedBlock$contentF;
-          // Fast path: if the PM content fragment hasn't changed, skip serialization entirely
-          // Fragment.eq() leverages ProseMirror's structural sharing for O(1) comparison
-          if (cachedBlock !== null && cachedBlock !== void 0 && (_cachedBlock$contentF = cachedBlock.contentFragment) !== null && _cachedBlock$contentF !== void 0 && _cachedBlock$contentF.eq(syncBlockNode.content)) {
-            return true;
-          }
-          var syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
-          if (cachedBlock && !isRemote) {
-            this.hasReceivedContentChange = true;
-          }
-          var isDirty = !isRemote || !cachedBlock; // if the change is not remote, or the block is not in the cache yet, it's dirty
-          this.syncBlockCache.set(resourceId, _objectSpread(_objectSpread({}, syncBlockData), {}, {
-            isDirty: isDirty,
-            // if the change is from remote, it's not dirty
-            contentFragment: syncBlockNode.content
-          }, fg('platform_synced_block_patch_10') && {
-            status: cachedBlock === null || cachedBlock === void 0 ? void 0 : cachedBlock.status
-          }));
-        } else {
-          var _syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
-          if (cachedBlock && !isEqual(_syncBlockData.content, cachedBlock.content)) {
-            this.hasReceivedContentChange = true;
-          }
-          this.syncBlockCache.set(resourceId, _objectSpread(_objectSpread({}, _syncBlockData), {}, {
-            isDirty: true
-          }, fg('platform_synced_block_patch_10') && {
-            status: cachedBlock === null || cachedBlock === void 0 ? void 0 : cachedBlock.status
-          }));
+
+        // Fast path: if the PM content fragment hasn't changed, skip serialization entirely
+        // Fragment.eq() leverages ProseMirror's structural sharing for O(1) comparison
+        if (cachedBlock !== null && cachedBlock !== void 0 && (_cachedBlock$contentF = cachedBlock.contentFragment) !== null && _cachedBlock$contentF !== void 0 && _cachedBlock$contentF.eq(syncBlockNode.content)) {
+          return true;
+        }
+        var syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
+        if (cachedBlock && !isRemote) {
+          this.hasReceivedContentChange = true;
         }
+        var isDirty = !isRemote || !cachedBlock; // if the change is not remote, or the block is not in the cache yet, it's dirty
+        this.syncBlockCache.set(resourceId, _objectSpread(_objectSpread({}, syncBlockData), {}, {
+          isDirty: isDirty,
+          // if the change is from remote, it's not dirty
+          contentFragment: syncBlockNode.content,
+          status: cachedBlock === null || cachedBlock === void 0 ? void 0 : cachedBlock.status
+        }));
         return true;
       } catch (error) {
         var _this$fireAnalyticsEv, _syncBlockNode$attrs2, _syncBlockNode$attrs3;
@@ -147,7 +132,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              if (!(this.viewMode === 'view' && fg('platform_synced_block_patch_8'))) {
+              if (!(this.viewMode === 'view')) {
                 _context.next = 3;
                 break;
               }
@@ -218,11 +203,9 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 if (result.resourceId && !result.error) {
                   var _this2$fireAnalyticsE;
                   // Update cache with the status returned from the backend
-                  if (fg('platform_synced_block_patch_10')) {
-                    var cachedData = _this2.syncBlockCache.get(result.resourceId);
-                    if (cachedData && result.status) {
-                      cachedData.status = result.status;
-                    }
+                  var cachedData = _this2.syncBlockCache.get(result.resourceId);
+                  if (cachedData && result.status) {
+                    cachedData.status = result.status;
                   }
                   (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, updateSuccessPayload(result.resourceId, false, productAttrIfGateOn(result.resourceId)));
                 }
@@ -267,7 +250,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "hasUnsavedChanges",
     value: function hasUnsavedChanges() {
-      if (this.viewMode === 'view' && fg('platform_synced_block_patch_8')) {
+      if (this.viewMode === 'view') {
         return false;
       }
 
@@ -306,16 +289,14 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "commitPendingCreation",
     value: function commitPendingCreation(success, resourceId) {
-      if (this.viewMode === 'view' && fg('platform_synced_block_patch_8')) {
+      if (this.viewMode === 'view') {
         return;
       }
       var onCompletion = this.creationCompletionCallbacks.get(resourceId);
       if (onCompletion) {
         this.creationCompletionCallbacks.delete(resourceId);
         onCompletion(success);
-        if (success && editorExperiment('platform_synced_block_patch_6', true, {
-          exposure: true
-        })) {
+        if (success) {
           // If creation is successful, set hasReceivedContentChange to true
           // to indicate that there are unsaved changes in the cache
           this.hasReceivedContentChange = true;
@@ -377,7 +358,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     key: "createBodiedSyncBlockNode",
     value: function createBodiedSyncBlockNode(attrs, node, onCompletion) {
       var _this4 = this;
-      if (this.viewMode === 'view' && fg('platform_synced_block_patch_8')) {
+      if (this.viewMode === 'view') {
         return;
       }
       var resourceId = attrs.resourceId,
@@ -387,17 +368,14 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         if (!this.dataProvider) {
           throw new Error('Data provider not set');
         }
-        if (fg('platform_synced_block_update_refactor')) {
-          // add the node to the cache
-          this.updateSyncBlockData(node, false);
 
-          // Mark the block as unpublished in the cache so it can be cleaned up on cancel
-          if (fg('platform_synced_block_patch_10')) {
-            var cached = this.syncBlockCache.get(resourceId);
-            if (cached) {
-              cached.status = 'unpublished';
-            }
-          }
+        // add the node to the cache
+        this.updateSyncBlockData(node, false);
+
+        // Mark the block as unpublished in the cache so it can be cleaned up on cancel
+        var cached = this.syncBlockCache.get(resourceId);
+        if (cached) {
+          cached.status = 'unpublished';
         }
         this.creationCompletionCallbacks.set(resourceId, onCompletion);
         (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 || _this$createExperienc.start({});
@@ -451,7 +429,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.prev = 0;
-              if (!(this.viewMode === 'view' && fg('platform_synced_block_patch_8'))) {
+              if (!(this.viewMode === 'view')) {
                 _context2.next = 3;
                 break;
               }
@@ -542,7 +520,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(this.viewMode === 'view' && fg('platform_synced_block_patch_8'))) {
+              if (!(this.viewMode === 'view')) {
                 _context3.next = 2;
                 break;
               }
@@ -594,7 +572,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              if (!(!fg('platform_synced_block_patch_10') || !this.dataProvider || this.syncBlockCache.size === 0)) {
+              if (!(!this.dataProvider || this.syncBlockCache.size === 0)) {
                 _context4.next = 2;
                 break;
               }
@@ -669,9 +647,6 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "discardUnpublishedBlocks",
     value: function discardUnpublishedBlocks() {
-      if (!fg('platform_synced_block_patch_10')) {
-        return Promise.resolve(true);
-      }
       var unpublishedBlockIds = Array.from(this.syncBlockCache.entries()).filter(function (_ref3) {
         var _ref4 = _slicedToArray(_ref3, 2),
           _ = _ref4[0],
@@ -712,7 +687,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (!(this.viewMode === 'view' && fg('platform_synced_block_patch_8'))) {
+              if (!(this.viewMode === 'view')) {
                 _context5.next = 2;
                 break;
               }

package/dist/esm/store-manager/syncBlockStoreManager.js

@@ -7,7 +7,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import { useMemo, useRef } from 'react';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { SyncBlockError } from '../common/types';
 import { fetchReferencesErrorPayload } from '../utils/errorHandling';
@@ -41,7 +40,7 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
     value: function () {
       var _fetchReferencesSourceInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resourceId, blockInstanceId, isSourceSyncBlock) {
         var _this = this;
-        var _this$fetchReferences, _response$references, _this$fetchReferences5, _response$references2, response, _this$fetchReferences2, _this$fetchReferences3, _this$fetchReferences4, sourceInfoPromises, sourceInfos, sourceSyncBlockData, _this$fireAnalyticsEv;
+        var _this$fetchReferences, _response$references, _this$fetchReferences3, _response$references2, response, _this$fetchReferences2, sourceInfoPromises, sourceInfos, sourceSyncBlockData, _this$fireAnalyticsEv;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -69,30 +68,12 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
               });
             case 10:
               if (!(!response.references || ((_response$references = response.references) === null || _response$references === void 0 ? void 0 : _response$references.length) === 0)) {
-                _context2.next = 17;
-                break;
-              }
-              if (!fg('platform_synced_block_patch_8')) {
-                _context2.next = 15;
+                _context2.next = 12;
                 break;
               }
               return _context2.abrupt("return", this.getUnregisteredReferences(resourceId, blockInstanceId, isSourceSyncBlock));
-            case 15:
-              // No reference found
-              if (isSourceSyncBlock) {
-                (_this$fetchReferences3 = this.fetchReferencesExperience) === null || _this$fetchReferences3 === void 0 || _this$fetchReferences3.success();
-              } else {
-                (_this$fetchReferences4 = this.fetchReferencesExperience) === null || _this$fetchReferences4 === void 0 || _this$fetchReferences4.failure({
-                  reason: 'No references found for reference synced block'
-                });
-              }
-              return _context2.abrupt("return", isSourceSyncBlock ? {
-                references: []
-              } : {
-                error: SyncBlockError.Errored
-              });
-            case 17:
-              (_this$fetchReferences5 = this.fetchReferencesExperience) === null || _this$fetchReferences5 === void 0 || _this$fetchReferences5.success();
+            case 12:
+              (_this$fetchReferences3 = this.fetchReferencesExperience) === null || _this$fetchReferences3 === void 0 || _this$fetchReferences3.success();
               sourceInfoPromises = ((_response$references2 = response.references) !== null && _response$references2 !== void 0 ? _response$references2 : []).map( /*#__PURE__*/function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(reference) {
                   var _this$fetchSourceInfo, _this$dataProvider, _this$fetchSourceInfo3;
@@ -130,13 +111,13 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
                   return _ref.apply(this, arguments);
                 };
               }());
-              _context2.next = 21;
+              _context2.next = 16;
               return Promise.all(sourceInfoPromises);
-            case 21:
+            case 16:
               sourceInfos = _context2.sent;
-              _context2.next = 24;
+              _context2.next = 19;
               return isSourceSyncBlock ? this.sourceSyncBlockStoreManager.getSyncBlockSourceInfo(blockInstanceId) : this.referenceSyncBlockStoreManager.fetchSyncBlockSourceInfo(resourceId);
-            case 24:
+            case 19:
               sourceSyncBlockData = _context2.sent;
               if (sourceSyncBlockData) {
                 sourceInfos.push(_objectSpread(_objectSpread({}, sourceSyncBlockData), {}, {
@@ -149,8 +130,8 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
               return _context2.abrupt("return", {
                 references: sourceInfos
               });
-            case 29:
-              _context2.prev = 29;
+            case 24:
+              _context2.prev = 24;
               _context2.t0 = _context2["catch"](0);
               logException(_context2.t0, {
                 location: 'editor-synced-block-provider/syncBlockStoreManager'
@@ -159,11 +140,11 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
               return _context2.abrupt("return", {
                 error: SyncBlockError.Errored
               });
-            case 34:
+            case 29:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[0, 29]]);
+        }, _callee2, this, [[0, 24]]);
       }));
       function fetchReferencesSourceInfo(_x, _x2, _x3) {
         return _fetchReferencesSourceInfo.apply(this, arguments);
@@ -192,10 +173,10 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$fetchReferences6, _this$fetchSourceInfo4;
+      var _this$fetchReferences4, _this$fetchSourceInfo4;
       this.referenceSyncBlockStoreManager.destroy();
       this.sourceSyncBlockStoreManager.destroy();
-      (_this$fetchReferences6 = this.fetchReferencesExperience) === null || _this$fetchReferences6 === void 0 || _this$fetchReferences6.abort({
+      (_this$fetchReferences4 = this.fetchReferencesExperience) === null || _this$fetchReferences4 === void 0 || _this$fetchReferences4.abort({
         reason: 'editorDestroyed'
       });
       (_this$fetchSourceInfo4 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo4 === void 0 || _this$fetchSourceInfo4.abort({
@@ -206,8 +187,8 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
     key: "getUnregisteredReferences",
     value: function () {
       var _getUnregisteredReferences = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resourceId, blockInstanceId, isSourceSyncBlock) {
-        var _this$fetchReferences0;
-        var _this$fetchReferences8, referenceResourceId, hasUnregisteredReferenceOnPage, _this$fetchReferences7, _sourceSyncBlockData, _references, sourceSyncBlockReference, referenceSyncBlockReference, references, sourceSyncBlockData, currentPageData, _this$fetchReferences9;
+        var _this$fetchReferences8;
+        var _this$fetchReferences6, referenceResourceId, hasUnregisteredReferenceOnPage, _this$fetchReferences5, _sourceSyncBlockData, _references, sourceSyncBlockReference, referenceSyncBlockReference, references, sourceSyncBlockData, currentPageData, _this$fetchReferences7;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -242,13 +223,13 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
                 });
                 _references.push(sourceSyncBlockReference, referenceSyncBlockReference);
               }
-              (_this$fetchReferences7 = this.fetchReferencesExperience) === null || _this$fetchReferences7 === void 0 || _this$fetchReferences7.success();
+              (_this$fetchReferences5 = this.fetchReferencesExperience) === null || _this$fetchReferences5 === void 0 || _this$fetchReferences5.success();
               return _context3.abrupt("return", {
                 references: _references
               });
             case 11:
               // No remote or local reference exists — show info text with link to doco on how to use Synced Blocks
-              (_this$fetchReferences8 = this.fetchReferencesExperience) === null || _this$fetchReferences8 === void 0 || _this$fetchReferences8.success();
+              (_this$fetchReferences6 = this.fetchReferencesExperience) === null || _this$fetchReferences6 === void 0 || _this$fetchReferences6.success();
               return _context3.abrupt("return", {
                 references: []
               });
@@ -283,14 +264,14 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
                 _context3.next = 25;
                 break;
               }
-              (_this$fetchReferences9 = this.fetchReferencesExperience) === null || _this$fetchReferences9 === void 0 || _this$fetchReferences9.failure({
+              (_this$fetchReferences7 = this.fetchReferencesExperience) === null || _this$fetchReferences7 === void 0 || _this$fetchReferences7.failure({
                 reason: 'No references found for reference synced block'
               });
               return _context3.abrupt("return", {
                 error: SyncBlockError.Errored
               });
             case 25:
-              (_this$fetchReferences0 = this.fetchReferencesExperience) === null || _this$fetchReferences0 === void 0 || _this$fetchReferences0.success();
+              (_this$fetchReferences8 = this.fetchReferencesExperience) === null || _this$fetchReferences8 === void 0 || _this$fetchReferences8.success();
               return _context3.abrupt("return", {
                 references: references
               });

package/package.json

@@ -29,7 +29,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/node-data-provider": "^11.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^80.2.0",
+		"@atlaskit/tmp-editor-statsig": "^80.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"graphql-ws": "^5.14.2",
@@ -38,7 +38,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.30.0",
+		"@atlaskit/editor-common": "^114.32.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -81,7 +81,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "6.6.0",
+	"version": "6.6.1",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -89,23 +89,8 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"platform-feature-flags": {
-		"platform_synced_block_update_refactor": {
-			"type": "boolean"
-		},
-		"platform_synced_block_patch_8": {
-			"type": "boolean"
-		},
-		"platform_synced_block_patch_9": {
-			"type": "boolean"
-		},
-		"platform_synced_block_patch_10": {
-			"type": "boolean"
-		},
 		"platform_synced_block_patch_11": {
 			"type": "boolean"
-		},
-		"platform_synced_block_add_info_web_socket_error": {
-			"type": "boolean"
 		}
 	}
 }