@atlaskit/editor-plugin-media 1.39.2 → 1.39.3
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 +9 -0
- package/dist/cjs/nodeviews/mediaSingle.js +3 -3
- package/dist/cjs/nodeviews/mediaSingleNext.js +2 -2
- package/dist/cjs/plugin.js +1 -1
- package/dist/cjs/pm-plugins/keymap.js +1 -1
- package/dist/cjs/toDOM-fixes/mediaSingle.js +3 -3
- package/dist/cjs/toolbar/index.js +3 -3
- package/dist/cjs/utils/media-single.js +3 -3
- package/dist/es2019/nodeviews/mediaSingle.js +3 -3
- package/dist/es2019/nodeviews/mediaSingleNext.js +2 -2
- package/dist/es2019/plugin.js +1 -1
- package/dist/es2019/pm-plugins/keymap.js +1 -1
- package/dist/es2019/toDOM-fixes/mediaSingle.js +3 -3
- package/dist/es2019/toolbar/index.js +3 -3
- package/dist/es2019/utils/media-single.js +3 -3
- package/dist/esm/nodeviews/mediaSingle.js +3 -3
- package/dist/esm/nodeviews/mediaSingleNext.js +2 -2
- package/dist/esm/plugin.js +1 -1
- package/dist/esm/pm-plugins/keymap.js +1 -1
- package/dist/esm/toDOM-fixes/mediaSingle.js +3 -3
- package/dist/esm/toolbar/index.js +3 -3
- package/dist/esm/utils/media-single.js +3 -3
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-media
|
|
2
2
|
|
|
3
|
+
## 1.39.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#158691](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/158691)
|
|
8
|
+
[`70ef661bbbb4d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/70ef661bbbb4d) -
|
|
9
|
+
Update feature flag to gate
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 1.39.2
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -486,7 +486,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
486
486
|
mediaElement: currentMediaElement(),
|
|
487
487
|
mediaHeight: height,
|
|
488
488
|
mediaWidth: width,
|
|
489
|
-
extendedResizeOffset: (0, _platformFeatureFlags.fg)('
|
|
489
|
+
extendedResizeOffset: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') && !isInsideTable
|
|
490
490
|
}, function (_ref5) {
|
|
491
491
|
var badgeSize = _ref5.badgeSize;
|
|
492
492
|
return (0, _react2.jsx)(_react.default.Fragment, null, shouldShowExternalMediaBadge && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
|
|
@@ -518,7 +518,7 @@ var MediaSingleNode = exports.default = /*#__PURE__*/function (_Component) {
|
|
|
518
518
|
ref: this.captionPlaceHolderRef,
|
|
519
519
|
onClick: this.clickPlaceholder
|
|
520
520
|
})));
|
|
521
|
-
return (0, _react2.jsx)(_react.Fragment, null, canResize ? (0, _platformFeatureFlags.fg)('
|
|
521
|
+
return (0, _react2.jsx)(_react.Fragment, null, canResize ? (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') ? (0, _react2.jsx)(_ResizableMediaSingleNext.default, (0, _extends2.default)({}, resizableMediaSingleProps, {
|
|
522
522
|
showLegacyNotification: widthType !== 'pixel'
|
|
523
523
|
}), MediaChildren) : (0, _react2.jsx)(_ResizableMediaSingle.default, (0, _extends2.default)({}, resizableMediaSingleProps, {
|
|
524
524
|
lineLength: contentWidthForLegacyExperience,
|
|
@@ -652,7 +652,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
652
652
|
// see also: https://github.com/ProseMirror/prosemirror/issues/884
|
|
653
653
|
domRef.contentEditable = 'true';
|
|
654
654
|
}
|
|
655
|
-
if ((0, _platformFeatureFlags.fg)('
|
|
655
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')) {
|
|
656
656
|
domRef.classList.add('media-extended-resize-experience');
|
|
657
657
|
}
|
|
658
658
|
return domRef;
|
|
@@ -493,7 +493,7 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
|
|
|
493
493
|
mediaElement: currentMediaElement(),
|
|
494
494
|
mediaHeight: height,
|
|
495
495
|
mediaWidth: width,
|
|
496
|
-
extendedResizeOffset: (0, _platformFeatureFlags.fg)('
|
|
496
|
+
extendedResizeOffset: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') && !isInsideTable
|
|
497
497
|
}, function (_ref7) {
|
|
498
498
|
var badgeSize = _ref7.badgeSize;
|
|
499
499
|
return (0, _react2.jsx)(_react.default.Fragment, null, shouldShowExternalMediaBadge && (0, _react2.jsx)(_mediaSingle.ExternalImageBadge, {
|
|
@@ -525,7 +525,7 @@ var MediaSingleNodeNext = exports.MediaSingleNodeNext = function MediaSingleNode
|
|
|
525
525
|
ref: captionPlaceHolderRef,
|
|
526
526
|
onClick: clickPlaceholder
|
|
527
527
|
})));
|
|
528
|
-
return (0, _react2.jsx)(_react.Fragment, null, canResize ? (0, _platformFeatureFlags.fg)('
|
|
528
|
+
return (0, _react2.jsx)(_react.Fragment, null, canResize ? (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') ? (0, _react2.jsx)(_ResizableMediaSingleNext.default, {
|
|
529
529
|
view: view,
|
|
530
530
|
getPos: getPos,
|
|
531
531
|
updateSize: updateSize,
|
package/dist/cjs/plugin.js
CHANGED
|
@@ -134,7 +134,7 @@ var mediaPlugin = exports.mediaPlugin = function mediaPlugin(_ref3) {
|
|
|
134
134
|
allowCaptions = _ref5.allowCaptions,
|
|
135
135
|
mediaFeatureFlags = _ref5.featureFlags;
|
|
136
136
|
var allowMediaInline = (0, _mediaCommon.getMediaFeatureFlag)('mediaInline', mediaFeatureFlags);
|
|
137
|
-
var mediaSingleOption = (0, _platformFeatureFlags.fg)('
|
|
137
|
+
var mediaSingleOption = (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') ? {
|
|
138
138
|
withCaption: allowCaptions,
|
|
139
139
|
withExtendedWidthTypes: true
|
|
140
140
|
} : {
|
|
@@ -27,7 +27,7 @@ function keymapPlugin(options, editorAnalyticsAPI, editorSelectionAPI, widthPlug
|
|
|
27
27
|
}
|
|
28
28
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.insertNewLine.common, splitMediaGroup, list);
|
|
29
29
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.enter.common, splitMediaGroup, list);
|
|
30
|
-
if ((0, _platformFeatureFlags.fg)('
|
|
30
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')) {
|
|
31
31
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.increaseMediaSize.common, handleMediaIncrease(editorAnalyticsAPI, widthPlugin, options, getIntl), list);
|
|
32
32
|
(0, _keymaps.bindKeymapWithCommand)(_keymaps.decreaseMediaSize.common, handleMediaDecrease(editorAnalyticsAPI, widthPlugin, options, getIntl), list);
|
|
33
33
|
}
|
|
@@ -166,7 +166,7 @@ var toDOM = exports.toDOM = function toDOM(node) {
|
|
|
166
166
|
var isExternalMedia = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.type) === 'external';
|
|
167
167
|
var childMediaWidth = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.width) || DEFAULT_IMAGE_WIDTH;
|
|
168
168
|
var childMediaHeight = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.height) || DEFAULT_IMAGE_HEIGHT;
|
|
169
|
-
var dataAttrs = (0, _toDOMAttrs.getAttrsFromNodeMediaSingle)((0, _platformFeatureFlags.fg)('
|
|
169
|
+
var dataAttrs = (0, _toDOMAttrs.getAttrsFromNodeMediaSingle)((0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience'), node);
|
|
170
170
|
var content = prepareWrapperContentDOM({
|
|
171
171
|
layout: layout,
|
|
172
172
|
dataAttrs: dataAttrs,
|
|
@@ -174,14 +174,14 @@ var toDOM = exports.toDOM = function toDOM(node) {
|
|
|
174
174
|
childMediaHeight: childMediaHeight,
|
|
175
175
|
mediaSingleDimensionWidth: mediaSingleAttrs.width,
|
|
176
176
|
isPixelWidth: isPixelWidth,
|
|
177
|
-
isExtendedResizeExperience: (0, _platformFeatureFlags.fg)('
|
|
177
|
+
isExtendedResizeExperience: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')
|
|
178
178
|
});
|
|
179
179
|
var isMediaWrapped = WRAPPED_LAYOUTS.includes(layout);
|
|
180
180
|
var proportionCalc = mediaProportionalWidthCSSCalc({
|
|
181
181
|
isPixelWidth: isPixelWidth,
|
|
182
182
|
isMediaWrapped: isMediaWrapped,
|
|
183
183
|
mediaSingleDimensionWidth: mediaSingleAttrs === null || mediaSingleAttrs === void 0 ? void 0 : mediaSingleAttrs.width,
|
|
184
|
-
isExtendedResizeExperience: (0, _platformFeatureFlags.fg)('
|
|
184
|
+
isExtendedResizeExperience: (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')
|
|
185
185
|
});
|
|
186
186
|
var contentWrapperWidth = mediaContentWrapperWidthCSSCalc({
|
|
187
187
|
isMediaWrapped: isMediaWrapped,
|
|
@@ -234,7 +234,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
|
|
|
234
234
|
var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
|
|
235
235
|
var isChangingLayoutDisabled = false;
|
|
236
236
|
var selectedNode = (0, _utils2.getSelectedMediaSingle)(state);
|
|
237
|
-
if ((0, _platformFeatureFlags.fg)('
|
|
237
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')) {
|
|
238
238
|
var _widthPlugin$sharedSt;
|
|
239
239
|
var contentWidth = widthPlugin === null || widthPlugin === void 0 || (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
|
|
240
240
|
var selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
|
|
@@ -327,7 +327,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
|
|
|
327
327
|
// Pixel Entry Toolbar Support
|
|
328
328
|
var selection = state.selection;
|
|
329
329
|
var isWithinTable = (0, _utils.hasParentNodeOfType)([state.schema.nodes.table])(selection);
|
|
330
|
-
if (allowResizing && (!isWithinTable || allowResizingInTables === true) && (0, _platformFeatureFlags.fg)('
|
|
330
|
+
if (allowResizing && (!isWithinTable || allowResizingInTables === true) && (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')) {
|
|
331
331
|
var selectedMediaSingleNode = (0, _utils2.getSelectedMediaSingle)(state);
|
|
332
332
|
var sizeInput = {
|
|
333
333
|
type: 'custom',
|
|
@@ -653,7 +653,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(state,
|
|
|
653
653
|
scrollable: true,
|
|
654
654
|
mediaAssistiveMessage: assistiveMessage
|
|
655
655
|
});
|
|
656
|
-
if (allowResizing && (0, _platformFeatureFlags.fg)('
|
|
656
|
+
if (allowResizing && (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience')) {
|
|
657
657
|
return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
|
|
658
658
|
width: mediaPluginState.isResizing ? undefined : (0, _utils2.getMaxToolbarWidth)()
|
|
659
659
|
});
|
|
@@ -104,7 +104,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
|
|
|
104
104
|
if (node.type !== media || !(0, _isType.isImage)(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
|
|
105
105
|
return false;
|
|
106
106
|
}
|
|
107
|
-
var resizeExperience = (0, _platformFeatureFlags.fg)('
|
|
107
|
+
var resizeExperience = (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience');
|
|
108
108
|
var insertMediaPopup = (0, _experiments.editorExperiment)('add-media-from-url', true);
|
|
109
109
|
var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
|
|
110
110
|
widthType: 'pixel',
|
|
@@ -246,7 +246,7 @@ var createMediaSingleNode = function createMediaSingleNode(schema, collection, m
|
|
|
246
246
|
var mediaSingleAttrs = alignLeftOnInsert ? {
|
|
247
247
|
layout: 'align-start'
|
|
248
248
|
} : {};
|
|
249
|
-
var extendedMediaSingleAttrs = (0, _platformFeatureFlags.fg)('
|
|
249
|
+
var extendedMediaSingleAttrs = (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') ? _objectSpread(_objectSpread({}, mediaSingleAttrs), {}, {
|
|
250
250
|
width: (0, _mediaSingle.getMediaSingleInitialWidth)(scaledWidth, maxWidth, minWidth),
|
|
251
251
|
// TODO: change to use enum
|
|
252
252
|
widthType: 'pixel'
|
|
@@ -264,7 +264,7 @@ var replaceWithMediaSingleNode = function replaceWithMediaSingleNode(schema, max
|
|
|
264
264
|
var copiedMediaNode = media.create(_objectSpread(_objectSpread({}, mediaNode.attrs), {}, {
|
|
265
265
|
type: 'file'
|
|
266
266
|
}), mediaNode.content, mediaNode.marks);
|
|
267
|
-
var extendedMediaSingleAttrs = (0, _platformFeatureFlags.fg)('
|
|
267
|
+
var extendedMediaSingleAttrs = (0, _platformFeatureFlags.fg)('platform_editor_media_extended_resize_experience') ? {
|
|
268
268
|
width: (0, _mediaSingle.getMediaSingleInitialWidth)(width, maxWidth, minWidth),
|
|
269
269
|
widthType: 'pixel'
|
|
270
270
|
} : {};
|
|
@@ -404,7 +404,7 @@ export default class MediaSingleNode extends Component {
|
|
|
404
404
|
mediaElement: currentMediaElement(),
|
|
405
405
|
mediaHeight: height,
|
|
406
406
|
mediaWidth: width,
|
|
407
|
-
extendedResizeOffset: fg('
|
|
407
|
+
extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
|
|
408
408
|
}, ({
|
|
409
409
|
badgeSize
|
|
410
410
|
}) => jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
|
|
@@ -435,7 +435,7 @@ export default class MediaSingleNode extends Component {
|
|
|
435
435
|
ref: this.captionPlaceHolderRef,
|
|
436
436
|
onClick: this.clickPlaceholder
|
|
437
437
|
})));
|
|
438
|
-
return jsx(Fragment, null, canResize ? fg('
|
|
438
|
+
return jsx(Fragment, null, canResize ? fg('platform_editor_media_extended_resize_experience') ? jsx(ResizableMediaSingleNext, _extends({}, resizableMediaSingleProps, {
|
|
439
439
|
showLegacyNotification: widthType !== 'pixel'
|
|
440
440
|
}), MediaChildren) : jsx(ResizableMediaSingle, _extends({}, resizableMediaSingleProps, {
|
|
441
441
|
lineLength: contentWidthForLegacyExperience,
|
|
@@ -559,7 +559,7 @@ class MediaSingleNodeView extends ReactNodeView {
|
|
|
559
559
|
// see also: https://github.com/ProseMirror/prosemirror/issues/884
|
|
560
560
|
domRef.contentEditable = 'true';
|
|
561
561
|
}
|
|
562
|
-
if (fg('
|
|
562
|
+
if (fg('platform_editor_media_extended_resize_experience')) {
|
|
563
563
|
domRef.classList.add('media-extended-resize-experience');
|
|
564
564
|
}
|
|
565
565
|
return domRef;
|
|
@@ -454,7 +454,7 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
|
|
|
454
454
|
mediaElement: currentMediaElement(),
|
|
455
455
|
mediaHeight: height,
|
|
456
456
|
mediaWidth: width,
|
|
457
|
-
extendedResizeOffset: fg('
|
|
457
|
+
extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
|
|
458
458
|
}, ({
|
|
459
459
|
badgeSize
|
|
460
460
|
}) => jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
|
|
@@ -485,7 +485,7 @@ export const MediaSingleNodeNext = mediaSingleNodeNextProps => {
|
|
|
485
485
|
ref: captionPlaceHolderRef,
|
|
486
486
|
onClick: clickPlaceholder
|
|
487
487
|
})));
|
|
488
|
-
return jsx(Fragment, null, canResize ? fg('
|
|
488
|
+
return jsx(Fragment, null, canResize ? fg('platform_editor_media_extended_resize_experience') ? jsx(ResizableMediaSingleNext, {
|
|
489
489
|
view: view,
|
|
490
490
|
getPos: getPos,
|
|
491
491
|
updateSize: updateSize,
|
package/dist/es2019/plugin.js
CHANGED
|
@@ -126,7 +126,7 @@ export const mediaPlugin = ({
|
|
|
126
126
|
featureFlags: mediaFeatureFlags
|
|
127
127
|
} = options || {};
|
|
128
128
|
const allowMediaInline = getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
|
|
129
|
-
const mediaSingleOption = fg('
|
|
129
|
+
const mediaSingleOption = fg('platform_editor_media_extended_resize_experience') ? {
|
|
130
130
|
withCaption: allowCaptions,
|
|
131
131
|
withExtendedWidthTypes: true
|
|
132
132
|
} : {
|
|
@@ -21,7 +21,7 @@ function keymapPlugin(options, editorAnalyticsAPI, editorSelectionAPI, widthPlug
|
|
|
21
21
|
}
|
|
22
22
|
bindKeymapWithCommand(insertNewLine.common, splitMediaGroup, list);
|
|
23
23
|
bindKeymapWithCommand(enter.common, splitMediaGroup, list);
|
|
24
|
-
if (fg('
|
|
24
|
+
if (fg('platform_editor_media_extended_resize_experience')) {
|
|
25
25
|
bindKeymapWithCommand(increaseMediaSize.common, handleMediaIncrease(editorAnalyticsAPI, widthPlugin, options, getIntl), list);
|
|
26
26
|
bindKeymapWithCommand(decreaseMediaSize.common, handleMediaDecrease(editorAnalyticsAPI, widthPlugin, options, getIntl), list);
|
|
27
27
|
}
|
|
@@ -162,7 +162,7 @@ export const toDOM = node => {
|
|
|
162
162
|
const isExternalMedia = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.type) === 'external';
|
|
163
163
|
const childMediaWidth = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.width) || DEFAULT_IMAGE_WIDTH;
|
|
164
164
|
const childMediaHeight = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.height) || DEFAULT_IMAGE_HEIGHT;
|
|
165
|
-
const dataAttrs = getAttrsFromNodeMediaSingle(fg('
|
|
165
|
+
const dataAttrs = getAttrsFromNodeMediaSingle(fg('platform_editor_media_extended_resize_experience'), node);
|
|
166
166
|
const content = prepareWrapperContentDOM({
|
|
167
167
|
layout,
|
|
168
168
|
dataAttrs,
|
|
@@ -170,14 +170,14 @@ export const toDOM = node => {
|
|
|
170
170
|
childMediaHeight,
|
|
171
171
|
mediaSingleDimensionWidth: mediaSingleAttrs.width,
|
|
172
172
|
isPixelWidth,
|
|
173
|
-
isExtendedResizeExperience: fg('
|
|
173
|
+
isExtendedResizeExperience: fg('platform_editor_media_extended_resize_experience')
|
|
174
174
|
});
|
|
175
175
|
const isMediaWrapped = WRAPPED_LAYOUTS.includes(layout);
|
|
176
176
|
const proportionCalc = mediaProportionalWidthCSSCalc({
|
|
177
177
|
isPixelWidth,
|
|
178
178
|
isMediaWrapped,
|
|
179
179
|
mediaSingleDimensionWidth: mediaSingleAttrs === null || mediaSingleAttrs === void 0 ? void 0 : mediaSingleAttrs.width,
|
|
180
|
-
isExtendedResizeExperience: fg('
|
|
180
|
+
isExtendedResizeExperience: fg('platform_editor_media_extended_resize_experience')
|
|
181
181
|
});
|
|
182
182
|
const contentWrapperWidth = mediaContentWrapperWidthCSSCalc({
|
|
183
183
|
isMediaWrapped,
|
|
@@ -228,7 +228,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
|
|
|
228
228
|
const widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
|
|
229
229
|
let isChangingLayoutDisabled = false;
|
|
230
230
|
const selectedNode = getSelectedMediaSingle(state);
|
|
231
|
-
if (fg('
|
|
231
|
+
if (fg('platform_editor_media_extended_resize_experience')) {
|
|
232
232
|
var _widthPlugin$sharedSt;
|
|
233
233
|
const contentWidth = widthPlugin === null || widthPlugin === void 0 ? void 0 : (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
|
|
234
234
|
const selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
|
|
@@ -319,7 +319,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
|
|
|
319
319
|
selection
|
|
320
320
|
} = state;
|
|
321
321
|
const isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);
|
|
322
|
-
if (allowResizing && (!isWithinTable || allowResizingInTables === true) && fg('
|
|
322
|
+
if (allowResizing && (!isWithinTable || allowResizingInTables === true) && fg('platform_editor_media_extended_resize_experience')) {
|
|
323
323
|
const selectedMediaSingleNode = getSelectedMediaSingle(state);
|
|
324
324
|
const sizeInput = {
|
|
325
325
|
type: 'custom',
|
|
@@ -656,7 +656,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
|
|
|
656
656
|
scrollable: true,
|
|
657
657
|
mediaAssistiveMessage: assistiveMessage
|
|
658
658
|
};
|
|
659
|
-
if (allowResizing && fg('
|
|
659
|
+
if (allowResizing && fg('platform_editor_media_extended_resize_experience')) {
|
|
660
660
|
return {
|
|
661
661
|
...toolbarConfig,
|
|
662
662
|
width: mediaPluginState.isResizing ? undefined : getMaxToolbarWidth()
|
|
@@ -93,7 +93,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
|
|
|
93
93
|
if (node.type !== media || !isImage(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
|
|
94
94
|
return false;
|
|
95
95
|
}
|
|
96
|
-
const resizeExperience = fg('
|
|
96
|
+
const resizeExperience = fg('platform_editor_media_extended_resize_experience');
|
|
97
97
|
const insertMediaPopup = editorExperiment('add-media-from-url', true);
|
|
98
98
|
const mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
|
|
99
99
|
widthType: 'pixel',
|
|
@@ -244,7 +244,7 @@ const createMediaSingleNode = (schema, collection, maxWidth, minWidth, alignLeft
|
|
|
244
244
|
const mediaSingleAttrs = alignLeftOnInsert ? {
|
|
245
245
|
layout: 'align-start'
|
|
246
246
|
} : {};
|
|
247
|
-
const extendedMediaSingleAttrs = fg('
|
|
247
|
+
const extendedMediaSingleAttrs = fg('platform_editor_media_extended_resize_experience') ? {
|
|
248
248
|
...mediaSingleAttrs,
|
|
249
249
|
width: getMediaSingleInitialWidth(scaledWidth, maxWidth, minWidth),
|
|
250
250
|
// TODO: change to use enum
|
|
@@ -265,7 +265,7 @@ const replaceWithMediaSingleNode = (schema, maxWidth, minWidth) => mediaNode =>
|
|
|
265
265
|
...mediaNode.attrs,
|
|
266
266
|
type: 'file'
|
|
267
267
|
}, mediaNode.content, mediaNode.marks);
|
|
268
|
-
const extendedMediaSingleAttrs = fg('
|
|
268
|
+
const extendedMediaSingleAttrs = fg('platform_editor_media_extended_resize_experience') ? {
|
|
269
269
|
width: getMediaSingleInitialWidth(width, maxWidth, minWidth),
|
|
270
270
|
widthType: 'pixel'
|
|
271
271
|
} : {};
|
|
@@ -480,7 +480,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
|
|
|
480
480
|
mediaElement: currentMediaElement(),
|
|
481
481
|
mediaHeight: height,
|
|
482
482
|
mediaWidth: width,
|
|
483
|
-
extendedResizeOffset: fg('
|
|
483
|
+
extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
|
|
484
484
|
}, function (_ref5) {
|
|
485
485
|
var badgeSize = _ref5.badgeSize;
|
|
486
486
|
return jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
|
|
@@ -512,7 +512,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
|
|
|
512
512
|
ref: this.captionPlaceHolderRef,
|
|
513
513
|
onClick: this.clickPlaceholder
|
|
514
514
|
})));
|
|
515
|
-
return jsx(Fragment, null, canResize ? fg('
|
|
515
|
+
return jsx(Fragment, null, canResize ? fg('platform_editor_media_extended_resize_experience') ? jsx(ResizableMediaSingleNext, _extends({}, resizableMediaSingleProps, {
|
|
516
516
|
showLegacyNotification: widthType !== 'pixel'
|
|
517
517
|
}), MediaChildren) : jsx(ResizableMediaSingle, _extends({}, resizableMediaSingleProps, {
|
|
518
518
|
lineLength: contentWidthForLegacyExperience,
|
|
@@ -647,7 +647,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
647
647
|
// see also: https://github.com/ProseMirror/prosemirror/issues/884
|
|
648
648
|
domRef.contentEditable = 'true';
|
|
649
649
|
}
|
|
650
|
-
if (fg('
|
|
650
|
+
if (fg('platform_editor_media_extended_resize_experience')) {
|
|
651
651
|
domRef.classList.add('media-extended-resize-experience');
|
|
652
652
|
}
|
|
653
653
|
return domRef;
|
|
@@ -486,7 +486,7 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
|
|
|
486
486
|
mediaElement: currentMediaElement(),
|
|
487
487
|
mediaHeight: height,
|
|
488
488
|
mediaWidth: width,
|
|
489
|
-
extendedResizeOffset: fg('
|
|
489
|
+
extendedResizeOffset: fg('platform_editor_media_extended_resize_experience') && !isInsideTable
|
|
490
490
|
}, function (_ref7) {
|
|
491
491
|
var badgeSize = _ref7.badgeSize;
|
|
492
492
|
return jsx(React.Fragment, null, shouldShowExternalMediaBadge && jsx(ExternalImageBadge, {
|
|
@@ -518,7 +518,7 @@ export var MediaSingleNodeNext = function MediaSingleNodeNext(mediaSingleNodeNex
|
|
|
518
518
|
ref: captionPlaceHolderRef,
|
|
519
519
|
onClick: clickPlaceholder
|
|
520
520
|
})));
|
|
521
|
-
return jsx(Fragment, null, canResize ? fg('
|
|
521
|
+
return jsx(Fragment, null, canResize ? fg('platform_editor_media_extended_resize_experience') ? jsx(ResizableMediaSingleNext, {
|
|
522
522
|
view: view,
|
|
523
523
|
getPos: getPos,
|
|
524
524
|
updateSize: updateSize,
|
package/dist/esm/plugin.js
CHANGED
|
@@ -124,7 +124,7 @@ export var mediaPlugin = function mediaPlugin(_ref3) {
|
|
|
124
124
|
allowCaptions = _ref5.allowCaptions,
|
|
125
125
|
mediaFeatureFlags = _ref5.featureFlags;
|
|
126
126
|
var allowMediaInline = getMediaFeatureFlag('mediaInline', mediaFeatureFlags);
|
|
127
|
-
var mediaSingleOption = fg('
|
|
127
|
+
var mediaSingleOption = fg('platform_editor_media_extended_resize_experience') ? {
|
|
128
128
|
withCaption: allowCaptions,
|
|
129
129
|
withExtendedWidthTypes: true
|
|
130
130
|
} : {
|
|
@@ -21,7 +21,7 @@ function keymapPlugin(options, editorAnalyticsAPI, editorSelectionAPI, widthPlug
|
|
|
21
21
|
}
|
|
22
22
|
bindKeymapWithCommand(insertNewLine.common, splitMediaGroup, list);
|
|
23
23
|
bindKeymapWithCommand(enter.common, splitMediaGroup, list);
|
|
24
|
-
if (fg('
|
|
24
|
+
if (fg('platform_editor_media_extended_resize_experience')) {
|
|
25
25
|
bindKeymapWithCommand(increaseMediaSize.common, handleMediaIncrease(editorAnalyticsAPI, widthPlugin, options, getIntl), list);
|
|
26
26
|
bindKeymapWithCommand(decreaseMediaSize.common, handleMediaDecrease(editorAnalyticsAPI, widthPlugin, options, getIntl), list);
|
|
27
27
|
}
|
|
@@ -159,7 +159,7 @@ export var toDOM = function toDOM(node) {
|
|
|
159
159
|
var isExternalMedia = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.type) === 'external';
|
|
160
160
|
var childMediaWidth = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.width) || DEFAULT_IMAGE_WIDTH;
|
|
161
161
|
var childMediaHeight = (childNode === null || childNode === void 0 ? void 0 : childNode.attrs.height) || DEFAULT_IMAGE_HEIGHT;
|
|
162
|
-
var dataAttrs = getAttrsFromNodeMediaSingle(fg('
|
|
162
|
+
var dataAttrs = getAttrsFromNodeMediaSingle(fg('platform_editor_media_extended_resize_experience'), node);
|
|
163
163
|
var content = prepareWrapperContentDOM({
|
|
164
164
|
layout: layout,
|
|
165
165
|
dataAttrs: dataAttrs,
|
|
@@ -167,14 +167,14 @@ export var toDOM = function toDOM(node) {
|
|
|
167
167
|
childMediaHeight: childMediaHeight,
|
|
168
168
|
mediaSingleDimensionWidth: mediaSingleAttrs.width,
|
|
169
169
|
isPixelWidth: isPixelWidth,
|
|
170
|
-
isExtendedResizeExperience: fg('
|
|
170
|
+
isExtendedResizeExperience: fg('platform_editor_media_extended_resize_experience')
|
|
171
171
|
});
|
|
172
172
|
var isMediaWrapped = WRAPPED_LAYOUTS.includes(layout);
|
|
173
173
|
var proportionCalc = mediaProportionalWidthCSSCalc({
|
|
174
174
|
isPixelWidth: isPixelWidth,
|
|
175
175
|
isMediaWrapped: isMediaWrapped,
|
|
176
176
|
mediaSingleDimensionWidth: mediaSingleAttrs === null || mediaSingleAttrs === void 0 ? void 0 : mediaSingleAttrs.width,
|
|
177
|
-
isExtendedResizeExperience: fg('
|
|
177
|
+
isExtendedResizeExperience: fg('platform_editor_media_extended_resize_experience')
|
|
178
178
|
});
|
|
179
179
|
var contentWrapperWidth = mediaContentWrapperWidthCSSCalc({
|
|
180
180
|
isMediaWrapped: isMediaWrapped,
|
|
@@ -224,7 +224,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
|
|
|
224
224
|
var widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width;
|
|
225
225
|
var isChangingLayoutDisabled = false;
|
|
226
226
|
var selectedNode = getSelectedMediaSingle(state);
|
|
227
|
-
if (fg('
|
|
227
|
+
if (fg('platform_editor_media_extended_resize_experience')) {
|
|
228
228
|
var _widthPlugin$sharedSt;
|
|
229
229
|
var contentWidth = widthPlugin === null || widthPlugin === void 0 || (_widthPlugin$sharedSt = widthPlugin.sharedState.currentState()) === null || _widthPlugin$sharedSt === void 0 ? void 0 : _widthPlugin$sharedSt.lineLength;
|
|
230
230
|
var selectedNodeMaxWidth = pluginState.currentMaxWidth || contentWidth;
|
|
@@ -317,7 +317,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
|
|
|
317
317
|
// Pixel Entry Toolbar Support
|
|
318
318
|
var selection = state.selection;
|
|
319
319
|
var isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);
|
|
320
|
-
if (allowResizing && (!isWithinTable || allowResizingInTables === true) && fg('
|
|
320
|
+
if (allowResizing && (!isWithinTable || allowResizingInTables === true) && fg('platform_editor_media_extended_resize_experience')) {
|
|
321
321
|
var selectedMediaSingleNode = getSelectedMediaSingle(state);
|
|
322
322
|
var sizeInput = {
|
|
323
323
|
type: 'custom',
|
|
@@ -643,7 +643,7 @@ export var floatingToolbar = function floatingToolbar(state, intl) {
|
|
|
643
643
|
scrollable: true,
|
|
644
644
|
mediaAssistiveMessage: assistiveMessage
|
|
645
645
|
});
|
|
646
|
-
if (allowResizing && fg('
|
|
646
|
+
if (allowResizing && fg('platform_editor_media_extended_resize_experience')) {
|
|
647
647
|
return _objectSpread(_objectSpread({}, toolbarConfig), {}, {
|
|
648
648
|
width: mediaPluginState.isResizing ? undefined : getMaxToolbarWidth()
|
|
649
649
|
});
|
|
@@ -97,7 +97,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
|
|
|
97
97
|
if (node.type !== media || !isImage(node.attrs.__fileMimeType) && node.attrs.type !== 'external') {
|
|
98
98
|
return false;
|
|
99
99
|
}
|
|
100
|
-
var resizeExperience = fg('
|
|
100
|
+
var resizeExperience = fg('platform_editor_media_extended_resize_experience');
|
|
101
101
|
var insertMediaPopup = editorExperiment('add-media-from-url', true);
|
|
102
102
|
var mediaSingleAttrs = resizeExperience && insertMediaPopup ? {
|
|
103
103
|
widthType: 'pixel',
|
|
@@ -239,7 +239,7 @@ var createMediaSingleNode = function createMediaSingleNode(schema, collection, m
|
|
|
239
239
|
var mediaSingleAttrs = alignLeftOnInsert ? {
|
|
240
240
|
layout: 'align-start'
|
|
241
241
|
} : {};
|
|
242
|
-
var extendedMediaSingleAttrs = fg('
|
|
242
|
+
var extendedMediaSingleAttrs = fg('platform_editor_media_extended_resize_experience') ? _objectSpread(_objectSpread({}, mediaSingleAttrs), {}, {
|
|
243
243
|
width: getMediaSingleInitialWidth(scaledWidth, maxWidth, minWidth),
|
|
244
244
|
// TODO: change to use enum
|
|
245
245
|
widthType: 'pixel'
|
|
@@ -257,7 +257,7 @@ var replaceWithMediaSingleNode = function replaceWithMediaSingleNode(schema, max
|
|
|
257
257
|
var copiedMediaNode = media.create(_objectSpread(_objectSpread({}, mediaNode.attrs), {}, {
|
|
258
258
|
type: 'file'
|
|
259
259
|
}), mediaNode.content, mediaNode.marks);
|
|
260
|
-
var extendedMediaSingleAttrs = fg('
|
|
260
|
+
var extendedMediaSingleAttrs = fg('platform_editor_media_extended_resize_experience') ? {
|
|
261
261
|
width: getMediaSingleInitialWidth(width, maxWidth, minWidth),
|
|
262
262
|
widthType: 'pixel'
|
|
263
263
|
} : {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-media",
|
|
3
|
-
"version": "1.39.
|
|
3
|
+
"version": "1.39.3",
|
|
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.3.0",
|
|
39
|
-
"@atlaskit/editor-common": "^94.
|
|
39
|
+
"@atlaskit/editor-common": "^94.12.0",
|
|
40
40
|
"@atlaskit/editor-palette": "1.6.3",
|
|
41
41
|
"@atlaskit/editor-plugin-analytics": "^1.10.0",
|
|
42
42
|
"@atlaskit/editor-plugin-annotation": "1.23.3",
|
|
@@ -123,7 +123,7 @@
|
|
|
123
123
|
"platform_editor_react18_phase2__media_single": {
|
|
124
124
|
"type": "boolean"
|
|
125
125
|
},
|
|
126
|
-
"
|
|
126
|
+
"platform_editor_media_extended_resize_experience": {
|
|
127
127
|
"type": "boolean"
|
|
128
128
|
},
|
|
129
129
|
"platform_editor_media_batch_updates": {
|