@atlaskit/editor-plugin-hyperlink 0.5.4 → 0.5.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 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
+
+- [#42680](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42680) [`1174ff1745b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1174ff1745b) - Cleans up ff platform.linking-platform.editor.fix-link-insert-analytics. No expected functional changes.
+
 ## 0.5.4
 
 ### 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/cjs/commands.js

@@ -20,7 +20,6 @@ var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _link = require("@atlaskit/editor-common/link");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _main = require("./pm-plugins/main");
 var _toolbarButtons = require("./pm-plugins/toolbar-buttons");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -125,7 +124,7 @@ function insertLink(from, to, incomingHref, incomingTitle, displayText, source,
             sourceEvent: sourceEvent
           });
         }
-      } else if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.editor.fix-link-insert-analytics')) {
+      } else {
         /**
          * Add link metadata because queue cards would have otherwise handled this for us
          */

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/es2019/commands.js

@@ -4,7 +4,6 @@ import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
 import { filterCommand as filter, getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { stateKey } from './pm-plugins/main';
 import { toolbarKey } from './pm-plugins/toolbar-buttons';
 export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
@@ -111,7 +110,7 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
             sourceEvent
           });
         }
-      } else if (getBooleanFF('platform.linking-platform.editor.fix-link-insert-analytics')) {
+      } else {
         /**
          * Add link metadata because queue cards would have otherwise handled this for us
          */

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/dist/esm/commands.js

@@ -7,7 +7,6 @@ import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { isTextAtPos, LinkAction } from '@atlaskit/editor-common/link';
 import { filterCommand as filter, getLinkCreationAnalyticsEvent, normalizeUrl } from '@atlaskit/editor-common/utils';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { stateKey } from './pm-plugins/main';
 import { toolbarKey } from './pm-plugins/toolbar-buttons';
 export function setLinkHref(href, pos, editorAnalyticsApi, to, isTabPressed) {
@@ -110,7 +109,7 @@ export function insertLink(from, to, incomingHref, incomingTitle, displayText, s
             sourceEvent: sourceEvent
           });
         }
-      } else if (getBooleanFF('platform.linking-platform.editor.fix-link-insert-analytics')) {
+      } else {
         /**
          * Add link metadata because queue cards would have otherwise handled this for us
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-hyperlink",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Hyperlink plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,12 +33,11 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^32.0.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^76.17.0",
+    "@atlaskit/editor-common": "^76.18.0",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/icon": "^21.12.0",
-    "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/prosemirror-input-rules": "^2.4.0",
     "@babel/runtime": "^7.0.0",
     "uuid": "^3.1.0"
@@ -95,9 +94,5 @@
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
-  "platform-feature-flags": {
-    "platform.linking-platform.editor.fix-link-insert-analytics": {
-      "type": "boolean"
-    }
-  }
+  "platform-feature-flags": {}
 }