@atlaskit/editor-common 110.41.5 → 110.41.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 110.41.6
+
+### Patch Changes
+
+- [`dcc6a3e73f414`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dcc6a3e73f414) -
+  [ux] EDITOR-3304 add offline error state for sync blocks and update other error UI to match new
+  designs
+
 ## 110.41.5
 
 ### Patch Changes
@@ -1982,8 +1990,6 @@
 
 ### Patch Changes
 
-- [`9383d1ef58fe1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9383d1ef58fe1) -
-  Cleanup feature gate cc_mention_ssr_placeholder
 - Updated dependencies
 
 ## 107.32.0

package/dist/cjs/messages/syncBlock.js

@@ -43,12 +43,12 @@ var syncBlockMessages = exports.syncBlockMessages = (0, _reactIntlNext.defineMes
   },
   permissionDeniedHeading: {
     id: 'fabric.editor.syncedBlockPermissionDeniedHeading',
-    defaultMessage: "You don't have permission to view this synced block",
+    defaultMessage: "Request access to view synced block",
     description: 'Heading for error state where the user does not have permission to view the synced block'
   },
   permissionDeniedDescription: {
     id: 'fabric.editor.syncedBlockPermissionDeniedDescription',
-    defaultMessage: "The source of this synced block is a content item you don't have access to.",
+    defaultMessage: "You don't have access to view the source content of this synced block.",
     description: 'Description for error state where the user does not have permission to view the synced block'
   },
   permissionDeniedAltText: {
@@ -163,14 +163,9 @@ var syncBlockMessages = exports.syncBlockMessages = (0, _reactIntlNext.defineMes
   },
   generalErrorDescription: {
     id: 'fabric.editor.syncedBlockGeneralErrorDescription',
-    defaultMessage: 'Something went wrong while loading this synced block.',
+    defaultMessage: "We're unable to display this content at the moment.",
     description: 'Description for general error state of the synced block'
   },
-  notFoundDescription: {
-    id: 'fabric.editor.syncedBlockNotFoundDescription',
-    defaultMessage: 'We’re unable to load this synced block.',
-    description: 'Description for error state where the synced block cannot be found or no longer exists'
-  },
   notFoundAltText: {
     id: 'fabric.editor.syncedBlockNotFoundIconAltText',
     defaultMessage: 'Synced block not found.',
@@ -178,7 +173,12 @@ var syncBlockMessages = exports.syncBlockMessages = (0, _reactIntlNext.defineMes
   },
   retryButton: {
     id: 'fabric.editor.retrySyncedBlock',
-    defaultMessage: 'Retry',
+    defaultMessage: 'Try again',
     description: 'Label for button which retries loading the synced block'
+  },
+  offlineError: {
+    id: 'fabric.editor.error.description.offline',
+    defaultMessage: "We're unable to display this content at the moment because you are offline.",
+    description: 'Error message which is shown over sync block when the editor is offline'
   }
 });

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "110.41.4";
+var packageVersion = "110.41.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/styles/shared/sync-block.js

@@ -8,7 +8,8 @@ var prefix = 'ak-editor-sync-block';
 var SyncBlockSharedCssClassName = exports.SyncBlockSharedCssClassName = {
   prefix: prefix,
   renderer: "".concat(prefix, "__renderer"),
-  error: "".concat(prefix, "__error_state")
+  error: "".concat(prefix, "__error_state"),
+  loading: "".concat(prefix, "__loading_state")
 };
 var bodiedPrefix = 'ak-editor-bodied-sync-block';
 var BodiedSyncBlockSharedCssClassName = exports.BodiedSyncBlockSharedCssClassName = {

package/dist/cjs/transforms/sync-block.js

@@ -23,24 +23,14 @@ var transformSyncBlockNode = function transformSyncBlockNode(node, schema, isFro
   });
   return schema.nodes.syncBlock.create(newAttrs, null, (0, _toConsumableArray2.default)(node.marks));
 };
-var transformBodiedSyncBlockNode = function transformBodiedSyncBlockNode(node, schema, isFromEditor) {
+var transformBodiedSyncBlockNode = function transformBodiedSyncBlockNode(node, isFromEditor) {
   // if copying from renderer, flatten out the content and remove the bodied sync block
   if (!isFromEditor) {
     return node.content;
   }
 
-  // bodied sync blocks need a unique localId and convert to a reference sync block
-  // when converting we want to be specific about attributes and marks we carry over
-  var newAttrs = {
-    resourceId: node.attrs.resourceId,
-    localId: _adfSchema.uuid.generate()
-  };
-  var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
-    var _schema$nodes$syncBlo;
-    return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
-  }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
-
-  return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+  // this is not possible.
+  return node;
 };
 
 /**
@@ -53,7 +43,7 @@ var transformSyncBlock = exports.transformSyncBlock = function transformSyncBloc
     if (node.type === schema.nodes.syncBlock) {
       return transformSyncBlockNode(node, schema, isFromEditor);
     } else if (node.type === schema.nodes.bodiedSyncBlock) {
-      return transformBodiedSyncBlockNode(node, schema, isFromEditor);
+      return transformBodiedSyncBlockNode(node, isFromEditor);
     }
     return node;
   });

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.41.4";
+var packageVersion = "110.41.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/messages/syncBlock.js

@@ -37,12 +37,12 @@ export const syncBlockMessages = defineMessages({
   },
   permissionDeniedHeading: {
     id: 'fabric.editor.syncedBlockPermissionDeniedHeading',
-    defaultMessage: "You don't have permission to view this synced block",
+    defaultMessage: "Request access to view synced block",
     description: 'Heading for error state where the user does not have permission to view the synced block'
   },
   permissionDeniedDescription: {
     id: 'fabric.editor.syncedBlockPermissionDeniedDescription',
-    defaultMessage: "The source of this synced block is a content item you don't have access to.",
+    defaultMessage: "You don't have access to view the source content of this synced block.",
     description: 'Description for error state where the user does not have permission to view the synced block'
   },
   permissionDeniedAltText: {
@@ -157,14 +157,9 @@ export const syncBlockMessages = defineMessages({
   },
   generalErrorDescription: {
     id: 'fabric.editor.syncedBlockGeneralErrorDescription',
-    defaultMessage: 'Something went wrong while loading this synced block.',
+    defaultMessage: `We're unable to display this content at the moment.`,
     description: 'Description for general error state of the synced block'
   },
-  notFoundDescription: {
-    id: 'fabric.editor.syncedBlockNotFoundDescription',
-    defaultMessage: 'We’re unable to load this synced block.',
-    description: 'Description for error state where the synced block cannot be found or no longer exists'
-  },
   notFoundAltText: {
     id: 'fabric.editor.syncedBlockNotFoundIconAltText',
     defaultMessage: 'Synced block not found.',
@@ -172,7 +167,12 @@ export const syncBlockMessages = defineMessages({
   },
   retryButton: {
     id: 'fabric.editor.retrySyncedBlock',
-    defaultMessage: 'Retry',
+    defaultMessage: 'Try again',
     description: 'Label for button which retries loading the synced block'
+  },
+  offlineError: {
+    id: 'fabric.editor.error.description.offline',
+    defaultMessage: `We're unable to display this content at the moment because you are offline.`,
+    description: 'Error message which is shown over sync block when the editor is offline'
   }
 });

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "110.41.4";
+const packageVersion = "110.41.5";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/styles/shared/sync-block.js

@@ -2,7 +2,8 @@ const prefix = 'ak-editor-sync-block';
 export const SyncBlockSharedCssClassName = {
   prefix,
   renderer: `${prefix}__renderer`,
-  error: `${prefix}__error_state`
+  error: `${prefix}__error_state`,
+  loading: `${prefix}__loading_state`
 };
 const bodiedPrefix = 'ak-editor-bodied-sync-block';
 export const BodiedSyncBlockSharedCssClassName = {

package/dist/es2019/transforms/sync-block.js

@@ -13,24 +13,14 @@ const transformSyncBlockNode = (node, schema, isFromEditor) => {
   };
   return schema.nodes.syncBlock.create(newAttrs, null, [...node.marks]);
 };
-const transformBodiedSyncBlockNode = (node, schema, isFromEditor) => {
+const transformBodiedSyncBlockNode = (node, isFromEditor) => {
   // if copying from renderer, flatten out the content and remove the bodied sync block
   if (!isFromEditor) {
     return node.content;
   }
 
-  // bodied sync blocks need a unique localId and convert to a reference sync block
-  // when converting we want to be specific about attributes and marks we carry over
-  const newAttrs = {
-    resourceId: node.attrs.resourceId,
-    localId: uuid.generate()
-  };
-  const newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(mark => {
-    var _schema$nodes$syncBlo;
-    return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
-  }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
-
-  return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+  // this is not possible.
+  return node;
 };
 
 /**
@@ -43,7 +33,7 @@ export const transformSyncBlock = (slice, schema, pasteSource) => {
     if (node.type === schema.nodes.syncBlock) {
       return transformSyncBlockNode(node, schema, isFromEditor);
     } else if (node.type === schema.nodes.bodiedSyncBlock) {
-      return transformBodiedSyncBlockNode(node, schema, isFromEditor);
+      return transformBodiedSyncBlockNode(node, isFromEditor);
     }
     return node;
   });

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "110.41.4";
+const packageVersion = "110.41.5";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/messages/syncBlock.js

@@ -37,12 +37,12 @@ export var syncBlockMessages = defineMessages({
   },
   permissionDeniedHeading: {
     id: 'fabric.editor.syncedBlockPermissionDeniedHeading',
-    defaultMessage: "You don't have permission to view this synced block",
+    defaultMessage: "Request access to view synced block",
     description: 'Heading for error state where the user does not have permission to view the synced block'
   },
   permissionDeniedDescription: {
     id: 'fabric.editor.syncedBlockPermissionDeniedDescription',
-    defaultMessage: "The source of this synced block is a content item you don't have access to.",
+    defaultMessage: "You don't have access to view the source content of this synced block.",
     description: 'Description for error state where the user does not have permission to view the synced block'
   },
   permissionDeniedAltText: {
@@ -157,14 +157,9 @@ export var syncBlockMessages = defineMessages({
   },
   generalErrorDescription: {
     id: 'fabric.editor.syncedBlockGeneralErrorDescription',
-    defaultMessage: 'Something went wrong while loading this synced block.',
+    defaultMessage: "We're unable to display this content at the moment.",
     description: 'Description for general error state of the synced block'
   },
-  notFoundDescription: {
-    id: 'fabric.editor.syncedBlockNotFoundDescription',
-    defaultMessage: 'We’re unable to load this synced block.',
-    description: 'Description for error state where the synced block cannot be found or no longer exists'
-  },
   notFoundAltText: {
     id: 'fabric.editor.syncedBlockNotFoundIconAltText',
     defaultMessage: 'Synced block not found.',
@@ -172,7 +167,12 @@ export var syncBlockMessages = defineMessages({
   },
   retryButton: {
     id: 'fabric.editor.retrySyncedBlock',
-    defaultMessage: 'Retry',
+    defaultMessage: 'Try again',
     description: 'Label for button which retries loading the synced block'
+  },
+  offlineError: {
+    id: 'fabric.editor.error.description.offline',
+    defaultMessage: "We're unable to display this content at the moment because you are offline.",
+    description: 'Error message which is shown over sync block when the editor is offline'
   }
 });

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "110.41.4";
+var packageVersion = "110.41.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/styles/shared/sync-block.js

@@ -2,7 +2,8 @@ var prefix = 'ak-editor-sync-block';
 export var SyncBlockSharedCssClassName = {
   prefix: prefix,
   renderer: "".concat(prefix, "__renderer"),
-  error: "".concat(prefix, "__error_state")
+  error: "".concat(prefix, "__error_state"),
+  loading: "".concat(prefix, "__loading_state")
 };
 var bodiedPrefix = 'ak-editor-bodied-sync-block';
 export var BodiedSyncBlockSharedCssClassName = {

package/dist/esm/transforms/sync-block.js

@@ -16,24 +16,14 @@ var transformSyncBlockNode = function transformSyncBlockNode(node, schema, isFro
   });
   return schema.nodes.syncBlock.create(newAttrs, null, _toConsumableArray(node.marks));
 };
-var transformBodiedSyncBlockNode = function transformBodiedSyncBlockNode(node, schema, isFromEditor) {
+var transformBodiedSyncBlockNode = function transformBodiedSyncBlockNode(node, isFromEditor) {
   // if copying from renderer, flatten out the content and remove the bodied sync block
   if (!isFromEditor) {
     return node.content;
   }
 
-  // bodied sync blocks need a unique localId and convert to a reference sync block
-  // when converting we want to be specific about attributes and marks we carry over
-  var newAttrs = {
-    resourceId: node.attrs.resourceId,
-    localId: uuid.generate()
-  };
-  var newMarks = schema.nodes.syncBlock.markSet ? node.marks.filter(function (mark) {
-    var _schema$nodes$syncBlo;
-    return (_schema$nodes$syncBlo = schema.nodes.syncBlock.markSet) === null || _schema$nodes$syncBlo === void 0 ? void 0 : _schema$nodes$syncBlo.includes(mark.type);
-  }) : node.marks; // schema.nodes.syncBlock.markSet is null meaning all marks are allowed
-
-  return schema.nodes.syncBlock.create(newAttrs, null, newMarks);
+  // this is not possible.
+  return node;
 };
 
 /**
@@ -46,7 +36,7 @@ export var transformSyncBlock = function transformSyncBlock(slice, schema, paste
     if (node.type === schema.nodes.syncBlock) {
       return transformSyncBlockNode(node, schema, isFromEditor);
     } else if (node.type === schema.nodes.bodiedSyncBlock) {
-      return transformBodiedSyncBlockNode(node, schema, isFromEditor);
+      return transformBodiedSyncBlockNode(node, isFromEditor);
     }
     return node;
   });

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "110.41.4";
+var packageVersion = "110.41.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/types/messages/syncBlock.d.ts

@@ -159,17 +159,17 @@ export declare const syncBlockMessages: {
         defaultMessage: string;
         description: string;
     };
-    notFoundDescription: {
+    notFoundAltText: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    notFoundAltText: {
+    retryButton: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    retryButton: {
+    offlineError: {
         id: string;
         defaultMessage: string;
         description: string;

package/dist/types/styles/shared/sync-block.d.ts

@@ -2,6 +2,7 @@ export declare const SyncBlockSharedCssClassName: {
     prefix: string;
     renderer: string;
     error: string;
+    loading: string;
 };
 export declare const BodiedSyncBlockSharedCssClassName: {
     prefix: string;

package/dist/types-ts4.5/messages/syncBlock.d.ts

@@ -159,17 +159,17 @@ export declare const syncBlockMessages: {
         defaultMessage: string;
         description: string;
     };
-    notFoundDescription: {
+    notFoundAltText: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    notFoundAltText: {
+    retryButton: {
         id: string;
         defaultMessage: string;
         description: string;
     };
-    retryButton: {
+    offlineError: {
         id: string;
         defaultMessage: string;
         description: string;

package/dist/types-ts4.5/styles/shared/sync-block.d.ts

@@ -2,6 +2,7 @@ export declare const SyncBlockSharedCssClassName: {
     prefix: string;
     renderer: string;
     error: string;
+    loading: string;
 };
 export declare const BodiedSyncBlockSharedCssClassName: {
     prefix: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "110.41.5",
+	"version": "110.41.6",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -56,7 +56,7 @@
 		"@atlaskit/link-datasource": "^4.30.0",
 		"@atlaskit/link-picker": "^4.1.0",
 		"@atlaskit/media-card": "^79.9.0",
-		"@atlaskit/media-client": "^35.6.0",
+		"@atlaskit/media-client": "^35.7.0",
 		"@atlaskit/media-client-react": "^4.1.0",
 		"@atlaskit/media-common": "^12.3.0",
 		"@atlaskit/media-file-preview": "^0.15.0",