@atlaskit/editor-plugin-media 3.0.5 → 3.0.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-media
 
+## 3.0.6
+
+### Patch Changes
+
+- [#157322](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/157322)
+  [`0e61040734cef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0e61040734cef) -
+  [ED-27842] Consolidate extraneous no_cursor flags into one flag for full rollout
+- Updated dependencies
+
 ## 3.0.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/mediaSingle.js

@@ -612,12 +612,13 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
     editorDisabled = _useSharedState.editorDisabled,
     viewMode = _useSharedState.viewMode;
   var hasHadInteraction = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'interaction.hasHadInteraction');
+  var interactionState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'interaction.interactionState');
   var mediaProvider = (0, _react.useMemo)(function () {
     return mediaProviderPromise ? Promise.resolve(mediaProviderPromise) : undefined;
   }, [mediaProviderPromise]);
   var isSelectedAndInteracted = (0, _react.useCallback)(function () {
-    return Boolean(selected() && hasHadInteraction !== false);
-  }, [hasHadInteraction, selected]);
+    return Boolean(selected() && ((0, _platformFeatureFlags.fg)('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : hasHadInteraction !== false));
+  }, [hasHadInteraction, interactionState, selected]);
   if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2__media_single') || (0, _platformFeatureFlags.fg)('platform_editor_react18_phase2__media_single_jira')) {
     return (0, _react2.jsx)(_mediaSingleNext.MediaSingleNodeNext, {
       width: width || 0,
@@ -629,7 +630,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
       mediaOptions: mediaOptions,
       view: view,
       fullWidthMode: fullWidthMode,
-      selected: (0, _platformFeatureFlags.fg)('platform_editor_no_selection_until_interaction') ? isSelectedAndInteracted : selected,
+      selected: (0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init') ? isSelectedAndInteracted : selected,
       eventDispatcher: eventDispatcher,
       addPendingTask: addPendingTask,
       isDrafting: isDrafting,
@@ -652,7 +653,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
     mediaOptions: mediaOptions,
     view: view,
     fullWidthMode: fullWidthMode,
-    selected: (0, _platformFeatureFlags.fg)('platform_editor_no_selection_until_interaction') ? isSelectedAndInteracted : selected,
+    selected: (0, _platformFeatureFlags.fg)('platform_editor_no_cursor_on_live_doc_init') ? isSelectedAndInteracted : selected,
     eventDispatcher: eventDispatcher,
     addPendingTask: addPendingTask,
     isDrafting: isDrafting,

package/dist/es2019/nodeviews/mediaSingle.js

@@ -526,8 +526,9 @@ const MediaSingleNodeWrapper = ({
     viewMode
   } = useSharedState(pluginInjectionApi);
   const hasHadInteraction = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.hasHadInteraction');
+  const interactionState = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.interactionState');
   const mediaProvider = useMemo(() => mediaProviderPromise ? Promise.resolve(mediaProviderPromise) : undefined, [mediaProviderPromise]);
-  const isSelectedAndInteracted = useCallback(() => Boolean(selected() && hasHadInteraction !== false), [hasHadInteraction, selected]);
+  const isSelectedAndInteracted = useCallback(() => Boolean(selected() && (fg('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : hasHadInteraction !== false)), [hasHadInteraction, interactionState, selected]);
   if (fg('platform_editor_react18_phase2__media_single') || fg('platform_editor_react18_phase2__media_single_jira')) {
     return jsx(MediaSingleNodeNext, {
       width: width || 0,
@@ -539,7 +540,7 @@ const MediaSingleNodeWrapper = ({
       mediaOptions: mediaOptions,
       view: view,
       fullWidthMode: fullWidthMode,
-      selected: fg('platform_editor_no_selection_until_interaction') ? isSelectedAndInteracted : selected,
+      selected: fg('platform_editor_no_cursor_on_live_doc_init') ? isSelectedAndInteracted : selected,
       eventDispatcher: eventDispatcher,
       addPendingTask: addPendingTask,
       isDrafting: isDrafting,
@@ -562,7 +563,7 @@ const MediaSingleNodeWrapper = ({
     mediaOptions: mediaOptions,
     view: view,
     fullWidthMode: fullWidthMode,
-    selected: fg('platform_editor_no_selection_until_interaction') ? isSelectedAndInteracted : selected,
+    selected: fg('platform_editor_no_cursor_on_live_doc_init') ? isSelectedAndInteracted : selected,
     eventDispatcher: eventDispatcher,
     addPendingTask: addPendingTask,
     isDrafting: isDrafting,

package/dist/esm/nodeviews/mediaSingle.js

@@ -607,12 +607,13 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
     editorDisabled = _useSharedState.editorDisabled,
     viewMode = _useSharedState.viewMode;
   var hasHadInteraction = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.hasHadInteraction');
+  var interactionState = useSharedPluginStateSelector(pluginInjectionApi, 'interaction.interactionState');
   var mediaProvider = useMemo(function () {
     return mediaProviderPromise ? Promise.resolve(mediaProviderPromise) : undefined;
   }, [mediaProviderPromise]);
   var isSelectedAndInteracted = useCallback(function () {
-    return Boolean(selected() && hasHadInteraction !== false);
-  }, [hasHadInteraction, selected]);
+    return Boolean(selected() && (fg('platform_editor_interaction_api_refactor') ? interactionState !== 'hasNotHadInteraction' : hasHadInteraction !== false));
+  }, [hasHadInteraction, interactionState, selected]);
   if (fg('platform_editor_react18_phase2__media_single') || fg('platform_editor_react18_phase2__media_single_jira')) {
     return jsx(MediaSingleNodeNext, {
       width: width || 0,
@@ -624,7 +625,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
       mediaOptions: mediaOptions,
       view: view,
       fullWidthMode: fullWidthMode,
-      selected: fg('platform_editor_no_selection_until_interaction') ? isSelectedAndInteracted : selected,
+      selected: fg('platform_editor_no_cursor_on_live_doc_init') ? isSelectedAndInteracted : selected,
       eventDispatcher: eventDispatcher,
       addPendingTask: addPendingTask,
       isDrafting: isDrafting,
@@ -647,7 +648,7 @@ var MediaSingleNodeWrapper = function MediaSingleNodeWrapper(_ref6) {
     mediaOptions: mediaOptions,
     view: view,
     fullWidthMode: fullWidthMode,
-    selected: fg('platform_editor_no_selection_until_interaction') ? isSelectedAndInteracted : selected,
+    selected: fg('platform_editor_no_cursor_on_live_doc_init') ? isSelectedAndInteracted : selected,
     eventDispatcher: eventDispatcher,
     addPendingTask: addPendingTask,
     isDrafting: isDrafting,

package/dist/types/pm-plugins/pixel-resizing/index.d.ts

@@ -1,5 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 declare const createCommand: <A = {
     type: "openPixelEditor";
 } | {

package/dist/types/pm-plugins/pixel-resizing/ui/index.d.ts

@@ -4,8 +4,8 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { HoverDecorationHandler } from '@atlaskit/editor-plugin-decorations';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { MediaNextEditorPluginType } from '../../../mediaPluginType';
-import { MediaPluginState } from '../../../types';
+import type { MediaNextEditorPluginType } from '../../../mediaPluginType';
+import type { MediaPluginState } from '../../../types';
 export type Props = {
     editorView: EditorView;
     selectedMediaSingleNode: ContentNodeWithPos;

package/dist/types/ui/MediaPicker/BrowserWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     isOpen?: boolean;

package/dist/types/ui/MediaPicker/ClipboardWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     featureFlags?: MediaFeatureFlags;

package/dist/types/ui/MediaPicker/DropzoneWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     isActive: boolean;

package/dist/types/ui/MediaPicker/PickerFacadeProvider.d.ts

@@ -1,8 +1,8 @@
 import type React from 'react';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { BrowserConfig, ClipboardConfig, DropzoneConfig } from '@atlaskit/media-picker/types';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import PickerFacade from '../../pm-plugins/picker-facade';
 interface ChildrenProps {
     config: ClipboardConfig | BrowserConfig | DropzoneConfig;

package/dist/types/ui/toolbar/pixel-resizing.d.ts

@@ -1,8 +1,8 @@
-import { IntlShape } from 'react-intl-next';
-import { FloatingToolbarConfig, FloatingToolbarOverflowDropdownOptions, Command } from '@atlaskit/editor-common/types';
+import { type IntlShape } from 'react-intl-next';
+import { type FloatingToolbarConfig, type FloatingToolbarOverflowDropdownOptions, type Command } from '@atlaskit/editor-common/types';
 import { NodeType } from '@atlaskit/editor-prosemirror/model';
 import { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { Props } from '../../pm-plugins/pixel-resizing/ui';
-import { MediaOptions, MediaToolbarBaseConfig } from '../../types';
+import { type Props } from '../../pm-plugins/pixel-resizing/ui';
+import type { MediaOptions, MediaToolbarBaseConfig } from '../../types';
 export declare const getPixelResizingToolbar: (toolbarBaseConfig: MediaToolbarBaseConfig, { pluginInjectionApi, intl, pluginState, hoverDecoration, isEditorFullWidthEnabled, triggerButtonSelector, }: Omit<Props, 'editorView' | 'selectedMediaSingleNode'>) => FloatingToolbarConfig;
 export declare const getResizeDropdownOption: (mediaOptions: MediaOptions, state: EditorState, formatMessage: IntlShape['formatMessage'], selectedNodeType?: NodeType) => FloatingToolbarOverflowDropdownOptions<Command>;

package/dist/types/ui/toolbar/utils.d.ts

@@ -1,6 +1,6 @@
 import type { ExternalMediaAttributes, MediaADFAttrs, RichMediaLayout } from '@atlaskit/adf-schema';
 import type { LayoutIcon } from '@atlaskit/editor-common/card';
-import { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
+import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import type { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';

package/dist/types-ts4.5/pm-plugins/pixel-resizing/index.d.ts

@@ -1,5 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 declare const createCommand: <A = {
     type: "openPixelEditor";
 } | {

package/dist/types-ts4.5/pm-plugins/pixel-resizing/ui/index.d.ts

@@ -4,8 +4,8 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { HoverDecorationHandler } from '@atlaskit/editor-plugin-decorations';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { MediaNextEditorPluginType } from '../../../mediaPluginType';
-import { MediaPluginState } from '../../../types';
+import type { MediaNextEditorPluginType } from '../../../mediaPluginType';
+import type { MediaPluginState } from '../../../types';
 export type Props = {
     editorView: EditorView;
     selectedMediaSingleNode: ContentNodeWithPos;

package/dist/types-ts4.5/ui/MediaPicker/BrowserWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     isOpen?: boolean;

package/dist/types-ts4.5/ui/MediaPicker/ClipboardWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     featureFlags?: MediaFeatureFlags;

package/dist/types-ts4.5/ui/MediaPicker/DropzoneWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { EditorAppearance, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaFeatureFlags } from '@atlaskit/media-common/mediaFeatureFlags';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 type Props = {
     api: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     isActive: boolean;

package/dist/types-ts4.5/ui/MediaPicker/PickerFacadeProvider.d.ts

@@ -1,8 +1,8 @@
 import type React from 'react';
-import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { BrowserConfig, ClipboardConfig, DropzoneConfig } from '@atlaskit/media-picker/types';
-import { MediaNextEditorPluginType } from '../../mediaPluginType';
+import type { MediaNextEditorPluginType } from '../../mediaPluginType';
 import PickerFacade from '../../pm-plugins/picker-facade';
 interface ChildrenProps {
     config: ClipboardConfig | BrowserConfig | DropzoneConfig;

package/dist/types-ts4.5/ui/toolbar/pixel-resizing.d.ts

@@ -1,8 +1,8 @@
-import { IntlShape } from 'react-intl-next';
-import { FloatingToolbarConfig, FloatingToolbarOverflowDropdownOptions, Command } from '@atlaskit/editor-common/types';
+import { type IntlShape } from 'react-intl-next';
+import { type FloatingToolbarConfig, type FloatingToolbarOverflowDropdownOptions, type Command } from '@atlaskit/editor-common/types';
 import { NodeType } from '@atlaskit/editor-prosemirror/model';
 import { EditorState } from '@atlaskit/editor-prosemirror/state';
-import { Props } from '../../pm-plugins/pixel-resizing/ui';
-import { MediaOptions, MediaToolbarBaseConfig } from '../../types';
+import { type Props } from '../../pm-plugins/pixel-resizing/ui';
+import type { MediaOptions, MediaToolbarBaseConfig } from '../../types';
 export declare const getPixelResizingToolbar: (toolbarBaseConfig: MediaToolbarBaseConfig, { pluginInjectionApi, intl, pluginState, hoverDecoration, isEditorFullWidthEnabled, triggerButtonSelector, }: Omit<Props, 'editorView' | 'selectedMediaSingleNode'>) => FloatingToolbarConfig;
 export declare const getResizeDropdownOption: (mediaOptions: MediaOptions, state: EditorState, formatMessage: IntlShape['formatMessage'], selectedNodeType?: NodeType) => FloatingToolbarOverflowDropdownOptions<Command>;

package/dist/types-ts4.5/ui/toolbar/utils.d.ts

@@ -1,6 +1,6 @@
 import type { ExternalMediaAttributes, MediaADFAttrs, RichMediaLayout } from '@atlaskit/adf-schema';
 import type { LayoutIcon } from '@atlaskit/editor-common/card';
-import { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
+import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 import type { Node as ProseMirrorNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "3.0.5",
+	"version": "3.0.6",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,8 +37,8 @@
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/button": "^23.0.0",
-		"@atlaskit/editor-common": "^105.2.0",
+		"@atlaskit/button": "^23.2.0",
+		"@atlaskit/editor-common": "^105.8.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-annotation": "^2.8.0",
@@ -50,28 +50,28 @@
 		"@atlaskit/editor-plugin-focus": "^1.5.0",
 		"@atlaskit/editor-plugin-grid": "^2.0.0",
 		"@atlaskit/editor-plugin-guideline": "^2.0.0",
-		"@atlaskit/editor-plugin-interaction": "^1.0.0",
+		"@atlaskit/editor-plugin-interaction": "^1.1.0",
 		"@atlaskit/editor-plugin-selection": "^2.2.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/form": "^12.0.0",
-		"@atlaskit/icon": "^26.0.0",
-		"@atlaskit/media-card": "^79.2.0",
-		"@atlaskit/media-client": "^33.1.0",
-		"@atlaskit/media-client-react": "^4.0.0",
-		"@atlaskit/media-common": "^12.0.0",
-		"@atlaskit/media-filmstrip": "^50.0.0",
+		"@atlaskit/icon": "^26.1.0",
+		"@atlaskit/media-card": "^79.3.0",
+		"@atlaskit/media-client": "^33.3.0",
+		"@atlaskit/media-client-react": "^4.1.0",
+		"@atlaskit/media-common": "^12.1.0",
+		"@atlaskit/media-filmstrip": "^50.1.0",
 		"@atlaskit/media-picker": "^69.0.0",
-		"@atlaskit/media-ui": "^28.1.0",
-		"@atlaskit/media-viewer": "^52.0.0",
+		"@atlaskit/media-ui": "^28.2.0",
+		"@atlaskit/media-viewer": "^52.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.7.0",
+		"@atlaskit/primitives": "^14.8.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.21.0",
-		"@atlaskit/tokens": "^4.8.0",
+		"@atlaskit/tmp-editor-statsig": "^4.23.0",
+		"@atlaskit/tokens": "^4.9.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -184,7 +184,7 @@
 		"platform_editor_fix_image_size_diff_during_ssr": {
 			"type": "boolean"
 		},
-		"platform_editor_no_selection_until_interaction": {
+		"platform_editor_no_cursor_on_live_doc_init": {
 			"type": "boolean"
 		},
 		"platform_editor_controls_patch_7": {
@@ -204,6 +204,9 @@
 		},
 		"platform_editor_controls_patch_9": {
 			"type": "boolean"
+		},
+		"platform_editor_interaction_api_refactor": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {