@atlaskit/editor-plugin-media 1.32.0 → 1.32.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-media
 
+## 1.32.2
+
+### Patch Changes
+
+- [#144324](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/144324)
+  [`28ccc12f4b59f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/28ccc12f4b59f) -
+  Cleanup LD FF for Add comment button in the media toolbar
+
+## 1.32.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.32.0
 
 ### Minor Changes

package/dist/cjs/toolbar/index.js

@@ -203,7 +203,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
     var isChangingLayoutDisabled = false;
     var selectedNode = (0, _utils2.getSelectedMediaSingle)(state);
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.extended-resize-experience')) {
+    if ((0, _platformFeatureFlags.fg)('platform.editor.media.extended-resize-experience')) {
       var _widthPlugin$sharedSt;
       var contentWidth = widthPlugin === null || widthPlugin === void 0 || (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
       var selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
@@ -290,7 +290,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     // Pixel Entry Toolbar Support
     var selection = state.selection;
     var isWithinTable = (0, _utils.hasParentNodeOfType)([state.schema.nodes.table])(selection);
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.extended-resize-experience') && allowResizing && (!isWithinTable || allowResizingInTables === true)) {
+    if (allowResizing && (!isWithinTable || allowResizingInTables === true) && (0, _platformFeatureFlags.fg)('platform.editor.media.extended-resize-experience')) {
       var selectedMediaSingleNode = (0, _utils2.getSelectedMediaSingle)(state);
       var sizeInput = {
         type: 'custom',
@@ -388,8 +388,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         type: 'separator'
       });
     }
-    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia && allowCommentsOnMedia && (!isViewOnly || isViewOnly && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.comments-in-media-toolbar-button')) //This is required until this fix is merged: https://product-fabric.atlassian.net/browse/ED-23180
-    ) {
+    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia && allowCommentsOnMedia) {
       toolbarButtons.push((0, _comments.commentButton)(intl, state, pluginInjectionApi), {
         type: 'separator',
         supportsViewMode: true
@@ -601,7 +600,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
     scrollable: true,
     mediaAssistiveMessage: assistiveMessage
   });
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.extended-resize-experience') && allowResizing) {
+  if (allowResizing && (0, _platformFeatureFlags.fg)('platform.editor.media.extended-resize-experience')) {
     return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
       width: mediaPluginState.isResizing ? undefined : (0, _utils2.getMaxToolbarWidth)()
     });

package/dist/es2019/toolbar/index.js

@@ -12,7 +12,7 @@ import DownloadIcon from '@atlaskit/icon/glyph/download';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import { messages } from '@atlaskit/media-ui';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { showLinkingToolbar } from '../commands/linking';
 import { MediaSingleNodeSelector } from '../nodeviews/styles';
 import { getPluginState as getMediaAltTextPluginState } from '../pm-plugins/alt-text';
@@ -196,7 +196,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     const widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
     let isChangingLayoutDisabled = false;
     const selectedNode = getSelectedMediaSingle(state);
-    if (getBooleanFF('platform.editor.media.extended-resize-experience')) {
+    if (fg('platform.editor.media.extended-resize-experience')) {
       var _widthPlugin$sharedSt;
       const contentWidth = widthPlugin === null || widthPlugin === void 0 ? void 0 : (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
       const selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
@@ -281,7 +281,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       selection
     } = state;
     const isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);
-    if (getBooleanFF('platform.editor.media.extended-resize-experience') && allowResizing && (!isWithinTable || allowResizingInTables === true)) {
+    if (allowResizing && (!isWithinTable || allowResizingInTables === true) && fg('platform.editor.media.extended-resize-experience')) {
       const selectedMediaSingleNode = getSelectedMediaSingle(state);
       const sizeInput = {
         type: 'custom',
@@ -385,8 +385,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         type: 'separator'
       });
     }
-    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia && allowCommentsOnMedia && (!isViewOnly || isViewOnly && getBooleanFF('platform.editor.live-view.comments-in-media-toolbar-button')) //This is required until this fix is merged: https://product-fabric.atlassian.net/browse/ED-23180
-    ) {
+    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia && allowCommentsOnMedia) {
       toolbarButtons.push(commentButton(intl, state, pluginInjectionApi), {
         type: 'separator',
         supportsViewMode: true
@@ -603,7 +602,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     scrollable: true,
     mediaAssistiveMessage: assistiveMessage
   };
-  if (getBooleanFF('platform.editor.media.extended-resize-experience') && allowResizing) {
+  if (allowResizing && fg('platform.editor.media.extended-resize-experience')) {
     return {
       ...toolbarConfig,
       width: mediaPluginState.isResizing ? undefined : getMaxToolbarWidth()

package/dist/esm/toolbar/index.js

@@ -16,7 +16,7 @@ import DownloadIcon from '@atlaskit/icon/glyph/download';
 import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import { mediaFilmstripItemDOMSelector } from '@atlaskit/media-filmstrip';
 import { messages } from '@atlaskit/media-ui';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { showLinkingToolbar } from '../commands/linking';
 import { MediaSingleNodeSelector } from '../nodeviews/styles';
 import { getPluginState as getMediaAltTextPluginState } from '../pm-plugins/alt-text';
@@ -193,7 +193,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
     var isChangingLayoutDisabled = false;
     var selectedNode = getSelectedMediaSingle(state);
-    if (getBooleanFF('platform.editor.media.extended-resize-experience')) {
+    if (fg('platform.editor.media.extended-resize-experience')) {
       var _widthPlugin$sharedSt;
       var contentWidth = widthPlugin === null || widthPlugin === void 0 || (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
       var selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
@@ -280,7 +280,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
     // Pixel Entry Toolbar Support
     var selection = state.selection;
     var isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);
-    if (getBooleanFF('platform.editor.media.extended-resize-experience') && allowResizing && (!isWithinTable || allowResizingInTables === true)) {
+    if (allowResizing && (!isWithinTable || allowResizingInTables === true) && fg('platform.editor.media.extended-resize-experience')) {
       var selectedMediaSingleNode = getSelectedMediaSingle(state);
       var sizeInput = {
         type: 'custom',
@@ -378,8 +378,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         type: 'separator'
       });
     }
-    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia && allowCommentsOnMedia && (!isViewOnly || isViewOnly && getBooleanFF('platform.editor.live-view.comments-in-media-toolbar-button')) //This is required until this fix is merged: https://product-fabric.atlassian.net/browse/ED-23180
-    ) {
+    if (editorFeatureFlags && editorFeatureFlags.commentsOnMedia && allowCommentsOnMedia) {
       toolbarButtons.push(commentButton(intl, state, pluginInjectionApi), {
         type: 'separator',
         supportsViewMode: true
@@ -591,7 +590,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
     scrollable: true,
     mediaAssistiveMessage: assistiveMessage
   });
-  if (getBooleanFF('platform.editor.media.extended-resize-experience') && allowResizing) {
+  if (allowResizing && fg('platform.editor.media.extended-resize-experience')) {
     return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
       width: mediaPluginState.isResizing ? undefined : getMaxToolbarWidth()
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.32.0",
+	"version": "1.32.2",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,10 +36,10 @@
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^90.2.0",
+		"@atlaskit/editor-common": "^91.0.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
-		"@atlaskit/editor-plugin-annotation": "1.19.7",
+		"@atlaskit/editor-plugin-annotation": "1.19.8",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
@@ -132,9 +132,6 @@
 			"type": "boolean",
 			"referenceOnly": "true"
 		},
-		"platform.editor.live-view.comments-in-media-toolbar-button": {
-			"type": "boolean"
-		},
 		"platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
 			"type": "boolean"
 		},