@atlaskit/editor-plugin-synced-block 5.3.12 → 5.3.14

package/dist/es2019/ui/DeleteConfirmationModal.js

@@ -8,7 +8,6 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import ModalDialog, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Text, Box } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
@@ -35,7 +34,7 @@ export const DeleteConfirmationModal = ({
   syncBlockStoreManager,
   api
 }) => {
-  var _api$core2, _api$core4, _api$core6, _syncBlockIds$length;
+  var _api$core2, _api$core4, _api$core6;
   const [isOpen, setIsOpen] = useState(false);
   const [syncBlockIds, setSyncBlockIds] = useState(undefined);
   const [referenceCount, setReferenceCount] = useState(undefined);
@@ -119,7 +118,7 @@ export const DeleteConfirmationModal = ({
     }
   }, [api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions, bodiedSyncBlockDeletionStatus, isOpen]);
   useEffect(() => {
-    if (isOpen && syncBlockIds !== undefined && fg('platform_synced_block_dogfooding')) {
+    if (isOpen && syncBlockIds !== undefined) {
       const fetchReferences = async () => {
         try {
           const references = await Promise.all(syncBlockIds.map(async syncBlockId => {
@@ -144,7 +143,7 @@ export const DeleteConfirmationModal = ({
     onClose: handleClick(false),
     testId: "sync-block-delete-confirmation",
     height: 184
-  }, fg('platform_synced_block_dogfooding') ? /*#__PURE__*/React.createElement(React.Fragment, null, referenceCount === undefined ? /*#__PURE__*/React.createElement(Box, {
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, referenceCount === undefined ? /*#__PURE__*/React.createElement(Box, {
     xcss: styles.spinner
   }, /*#__PURE__*/React.createElement(Spinner, {
     size: "large"
@@ -157,22 +156,7 @@ export const DeleteConfirmationModal = ({
     isDisabled: isOfflineMode(mode),
     deleteReason: deleteReason,
     sourceCount: (syncBlockIds === null || syncBlockIds === void 0 ? void 0 : syncBlockIds.length) || 0
-  })) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalHeader, {
-    hasCloseButton: true
-  }, /*#__PURE__*/React.createElement(ModalTitle, {
-    appearance: "warning"
-  }, formatMessage(messages.deleteConfirmationModalTitleSingle))), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Text, null, formatMessage(messages.deleteConfirmationModalDescription, {
-    syncBlockCount: (_syncBlockIds$length = syncBlockIds === null || syncBlockIds === void 0 ? void 0 : syncBlockIds.length) !== null && _syncBlockIds$length !== void 0 ? _syncBlockIds$length : 1
-  }))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
-    appearance: "subtle",
-    onClick: handleClick(false)
-  }, formatMessage(messages.deleteConfirmationModalCancelButton)), /*#__PURE__*/React.createElement(Button, {
-    appearance: "warning",
-    onClick: handleClick(true),
-    autoFocus: true,
-    isDisabled: isOfflineMode(mode),
-    isLoading: bodiedSyncBlockDeletionStatus === 'processing'
-  }, formatMessage(messages.deleteConfirmationModalDeleteButton))))));
+  }))));
 };
 const ModalContent = ({
   content,

package/dist/es2019/ui/Flag.js

@@ -37,6 +37,11 @@ const flagMap = {
     title: messages.unpublishedSyncBlockPastedTitle,
     description: messages.unpublishedSyncBlockPastedDescription,
     type: 'info'
+  },
+  [FLAG_ID.CANNOT_CREATE_SYNC_BLOCK]: {
+    title: messages.cannotCreateSyncBlockTitle,
+    description: messages.CannotCreateSyncBlockDescription,
+    type: 'error'
   }
 };
 export const Flag = ({

package/dist/es2019/ui/SyncBlockLabel.js

@@ -3,7 +3,6 @@ import { useIntl } from 'react-intl-next';
 import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Text } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip';
 import VisuallyHidden from '@atlaskit/visually-hidden';
@@ -22,17 +21,12 @@ const SyncBlockLabelComponent = ({
   } = intl;
   const [tooltipContent, setTooltipContent] = useState(formatMessage(messages.defaultSyncBlockTooltip));
   let tooltipMessage = formatMessage(messages.defaultSyncBlockTooltip);
-  if (isSource && !fg('platform_synced_block_dogfooding')) {
-    tooltipMessage = formatMessage(messages.sourceSyncBlockTooltip);
-  } else if (title) {
+  if (title) {
     tooltipMessage = formatMessage(messages.referenceSyncBlockTooltip, {
       title
     });
   }
   const updateTooltipContent = useCallback(() => {
-    if (!fg('platform_synced_block_dogfooding')) {
-      return;
-    }
     let tooltipContent = tooltipMessage;
     if (contentUpdatedAt) {
       const elapsedTime = formatElapsedTime(contentUpdatedAt, intl);
@@ -52,7 +46,7 @@ const SyncBlockLabelComponent = ({
   }, [contentUpdatedAt, formatMessage, intl, tooltipMessage]);
   const ariaDescribedById = `sync-block-label-description-${localId}`;
   const getLabelContent = useMemo(() => {
-    if (isUnsyncedBlock && fg('platform_synced_block_dogfooding')) {
+    if (isUnsyncedBlock) {
       return /*#__PURE__*/React.createElement(Text, {
         size: "small",
         color: "color.text.subtle"
@@ -81,12 +75,12 @@ const SyncBlockLabelComponent = ({
     size: "small",
     label: ""
   }), getLabelContent);
-  if ((isSource || isUnsyncedBlock) && fg('platform_synced_block_dogfooding')) {
+  if (isSource || isUnsyncedBlock) {
     return label;
   }
   return /*#__PURE__*/React.createElement(Tooltip, {
     position: "top",
-    content: fg('platform_synced_block_dogfooding') ? tooltipContent : tooltipMessage
+    content: tooltipContent
     // workaround because tooltip adds aria-describedby with a new id every time the tooltip is opened
     // this causes an infinite rerender loop because of the forwardRef from the node view we are inside in bodiedSyncBlock
     // tooltip content is available for screen readers in visually hidden content after the label

package/dist/es2019/ui/SyncBlockRefresher.js

@@ -1,13 +1,12 @@
 import { useEffect } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const SYNC_BLOCK_FETCH_INTERVAL = 3000;
 
 // Component that manages synced block data synchronization.
-// When the feature flag 'platform_synced_block_dogfooding' is enabled,
-// it uses provider-based GraphQL subscriptions for updates.
-// When disabled, it falls back to polling at regular intervals.
+// Component that manages synced block data synchronization.
+// Uses provider-based GraphQL subscriptions for updates when online.
+// Falls back to polling at regular intervals when offline.
 export const SyncBlockRefresher = ({
   syncBlockStoreManager,
   api
@@ -20,14 +19,13 @@ export const SyncBlockRefresher = ({
       mode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode
     };
   });
-  const featureFlagEnabled = fg('platform_synced_block_dogfooding');
   const isOnline = !isOfflineMode(mode);
   useEffect(() => {
-    const useRealTimeSubscriptions = featureFlagEnabled && isOnline;
+    const useRealTimeSubscriptions = isOnline;
     syncBlockStoreManager.referenceManager.setRealTimeSubscriptionsEnabled(useRealTimeSubscriptions);
-  }, [syncBlockStoreManager, featureFlagEnabled, isOnline]);
+  }, [syncBlockStoreManager, isOnline]);
   useEffect(() => {
-    const useRealTimeSubscriptions = featureFlagEnabled && isOnline;
+    const useRealTimeSubscriptions = isOnline;
     if (useRealTimeSubscriptions) {
       return;
     }
@@ -46,6 +44,6 @@ export const SyncBlockRefresher = ({
     return () => {
       window.clearInterval(interval);
     };
-  }, [syncBlockStoreManager, isOnline, featureFlagEnabled]);
+  }, [syncBlockStoreManager, isOnline]);
   return null;
 };

package/dist/es2019/ui/floating-toolbar.js

@@ -20,6 +20,9 @@ export const getToolbarConfig = (state, intl, api, syncBlockStore) => {
   if (!syncBlockObject) {
     return;
   }
+  if (syncBlockStore.sourceManager.isPendingCreation(syncBlockObject.node.attrs.resourceId) && fg('platform_synced_block_patch_1')) {
+    return;
+  }
   const syncBlockInstance = syncBlockStore.referenceManager.getFromCache(syncBlockObject.node.attrs.resourceId);
   const isUnsyncedBlock = (syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : (_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.type) === SyncBlockError.NotFound;
   const isErroredBlock = syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.error;
@@ -53,12 +56,12 @@ export const getToolbarConfig = (state, intl, api, syncBlockStore) => {
       title: formatMessage(commonMessages.delete),
       onClick: removeSyncedBlock(api),
       icon: DeleteIcon,
-      testId: fg('platform_synced_block_dogfooding') ? SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceDelete : undefined,
-      ...hoverDecorationProps(nodeType, fg('platform_synced_block_dogfooding') ? undefined : akEditorSelectedNodeClassName)
+      testId: SYNCED_BLOCK_BUTTON_TEST_ID.syncedBlockToolbarReferenceDelete,
+      ...hoverDecorationProps(nodeType, akEditorSelectedNodeClassName)
     };
     items.push(deleteButton);
   } else {
-    if (!isErroredBlock && fg('platform_synced_block_dogfooding')) {
+    if (!isErroredBlock) {
       const syncedLocation = {
         type: 'custom',
         fallback: [],

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

@@ -24,23 +24,23 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
     var paragraphNode = paragraph.createAndFill({});
     var newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, paragraphNode ? [paragraphNode] : []);
     if (!newBodiedSyncBlockNode) {
-      if (fg('platform_synced_block_dogfooding')) {
-        fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
-          action: ACTION.ERROR,
-          actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-          actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
-          attributes: {
-            error: 'Create and fill for empty content failed'
-          },
-          eventType: EVENT_TYPE.OPERATIONAL
-        });
-      }
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
+        action: ACTION.ERROR,
+        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
+        attributes: {
+          error: 'Create and fill for empty content failed'
+        },
+        eventType: EVENT_TYPE.OPERATIONAL
+      });
       return false;
     }
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs);
+    if (!fg('platform_synced_block_patch_1')) {
+      syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs, function () {});
+    }
     if (typeAheadInsert) {
       tr = typeAheadInsert(newBodiedSyncBlockNode);
     } else {
@@ -49,47 +49,43 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
   } else {
     var conversionInfo = canBeConvertedToSyncBlock(tr.selection);
     if (!conversionInfo) {
-      if (fg('platform_synced_block_dogfooding')) {
-        fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
-          action: ACTION.ERROR,
-          actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-          actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
-          attributes: {
-            error: 'Content cannot be converted to sync block'
-          },
-          eventType: EVENT_TYPE.OPERATIONAL
-        });
-      }
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
+        action: ACTION.ERROR,
+        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
+        attributes: {
+          error: 'Content cannot be converted to sync block'
+        },
+        eventType: EVENT_TYPE.OPERATIONAL
+      });
       return false;
     }
     var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude);
     if (!_newBodiedSyncBlockNode) {
-      if (fg('platform_synced_block_dogfooding')) {
-        fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
-          action: ACTION.ERROR,
-          actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-          actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
-          attributes: {
-            error: 'Create and fill for content failed'
-          },
-          eventType: EVENT_TYPE.OPERATIONAL
-        });
-      }
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
+        action: ACTION.ERROR,
+        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
+        attributes: {
+          error: 'Create and fill for content failed'
+        },
+        eventType: EVENT_TYPE.OPERATIONAL
+      });
       return false;
     }
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs, _newBodiedSyncBlockNode);
+    if (!fg('platform_synced_block_patch_1')) {
+      // Moved to appendTransaction
+      syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs, function () {}, _newBodiedSyncBlockNode);
+    }
     tr.replaceWith(conversionInfo.from, conversionInfo.to, _newBodiedSyncBlockNode).scrollIntoView();
 
     // set selection to the start of the previous selection for the position taken up by the start of the new synced block
     tr.setSelection(TextSelection.create(tr.doc, conversionInfo.from));
   }
-
-  // This transaction will be intercepted in filterTransaction and dispatched when saving to backend succeeds
-  // see filterTransaction for more details
   return tr;
 };
 export var copySyncedBlockReferenceToClipboardEditorCommand = function copySyncedBlockReferenceToClipboardEditorCommand(syncBlockStore, inputMethod, api) {

package/dist/esm/nodeviews/bodiedSyncedBlock.js

@@ -12,7 +12,6 @@ import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { BodiedSyncBlockWrapper } from '../ui/BodiedSyncBlockWrapper';
 var toDOM = function toDOM() {
   return ['div', {
@@ -90,7 +89,7 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       if (!syncBlockStore) {
         return null;
       }
-      return fg('platform_synced_block_dogfooding') ? /*#__PURE__*/React.createElement(ErrorBoundary, {
+      return /*#__PURE__*/React.createElement(ErrorBoundary, {
         component: ACTION_SUBJECT.SYNCED_BLOCK,
         dispatchAnalyticsEvent: (_this$api6 = this.api) === null || _this$api6 === void 0 || (_this$api6 = _this$api6.analytics) === null || _this$api6 === void 0 ? void 0 : _this$api6.actions.fireAnalyticsEvent,
         fallbackComponent: null
@@ -98,11 +97,7 @@ var BodiedSyncBlock = /*#__PURE__*/function (_ReactNodeView) {
         ref: forwardRef,
         syncBlockStore: syncBlockStore,
         node: this.node
-      })) : /*#__PURE__*/React.createElement(BodiedSyncBlockWrapper, {
-        ref: forwardRef,
-        syncBlockStore: syncBlockStore,
-        node: this.node
-      });
+      }));
     }
   }, {
     key: "getContentDOM",

package/dist/esm/nodeviews/syncedBlock.js

@@ -13,7 +13,6 @@ import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName, SyncBlockActionsProvider } from '@atlaskit/editor-common/sync-block';
 import { useFetchSyncBlockData as _useFetchSyncBlockData, useFetchSyncBlockTitle as _useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { removeSyncedBlockAtPos } from '../editor-commands';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
 export var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
@@ -42,8 +41,7 @@ export var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
         _this$api,
         _this$api2,
         _this2 = this,
-        _this$options2,
-        _this$options3;
+        _this$options2;
       var getPos = _ref.getPos;
       if (!((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.syncedBlockRenderer)) {
         return null;
@@ -54,14 +52,13 @@ export var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       if (!resourceId || !localId) {
         return null;
       }
-      var initialSyncBlockStore = fg('platform_synced_block_dogfooding') ? this.syncBlockStore : undefined;
-      var syncBlockStore = (_this$api$syncedBlock = (_this$api = this.api) === null || _this$api === void 0 || (_this$api = _this$api.syncedBlock) === null || _this$api === void 0 || (_this$api = _this$api.sharedState.currentState()) === null || _this$api === void 0 ? void 0 : _this$api.syncBlockStore) !== null && _this$api$syncedBlock !== void 0 ? _this$api$syncedBlock : initialSyncBlockStore;
+      var syncBlockStore = (_this$api$syncedBlock = (_this$api = this.api) === null || _this$api === void 0 || (_this$api = _this$api.syncedBlock) === null || _this$api === void 0 || (_this$api = _this$api.sharedState.currentState()) === null || _this$api === void 0 ? void 0 : _this$api.syncBlockStore) !== null && _this$api$syncedBlock !== void 0 ? _this$api$syncedBlock : this.syncBlockStore;
       if (!syncBlockStore) {
         return null;
       }
 
       // get document node from data provider
-      return fg('platform_synced_block_dogfooding') ? /*#__PURE__*/React.createElement(ErrorBoundary, {
+      return /*#__PURE__*/React.createElement(ErrorBoundary, {
         component: ACTION_SUBJECT.SYNCED_BLOCK,
         dispatchAnalyticsEvent: (_this$api2 = this.api) === null || _this$api2 === void 0 || (_this$api2 = _this$api2.analytics) === null || _this$api2 === void 0 ? void 0 : _this$api2.actions.fireAnalyticsEvent,
         fallbackComponent: null
@@ -86,18 +83,7 @@ export var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
           return _useFetchSyncBlockData(syncBlockStore, resourceId, localId, (_this2$api = _this2.api) === null || _this2$api === void 0 || (_this2$api = _this2$api.analytics) === null || _this2$api === void 0 || (_this2$api = _this2$api.actions) === null || _this2$api === void 0 ? void 0 : _this2$api.fireAnalyticsEvent);
         },
         api: this.api
-      }))) : /*#__PURE__*/React.createElement(SyncBlockRendererWrapper, {
-        localId: this.node.attrs.localId,
-        syncedBlockRenderer: (_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.syncedBlockRenderer,
-        useFetchSyncBlockTitle: function useFetchSyncBlockTitle() {
-          return _useFetchSyncBlockTitle(syncBlockStore, _this2.node);
-        },
-        useFetchSyncBlockData: function useFetchSyncBlockData() {
-          var _this2$api2;
-          return _useFetchSyncBlockData(syncBlockStore, resourceId, localId, (_this2$api2 = _this2.api) === null || _this2$api2 === void 0 || (_this2$api2 = _this2$api2.analytics) === null || _this2$api2 === void 0 || (_this2$api2 = _this2$api2.actions) === null || _this2$api2 === void 0 ? void 0 : _this2$api2.fireAnalyticsEvent);
-        },
-        api: this.api
-      });
+      })));
     }
   }, {
     key: "destroy",