@atlaskit/editor-common 117.0.1 → 117.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-common
 
+## 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
+
+- [`72f7cec91a1d4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/72f7cec91a1d4) -
+  Remove the `platform_editor_block_menu_v2_patch_4` feature flag. Block menu local-id lookups now
+  always scope the query to the provided container.
+- Updated dependencies
+
 ## 117.0.1
 
 ### Patch Changes

package/dist/cjs/block-menu/getLocalIdSelector.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLocalIdSelector = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var getLocalIdSelector = exports.getLocalIdSelector = function getLocalIdSelector(localId, container) {
   // Check if the element with data-local-id exists
   var element = container.querySelector("[data-local-id=\"".concat(localId, "\"]"));
@@ -25,10 +24,8 @@ var getLocalIdSelector = exports.getLocalIdSelector = function getLocalIdSelecto
   // Special case for tables which use data-table-local-id
   element = container.querySelector("[data-table-local-id=\"".concat(localId, "\"]"));
   if (element) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_4')) {
-      return element.parentElement; // return table wrapper instead of table div, so the height calculation is correct
-    }
-    return element;
+    // return table wrapper instead of table div, so the height calculation is correct
+    return element.parentElement;
   }
 
   // Special case for extension, smart cards and media which use lowercase localid

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

package/dist/es2019/block-menu/getLocalIdSelector.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 export const getLocalIdSelector = (localId, container) => {
   // Check if the element with data-local-id exists
   let element = container.querySelector(`[data-local-id="${localId}"]`);
@@ -19,10 +18,8 @@ export const getLocalIdSelector = (localId, container) => {
   // Special case for tables which use data-table-local-id
   element = container.querySelector(`[data-table-local-id="${localId}"]`);
   if (element) {
-    if (fg('platform_editor_block_menu_v2_patch_4')) {
-      return element.parentElement; // return table wrapper instead of table div, so the height calculation is correct
-    }
-    return element;
+    // return table wrapper instead of table div, so the height calculation is correct
+    return element.parentElement;
   }
 
   // Special case for extension, smart cards and media which use lowercase localid

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

package/dist/esm/block-menu/getLocalIdSelector.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 export var getLocalIdSelector = function getLocalIdSelector(localId, container) {
   // Check if the element with data-local-id exists
   var element = container.querySelector("[data-local-id=\"".concat(localId, "\"]"));
@@ -19,10 +18,8 @@ export var getLocalIdSelector = function getLocalIdSelector(localId, container)
   // Special case for tables which use data-table-local-id
   element = container.querySelector("[data-table-local-id=\"".concat(localId, "\"]"));
   if (element) {
-    if (fg('platform_editor_block_menu_v2_patch_4')) {
-      return element.parentElement; // return table wrapper instead of table div, so the height calculation is correct
-    }
-    return element;
+    // return table wrapper instead of table div, so the height calculation is correct
+    return element.parentElement;
   }
 
   // Special case for extension, smart cards and media which use lowercase localid

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

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "117.0.1",
+	"version": "117.1.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -70,20 +70,20 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/platform-feature-flags-react": "^1.1.0",
-		"@atlaskit/popper": "^8.5.0",
+		"@atlaskit/popper": "^9.0.0",
 		"@atlaskit/primitives": "^22.2.0",
 		"@atlaskit/profilecard": "^26.14.0",
 		"@atlaskit/prosemirror-history": "^1.1.0",
 		"@atlaskit/react-compiler-gating": "^0.2.0",
 		"@atlaskit/react-ufo": "^7.3.0",
-		"@atlaskit/section-message": "^9.2.0",
-		"@atlaskit/smart-card": "^45.16.0",
+		"@atlaskit/section-message": "^10.0.0",
+		"@atlaskit/smart-card": "^45.17.0",
 		"@atlaskit/smart-user-picker": "^11.3.0",
 		"@atlaskit/spinner": "^20.1.0",
 		"@atlaskit/task-decision": "^21.8.0",
 		"@atlaskit/teams-app-config": "^2.1.0",
-		"@atlaskit/textfield": "^9.1.0",
-		"@atlaskit/tmp-editor-statsig": "^138.0.0",
+		"@atlaskit/textfield": "^10.0.0",
+		"@atlaskit/tmp-editor-statsig": "^139.0.0",
 		"@atlaskit/tokens": "^16.3.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@atlaskit/width-detector": "^6.2.0",
@@ -232,9 +232,6 @@
 		"platform_editor_native_anchor_patch_3": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_v2_patch_4": {
-			"type": "boolean"
-		},
 		"jim-lower-ranking-in-jira-macro-search": {
 			"type": "boolean"
 		},