@atlaskit/editor-plugin-media 1.31.6 → 1.31.7

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-media
 
+## 1.31.7
+
+### Patch Changes
+
+- [#140707](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140707)
+  [`972fb840acf35`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/972fb840acf35) -
+  Switch from fg to experiment for media-from-url
+- Updated dependencies
+
 ## 1.31.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaSingle.js

@@ -30,6 +30,7 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaClient = require("@atlaskit/media-client");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _captions = require("../commands/captions");
 var _main = require("../pm-plugins/main");
 var _CaptionPlaceholder = _interopRequireDefault(require("../ui/CaptionPlaceholder"));
@@ -466,7 +467,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
         ,
         className: _styles.MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
-      }, (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one') && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
+      }, (0, _experiments.editorExperiment)('add-media-from-url', true) && (0, _react2.jsx)(_mediaSingle.MediaBadges, {
         mediaElement: currentMediaElement(),
         mediaHeight: height,
         mediaWidth: width,
@@ -483,7 +484,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
           isDrafting: isCurrentNodeDrafting,
           badgeSize: badgeSize
         }));
-      }), !(0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one') && commentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
+      }), !(0, _experiments.editorExperiment)('add-media-from-url', true) && commentsOnMedia && (0, _react2.jsx)(_CommentBadge.CommentBadge, {
         commentsOnMediaBugFixEnabled: mediaOptions === null || mediaOptions === void 0 || (_mediaOptions$getEdit2 = mediaOptions.getEditorFeatureFlags) === null || _mediaOptions$getEdit2 === void 0 || (_mediaOptions$getEdit2 = _mediaOptions$getEdit2.call(mediaOptions)) === null || _mediaOptions$getEdit2 === void 0 ? void 0 : _mediaOptions$getEdit2.commentsOnMediaBugFix,
         view: view,
         api: pluginInjectionApi,

package/dist/cjs/pm-plugins/main.js

@@ -32,6 +32,7 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _mediaCommon = require("@atlaskit/media-common");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _helpers = _interopRequireWildcard(require("../commands/helpers"));
 var helpers = _helpers;
 var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
@@ -211,6 +212,9 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     });
     (0, _defineProperty2.default)(this, "showMediaPicker", function () {
       if (_this.openMediaPickerBrowser) {
+        (0, _experiments.editorExperiment)('add-media-from-url', false, {
+          exposure: true
+        });
         return _this.openMediaPickerBrowser();
       }
       _this.onPopupToggleCallback(true);

package/dist/cjs/ui/CommentBadge/index.js

@@ -87,7 +87,7 @@ var CommentBadge = exports.CommentBadge = (0, _reactIntlNext.injectIntl)(Comment
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 
 var CommentBadgeNextWrapper = exports.CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {

package/dist/cjs/utils/media-single.js

@@ -16,6 +16,7 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _mediaCommon = require("../utils/media-common");
 var _analytics2 = require("./analytics");
 var _isType = require("./is-type");
@@ -94,7 +95,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
     return false;
   }
   var resizeExperience = (0, _platformFeatureFlags.fg)('platform.editor.media.extended-resize-experience');
-  var insertMediaPopup = (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one');
+  var insertMediaPopup = (0, _experiments.editorExperiment)('add-media-from-url', true);
   var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
     widthType: 'pixel',
     width: (0, _mediaSingle.getMediaSingleInitialWidth)((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : _mediaSingle.DEFAULT_IMAGE_WIDTH),

package/dist/es2019/nodeviews/mediaSingle.js

@@ -11,8 +11,7 @@ import React, { Component, Fragment, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE } from '@atlaskit/editor-common/media-single';
-import { ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
+import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, ExternalImageBadge, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { MediaSingle } from '@atlaskit/editor-common/ui';
@@ -22,6 +21,7 @@ import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/u
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import CaptionPlaceholder from '../ui/CaptionPlaceholder';
@@ -384,7 +384,7 @@ export default class MediaSingleNode extends Component {
       ,
       className: MediaSingleNodeSelector,
       onClick: this.onMediaSingleClicked
-    }, fg('platform_editor_insert_media_plugin_phase_one') && jsx(MediaBadges, {
+    }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
       mediaElement: currentMediaElement(),
       mediaHeight: height,
       mediaWidth: width,
@@ -400,7 +400,7 @@ export default class MediaSingleNode extends Component {
       getPos: getPos,
       isDrafting: isCurrentNodeDrafting,
       badgeSize: badgeSize
-    }))), !fg('platform_editor_insert_media_plugin_phase_one') && commentsOnMedia && jsx(CommentBadge, {
+    }))), !editorExperiment('add-media-from-url', true) && commentsOnMedia && jsx(CommentBadge, {
       commentsOnMediaBugFixEnabled: mediaOptions === null || mediaOptions === void 0 ? void 0 : (_mediaOptions$getEdit2 = mediaOptions.getEditorFeatureFlags) === null || _mediaOptions$getEdit2 === void 0 ? void 0 : (_mediaOptions$getEdit3 = _mediaOptions$getEdit2.call(mediaOptions)) === null || _mediaOptions$getEdit3 === void 0 ? void 0 : _mediaOptions$getEdit3.commentsOnMediaBugFix,
       view: view,
       api: pluginInjectionApi,

package/dist/es2019/pm-plugins/main.js

@@ -14,6 +14,7 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -181,6 +182,9 @@ export class MediaPluginStateImplementation {
     });
     _defineProperty(this, "showMediaPicker", () => {
       if (this.openMediaPickerBrowser) {
+        editorExperiment('add-media-from-url', false, {
+          exposure: true
+        });
         return this.openMediaPickerBrowser();
       }
       this.onPopupToggleCallback(true);

package/dist/es2019/ui/CommentBadge/index.js

@@ -76,7 +76,7 @@ export const CommentBadge = injectIntl(CommentBadgeWrapper);
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 
 export const CommentBadgeNextWrapper = ({

package/dist/es2019/utils/media-single.js

@@ -8,6 +8,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -85,7 +86,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
     return false;
   }
   const resizeExperience = fg('platform.editor.media.extended-resize-experience');
-  const insertMediaPopup = fg('platform_editor_insert_media_plugin_phase_one');
+  const insertMediaPopup = editorExperiment('add-media-from-url', true);
   const mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
     widthType: 'pixel',
     width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),

package/dist/esm/nodeviews/mediaSingle.js

@@ -24,8 +24,7 @@ import React, { Component, Fragment, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE } from '@atlaskit/editor-common/media-single';
-import { ExternalImageBadge, MediaBadges } from '@atlaskit/editor-common/media-single';
+import { calcMediaSinglePixelWidth, DEFAULT_IMAGE_HEIGHT, DEFAULT_IMAGE_WIDTH, ExternalImageBadge, getMaxWidthForNestedNode, MEDIA_SINGLE_GUTTER_SIZE, MediaBadges } from '@atlaskit/editor-common/media-single';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { MediaSingle } from '@atlaskit/editor-common/ui';
@@ -35,6 +34,7 @@ import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/u
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../commands/captions';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import CaptionPlaceholder from '../ui/CaptionPlaceholder';
@@ -461,7 +461,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
         ,
         className: MediaSingleNodeSelector,
         onClick: this.onMediaSingleClicked
-      }, fg('platform_editor_insert_media_plugin_phase_one') && jsx(MediaBadges, {
+      }, editorExperiment('add-media-from-url', true) && jsx(MediaBadges, {
         mediaElement: currentMediaElement(),
         mediaHeight: height,
         mediaWidth: width,
@@ -478,7 +478,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
           isDrafting: isCurrentNodeDrafting,
           badgeSize: badgeSize
         }));
-      }), !fg('platform_editor_insert_media_plugin_phase_one') && commentsOnMedia && jsx(CommentBadge, {
+      }), !editorExperiment('add-media-from-url', true) && commentsOnMedia && jsx(CommentBadge, {
         commentsOnMediaBugFixEnabled: mediaOptions === null || mediaOptions === void 0 || (_mediaOptions$getEdit2 = mediaOptions.getEditorFeatureFlags) === null || _mediaOptions$getEdit2 === void 0 || (_mediaOptions$getEdit2 = _mediaOptions$getEdit2.call(mediaOptions)) === null || _mediaOptions$getEdit2 === void 0 ? void 0 : _mediaOptions$getEdit2.commentsOnMediaBugFix,
         view: view,
         api: pluginInjectionApi,

package/dist/esm/pm-plugins/main.js

@@ -23,6 +23,7 @@ import { findDomRefAtPos, findParentNodeOfType, findSelectedNodeOfType, isNodeSe
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
@@ -196,6 +197,9 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     });
     _defineProperty(this, "showMediaPicker", function () {
       if (_this.openMediaPickerBrowser) {
+        editorExperiment('add-media-from-url', false, {
+          exposure: true
+        });
         return _this.openMediaPickerBrowser();
       }
       _this.onPopupToggleCallback(true);

package/dist/esm/ui/CommentBadge/index.js

@@ -77,7 +77,7 @@ export var CommentBadge = injectIntl(CommentBadgeWrapper);
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 
 export var CommentBadgeNextWrapper = function CommentBadgeNextWrapper(_ref2) {

package/dist/esm/utils/media-single.js

@@ -11,6 +11,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert as pmSafeInsert, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { findChangeFromLocation, getChangeMediaAnalytics } from './analytics';
 import { isImage } from './is-type';
@@ -87,7 +88,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
     return false;
   }
   var resizeExperience = fg('platform.editor.media.extended-resize-experience');
-  var insertMediaPopup = fg('platform_editor_insert_media_plugin_phase_one');
+  var insertMediaPopup = editorExperiment('add-media-from-url', true);
   var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
     widthType: 'pixel',
     width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),

package/dist/types/ui/CommentBadge/index.d.ts

@@ -22,7 +22,7 @@ export declare const CommentBadge: React.FC<import("react-intl-next").WithIntlPr
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;

package/dist/types-ts4.5/ui/CommentBadge/index.d.ts

@@ -22,7 +22,7 @@ export declare const CommentBadge: React.FC<import("react-intl-next").WithIntlPr
 /**
  * Remove CommentBadgeWrapper component above
  * and rename CommentBadgeNextWrapper to CommentBadgeWrapper
- * when clean up platform_editor_insert_media_plugin_phase_one feature flag
+ * when clean up platform_editor_add_media_from_url feature flag
  */
 type CommentBadgeNextWrapperProps = {
     mediaSingleElement?: HTMLElement | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.31.6",
+	"version": "1.31.7",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,7 +36,7 @@
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^89.1.0",
+		"@atlaskit/editor-common": "^89.2.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "1.19.6",
@@ -53,7 +53,7 @@
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/form": "^10.5.0",
-		"@atlaskit/icon": "^22.17.0",
+		"@atlaskit/icon": "^22.18.0",
 		"@atlaskit/media-card": "^78.3.0",
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-client-react": "^2.2.0",
@@ -67,7 +67,7 @@
 		"@atlaskit/textfield": "^6.5.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.1.8",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -144,9 +144,6 @@
 		"platform-editor-a11y-image-border-options-dropdown": {
 			"type": "boolean"
 		},
-		"platform_editor_insert_media_plugin_phase_one": {
-			"type": "boolean"
-		},
 		"platform_editor_media_batch_updates": {
 			"type": "boolean"
 		}