@atlaskit/editor-plugin-synced-block 11.0.4 → 11.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/DeleteConfirmationModal.js +8 -4
  3. package/dist/es2019/ui/DeleteConfirmationModal.js +8 -4
  4. package/dist/esm/ui/DeleteConfirmationModal.js +8 -4
  5. package/package.json +4 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/editor-plugin-synced-block
2
2
 
3
+ ## 11.0.5
4
+
5
+ ### Patch Changes
6
+
7
+ - [`918ee54b672aa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/918ee54b672aa) -
8
+ Fix synced block delete modal reference counts
9
+ - Updated dependencies
10
+
3
11
  ## 11.0.4
4
12
 
5
13
  ### Patch Changes
package/dist/cjs/ui/DeleteConfirmationModal.js CHANGED
@@ -20,6 +20,7 @@ var _hooks = require("@atlaskit/editor-common/hooks");
20
20
  var _messages = require("@atlaskit/editor-common/messages");
21
21
  var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
22
22
  var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
23
+ var _fg = require("@atlaskit/platform-feature-flags/fg");
23
24
  var _compiled = require("@atlaskit/primitives/compiled");
24
25
  var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
25
26
  var _main = require("../pm-plugins/main");
@@ -325,15 +326,18 @@ var ModalContent = function ModalContent(_ref0) {
325
326
  descriptionMultiple = content.descriptionMultiple,
326
327
  confirmButtonLabel = content.confirmButtonLabel;
327
328
  var hasNoReferenceOrFailToFetch = referenceCount === 0;
328
- var syncBlockCount = deleteReason === 'source-block-deleted' ? referenceCount + sourceCount : referenceCount;
329
+ var totalLocationCount = deleteReason === 'source-block-deleted' ? referenceCount + sourceCount : referenceCount;
330
+ var isReferenceCountDescriptionEnabled = deleteReason === 'source-block-deleted' && (0, _fg.fg)('platform_editor_blocks_patch_7');
331
+ var descriptionLocationCount = isReferenceCountDescriptionEnabled ? referenceCount : totalLocationCount;
332
+ var descriptionMultipleMessage = isReferenceCountDescriptionEnabled ? _messages.syncBlockMessages.deletionConfirmationModalDescriptionReferenceCount : descriptionMultiple;
329
333
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, {
330
334
  hasCloseButton: true
331
335
  }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, {
332
336
  appearance: "warning"
333
337
  }, hasNoReferenceOrFailToFetch ? formatMessage(titleSingle) : formatMessage(titleMultiple, {
334
- count: syncBlockCount
335
- }))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_compiled.Text, null, hasNoReferenceOrFailToFetch ? formatMessage(descriptionSingle) : formatMessage(descriptionMultiple, {
336
- syncBlockCount: syncBlockCount
338
+ count: totalLocationCount
339
+ }))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, /*#__PURE__*/_react.default.createElement(_compiled.Text, null, hasNoReferenceOrFailToFetch ? formatMessage(descriptionSingle) : formatMessage(descriptionMultipleMessage, {
340
+ syncBlockCount: descriptionLocationCount
337
341
  }))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_new.default, {
338
342
  appearance: "subtle",
339
343
  onClick: handleClick(false)
package/dist/es2019/ui/DeleteConfirmationModal.js CHANGED
@@ -8,6 +8,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
8
8
  import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
9
9
  import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
10
10
  import ModalDialog, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
11
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
11
12
  import { Text, Box } from '@atlaskit/primitives/compiled';
12
13
  import Spinner from '@atlaskit/spinner';
13
14
  import { syncedBlockPluginKey } from '../pm-plugins/main';
@@ -252,15 +253,18 @@ const ModalContent = ({
252
253
  confirmButtonLabel
253
254
  } = content;
254
255
  const hasNoReferenceOrFailToFetch = referenceCount === 0;
255
- const syncBlockCount = deleteReason === 'source-block-deleted' ? referenceCount + sourceCount : referenceCount;
256
+ const totalLocationCount = deleteReason === 'source-block-deleted' ? referenceCount + sourceCount : referenceCount;
257
+ const isReferenceCountDescriptionEnabled = deleteReason === 'source-block-deleted' && fg('platform_editor_blocks_patch_7');
258
+ const descriptionLocationCount = isReferenceCountDescriptionEnabled ? referenceCount : totalLocationCount;
259
+ const descriptionMultipleMessage = isReferenceCountDescriptionEnabled ? messages.deletionConfirmationModalDescriptionReferenceCount : descriptionMultiple;
256
260
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalHeader, {
257
261
  hasCloseButton: true
258
262
  }, /*#__PURE__*/React.createElement(ModalTitle, {
259
263
  appearance: "warning"
260
264
  }, hasNoReferenceOrFailToFetch ? formatMessage(titleSingle) : formatMessage(titleMultiple, {
261
- count: syncBlockCount
262
- }))), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Text, null, hasNoReferenceOrFailToFetch ? formatMessage(descriptionSingle) : formatMessage(descriptionMultiple, {
263
- syncBlockCount
265
+ count: totalLocationCount
266
+ }))), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Text, null, hasNoReferenceOrFailToFetch ? formatMessage(descriptionSingle) : formatMessage(descriptionMultipleMessage, {
267
+ syncBlockCount: descriptionLocationCount
264
268
  }))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
265
269
  appearance: "subtle",
266
270
  onClick: handleClick(false)
package/dist/esm/ui/DeleteConfirmationModal.js CHANGED
@@ -14,6 +14,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
14
14
  import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
15
15
  import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
16
16
  import ModalDialog, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
17
+ import { fg } from '@atlaskit/platform-feature-flags/fg';
17
18
  import { Text, Box } from '@atlaskit/primitives/compiled';
18
19
  import Spinner from '@atlaskit/spinner';
19
20
  import { syncedBlockPluginKey } from '../pm-plugins/main';
@@ -316,15 +317,18 @@ var ModalContent = function ModalContent(_ref0) {
316
317
  descriptionMultiple = content.descriptionMultiple,
317
318
  confirmButtonLabel = content.confirmButtonLabel;
318
319
  var hasNoReferenceOrFailToFetch = referenceCount === 0;
319
- var syncBlockCount = deleteReason === 'source-block-deleted' ? referenceCount + sourceCount : referenceCount;
320
+ var totalLocationCount = deleteReason === 'source-block-deleted' ? referenceCount + sourceCount : referenceCount;
321
+ var isReferenceCountDescriptionEnabled = deleteReason === 'source-block-deleted' && fg('platform_editor_blocks_patch_7');
322
+ var descriptionLocationCount = isReferenceCountDescriptionEnabled ? referenceCount : totalLocationCount;
323
+ var descriptionMultipleMessage = isReferenceCountDescriptionEnabled ? messages.deletionConfirmationModalDescriptionReferenceCount : descriptionMultiple;
320
324
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalHeader, {
321
325
  hasCloseButton: true
322
326
  }, /*#__PURE__*/React.createElement(ModalTitle, {
323
327
  appearance: "warning"
324
328
  }, hasNoReferenceOrFailToFetch ? formatMessage(titleSingle) : formatMessage(titleMultiple, {
325
- count: syncBlockCount
326
- }))), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Text, null, hasNoReferenceOrFailToFetch ? formatMessage(descriptionSingle) : formatMessage(descriptionMultiple, {
327
- syncBlockCount: syncBlockCount
329
+ count: totalLocationCount
330
+ }))), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Text, null, hasNoReferenceOrFailToFetch ? formatMessage(descriptionSingle) : formatMessage(descriptionMultipleMessage, {
331
+ syncBlockCount: descriptionLocationCount
328
332
  }))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
329
333
  appearance: "subtle",
330
334
  onClick: handleClick(false)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-synced-block",
3
- "version": "11.0.4",
3
+ "version": "11.0.5",
4
4
  "description": "SyncedBlock plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -113,6 +113,9 @@
113
113
  "platform_editor_blocks_patch_6": {
114
114
  "type": "boolean"
115
115
  },
116
+ "platform_editor_blocks_patch_7": {
117
+ "type": "boolean"
118
+ },
116
119
  "platform_synced_block_patch_13": {
117
120
  "type": "boolean"
118
121
  },