@atlaskit/editor-plugin-media 14.3.0 → 14.3.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-media
 
+## 14.3.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.3.1
+
+### Patch Changes
+
+- [`4fa93c380fa24`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4fa93c380fa24) -
+  Clean up platform editor typography UGC feature gate
+
 ## 14.3.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/mediaSingleNext.js

@@ -21,7 +21,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _mediaClient = require("@atlaskit/media-client");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _captions = require("../pm-plugins/commands/captions");
 var _mediaCommon = require("../pm-plugins/utils/media-common");
 var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
@@ -503,18 +502,11 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
     }));
   }), (0, _react2.jsx)(_reactNodeView.NodeViewContentHole, {
     ref: forwardRef
-  }), shouldShowPlaceholder && ((0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') ? (0, _react2.jsx)(_CaptionPlaceholder.CaptionPlaceholderButton
-  // platform_editor_typography_ugc clean up
-  // remove typecasting
-  , {
+  }), shouldShowPlaceholder && (0, _react2.jsx)(_CaptionPlaceholder.CaptionPlaceholderButton, {
     ref: captionPlaceHolderRef,
     onClick: clickPlaceholder,
     placeholderMessage: mediaOptions.allowImagePreview ? _media.captionMessages.placeholderWithDoubleClickPrompt : _media.captionMessages.placeholder
-  }) : (0, _react2.jsx)(_CaptionPlaceholder.CaptionPlaceholder, {
-    ref: captionPlaceHolderRef,
-    onClick: clickPlaceholder,
-    placeholderMessage: mediaOptions.allowImagePreview ? _media.captionMessages.placeholderWithDoubleClickPrompt : _media.captionMessages.placeholder
-  })));
+  }));
   if (widthType !== 'pixel') {
     return (0, _react2.jsx)(_react.Fragment, null, canResize ? mediaOptions.allowPixelResizing ? (0, _react2.jsx)(_ResizableMediaSingleNext.default, {
       view: view,

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

@@ -1,32 +1,27 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CaptionPlaceholderButton = exports.CaptionPlaceholder = void 0;
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+exports.CaptionPlaceholderButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
 var _media = require("@atlaskit/editor-common/media");
 var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _primitives = require("@atlaskit/primitives");
-var _templateObject;
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /* eslint-disable @atlaskit/design-system/use-primitives-text */
-// This had to be disabled to add an id and styles to a component that could not be replaced with Text
-// This was added in a experiment cleanup and should be removed if possible
-// Be sure to use primitives in this file as needed
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-var placeholder = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\tcolor: ", ";\n\twidth: 100%;\n\ttext-align: center;\n\tmargin-top: ", " !important;\n\tdisplay: block;\n"])), "var(--ds-text-subtlest, #6B6E76)", "var(--ds-space-100, 8px)");
+
 var placeholderText = (0, _react2.css)({
   color: "var(--ds-text-subtlest, #6B6E76)"
 });
@@ -34,40 +29,9 @@ var placeholderButton = (0, _primitives.xcss)({
   width: '100%',
   marginTop: 'space.100'
 });
-// platform_editor_typography_ugc clean up
-// Remove this component
-var CaptionPlaceholder = exports.CaptionPlaceholder = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
+var CaptionPlaceholderButton = exports.CaptionPlaceholderButton = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var onClick = _ref.onClick,
     placeholderMessage = _ref.placeholderMessage;
-  var handlePointerDown = (0, _react.useCallback)(function (e) {
-    e.preventDefault();
-    onClick();
-  }, [onClick]);
-  var computedPlaceholderMessage = placeholderMessage ? placeholderMessage : _media.captionMessages.placeholder;
-
-  // This issue is a temporary fix for users being able to edit captions on edge browsers. This will be removed
-  // replaced with CaptionPlaceholderButton in the near future and this code can be removed.
-  return (
-    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
-    (0, _react2.jsx)("span", {
-      ref: ref,
-      css: placeholder,
-      onPointerDown: handlePointerDown
-      // This id is just used for setting styles at the moment, if it's needed for anything more specific
-      // It may need to be generated to avoid overlap
-      ,
-      id: _mediaSingle.CAPTION_PLACEHOLDER_ID,
-      "data-id": _mediaSingle.CAPTION_PLACEHOLDER_ID,
-      "data-testid": "caption-placeholder"
-    }, (0, _react2.jsx)(_reactIntl.FormattedMessage
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    , computedPlaceholderMessage))
-  );
-});
-var CaptionPlaceholderButton = exports.CaptionPlaceholderButton = /*#__PURE__*/_react.default.forwardRef(function (_ref2, ref) {
-  var onClick = _ref2.onClick,
-    placeholderMessage = _ref2.placeholderMessage;
   var handleMouseDown = (0, _react.useCallback)(function (e) {
     // In firefox, button is focused when mouse down, which make editor lose focus
     // Hence we want to disabled it so that user can type in caption directly after click

package/dist/es2019/nodeviews/mediaSingleNext.js

@@ -16,10 +16,9 @@ import { MediaSingle } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../pm-plugins/commands/captions';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
-import { CaptionPlaceholder, CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
+import { CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
 import { CommentBadgeWrapper } from '../ui/CommentBadge';
 import ResizableMediaSingle from '../ui/ResizableMediaSingle';
 import ResizableMediaSingleNext from '../ui/ResizableMediaSingle/ResizableMediaSingleNext';
@@ -462,18 +461,11 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
     isDrafting: isCurrentNodeDrafting
   }))), jsx(NodeViewContentHole, {
     ref: forwardRef
-  }), shouldShowPlaceholder && (fg('platform_editor_typography_ugc') ? jsx(CaptionPlaceholderButton
-  // platform_editor_typography_ugc clean up
-  // remove typecasting
-  , {
+  }), shouldShowPlaceholder && jsx(CaptionPlaceholderButton, {
     ref: captionPlaceHolderRef,
     onClick: clickPlaceholder,
     placeholderMessage: mediaOptions.allowImagePreview ? captionMessages.placeholderWithDoubleClickPrompt : captionMessages.placeholder
-  }) : jsx(CaptionPlaceholder, {
-    ref: captionPlaceHolderRef,
-    onClick: clickPlaceholder,
-    placeholderMessage: mediaOptions.allowImagePreview ? captionMessages.placeholderWithDoubleClickPrompt : captionMessages.placeholder
-  })));
+  }));
   if (widthType !== 'pixel') {
     return jsx(Fragment, null, canResize ? mediaOptions.allowPixelResizing ? jsx(ResizableMediaSingleNext, {
       view: view,

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

@@ -1,7 +1,4 @@
 /* eslint-disable @atlaskit/design-system/use-primitives-text */
-// This had to be disabled to add an id and styles to a component that could not be replaced with Text
-// This was added in a experiment cleanup and should be removed if possible
-// Be sure to use primitives in this file as needed
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -15,14 +12,6 @@ import { captionMessages as messages } from '@atlaskit/editor-common/media';
 import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Pressable, xcss } from '@atlaskit/primitives';
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-const placeholder = css`
-	color: ${"var(--ds-text-subtlest, #6B6E76)"};
-	width: 100%;
-	text-align: center;
-	margin-top: ${"var(--ds-space-100, 8px)"} !important;
-	display: block;
-`;
 const placeholderText = css({
   color: "var(--ds-text-subtlest, #6B6E76)"
 });
@@ -30,38 +19,6 @@ const placeholderButton = xcss({
   width: '100%',
   marginTop: 'space.100'
 });
-// platform_editor_typography_ugc clean up
-// Remove this component
-export const CaptionPlaceholder = /*#__PURE__*/React.forwardRef(({
-  onClick,
-  placeholderMessage
-}, ref) => {
-  const handlePointerDown = useCallback(e => {
-    e.preventDefault();
-    onClick();
-  }, [onClick]);
-  const computedPlaceholderMessage = placeholderMessage ? placeholderMessage : messages.placeholder;
-
-  // This issue is a temporary fix for users being able to edit captions on edge browsers. This will be removed
-  // replaced with CaptionPlaceholderButton in the near future and this code can be removed.
-  return (
-    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
-    jsx("span", {
-      ref: ref,
-      css: placeholder,
-      onPointerDown: handlePointerDown
-      // This id is just used for setting styles at the moment, if it's needed for anything more specific
-      // It may need to be generated to avoid overlap
-      ,
-      id: CAPTION_PLACEHOLDER_ID,
-      "data-id": CAPTION_PLACEHOLDER_ID,
-      "data-testid": "caption-placeholder"
-    }, jsx(FormattedMessage
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    , computedPlaceholderMessage))
-  );
-});
 export const CaptionPlaceholderButton = /*#__PURE__*/React.forwardRef(({
   onClick,
   placeholderMessage

package/dist/esm/nodeviews/mediaSingleNext.js

@@ -22,10 +22,9 @@ import { MediaSingle } from '@atlaskit/editor-common/ui';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { getAttrsFromUrl } from '@atlaskit/media-client';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { insertAndSelectCaptionFromMediaSinglePos } from '../pm-plugins/commands/captions';
 import { isMediaBlobUrlFromAttrs } from '../pm-plugins/utils/media-common';
-import { CaptionPlaceholder, CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
+import { CaptionPlaceholderButton } from '../ui/CaptionPlaceholder';
 import { CommentBadgeWrapper } from '../ui/CommentBadge';
 import ResizableMediaSingle from '../ui/ResizableMediaSingle';
 import ResizableMediaSingleNext from '../ui/ResizableMediaSingle/ResizableMediaSingleNext';
@@ -497,18 +496,11 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
     }));
   }), jsx(NodeViewContentHole, {
     ref: forwardRef
-  }), shouldShowPlaceholder && (fg('platform_editor_typography_ugc') ? jsx(CaptionPlaceholderButton
-  // platform_editor_typography_ugc clean up
-  // remove typecasting
-  , {
+  }), shouldShowPlaceholder && jsx(CaptionPlaceholderButton, {
     ref: captionPlaceHolderRef,
     onClick: clickPlaceholder,
     placeholderMessage: mediaOptions.allowImagePreview ? captionMessages.placeholderWithDoubleClickPrompt : captionMessages.placeholder
-  }) : jsx(CaptionPlaceholder, {
-    ref: captionPlaceHolderRef,
-    onClick: clickPlaceholder,
-    placeholderMessage: mediaOptions.allowImagePreview ? captionMessages.placeholderWithDoubleClickPrompt : captionMessages.placeholder
-  })));
+  }));
   if (widthType !== 'pixel') {
     return jsx(Fragment, null, canResize ? mediaOptions.allowPixelResizing ? jsx(ResizableMediaSingleNext, {
       view: view,

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

@@ -1,9 +1,4 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
 /* eslint-disable @atlaskit/design-system/use-primitives-text */
-// This had to be disabled to add an id and styles to a component that could not be replaced with Text
-// This was added in a experiment cleanup and should be removed if possible
-// Be sure to use primitives in this file as needed
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -17,8 +12,6 @@ import { captionMessages as messages } from '@atlaskit/editor-common/media';
 import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Pressable, xcss } from '@atlaskit/primitives';
-// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-var placeholder = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\tcolor: ", ";\n\twidth: 100%;\n\ttext-align: center;\n\tmargin-top: ", " !important;\n\tdisplay: block;\n"])), "var(--ds-text-subtlest, #6B6E76)", "var(--ds-space-100, 8px)");
 var placeholderText = css({
   color: "var(--ds-text-subtlest, #6B6E76)"
 });
@@ -26,40 +19,9 @@ var placeholderButton = xcss({
   width: '100%',
   marginTop: 'space.100'
 });
-// platform_editor_typography_ugc clean up
-// Remove this component
-export var CaptionPlaceholder = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+export var CaptionPlaceholderButton = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var onClick = _ref.onClick,
     placeholderMessage = _ref.placeholderMessage;
-  var handlePointerDown = useCallback(function (e) {
-    e.preventDefault();
-    onClick();
-  }, [onClick]);
-  var computedPlaceholderMessage = placeholderMessage ? placeholderMessage : messages.placeholder;
-
-  // This issue is a temporary fix for users being able to edit captions on edge browsers. This will be removed
-  // replaced with CaptionPlaceholderButton in the near future and this code can be removed.
-  return (
-    // eslint-disable-next-line @atlaskit/design-system/use-primitives-text
-    jsx("span", {
-      ref: ref,
-      css: placeholder,
-      onPointerDown: handlePointerDown
-      // This id is just used for setting styles at the moment, if it's needed for anything more specific
-      // It may need to be generated to avoid overlap
-      ,
-      id: CAPTION_PLACEHOLDER_ID,
-      "data-id": CAPTION_PLACEHOLDER_ID,
-      "data-testid": "caption-placeholder"
-    }, jsx(FormattedMessage
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    , computedPlaceholderMessage))
-  );
-});
-export var CaptionPlaceholderButton = /*#__PURE__*/React.forwardRef(function (_ref2, ref) {
-  var onClick = _ref2.onClick,
-    placeholderMessage = _ref2.placeholderMessage;
   var handleMouseDown = useCallback(function (e) {
     // In firefox, button is focused when mouse down, which make editor lose focus
     // Hence we want to disabled it so that user can type in caption directly after click

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

@@ -11,6 +11,5 @@ type CaptionPlaceholderProps = {
         id: string;
     };
 };
-export declare const CaptionPlaceholder: React.ForwardRefExoticComponent<CaptionPlaceholderProps & React.RefAttributes<HTMLSpanElement>>;
 export declare const CaptionPlaceholderButton: React.ForwardRefExoticComponent<CaptionPlaceholderProps & React.RefAttributes<HTMLButtonElement>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "14.3.0",
+	"version": "14.3.2",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,9 +44,9 @@
 		"@atlaskit/editor-shared-styles": "^4.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/form": "^16.1.0",
-		"@atlaskit/icon": "^36.2.0",
+		"@atlaskit/icon": "^37.0.0",
 		"@atlaskit/icon-lab": "^7.3.0",
-		"@atlaskit/media-card": "^81.3.0",
+		"@atlaskit/media-card": "^81.4.0",
 		"@atlaskit/media-client": "^37.2.0",
 		"@atlaskit/media-client-react": "^6.1.0",
 		"@atlaskit/media-common": "^14.3.0",
@@ -69,7 +69,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.24.0",
+		"@atlaskit/editor-common": "^116.25.0",
 		"@atlaskit/media-core": "^38.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -118,9 +118,6 @@
 		"platform_media_cross_client_copy_with_auth": {
 			"type": "boolean"
 		},
-		"platform_editor_typography_ugc": {
-			"type": "boolean"
-		},
 		"platform_editor_introduce_insert_media_command": {
 			"type": "boolean"
 		},