@atlaskit/editor-plugin-media-insert 44.0.5 → 44.0.6

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-media-insert
 
+## 44.0.6
+
+### Patch Changes
+
+- [`a6e997a7a24f7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a6e997a7a24f7) -
+  Clean up experiment `platform_editor_fix_focus_mediainsertpicker`
+
 ## 44.0.5
 
 ### Patch Changes

package/dist/cjs/ui/MediaFromURL.js

@@ -28,7 +28,6 @@ var _helperMessage = require("@atlaskit/form/helper-message");
 var _messageWrapper = require("@atlaskit/form/message-wrapper");
 var _growDiagonal = _interopRequireDefault(require("@atlaskit/icon/core/grow-diagonal"));
 var _getMediaClient = require("@atlaskit/media-client-react/get-media-client");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _primitives = require("@atlaskit/primitives");
 var _message = _interopRequireDefault(require("@atlaskit/section-message/message"));
 var _textField = _interopRequireDefault(require("@atlaskit/textfield/text-field"));
@@ -278,13 +277,9 @@ function MediaFromURL(_ref) {
         };
         dispatchAnalyticsEvent(payload);
       }
-      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-        cancelMediaInsertPicker();
-      } else {
-        closeMediaInsertPicker();
-      }
+      cancelMediaInsertPicker();
     }
-  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker, closeMediaInsertPicker]);
+  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker]);
   var onCancel = _react.default.useCallback(function () {
     if (dispatchAnalyticsEvent) {
       var payload = {
@@ -295,12 +290,8 @@ function MediaFromURL(_ref) {
       };
       dispatchAnalyticsEvent(payload);
     }
-    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-      cancelMediaInsertPicker();
-    } else {
-      closeMediaInsertPicker();
-    }
-  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent, closeMediaInsertPicker]);
+    cancelMediaInsertPicker();
+  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent]);
   return /*#__PURE__*/_react.default.createElement(_form.default, {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     onSubmit: function onSubmit(_ref3, form) {

package/dist/cjs/ui/MediaInsertPicker.js

@@ -18,7 +18,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _withOuterListeners = _interopRequireDefault(require("@atlaskit/editor-common/with-outer-listeners"));
 var _constants = require("@atlaskit/editor-shared-styles/constants");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _tabList = _interopRequireDefault(require("@atlaskit/tabs/tab-list"));
 var _tabs = _interopRequireDefault(require("@atlaskit/tabs/tabs"));
@@ -175,6 +174,10 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     returnFocusRef.current = focusButton;
     closeMediaInsertPicker();
   }, [closeMediaInsertPicker, focusButton]);
+  // Return focus on unmount to whichever element `returnFocusRef` currently points at.
+  var returnFocusOnUnmount = _react.default.useCallback(function () {
+    returnFocusRef.current();
+  }, []);
   var intl = (0, _reactIntl.useIntl)();
   var _useUnholyAutofocus = (0, _useUnholyAutofocus2.useUnholyAutofocus)(),
     autofocusRef = _useUnholyAutofocus.autofocusRef,
@@ -310,22 +313,9 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
         };
         dispatchAnalyticsEvent(payload);
       }
-      if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-        closeAndReturnFocusToButton();
-      } else {
-        closeMediaInsertPicker(); // Focuses editor on unmount
-        focusEditor();
-      }
+      closeAndReturnFocusToButton();
     };
   };
-  var closePickerAndFocusEditor = function closePickerAndFocusEditor() {
-    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndFocusEditor();
-    } else {
-      closeMediaInsertPicker();
-      focusEditor();
-    }
-  };
   var fileTabTitle = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(_mediaInsert.mediaInsertMessages.uploadTabTitle) : intl.formatMessage(_mediaInsert.mediaInsertMessages.fileTabTitle);
   return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
     ariaLabel: intl.formatMessage(_mediaInsert.mediaInsertMessages.mediaPickerPopupAriaLabel)
@@ -337,9 +327,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
     fitHeight: 390,
     fitWidth: 340,
     mountTo: mountPoint,
-    onUnmount: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_fix_focus_mediainsertpicker') ? function () {
-      return returnFocusRef.current();
-    } : undefined,
+    onUnmount: returnFocusOnUnmount,
     boundariesElement: popupsBoundariesElement,
     handleClickOutside: handleClose(_enums.INPUT_METHOD.MOUSE),
     handleEscapeKeydown: handleClose(_enums.INPUT_METHOD.KEYBOARD),
@@ -370,7 +358,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
           key: tab.key,
           disablePaddingBlockEnd: true
         }, /*#__PURE__*/_react.default.createElement(TabComponent, {
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertMediaSingle: insertMediaSingle,
           mediaProvider: mediaProvider
@@ -382,7 +370,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
         }, /*#__PURE__*/_react.default.createElement(_LocalMedia.LocalMedia, {
           ref: autofocusRef,
           mediaProvider: mediaProvider,
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertFile: insertFile
         }));
@@ -392,7 +380,7 @@ var MediaInsertPicker = exports.MediaInsertPicker = function MediaInsertPicker(_
       }, /*#__PURE__*/_react.default.createElement(_MediaFromURL.MediaFromURL, {
         mediaProvider: mediaProvider,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         cancelMediaInsertPicker: closeAndReturnFocusToButton,
         insertMediaSingle: insertMediaSingle,
         insertExternalMediaSingle: insertExternalMediaSingle,

package/dist/es2019/ui/MediaFromURL.js

@@ -14,7 +14,6 @@ import { HelperMessage } from '@atlaskit/form/helper-message';
 import { MessageWrapper } from '@atlaskit/form/message-wrapper';
 import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
 import { getMediaClient } from '@atlaskit/media-client-react/get-media-client';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, Flex, Inline, Stack, xcss } from '@atlaskit/primitives';
 import SectionMessage from '@atlaskit/section-message/message';
@@ -242,13 +241,9 @@ export function MediaFromURL({
         };
         dispatchAnalyticsEvent(payload);
       }
-      if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-        cancelMediaInsertPicker();
-      } else {
-        closeMediaInsertPicker();
-      }
+      cancelMediaInsertPicker();
     }
-  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker, closeMediaInsertPicker]);
+  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker]);
   const onCancel = React.useCallback(() => {
     if (dispatchAnalyticsEvent) {
       const payload = {
@@ -259,12 +254,8 @@ export function MediaFromURL({
       };
       dispatchAnalyticsEvent(payload);
     }
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      cancelMediaInsertPicker();
-    } else {
-      closeMediaInsertPicker();
-    }
-  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent, closeMediaInsertPicker]);
+    cancelMediaInsertPicker();
+  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(Form, {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     onSubmit: ({

package/dist/es2019/ui/MediaInsertPicker.js

@@ -10,7 +10,6 @@ import { PlainOutsideClickTargetRefContext } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import withOuterListeners from '@atlaskit/editor-common/with-outer-listeners';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles/constants';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { Box, Focusable, Text } from '@atlaskit/primitives/compiled';
 import TabList from '@atlaskit/tabs/tab-list';
 import Tabs from '@atlaskit/tabs/tabs';
@@ -166,6 +165,10 @@ export const MediaInsertPicker = ({
     returnFocusRef.current = focusButton;
     closeMediaInsertPicker();
   }, [closeMediaInsertPicker, focusButton]);
+  // Return focus on unmount to whichever element `returnFocusRef` currently points at.
+  const returnFocusOnUnmount = React.useCallback(() => {
+    returnFocusRef.current();
+  }, []);
   const intl = useIntl();
   const {
     autofocusRef,
@@ -297,20 +300,7 @@ export const MediaInsertPicker = ({
       };
       dispatchAnalyticsEvent(payload);
     }
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndReturnFocusToButton();
-    } else {
-      closeMediaInsertPicker(); // Focuses editor on unmount
-      focusEditor();
-    }
-  };
-  const closePickerAndFocusEditor = () => {
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndFocusEditor();
-    } else {
-      closeMediaInsertPicker();
-      focusEditor();
-    }
+    closeAndReturnFocusToButton();
   };
   const fileTabTitle = expValEqualsNoExposure('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(mediaInsertMessages.uploadTabTitle) : intl.formatMessage(mediaInsertMessages.fileTabTitle);
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
@@ -323,7 +313,7 @@ export const MediaInsertPicker = ({
     fitHeight: 390,
     fitWidth: 340,
     mountTo: mountPoint,
-    onUnmount: isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker') ? () => returnFocusRef.current() : undefined,
+    onUnmount: returnFocusOnUnmount,
     boundariesElement: popupsBoundariesElement,
     handleClickOutside: handleClose(INPUT_METHOD.MOUSE),
     handleEscapeKeydown: handleClose(INPUT_METHOD.KEYBOARD),
@@ -351,7 +341,7 @@ export const MediaInsertPicker = ({
         key: tab.key,
         disablePaddingBlockEnd: true
       }, /*#__PURE__*/React.createElement(TabComponent, {
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         insertMediaSingle: insertMediaSingle,
         mediaProvider: mediaProvider
@@ -363,7 +353,7 @@ export const MediaInsertPicker = ({
       }, /*#__PURE__*/React.createElement(LocalMedia, {
         ref: autofocusRef,
         mediaProvider: mediaProvider,
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
         insertFile: insertFile
       }));
@@ -373,7 +363,7 @@ export const MediaInsertPicker = ({
     }, /*#__PURE__*/React.createElement(MediaFromURL, {
       mediaProvider: mediaProvider,
       dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-      closeMediaInsertPicker: closePickerAndFocusEditor,
+      closeMediaInsertPicker: closeAndFocusEditor,
       cancelMediaInsertPicker: closeAndReturnFocusToButton,
       insertMediaSingle: insertMediaSingle,
       insertExternalMediaSingle: insertExternalMediaSingle,

package/dist/esm/ui/MediaFromURL.js

@@ -22,7 +22,6 @@ import { HelperMessage } from '@atlaskit/form/helper-message';
 import { MessageWrapper } from '@atlaskit/form/message-wrapper';
 import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
 import { getMediaClient } from '@atlaskit/media-client-react/get-media-client';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, Flex, Inline, Stack, xcss } from '@atlaskit/primitives';
 import SectionMessage from '@atlaskit/section-message/message';
@@ -270,13 +269,9 @@ export function MediaFromURL(_ref) {
         };
         dispatchAnalyticsEvent(payload);
       }
-      if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-        cancelMediaInsertPicker();
-      } else {
-        closeMediaInsertPicker();
-      }
+      cancelMediaInsertPicker();
     }
-  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker, closeMediaInsertPicker]);
+  }, [dispatchAnalyticsEvent, cancelMediaInsertPicker]);
   var onCancel = React.useCallback(function () {
     if (dispatchAnalyticsEvent) {
       var payload = {
@@ -287,12 +282,8 @@ export function MediaFromURL(_ref) {
       };
       dispatchAnalyticsEvent(payload);
     }
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      cancelMediaInsertPicker();
-    } else {
-      closeMediaInsertPicker();
-    }
-  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent, closeMediaInsertPicker]);
+    cancelMediaInsertPicker();
+  }, [cancelMediaInsertPicker, dispatchAnalyticsEvent]);
   return /*#__PURE__*/React.createElement(Form, {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     onSubmit: function onSubmit(_ref3, form) {

package/dist/esm/ui/MediaInsertPicker.js

@@ -13,7 +13,6 @@ import { PlainOutsideClickTargetRefContext } from '@atlaskit/editor-common/ui';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import withOuterListeners from '@atlaskit/editor-common/with-outer-listeners';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles/constants';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { Box, Focusable, Text } from '@atlaskit/primitives/compiled';
 import TabList from '@atlaskit/tabs/tab-list';
 import Tabs from '@atlaskit/tabs/tabs';
@@ -168,6 +167,10 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
     returnFocusRef.current = focusButton;
     closeMediaInsertPicker();
   }, [closeMediaInsertPicker, focusButton]);
+  // Return focus on unmount to whichever element `returnFocusRef` currently points at.
+  var returnFocusOnUnmount = React.useCallback(function () {
+    returnFocusRef.current();
+  }, []);
   var intl = useIntl();
   var _useUnholyAutofocus = useUnholyAutofocus(),
     autofocusRef = _useUnholyAutofocus.autofocusRef,
@@ -303,22 +306,9 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
         };
         dispatchAnalyticsEvent(payload);
       }
-      if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-        closeAndReturnFocusToButton();
-      } else {
-        closeMediaInsertPicker(); // Focuses editor on unmount
-        focusEditor();
-      }
+      closeAndReturnFocusToButton();
     };
   };
-  var closePickerAndFocusEditor = function closePickerAndFocusEditor() {
-    if (isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker')) {
-      closeAndFocusEditor();
-    } else {
-      closeMediaInsertPicker();
-      focusEditor();
-    }
-  };
   var fileTabTitle = expValEqualsNoExposure('cc_page_experiences_editor_image_generation', 'isEnabled', true) ? intl.formatMessage(mediaInsertMessages.uploadTabTitle) : intl.formatMessage(mediaInsertMessages.fileTabTitle);
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     ariaLabel: intl.formatMessage(mediaInsertMessages.mediaPickerPopupAriaLabel)
@@ -330,9 +320,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
     fitHeight: 390,
     fitWidth: 340,
     mountTo: mountPoint,
-    onUnmount: isExperimentEnabled('platform_editor_fix_focus_mediainsertpicker') ? function () {
-      return returnFocusRef.current();
-    } : undefined,
+    onUnmount: returnFocusOnUnmount,
     boundariesElement: popupsBoundariesElement,
     handleClickOutside: handleClose(INPUT_METHOD.MOUSE),
     handleEscapeKeydown: handleClose(INPUT_METHOD.KEYBOARD),
@@ -363,7 +351,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
           key: tab.key,
           disablePaddingBlockEnd: true
         }, /*#__PURE__*/React.createElement(TabComponent, {
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertMediaSingle: insertMediaSingle,
           mediaProvider: mediaProvider
@@ -375,7 +363,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
         }, /*#__PURE__*/React.createElement(LocalMedia, {
           ref: autofocusRef,
           mediaProvider: mediaProvider,
-          closeMediaInsertPicker: closePickerAndFocusEditor,
+          closeMediaInsertPicker: closeAndFocusEditor,
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           insertFile: insertFile
         }));
@@ -385,7 +373,7 @@ export var MediaInsertPicker = function MediaInsertPicker(_ref3) {
       }, /*#__PURE__*/React.createElement(MediaFromURL, {
         mediaProvider: mediaProvider,
         dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        closeMediaInsertPicker: closePickerAndFocusEditor,
+        closeMediaInsertPicker: closeAndFocusEditor,
         cancelMediaInsertPicker: closeAndReturnFocusToButton,
         insertMediaSingle: insertMediaSingle,
         insertExternalMediaSingle: insertExternalMediaSingle,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media-insert",
-	"version": "44.0.5",
+	"version": "44.0.6",
 	"description": "Media Insert plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.3.0",
+		"@atlaskit/editor-common": "^130.4.0",
 		"@atlaskit/platform-feature-flags-react": "^1.2.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"react": "^18.2.0 || ^19.2.0",