@atlaskit/editor-plugin-media 8.5.2 → 8.6.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-media
 
+## 8.6.1
+
+### Patch Changes
+
+- [`b6a737b41d065`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b6a737b41d065) -
+  Clean up experiment platform_editor_fix_clone_nesting_exp
+- Updated dependencies
+
+## 8.6.0
+
+### Minor Changes
+
+- [`762b79e21f96a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/762b79e21f96a) -
+  Migrated and cleaned up legacy iconography usage.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.5.2
 
 ### Patch Changes

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

@@ -485,19 +485,14 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
   return (0, _createClass2.default)(MediaPluginStateImplementation, [{
     key: "clone",
     value: function clone() {
+      var _originalTarget;
       var clonedAt = (performance || Date).now();
 
       // Prevent double wrapping
       // If clone is repeatedly called, we want to proxy the underlying MediaPluginStateImplementation target, rather than the proxy itself
       // If we proxy the proxy, then calling get in future will need to recursively unwrap proxies to find the original target, which causes performance issues
       // Instead, we check if there is an original target stored on "this", and if so, we use that as the proxy target instead
-      // eslint-disable-next-line @typescript-eslint/no-this-alias -- This is required while this is behind a feature-gate. Once the feature-gate is removed, we can inline proxyTarget as "(this as unknown as { originalTarget?: typeof proxyTarget }).originalTarget ?? this"
-      var proxyTarget = this;
-      var originalTarget = this.originalTarget;
-      if (originalTarget !== undefined && (0, _expValEquals.expValEquals)('platform_editor_fix_clone_nesting_exp', 'isEnabled', true)) {
-        proxyTarget = originalTarget;
-      }
-      return new Proxy(proxyTarget, {
+      return new Proxy((_originalTarget = this.originalTarget) !== null && _originalTarget !== void 0 ? _originalTarget : this, {
         get: function get(target, prop, receiver) {
           if (prop === 'singletonCreatedAt') {
             return clonedAt;

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

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _icons = require("@atlaskit/editor-common/icons");
 var _media = require("@atlaskit/editor-common/media");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -20,7 +19,6 @@ var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-d
 var _strokeWeightLarge = _interopRequireDefault(require("@atlaskit/icon/core/stroke-weight-large"));
 var _strokeWeightMedium = _interopRequireDefault(require("@atlaskit/icon/core/stroke-weight-medium"));
 var _strokeWeightSmall = _interopRequireDefault(require("@atlaskit/icon/core/stroke-weight-small"));
-var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -314,8 +312,7 @@ var ImageBorder = function ImageBorder(_ref) {
     iconBefore: (0, _react2.jsx)(_border.default, {
       color: "currentColor",
       label: "",
-      spacing: "spacious",
-      LEGACY_fallbackIcon: _icons.BorderIcon
+      spacing: "spacious"
     }),
     title: enabled ? formatMessage(_media.imageBorderMessages.removeBorder) : formatMessage(_media.imageBorderMessages.addBorder)
   }), (0, _react2.jsx)("div", {
@@ -334,7 +331,6 @@ var ImageBorder = function ImageBorder(_ref) {
       color: "currentColor",
       spacing: "spacious",
       label: "",
-      LEGACY_fallbackIcon: _chevronDown2.default,
       size: "small"
     }),
     onClick: function onClick() {

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

@@ -18,10 +18,10 @@ import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as helpers from '../pm-plugins/commands/helpers';
+import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 import { getIdentifier, getMediaFromSupportedMediaNodesFromSelection, isNodeDoubleClickSupportedInLivePagesViewMode, removeMediaNode, splitMediaGroup } from '../pm-plugins/utils/media-common';
 import { insertMediaGroupNode, insertMediaInlineNode } from '../pm-plugins/utils/media-files';
 import { getMediaNodeInsertionType } from '../pm-plugins/utils/media-inline';
@@ -462,19 +462,14 @@ export class MediaPluginStateImplementation {
     this.singletonCreatedAt = (performance || Date).now();
   }
   clone() {
+    var _originalTarget;
     const clonedAt = (performance || Date).now();
 
     // Prevent double wrapping
     // If clone is repeatedly called, we want to proxy the underlying MediaPluginStateImplementation target, rather than the proxy itself
     // If we proxy the proxy, then calling get in future will need to recursively unwrap proxies to find the original target, which causes performance issues
     // Instead, we check if there is an original target stored on "this", and if so, we use that as the proxy target instead
-    // eslint-disable-next-line @typescript-eslint/no-this-alias -- This is required while this is behind a feature-gate. Once the feature-gate is removed, we can inline proxyTarget as "(this as unknown as { originalTarget?: typeof proxyTarget }).originalTarget ?? this"
-    let proxyTarget = this;
-    const originalTarget = this.originalTarget;
-    if (originalTarget !== undefined && expValEquals('platform_editor_fix_clone_nesting_exp', 'isEnabled', true)) {
-      proxyTarget = originalTarget;
-    }
-    return new Proxy(proxyTarget, {
+    return new Proxy((_originalTarget = this.originalTarget) !== null && _originalTarget !== void 0 ? _originalTarget : this, {
       get(target, prop, receiver) {
         if (prop === 'singletonCreatedAt') {
           return clonedAt;

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

@@ -6,7 +6,6 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { BorderIcon as LegacyBorderIcon } from '@atlaskit/editor-common/icons';
 import { imageBorderMessages as messages } from '@atlaskit/editor-common/media';
 import { DropdownMenuSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -18,7 +17,6 @@ import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import StrokeWeightLargeIcon from '@atlaskit/icon/core/stroke-weight-large';
 import StrokeWeightMediumIcon from '@atlaskit/icon/core/stroke-weight-medium';
 import StrokeWeightSmallIcon from '@atlaskit/icon/core/stroke-weight-small';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Text } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip';
@@ -287,8 +285,7 @@ const ImageBorder = ({
     iconBefore: jsx(BorderIcon, {
       color: "currentColor",
       label: "",
-      spacing: "spacious",
-      LEGACY_fallbackIcon: LegacyBorderIcon
+      spacing: "spacious"
     }),
     title: enabled ? formatMessage(messages.removeBorder) : formatMessage(messages.addBorder)
   }), jsx("div", {
@@ -307,7 +304,6 @@ const ImageBorder = ({
       color: "currentColor",
       spacing: "spacious",
       label: "",
-      LEGACY_fallbackIcon: ExpandIcon,
       size: "small"
     }),
     onClick: () => {

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

@@ -27,10 +27,10 @@ import { isFileIdentifier } from '@atlaskit/media-client';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as helpers from '../pm-plugins/commands/helpers';
+import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 import { getIdentifier, getMediaFromSupportedMediaNodesFromSelection, isNodeDoubleClickSupportedInLivePagesViewMode, removeMediaNode, splitMediaGroup } from '../pm-plugins/utils/media-common';
 import { insertMediaGroupNode, insertMediaInlineNode } from '../pm-plugins/utils/media-files';
 import { getMediaNodeInsertionType } from '../pm-plugins/utils/media-inline';
@@ -477,19 +477,14 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
   return _createClass(MediaPluginStateImplementation, [{
     key: "clone",
     value: function clone() {
+      var _originalTarget;
       var clonedAt = (performance || Date).now();
 
       // Prevent double wrapping
       // If clone is repeatedly called, we want to proxy the underlying MediaPluginStateImplementation target, rather than the proxy itself
       // If we proxy the proxy, then calling get in future will need to recursively unwrap proxies to find the original target, which causes performance issues
       // Instead, we check if there is an original target stored on "this", and if so, we use that as the proxy target instead
-      // eslint-disable-next-line @typescript-eslint/no-this-alias -- This is required while this is behind a feature-gate. Once the feature-gate is removed, we can inline proxyTarget as "(this as unknown as { originalTarget?: typeof proxyTarget }).originalTarget ?? this"
-      var proxyTarget = this;
-      var originalTarget = this.originalTarget;
-      if (originalTarget !== undefined && expValEquals('platform_editor_fix_clone_nesting_exp', 'isEnabled', true)) {
-        proxyTarget = originalTarget;
-      }
-      return new Proxy(proxyTarget, {
+      return new Proxy((_originalTarget = this.originalTarget) !== null && _originalTarget !== void 0 ? _originalTarget : this, {
         get: function get(target, prop, receiver) {
           if (prop === 'singletonCreatedAt') {
             return clonedAt;

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

@@ -7,7 +7,6 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { BorderIcon as LegacyBorderIcon } from '@atlaskit/editor-common/icons';
 import { imageBorderMessages as messages } from '@atlaskit/editor-common/media';
 import { DropdownMenuSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -19,7 +18,6 @@ import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import StrokeWeightLargeIcon from '@atlaskit/icon/core/stroke-weight-large';
 import StrokeWeightMediumIcon from '@atlaskit/icon/core/stroke-weight-medium';
 import StrokeWeightSmallIcon from '@atlaskit/icon/core/stroke-weight-small';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Text } from '@atlaskit/primitives/compiled';
 import Tooltip from '@atlaskit/tooltip';
@@ -306,8 +304,7 @@ var ImageBorder = function ImageBorder(_ref) {
     iconBefore: jsx(BorderIcon, {
       color: "currentColor",
       label: "",
-      spacing: "spacious",
-      LEGACY_fallbackIcon: LegacyBorderIcon
+      spacing: "spacious"
     }),
     title: enabled ? formatMessage(messages.removeBorder) : formatMessage(messages.addBorder)
   }), jsx("div", {
@@ -326,7 +323,6 @@ var ImageBorder = function ImageBorder(_ref) {
       color: "currentColor",
       spacing: "spacious",
       label: "",
-      LEGACY_fallbackIcon: ExpandIcon,
       size: "small"
     }),
     onClick: function onClick() {

package/dist/types/pm-plugins/main.d.ts

@@ -12,7 +12,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { type Identifier } from '@atlaskit/media-client';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaNextEditorPluginType } from '../mediaPluginType';
-import type { MediaOptions, MediaState, MediaStateEventSubscriber, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
+import type { getPosHandlerNode as ProsemirrorGetPosHandler, MediaOptions, MediaState, MediaStateEventSubscriber } from '../types';
 import type { MediaPluginOptions } from '../types/media-plugin-options';
 import PickerFacade from './picker-facade';
 import type { MediaNodeWithPosHandler, MediaPluginState } from './types';
@@ -64,7 +64,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     singletonCreatedAt: number;
     constructor(state: EditorState, options: MediaPluginOptions, mediaOptions: MediaOptions | undefined, dispatch: Dispatch | undefined, pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined);
-    clone(): this;
+    clone(): MediaPluginStateImplementation;
     subscribeToUploadInProgressState(fn: (isUploading: boolean) => void): void;
     unsubscribeFromUploadInProgressState(fn: (isUploading: boolean) => void): void;
     private previousMediaProvider;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -12,7 +12,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { type Identifier } from '@atlaskit/media-client';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaNextEditorPluginType } from '../mediaPluginType';
-import type { MediaOptions, MediaState, MediaStateEventSubscriber, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
+import type { getPosHandlerNode as ProsemirrorGetPosHandler, MediaOptions, MediaState, MediaStateEventSubscriber } from '../types';
 import type { MediaPluginOptions } from '../types/media-plugin-options';
 import PickerFacade from './picker-facade';
 import type { MediaNodeWithPosHandler, MediaPluginState } from './types';
@@ -64,7 +64,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined;
     singletonCreatedAt: number;
     constructor(state: EditorState, options: MediaPluginOptions, mediaOptions: MediaOptions | undefined, dispatch: Dispatch | undefined, pluginInjectionApi: ExtractInjectionAPI<MediaNextEditorPluginType> | undefined);
-    clone(): this;
+    clone(): MediaPluginStateImplementation;
     subscribeToUploadInProgressState(fn: (isUploading: boolean) => void): void;
     unsubscribeFromUploadInProgressState(fn: (isUploading: boolean) => void): void;
     private previousMediaProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "8.5.2",
+	"version": "8.6.1",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/analytics-namespaced-context": "^7.2.0",
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/button": "^23.7.0",
+		"@atlaskit/button": "^23.8.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
 		"@atlaskit/editor-plugin-annotation": "^6.3.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^6.1.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^8.0.0",
-		"@atlaskit/editor-plugin-floating-toolbar": "^8.2.0",
+		"@atlaskit/editor-plugin-floating-toolbar": "^8.3.0",
 		"@atlaskit/editor-plugin-focus": "^5.0.0",
 		"@atlaskit/editor-plugin-grid": "^6.0.0",
 		"@atlaskit/editor-plugin-guideline": "^6.0.0",
@@ -51,10 +51,10 @@
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/form": "^15.0.0",
-		"@atlaskit/icon": "^29.1.0",
-		"@atlaskit/icon-lab": "^5.12.0",
-		"@atlaskit/media-card": "^79.10.0",
+		"@atlaskit/form": "^15.1.0",
+		"@atlaskit/icon": "^29.3.0",
+		"@atlaskit/icon-lab": "^5.13.0",
+		"@atlaskit/media-card": "^79.11.0",
 		"@atlaskit/media-client": "^35.7.0",
 		"@atlaskit/media-client-react": "^4.1.0",
 		"@atlaskit/media-common": "^12.3.0",
@@ -66,8 +66,8 @@
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^15.12.0",
-		"@atlaskit/tokens": "^8.5.0",
+		"@atlaskit/tmp-editor-statsig": "^15.13.0",
+		"@atlaskit/tokens": "^8.6.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -78,7 +78,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.44.0",
+		"@atlaskit/editor-common": "^110.46.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",