@atlaskit/editor-plugin-media 1.37.3 → 1.38.0

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

@@ -4,6 +4,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { RawIntlProvider } from 'react-intl-next';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { mediaInlineImagesEnabled } from '@atlaskit/editor-common/media-inline';
 import { CAPTION_PLACEHOLDER_ID, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -20,10 +21,10 @@ import * as helpers from '../commands/helpers';
 import { updateMediaNodeAttrs } from '../commands/helpers';
 import PickerFacade from '../picker-facade';
 import DropPlaceholder from '../ui/Media/DropPlaceholder';
-import { getMediaFromSupportedMediaNodesFromSelection, removeMediaNode, splitMediaGroup } from '../utils/media-common';
+import { getMediaFromSupportedMediaNodesFromSelection, isNodeDoubleClickSupportedInLivePagesViewMode, removeMediaNode, splitMediaGroup } from '../utils/media-common';
 import { insertMediaGroupNode, insertMediaInlineNode } from '../utils/media-files';
 import { getMediaNodeInsertionType } from '../utils/media-inline';
-import { insertMediaSingleNode, isVideo } from '../utils/media-single';
+import { insertMediaSingleNode } from '../utils/media-single';
 import { ACTIONS } from './actions';
 import { MediaTaskManager } from './mediaTaskManager';
 import { stateKey } from './plugin-key';
@@ -817,18 +818,33 @@ export const createPlugin = (_schema, options, getIntl, pluginInjectionApi, disp
       },
       handleDoubleClickOn: view => {
         var _pluginInjectionApi$e, _pluginInjectionApi$e2;
-        if (!fg('platform_editor_media_previewer_bugfix') || !fg('platform_editor_media_interaction_improvements') || (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.mode) === 'view') {
+        if (!fg('platform_editor_media_previewer_bugfix') || !fg('platform_editor_media_interaction_improvements')) {
           return;
         }
+        const isLivePagesViewMode = (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.mode) === 'view';
 
         // Double Click support for Media Viewer Nodes
         const maybeMediaNode = getMediaFromSupportedMediaNodesFromSelection(view.state);
         if (maybeMediaNode) {
+          var _pluginInjectionApi$a;
           // If media type is video, do not open media viewer
-          if (isVideo(maybeMediaNode.attrs.__fileMimeType)) {
+          if (!isNodeDoubleClickSupportedInLivePagesViewMode(isLivePagesViewMode, maybeMediaNode)) {
             return false;
           }
+          // Show media viewer
           pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.core.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.media.commands.showMediaViewer(maybeMediaNode.attrs));
+
+          // Call analytics event
+          pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions.fireAnalyticsEvent({
+            action: ACTION.OPENED,
+            actionSubject: ACTION_SUBJECT.MEDIA_VIEWER,
+            actionSubjectId: ACTION_SUBJECT_ID.MEDIA,
+            eventType: EVENT_TYPE.UI,
+            attributes: {
+              nodeType: maybeMediaNode.type.name,
+              inputMethod: INPUT_METHOD.DOUBLE_CLICK
+            }
+          });
           return true;
         }
         return false;

package/dist/es2019/toolbar/assets/commentWithDotIcon.js

@@ -1,7 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import Icon from '@atlaskit/icon';
-import { Y300 } from '@atlaskit/theme/colors';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { N0, Y300 } from '@atlaskit/theme/colors';
 const IconCommentWithDotGlyph = () => {
   return /*#__PURE__*/React.createElement("svg", {
     width: "24",
@@ -29,8 +30,37 @@ const IconCommentWithDotGlyph = () => {
     fill: `var(--ds-background-warning-bold, ${Y300})`
   }));
 };
+const IconCommentConfluenceTypeWithDotGlyph = () => {
+  return /*#__PURE__*/React.createElement("svg", {
+    width: "24",
+    height: "24",
+    viewBox: "0 0 24 24",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M4.998 11.513C4.998 8.475 8.139 6.003 12 6.003C15.861 6.003 19.002 8.475 19.002 11.513C19.002 14.552 15.861 17.023 12 17.023C8.139 17.023 4.998 14.552 4.998 11.513ZM19.838 19.284V19.282C19.838 19.282 18.274 17.022 19.071 16.166L19.034 16.186C20.261 14.902 21 13.279 21 11.513C21 7.371 16.963 4 12 4C7.037 4 3 7.37 3 11.513C3 15.656 7.037 19.027 12 19.027C13.42 19.027 14.76 18.742 15.957 18.251C16.96 19.273 18.244 19.823 19.197 19.97L19.199 19.967C19.2515 19.9867 19.3069 19.9979 19.363 20C19.448 20 19.5317 19.9789 19.6067 19.9386C19.6816 19.8984 19.7453 19.8402 19.7923 19.7693C19.8392 19.6984 19.8679 19.6169 19.8757 19.5323C19.8835 19.4476 19.8712 19.3623 19.838 19.284Z",
+    fill: "currentColor"
+  }), /*#__PURE__*/React.createElement("path", {
+    d: "M16 9H8C7.44772 9 7 9.44772 7 10C7 10.5523 7.44772 11 8 11H16C16.5523 11 17 10.5523 17 10C17 9.44772 16.5523 9 16 9Z",
+    fill: "currentColor"
+  }), /*#__PURE__*/React.createElement("path", {
+    d: "M11 12H8C7.44772 12 7 12.4477 7 13C7 13.5523 7.44772 14 8 14H11C11.5523 14 12 13.5523 12 13C12 12.4477 11.5523 12 11 12Z",
+    fill: "currentColor"
+  }), /*#__PURE__*/React.createElement("rect", {
+    x: "13",
+    y: "1",
+    width: "8",
+    height: "8",
+    rx: "4",
+    stroke: `var(--ds-border-inverse, ${N0})`,
+    strokeWidth: 2,
+    fill: "var(--ds-icon-brand, #0052CC)"
+  }));
+};
 export const CommentWithDotIcon = props => {
   return /*#__PURE__*/React.createElement(Icon, _extends({
-    glyph: IconCommentWithDotGlyph
+    glyph: fg('platform_editor_media_interaction_improvements') ? IconCommentConfluenceTypeWithDotGlyph : IconCommentWithDotGlyph
   }, props));
 };

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

@@ -9,6 +9,7 @@ import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { captionMessages as messages } from '@atlaskit/editor-common/media';
 import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Pressable, Text, xcss } from '@atlaskit/primitives';
 import { N200 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
@@ -24,11 +25,16 @@ const placeholderButton = xcss({
   marginTop: 'space.100'
 });
 
-// platform_editor_typography_migration_ugc clean up
+// platform_editor_typography_ugc clean up
 // Remove this component
 export const CaptionPlaceholder = /*#__PURE__*/React.forwardRef(({
   onClick
 }, ref) => {
+  const message = fg('platform_editor_media_interaction_improvements') ? {
+    ...messages.placeholderWithDoubleClickPrompt
+  } : {
+    ...messages.placeholder
+  };
   return (
     // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
     jsx("span", {
@@ -37,7 +43,7 @@ export const CaptionPlaceholder = /*#__PURE__*/React.forwardRef(({
       onClick: onClick,
       "data-id": CAPTION_PLACEHOLDER_ID,
       "data-testid": "caption-placeholder"
-    }, jsx(FormattedMessage, messages.placeholder))
+    }, jsx(FormattedMessage, message))
   );
 });
 export const CaptionPlaceholderButton = /*#__PURE__*/React.forwardRef(({
@@ -48,6 +54,11 @@ export const CaptionPlaceholderButton = /*#__PURE__*/React.forwardRef(({
     // Hence we want to disabled it so that user can type in caption directly after click
     e.preventDefault();
   }, []);
+  const message = fg('platform_editor_media_interaction_improvements') ? {
+    ...messages.placeholderWithDoubleClickPrompt
+  } : {
+    ...messages.placeholder
+  };
   return jsx(Pressable, {
     ref: ref,
     backgroundColor: "color.background.neutral.subtle",
@@ -60,5 +71,5 @@ export const CaptionPlaceholderButton = /*#__PURE__*/React.forwardRef(({
   }, jsx(Text, {
     color: "color.text.subtlest",
     size: "large"
-  }, jsx(FormattedMessage, messages.placeholder)));
+  }, jsx(FormattedMessage, message)));
 });