@atlaskit/editor-plugin-media 1.31.0 → 1.31.2

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.
Files changed (34) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/cjs/nodeviews/lazy-media-group.js +2 -2
  3. package/dist/cjs/nodeviews/lazy-media-inline.js +2 -2
  4. package/dist/cjs/nodeviews/lazy-media-single.js +2 -2
  5. package/dist/cjs/nodeviews/lazy-media.js +2 -2
  6. package/dist/cjs/plugin.js +2 -2
  7. package/dist/cjs/pm-plugins/{keymap-media-single.js → keymap-media.js} +34 -16
  8. package/dist/cjs/toDOM-fixes/media.js +2 -2
  9. package/dist/cjs/toDOM-fixes/mediaGroup.js +2 -2
  10. package/dist/cjs/toDOM-fixes/mediaInline.js +2 -2
  11. package/dist/cjs/toDOM-fixes/mediaSingle.js +2 -2
  12. package/dist/es2019/nodeviews/lazy-media-group.js +2 -2
  13. package/dist/es2019/nodeviews/lazy-media-inline.js +2 -2
  14. package/dist/es2019/nodeviews/lazy-media-single.js +2 -2
  15. package/dist/es2019/nodeviews/lazy-media.js +2 -2
  16. package/dist/es2019/plugin.js +1 -1
  17. package/dist/es2019/pm-plugins/{keymap-media-single.js → keymap-media.js} +34 -16
  18. package/dist/es2019/toDOM-fixes/media.js +2 -2
  19. package/dist/es2019/toDOM-fixes/mediaGroup.js +2 -2
  20. package/dist/es2019/toDOM-fixes/mediaInline.js +2 -2
  21. package/dist/es2019/toDOM-fixes/mediaSingle.js +2 -2
  22. package/dist/esm/nodeviews/lazy-media-group.js +2 -2
  23. package/dist/esm/nodeviews/lazy-media-inline.js +2 -2
  24. package/dist/esm/nodeviews/lazy-media-single.js +2 -2
  25. package/dist/esm/nodeviews/lazy-media.js +2 -2
  26. package/dist/esm/plugin.js +1 -1
  27. package/dist/esm/pm-plugins/{keymap-media-single.js → keymap-media.js} +34 -16
  28. package/dist/esm/toDOM-fixes/media.js +2 -2
  29. package/dist/esm/toDOM-fixes/mediaGroup.js +2 -2
  30. package/dist/esm/toDOM-fixes/mediaInline.js +2 -2
  31. package/dist/esm/toDOM-fixes/mediaSingle.js +2 -2
  32. package/package.json +2 -4
  33. /package/dist/types/pm-plugins/{keymap-media-single.d.ts → keymap-media.d.ts} +0 -0
  34. /package/dist/types-ts4.5/pm-plugins/{keymap-media-single.d.ts → keymap-media.d.ts} +0 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @atlaskit/editor-plugin-media
2
2
 
3
+ ## 1.31.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#139335](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139335)
8
+ [`ac5e66fc71394`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ac5e66fc71394) -
9
+ ED-24798 bug-fix: pressing Backspace before media that is nested in a quote should move your
10
+ selection to the media
11
+
12
+ ## 1.31.1
13
+
14
+ ### Patch Changes
15
+
16
+ - [#139034](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139034)
17
+ [`517cdc0f7ea1a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/517cdc0f7ea1a) -
18
+ Used experiment for lazy node view
19
+
3
20
  ## 1.31.0
4
21
 
5
22
  ### 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)({
@@ -21,7 +21,7 @@ var _lazyMediaSingle = require("./nodeviews/lazy-media-single");
21
21
  var _altText = require("./pm-plugins/alt-text");
22
22
  var _keymap = _interopRequireDefault(require("./pm-plugins/alt-text/keymap"));
23
23
  var _keymap2 = _interopRequireDefault(require("./pm-plugins/keymap"));
24
- var _keymapMediaSingle = _interopRequireDefault(require("./pm-plugins/keymap-media-single"));
24
+ var _keymapMedia = _interopRequireDefault(require("./pm-plugins/keymap-media"));
25
25
  var _linking = _interopRequireDefault(require("./pm-plugins/linking"));
26
26
  var _keymap3 = _interopRequireDefault(require("./pm-plugins/linking/keymap"));
27
27
  var _main = require("./pm-plugins/main");
@@ -164,7 +164,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref2) {
164
164
  name: 'mediaSingleKeymap',
165
165
  plugin: function plugin(_ref7) {
166
166
  var schema = _ref7.schema;
167
- return (0, _keymapMediaSingle.default)(schema);
167
+ return (0, _keymapMedia.default)(schema);
168
168
  }
169
169
  });
170
170
  }
@@ -9,6 +9,7 @@ var _selection = require("@atlaskit/editor-common/selection");
9
9
  var _utils = require("@atlaskit/editor-common/utils");
10
10
  var _commands = require("@atlaskit/editor-prosemirror/commands");
11
11
  var _keymap = require("@atlaskit/editor-prosemirror/keymap");
12
+ var _state = require("@atlaskit/editor-prosemirror/state");
12
13
  var _utils2 = require("@atlaskit/editor-prosemirror/utils");
13
14
  /**
14
15
  * Check if is an empty selection at the start of the node
@@ -121,11 +122,12 @@ function handleSelectionAfterWrapRight(isEmptyNode) {
121
122
  return true;
122
123
  };
123
124
  }
124
- var maybeRemoveMediaSingleNode = function maybeRemoveMediaSingleNode(schema) {
125
+ var backspaceAfterMediaNode = function backspaceAfterMediaNode(schema) {
125
126
  var isEmptyNodeInSchema = (0, _utils.isEmptyNode)(schema);
126
127
  return function (state, dispatch) {
127
128
  var selection = state.selection,
128
- schema = state.schema;
129
+ schema = state.schema,
130
+ tr = state.tr;
129
131
  var $from = selection.$from;
130
132
  if (!isEmptySelectionAtStart(state.selection)) {
131
133
  return false;
@@ -134,29 +136,45 @@ var maybeRemoveMediaSingleNode = function maybeRemoveMediaSingleNode(schema) {
134
136
  return false;
135
137
  }
136
138
  var previousSibling = -1;
137
- if (!isSiblingOfType(state.selection, schema.nodes.mediaSingle, previousSibling)) {
138
- // no media single
139
+
140
+ // no media single or media group
141
+ if (!isSiblingOfType(state.selection, schema.nodes.mediaSingle, previousSibling) && !isSiblingOfType(state.selection, schema.nodes.mediaGroup, previousSibling)) {
139
142
  return false;
140
143
  }
141
- var mediaSingle = getSibling(state.selection, previousSibling);
142
- if (mediaSingle.attrs.layout === 'wrap-right') {
143
- return handleSelectionAfterWrapRight(isEmptyNodeInSchema)(state, dispatch);
144
+ var media = getSibling(state.selection, previousSibling);
145
+
146
+ // if media single
147
+ if (media.type === schema.nodes.mediaSingle) {
148
+ if (media.attrs.layout === 'wrap-right') {
149
+ return handleSelectionAfterWrapRight(isEmptyNodeInSchema)(state, dispatch);
150
+ }
151
+ if (dispatch) {
152
+ // Select media single, and remove paragraph if it's empty.
153
+ (0, _commands.selectNodeBackward)(state, function (tr) {
154
+ if (isEmptyNodeInSchema($from.parent) && !(0, _selection.atTheEndOfDoc)(state)) {
155
+ tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
156
+ }
157
+ dispatch(tr);
158
+ });
159
+ }
160
+ return true;
144
161
  }
162
+
163
+ // if media group
145
164
  if (dispatch) {
146
- // Select media single, and remove paragraph if it's empty.
147
- (0, _commands.selectNodeBackward)(state, function (tr) {
148
- if (isEmptyNodeInSchema($from.parent) && !(0, _selection.atTheEndOfDoc)(state)) {
149
- tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
150
- }
151
- dispatch(tr);
152
- });
165
+ // select media group, and remove paragraph if it's empty.
166
+ if (isEmptyNodeInSchema($from.parent)) {
167
+ tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // remove node
168
+ tr.setSelection(new _state.NodeSelection(tr.doc.resolve($from.pos - media.nodeSize))).scrollIntoView(); // select media
169
+ }
170
+ dispatch(tr);
153
171
  }
154
172
  return true;
155
173
  };
156
174
  };
157
175
  function keymapPlugin(schema) {
158
176
  var list = {};
159
- var removeMediaSingleCommand = maybeRemoveMediaSingleNode(schema);
160
- (0, _keymaps.bindKeymapWithCommand)(_keymaps.backspace.common, removeMediaSingleCommand, list);
177
+ var backspaceAfterMediaCommand = backspaceAfterMediaNode(schema);
178
+ (0, _keymaps.bindKeymapWithCommand)(_keymaps.backspace.common, backspaceAfterMediaCommand, list);
161
179
  return (0, _keymap.keymap)(list);
162
180
  }
@@ -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), {}, {
@@ -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({
@@ -14,7 +14,7 @@ import { lazyMediaSingleView } from './nodeviews/lazy-media-single';
14
14
  import { createPlugin as createMediaAltTextPlugin } from './pm-plugins/alt-text';
15
15
  import keymapMediaAltTextPlugin from './pm-plugins/alt-text/keymap';
16
16
  import keymapPlugin from './pm-plugins/keymap';
17
- import keymapMediaSinglePlugin from './pm-plugins/keymap-media-single';
17
+ import keymapMediaSinglePlugin from './pm-plugins/keymap-media';
18
18
  import linkingPlugin from './pm-plugins/linking';
19
19
  import keymapLinkingPlugin from './pm-plugins/linking/keymap';
20
20
  import { createPlugin, stateKey } from './pm-plugins/main';
@@ -3,6 +3,7 @@ import { atTheEndOfDoc } from '@atlaskit/editor-common/selection';
3
3
  import { isEmptyNode, isSelectionInsideLastNodeInDocument } from '@atlaskit/editor-common/utils';
4
4
  import { selectNodeBackward } from '@atlaskit/editor-prosemirror/commands';
5
5
  import { keymap } from '@atlaskit/editor-prosemirror/keymap';
6
+ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
6
7
  import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
7
8
 
8
9
  /**
@@ -126,12 +127,13 @@ function handleSelectionAfterWrapRight(isEmptyNode) {
126
127
  return true;
127
128
  };
128
129
  }
129
- const maybeRemoveMediaSingleNode = schema => {
130
+ const backspaceAfterMediaNode = schema => {
130
131
  const isEmptyNodeInSchema = isEmptyNode(schema);
131
132
  return (state, dispatch) => {
132
133
  const {
133
134
  selection,
134
- schema
135
+ schema,
136
+ tr
135
137
  } = state;
136
138
  const {
137
139
  $from
@@ -143,29 +145,45 @@ const maybeRemoveMediaSingleNode = schema => {
143
145
  return false;
144
146
  }
145
147
  const previousSibling = -1;
146
- if (!isSiblingOfType(state.selection, schema.nodes.mediaSingle, previousSibling)) {
147
- // no media single
148
+
149
+ // no media single or media group
150
+ if (!isSiblingOfType(state.selection, schema.nodes.mediaSingle, previousSibling) && !isSiblingOfType(state.selection, schema.nodes.mediaGroup, previousSibling)) {
148
151
  return false;
149
152
  }
150
- const mediaSingle = getSibling(state.selection, previousSibling);
151
- if (mediaSingle.attrs.layout === 'wrap-right') {
152
- return handleSelectionAfterWrapRight(isEmptyNodeInSchema)(state, dispatch);
153
+ const media = getSibling(state.selection, previousSibling);
154
+
155
+ // if media single
156
+ if (media.type === schema.nodes.mediaSingle) {
157
+ if (media.attrs.layout === 'wrap-right') {
158
+ return handleSelectionAfterWrapRight(isEmptyNodeInSchema)(state, dispatch);
159
+ }
160
+ if (dispatch) {
161
+ // Select media single, and remove paragraph if it's empty.
162
+ selectNodeBackward(state, tr => {
163
+ if (isEmptyNodeInSchema($from.parent) && !atTheEndOfDoc(state)) {
164
+ tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
165
+ }
166
+ dispatch(tr);
167
+ });
168
+ }
169
+ return true;
153
170
  }
171
+
172
+ // if media group
154
173
  if (dispatch) {
155
- // Select media single, and remove paragraph if it's empty.
156
- selectNodeBackward(state, tr => {
157
- if (isEmptyNodeInSchema($from.parent) && !atTheEndOfDoc(state)) {
158
- tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
159
- }
160
- dispatch(tr);
161
- });
174
+ // select media group, and remove paragraph if it's empty.
175
+ if (isEmptyNodeInSchema($from.parent)) {
176
+ tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // remove node
177
+ tr.setSelection(new NodeSelection(tr.doc.resolve($from.pos - media.nodeSize))).scrollIntoView(); // select media
178
+ }
179
+ dispatch(tr);
162
180
  }
163
181
  return true;
164
182
  };
165
183
  };
166
184
  export default function keymapPlugin(schema) {
167
185
  const list = {};
168
- const removeMediaSingleCommand = maybeRemoveMediaSingleNode(schema);
169
- bindKeymapWithCommand(backspace.common, removeMediaSingleCommand, list);
186
+ const backspaceAfterMediaCommand = backspaceAfterMediaNode(schema);
187
+ bindKeymapWithCommand(backspace.common, backspaceAfterMediaCommand, list);
170
188
  return keymap(list);
171
189
  }
@@ -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,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({
@@ -14,7 +14,7 @@ import { lazyMediaSingleView } from './nodeviews/lazy-media-single';
14
14
  import { createPlugin as createMediaAltTextPlugin } from './pm-plugins/alt-text';
15
15
  import keymapMediaAltTextPlugin from './pm-plugins/alt-text/keymap';
16
16
  import keymapPlugin from './pm-plugins/keymap';
17
- import keymapMediaSinglePlugin from './pm-plugins/keymap-media-single';
17
+ import keymapMediaSinglePlugin from './pm-plugins/keymap-media';
18
18
  import linkingPlugin from './pm-plugins/linking';
19
19
  import keymapLinkingPlugin from './pm-plugins/linking/keymap';
20
20
  import { createPlugin, stateKey } from './pm-plugins/main';
@@ -3,6 +3,7 @@ import { atTheEndOfDoc } from '@atlaskit/editor-common/selection';
3
3
  import { isEmptyNode, isSelectionInsideLastNodeInDocument } from '@atlaskit/editor-common/utils';
4
4
  import { selectNodeBackward } from '@atlaskit/editor-prosemirror/commands';
5
5
  import { keymap } from '@atlaskit/editor-prosemirror/keymap';
6
+ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
6
7
  import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
7
8
 
8
9
  /**
@@ -116,11 +117,12 @@ function handleSelectionAfterWrapRight(isEmptyNode) {
116
117
  return true;
117
118
  };
118
119
  }
119
- var maybeRemoveMediaSingleNode = function maybeRemoveMediaSingleNode(schema) {
120
+ var backspaceAfterMediaNode = function backspaceAfterMediaNode(schema) {
120
121
  var isEmptyNodeInSchema = isEmptyNode(schema);
121
122
  return function (state, dispatch) {
122
123
  var selection = state.selection,
123
- schema = state.schema;
124
+ schema = state.schema,
125
+ tr = state.tr;
124
126
  var $from = selection.$from;
125
127
  if (!isEmptySelectionAtStart(state.selection)) {
126
128
  return false;
@@ -129,29 +131,45 @@ var maybeRemoveMediaSingleNode = function maybeRemoveMediaSingleNode(schema) {
129
131
  return false;
130
132
  }
131
133
  var previousSibling = -1;
132
- if (!isSiblingOfType(state.selection, schema.nodes.mediaSingle, previousSibling)) {
133
- // no media single
134
+
135
+ // no media single or media group
136
+ if (!isSiblingOfType(state.selection, schema.nodes.mediaSingle, previousSibling) && !isSiblingOfType(state.selection, schema.nodes.mediaGroup, previousSibling)) {
134
137
  return false;
135
138
  }
136
- var mediaSingle = getSibling(state.selection, previousSibling);
137
- if (mediaSingle.attrs.layout === 'wrap-right') {
138
- return handleSelectionAfterWrapRight(isEmptyNodeInSchema)(state, dispatch);
139
+ var media = getSibling(state.selection, previousSibling);
140
+
141
+ // if media single
142
+ if (media.type === schema.nodes.mediaSingle) {
143
+ if (media.attrs.layout === 'wrap-right') {
144
+ return handleSelectionAfterWrapRight(isEmptyNodeInSchema)(state, dispatch);
145
+ }
146
+ if (dispatch) {
147
+ // Select media single, and remove paragraph if it's empty.
148
+ selectNodeBackward(state, function (tr) {
149
+ if (isEmptyNodeInSchema($from.parent) && !atTheEndOfDoc(state)) {
150
+ tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
151
+ }
152
+ dispatch(tr);
153
+ });
154
+ }
155
+ return true;
139
156
  }
157
+
158
+ // if media group
140
159
  if (dispatch) {
141
- // Select media single, and remove paragraph if it's empty.
142
- selectNodeBackward(state, function (tr) {
143
- if (isEmptyNodeInSchema($from.parent) && !atTheEndOfDoc(state)) {
144
- tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // Remove node
145
- }
146
- dispatch(tr);
147
- });
160
+ // select media group, and remove paragraph if it's empty.
161
+ if (isEmptyNodeInSchema($from.parent)) {
162
+ tr.replace($from.pos - 1, $from.pos + $from.parent.nodeSize - 1); // remove node
163
+ tr.setSelection(new NodeSelection(tr.doc.resolve($from.pos - media.nodeSize))).scrollIntoView(); // select media
164
+ }
165
+ dispatch(tr);
148
166
  }
149
167
  return true;
150
168
  };
151
169
  };
152
170
  export default function keymapPlugin(schema) {
153
171
  var list = {};
154
- var removeMediaSingleCommand = maybeRemoveMediaSingleNode(schema);
155
- bindKeymapWithCommand(backspace.common, removeMediaSingleCommand, list);
172
+ var backspaceAfterMediaCommand = backspaceAfterMediaNode(schema);
173
+ bindKeymapWithCommand(backspace.common, backspaceAfterMediaCommand, list);
156
174
  return keymap(list);
157
175
  }
@@ -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), {}, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-media",
3
- "version": "1.31.0",
3
+ "version": "1.31.2",
4
4
  "description": "Media plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -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
  },