@atlaskit/editor-plugin-synced-block 5.3.33 → 5.3.35

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.3.35
+
+### Patch Changes
+
+- [`d144f08676a16`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d144f08676a16) -
+  [EDITOR-5528] Remove lazy loading for bodiedSyncBlock node
+
+## 5.3.34
+
+### Patch Changes
+
+- [`6424f86f6390a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6424f86f6390a) -
+  Improve Synced Blocks robustness
+- Updated dependencies
+
 ## 5.3.33
 
 ### Patch Changes

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

@@ -153,9 +153,7 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
   }
   var domNode = (0, _copyButton.toDOM)(referenceSyncBlockNode, schema);
   (0, _copyButton.copyDomNode)(domNode, referenceSyncBlockNode.type, selection);
-
-  // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
-  setTimeout(function () {
+  (0, _utils2.deferDispatch)(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics4;
       var tr = _ref3.tr;
@@ -175,7 +173,7 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
         }
       });
     });
-  }, 0);
+  });
   return true;
 };
 var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.bodiedSyncBlockNodeView = void 0;
+exports.bodiedSyncBlockNodeView = exports.BodiedSyncBlock = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -17,6 +17,7 @@ var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/rea
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _BodiedSyncBlockWrapper = require("../ui/BodiedSyncBlockWrapper");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -26,12 +27,13 @@ var toDOM = function toDOM() {
     contenteditable: true
   }, 0];
 };
-var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
+var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   function BodiedSyncBlock(props) {
     var _this;
     (0, _classCallCheck2.default)(this, BodiedSyncBlock);
     _this = _callSuper(this, BodiedSyncBlock, [props.node, props.view, props.getPos, props.portalProviderAPI, props.eventDispatcher, props]);
     _this.api = props.api;
+    _this.syncBlockStore = props.syncBlockStore;
     _this.handleConnectivityModeChange();
     _this.handleViewModeChange();
     return _this;
@@ -91,8 +93,9 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
-      var _this$api5, _this$api6;
-      var syncBlockStore = (_this$api5 = this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.syncedBlock.sharedState) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.currentState()) === null || _this$api5 === void 0 ? void 0 : _this$api5.syncBlockStore;
+      var _this$api$syncedBlock, _this$api5, _this$api6;
+      // Use passed syncBlockStore for SSR where sharedState.currentState() is delayed
+      var syncBlockStore = (_this$api$syncedBlock = (_this$api5 = this.api) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.syncedBlock.sharedState) === null || _this$api5 === void 0 || (_this$api5 = _this$api5.currentState()) === null || _this$api5 === void 0 ? void 0 : _this$api5.syncBlockStore) !== null && _this$api$syncedBlock !== void 0 ? _this$api$syncedBlock : this.syncBlockStore;
       if (!syncBlockStore) {
         return null;
       }
@@ -112,10 +115,12 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM()),
         dom = _DOMSerializer$render.dom,
         contentDOM = _DOMSerializer$render.contentDOM;
-      if (dom instanceof HTMLElement) {
+      // In SSR, the first check won't work, so fallback to nodeType check
+      if (dom instanceof HTMLElement || dom.nodeType === 1 && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
         this.updateContentEditable({
           contentDOM: contentDOM
         });
+        // eslint-disable-next-line @atlaskit/editor/no-as-casting
         return {
           dom: dom,
           contentDOM: contentDOM
@@ -138,7 +143,8 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
 var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(_ref4) {
   var pluginOptions = _ref4.pluginOptions,
     pmPluginFactoryParams = _ref4.pmPluginFactoryParams,
-    api = _ref4.api;
+    api = _ref4.api,
+    syncBlockStore = _ref4.syncBlockStore;
   return function (node, view, getPos) {
     var portalProviderAPI = pmPluginFactoryParams.portalProviderAPI,
       eventDispatcher = pmPluginFactoryParams.eventDispatcher;
@@ -149,7 +155,8 @@ var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedS
       view: view,
       getPos: getPos,
       portalProviderAPI: portalProviderAPI,
-      eventDispatcher: eventDispatcher
+      eventDispatcher: eventDispatcher,
+      syncBlockStore: syncBlockStore
     }).init();
   };
 };