@atlaskit/editor-common 117.0.2 → 117.1.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-common
 
+## 117.1.1
+
+### Patch Changes
+
+- [`7167e21d35f98`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7167e21d35f98) -
+  Include the source block in synced location toolbar counts and explain the empty state in a
+  tooltip
+- [`66dd767196a39`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/66dd767196a39) -
+  Receive actingUserId and populate as required
+
+## 117.1.0
+
+### Minor Changes
+
+- [`bf4e41c29b4ea`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bf4e41c29b4ea) -
+  Add `migratedFrom` macro aliases for Connect-to-Forge rendering. Forge macro manifests can declare
+  `migratedFrom: ['legacy-connect-macro-key']`; consumers can use the new
+  `combineExtensionProviders(providers, { resolveExtension, resolvePreloadedExtension })` options to
+  resolve that alias before the normal provider lookup.
+
 ## 117.0.2
 
 ### Patch Changes

package/dist/cjs/extensions/combine-extension-providers.js

@@ -13,9 +13,12 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 /**
  * Allow to run methods from the `ExtensionProvider` interface across all providers seamlessly.
- * This handles promise racing and discards rejected promises safely.
+ * This handles optional explicit resolution, promise racing, and safely discarded rejections.
  */
 var _default = exports.default = function _default(extensionProviders) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    resolveExtension = _ref.resolveExtension,
+    resolvePreloadedExtension = _ref.resolvePreloadedExtension;
   var providersCache = [];
   var _combineProviders = (0, _providerHelpers.combineProviders)(extensionProviders),
     invokeSingle = _combineProviders.invokeSingle,
@@ -53,6 +56,10 @@ var _default = exports.default = function _default(extensionProviders) {
       }))();
     },
     getPreloadedExtension: function getPreloadedExtension(type, key) {
+      var resolvedExtension = resolvePreloadedExtension === null || resolvePreloadedExtension === void 0 ? void 0 : resolvePreloadedExtension(type, key);
+      if (resolvedExtension) {
+        return resolvedExtension;
+      }
       if (providersCache.length === 0) {
         // preload() has not been called yet
         return;
@@ -82,7 +89,28 @@ var _default = exports.default = function _default(extensionProviders) {
       }
     },
     getExtension: function getExtension(type, key) {
-      return invokeSingle('getExtension', [type, key]);
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var resolvedExtension;
+        return _regenerator.default.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 1;
+              return resolveExtension === null || resolveExtension === void 0 ? void 0 : resolveExtension(type, key);
+            case 1:
+              resolvedExtension = _context2.sent;
+              if (!resolvedExtension) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return", resolvedExtension);
+            case 2:
+              return _context2.abrupt("return", invokeSingle('getExtension', [type, key]));
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
     },
     search: function search(keyword) {
       return invokeList('search', [keyword]);

package/dist/cjs/messages/avatar-group.js

@@ -15,5 +15,10 @@ var avatarGroupMessages = exports.avatarGroupMessages = (0, _reactIntl.defineMes
     id: 'fabric.editor.anonymous-collaborator',
     defaultMessage: 'Anonymous collaborator',
     description: 'The name of an anonymous collaborator, used when the participant name is not specified'
+  },
+  agentWithUser: {
+    id: 'fabric.editor.agent-with-user',
+    defaultMessage: '{agentName} with {userName}',
+    description: 'Tooltip text for an agent avatar in the editor presence avatar group. The agentName placeholder is the AI agent display name. The userName placeholder is the display name of the user the agent is acting on behalf of.'
   }
 });

package/dist/cjs/messages/syncBlock.js

@@ -331,6 +331,11 @@ var syncBlockMessages = exports.syncBlockMessages = (0, _reactIntl.defineMessage
     defaultMessage: 'Loading synced locations',
     description: 'Accessible label for the spinner while synced locations are loading.'
   },
+  syncedLocationDropdownNoReferencesTooltip: {
+    id: 'editor-common.messages.syncBlock.syncedLocationDropdownNoReferencesTooltip.ai-non-final',
+    defaultMessage: 'Not yet synced to any other locations',
+    description: 'Tooltip for the synced locations toolbar button when the selected synced block has no references.'
+  },
   syncedLocationDropdownHeading: {
     id: 'fabric.editor.syncedLocationDropdownHeading',
     defaultMessage: '{count} locations:',

package/dist/cjs/monitoring/error.js

@@ -28,7 +28,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 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 = "117.0.1";
+var packageVersion = "117.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "117.0.1";
+var packageVersion = "117.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/extensions/combine-extension-providers.js

@@ -1,9 +1,12 @@
 import { combineProviders } from '../provider-helpers';
 /**
  * Allow to run methods from the `ExtensionProvider` interface across all providers seamlessly.
- * This handles promise racing and discards rejected promises safely.
+ * This handles optional explicit resolution, promise racing, and safely discarded rejections.
  */
-export default (extensionProviders => {
+export default ((extensionProviders, {
+  resolveExtension,
+  resolvePreloadedExtension
+} = {}) => {
   let providersCache = [];
   const {
     invokeSingle,
@@ -23,6 +26,10 @@ export default (extensionProviders => {
       }));
     },
     getPreloadedExtension(type, key) {
+      const resolvedExtension = resolvePreloadedExtension === null || resolvePreloadedExtension === void 0 ? void 0 : resolvePreloadedExtension(type, key);
+      if (resolvedExtension) {
+        return resolvedExtension;
+      }
       if (providersCache.length === 0) {
         // preload() has not been called yet
         return;
@@ -42,7 +49,11 @@ export default (extensionProviders => {
         }
       }
     },
-    getExtension(type, key) {
+    async getExtension(type, key) {
+      const resolvedExtension = await (resolveExtension === null || resolveExtension === void 0 ? void 0 : resolveExtension(type, key));
+      if (resolvedExtension) {
+        return resolvedExtension;
+      }
       return invokeSingle('getExtension', [type, key]);
     },
     search(keyword) {

package/dist/es2019/messages/avatar-group.js

@@ -9,5 +9,10 @@ export const avatarGroupMessages = defineMessages({
     id: 'fabric.editor.anonymous-collaborator',
     defaultMessage: 'Anonymous collaborator',
     description: 'The name of an anonymous collaborator, used when the participant name is not specified'
+  },
+  agentWithUser: {
+    id: 'fabric.editor.agent-with-user',
+    defaultMessage: '{agentName} with {userName}',
+    description: 'Tooltip text for an agent avatar in the editor presence avatar group. The agentName placeholder is the AI agent display name. The userName placeholder is the display name of the user the agent is acting on behalf of.'
   }
 });

package/dist/es2019/messages/syncBlock.js

@@ -325,6 +325,11 @@ export const syncBlockMessages = defineMessages({
     defaultMessage: 'Loading synced locations',
     description: 'Accessible label for the spinner while synced locations are loading.'
   },
+  syncedLocationDropdownNoReferencesTooltip: {
+    id: 'editor-common.messages.syncBlock.syncedLocationDropdownNoReferencesTooltip.ai-non-final',
+    defaultMessage: 'Not yet synced to any other locations',
+    description: 'Tooltip for the synced locations toolbar button when the selected synced block has no references.'
+  },
   syncedLocationDropdownHeading: {
     id: 'fabric.editor.syncedLocationDropdownHeading',
     defaultMessage: '{count} locations:',

package/dist/es2019/monitoring/error.js

@@ -14,7 +14,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 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 = "117.0.1";
+const packageVersion = "117.1.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "117.0.1";
+const packageVersion = "117.1.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/extensions/combine-extension-providers.js

@@ -6,9 +6,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { combineProviders } from '../provider-helpers';
 /**
  * Allow to run methods from the `ExtensionProvider` interface across all providers seamlessly.
- * This handles promise racing and discards rejected promises safely.
+ * This handles optional explicit resolution, promise racing, and safely discarded rejections.
  */
 export default (function (extensionProviders) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    resolveExtension = _ref.resolveExtension,
+    resolvePreloadedExtension = _ref.resolvePreloadedExtension;
   var providersCache = [];
   var _combineProviders = combineProviders(extensionProviders),
     invokeSingle = _combineProviders.invokeSingle,
@@ -46,6 +49,10 @@ export default (function (extensionProviders) {
       }))();
     },
     getPreloadedExtension: function getPreloadedExtension(type, key) {
+      var resolvedExtension = resolvePreloadedExtension === null || resolvePreloadedExtension === void 0 ? void 0 : resolvePreloadedExtension(type, key);
+      if (resolvedExtension) {
+        return resolvedExtension;
+      }
       if (providersCache.length === 0) {
         // preload() has not been called yet
         return;
@@ -75,7 +82,28 @@ export default (function (extensionProviders) {
       }
     },
     getExtension: function getExtension(type, key) {
-      return invokeSingle('getExtension', [type, key]);
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var resolvedExtension;
+        return _regeneratorRuntime.wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 1;
+              return resolveExtension === null || resolveExtension === void 0 ? void 0 : resolveExtension(type, key);
+            case 1:
+              resolvedExtension = _context2.sent;
+              if (!resolvedExtension) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return", resolvedExtension);
+            case 2:
+              return _context2.abrupt("return", invokeSingle('getExtension', [type, key]));
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
     },
     search: function search(keyword) {
       return invokeList('search', [keyword]);

package/dist/esm/messages/avatar-group.js

@@ -9,5 +9,10 @@ export var avatarGroupMessages = defineMessages({
     id: 'fabric.editor.anonymous-collaborator',
     defaultMessage: 'Anonymous collaborator',
     description: 'The name of an anonymous collaborator, used when the participant name is not specified'
+  },
+  agentWithUser: {
+    id: 'fabric.editor.agent-with-user',
+    defaultMessage: '{agentName} with {userName}',
+    description: 'Tooltip text for an agent avatar in the editor presence avatar group. The agentName placeholder is the AI agent display name. The userName placeholder is the display name of the user the agent is acting on behalf of.'
   }
 });

package/dist/esm/messages/syncBlock.js

@@ -325,6 +325,11 @@ export var syncBlockMessages = defineMessages({
     defaultMessage: 'Loading synced locations',
     description: 'Accessible label for the spinner while synced locations are loading.'
   },
+  syncedLocationDropdownNoReferencesTooltip: {
+    id: 'editor-common.messages.syncBlock.syncedLocationDropdownNoReferencesTooltip.ai-non-final',
+    defaultMessage: 'Not yet synced to any other locations',
+    description: 'Tooltip for the synced locations toolbar button when the selected synced block has no references.'
+  },
   syncedLocationDropdownHeading: {
     id: 'fabric.editor.syncedLocationDropdownHeading',
     defaultMessage: '{count} locations:',

package/dist/esm/monitoring/error.js

@@ -20,7 +20,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 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 = "117.0.1";
+var packageVersion = "117.1.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

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 = "117.0.1";
+var packageVersion = "117.1.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/types/collab/index.d.ts

@@ -376,6 +376,7 @@ type ProviderParticipantPermitLevel = {
     isPermittedToView?: boolean;
 };
 export interface CollabParticipant {
+    actingUserId?: string;
     avatar: string;
     cursorPos?: number;
     isGuest?: boolean;
@@ -386,6 +387,7 @@ export interface CollabParticipant {
     presenceActivity?: PresenceActivity;
     presenceId?: string;
     sessionId: string;
+    userId?: string;
 }
 export type ProviderParticipant = CollabParticipant & {
     clientId: number | string;

package/dist/types/extensions/combine-extension-providers.d.ts

@@ -1,7 +1,12 @@
+import type { ExtensionKey, ExtensionManifest, ExtensionType } from './types/extension-manifest';
 import type { ExtensionProvider } from './types/extension-provider';
+type CombineExtensionProvidersOptions = {
+    resolveExtension?: (type: ExtensionType, key: ExtensionKey) => Promise<ExtensionManifest | undefined>;
+    resolvePreloadedExtension?: (type: ExtensionType, key: ExtensionKey) => ExtensionManifest | undefined;
+};
 export default _default;
 /**
  * Allow to run methods from the `ExtensionProvider` interface across all providers seamlessly.
- * This handles promise racing and discards rejected promises safely.
+ * This handles optional explicit resolution, promise racing, and safely discarded rejections.
  */
-declare function _default(extensionProviders: (ExtensionProvider | Promise<ExtensionProvider>)[]): ExtensionProvider;
+declare function _default(extensionProviders: (ExtensionProvider | Promise<ExtensionProvider>)[], { resolveExtension, resolvePreloadedExtension }?: CombineExtensionProvidersOptions): ExtensionProvider;

package/dist/types/messages/avatar-group.d.ts

@@ -1,12 +1,17 @@
 export declare const avatarGroupMessages: {
-    editors: {
-        id: string;
+    agentWithUser: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
     anonymousCollaborator: {
+        defaultMessage: string;
+        description: string;
         id: string;
+    };
+    editors: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
 };

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

@@ -409,6 +409,11 @@ export declare const syncBlockMessages: {
         description: string;
         id: string;
     };
+    syncedLocationDropdownNoReferencesTooltip: {
+        defaultMessage: string;
+        description: string;
+        id: string;
+    };
     syncedLocationDropdownNoResults: {
         defaultMessage: string;
         description: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "117.0.2",
+	"version": "117.1.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"