@atlaskit/editor-core 187.44.8 → 187.44.11
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 +12 -0
- package/dist/cjs/plugins/media/commands/linking.js +1 -1
- package/dist/cjs/plugins/media/index.js +0 -1
- package/dist/cjs/plugins/media/nodeviews/mediaGroup.js +5 -6
- package/dist/cjs/plugins/media/nodeviews/mediaNodeView/media.js +2 -3
- package/dist/cjs/plugins/media/nodeviews/mediaSingle.js +5 -7
- package/dist/cjs/plugins/media/pm-plugins/alt-text/commands.js +1 -1
- package/dist/cjs/plugins/media/pm-plugins/alt-text/index.js +2 -3
- package/dist/cjs/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js +1 -2
- package/dist/cjs/plugins/media/pm-plugins/keymap-media-single.js +1 -1
- package/dist/cjs/plugins/media/pm-plugins/linking/index.js +2 -2
- package/dist/cjs/plugins/media/pm-plugins/main.js +1 -3
- package/dist/cjs/plugins/media/toolbar/alt-text.js +1 -1
- package/dist/cjs/plugins/media/toolbar/index.js +6 -4
- package/dist/cjs/plugins/media/toolbar/linking-toolbar-appearance.js +5 -6
- package/dist/cjs/plugins/media/ui/ImageBorder/index.js +2 -3
- package/dist/cjs/plugins/media/ui/MediaLinkingToolbar.js +2 -2
- package/dist/cjs/plugins/media/utils/media-common.js +8 -8
- package/dist/cjs/plugins/media/utils/media-files.js +7 -8
- package/dist/cjs/plugins/media/utils/media-single.js +4 -6
- package/dist/cjs/utils/document.js +9 -18
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/plugins/media/commands/linking.js +2 -2
- package/dist/es2019/plugins/media/index.js +0 -1
- package/dist/es2019/plugins/media/nodeviews/mediaGroup.js +1 -2
- package/dist/es2019/plugins/media/nodeviews/mediaNodeView/media.js +2 -1
- package/dist/es2019/plugins/media/nodeviews/mediaSingle.js +1 -3
- package/dist/es2019/plugins/media/pm-plugins/alt-text/commands.js +1 -1
- package/dist/es2019/plugins/media/pm-plugins/alt-text/index.js +1 -1
- package/dist/es2019/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js +1 -2
- package/dist/es2019/plugins/media/pm-plugins/keymap-media-single.js +1 -1
- package/dist/es2019/plugins/media/pm-plugins/linking/index.js +1 -1
- package/dist/es2019/plugins/media/pm-plugins/main.js +1 -3
- package/dist/es2019/plugins/media/toolbar/alt-text.js +1 -1
- package/dist/es2019/plugins/media/toolbar/index.js +1 -1
- package/dist/es2019/plugins/media/toolbar/linking-toolbar-appearance.js +2 -3
- package/dist/es2019/plugins/media/ui/ImageBorder/index.js +1 -1
- package/dist/es2019/plugins/media/ui/MediaLinkingToolbar.js +1 -1
- package/dist/es2019/plugins/media/utils/media-common.js +6 -4
- package/dist/es2019/plugins/media/utils/media-files.js +1 -2
- package/dist/es2019/plugins/media/utils/media-single.js +1 -3
- package/dist/es2019/utils/document.js +2 -19
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/plugins/media/commands/linking.js +2 -2
- package/dist/esm/plugins/media/index.js +0 -1
- package/dist/esm/plugins/media/nodeviews/mediaGroup.js +1 -2
- package/dist/esm/plugins/media/nodeviews/mediaNodeView/media.js +2 -1
- package/dist/esm/plugins/media/nodeviews/mediaSingle.js +1 -3
- package/dist/esm/plugins/media/pm-plugins/alt-text/commands.js +1 -1
- package/dist/esm/plugins/media/pm-plugins/alt-text/index.js +1 -1
- package/dist/esm/plugins/media/pm-plugins/alt-text/ui/AltTextEdit.js +1 -2
- package/dist/esm/plugins/media/pm-plugins/keymap-media-single.js +1 -1
- package/dist/esm/plugins/media/pm-plugins/linking/index.js +1 -1
- package/dist/esm/plugins/media/pm-plugins/main.js +1 -3
- package/dist/esm/plugins/media/toolbar/alt-text.js +1 -1
- package/dist/esm/plugins/media/toolbar/index.js +1 -1
- package/dist/esm/plugins/media/toolbar/linking-toolbar-appearance.js +2 -3
- package/dist/esm/plugins/media/ui/ImageBorder/index.js +1 -1
- package/dist/esm/plugins/media/ui/MediaLinkingToolbar.js +1 -1
- package/dist/esm/plugins/media/utils/media-common.js +6 -4
- package/dist/esm/plugins/media/utils/media-files.js +1 -2
- package/dist/esm/plugins/media/utils/media-single.js +1 -3
- package/dist/esm/utils/document.js +5 -19
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/plugins/media/commands/captions.d.ts +1 -1
- package/dist/types/plugins/media/commands/helpers.d.ts +1 -1
- package/dist/types/plugins/media/commands/linking.d.ts +4 -5
- package/dist/types/plugins/media/media-plugin-options.d.ts +1 -2
- package/dist/types/plugins/media/nodeviews/mediaGroup.d.ts +3 -4
- package/dist/types/plugins/media/nodeviews/mediaNodeUpdater.d.ts +1 -1
- package/dist/types/plugins/media/nodeviews/mediaNodeView/index.d.ts +4 -5
- package/dist/types/plugins/media/nodeviews/mediaNodeView/media.d.ts +1 -2
- package/dist/types/plugins/media/nodeviews/mediaSingle.d.ts +4 -4
- package/dist/types/plugins/media/nodeviews/types.d.ts +6 -7
- package/dist/types/plugins/media/pm-plugins/alt-text/index.d.ts +1 -1
- package/dist/types/plugins/media/pm-plugins/linking/index.d.ts +1 -1
- package/dist/types/plugins/media/pm-plugins/main.d.ts +6 -7
- package/dist/types/plugins/media/pm-plugins/types.d.ts +2 -3
- package/dist/types/plugins/media/toolbar/alt-text.d.ts +2 -3
- package/dist/types/plugins/media/toolbar/commands.d.ts +2 -2
- package/dist/types/plugins/media/toolbar/index.d.ts +2 -2
- package/dist/types/plugins/media/toolbar/linking.d.ts +2 -2
- package/dist/types/plugins/media/types.d.ts +1 -0
- package/dist/types/plugins/media/ui/MediaPicker/DropzoneWrapper.d.ts +1 -1
- package/dist/types/plugins/media/ui/ResizableMediaSingle/types.d.ts +3 -3
- package/dist/types/plugins/media/utils/media-common.d.ts +1 -2
- package/dist/types/utils/document.d.ts +2 -3
- package/dist/types-ts4.5/plugins/media/commands/captions.d.ts +1 -1
- package/dist/types-ts4.5/plugins/media/commands/helpers.d.ts +1 -1
- package/dist/types-ts4.5/plugins/media/commands/linking.d.ts +4 -5
- package/dist/types-ts4.5/plugins/media/media-plugin-options.d.ts +1 -2
- package/dist/types-ts4.5/plugins/media/nodeviews/mediaGroup.d.ts +3 -4
- package/dist/types-ts4.5/plugins/media/nodeviews/mediaNodeUpdater.d.ts +1 -1
- package/dist/types-ts4.5/plugins/media/nodeviews/mediaNodeView/index.d.ts +4 -5
- package/dist/types-ts4.5/plugins/media/nodeviews/mediaNodeView/media.d.ts +1 -2
- package/dist/types-ts4.5/plugins/media/nodeviews/mediaSingle.d.ts +4 -4
- package/dist/types-ts4.5/plugins/media/nodeviews/types.d.ts +6 -7
- package/dist/types-ts4.5/plugins/media/pm-plugins/alt-text/index.d.ts +1 -1
- package/dist/types-ts4.5/plugins/media/pm-plugins/linking/index.d.ts +1 -1
- package/dist/types-ts4.5/plugins/media/pm-plugins/main.d.ts +6 -7
- package/dist/types-ts4.5/plugins/media/pm-plugins/types.d.ts +2 -3
- package/dist/types-ts4.5/plugins/media/toolbar/alt-text.d.ts +2 -3
- package/dist/types-ts4.5/plugins/media/toolbar/commands.d.ts +2 -2
- package/dist/types-ts4.5/plugins/media/toolbar/index.d.ts +2 -2
- package/dist/types-ts4.5/plugins/media/toolbar/linking.d.ts +2 -2
- package/dist/types-ts4.5/plugins/media/types.d.ts +1 -0
- package/dist/types-ts4.5/plugins/media/ui/MediaPicker/DropzoneWrapper.d.ts +1 -1
- package/dist/types-ts4.5/plugins/media/ui/ResizableMediaSingle/types.d.ts +3 -3
- package/dist/types-ts4.5/plugins/media/utils/media-common.d.ts +1 -2
- package/dist/types-ts4.5/utils/document.d.ts +2 -3
- package/package.json +8 -4
- package/report.api.md +2 -2
- package/tmp/api-report-tmp.d.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 187.44.11
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`d5088ec1cdf`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d5088ec1cdf) - [ED-16733] Prepare Media plugin for extraction
|
|
8
|
+
|
|
9
|
+
## 187.44.10
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- Updated dependencies
|
|
14
|
+
|
|
3
15
|
## 187.44.8
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
|
@@ -8,7 +8,7 @@ exports.unlink = exports.showLinkingToolbarWithMediaTypeCheck = exports.showLink
|
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _linking = require("../pm-plugins/linking");
|
|
10
10
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
11
|
-
var _commands = require("
|
|
11
|
+
var _commands = require("@atlaskit/editor-common/commands");
|
|
12
12
|
var _actions = require("../pm-plugins/linking/actions");
|
|
13
13
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
14
14
|
var _currentMediaNode = require("../utils/current-media-node");
|
|
@@ -134,7 +134,6 @@ var mediaPlugin = function mediaPlugin(_ref2) {
|
|
|
134
134
|
mediaGroup: (0, _mediaGroup.ReactMediaGroupNode)(portalProviderAPI, eventDispatcher, providerFactory, options, api),
|
|
135
135
|
mediaSingle: (0, _mediaSingle.ReactMediaSingleNode)(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options),
|
|
136
136
|
media: (0, _mediaNodeView.ReactMediaNode)(portalProviderAPI, eventDispatcher, providerFactory, options, api),
|
|
137
|
-
// @ts-expect-error
|
|
138
137
|
mediaInline: (0, _mediaInline.ReactMediaInlineNode)(portalProviderAPI, eventDispatcher, providerFactory, api)
|
|
139
138
|
},
|
|
140
139
|
errorReporter: errorReporter,
|
|
@@ -19,8 +19,7 @@ var _close = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/close")
|
|
|
19
19
|
var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
|
|
20
20
|
var _react = _interopRequireDefault(require("react"));
|
|
21
21
|
var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
|
|
22
|
-
var _utils = require("
|
|
23
|
-
var _nodes = require("../../../utils/nodes");
|
|
22
|
+
var _utils = require("@atlaskit/editor-common/utils");
|
|
24
23
|
var _pluginKey = require("../pm-plugins/plugin-key");
|
|
25
24
|
var _mediaNodeUpdater = require("./mediaNodeUpdater");
|
|
26
25
|
var _mediaCommon = require("@atlaskit/media-common");
|
|
@@ -46,13 +45,13 @@ var isMediaGroupSelectedFromProps = function isMediaGroupSelectedFromProps(props
|
|
|
46
45
|
if (typeof pos !== 'number') {
|
|
47
46
|
return false;
|
|
48
47
|
}
|
|
49
|
-
return (0,
|
|
48
|
+
return (0, _utils.isNodeSelectedOrInRange)(props.anchorPos, props.headPos, pos, props.node.nodeSize);
|
|
50
49
|
};
|
|
51
50
|
var hasSelectionChanged = function hasSelectionChanged(oldProps, newProps) {
|
|
52
51
|
if (isMediaGroupSelectedFromProps(oldProps) !== isMediaGroupSelectedFromProps(newProps)) {
|
|
53
52
|
return true;
|
|
54
53
|
}
|
|
55
|
-
if (isMediaGroupSelectedFromProps(newProps) ===
|
|
54
|
+
if (isMediaGroupSelectedFromProps(newProps) === _utils.SelectedState.selectedInside) {
|
|
56
55
|
return oldProps.anchorPos !== newProps.anchorPos;
|
|
57
56
|
}
|
|
58
57
|
return false;
|
|
@@ -121,10 +120,10 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
|
|
|
121
120
|
});
|
|
122
121
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isNodeSelected", function (nodePos) {
|
|
123
122
|
var selected = isMediaGroupSelectedFromProps(_this.props);
|
|
124
|
-
if (selected ===
|
|
123
|
+
if (selected === _utils.SelectedState.selectedInRange) {
|
|
125
124
|
return true;
|
|
126
125
|
}
|
|
127
|
-
if (selected ===
|
|
126
|
+
if (selected === _utils.SelectedState.selectedInside && _this.props.anchorPos === nodePos) {
|
|
128
127
|
return true;
|
|
129
128
|
}
|
|
130
129
|
return false;
|
|
@@ -21,7 +21,6 @@ var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-contex
|
|
|
21
21
|
var _mediaCard = require("@atlaskit/media-card");
|
|
22
22
|
var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
|
|
23
23
|
var _react = _interopRequireWildcard(require("react"));
|
|
24
|
-
var _utils2 = require("../../../../utils");
|
|
25
24
|
var _pluginKey = require("../../pm-plugins/plugin-key");
|
|
26
25
|
var _styles = require("../styles");
|
|
27
26
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
@@ -81,11 +80,11 @@ var MediaNode = /*#__PURE__*/function (_Component) {
|
|
|
81
80
|
if (state.selection instanceof _cellSelection.CellSelection) {
|
|
82
81
|
return;
|
|
83
82
|
}
|
|
84
|
-
(0,
|
|
83
|
+
(0, _utils.setTextSelection)(_this.props.view, state.selection.from < propPos ? state.selection.from : propPos - 1,
|
|
85
84
|
// + 3 needed for offset of the media inside mediaSingle and cursor to make whole mediaSingle selected
|
|
86
85
|
state.selection.to > propPos ? state.selection.to : propPos + 2);
|
|
87
86
|
} else {
|
|
88
|
-
(0,
|
|
87
|
+
(0, _utils.setNodeSelection)(_this.props.view, propPos - 1);
|
|
89
88
|
}
|
|
90
89
|
});
|
|
91
90
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onFullscreenChange", function (fullscreen) {
|
|
@@ -22,13 +22,11 @@ var _react2 = _interopRequireWildcard(require("react"));
|
|
|
22
22
|
var _providerFactory = require("@atlaskit/editor-common/provider-factory");
|
|
23
23
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
24
24
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
25
|
-
var _nodes = require("../../../utils/nodes");
|
|
26
|
-
var _utils2 = require("../../../utils");
|
|
27
25
|
var _ResizableMediaSingleNext = _interopRequireDefault(require("../ui/ResizableMediaSingle/ResizableMediaSingleNext"));
|
|
28
26
|
var _ResizableMediaSingle = _interopRequireDefault(require("../ui/ResizableMediaSingle"));
|
|
29
27
|
var _main = require("../pm-plugins/main");
|
|
30
28
|
var _mediaNodeUpdater = require("./mediaNodeUpdater");
|
|
31
|
-
var
|
|
29
|
+
var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
32
30
|
var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
|
|
33
31
|
var _styles = require("./styles");
|
|
34
32
|
var _mediaClient = require("@atlaskit/media-client");
|
|
@@ -194,11 +192,11 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
|
|
|
194
192
|
if (state.selection instanceof _cellSelection.CellSelection) {
|
|
195
193
|
return;
|
|
196
194
|
}
|
|
197
|
-
(0,
|
|
195
|
+
(0, _utils.setTextSelection)(_this.props.view, state.selection.from < propPos ? state.selection.from : propPos,
|
|
198
196
|
// + 3 needed for offset of the media inside mediaSingle and cursor to make whole mediaSingle selected
|
|
199
197
|
state.selection.to > propPos ? state.selection.to : propPos + 3);
|
|
200
198
|
} else {
|
|
201
|
-
(0,
|
|
199
|
+
(0, _utils.setNodeSelection)(_this.props.view, propPos);
|
|
202
200
|
}
|
|
203
201
|
});
|
|
204
202
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateSize", function (width, layout) {
|
|
@@ -393,7 +391,7 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
|
|
|
393
391
|
if (pos) {
|
|
394
392
|
var $pos = state.doc.resolve(pos);
|
|
395
393
|
var table = state.schema.nodes.table;
|
|
396
|
-
var disabledNode = !!(0,
|
|
394
|
+
var disabledNode = !!(0, _utils2.findParentNodeOfTypeClosestToPos)($pos, [table]);
|
|
397
395
|
canResize = canResize && !disabledNode;
|
|
398
396
|
}
|
|
399
397
|
}
|
|
@@ -488,7 +486,7 @@ var MediaSingleNodeView = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
488
486
|
} catch (e) {
|
|
489
487
|
pos = undefined;
|
|
490
488
|
}
|
|
491
|
-
var isNodeSelected = (0,
|
|
489
|
+
var isNodeSelected = (0, _utils.isNodeSelectedOrInRange)(selection.$anchor.pos, selection.$head.pos, pos, _this2.node.nodeSize);
|
|
492
490
|
_this2.selectionType = isNodeSelected;
|
|
493
491
|
return isNodeSelected;
|
|
494
492
|
});
|
|
@@ -8,8 +8,8 @@ exports.updateAltText = exports.openMediaAltTextMenu = exports.closeMediaAltText
|
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
9
|
var _ = require(".");
|
|
10
10
|
var _mediaCommon = require("../../utils/media-common");
|
|
11
|
-
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
12
11
|
var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
|
|
12
|
+
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
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; }
|
|
15
15
|
var createCommandWithAnalytics = function createCommandWithAnalytics(actionType, action, transform) {
|
|
@@ -7,12 +7,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.pluginKey = exports.getPluginState = exports.createPlugin = exports.createCommand = void 0;
|
|
8
8
|
var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
|
|
9
9
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
10
|
-
var _pluginStateFactory = require("../../../../utils/plugin-state-factory");
|
|
11
|
-
var _reducer = _interopRequireDefault(require("./reducer"));
|
|
12
10
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
11
|
+
var _reducer = _interopRequireDefault(require("./reducer"));
|
|
13
12
|
var pluginKey = new _state.PluginKey('mediaAltTextPlugin');
|
|
14
13
|
exports.pluginKey = pluginKey;
|
|
15
|
-
var _pluginFactory = (0,
|
|
14
|
+
var _pluginFactory = (0, _utils.pluginFactory)(pluginKey, _reducer.default, {
|
|
16
15
|
onSelectionChanged: function onSelectionChanged(tr, newState) {
|
|
17
16
|
// dont close alt text for undo/redo transactions (if it comes from prosemirror-history)
|
|
18
17
|
if (tr.getMeta(_utils.pmHistoryPluginKey)) {
|
|
@@ -22,7 +22,6 @@ var _messages = require("../messages");
|
|
|
22
22
|
var _reactIntlNext = require("react-intl-next");
|
|
23
23
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
24
24
|
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
25
|
-
var _keymaps2 = require("../../../../../keymaps");
|
|
26
25
|
var _commands = require("../commands");
|
|
27
26
|
var _analyticsNext = require("@atlaskit/analytics-next");
|
|
28
27
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
@@ -135,7 +134,7 @@ var AltTextEditComponent = /*#__PURE__*/function (_React$Component) {
|
|
|
135
134
|
var formatMessage = this.props.intl.formatMessage;
|
|
136
135
|
var showClearTextButton = this.state.showClearTextButton;
|
|
137
136
|
var backButtonMessage = formatMessage(_messages.messages.back);
|
|
138
|
-
var backButtonMessageComponent = (0, _react2.jsx)(
|
|
137
|
+
var backButtonMessageComponent = (0, _react2.jsx)(_keymaps.ToolTipContent, {
|
|
139
138
|
description: backButtonMessage,
|
|
140
139
|
keymap: _keymaps.escape,
|
|
141
140
|
shortcutOverride: "Esc"
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.default = keymapPlugin;
|
|
7
7
|
var _keymap = require("@atlaskit/editor-prosemirror/keymap");
|
|
8
8
|
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
9
|
-
var _utils = require("
|
|
9
|
+
var _utils = require("@atlaskit/editor-common/utils");
|
|
10
10
|
var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
11
11
|
var _commands = require("@atlaskit/editor-prosemirror/commands");
|
|
12
12
|
var _selection = require("@atlaskit/editor-common/selection");
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.mediaLinkingPluginKey = exports.getMediaLinkingState = exports.default = exports.createMediaLinkingCommand = void 0;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var
|
|
9
|
+
var _utils = require("@atlaskit/editor-common/utils");
|
|
10
10
|
var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
|
|
11
11
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
12
12
|
var _reducer = _interopRequireDefault(require("./reducer"));
|
|
@@ -52,7 +52,7 @@ function onSelectionChanged(tr) {
|
|
|
52
52
|
mediaPos: mediaPos
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
|
-
var mediaLinkingPluginFactory = (0,
|
|
55
|
+
var mediaLinkingPluginFactory = (0, _utils.pluginFactory)(mediaLinkingPluginKey, _reducer.default, {
|
|
56
56
|
mapping: mapping,
|
|
57
57
|
onSelectionChanged: onSelectionChanged
|
|
58
58
|
});
|
|
@@ -34,9 +34,7 @@ var helpers = _interopRequireWildcard(require("../commands/helpers"));
|
|
|
34
34
|
var _pluginKey = require("./plugin-key");
|
|
35
35
|
var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
|
|
36
36
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
37
|
-
var _document = require("../../../utils/document");
|
|
38
37
|
var _mediaCommon2 = require("@atlaskit/media-common");
|
|
39
|
-
var _utils3 = require("../../../utils");
|
|
40
38
|
var _reactIntlNext = require("react-intl-next");
|
|
41
39
|
var _mediaTaskManager = require("./mediaTaskManager");
|
|
42
40
|
var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
|
|
@@ -248,7 +246,7 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
|
|
|
248
246
|
// read width state right before inserting to get up-to-date and define values
|
|
249
247
|
var widthPluginState = (_this$pluginInjection3 = _this.pluginInjectionApi) === null || _this$pluginInjection3 === void 0 ? void 0 : _this$pluginInjection3.width.sharedState.currentState();
|
|
250
248
|
(0, _mediaSingle.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState, editorAnalyticsAPI);
|
|
251
|
-
} else if ((0, _mediaCommon2.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !(0,
|
|
249
|
+
} else if ((0, _mediaCommon2.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !(0, _utils.isInEmptyLine)(state) && (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _utils.isInListItem)(state)) && (0, _mediaFiles.canInsertMediaInline)(state)) {
|
|
252
250
|
(0, _mediaFiles.insertMediaInlineNode)(editorAnalyticsAPI)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
|
|
253
251
|
} else {
|
|
254
252
|
(0, _mediaFiles.insertMediaGroupNode)(editorAnalyticsAPI)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
|
|
@@ -9,7 +9,7 @@ exports.getAltTextToolbar = exports.altTextEditComponent = exports.altTextButton
|
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
10
|
var _react = _interopRequireDefault(require("react"));
|
|
11
11
|
var _commands = require("../pm-plugins/alt-text/commands");
|
|
12
|
-
var _keymaps = require("
|
|
12
|
+
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
13
13
|
var _messages = require("../pm-plugins/alt-text/messages");
|
|
14
14
|
var _AltTextEdit = _interopRequireWildcard(require("../pm-plugins/alt-text/ui/AltTextEdit"));
|
|
15
15
|
var _mediaCommon = require("../utils/media-common");
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
4
5
|
Object.defineProperty(exports, "__esModule", {
|
|
5
6
|
value: true
|
|
6
7
|
});
|
|
@@ -13,7 +14,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
|
13
14
|
var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
|
|
14
15
|
var _download = _interopRequireDefault(require("@atlaskit/icon/glyph/download"));
|
|
15
16
|
var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
|
|
16
|
-
var _messages =
|
|
17
|
+
var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
|
|
17
18
|
var _pluginKey = require("../pm-plugins/plugin-key");
|
|
18
19
|
var _linking = require("./linking");
|
|
19
20
|
var _card = require("@atlaskit/editor-common/card");
|
|
@@ -24,7 +25,6 @@ var _linking3 = require("../commands/linking");
|
|
|
24
25
|
var _linkingToolbarAppearance = require("./linking-toolbar-appearance");
|
|
25
26
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
26
27
|
var _mediaUi = require("@atlaskit/media-ui");
|
|
27
|
-
var _messages2 = require("@atlaskit/editor-common/messages");
|
|
28
28
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
29
29
|
var _filePreviewItem = require("./filePreviewItem");
|
|
30
30
|
var _utils2 = require("./utils");
|
|
@@ -37,6 +37,8 @@ var _imageBorder = require("./imageBorder");
|
|
|
37
37
|
var _PixelEntry = require("../ui/PixelEntry");
|
|
38
38
|
var _mediaSingle2 = require("@atlaskit/editor-common/media-single");
|
|
39
39
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
40
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
41
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
40
42
|
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; }
|
|
41
43
|
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; }
|
|
42
44
|
var remove = function remove(state, dispatch) {
|
|
@@ -60,7 +62,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
|
|
|
60
62
|
title: intl.formatMessage(_mediaUi.messages.changeView),
|
|
61
63
|
options: [{
|
|
62
64
|
id: 'editor.media.view.switcher.inline',
|
|
63
|
-
title: intl.formatMessage(
|
|
65
|
+
title: intl.formatMessage(_messages.cardMessages.inline),
|
|
64
66
|
selected: false,
|
|
65
67
|
disabled: false,
|
|
66
68
|
onClick: (0, _commands.changeMediaCardToInline)(editorAnalyticsAPI),
|
|
@@ -133,7 +135,7 @@ var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToo
|
|
|
133
135
|
title: intl.formatMessage(_mediaUi.messages.changeView),
|
|
134
136
|
options: [{
|
|
135
137
|
id: 'editor.media.view.switcher.inline',
|
|
136
|
-
title: intl.formatMessage(
|
|
138
|
+
title: intl.formatMessage(_messages.cardMessages.inline),
|
|
137
139
|
selected: true,
|
|
138
140
|
disabled: false,
|
|
139
141
|
onClick: function onClick() {
|
|
@@ -15,9 +15,8 @@ var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"))
|
|
|
15
15
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
16
16
|
var _checkMediaType = require("../utils/check-media-type");
|
|
17
17
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
18
|
-
var _messages = require("
|
|
19
|
-
var
|
|
20
|
-
var _keymaps = require("../../../keymaps");
|
|
18
|
+
var _messages = require("@atlaskit/editor-common/messages");
|
|
19
|
+
var _keymaps = require("@atlaskit/editor-common/keymaps");
|
|
21
20
|
var _pluginKey = require("../pm-plugins/plugin-key");
|
|
22
21
|
var _currentMediaNode = require("../utils/current-media-node");
|
|
23
22
|
var _templateObject;
|
|
@@ -58,8 +57,8 @@ var LinkToolbarAppearance = function LinkToolbarAppearance(_ref) {
|
|
|
58
57
|
}
|
|
59
58
|
if (mediaLinkingState && mediaLinkingState.editable) {
|
|
60
59
|
var isValidUrl = (0, _adfSchema.isSafeUrl)(mediaLinkingState.link);
|
|
61
|
-
var title = intl.formatMessage(
|
|
62
|
-
var linkTitle = intl.formatMessage(isValidUrl ? _messages.linkMessages.openLink :
|
|
60
|
+
var title = intl.formatMessage(_messages.linkToolbarMessages.editLink);
|
|
61
|
+
var linkTitle = intl.formatMessage(isValidUrl ? _messages.linkMessages.openLink : _messages.linkToolbarMessages.unableToOpenLink);
|
|
63
62
|
return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)("div", {
|
|
64
63
|
css: wrapper
|
|
65
64
|
}, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
|
|
@@ -84,7 +83,7 @@ var LinkToolbarAppearance = function LinkToolbarAppearance(_ref) {
|
|
|
84
83
|
className: "hyperlink-open-link"
|
|
85
84
|
}), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
|
|
86
85
|
} else {
|
|
87
|
-
var _title = intl.formatMessage(
|
|
86
|
+
var _title = intl.formatMessage(_messages.linkToolbarMessages.addLink);
|
|
88
87
|
return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
|
|
89
88
|
testId: "add-link-button",
|
|
90
89
|
onClick: onAddLink,
|
|
@@ -16,7 +16,6 @@ var _editorPalette = require("@atlaskit/editor-palette");
|
|
|
16
16
|
var _uiMenu = require("@atlaskit/editor-common/ui-menu");
|
|
17
17
|
var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
|
|
18
18
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
19
|
-
var _ToolbarButton = _interopRequireDefault(require("../../../../ui/ToolbarButton"));
|
|
20
19
|
var _styles2 = require("./styles");
|
|
21
20
|
var _messages = require("./messages");
|
|
22
21
|
/** @jsx jsx */
|
|
@@ -140,7 +139,7 @@ var ImageBorder = function ImageBorder(_ref) {
|
|
|
140
139
|
enabled: enabled,
|
|
141
140
|
isOpen: isOpen
|
|
142
141
|
})
|
|
143
|
-
}, (0, _react.jsx)(
|
|
142
|
+
}, (0, _react.jsx)(_uiMenu.ToolbarButton, {
|
|
144
143
|
className: "image-border-toolbar-btn",
|
|
145
144
|
selected: enabled,
|
|
146
145
|
onClick: toggleBorder,
|
|
@@ -152,7 +151,7 @@ var ImageBorder = function ImageBorder(_ref) {
|
|
|
152
151
|
title: enabled ? formatMessage(_messages.messages.removeBorder) : formatMessage(_messages.messages.addBorder)
|
|
153
152
|
}), (0, _react.jsx)("div", {
|
|
154
153
|
ref: popupTarget
|
|
155
|
-
}, (0, _react.jsx)(
|
|
154
|
+
}, (0, _react.jsx)(_uiMenu.ToolbarButton, {
|
|
156
155
|
className: "image-border-toolbar-dropdown",
|
|
157
156
|
selected: enabled || isOpen,
|
|
158
157
|
"aria-label": formatMessage(_messages.messages.borderOptions),
|
|
@@ -23,7 +23,7 @@ var _link = require("@atlaskit/editor-common/link");
|
|
|
23
23
|
var _messages = require("@atlaskit/editor-common/messages");
|
|
24
24
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
25
25
|
var _colors = require("@atlaskit/theme/colors");
|
|
26
|
-
var
|
|
26
|
+
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
27
27
|
var _mediaLinkingToolbarMessages = require("./media-linking-toolbar-messages");
|
|
28
28
|
var _templateObject, _templateObject2;
|
|
29
29
|
/** @jsx jsx */
|
|
@@ -160,7 +160,7 @@ var LinkAddToolbar = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
160
160
|
var formatMessage = this.props.intl.formatMessage;
|
|
161
161
|
|
|
162
162
|
// dont show validation errors if input method is typeahed, which means user selects from search list
|
|
163
|
-
if (inputMethod ===
|
|
163
|
+
if (inputMethod === _analytics.INPUT_METHOD.TYPEAHEAD) {
|
|
164
164
|
return [];
|
|
165
165
|
}
|
|
166
166
|
if (!value) {
|
|
@@ -8,12 +8,12 @@ var _commands = require("@atlaskit/editor-prosemirror/commands");
|
|
|
8
8
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
9
9
|
var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
10
10
|
var _utils2 = require("@atlaskit/editor-common/utils");
|
|
11
|
-
var _utils3 = require("../../../utils");
|
|
12
|
-
var _slice = require("../../../utils/slice");
|
|
13
|
-
var _dom = require("../../../utils/dom");
|
|
14
11
|
var _isImage = require("./is-image");
|
|
15
12
|
var _selection = require("@atlaskit/editor-common/selection");
|
|
16
13
|
var _mediaClient = require("@atlaskit/media-client");
|
|
14
|
+
var isTemporary = function isTemporary(id) {
|
|
15
|
+
return id.indexOf('temporary:') === 0;
|
|
16
|
+
};
|
|
17
17
|
var isMediaBlobUrlFromAttrs = function isMediaBlobUrlFromAttrs(attrs) {
|
|
18
18
|
return !!(attrs && attrs.type === 'external' && (0, _mediaClient.isMediaBlobUrl)(attrs.url));
|
|
19
19
|
};
|
|
@@ -127,7 +127,7 @@ var removeMediaNode = function removeMediaNode(view, node, getPos) {
|
|
|
127
127
|
return;
|
|
128
128
|
}
|
|
129
129
|
tr.deleteRange(currentMediaNodePos, currentMediaNodePos + node.nodeSize);
|
|
130
|
-
if (
|
|
130
|
+
if (isTemporary(id)) {
|
|
131
131
|
tr.setMeta('addToHistory', false);
|
|
132
132
|
}
|
|
133
133
|
var $currentMediaNodePos = doc.resolve(currentMediaNodePos);
|
|
@@ -183,7 +183,7 @@ var transformSliceToCorrectMediaWrapper = function transformSliceToCorrectMediaW
|
|
|
183
183
|
mediaGroup = _schema$nodes.mediaGroup,
|
|
184
184
|
mediaSingle = _schema$nodes.mediaSingle,
|
|
185
185
|
media = _schema$nodes.media;
|
|
186
|
-
return (0,
|
|
186
|
+
return (0, _utils2.mapSlice)(slice, function (node, parent) {
|
|
187
187
|
if (!parent && node.type === media) {
|
|
188
188
|
if (mediaSingle && ((0, _isImage.isImage)(node.attrs.__fileMimeType) || node.attrs.type === 'external')) {
|
|
189
189
|
return mediaSingle.createChecked({}, node);
|
|
@@ -225,7 +225,7 @@ var unwrapNestedMediaElements = function unwrapNestedMediaElements(html) {
|
|
|
225
225
|
// Remove Google Doc's wrapper <b> el
|
|
226
226
|
var docsWrapper = wrapper.querySelector('b[id^="docs-internal-guid-"]');
|
|
227
227
|
if (docsWrapper) {
|
|
228
|
-
(0,
|
|
228
|
+
(0, _utils2.unwrap)(wrapper, docsWrapper);
|
|
229
229
|
}
|
|
230
230
|
var imageTags = wrapper.querySelectorAll('img');
|
|
231
231
|
if (!imageTags.length) {
|
|
@@ -253,7 +253,7 @@ var unwrapNestedMediaElements = function unwrapNestedMediaElements(html) {
|
|
|
253
253
|
|
|
254
254
|
// Find the top most element that the parent has a valid container for the image.
|
|
255
255
|
// Stop just before found the wrapper
|
|
256
|
-
var insertBeforeElement = (0,
|
|
256
|
+
var insertBeforeElement = (0, _utils2.walkUpTreeUntil)(mediaParent, function (element) {
|
|
257
257
|
// If is at the top just use this element as reference
|
|
258
258
|
if (element.parentElement === wrapper) {
|
|
259
259
|
return true;
|
|
@@ -270,7 +270,7 @@ var unwrapNestedMediaElements = function unwrapNestedMediaElements(html) {
|
|
|
270
270
|
// Attempt to clean up lines left behind by the image
|
|
271
271
|
mediaParent.innerText = mediaParent.innerText.trim();
|
|
272
272
|
// Walk up and delete empty elements left over after removing the image tag
|
|
273
|
-
(0,
|
|
273
|
+
(0, _utils2.removeNestedEmptyEls)(mediaParent);
|
|
274
274
|
}
|
|
275
275
|
});
|
|
276
276
|
|
|
@@ -5,15 +5,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.insertMediaInlineNode = exports.insertMediaGroupNode = exports.getPosInList = exports.canInsertMediaInline = void 0;
|
|
7
7
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
8
|
-
var _utils = require("
|
|
9
|
-
var _utils2 = require("@atlaskit/editor-common/utils");
|
|
8
|
+
var _utils = require("@atlaskit/editor-common/utils");
|
|
10
9
|
var _mediaCommon = require("./media-common");
|
|
11
|
-
var
|
|
10
|
+
var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
12
11
|
var _selection = require("@atlaskit/editor-common/selection");
|
|
13
12
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
14
13
|
var canInsertMediaInline = function canInsertMediaInline(state) {
|
|
15
14
|
var node = state.schema.nodes.mediaInline.create({});
|
|
16
|
-
return (0,
|
|
15
|
+
return (0, _utils2.canInsert)(state.selection.$to, _model.Fragment.from(node));
|
|
17
16
|
};
|
|
18
17
|
exports.canInsertMediaInline = canInsertMediaInline;
|
|
19
18
|
var getInsertMediaGroupAnalytics = function getInsertMediaGroupAnalytics(mediaState, inputMethod) {
|
|
@@ -69,7 +68,7 @@ function isSelectionMediaGroup(state) {
|
|
|
69
68
|
function shouldAppendParagraph(state, node) {
|
|
70
69
|
var media = state.schema.nodes.media;
|
|
71
70
|
var wasMediaNode = node && node.type === media;
|
|
72
|
-
return ((0, _utils.insideTableCell)(state) || (0, _utils.isInListItem)(state) || (0,
|
|
71
|
+
return ((0, _utils.insideTableCell)(state) || (0, _utils.isInListItem)(state) || (0, _utils.isInLayoutColumn)(state) || (0, _selection.atTheEndOfDoc)(state) && (!(0, _mediaCommon.posOfPrecedingMediaGroup)(state) || (0, _mediaCommon.isSelectionNonMediaBlockNode)(state))) && !wasMediaNode;
|
|
73
72
|
}
|
|
74
73
|
|
|
75
74
|
/**
|
|
@@ -144,7 +143,7 @@ var insertMediaGroupNode = function insertMediaGroupNode(editorAnalyticsAPI) {
|
|
|
144
143
|
var resolvedInsertPos = tr.doc.resolve(mediaInsertPos);
|
|
145
144
|
var parent = resolvedInsertPos.parent;
|
|
146
145
|
var nodeAtInsertionPoint = tr.doc.nodeAt(mediaInsertPos);
|
|
147
|
-
var shouldSplit = !isSelectionMediaGroup(state) && (0,
|
|
146
|
+
var shouldSplit = !isSelectionMediaGroup(state) && (0, _utils.isSupportedInParent)(state, _model.Fragment.from(state.schema.nodes.mediaGroup.createChecked({}, mediaNodes)));
|
|
148
147
|
var withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
|
|
149
148
|
var content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
|
|
150
149
|
: [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
|
|
@@ -170,7 +169,7 @@ var insertMediaGroupNode = function insertMediaGroupNode(editorAnalyticsAPI) {
|
|
|
170
169
|
content.push(paragraph.create());
|
|
171
170
|
}
|
|
172
171
|
editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
|
|
173
|
-
dispatch((0,
|
|
172
|
+
dispatch((0, _utils2.safeInsert)(_model.Fragment.fromArray(content), mediaInsertPos)(tr));
|
|
174
173
|
};
|
|
175
174
|
};
|
|
176
175
|
exports.insertMediaGroupNode = insertMediaGroupNode;
|
|
@@ -212,7 +211,7 @@ var getPosInList = function getPosInList(state) {
|
|
|
212
211
|
listItem = _state$schema$nodes2.listItem;
|
|
213
212
|
|
|
214
213
|
// 1. Check if I am inside a list.
|
|
215
|
-
if ((0,
|
|
214
|
+
if ((0, _utils2.hasParentNode)(function (node) {
|
|
216
215
|
return node.type === listItem;
|
|
217
216
|
})(state.selection)) {
|
|
218
217
|
// 2. Get end position of root list
|
|
@@ -11,11 +11,9 @@ exports.transformSliceForMedia = transformSliceForMedia;
|
|
|
11
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
12
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
13
13
|
var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
14
|
-
var _utils2 = require("
|
|
14
|
+
var _utils2 = require("@atlaskit/editor-common/utils");
|
|
15
15
|
var _mediaSingle = require("@atlaskit/editor-common/media-single");
|
|
16
|
-
var _utils3 = require("@atlaskit/editor-common/utils");
|
|
17
16
|
var _mediaCommon = require("../utils/media-common");
|
|
18
|
-
var _slice = require("../../../utils/slice");
|
|
19
17
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
20
18
|
var _insert = require("@atlaskit/editor-common/insert");
|
|
21
19
|
var _isImage = require("./is-image");
|
|
@@ -38,7 +36,7 @@ var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, file
|
|
|
38
36
|
};
|
|
39
37
|
};
|
|
40
38
|
function shouldAddParagraph(state) {
|
|
41
|
-
return (0, _selection.atTheBeginningOfBlock)(state) && !(0, _utils2.checkNodeDown)(state.selection, state.doc,
|
|
39
|
+
return (0, _selection.atTheBeginningOfBlock)(state) && !(0, _utils2.checkNodeDown)(state.selection, state.doc, _utils2.isEmptyParagraph);
|
|
42
40
|
}
|
|
43
41
|
function insertNodesWithOptionalParagraph(nodes) {
|
|
44
42
|
var analyticsAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
@@ -190,7 +188,7 @@ function transformSliceForMedia(slice, schema) {
|
|
|
190
188
|
return function (selection) {
|
|
191
189
|
var newSlice = slice;
|
|
192
190
|
if ((0, _utils.hasParentNodeOfType)([layoutSection, table, bulletList, orderedList, expand, nestedExpand])(selection)) {
|
|
193
|
-
newSlice = (0,
|
|
191
|
+
newSlice = (0, _utils2.mapSlice)(newSlice, function (node) {
|
|
194
192
|
var extendedOrLegacyAttrs = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.extended-resize-experience') ? {
|
|
195
193
|
layout: node.attrs.layout,
|
|
196
194
|
widthType: node.attrs.widthType,
|
|
@@ -212,7 +210,7 @@ function transformSliceForMedia(slice, schema) {
|
|
|
212
210
|
});
|
|
213
211
|
}
|
|
214
212
|
var __mediaTraceId = (0, _mediaCommon2.getRandomHex)(8);
|
|
215
|
-
newSlice = (0,
|
|
213
|
+
newSlice = (0, _utils2.mapSlice)(newSlice, function (node) {
|
|
216
214
|
// This logic is duplicated in editor-plugin-ai where external images can be inserted
|
|
217
215
|
// from external sources through the use of AI. The editor-plugin-ai package is avoiding
|
|
218
216
|
// sharing dependencies with editor-core to support products using it with various versions
|
|
@@ -14,27 +14,18 @@ exports.getChangedNodes = getChangedNodes;
|
|
|
14
14
|
exports.getChangedNodesIn = getChangedNodesIn;
|
|
15
15
|
exports.getChildBreakoutModes = getChildBreakoutModes;
|
|
16
16
|
exports.getNodesCount = getNodesCount;
|
|
17
|
-
exports
|
|
17
|
+
Object.defineProperty(exports, "isInEmptyLine", {
|
|
18
|
+
enumerable: true,
|
|
19
|
+
get: function get() {
|
|
20
|
+
return _utils.isInEmptyLine;
|
|
21
|
+
}
|
|
22
|
+
});
|
|
18
23
|
exports.nodesBetweenChanged = nodesBetweenChanged;
|
|
19
24
|
exports.processRawFragmentValue = processRawFragmentValue;
|
|
20
25
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
21
26
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
22
27
|
var _nodeWidth = require("./node-width");
|
|
23
28
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
24
|
-
function isInEmptyLine(state) {
|
|
25
|
-
var selection = state.selection;
|
|
26
|
-
var _ref = selection,
|
|
27
|
-
$cursor = _ref.$cursor,
|
|
28
|
-
$anchor = _ref.$anchor;
|
|
29
|
-
if (!$cursor) {
|
|
30
|
-
return false;
|
|
31
|
-
}
|
|
32
|
-
var node = $cursor.node();
|
|
33
|
-
if (!node) {
|
|
34
|
-
return false;
|
|
35
|
-
}
|
|
36
|
-
return (0, _utils.isEmptyParagraph)(node) && (0, _utils.hasDocAsParent)($anchor);
|
|
37
|
-
}
|
|
38
29
|
function processRawFragmentValue(schema, value, providerFactory, sanitizePrivateContent, contentTransformer, dispatchAnalyticsEvent) {
|
|
39
30
|
if (!value) {
|
|
40
31
|
return;
|
|
@@ -49,9 +40,9 @@ function processRawFragmentValue(schema, value, providerFactory, sanitizePrivate
|
|
|
49
40
|
}
|
|
50
41
|
return _model.Fragment.from(adfEntities);
|
|
51
42
|
}
|
|
52
|
-
function getChangedNodesIn(
|
|
53
|
-
var tr =
|
|
54
|
-
doc =
|
|
43
|
+
function getChangedNodesIn(_ref) {
|
|
44
|
+
var tr = _ref.tr,
|
|
45
|
+
doc = _ref.doc;
|
|
55
46
|
var nodes = [];
|
|
56
47
|
var stepRange = (0, _utils.getStepRange)(tr);
|
|
57
48
|
if (!stepRange) {
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.version = exports.nextMajorVersion = exports.name = void 0;
|
|
7
7
|
var name = "@atlaskit/editor-core";
|
|
8
8
|
exports.name = name;
|
|
9
|
-
var version = "187.44.
|
|
9
|
+
var version = "187.44.11";
|
|
10
10
|
exports.version = version;
|
|
11
11
|
var nextMajorVersion = function nextMajorVersion() {
|
|
12
12
|
return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createMediaLinkingCommand, getMediaLinkingState, mediaLinkingPluginKey } from '../pm-plugins/linking';
|
|
2
2
|
import { normalizeUrl } from '@atlaskit/editor-common/utils';
|
|
3
|
-
import { createToggleBlockMarkOnRange } from '
|
|
3
|
+
import { createToggleBlockMarkOnRange } from '@atlaskit/editor-common/commands';
|
|
4
4
|
import { MediaLinkingActionsTypes } from '../pm-plugins/linking/actions';
|
|
5
|
-
import {
|
|
5
|
+
import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
|
|
6
6
|
import { currentMediaNode } from '../utils/current-media-node';
|
|
7
7
|
import { checkMediaType } from '../utils/check-media-type';
|
|
8
8
|
import { getMediaPluginState } from '../pm-plugins/main';
|
|
@@ -123,7 +123,6 @@ const mediaPlugin = ({
|
|
|
123
123
|
mediaGroup: ReactMediaGroupNode(portalProviderAPI, eventDispatcher, providerFactory, options, api),
|
|
124
124
|
mediaSingle: ReactMediaSingleNode(portalProviderAPI, eventDispatcher, providerFactory, api, dispatchAnalyticsEvent, options),
|
|
125
125
|
media: ReactMediaNode(portalProviderAPI, eventDispatcher, providerFactory, options, api),
|
|
126
|
-
// @ts-expect-error
|
|
127
126
|
mediaInline: ReactMediaInlineNode(portalProviderAPI, eventDispatcher, providerFactory, api)
|
|
128
127
|
},
|
|
129
128
|
errorReporter,
|