@atlaskit/editor-plugin-media 12.2.6 → 12.4.0

package/dist/es2019/nodeviews/mediaSingle.js

@@ -14,7 +14,6 @@ import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { isNodeSelectedOrInRange } from '@atlaskit/editor-common/utils';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { MediaSingleNodeNext } from './mediaSingleNext';
 const selector = states => {
@@ -192,7 +191,7 @@ class MediaSingleNodeView extends ReactNodeView {
       isValidUpdate = (currentNode, newNode) => this.getNodeMediaId(currentNode) === this.getNodeMediaId(newNode);
     }
     // Detect mediaSingle width attribute changes and signal child media node to update
-    if (!this.hasResized && this.node.attrs.width !== node.attrs.width && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (!this.hasResized && this.node.attrs.width !== node.attrs.width) {
       const target = this.dom.querySelector('div[data-prosemirror-node-name="media"]');
       target === null || target === void 0 ? void 0 : target.dispatchEvent(new CustomEvent('resized'));
     }

package/dist/es2019/nodeviews/mediaSingleNext.js

@@ -468,7 +468,7 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
     onClick: clickPlaceholder,
     placeholderMessage: mediaOptions.allowImagePreview ? captionMessages.placeholderWithDoubleClickPrompt : captionMessages.placeholder
   })));
-  if (!expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) || widthType !== 'pixel' && expValEquals('platform_editor_media_vc_fixes_patch1', 'isEnabled', true)) {
+  if (widthType !== 'pixel' && expValEquals('platform_editor_media_vc_fixes_patch1', 'isEnabled', true)) {
     return jsx(Fragment, null, canResize ? mediaOptions.allowPixelResizing ? jsx(ResizableMediaSingleNext, {
       view: view,
       getPos: getPos,
@@ -488,7 +488,7 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
       hasFallbackContainer: false,
       mediaSingleWidth: mediaSingleWidth,
       editorAppearance: editorAppearance,
-      showLegacyNotification: widthType !== 'pixel',
+      showLegacyNotification: true,
       forceHandlePositioning: mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.forceHandlePositioning
     }, MediaChildren) : jsx(ResizableMediaSingle, {
       view: view,

package/dist/es2019/nodeviews/toDOM-fixes/mediaSingle.js

@@ -1,6 +1,5 @@
 import { mediaSingleSpec } from '@atlaskit/adf-schema';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getAttrsFromNodeMediaSingle } from './toDOMAttrs';
 const WRAPPED_LAYOUTS = ['wrap-left', 'wrap-right'];
 const ALIGNED_LAYOUTS = ['align-end', 'align-start'];
@@ -45,17 +44,9 @@ export const mediaWidthCSSCalc = ({
   } else if (shouldHardCodePixelWidth) {
     cssCalc = `min(${mediaSingleDimensionWidth}px, ${fullContainerWidth})`;
   } else if (shouldUseBreakoutWideLogic) {
-    if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-      cssCalc = `max(var(--ak-editor--line-length), min(var(--ak-editor--breakout-wide-layout-width), var(--ak-editor-max-container-width)))`;
-    } else {
-      cssCalc = `max(var(--ak-editor--line-length), min(var(--ak-editor--breakout-wide-layout-width), calc(100cqw - var(--ak-editor--breakout-full-page-guttering-padding))))`;
-    }
+    cssCalc = `max(var(--ak-editor--line-length), min(var(--ak-editor--breakout-wide-layout-width), var(--ak-editor-max-container-width)))`;
   } else if (shouldUseBreakoutFullWidthLogic) {
-    if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-      cssCalc = `max(var(--ak-editor--line-length), min(var(--ak-editor--full-width-layout-width), var(--ak-editor-max-container-width)))`;
-    } else {
-      cssCalc = `max(var(--ak-editor--line-length), min(var(--ak-editor--full-width-layout-width), calc(100cqw - var(--ak-editor--breakout-full-page-guttering-padding))))`;
-    }
+    cssCalc = `max(var(--ak-editor--line-length), min(var(--ak-editor--full-width-layout-width), var(--ak-editor-max-container-width)))`;
   } else {
     cssCalc = `max(min(${baseWidth}px, min(100cqw, 100%)), ${GUTTER_SIZE})`;
   }

package/dist/es2019/pm-plugins/ai-generating-decoration.js

@@ -2,6 +2,8 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
  * ProseMirror plugin that manages AI-generating decorations on media nodes.
@@ -98,9 +100,10 @@ export function createAIGeneratingDecorationPlugin() {
         };
       },
       apply(tr, pluginState, _oldState, newState) {
-        // Killswitch — if active, clear any existing decorations and stop
+        // Disabled when killswitch is on or gate/experiment off — drop decorations.
+        if (
         // eslint-disable-next-line @atlaskit/platform/use-recommended-utils -- dynamic config killswitch, not a standard feature gate
-        if (FeatureGates.getExperimentValue('maui_ai_border_killswitch', 'value', false)) {
+        FeatureGates.getExperimentValue('maui_ai_border_killswitch', 'value', false) || !fg('cc-maui-phase-2-loading') || !expValEquals('cc-maui-experiment', 'isEnabled', true)) {
           if (pluginState.generatingMediaIds.size > 0) {
             return {
               generatingMediaIds: new Set(),

package/dist/es2019/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -17,7 +17,6 @@ import { nonWrappedLayouts } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { MEDIA_PLUGIN_IS_RESIZING_KEY, MEDIA_PLUGIN_RESIZING_WIDTH_KEY } from '../../pm-plugins/main';
 import { getMediaResizeAnalyticsEvent } from '../../pm-plugins/utils/analytics';
@@ -190,9 +189,7 @@ export const ResizableMediaSingleNextFunctional = props => {
   const [isResizing, setIsResizing] = useState(false);
   const [isVideoFile, setIsVideoFile] = useState(false);
   const [hasResized, setHasResized] = useState(false);
-  const nodePosition = expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) ? getNodePosition(getPos) :
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useMemo(() => getNodePosition(getPos), [getPos]);
+  const nodePosition = getNodePosition(getPos);
   const isNestedNode = useMemo(() => {
     if (nodePosition === null) {
       return false;
@@ -227,7 +224,7 @@ export const ResizableMediaSingleNextFunctional = props => {
     if (isAdjacentMode || fullWidthMode) {
       return lineLength;
     }
-    if (!isResizing && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (!isResizing) {
       return `var(--ak-editor-max-container-width)`;
     }
     return calcMaxWidth({
@@ -244,7 +241,7 @@ export const ResizableMediaSingleNextFunctional = props => {
   const minViewWidth = isResizing ? minWidth : `min(${minWidth}px, 100%)`;
   const resizerNextClassName = useMemo(() => {
     const classNameNext = classnames(richMediaClassName, `image-${layout}`, isResizing ? 'is-resizing' : 'not-resizing', className, resizerItemClassName, {
-      'display-handle': expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) ? selected && !disableHandles : selected,
+      'display-handle': selected && !disableHandles,
       'richMedia-selected': selected,
       'rich-media-wrapped': layout === 'wrap-left' || layout === 'wrap-right'
     });
@@ -261,7 +258,7 @@ export const ResizableMediaSingleNextFunctional = props => {
     return !!findParentNodeOfTypeClosestToPos($pos, [listItem]);
   }, [nodePosition, view]);
   const enable = useMemo(() => {
-    if (disableHandles && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (disableHandles) {
       return {
         left: false,
         right: false
@@ -367,7 +364,7 @@ export const ResizableMediaSingleNextFunctional = props => {
       isNestedNode: isAdjacentMode
     })(size, delta, false, aspectRatioRef.current);
     const resizerDomEl = resizerContainerRef.current;
-    if (resizerDomEl && !hasResized && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (resizerDomEl && !hasResized) {
       // dispatch resize event to media node DOM element inside resizerDom
       const mediaDomEl = resizerDomEl.querySelector('div[data-prosemirror-node-name="media"]');
       const event = new CustomEvent('resized');
@@ -503,7 +500,7 @@ export const ResizableMediaSingleNextFunctional = props => {
     snap: snaps,
     resizeRatio: nonWrappedLayouts.includes(layout) ? 2 : 1,
     "data-testid": resizerNextTestId,
-    isHandleVisible: expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) ? selected && !disableHandles : selected,
+    isHandleVisible: selected && !disableHandles,
     handlePositioning: handlePositioning,
     handleHighlight: "full-height"
   }, children, showLegacyNotification && jsx(ResizableMediaMigrationNotification, null)));

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

@@ -13,7 +13,6 @@ import { calcColumnsFromPx, calcMediaPxWidth, calcPctFromPx, handleSides, imageA
 import { calculateSnapPoints } from '@atlaskit/editor-common/utils';
 import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { checkMediaType } from '../../pm-plugins/utils/check-media-type';
 import { wrapperStyle } from './styled';
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -44,7 +43,7 @@ export default class ResizableMediaSingle extends React.Component {
           state
         }
       } = this.props;
-      if (!this.hasResized && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+      if (!this.hasResized) {
         var _this$wrapper;
         const mediaDomEl = (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 ? void 0 : _this$wrapper.querySelector('div[data-prosemirror-node-name="media"]');
         if (mediaDomEl) {
@@ -295,11 +294,9 @@ export default class ResizableMediaSingle extends React.Component {
     const enable = {};
     handleSides.forEach(side => {
       const oppositeSide = side === 'left' ? 'right' : 'left';
-      if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-        if (this.props.disableHandles) {
-          enable[side] = false;
-          return;
-        }
+      if (this.props.disableHandles) {
+        enable[side] = false;
+        return;
       }
       enable[side] = ['full-width', 'wide', 'center'].concat(`wrap-${oppositeSide}`).concat(`align-${imageAlignmentMap[oppositeSide]}`).indexOf(layout) > -1;
       if (side === 'left' && this.insideInlineLike) {

package/dist/esm/nodeviews/lazy-media-group.js

@@ -1,24 +1,6 @@
-import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ReactMediaGroupNode } from './mediaGroup';
 export var lazyMediaGroupView = function lazyMediaGroupView(portalProviderAPI, eventDispatcher, providerFactory) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var api = arguments.length > 4 ? arguments[4] : undefined;
-  if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-    return ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
-  }
-  return withLazyLoading({
-    nodeName: 'mediaGroup',
-    getNodeViewOptions: function getNodeViewOptions() {},
-    loader: function loader() {
-      var result = import( /* webpackChunkName: "@atlaskit-internal_editor-plugin-media-group-lazy-node-view" */
-      './mediaGroup').then(function (_ref) {
-        var ReactMediaGroupNode = _ref.ReactMediaGroupNode;
-        return function (node, view, getPos) {
-          return ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api)(node, view, getPos);
-        };
-      });
-      return result;
-    }
-  });
+  return ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
 };

package/dist/esm/nodeviews/mediaGroup.js

@@ -9,7 +9,6 @@ import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useMediaProvider } from '../ui/hooks/useMediaProvider';
 import { MediaGroupNext } from './mediaGroupNext';
 var selector = function selector(states) {
@@ -60,9 +59,6 @@ var MediaGroupNodeView = /*#__PURE__*/function (_ReactNodeView) {
               editorDisabled = _ref3.editorDisabled,
               editorViewMode = _ref3.editorViewMode;
             var mediaProvider = mediaProviderFromState ? Promise.resolve(mediaProviderFromState) : undefined;
-            if (!mediaProvider && !expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-              return null;
-            }
             return /*#__PURE__*/React.createElement(MediaGroupNext, {
               node: _this.node,
               getPos: getPos,

package/dist/esm/nodeviews/mediaNodeView/index.js

@@ -86,47 +86,41 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
         width: '100%',
         height: '100%'
       };
-      if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-        var pos = _this.getPos();
-        if (typeof pos !== 'number') {
-          return flexibleDimensions;
-        }
-        if (_this.hasBeenResized) {
-          return flexibleDimensions;
-        }
-        var mediaSingleNodeParent = _this.getMediaSingleNode(_this.getPos);
+      var pos = _this.getPos();
+      if (typeof pos !== 'number') {
+        return flexibleDimensions;
+      }
+      if (_this.hasBeenResized) {
+        return flexibleDimensions;
+      }
+      var mediaSingleNodeParent = _this.getMediaSingleNode(_this.getPos);
 
-        // If media parent not found, return default
-        if (!mediaSingleNodeParent) {
-          return flexibleDimensions;
-        }
-        if (expValEquals('platform_editor_media_vc_fixes_patch1', 'isEnabled', true)) {
-          if (_this.hasPxWidthType(mediaSingleNodeParent)) {
-            return {
-              width: "".concat(mediaSingleNodeParent.attrs.width, "px"),
-              height: '100%'
-            };
-          }
-          return flexibleDimensions;
+      // If media parent not found, return default
+      if (!mediaSingleNodeParent) {
+        return flexibleDimensions;
+      }
+      if (expValEquals('platform_editor_media_vc_fixes_patch1', 'isEnabled', true)) {
+        if (_this.hasPxWidthType(mediaSingleNodeParent)) {
+          return {
+            width: "".concat(mediaSingleNodeParent.attrs.width, "px"),
+            height: '100%'
+          };
         }
-
-        // Compute normal dimensions
-        var maxWidth = _this.getMaxWidthFromMediaSingleNode(mediaSingleNodeParent);
-        return {
-          width: "".concat(maxWidth, "px"),
-          height: '100%'
-        };
+        return flexibleDimensions;
       }
-      return flexibleDimensions;
+
+      // Compute normal dimensions
+      var maxWidth = _this.getMaxWidthFromMediaSingleNode(mediaSingleNodeParent);
+      return {
+        width: "".concat(maxWidth, "px"),
+        height: '100%'
+      };
     });
     _defineProperty(_this, "getMediaProviderToUse", function (mediaOptions, mediaProvider) {
       if (mediaProvider) {
         return mediaProvider;
       }
-      if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-        return mediaOptions.provider;
-      }
-      return mediaOptions.syncProvider ? Promise.resolve(mediaOptions.syncProvider) : mediaOptions.provider;
+      return mediaOptions.provider;
     });
     _defineProperty(_this, "renderMediaNodeWithState", function (contextIdentifierProvider) {
       return function (_ref2) {
@@ -247,12 +241,10 @@ var MediaNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
         // see also: https://github.com/ProseMirror/prosemirror/issues/884
         domRef.contentEditable = 'true';
       }
-      if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-        this.resizeListenerBinding = bind(domRef, {
-          type: 'resized',
-          listener: this.hasResizedListener
-        });
-      }
+      this.resizeListenerBinding = bind(domRef, {
+        type: 'resized',
+        listener: this.hasResizedListener
+      });
       return domRef;
     }
   }, {

package/dist/esm/nodeviews/mediaNodeView/media.js

@@ -47,16 +47,8 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
             mediaProvider = _context.sent;
             if (mediaProvider) {
               viewMediaClientConfig = mediaProvider.viewMediaClientConfig;
-              viewAndUploadMediaClientConfig = mediaProvider.viewAndUploadMediaClientConfig;
-              if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-                // Only update state if new configs are available and different from current state
-                if (viewMediaClientConfig && _this.state.viewMediaClientConfig !== viewMediaClientConfig || viewAndUploadMediaClientConfig && _this.state.viewAndUploadMediaClientConfig !== viewAndUploadMediaClientConfig) {
-                  _this.setState({
-                    viewMediaClientConfig: viewMediaClientConfig,
-                    viewAndUploadMediaClientConfig: viewAndUploadMediaClientConfig
-                  });
-                }
-              } else {
+              viewAndUploadMediaClientConfig = mediaProvider.viewAndUploadMediaClientConfig; // Only update state if new configs are available and different from current state
+              if (viewMediaClientConfig && _this.state.viewMediaClientConfig !== viewMediaClientConfig || viewAndUploadMediaClientConfig && _this.state.viewAndUploadMediaClientConfig !== viewAndUploadMediaClientConfig) {
                 _this.setState({
                   viewMediaClientConfig: viewMediaClientConfig,
                   viewAndUploadMediaClientConfig: viewAndUploadMediaClientConfig
@@ -159,7 +151,7 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
     _this.mediaPluginState = mediaStateKey.getState(view.state);
 
     // Initialize state from syncProvider (available on both server and client for SSR)
-    if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) && syncProvider) {
+    if (syncProvider) {
       _this.state = {
         viewMediaClientConfig: syncProvider.viewMediaClientConfig,
         viewAndUploadMediaClientConfig: syncProvider.viewAndUploadMediaClientConfig
@@ -173,7 +165,7 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
     value: function shouldComponentUpdate(nextProps, nextState) {
       var hasNewViewMediaClientConfig = !this.state.viewMediaClientConfig && nextState.viewMediaClientConfig;
       var hasNewViewAndUploadMediaClientConfig = !this.state.viewAndUploadMediaClientConfig && nextState.viewAndUploadMediaClientConfig;
-      if (this.props.selected !== nextProps.selected || this.props.node.attrs.id !== nextProps.node.attrs.id || this.props.node.attrs.collection !== nextProps.node.attrs.collection || this.props.isAIGenerating !== nextProps.isAIGenerating || this.props.maxDimensions.height !== nextProps.maxDimensions.height || this.props.maxDimensions.width !== nextProps.maxDimensions.width || this.props.contextIdentifierProvider !== nextProps.contextIdentifierProvider || this.props.isLoading !== nextProps.isLoading || this.props.mediaProvider !== nextProps.mediaProvider || expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) && this.props.syncProvider !== nextProps.syncProvider || hasNewViewMediaClientConfig || hasNewViewAndUploadMediaClientConfig) {
+      if (this.props.selected !== nextProps.selected || this.props.node.attrs.id !== nextProps.node.attrs.id || this.props.node.attrs.collection !== nextProps.node.attrs.collection || this.props.isAIGenerating !== nextProps.isAIGenerating || this.props.maxDimensions.height !== nextProps.maxDimensions.height || this.props.maxDimensions.width !== nextProps.maxDimensions.width || this.props.contextIdentifierProvider !== nextProps.contextIdentifierProvider || this.props.isLoading !== nextProps.isLoading || this.props.mediaProvider !== nextProps.mediaProvider || this.props.syncProvider !== nextProps.syncProvider || hasNewViewMediaClientConfig || hasNewViewAndUploadMediaClientConfig) {
         return true;
       }
       return false;
@@ -311,17 +303,10 @@ export var MediaNode = /*#__PURE__*/function (_Component) {
       // Check if we have any media client config available (syncProvider, state, or upload config)
       var hasNoMediaClientConfig = !viewMediaClientConfig && (fg('platform_media_video_captions') ? !viewAndUploadMediaClientConfig : true);
       if (isLoading || type !== 'external' && hasNoMediaClientConfig) {
-        if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-          return /*#__PURE__*/React.createElement(MediaCardWrapper, {
-            dimensions: originalDimensions,
-            borderWidth: borderMark === null || borderMark === void 0 ? void 0 : borderMark.attrs.size,
-            selected: selected
-          }, /*#__PURE__*/React.createElement(CardLoading, {
-            interactionName: "editor-media-card-loading"
-          }));
-        }
         return /*#__PURE__*/React.createElement(MediaCardWrapper, {
-          dimensions: originalDimensions
+          dimensions: originalDimensions,
+          borderWidth: borderMark === null || borderMark === void 0 ? void 0 : borderMark.attrs.size,
+          selected: selected
         }, /*#__PURE__*/React.createElement(CardLoading, {
           interactionName: "editor-media-card-loading"
         }));

package/dist/esm/nodeviews/mediaSingle.js

@@ -23,7 +23,6 @@ import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { isNodeSelectedOrInRange } from '@atlaskit/editor-common/utils';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { MEDIA_CONTENT_WRAP_CLASS_NAME } from '../pm-plugins/main';
 import { MediaSingleNodeNext } from './mediaSingleNext';
 var selector = function selector(states) {
@@ -228,7 +227,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
         };
       }
       // Detect mediaSingle width attribute changes and signal child media node to update
-      if (!this.hasResized && this.node.attrs.width !== node.attrs.width && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+      if (!this.hasResized && this.node.attrs.width !== node.attrs.width) {
         var target = this.dom.querySelector('div[data-prosemirror-node-name="media"]');
         target === null || target === void 0 || target.dispatchEvent(new CustomEvent('resized'));
       }

package/dist/esm/nodeviews/mediaSingleNext.js

@@ -503,7 +503,7 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     onClick: clickPlaceholder,
     placeholderMessage: mediaOptions.allowImagePreview ? captionMessages.placeholderWithDoubleClickPrompt : captionMessages.placeholder
   })));
-  if (!expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) || widthType !== 'pixel' && expValEquals('platform_editor_media_vc_fixes_patch1', 'isEnabled', true)) {
+  if (widthType !== 'pixel' && expValEquals('platform_editor_media_vc_fixes_patch1', 'isEnabled', true)) {
     return jsx(Fragment, null, canResize ? mediaOptions.allowPixelResizing ? jsx(ResizableMediaSingleNext, {
       view: view,
       getPos: getPos,
@@ -523,7 +523,7 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
       hasFallbackContainer: false,
       mediaSingleWidth: mediaSingleWidth,
       editorAppearance: editorAppearance,
-      showLegacyNotification: widthType !== 'pixel',
+      showLegacyNotification: true,
       forceHandlePositioning: mediaOptions === null || mediaOptions === void 0 ? void 0 : mediaOptions.forceHandlePositioning
     }, MediaChildren) : jsx(ResizableMediaSingle, {
       view: view,

package/dist/esm/nodeviews/toDOM-fixes/mediaSingle.js

@@ -3,7 +3,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { mediaSingleSpec } from '@atlaskit/adf-schema';
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getAttrsFromNodeMediaSingle } from './toDOMAttrs';
 var WRAPPED_LAYOUTS = ['wrap-left', 'wrap-right'];
 var ALIGNED_LAYOUTS = ['align-end', 'align-start'];
@@ -47,17 +46,9 @@ export var mediaWidthCSSCalc = function mediaWidthCSSCalc(_ref) {
   } else if (shouldHardCodePixelWidth) {
     cssCalc = "min(".concat(mediaSingleDimensionWidth, "px, ").concat(fullContainerWidth, ")");
   } else if (shouldUseBreakoutWideLogic) {
-    if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-      cssCalc = "max(var(--ak-editor--line-length), min(var(--ak-editor--breakout-wide-layout-width), var(--ak-editor-max-container-width)))";
-    } else {
-      cssCalc = "max(var(--ak-editor--line-length), min(var(--ak-editor--breakout-wide-layout-width), calc(100cqw - var(--ak-editor--breakout-full-page-guttering-padding))))";
-    }
+    cssCalc = "max(var(--ak-editor--line-length), min(var(--ak-editor--breakout-wide-layout-width), var(--ak-editor-max-container-width)))";
   } else if (shouldUseBreakoutFullWidthLogic) {
-    if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-      cssCalc = "max(var(--ak-editor--line-length), min(var(--ak-editor--full-width-layout-width), var(--ak-editor-max-container-width)))";
-    } else {
-      cssCalc = "max(var(--ak-editor--line-length), min(var(--ak-editor--full-width-layout-width), calc(100cqw - var(--ak-editor--breakout-full-page-guttering-padding))))";
-    }
+    cssCalc = "max(var(--ak-editor--line-length), min(var(--ak-editor--full-width-layout-width), var(--ak-editor-max-container-width)))";
   } else {
     cssCalc = "max(min(".concat(baseWidth, "px, min(100cqw, 100%)), ").concat(GUTTER_SIZE, ")");
   }

package/dist/esm/pm-plugins/ai-generating-decoration.js

@@ -5,6 +5,8 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
  * ProseMirror plugin that manages AI-generating decorations on media nodes.
@@ -103,9 +105,10 @@ export function createAIGeneratingDecorationPlugin() {
         };
       },
       apply: function apply(tr, pluginState, _oldState, newState) {
-        // Killswitch — if active, clear any existing decorations and stop
+        // Disabled when killswitch is on or gate/experiment off — drop decorations.
+        if (
         // eslint-disable-next-line @atlaskit/platform/use-recommended-utils -- dynamic config killswitch, not a standard feature gate
-        if (FeatureGates.getExperimentValue('maui_ai_border_killswitch', 'value', false)) {
+        FeatureGates.getExperimentValue('maui_ai_border_killswitch', 'value', false) || !fg('cc-maui-phase-2-loading') || !expValEquals('cc-maui-experiment', 'isEnabled', true)) {
           if (pluginState.generatingMediaIds.size > 0) {
             return {
               generatingMediaIds: new Set(),

package/dist/esm/ui/ResizableMediaSingle/ResizableMediaSingleNext.js

@@ -19,7 +19,6 @@ import { nonWrappedLayouts } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorGutterPaddingReduced, akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { MEDIA_PLUGIN_IS_RESIZING_KEY, MEDIA_PLUGIN_RESIZING_WIDTH_KEY } from '../../pm-plugins/main';
 import { getMediaResizeAnalyticsEvent } from '../../pm-plugins/utils/analytics';
@@ -203,11 +202,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
     _useState0 = _slicedToArray(_useState9, 2),
     hasResized = _useState0[0],
     setHasResized = _useState0[1];
-  var nodePosition = expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) ? getNodePosition(getPos) :
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useMemo(function () {
-    return getNodePosition(getPos);
-  }, [getPos]);
+  var nodePosition = getNodePosition(getPos);
   var isNestedNode = useMemo(function () {
     if (nodePosition === null) {
       return false;
@@ -242,7 +237,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
     if (isAdjacentMode || fullWidthMode) {
       return lineLength;
     }
-    if (!isResizing && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (!isResizing) {
       return "var(--ak-editor-max-container-width)";
     }
     return calcMaxWidth({
@@ -259,7 +254,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
   var minViewWidth = isResizing ? minWidth : "min(".concat(minWidth, "px, 100%)");
   var resizerNextClassName = useMemo(function () {
     var classNameNext = classnames(richMediaClassName, "image-".concat(layout), isResizing ? 'is-resizing' : 'not-resizing', className, resizerItemClassName, {
-      'display-handle': expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) ? selected && !disableHandles : selected,
+      'display-handle': selected && !disableHandles,
       'richMedia-selected': selected,
       'rich-media-wrapped': layout === 'wrap-left' || layout === 'wrap-right'
     });
@@ -274,7 +269,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
     return !!findParentNodeOfTypeClosestToPos($pos, [listItem]);
   }, [nodePosition, view]);
   var enable = useMemo(function () {
-    if (disableHandles && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (disableHandles) {
       return {
         left: false,
         right: false
@@ -381,7 +376,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
       height = _calculateSizeState.height,
       newLayout = _calculateSizeState.layout;
     var resizerDomEl = resizerContainerRef.current;
-    if (resizerDomEl && !hasResized && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+    if (resizerDomEl && !hasResized) {
       // dispatch resize event to media node DOM element inside resizerDom
       var mediaDomEl = resizerDomEl.querySelector('div[data-prosemirror-node-name="media"]');
       var event = new CustomEvent('resized');
@@ -516,7 +511,7 @@ export var ResizableMediaSingleNextFunctional = function ResizableMediaSingleNex
     snap: snaps,
     resizeRatio: nonWrappedLayouts.includes(layout) ? 2 : 1,
     "data-testid": resizerNextTestId,
-    isHandleVisible: expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true) ? selected && !disableHandles : selected,
+    isHandleVisible: selected && !disableHandles,
     handlePositioning: handlePositioning,
     handleHighlight: "full-height"
   }, children, showLegacyNotification && jsx(ResizableMediaMigrationNotification, null)));

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

@@ -22,7 +22,6 @@ import { calcColumnsFromPx, calcMediaPxWidth, calcPctFromPx, handleSides, imageA
 import { calculateSnapPoints } from '@atlaskit/editor-common/utils';
 import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { checkMediaType } from '../../pm-plugins/utils/check-media-type';
 import { wrapperStyle } from './styled';
 // eslint-disable-next-line @repo/internal/react/no-class-components
@@ -54,7 +53,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       var _this$props2 = _this.props,
         layout = _this$props2.layout,
         state = _this$props2.view.state;
-      if (!_this.hasResized && expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
+      if (!_this.hasResized) {
         var _this$wrapper;
         var mediaDomEl = (_this$wrapper = _this.wrapper) === null || _this$wrapper === void 0 ? void 0 : _this$wrapper.querySelector('div[data-prosemirror-node-name="media"]');
         if (mediaDomEl) {
@@ -361,11 +360,9 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       var enable = {};
       handleSides.forEach(function (side) {
         var oppositeSide = side === 'left' ? 'right' : 'left';
-        if (expValEquals('platform_editor_media_vc_fixes', 'isEnabled', true)) {
-          if (_this2.props.disableHandles) {
-            enable[side] = false;
-            return;
-          }
+        if (_this2.props.disableHandles) {
+          enable[side] = false;
+          return;
         }
         enable[side] = ['full-width', 'wide', 'center'].concat("wrap-".concat(oppositeSide)).concat("align-".concat(imageAlignmentMap[oppositeSide])).indexOf(layout) > -1;
         if (side === 'left' && _this2.insideInlineLike) {

package/dist/types/nodeviews/lazy-media-group.d.ts

@@ -1,5 +1,5 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import { type NodeViewConstructor } from '@atlaskit/editor-common/lazy-node-view';
+import type { NodeViewConstructor } from '@atlaskit/editor-common/lazy-node-view';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';

package/dist/types-ts4.5/nodeviews/lazy-media-group.d.ts

@@ -1,5 +1,5 @@
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
-import { type NodeViewConstructor } from '@atlaskit/editor-common/lazy-node-view';
+import type { NodeViewConstructor } from '@atlaskit/editor-common/lazy-node-view';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "12.2.6",
+	"version": "12.4.0",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/textfield": "^8.3.0",
-		"@atlaskit/tmp-editor-statsig": "^74.0.0",
+		"@atlaskit/tmp-editor-statsig": "^74.1.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^21.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -78,7 +78,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.15.0",
+		"@atlaskit/editor-common": "^114.18.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -162,6 +162,9 @@
 		},
 		"platform_editor_media_disable_save_during_upload": {
 			"type": "boolean"
+		},
+		"cc-maui-phase-2-loading": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {