@atlaskit/editor-plugin-hyperlink 6.0.2 → 6.0.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-hyperlink
 
+## 6.0.4
+
+### Patch Changes
+
+- [`a8630c1107c3d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a8630c1107c3d) -
+  [ED-28781] Hide inline text toolbar when other popups are open
+- Updated dependencies
+
+## 6.0.3
+
+### Patch Changes
+
+- [`db97eb262cc5a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/db97eb262cc5a) -
+  replace platform_editor_toolbar_aifc with separate experiements for jira and confluence
+- Updated dependencies
+
 ## 6.0.2
 
 ### Patch Changes

package/dist/cjs/hyperlinkPlugin.js

@@ -17,7 +17,6 @@ var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _utils = require("@atlaskit/editor-common/utils");
 var _linkEditorLink = _interopRequireDefault(require("@atlaskit/icon/core/migration/link--editor-link"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./editor-commands/commands");
 var _fakeCursorForToolbar = _interopRequireDefault(require("./pm-plugins/fake-cursor-for-toolbar"));
@@ -52,7 +51,10 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
   var primaryToolbarComponent;
-  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+  var isToolbarAIFCEnabled = (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true, {
+    exposure: true
+  });
+  if (isToolbarAIFCEnabled) {
     var _api$toolbar;
     api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents((0, _toolbarComponents.getToolbarComponents)(api));
   }
@@ -183,7 +185,7 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         }];
       },
       floatingToolbar: (0, _Toolbar.getToolbarConfig)(options, api)
-    }, !(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true) && {
+    }, !isToolbarAIFCEnabled && {
       selectionToolbar: function selectionToolbar(state, _ref5) {
         var _api$userPreferences, _api$selectionToolbar;
         var formatMessage = _ref5.formatMessage;
@@ -220,7 +222,7 @@ var hyperlinkPlugin = exports.hyperlinkPlugin = function hyperlinkPlugin(_ref) {
           return undefined;
         }
       }
-    }), !(0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true) && {
+    }), !isToolbarAIFCEnabled && {
       primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
         exposure: true
       }) ? primaryToolbarComponent : undefined

package/dist/cjs/ui/toolbar/Toolbar.js

@@ -18,6 +18,7 @@ var _link2 = require("@atlaskit/editor-common/link");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
+var _userIntent = require("@atlaskit/editor-common/user-intent");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
@@ -25,6 +26,7 @@ var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
 var _linkBrokenEditorUnlink = _interopRequireDefault(require("@atlaskit/icon/core/migration/link-broken--editor-unlink"));
 var _linkExternalShortcut = _interopRequireDefault(require("@atlaskit/icon/core/migration/link-external--shortcut"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../../editor-commands/commands");
 var _main = require("../../pm-plugins/main");
@@ -260,7 +262,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                   if (!view) {
                     return null;
                   }
-                  return /*#__PURE__*/_react.default.createElement(HyperlinkAddToolbarWithState, {
+                  var Toolbar = /*#__PURE__*/_react.default.createElement(HyperlinkAddToolbarWithState, {
                     pluginInjectionApi: pluginInjectionApi,
                     view: view,
                     key: idx,
@@ -292,6 +294,9 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(opti
                       view.focus();
                     }
                   });
+                  return (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? /*#__PURE__*/_react.default.createElement(_userIntent.UserIntentPopupWrapper, {
+                    api: pluginInjectionApi
+                  }, Toolbar) : Toolbar;
                 }
               }]
             });

package/dist/es2019/hyperlinkPlugin.js

@@ -9,7 +9,6 @@ import { IconLink } from '@atlaskit/editor-common/quick-insert';
 import { canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import LinkIcon from '@atlaskit/icon/core/migration/link--editor-link';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideLinkToolbarSetMeta, insertLinkWithAnalytics, removeLinkEditorCommand, showLinkToolbar, updateLink, updateLinkEditorCommand } from './editor-commands/commands';
 import fakeCursorToolbarPlugin from './pm-plugins/fake-cursor-for-toolbar';
@@ -42,7 +41,10 @@ export const hyperlinkPlugin = ({
   api
 }) => {
   let primaryToolbarComponent;
-  if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+  const isToolbarAIFCEnabled = editorExperiment('platform_editor_toolbar_aifc', true, {
+    exposure: true
+  });
+  if (isToolbarAIFCEnabled) {
     var _api$toolbar;
     api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.registerComponents(getToolbarComponents(api));
   }
@@ -160,7 +162,7 @@ export const hyperlinkPlugin = ({
         }
       }],
       floatingToolbar: getToolbarConfig(options, api),
-      ...(!expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true) && {
+      ...(!isToolbarAIFCEnabled && {
         selectionToolbar: (state, {
           formatMessage
         }) => {
@@ -200,7 +202,7 @@ export const hyperlinkPlugin = ({
           }
         }
       }),
-      ...(!expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true) && {
+      ...(!isToolbarAIFCEnabled && {
         primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && editorExperiment('platform_editor_controls', 'variant1', {
           exposure: true
         }) ? primaryToolbarComponent : undefined

package/dist/es2019/ui/toolbar/Toolbar.js

@@ -7,6 +7,7 @@ import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link';
 import { linkMessages, linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
@@ -14,6 +15,7 @@ import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/migration/link-broken--editor-unlink';
 import LinkExternalIcon from '@atlaskit/icon/core/migration/link-external--shortcut';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { editInsertedLink, insertLinkWithAnalytics, onClickAwayCallback, onEscapeCallback, removeLink, updateLink } from '../../editor-commands/commands';
 import { stateKey } from '../../pm-plugins/main';
@@ -245,7 +247,7 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
                 if (!view) {
                   return null;
                 }
-                return /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
+                const Toolbar = /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
                   pluginInjectionApi: pluginInjectionApi,
                   view: view,
                   key: idx,
@@ -271,6 +273,9 @@ export const getToolbarConfig = (options, pluginInjectionApi) => (state, intl, p
                     view.focus();
                   }
                 });
+                return editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? /*#__PURE__*/React.createElement(UserIntentPopupWrapper, {
+                  api: pluginInjectionApi
+                }, Toolbar) : Toolbar;
               }
             }]
           };

package/dist/esm/hyperlinkPlugin.js

@@ -12,7 +12,6 @@ import { IconLink } from '@atlaskit/editor-common/quick-insert';
 import { canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import LinkIcon from '@atlaskit/icon/core/migration/link--editor-link';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { hideLinkToolbarSetMeta, insertLinkWithAnalytics, removeLinkEditorCommand, showLinkToolbar as _showLinkToolbar, updateLink, updateLinkEditorCommand } from './editor-commands/commands';
 import fakeCursorToolbarPlugin from './pm-plugins/fake-cursor-for-toolbar';
@@ -45,7 +44,10 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
   var primaryToolbarComponent;
-  if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+  var isToolbarAIFCEnabled = editorExperiment('platform_editor_toolbar_aifc', true, {
+    exposure: true
+  });
+  if (isToolbarAIFCEnabled) {
     var _api$toolbar;
     api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 || _api$toolbar.actions.registerComponents(getToolbarComponents(api));
   }
@@ -176,7 +178,7 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
         }];
       },
       floatingToolbar: getToolbarConfig(options, api)
-    }, !expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true) && {
+    }, !isToolbarAIFCEnabled && {
       selectionToolbar: function selectionToolbar(state, _ref5) {
         var _api$userPreferences, _api$selectionToolbar;
         var formatMessage = _ref5.formatMessage;
@@ -213,7 +215,7 @@ export var hyperlinkPlugin = function hyperlinkPlugin(_ref) {
           return undefined;
         }
       }
-    }), !expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true) && {
+    }), !isToolbarAIFCEnabled && {
       primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && editorExperiment('platform_editor_controls', 'variant1', {
         exposure: true
       }) ? primaryToolbarComponent : undefined

package/dist/esm/ui/toolbar/Toolbar.js

@@ -11,6 +11,7 @@ import { HyperlinkAddToolbar } from '@atlaskit/editor-common/link';
 import { linkMessages, linkToolbarMessages as linkToolbarCommonMessages } from '@atlaskit/editor-common/messages';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { LINKPICKER_HEIGHT_IN_PX, RECENT_SEARCH_HEIGHT_IN_PX, RECENT_SEARCH_WIDTH_IN_PX } from '@atlaskit/editor-common/ui';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
@@ -18,6 +19,7 @@ import EditIcon from '@atlaskit/icon/core/edit';
 import LinkBrokenIcon from '@atlaskit/icon/core/migration/link-broken--editor-unlink';
 import LinkExternalIcon from '@atlaskit/icon/core/migration/link-external--shortcut';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { editInsertedLink, insertLinkWithAnalytics, onClickAwayCallback, onEscapeCallback, removeLink, updateLink } from '../../editor-commands/commands';
 import { stateKey } from '../../pm-plugins/main';
@@ -251,7 +253,7 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
                   if (!view) {
                     return null;
                   }
-                  return /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
+                  var Toolbar = /*#__PURE__*/React.createElement(HyperlinkAddToolbarWithState, {
                     pluginInjectionApi: pluginInjectionApi,
                     view: view,
                     key: idx,
@@ -283,6 +285,9 @@ export var getToolbarConfig = function getToolbarConfig(options, pluginInjection
                       view.focus();
                     }
                   });
+                  return editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? /*#__PURE__*/React.createElement(UserIntentPopupWrapper, {
+                    api: pluginInjectionApi
+                  }, Toolbar) : Toolbar;
                 }
               }]
             });

package/dist/types/hyperlinkPluginType.d.ts

@@ -7,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './editor-commands/commands';
 type HyperlinkPluginCommands = {
@@ -55,7 +56,8 @@ export type HyperlinkPluginDependencies = [
     OptionalPlugin<PrimaryToolbarPlugin>,
     OptionalPlugin<SelectionToolbarPlugin>,
     OptionalPlugin<UserPreferencesPlugin>,
-    OptionalPlugin<ToolbarPlugin>
+    OptionalPlugin<ToolbarPlugin>,
+    OptionalPlugin<UserIntentPlugin>
 ];
 export type HyperlinkPluginActions = {
     hideLinkToolbar: HideLinkToolbar;

package/dist/types-ts4.5/hyperlinkPluginType.d.ts

@@ -7,6 +7,7 @@ import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmo
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { HideLinkToolbar, InsertLink, ShowLinkToolbar, UpdateLink } from './editor-commands/commands';
 type HyperlinkPluginCommands = {
@@ -55,7 +56,8 @@ export type HyperlinkPluginDependencies = [
     OptionalPlugin<PrimaryToolbarPlugin>,
     OptionalPlugin<SelectionToolbarPlugin>,
     OptionalPlugin<UserPreferencesPlugin>,
-    OptionalPlugin<ToolbarPlugin>
+    OptionalPlugin<ToolbarPlugin>,
+    OptionalPlugin<UserIntentPlugin>
 ];
 export type HyperlinkPluginActions = {
     hideLinkToolbar: HideLinkToolbar;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-hyperlink",
-	"version": "6.0.2",
+	"version": "6.0.4",
 	"description": "Hyperlink plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,19 +38,20 @@
 		"@atlaskit/editor-plugin-primary-toolbar": "^5.0.0",
 		"@atlaskit/editor-plugin-selection-toolbar": "^5.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^1.1.0",
+		"@atlaskit/editor-plugin-user-intent": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-toolbar": "^0.8.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
-		"@atlaskit/tmp-editor-statsig": "^12.4.0",
+		"@atlaskit/tmp-editor-statsig": "^12.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.2.0",
+		"@atlaskit/editor-common": "^108.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"