@atlaskit/editor-plugin-hyperlink 0.5.5 → 0.5.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 0.5.7
+
+### Patch Changes
+
+- [#43379](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43379) [`482c025520d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/482c025520d) - ED-20763 Upgrade ADF schema version to 33.2.3 for MBE nodes.
+- Updated dependencies
+
+## 0.5.6
+
+### Patch Changes
+
+- [#42848](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42848) [`f2f8428f703`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f2f8428f703) - Abandons feature flag lp-link-picker-focus-trap as it was not successfully rolled out. Will re-introduce as platform feature flag as/when necessary.
+
 ## 0.5.5
 
 ### Patch Changes

package/dist/cjs/Toolbar.js

@@ -115,14 +115,8 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
     var formatMessage = intl.formatMessage;
     var linkState = _main.stateKey.getState(state);
     var editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
-
-    /**
-     * Enable focus trap only if feature flag is enabled AND for the new version of the picker
-     */
     var lpLinkPicker = featureFlags.lpLinkPicker,
-      lpLinkPickerFocusTrap = featureFlags.lpLinkPickerFocusTrap,
       preventPopupOverflow = featureFlags.preventPopupOverflow;
-    var shouldEnableFocusTrap = Boolean(lpLinkPicker && lpLinkPickerFocusTrap);
     if (linkState && linkState.activeLinkMark) {
       var activeLinkMark = linkState.activeLinkMark;
       var hyperLinkToolbar = {
@@ -223,7 +217,6 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
               preventPopupOverflow: preventPopupOverflow,
               height: popupHeight,
               width: _ui.RECENT_SEARCH_WIDTH_IN_PX,
-              focusTrap: shouldEnableFocusTrap,
               items: [{
                 type: 'custom',
                 fallback: [],
@@ -244,9 +237,6 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                     onCancel: function onCancel() {
                       return view.focus();
                     },
-                    onClose: lpLinkPickerFocusTrap ? function () {
-                      return view.focus();
-                    } : undefined,
                     onEscapeCallback: _commands.onEscapeCallback,
                     onClickAwayCallback: _commands.onClickAwayCallback,
                     onSubmit: function onSubmit(href) {
@@ -263,9 +253,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                         sourceEvent: analytic
                       }) : (0, _commands.insertLinkWithAnalytics)(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider), analytic);
                       command(view.state, view.dispatch, view);
-                      if (!lpLinkPickerFocusTrap) {
-                        view.focus();
-                      }
+                      view.focus();
                     }
                   });
                 }

package/dist/es2019/Toolbar.js

@@ -103,16 +103,10 @@ export const getToolbarConfig = (options, featureFlags, pluginInjectionApi) => (
   } = intl;
   const linkState = stateKey.getState(state);
   const editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
-
-  /**
-   * Enable focus trap only if feature flag is enabled AND for the new version of the picker
-   */
   const {
     lpLinkPicker,
-    lpLinkPickerFocusTrap,
     preventPopupOverflow
   } = featureFlags;
-  const shouldEnableFocusTrap = Boolean(lpLinkPicker && lpLinkPickerFocusTrap);
   if (linkState && linkState.activeLinkMark) {
     const {
       activeLinkMark
@@ -213,7 +207,6 @@ export const getToolbarConfig = (options, featureFlags, pluginInjectionApi) => (
             preventPopupOverflow,
             height: popupHeight,
             width: RECENT_SEARCH_WIDTH_IN_PX,
-            focusTrap: shouldEnableFocusTrap,
             items: [{
               type: 'custom',
               fallback: [],
@@ -232,7 +225,6 @@ export const getToolbarConfig = (options, featureFlags, pluginInjectionApi) => (
                   displayText: displayText || '',
                   providerFactory: providerFactory,
                   onCancel: () => view.focus(),
-                  onClose: lpLinkPickerFocusTrap ? () => view.focus() : undefined,
                   onEscapeCallback: onEscapeCallback,
                   onClickAwayCallback: onClickAwayCallback,
                   onSubmit: (href, title = '', displayText, inputMethod, analytic) => {
@@ -245,9 +237,7 @@ export const getToolbarConfig = (options, featureFlags, pluginInjectionApi) => (
                       sourceEvent: analytic
                     }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider), analytic);
                     command(view.state, view.dispatch, view);
-                    if (!lpLinkPickerFocusTrap) {
-                      view.focus();
-                    }
+                    view.focus();
                   }
                 });
               }

package/dist/esm/Toolbar.js

@@ -107,14 +107,8 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, p
     var formatMessage = intl.formatMessage;
     var linkState = stateKey.getState(state);
     var editorAnalyticsApi = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions;
-
-    /**
-     * Enable focus trap only if feature flag is enabled AND for the new version of the picker
-     */
     var lpLinkPicker = featureFlags.lpLinkPicker,
-      lpLinkPickerFocusTrap = featureFlags.lpLinkPickerFocusTrap,
       preventPopupOverflow = featureFlags.preventPopupOverflow;
-    var shouldEnableFocusTrap = Boolean(lpLinkPicker && lpLinkPickerFocusTrap);
     if (linkState && linkState.activeLinkMark) {
       var activeLinkMark = linkState.activeLinkMark;
       var hyperLinkToolbar = {
@@ -215,7 +209,6 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, p
               preventPopupOverflow: preventPopupOverflow,
               height: popupHeight,
               width: RECENT_SEARCH_WIDTH_IN_PX,
-              focusTrap: shouldEnableFocusTrap,
               items: [{
                 type: 'custom',
                 fallback: [],
@@ -236,9 +229,6 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, p
                     onCancel: function onCancel() {
                       return view.focus();
                     },
-                    onClose: lpLinkPickerFocusTrap ? function () {
-                      return view.focus();
-                    } : undefined,
                     onEscapeCallback: onEscapeCallback,
                     onClickAwayCallback: onClickAwayCallback,
                     onSubmit: function onSubmit(href) {
@@ -255,9 +245,7 @@ export var getToolbarConfig = function getToolbarConfig(options, featureFlags, p
                         sourceEvent: analytic
                       }) : insertLinkWithAnalytics(inputMethod, activeLinkMark.from, activeLinkMark.to, href, editorAnalyticsApi, title, displayText, !!(options !== null && options !== void 0 && (_options$cardOptions = options.cardOptions) !== null && _options$cardOptions !== void 0 && _options$cardOptions.provider), analytic);
                       command(view.state, view.dispatch, view);
-                      if (!lpLinkPickerFocusTrap) {
-                        view.focus();
-                      }
+                      view.focus();
                     }
                   });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-hyperlink",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "Hyperlink plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -31,9 +31,9 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^32.0.0",
+    "@atlaskit/adf-schema": "^33.2.3",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^76.18.0",
+    "@atlaskit/editor-common": "^76.22.0",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "1.1.0",