@atlaskit/editor-plugin-media 1.30.0 → 1.31.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @atlaskit/editor-plugin-media
2
2
 
3
+ ## 1.31.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#139034](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139034)
8
+ [`517cdc0f7ea1a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/517cdc0f7ea1a) -
9
+ Used experiment for lazy node view
10
+
11
+ ## 1.31.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [#138140](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138140)
16
+ [`d912a8053c5f9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d912a8053c5f9) -
17
+ [ED-24869] ensure images inserted from outside media plugin are given pixel widthType
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies
22
+
3
23
  ## 1.30.0
4
24
 
5
25
  ### Minor Changes
@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.lazyMediaGroupView = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
9
  var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  var _mediaGroup = require("./mediaGroup");
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
13
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
14
  var lazyMediaGroupView = exports.lazyMediaGroupView = function lazyMediaGroupView(portalProviderAPI, eventDispatcher, providerFactory) {
15
15
  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
16
16
  var api = arguments.length > 4 ? arguments[4] : undefined;
17
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
17
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
18
18
  return (0, _mediaGroup.ReactMediaGroupNode)(portalProviderAPI, eventDispatcher, providerFactory, options, api);
19
19
  }
20
20
  return (0, _lazyNodeView.withLazyLoading)({
@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.lazyMediaInlineView = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
9
  var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  var _mediaInline = require("./mediaInline");
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
13
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
14
  var lazyMediaInlineView = exports.lazyMediaInlineView = function lazyMediaInlineView(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
15
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
15
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
16
16
  return (0, _mediaInline.ReactMediaInlineNode)(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent);
17
17
  }
18
18
  return (0, _lazyNodeView.withLazyLoading)({
@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.lazyMediaSingleView = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
9
  var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  var _mediaSingle = require("./mediaSingle");
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
13
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
14
  var lazyMediaSingleView = exports.lazyMediaSingleView = function lazyMediaSingleView(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
15
15
  var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
16
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
16
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
17
17
  return (0, _mediaSingle.ReactMediaSingleNode)(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options);
18
18
  }
19
19
  return (0, _lazyNodeView.withLazyLoading)({
@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.lazyMediaView = void 0;
8
8
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
9
9
  var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  var _mediaNodeView = require("./mediaNodeView");
12
12
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
13
13
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14
14
  var lazyMediaView = exports.lazyMediaView = function lazyMediaView(portalProviderAPI, eventDispatcher, providerFactory) {
15
15
  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
16
16
  var api = arguments.length > 4 ? arguments[4] : undefined;
17
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
17
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
18
18
  return (0, _mediaNodeView.ReactMediaNode)(portalProviderAPI, eventDispatcher, providerFactory, options, api);
19
19
  }
20
20
  return (0, _lazyNodeView.withLazyLoading)({
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.mediaSpecWithFixedToDOM = exports.defaultImageCardDimensions = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _adfSchema = require("@atlaskit/adf-schema");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  var _toDOMAttrs = require("./toDOMAttrs");
12
12
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
13
13
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -31,7 +31,7 @@ var defaultImageCardDimensions = exports.defaultImageCardDimensions = {
31
31
 
32
32
  // @nodeSpecException:toDOM patch
33
33
  var mediaSpecWithFixedToDOM = exports.mediaSpecWithFixedToDOM = function mediaSpecWithFixedToDOM() {
34
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
34
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
35
35
  return _adfSchema.media;
36
36
  }
37
37
  return _objectSpread(_objectSpread({}, _adfSchema.media), {}, {
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.mediaGroupSpecWithFixedToDOM = exports.getDefaultCardDimensions = exports.defaultSquareCardDimensions = exports.defaultImageCardDimensions = exports.defaultHorizontalCardDimensions = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _adfSchema = require("@atlaskit/adf-schema");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
12
12
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
13
13
  /**
@@ -61,7 +61,7 @@ var getDefaultCardDimensions = exports.getDefaultCardDimensions = function getDe
61
61
 
62
62
  // @nodeSpecException:toDOM patch
63
63
  var mediaGroupSpecWithFixedToDOM = exports.mediaGroupSpecWithFixedToDOM = function mediaGroupSpecWithFixedToDOM() {
64
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
64
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
65
65
  return _adfSchema.mediaGroup;
66
66
  }
67
67
  return _objectSpread(_objectSpread({}, _adfSchema.mediaGroup), {}, {
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.mediaInlineSpecWithFixedToDOM = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
9
  var _adfSchema = require("@atlaskit/adf-schema");
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
10
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
11
11
  var _toDOMAttrs = require("./toDOMAttrs");
12
12
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
13
13
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -17,7 +17,7 @@ var fallbackAspectRatio = 1.25;
17
17
 
18
18
  // @nodeSpecException:toDOM patch
19
19
  var mediaInlineSpecWithFixedToDOM = exports.mediaInlineSpecWithFixedToDOM = function mediaInlineSpecWithFixedToDOM() {
20
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
20
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
21
21
  return _adfSchema.mediaInline;
22
22
  }
23
23
  return _objectSpread(_objectSpread({}, _adfSchema.mediaInline), {}, {
@@ -8,7 +8,7 @@ exports.getMediaSinglePixelWidth = getMediaSinglePixelWidth;
8
8
  exports.wrappedLayouts = exports.shouldAddDefaultWrappedWidth = exports.mediaSingleSpecWithFixedToDOM = void 0;
9
9
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
10
  var _adfSchema = require("@atlaskit/adf-schema");
11
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
+ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
12
12
  var _toDOMAttrs = require("./toDOMAttrs");
13
13
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
14
14
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -120,7 +120,7 @@ function computeLayoutStyles(width, layout) {
120
120
  // @nodeSpecException:toDOM patch
121
121
  var mediaSingleSpecWithFixedToDOM = exports.mediaSingleSpecWithFixedToDOM = function mediaSingleSpecWithFixedToDOM(mediaSingleOption) {
122
122
  var mediaSingleNode = (0, _adfSchema.mediaSingleSpec)(mediaSingleOption);
123
- if (!(0, _platformFeatureFlags.fg)('platform_editor_lazy-node-views')) {
123
+ if ((0, _experiments.editorExperiment)('platform_editor_exp_lazy_node_views', false)) {
124
124
  return mediaSingleNode;
125
125
  }
126
126
  return _objectSpread(_objectSpread({}, mediaSingleNode), {}, {
@@ -79,6 +79,7 @@ var isMediaSingle = exports.isMediaSingle = function isMediaSingle(schema, fileM
79
79
  return !!schema.nodes.mediaSingle && (0, _isType.isImage)(fileMimeType);
80
80
  };
81
81
  var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, node, inputMethod, editorAnalyticsAPI) {
82
+ var _node$attrs$width;
82
83
  var state = view.state,
83
84
  dispatch = view.dispatch;
84
85
  var _state$schema$nodes = state.schema.nodes,
@@ -92,7 +93,14 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
92
93
  if (node.type !== media || !(0, _isType.isImage)(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
93
94
  return false;
94
95
  }
95
- var mediaSingleNode = mediaSingle.create({}, node);
96
+ var resizeExperience = (0, _platformFeatureFlags.fg)('platform.editor.media.extended-resize-experience');
97
+ var insertMediaPopup = (0, _platformFeatureFlags.fg)('platform_editor_insert_media_plugin_phase_one');
98
+ var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
99
+ widthType: 'pixel',
100
+ width: (0, _mediaSingle.getMediaSingleInitialWidth)((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : _mediaSingle.DEFAULT_IMAGE_WIDTH),
101
+ layout: 'center'
102
+ } : {};
103
+ var mediaSingleNode = mediaSingle.create(mediaSingleAttrs, node);
96
104
  var nodes = [mediaSingleNode];
97
105
  var analyticsAttributes = {
98
106
  inputMethod: inputMethod,
@@ -1,8 +1,8 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaGroupNode } from './mediaGroup';
4
4
  export const lazyMediaGroupView = (portalProviderAPI, eventDispatcher, providerFactory, options = {}, api) => {
5
- if (!fg('platform_editor_lazy-node-views')) {
5
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
6
6
  return ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
7
7
  }
8
8
  return withLazyLoading({
@@ -1,8 +1,8 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaInlineNode } from './mediaInline';
4
4
  export const lazyMediaInlineView = (portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) => {
5
- if (!fg('platform_editor_lazy-node-views')) {
5
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
6
6
  return ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent);
7
7
  }
8
8
  return withLazyLoading({
@@ -1,8 +1,8 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaSingleNode } from './mediaSingle';
4
4
  export const lazyMediaSingleView = (portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options = {}) => {
5
- if (!fg('platform_editor_lazy-node-views')) {
5
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
6
6
  return ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options);
7
7
  }
8
8
  return withLazyLoading({
@@ -1,8 +1,8 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaNode } from './mediaNodeView';
4
4
  export const lazyMediaView = (portalProviderAPI, eventDispatcher, providerFactory, options = {}, api) => {
5
- if (!fg('platform_editor_lazy-node-views')) {
5
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
6
6
  return ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
7
7
  }
8
8
  return withLazyLoading({
@@ -1,5 +1,5 @@
1
1
  import { media } from '@atlaskit/adf-schema';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { getMediaAttrs } from './toDOMAttrs';
4
4
  const skeletonStyling = `background: ${"var(--ds-background-neutral, #091E420F)"}; outline: none;`;
5
5
 
@@ -21,7 +21,7 @@ export const defaultImageCardDimensions = {
21
21
 
22
22
  // @nodeSpecException:toDOM patch
23
23
  export const mediaSpecWithFixedToDOM = () => {
24
- if (!fg('platform_editor_lazy-node-views')) {
24
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
25
25
  return media;
26
26
  }
27
27
  return {
@@ -1,5 +1,5 @@
1
1
  import { mediaGroup } from '@atlaskit/adf-schema';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
 
4
4
  /**
5
5
  * Duplicate consts from `media-card`.
@@ -51,7 +51,7 @@ export const getDefaultCardDimensions = (appearance = 'auto') => {
51
51
 
52
52
  // @nodeSpecException:toDOM patch
53
53
  export const mediaGroupSpecWithFixedToDOM = () => {
54
- if (!fg('platform_editor_lazy-node-views')) {
54
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
55
55
  return mediaGroup;
56
56
  }
57
57
  return {
@@ -1,5 +1,5 @@
1
1
  import { mediaInline } from '@atlaskit/adf-schema';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { getMediaAttrs } from './toDOMAttrs';
4
4
  const skeletonStyling = `background: ${"var(--ds-background-neutral, #091E420F)"};`;
5
5
  // Matches media
@@ -7,7 +7,7 @@ const fallbackAspectRatio = 1.25;
7
7
 
8
8
  // @nodeSpecException:toDOM patch
9
9
  export const mediaInlineSpecWithFixedToDOM = () => {
10
- if (!fg('platform_editor_lazy-node-views')) {
10
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
11
11
  return mediaInline;
12
12
  }
13
13
  return {
@@ -1,5 +1,5 @@
1
1
  import { mediaSingleSpec } from '@atlaskit/adf-schema';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { getAttrsFromNodeMediaSingle } from './toDOMAttrs';
4
4
  const skeletonStyling = `background: ${"var(--ds-background-neutral, #091E420F)"}; outline: none;`;
5
5
  export const wrappedLayouts = ['wrap-left', 'wrap-right', 'align-end', 'align-start'];
@@ -108,7 +108,7 @@ function computeLayoutStyles(width, layout) {
108
108
  // @nodeSpecException:toDOM patch
109
109
  export const mediaSingleSpecWithFixedToDOM = mediaSingleOption => {
110
110
  const mediaSingleNode = mediaSingleSpec(mediaSingleOption);
111
- if (!fg('platform_editor_lazy-node-views')) {
111
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
112
112
  return mediaSingleNode;
113
113
  }
114
114
  return {
@@ -1,7 +1,7 @@
1
1
  import memoizeOne from 'memoize-one';
2
2
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
3
3
  import { safeInsert, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
4
- import { getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
4
+ import { DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
5
5
  import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
6
6
  import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
7
7
  import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
@@ -67,6 +67,7 @@ function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, edito
67
67
  }
68
68
  export const isMediaSingle = (schema, fileMimeType) => !!schema.nodes.mediaSingle && isImage(fileMimeType);
69
69
  export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalyticsAPI) => {
70
+ var _node$attrs$width;
70
71
  const {
71
72
  state,
72
73
  dispatch
@@ -83,7 +84,14 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
83
84
  if (node.type !== media || !isImage(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
84
85
  return false;
85
86
  }
86
- const mediaSingleNode = mediaSingle.create({}, node);
87
+ const resizeExperience = fg('platform.editor.media.extended-resize-experience');
88
+ const insertMediaPopup = fg('platform_editor_insert_media_plugin_phase_one');
89
+ const mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
90
+ widthType: 'pixel',
91
+ width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),
92
+ layout: 'center'
93
+ } : {};
94
+ const mediaSingleNode = mediaSingle.create(mediaSingleAttrs, node);
87
95
  const nodes = [mediaSingleNode];
88
96
  const analyticsAttributes = {
89
97
  inputMethod,
@@ -1,10 +1,10 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaGroupNode } from './mediaGroup';
4
4
  export var lazyMediaGroupView = function lazyMediaGroupView(portalProviderAPI, eventDispatcher, providerFactory) {
5
5
  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
6
6
  var api = arguments.length > 4 ? arguments[4] : undefined;
7
- if (!fg('platform_editor_lazy-node-views')) {
7
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
8
8
  return ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
9
9
  }
10
10
  return withLazyLoading({
@@ -1,8 +1,8 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaInlineNode } from './mediaInline';
4
4
  export var lazyMediaInlineView = function lazyMediaInlineView(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
5
- if (!fg('platform_editor_lazy-node-views')) {
5
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
6
6
  return ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent);
7
7
  }
8
8
  return withLazyLoading({
@@ -1,9 +1,9 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaSingleNode } from './mediaSingle';
4
4
  export var lazyMediaSingleView = function lazyMediaSingleView(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent) {
5
5
  var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
6
- if (!fg('platform_editor_lazy-node-views')) {
6
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
7
7
  return ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options);
8
8
  }
9
9
  return withLazyLoading({
@@ -1,10 +1,10 @@
1
1
  import { withLazyLoading } from '@atlaskit/editor-common/lazy-node-view';
2
- import { fg } from '@atlaskit/platform-feature-flags';
2
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
3
3
  import { ReactMediaNode } from './mediaNodeView';
4
4
  export var lazyMediaView = function lazyMediaView(portalProviderAPI, eventDispatcher, providerFactory) {
5
5
  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
6
6
  var api = arguments.length > 4 ? arguments[4] : undefined;
7
- if (!fg('platform_editor_lazy-node-views')) {
7
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
8
8
  return ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api);
9
9
  }
10
10
  return withLazyLoading({
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
3
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { media } from '@atlaskit/adf-schema';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
6
6
  import { getMediaAttrs } from './toDOMAttrs';
7
7
  var skeletonStyling = "background: ".concat("var(--ds-background-neutral, #091E420F)", "; outline: none;");
8
8
 
@@ -24,7 +24,7 @@ export var defaultImageCardDimensions = {
24
24
 
25
25
  // @nodeSpecException:toDOM patch
26
26
  export var mediaSpecWithFixedToDOM = function mediaSpecWithFixedToDOM() {
27
- if (!fg('platform_editor_lazy-node-views')) {
27
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
28
28
  return media;
29
29
  }
30
30
  return _objectSpread(_objectSpread({}, media), {}, {
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
3
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { mediaGroup } from '@atlaskit/adf-schema';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
6
6
 
7
7
  /**
8
8
  * Duplicate consts from `media-card`.
@@ -55,7 +55,7 @@ export var getDefaultCardDimensions = function getDefaultCardDimensions() {
55
55
 
56
56
  // @nodeSpecException:toDOM patch
57
57
  export var mediaGroupSpecWithFixedToDOM = function mediaGroupSpecWithFixedToDOM() {
58
- if (!fg('platform_editor_lazy-node-views')) {
58
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
59
59
  return mediaGroup;
60
60
  }
61
61
  return _objectSpread(_objectSpread({}, mediaGroup), {}, {
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
3
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { mediaInline } from '@atlaskit/adf-schema';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
6
6
  import { getMediaAttrs } from './toDOMAttrs';
7
7
  var skeletonStyling = "background: ".concat("var(--ds-background-neutral, #091E420F)", ";");
8
8
  // Matches media
@@ -10,7 +10,7 @@ var fallbackAspectRatio = 1.25;
10
10
 
11
11
  // @nodeSpecException:toDOM patch
12
12
  export var mediaInlineSpecWithFixedToDOM = function mediaInlineSpecWithFixedToDOM() {
13
- if (!fg('platform_editor_lazy-node-views')) {
13
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
14
14
  return mediaInline;
15
15
  }
16
16
  return _objectSpread(_objectSpread({}, mediaInline), {}, {
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
3
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { mediaSingleSpec } from '@atlaskit/adf-schema';
5
- import { fg } from '@atlaskit/platform-feature-flags';
5
+ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
6
6
  import { getAttrsFromNodeMediaSingle } from './toDOMAttrs';
7
7
  var skeletonStyling = "background: ".concat("var(--ds-background-neutral, #091E420F)", "; outline: none;");
8
8
  export var wrappedLayouts = ['wrap-left', 'wrap-right', 'align-end', 'align-start'];
@@ -112,7 +112,7 @@ function computeLayoutStyles(width, layout) {
112
112
  // @nodeSpecException:toDOM patch
113
113
  export var mediaSingleSpecWithFixedToDOM = function mediaSingleSpecWithFixedToDOM(mediaSingleOption) {
114
114
  var mediaSingleNode = mediaSingleSpec(mediaSingleOption);
115
- if (!fg('platform_editor_lazy-node-views')) {
115
+ if (editorExperiment('platform_editor_exp_lazy_node_views', false)) {
116
116
  return mediaSingleNode;
117
117
  }
118
118
  return _objectSpread(_objectSpread({}, mediaSingleNode), {}, {
@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
4
4
  import memoizeOne from 'memoize-one';
5
5
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
6
6
  import { safeInsert, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
7
- import { getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
7
+ import { DEFAULT_IMAGE_WIDTH, getMaxWidthForNestedNodeNext, getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
8
8
  import { atTheBeginningOfBlock } from '@atlaskit/editor-common/selection';
9
9
  import { checkNodeDown, isEmptyParagraph } from '@atlaskit/editor-common/utils';
10
10
  import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
@@ -72,6 +72,7 @@ export var isMediaSingle = function isMediaSingle(schema, fileMimeType) {
72
72
  return !!schema.nodes.mediaSingle && isImage(fileMimeType);
73
73
  };
74
74
  export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, node, inputMethod, editorAnalyticsAPI) {
75
+ var _node$attrs$width;
75
76
  var state = view.state,
76
77
  dispatch = view.dispatch;
77
78
  var _state$schema$nodes = state.schema.nodes,
@@ -85,7 +86,14 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
85
86
  if (node.type !== media || !isImage(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
86
87
  return false;
87
88
  }
88
- var mediaSingleNode = mediaSingle.create({}, node);
89
+ var resizeExperience = fg('platform.editor.media.extended-resize-experience');
90
+ var insertMediaPopup = fg('platform_editor_insert_media_plugin_phase_one');
91
+ var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
92
+ widthType: 'pixel',
93
+ width: getMediaSingleInitialWidth((_node$attrs$width = node.attrs.width) !== null && _node$attrs$width !== void 0 ? _node$attrs$width : DEFAULT_IMAGE_WIDTH),
94
+ layout: 'center'
95
+ } : {};
96
+ var mediaSingleNode = mediaSingle.create(mediaSingleAttrs, node);
89
97
  var nodes = [mediaSingleNode];
90
98
  var analyticsAttributes = {
91
99
  inputMethod: inputMethod,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-media",
3
- "version": "1.30.0",
3
+ "version": "1.31.1",
4
4
  "description": "Media plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -36,7 +36,7 @@
36
36
  "@atlaskit/analytics-namespaced-context": "^6.12.0",
37
37
  "@atlaskit/analytics-next": "^10.1.0",
38
38
  "@atlaskit/button": "^20.1.0",
39
- "@atlaskit/editor-common": "^88.12.0",
39
+ "@atlaskit/editor-common": "^88.13.0",
40
40
  "@atlaskit/editor-palette": "1.6.0",
41
41
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
42
42
  "@atlaskit/editor-plugin-annotation": "1.19.4",
@@ -66,6 +66,7 @@
66
66
  "@atlaskit/primitives": "^12.1.0",
67
67
  "@atlaskit/textfield": "^6.5.0",
68
68
  "@atlaskit/theme": "^13.0.0",
69
+ "@atlaskit/tmp-editor-statsig": "^2.1.8",
69
70
  "@atlaskit/tokens": "^1.59.0",
70
71
  "@atlaskit/tooltip": "^18.7.0",
71
72
  "@babel/runtime": "^7.0.0",
@@ -143,9 +144,6 @@
143
144
  "platform-editor-a11y-image-border-options-dropdown": {
144
145
  "type": "boolean"
145
146
  },
146
- "platform_editor_lazy-node-views": {
147
- "type": "boolean"
148
- },
149
147
  "platform_editor_insert_media_plugin_phase_one": {
150
148
  "type": "boolean"
151
149
  },