@atlaskit/editor-core 197.2.7 → 197.4.0
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 +51 -0
- package/afm-cc/tsconfig.json +0 -3
- package/afm-jira/tsconfig.json +0 -3
- package/dist/cjs/actions/index.js +16 -42
- package/dist/cjs/composable-editor/editor-internal.js +9 -7
- package/dist/cjs/composable-editor/hooks/useProviders.js +11 -1
- package/dist/cjs/composable-editor/utils/handleProviders.js +3 -1
- package/dist/cjs/create-editor/ReactEditorView.js +13 -9
- package/dist/cjs/presets/universal.js +15 -11
- package/dist/cjs/ui/Appearance/FullPage/FullPage.js +1 -3
- package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js +1 -9
- package/dist/cjs/ui/ContentStyles/expand.js +9 -4
- package/dist/cjs/ui/ContentStyles/layout.js +8 -2
- package/dist/cjs/ui/Toolbar/ToolbarWithSizeDetector.js +3 -1
- package/dist/cjs/ui/ToolbarFeedback/index.js +5 -210
- package/dist/cjs/utils/action.js +9 -38
- package/dist/cjs/utils/getNodesCount.js +13 -0
- package/dist/cjs/utils/index.js +2 -2
- package/dist/cjs/utils/performance/getTimeSince.js +16 -0
- package/dist/cjs/utils/performance/track-transactions.js +5 -4
- package/dist/cjs/utils/{document.js → processRawFragmentValue.js} +2 -10
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/actions/index.js +4 -14
- package/dist/es2019/composable-editor/editor-internal.js +9 -7
- package/dist/es2019/composable-editor/hooks/useProviders.js +11 -1
- package/dist/es2019/composable-editor/utils/handleProviders.js +3 -1
- package/dist/es2019/create-editor/ReactEditorView.js +8 -4
- package/dist/es2019/index.js +8 -1
- package/dist/es2019/presets/universal.js +15 -11
- package/dist/es2019/ui/Appearance/FullPage/FullPage.js +1 -3
- package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js +1 -9
- package/dist/es2019/ui/ContentStyles/expand.js +16 -2
- package/dist/es2019/ui/ContentStyles/layout.js +25 -15
- package/dist/es2019/ui/Toolbar/ToolbarWithSizeDetector.js +3 -1
- package/dist/es2019/ui/ToolbarFeedback/index.js +5 -188
- package/dist/es2019/utils/action.js +0 -10
- package/dist/es2019/utils/getNodesCount.js +7 -0
- package/dist/es2019/utils/index.js +1 -1
- package/dist/es2019/utils/performance/getTimeSince.js +8 -0
- package/dist/es2019/utils/performance/track-transactions.js +2 -1
- package/dist/es2019/utils/{document.js → processRawFragmentValue.js} +1 -8
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/actions/index.js +17 -43
- package/dist/esm/composable-editor/editor-internal.js +9 -7
- package/dist/esm/composable-editor/hooks/useProviders.js +11 -1
- package/dist/esm/composable-editor/utils/handleProviders.js +3 -1
- package/dist/esm/create-editor/ReactEditorView.js +8 -4
- package/dist/esm/index.js +8 -1
- package/dist/esm/presets/universal.js +15 -11
- package/dist/esm/ui/Appearance/FullPage/FullPage.js +1 -3
- package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js +1 -9
- package/dist/esm/ui/ContentStyles/expand.js +9 -4
- package/dist/esm/ui/ContentStyles/layout.js +7 -2
- package/dist/esm/ui/Toolbar/ToolbarWithSizeDetector.js +3 -1
- package/dist/esm/ui/ToolbarFeedback/index.js +5 -212
- package/dist/esm/utils/action.js +9 -37
- package/dist/esm/utils/getNodesCount.js +7 -0
- package/dist/esm/utils/index.js +1 -1
- package/dist/esm/utils/performance/getTimeSince.js +10 -0
- package/dist/esm/utils/performance/track-transactions.js +2 -1
- package/dist/esm/utils/{document.js → processRawFragmentValue.js} +1 -8
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/actions/index.d.ts +0 -1
- package/dist/types/composable-editor/hooks/useProviders.d.ts +3 -1
- package/dist/types/create-editor/ReactEditorView.d.ts +2 -1
- package/dist/types/create-editor/create-universal-preset.d.ts +1456 -77
- package/dist/types/index.d.ts +8 -1
- package/dist/types/presets/default.d.ts +1297 -45
- package/dist/types/presets/universal.d.ts +1457 -77
- package/dist/types/presets/useUniversalPreset.d.ts +2205 -826
- package/dist/types/types/editor-appearance-component.d.ts +0 -1
- package/dist/types/ui/Appearance/FullPage/FullPageToolbar.d.ts +0 -1
- package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts +1 -1
- package/dist/types/ui/ContentStyles/index.d.ts +2 -2
- package/dist/types/ui/ToolbarFeedback/index.d.ts +1 -26
- package/dist/types/utils/action.d.ts +0 -4
- package/dist/types/utils/getNodesCount.d.ts +2 -0
- package/dist/types/utils/index.d.ts +1 -1
- package/dist/types/utils/performance/getTimeSince.d.ts +8 -0
- package/dist/{types-ts4.5/utils/document.d.ts → types/utils/processRawFragmentValue.d.ts} +1 -2
- package/dist/types-ts4.5/actions/index.d.ts +0 -1
- package/dist/types-ts4.5/composable-editor/hooks/useProviders.d.ts +3 -1
- package/dist/types-ts4.5/create-editor/ReactEditorView.d.ts +2 -1
- package/dist/types-ts4.5/create-editor/create-universal-preset.d.ts +1648 -60
- package/dist/types-ts4.5/index.d.ts +8 -1
- package/dist/types-ts4.5/presets/default.d.ts +1466 -24
- package/dist/types-ts4.5/presets/universal.d.ts +1649 -60
- package/dist/types-ts4.5/presets/useUniversalPreset.d.ts +2424 -836
- package/dist/types-ts4.5/types/editor-appearance-component.d.ts +0 -1
- package/dist/types-ts4.5/ui/Appearance/FullPage/FullPageToolbar.d.ts +0 -1
- package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts +1 -1
- package/dist/types-ts4.5/ui/ContentStyles/index.d.ts +2 -2
- package/dist/types-ts4.5/ui/ToolbarFeedback/index.d.ts +1 -26
- package/dist/types-ts4.5/utils/action.d.ts +0 -7
- package/dist/types-ts4.5/utils/getNodesCount.d.ts +2 -0
- package/dist/types-ts4.5/utils/index.d.ts +1 -1
- package/dist/types-ts4.5/utils/performance/getTimeSince.d.ts +8 -0
- package/dist/{types/utils/document.d.ts → types-ts4.5/utils/processRawFragmentValue.d.ts} +1 -2
- package/package.json +20 -22
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,56 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 197.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#137822](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137822)
|
|
8
|
+
[`202cf9b609302`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/202cf9b609302) -
|
|
9
|
+
[ux] Deprecating toolbar component that is unused.
|
|
10
|
+
- [#138305](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138305)
|
|
11
|
+
[`c79d9c18032b6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c79d9c18032b6) -
|
|
12
|
+
Passing task local ID from editor mentions plugin
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#138245](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138245)
|
|
17
|
+
[`e3913201044c6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e3913201044c6) -
|
|
18
|
+
Cleanup internal workaround with editor actions.
|
|
19
|
+
- [#138136](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138136)
|
|
20
|
+
[`35938ecf46ba7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/35938ecf46ba7) -
|
|
21
|
+
[ED-24755] Implement insert functionality of element templates and fire document inserted event
|
|
22
|
+
with template IDs
|
|
23
|
+
- [`749c8b3e5bd5d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/749c8b3e5bd5d) -
|
|
24
|
+
Cleanup feature flag for removing the hide avatar group prop.
|
|
25
|
+
- Updated dependencies
|
|
26
|
+
|
|
27
|
+
## 197.3.0
|
|
28
|
+
|
|
29
|
+
### Minor Changes
|
|
30
|
+
|
|
31
|
+
- [#136891](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136891)
|
|
32
|
+
[`388780c6348e9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/388780c6348e9) -
|
|
33
|
+
Pass emoji provider via preset
|
|
34
|
+
- [#137755](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137755)
|
|
35
|
+
[`f3d004d4e3a3e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f3d004d4e3a3e) -
|
|
36
|
+
ED-24650 fix nested node jittering issue
|
|
37
|
+
|
|
38
|
+
### Patch Changes
|
|
39
|
+
|
|
40
|
+
- [#137404](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137404)
|
|
41
|
+
[`ca03548656c8e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ca03548656c8e) -
|
|
42
|
+
ED-24744 Align padding of layout and expand when nested dnd is enabled
|
|
43
|
+
- [#137736](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137736)
|
|
44
|
+
[`2a88fdd213838`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2a88fdd213838) -
|
|
45
|
+
Introducing new smaller refined entry-points for editor-common to reduce bundle size.
|
|
46
|
+
- [#137404](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137404)
|
|
47
|
+
[`adae1f3dc8fca`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/adae1f3dc8fca) -
|
|
48
|
+
Switches Support Table in Comment features to use Statsig experiment instead of a Feature Gate.
|
|
49
|
+
- [#137800](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137800)
|
|
50
|
+
[`62a2ca89af70c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/62a2ca89af70c) -
|
|
51
|
+
Fix toolbar not showing up in SSR env
|
|
52
|
+
- Updated dependencies
|
|
53
|
+
|
|
3
54
|
## 197.2.7
|
|
4
55
|
|
|
5
56
|
### Patch Changes
|
package/afm-cc/tsconfig.json
CHANGED
package/afm-jira/tsconfig.json
CHANGED
|
@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
+
var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
|
|
13
14
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
14
15
|
var _analytics = require("@atlaskit/editor-common/utils/analytics");
|
|
15
16
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
@@ -18,8 +19,8 @@ var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
|
18
19
|
var _eventDispatcher = require("../event-dispatcher");
|
|
19
20
|
var _action = require("../utils/action");
|
|
20
21
|
var _deprecationWarnings = _interopRequireDefault(require("../utils/deprecation-warnings"));
|
|
21
|
-
var _document = require("../utils/document");
|
|
22
22
|
var _nodesByLocalIds = require("../utils/nodes-by-localIds");
|
|
23
|
+
var _processRawFragmentValue = require("../utils/processRawFragmentValue");
|
|
23
24
|
// TODO: ED-21786
|
|
24
25
|
// Please, do not copy or use this kind of code below
|
|
25
26
|
// @ts-ignore
|
|
@@ -201,34 +202,7 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
|
|
|
201
202
|
editorView.dispatch(tr);
|
|
202
203
|
return true;
|
|
203
204
|
}
|
|
204
|
-
|
|
205
|
-
key: "__temporaryFixForConfigPanel",
|
|
206
|
-
value: function () {
|
|
207
|
-
var _temporaryFixForConfigPanel2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
|
208
|
-
var editorView, __EDITOR_INTERNALS_DO_NOT_USE__API;
|
|
209
|
-
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
210
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
211
|
-
case 0:
|
|
212
|
-
// @ts-ignore Internal API not for use, just to unblock extracting extension plugin
|
|
213
|
-
editorView = this.editorView, __EDITOR_INTERNALS_DO_NOT_USE__API = this.__EDITOR_INTERNALS_DO_NOT_USE__API;
|
|
214
|
-
if (!(!editorView || !__EDITOR_INTERNALS_DO_NOT_USE__API)) {
|
|
215
|
-
_context2.next = 3;
|
|
216
|
-
break;
|
|
217
|
-
}
|
|
218
|
-
return _context2.abrupt("return");
|
|
219
|
-
case 3:
|
|
220
|
-
(0, _action.__temporaryFixForConfigPanel)(editorView, __EDITOR_INTERNALS_DO_NOT_USE__API);
|
|
221
|
-
case 4:
|
|
222
|
-
case "end":
|
|
223
|
-
return _context2.stop();
|
|
224
|
-
}
|
|
225
|
-
}, _callee2, this);
|
|
226
|
-
}));
|
|
227
|
-
function __temporaryFixForConfigPanel() {
|
|
228
|
-
return _temporaryFixForConfigPanel2.apply(this, arguments);
|
|
229
|
-
}
|
|
230
|
-
return __temporaryFixForConfigPanel;
|
|
231
|
-
}()
|
|
205
|
+
|
|
232
206
|
/**
|
|
233
207
|
* @deprecated This is deprecated and is no longer maintained.
|
|
234
208
|
*
|
|
@@ -242,36 +216,36 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
|
|
|
242
216
|
}, {
|
|
243
217
|
key: "getValue",
|
|
244
218
|
value: (function () {
|
|
245
|
-
var _getValue = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function
|
|
219
|
+
var _getValue = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
|
|
246
220
|
var editorView, doc, json, nodeSanitized;
|
|
247
|
-
return _regenerator.default.wrap(function
|
|
248
|
-
while (1) switch (
|
|
221
|
+
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
222
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
249
223
|
case 0:
|
|
250
224
|
editorView = this.editorView;
|
|
251
225
|
if (editorView) {
|
|
252
|
-
|
|
226
|
+
_context2.next = 3;
|
|
253
227
|
break;
|
|
254
228
|
}
|
|
255
|
-
return
|
|
229
|
+
return _context2.abrupt("return");
|
|
256
230
|
case 3:
|
|
257
|
-
|
|
231
|
+
_context2.next = 5;
|
|
258
232
|
return (0, _action.getEditorValueWithMedia)(editorView);
|
|
259
233
|
case 5:
|
|
260
|
-
doc =
|
|
234
|
+
doc = _context2.sent;
|
|
261
235
|
json = (0, _utils.toJSON)(doc);
|
|
262
236
|
if (this.contentEncode) {
|
|
263
|
-
|
|
237
|
+
_context2.next = 9;
|
|
264
238
|
break;
|
|
265
239
|
}
|
|
266
|
-
return
|
|
240
|
+
return _context2.abrupt("return", json);
|
|
267
241
|
case 9:
|
|
268
242
|
nodeSanitized = _model.Node.fromJSON(this.editorView.state.schema, json);
|
|
269
|
-
return
|
|
243
|
+
return _context2.abrupt("return", this.contentEncode(nodeSanitized));
|
|
270
244
|
case 11:
|
|
271
245
|
case "end":
|
|
272
|
-
return
|
|
246
|
+
return _context2.stop();
|
|
273
247
|
}
|
|
274
|
-
},
|
|
248
|
+
}, _callee2, this);
|
|
275
249
|
}));
|
|
276
250
|
function getValue() {
|
|
277
251
|
return _getValue.apply(this, arguments);
|
|
@@ -367,7 +341,7 @@ var EditorActions = exports.default = /*#__PURE__*/function () {
|
|
|
367
341
|
return true;
|
|
368
342
|
}
|
|
369
343
|
var schema = state.schema;
|
|
370
|
-
var content = Array.isArray(rawValue) ? (0,
|
|
344
|
+
var content = Array.isArray(rawValue) ? (0, _processRawFragmentValue.processRawFragmentValue)(schema, rawValue) : (0, _processRawValue.processRawValue)(schema, rawValue);
|
|
371
345
|
if (!content) {
|
|
372
346
|
return false;
|
|
373
347
|
}
|
|
@@ -54,10 +54,12 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
|
|
|
54
54
|
var setEditorApi = (0, _react.useCallback)(
|
|
55
55
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
56
56
|
function (api) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
if (!(0, _platformFeatureFlags.fg)('platform_editor_remove_editor_actions_workaround')) {
|
|
58
|
+
// This is an workaround to unblock Editor Lego Decoupling project, if you have questions ping us #cc-editor-lego
|
|
59
|
+
// We may clean up this code when EditorActions deprecation process starts
|
|
60
|
+
// @ts-expect-error 2339: Property '__EDITOR_INTERNALS_DO_NOT_USE__API' does not exist on type 'EditorActions<any>'.
|
|
61
|
+
editorActions.__EDITOR_INTERNALS_DO_NOT_USE__API = api;
|
|
62
|
+
}
|
|
61
63
|
}, [editorActions]);
|
|
62
64
|
var overriddenEditorProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
63
65
|
onSave: props.onSave ? handleSave : undefined,
|
|
@@ -145,8 +147,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
|
|
|
145
147
|
enableToolbarMinWidth: ((_props$featureFlags = props.featureFlags) === null || _props$featureFlags === void 0 ? void 0 : _props$featureFlags.toolbarMinWidthOverflow) != null ? !!((_props$featureFlags2 = props.featureFlags) !== null && _props$featureFlags2 !== void 0 && _props$featureFlags2.toolbarMinWidthOverflow) : props.allowUndoRedoButtons,
|
|
146
148
|
useStickyToolbar: props.useStickyToolbar,
|
|
147
149
|
featureFlags: featureFlags,
|
|
148
|
-
pluginHooks: config.pluginHooks
|
|
149
|
-
hideAvatarGroup: (0, _platformFeatureFlags.fg)('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
|
|
150
|
+
pluginHooks: config.pluginHooks
|
|
150
151
|
}));
|
|
151
152
|
}
|
|
152
153
|
}), (0, _react2.jsx)(PortalRenderer, null))))))));
|
|
@@ -177,7 +178,8 @@ function ReactEditorViewContextWrapper(props) {
|
|
|
177
178
|
(0, _useProviders.useProviders)({
|
|
178
179
|
contextIdentifierProvider: props.editorProps.contextIdentifierProvider,
|
|
179
180
|
mediaProvider: (_props$editorProps$me = props.editorProps.media) === null || _props$editorProps$me === void 0 ? void 0 : _props$editorProps$me.provider,
|
|
180
|
-
cardProvider: ((_props$editorProps$li = props.editorProps.linking) === null || _props$editorProps$li === void 0 || (_props$editorProps$li = _props$editorProps$li.smartLinks) === null || _props$editorProps$li === void 0 ? void 0 : _props$editorProps$li.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider
|
|
181
|
+
cardProvider: ((_props$editorProps$li = props.editorProps.linking) === null || _props$editorProps$li === void 0 || (_props$editorProps$li = _props$editorProps$li.smartLinks) === null || _props$editorProps$li === void 0 ? void 0 : _props$editorProps$li.provider) || smartLinks && smartLinks.provider || UNSAFE_cards && UNSAFE_cards.provider,
|
|
182
|
+
emojiProvider: props.editorProps.emojiProvider
|
|
181
183
|
});
|
|
182
184
|
return (0, _react2.jsx)(_ReactEditorView.default, (0, _extends2.default)({}, props, {
|
|
183
185
|
setEditorApi: setEditorAPI
|
|
@@ -8,6 +8,7 @@ exports.useProviders = void 0;
|
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
10
|
var _react = require("react");
|
|
11
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
12
|
var _context2 = require("../../presets/context");
|
|
12
13
|
/**
|
|
13
14
|
* This hook is used to replace the old approach of using the `providerFactory`.
|
|
@@ -20,7 +21,8 @@ var _context2 = require("../../presets/context");
|
|
|
20
21
|
var useProviders = exports.useProviders = function useProviders(_ref) {
|
|
21
22
|
var contextIdentifierProvider = _ref.contextIdentifierProvider,
|
|
22
23
|
mediaProvider = _ref.mediaProvider,
|
|
23
|
-
cardProvider = _ref.cardProvider
|
|
24
|
+
cardProvider = _ref.cardProvider,
|
|
25
|
+
emojiProvider = _ref.emojiProvider;
|
|
24
26
|
var editorApi = (0, _context2.usePresetContext)();
|
|
25
27
|
(0, _react.useEffect)(function () {
|
|
26
28
|
function setProvider() {
|
|
@@ -68,4 +70,12 @@ var useProviders = exports.useProviders = function useProviders(_ref) {
|
|
|
68
70
|
editorApi === null || editorApi === void 0 || (_editorApi$card = editorApi.card) === null || _editorApi$card === void 0 || _editorApi$card.actions.setProvider(cardProvider);
|
|
69
71
|
}
|
|
70
72
|
}, [cardProvider, editorApi]);
|
|
73
|
+
(0, _react.useEffect)(function () {
|
|
74
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_get_emoji_provider_from_config')) {
|
|
75
|
+
if (emojiProvider) {
|
|
76
|
+
var _editorApi$emoji;
|
|
77
|
+
editorApi === null || editorApi === void 0 || (_editorApi$emoji = editorApi.emoji) === null || _editorApi$emoji === void 0 || _editorApi$emoji.actions.setProvider(emojiProvider);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}, [emojiProvider, editorApi]);
|
|
71
81
|
};
|
|
@@ -28,7 +28,9 @@ function handleProviders(providerFactory, _ref, extensionProvider, quickInsertPr
|
|
|
28
28
|
autoformattingProvider = _ref.autoformattingProvider,
|
|
29
29
|
searchProvider = _ref.searchProvider,
|
|
30
30
|
cardProvider = _ref.cardProvider;
|
|
31
|
-
|
|
31
|
+
if (!(0, _platformFeatureFlags.fg)('platform_editor_get_emoji_provider_from_config')) {
|
|
32
|
+
providerFactory.setProvider('emojiProvider', emojiProvider);
|
|
33
|
+
}
|
|
32
34
|
providerFactory.setProvider('mentionProvider', mentionProvider);
|
|
33
35
|
providerFactory.setProvider('taskDecisionProvider', taskDecisionProvider);
|
|
34
36
|
providerFactory.setProvider('contextIdentifierProvider', contextIdentifierProvider);
|
|
@@ -19,18 +19,22 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
19
19
|
var _analytics = require("@atlaskit/editor-common/analytics");
|
|
20
20
|
var _browser = require("@atlaskit/editor-common/browser");
|
|
21
21
|
var _coreUtils = require("@atlaskit/editor-common/core-utils");
|
|
22
|
+
var _countNodes2 = require("@atlaskit/editor-common/count-nodes");
|
|
22
23
|
var _normalizeFeatureFlags = require("@atlaskit/editor-common/normalize-feature-flags");
|
|
23
24
|
var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
|
|
25
|
+
var _measureRender = require("@atlaskit/editor-common/performance/measure-render");
|
|
26
|
+
var _navigation = require("@atlaskit/editor-common/performance/navigation");
|
|
24
27
|
var _preset = require("@atlaskit/editor-common/preset");
|
|
28
|
+
var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
|
|
25
29
|
var _ufo = require("@atlaskit/editor-common/ufo");
|
|
26
|
-
var _utils = require("@atlaskit/editor-common/utils");
|
|
27
30
|
var _analytics2 = require("@atlaskit/editor-common/utils/analytics");
|
|
28
31
|
var _state2 = require("@atlaskit/editor-prosemirror/state");
|
|
29
32
|
var _view = require("@atlaskit/editor-prosemirror/view");
|
|
33
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
30
34
|
var _eventDispatcher = require("../event-dispatcher");
|
|
31
35
|
var _context = require("../presets/context");
|
|
32
|
-
var _document = require("../utils/document");
|
|
33
36
|
var _findChangedNodesFromTransaction = require("../utils/findChangedNodesFromTransaction");
|
|
37
|
+
var _getNodesCount = require("../utils/getNodesCount");
|
|
34
38
|
var _isFullPage = require("../utils/is-full-page");
|
|
35
39
|
var _RenderTracking = require("../utils/performance/components/RenderTracking");
|
|
36
40
|
var _measureEnum = _interopRequireDefault(require("../utils/performance/measure-enum"));
|
|
@@ -215,7 +219,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
|
|
|
215
219
|
_this.contentTransformer = contentTransformerProvider ? contentTransformerProvider(schema) : undefined;
|
|
216
220
|
var doc;
|
|
217
221
|
if (options.doc) {
|
|
218
|
-
doc = (0,
|
|
222
|
+
doc = (0, _processRawValue.processRawValue)(schema, options.doc, options.props.providerFactory, options.props.editorProps.sanitizePrivateContent, _this.contentTransformer, _this.dispatchAnalyticsEvent);
|
|
219
223
|
}
|
|
220
224
|
var api = _this.pluginInjectionAPI.api();
|
|
221
225
|
var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState().mode) === 'view';
|
|
@@ -406,18 +410,18 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
|
|
|
406
410
|
};
|
|
407
411
|
});
|
|
408
412
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createEditorView", function (node) {
|
|
409
|
-
(0,
|
|
413
|
+
(0, _measureRender.measureRender)(_measureEnum.default.PROSEMIRROR_RENDERED, function (_ref3) {
|
|
410
414
|
var _this$props$editorPro4, _proseMirrorRenderedT, _proseMirrorRenderedT2;
|
|
411
415
|
var duration = _ref3.duration,
|
|
412
416
|
startTime = _ref3.startTime,
|
|
413
417
|
distortedDuration = _ref3.distortedDuration;
|
|
414
418
|
var proseMirrorRenderedTracking = (_this$props$editorPro4 = _this.props.editorProps) === null || _this$props$editorPro4 === void 0 || (_this$props$editorPro4 = _this$props$editorPro4.performanceTracking) === null || _this$props$editorPro4 === void 0 ? void 0 : _this$props$editorPro4.proseMirrorRenderedTracking;
|
|
415
|
-
var forceSeverityTracking = typeof proseMirrorRenderedTracking === 'undefined'
|
|
419
|
+
var forceSeverityTracking = typeof proseMirrorRenderedTracking === 'undefined';
|
|
416
420
|
_this.proseMirrorRenderedSeverity = !!forceSeverityTracking || proseMirrorRenderedTracking !== null && proseMirrorRenderedTracking !== void 0 && proseMirrorRenderedTracking.trackSeverity ? (0, _analytics2.getAnalyticsEventSeverity)(duration, (_proseMirrorRenderedT = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityNormalThreshold) !== null && _proseMirrorRenderedT !== void 0 ? _proseMirrorRenderedT : _consts.PROSEMIRROR_RENDERED_NORMAL_SEVERITY_THRESHOLD, (_proseMirrorRenderedT2 = proseMirrorRenderedTracking === null || proseMirrorRenderedTracking === void 0 ? void 0 : proseMirrorRenderedTracking.severityDegradedThreshold) !== null && _proseMirrorRenderedT2 !== void 0 ? _proseMirrorRenderedT2 : _consts.PROSEMIRROR_RENDERED_DEGRADED_SEVERITY_THRESHOLD) : undefined;
|
|
417
421
|
if (_this.view) {
|
|
418
422
|
var _this$pluginInjection2, _this$experienceStore10;
|
|
419
|
-
var nodes = (0,
|
|
420
|
-
var ttfb = (0,
|
|
423
|
+
var nodes = (0, _getNodesCount.getNodesCount)(_this.view.state.doc);
|
|
424
|
+
var ttfb = (0, _navigation.getResponseEndTime)();
|
|
421
425
|
var contextIdentifier = (_this$pluginInjection2 = _this.pluginInjectionAPI.api().base) === null || _this$pluginInjection2 === void 0 ? void 0 : _this$pluginInjection2.sharedState.currentState();
|
|
422
426
|
_this.dispatchAnalyticsEvent({
|
|
423
427
|
action: _analytics.ACTION.PROSEMIRROR_RENDERED,
|
|
@@ -554,7 +558,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
|
|
|
554
558
|
});
|
|
555
559
|
var _api = _this.pluginInjectionAPI.api();
|
|
556
560
|
(_props$setEditorApi = props.setEditorApi) === null || _props$setEditorApi === void 0 || _props$setEditorApi.call(props, _api);
|
|
557
|
-
if (props.editorProps.editorActions) {
|
|
561
|
+
if (props.editorProps.editorActions && !(0, _platformFeatureFlags.fg)('platform_editor_remove_editor_actions_workaround')) {
|
|
558
562
|
// @ts-expect-error
|
|
559
563
|
props.editorProps.editorActions.__EDITOR_INTERNALS_DO_NOT_USE__API = _api;
|
|
560
564
|
}
|
|
@@ -624,7 +628,7 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
|
|
|
624
628
|
}, {
|
|
625
629
|
key: "countNodes",
|
|
626
630
|
value: function countNodes() {
|
|
627
|
-
return (0,
|
|
631
|
+
return (0, _countNodes2.countNodes)(this.editorState);
|
|
628
632
|
}
|
|
629
633
|
}, {
|
|
630
634
|
key: "isTransactionTrackingExplicitlyDisabled",
|
|
@@ -56,6 +56,7 @@ var _tasksAndDecisions = require("@atlaskit/editor-plugins/tasks-and-decisions")
|
|
|
56
56
|
var _textColor = require("@atlaskit/editor-plugins/text-color");
|
|
57
57
|
var _toolbarListsIndentation = require("@atlaskit/editor-plugins/toolbar-lists-indentation");
|
|
58
58
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
59
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
59
60
|
var _isFullPage = require("../utils/is-full-page");
|
|
60
61
|
var _versionWrapper = require("../version-wrapper");
|
|
61
62
|
var _default = require("./default");
|
|
@@ -143,11 +144,16 @@ function createUniversalPresetInternal(_ref) {
|
|
|
143
144
|
HighlightComponent: (_props$mention2 = props.mention) === null || _props$mention2 === void 0 ? void 0 : _props$mention2.HighlightComponent,
|
|
144
145
|
profilecardProvider: (_props$mention3 = props.mention) === null || _props$mention3 === void 0 ? void 0 : _props$mention3.profilecardProvider
|
|
145
146
|
}, initialPluginConfiguration === null || initialPluginConfiguration === void 0 ? void 0 : initialPluginConfiguration.mentionsPlugin)], Boolean(props.mentionProvider)).maybeAdd([_emoji.emojiPlugin, {
|
|
147
|
+
emojiProvider: props.emojiProvider,
|
|
146
148
|
emojiNodeDataProvider: initialPluginConfiguration === null || initialPluginConfiguration === void 0 || (_initialPluginConfigu = initialPluginConfiguration.emoji) === null || _initialPluginConfigu === void 0 ? void 0 : _initialPluginConfigu.emojiNodeDataProvider
|
|
147
149
|
}], Boolean(props.emojiProvider)).maybeAdd([_table.tablesPlugin, _objectSpread({
|
|
148
150
|
tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
|
|
149
|
-
dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && (0,
|
|
150
|
-
|
|
151
|
+
dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && (0, _experiments.editorExperiment)('support_table_in_comment', true, {
|
|
152
|
+
exposure: true
|
|
153
|
+
})),
|
|
154
|
+
isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && (isFullPage || isComment && (0, _experiments.editorExperiment)('support_table_in_comment', true, {
|
|
155
|
+
exposure: true
|
|
156
|
+
})),
|
|
151
157
|
allowContextualMenu: !isMobile,
|
|
152
158
|
fullWidthEnabled: appearance === 'full-width',
|
|
153
159
|
wasFullWidthEnabled: prevAppearance && prevAppearance === 'full-width',
|
|
@@ -218,7 +224,11 @@ function createUniversalPresetInternal(_ref) {
|
|
|
218
224
|
tableSelectorSupported: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableSelector) && isFullPage,
|
|
219
225
|
nativeStatusSupported: !statusMenuDisabled,
|
|
220
226
|
showElementBrowserLink: props.elementBrowser && props.elementBrowser.showModal || false,
|
|
221
|
-
replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false
|
|
227
|
+
replacePlusMenuWithElementBrowser: props.elementBrowser && props.elementBrowser.replacePlusMenu || false,
|
|
228
|
+
// @ts-ignore
|
|
229
|
+
// For platform_editor_element_level_templates experiment only
|
|
230
|
+
// clean up ticket ED-24873
|
|
231
|
+
UNSAFE_editorAppearance: appearance
|
|
222
232
|
}]).maybeAdd([_beforePrimaryToolbar.beforePrimaryToolbarPlugin, {
|
|
223
233
|
beforePrimaryToolbarComponents: // @ts-expect-error 2339: Property 'before' does not exist on type 'PrimaryToolbarComponents'.
|
|
224
234
|
(_props$primaryToolbar = props.primaryToolbarComponents) === null || _props$primaryToolbar === void 0 ? void 0 : _props$primaryToolbar.before
|
|
@@ -229,15 +239,9 @@ function createUniversalPresetInternal(_ref) {
|
|
|
229
239
|
// https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
|
|
230
240
|
collabEdit: props.collabEdit,
|
|
231
241
|
takeFullWidth: !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
|
|
232
|
-
showAvatarGroup:
|
|
233
|
-
// Cleanup: `platform_editor_remove_hide_avatar_group_prop`
|
|
234
|
-
// Remove `!props.hideAvatarGroup`
|
|
235
|
-
!props.hideAvatarGroup && featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
|
|
242
|
+
showAvatarGroup: featureFlags.showAvatarGroupAsPlugin === true && !featureFlags.twoLineEditorToolbar
|
|
236
243
|
}]).maybeAdd([_findReplace.findReplacePlugin, {
|
|
237
|
-
takeFullWidth:
|
|
238
|
-
// Cleanup: `platform_editor_remove_hide_avatar_group_prop`
|
|
239
|
-
// Remove `!props.hideAvatarGroup`
|
|
240
|
-
!props.hideAvatarGroup && !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
|
|
244
|
+
takeFullWidth: !!featureFlags.showAvatarGroupAsPlugin === false && !hasBeforePrimaryToolbar(props.primaryToolbarComponents),
|
|
241
245
|
twoLineEditorToolbar: !!props.primaryToolbarComponents && !!featureFlags.twoLineEditorToolbar
|
|
242
246
|
}], Boolean(props.allowFindReplace)).maybeAdd(_border.borderPlugin, Boolean(props.allowBorderMark || props.UNSAFE_allowBorderMark)).maybeAdd(_fragment.fragmentPlugin, Boolean(props.allowFragmentMark)).add(_pasteOptionsToolbar.pasteOptionsToolbarPlugin).add([_codeBidiWarning.codeBidiWarningPlugin, {
|
|
243
247
|
appearance: appearance
|
|
@@ -12,7 +12,6 @@ var _react2 = require("@emotion/react");
|
|
|
12
12
|
var _browser = require("@atlaskit/editor-common/browser");
|
|
13
13
|
var _hooks = require("@atlaskit/editor-common/hooks");
|
|
14
14
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
15
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
15
|
var _FullPageContentArea = require("./FullPageContentArea");
|
|
17
16
|
var _FullPageToolbar = require("./FullPageToolbar");
|
|
18
17
|
var _StyledComponents = require("./StyledComponents");
|
|
@@ -98,8 +97,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
|
|
|
98
97
|
primaryToolbarComponents: primaryToolbarComponents,
|
|
99
98
|
providerFactory: props.providerFactory,
|
|
100
99
|
showKeyline: showKeyline,
|
|
101
|
-
featureFlags: props.featureFlags
|
|
102
|
-
hideAvatarGroup: (0, _platformFeatureFlags.fg)('platform_editor_remove_hide_avatar_group_prop') ? undefined : props.hideAvatarGroup
|
|
100
|
+
featureFlags: props.featureFlags
|
|
103
101
|
}), (0, _react2.jsx)(_FullPageContentArea.FullPageContentArea, {
|
|
104
102
|
editorAPI: editorAPI,
|
|
105
103
|
ref: scrollContentContainerRef,
|
|
@@ -27,7 +27,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
27
27
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
28
28
|
|
|
29
29
|
var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(function (props) {
|
|
30
|
-
var _props$featureFlags, _props$customPrimaryT
|
|
30
|
+
var _props$featureFlags, _props$customPrimaryT;
|
|
31
31
|
var _useState = (0, _react.useState)(false),
|
|
32
32
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
33
33
|
shouldSplitToolbar = _useState2[0],
|
|
@@ -64,14 +64,6 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
|
|
|
64
64
|
css: _MainToolbar.customToolbarWrapperStyle
|
|
65
65
|
}, twoLineEditorToolbar && !!props.customPrimaryToolbarComponents && 'before' in props.customPrimaryToolbarComponents ? (0, _react2.jsx)(_BeforeWrapper.BeforePrimaryToolbarWrapper, {
|
|
66
66
|
beforePrimaryToolbarComponents: (_props$customPrimaryT = props.customPrimaryToolbarComponents) === null || _props$customPrimaryT === void 0 ? void 0 : _props$customPrimaryT.before
|
|
67
|
-
}) : null, !(0, _platformFeatureFlags.fg)('platform_editor_remove_hide_avatar_group_prop') ? props.hideAvatarGroup || (props === null || props === void 0 || (_props$featureFlags2 = props.featureFlags) === null || _props$featureFlags2 === void 0 ? void 0 : _props$featureFlags2.showAvatarGroupAsPlugin) === true && !((_props$featureFlags3 = props.featureFlags) !== null && _props$featureFlags3 !== void 0 && _props$featureFlags3.twoLineEditorToolbar) ? null : // Avatars are moved to Confluence codebase for Edit in Context
|
|
68
|
-
// When Edit in Context is enabled customPrimaryToolbarComponents is undefined
|
|
69
|
-
// For more details please check
|
|
70
|
-
// https://hello.atlassian.net/wiki/spaces/PCG/pages/2851572180/Editor+toolbar+for+live+pages+and+edit+in+context+projects
|
|
71
|
-
editorAPI === null || editorAPI === void 0 || (_editorAPI$avatarGrou = editorAPI.avatarGroup) === null || _editorAPI$avatarGrou === void 0 ? void 0 : _editorAPI$avatarGrou.actions.getToolbarItem({
|
|
72
|
-
inviteToEditComponent: (_props$collabEdit = props.collabEdit) === null || _props$collabEdit === void 0 ? void 0 : _props$collabEdit.inviteToEditComponent,
|
|
73
|
-
inviteToEditHandler: (_props$collabEdit2 = props.collabEdit) === null || _props$collabEdit2 === void 0 ? void 0 : _props$collabEdit2.inviteToEditHandler,
|
|
74
|
-
isInviteToEditButtonSelected: (_props$collabEdit3 = props.collabEdit) === null || _props$collabEdit3 === void 0 ? void 0 : _props$collabEdit3.isInviteToEditButtonSelected
|
|
75
67
|
}) : null, editorAPI !== null && editorAPI !== void 0 && editorAPI.findReplace && twoLineEditorToolbar ? editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.findReplace.actions.getToolbarButton({
|
|
76
68
|
popupsBoundariesElement: props.popupsBoundariesElement,
|
|
77
69
|
popupsMountPoint: props.popupsMountPoint,
|
|
@@ -11,7 +11,8 @@ var _styles = require("@atlaskit/editor-common/styles");
|
|
|
11
11
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
12
12
|
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
13
|
var _colors = require("@atlaskit/theme/colors");
|
|
14
|
-
var
|
|
14
|
+
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
15
|
+
var _templateObject, _templateObject2; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
15
16
|
var EXPAND_SELECTED_BACKGROUND = "var(--ds-background-neutral-subtle, rgba(255, 255, 255, 0.6))";
|
|
16
17
|
var EXPAND_ICON_COLOR = function EXPAND_ICON_COLOR() {
|
|
17
18
|
return (0, _react.css)({
|
|
@@ -20,15 +21,19 @@ var EXPAND_ICON_COLOR = function EXPAND_ICON_COLOR() {
|
|
|
20
21
|
};
|
|
21
22
|
var DANGER_STATE_BACKGROUND_COLOR = "var(--ds-background-danger, ".concat(_colors.R50, ")");
|
|
22
23
|
var DANGER_STATE_BORDER_COLOR = "var(--ds-border-danger, ".concat(_colors.R300, ")");
|
|
24
|
+
var firstNodeWithNotMarginTop = function firstNodeWithNotMarginTop() {
|
|
25
|
+
return (0, _experiments.editorExperiment)('nested-dnd', true) ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
26
|
+
(0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t> :nth-child(1 of :not(style, .ProseMirror-gapcursor, .ProseMirror-widget, span)) {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> div.ak-editor-expand[data-node-type='nestedExpand'] {\n\t\t\t\t\tmargin-top: ", ";\n\t\t\t\t}\n\t\t\t"])), "var(--ds-space-050, 0.25rem)") : '';
|
|
27
|
+
};
|
|
23
28
|
|
|
24
29
|
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
25
30
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
|
|
26
31
|
var expandStyles = exports.expandStyles = function expandStyles() {
|
|
27
|
-
return (0, _react.css)(
|
|
32
|
+
return (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t.", " > div {\n\t\tdisplay: flex;\n\t}\n\n\t.", " {\n\t\t", "\n\n\t\tcursor: pointer;\n\t\tbox-sizing: border-box;\n\n\t\ttd > & {\n\t\t\tmargin-top: 0;\n\t\t}\n\n\t\t.", " svg {\n\t\t\t", ";\n\t\t\ttransform: rotate(90deg);\n\t\t}\n\n\t\t&.", ":not(.danger) {\n\t\t\t", "\n\t\t}\n\n\t\t&.danger {\n\t\t\tbackground: ", ";\n\t\t\tborder-color: ", ";\n\t\t}\n\t}\n\n\t.ProseMirror\n\t\t> .", ",\n\t\t.", "\n\t\t> .", " {\n\t\tmargin-left: -", "px;\n\t\tmargin-right: -", "px;\n\t}\n\n\t.", " {\n\t\t", "\n\t\tcursor: text;\n\t\tpadding-top: 0px;\n\t\t", "\n\t}\n\n\t.", " {\n\t\t", "\n\t}\n\n\t.", " {\n\t\t", ";\n\t\talign-items: center;\n\t\toverflow: visible;\n\t}\n\n\t.", " {\n\t\tbackground: ", ";\n\t\tborder-color: ", ";\n\n\t\t.", " {\n\t\t\tpadding-top: ", ";\n\n\t\t\t", "\n\t\t}\n\t}\n\n\t.", " {\n\t\twidth: 100%;\n\t}\n\n\t/* stylelint-disable property-no-unknown, value-keyword-case */\n\t.", ":(.", ") {\n\t\t.expand-content-wrapper {\n\t\t\theight: auto;\n\t\t}\n\t}\n\t/* stylelint-enable property-no-unknown, value-keyword-case */\n\n\t.", ":not(.", ") {\n\t\t.ak-editor-expand__content {\n\t\t\tposition: absolute;\n\t\t\theight: 1px;\n\t\t\twidth: 1px;\n\t\t\toverflow: hidden;\n\t\t\tclip: rect(1px, 1px, 1px, 1px);\n\t\t\twhite-space: nowrap;\n\t\t}\n\n\t\t.", " svg {\n\t\t\t", ";\n\t\t\ttransform: rotate(0deg);\n\t\t}\n\n\t\t&:not(.", "):not(.danger) {\n\t\t\tbackground: transparent;\n\t\t\tborder-color: transparent;\n\n\t\t\t&:hover {\n\t\t\t\tborder-color: ", ";\n\t\t\t\tbackground: ", ";\n\t\t\t}\n\t\t}\n\t}\n"])), _styles.expandClassNames.icon, _styles.expandClassNames.prefix, _styles.sharedExpandStyles.containerStyles({
|
|
28
33
|
expanded: false,
|
|
29
34
|
focused: false
|
|
30
|
-
})(), _styles.expandClassNames.iconContainer, EXPAND_ICON_COLOR(), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Blanket, _editorSharedStyles.SelectionStyle.Border]), DANGER_STATE_BACKGROUND_COLOR, DANGER_STATE_BORDER_COLOR, _styles.expandClassNames.type('expand'), _styles.BreakoutCssClassName.BREAKOUT_MARK_DOM, _styles.expandClassNames.type('expand'), _editorSharedStyles.akLayoutGutterOffset, _editorSharedStyles.akLayoutGutterOffset, _styles.expandClassNames.content, _styles.sharedExpandStyles.contentStyles({
|
|
35
|
+
})(), _styles.expandClassNames.iconContainer, EXPAND_ICON_COLOR(), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Blanket, _editorSharedStyles.SelectionStyle.Border]), DANGER_STATE_BACKGROUND_COLOR, DANGER_STATE_BORDER_COLOR, _styles.expandClassNames.type('expand'), _styles.BreakoutCssClassName.BREAKOUT_MARK_DOM, _styles.expandClassNames.type('expand'), _editorSharedStyles.akLayoutGutterOffset + ((0, _experiments.editorExperiment)('nested-dnd', true) ? 8 : 0), _editorSharedStyles.akLayoutGutterOffset + ((0, _experiments.editorExperiment)('nested-dnd', true) ? 8 : 0), _styles.expandClassNames.content, _styles.sharedExpandStyles.contentStyles({
|
|
31
36
|
expanded: false,
|
|
32
37
|
focused: false
|
|
33
|
-
})(), (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_expand_style_fix') && "overflow-x: clip;", _styles.expandClassNames.titleInput, _styles.sharedExpandStyles.titleInputStyles(), _styles.expandClassNames.titleContainer, _styles.sharedExpandStyles.titleContainerStyles(), _styles.expandClassNames.expanded, EXPAND_SELECTED_BACKGROUND, "var(--ds-border, ".concat(_colors.N40A, ")"), _styles.expandClassNames.content, "var(--ds-space-100, 8px)", _styles.expandClassNames.inputContainer, _styles.expandClassNames.prefix, _styles.expandClassNames.expanded, _styles.expandClassNames.prefix, _styles.expandClassNames.expanded, _styles.expandClassNames.iconContainer, EXPAND_ICON_COLOR(), _editorSharedStyles.akEditorSelectedNodeClassName, "var(--ds-border, ".concat(_colors.N50A, ")"), EXPAND_SELECTED_BACKGROUND);
|
|
38
|
+
})(), (0, _platformFeatureFlags.fg)('platform_editor_drag_and_drop_expand_style_fix') && "overflow-x: clip;", _styles.expandClassNames.titleInput, _styles.sharedExpandStyles.titleInputStyles(), _styles.expandClassNames.titleContainer, _styles.sharedExpandStyles.titleContainerStyles(), _styles.expandClassNames.expanded, EXPAND_SELECTED_BACKGROUND, "var(--ds-border, ".concat(_colors.N40A, ")"), _styles.expandClassNames.content, "var(--ds-space-100, 8px)", firstNodeWithNotMarginTop(), _styles.expandClassNames.inputContainer, _styles.expandClassNames.prefix, _styles.expandClassNames.expanded, _styles.expandClassNames.prefix, _styles.expandClassNames.expanded, _styles.expandClassNames.iconContainer, EXPAND_ICON_COLOR(), _editorSharedStyles.akEditorSelectedNodeClassName, "var(--ds-border, ".concat(_colors.N50A, ")"), EXPAND_SELECTED_BACKGROUND);
|
|
34
39
|
};
|
|
@@ -25,8 +25,14 @@ var _consts = require("@atlaskit/editor-plugins/table/ui/consts");
|
|
|
25
25
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
26
26
|
var _colors = require("@atlaskit/theme/colors");
|
|
27
27
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
28
|
-
var _templateObject; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
28
|
+
var _templateObject, _templateObject2, _templateObject3; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
29
|
+
var firstNodeWithNotMarginTop = function firstNodeWithNotMarginTop() {
|
|
30
|
+
return (0, _experiments.editorExperiment)('nested-dnd', true) ? // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
31
|
+
(0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t> :nth-child(1 of :not(style, .ProseMirror-gapcursor, .ProseMirror-widget, span)) {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\t\t\t"]))) : // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression
|
|
32
|
+
(0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t> :not(style):first-child,\n\t\t\t\t> style:first-child + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + *,\n\t\t\t\t> style:first-child + .ProseMirror-gapcursor + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\n\t\t\t\t> .ProseMirror-gapcursor:first-child + span + * {\n\t\t\t\t\tmargin-top: 0;\n\t\t\t\t}\n\t\t\t"])));
|
|
33
|
+
};
|
|
34
|
+
|
|
29
35
|
// eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
|
|
30
36
|
var layoutStyles = exports.layoutStyles = function layoutStyles(viewMode) {
|
|
31
|
-
return (0, _react.css)(
|
|
37
|
+
return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", " [data-layout-section] {\n\t\t\t// TODO: Migrate away from gridSize\n\t\t\t// Recommendation: Replace directly with 7px\n\t\t\tmargin: ", " -", "px 0;\n\t\t\ttransition: border-color 0.3s ", ";\n\t\t\tcursor: ", ";\n\n\t\t\t/* Inner cursor located 26px from left */\n\t\t\t[data-layout-column] {\n\t\t\t\tflex: 1;\n\t\t\t\tmin-width: 0;\n\t\t\t\tborder: ", "px solid\n\t\t\t\t\t", ";\n\t\t\t\tborder-radius: 4px;\n\t\t\t\tpadding: ", "px\n\t\t\t\t\t", "px;\n\t\t\t\tbox-sizing: border-box;\n\n\t\t\t\t> div {\n\t\t\t\t\t", "\n\n\t\t\t\t\t> .embedCardView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-child\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor.-right\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> .ProseMirror-gapcursor.-right:first-of-type\n\t\t\t\t\t\t+ .embedCardView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t> .ProseMirror-gapcursor:first-child\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item,\n\t\t\t\t\t> style:first-child\n\t\t\t\t\t\t+ .ProseMirror-gapcursor\n\t\t\t\t\t\t+ span\n\t\t\t\t\t\t+ .mediaSingleView-content-wrap\n\t\t\t\t\t\t.rich-media-item {\n\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t}\n\n\t\t\t\t\t/* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n and shrinking layout's node selectable area (leniency margin) */\n\t\t\t\t\t> [data-node-type='decisionList'] {\n\t\t\t\t\t\tli:first-of-type [data-decision-wrapper] {\n\t\t\t\t\t\t\tmargin-top: 0;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\t/* Make the 'content' fill the entire height of the layout column to allow click\n handler of layout section nodeview to target only data-layout-column */\n\t\t\t\t[data-layout-content] {\n\t\t\t\t\theight: 100%;\n\t\t\t\t\tcursor: text;\n\t\t\t\t\t.mediaGroupView-content-wrap {\n\t\t\t\t\t\tclear: both;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t[data-layout-column] + [data-layout-column] {\n\t\t\t\tmargin-left: ", "px;\n\t\t\t}\n\n\t\t\t@media screen and (max-width: ", "px) {\n\t\t\t\t[data-layout-column] + [data-layout-column] {\n\t\t\t\t\tmargin-left: 0;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t// TODO: Remove the border styles below once design tokens have been enabled and fallbacks are no longer triggered.\n\t\t\t// This is because the default state already uses the same token and, as such, the hover style won't change anything.\n\t\t\t// https://product-fabric.atlassian.net/browse/DSP-4441\n\t\t\t/* Shows the border when cursor is inside a layout */\n\t\t\t&.selected [data-layout-column],\n\t\t\t&:hover [data-layout-column] {\n\t\t\t\tborder: ", "px solid\n\t\t\t\t\t", ";\n\t\t\t}\n\n\t\t\t&.selected.danger > [data-layout-column] {\n\t\t\t\tbackground-color: ", ";\n\t\t\t\tborder-color: ", ";\n\t\t\t}\n\n\t\t\t&.", ":not(.danger) {\n\t\t\t\t[data-layout-column] {\n\t\t\t\t\t", "\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t.fabric-editor--full-width-mode .ProseMirror {\n\t\t[data-layout-section] {\n\t\t\t.", " {\n\t\t\t\tmargin: 0 ", "px;\n\t\t\t}\n\t\t}\n\t}\n"])), _styles.columnLayoutSharedStyle, "var(--ds-space-100, 8px)", _editorSharedStyles.akLayoutGutterOffset + ((0, _experiments.editorExperiment)('nested-dnd', true) ? 8 : 0), _editorSharedStyles.akEditorSwoopCubicBezier, viewMode === 'view' ? 'default' : 'pointer', viewMode === 'view' ? 0 : _editorSharedStyles.akEditorSelectedBorderSize, "var(--ds-border, ".concat(_colors.N40A, ")"), _styles.LAYOUT_COLUMN_PADDING, _styles.LAYOUT_COLUMN_PADDING + ((0, _experiments.editorExperiment)('nested-dnd', true) ? 8 : 0), firstNodeWithNotMarginTop(), _styles.LAYOUT_SECTION_MARGIN, _editorSharedStyles.gridMediumMaxWidth, viewMode === 'view' ? 0 : _editorSharedStyles.akEditorSelectedBorderSize, "var(--ds-border, ".concat(_colors.N50A, ")"), "var(--ds-background-danger, ".concat(_editorSharedStyles.akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(_editorSharedStyles.akEditorDeleteBorder, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.Border, _editorSharedStyles.SelectionStyle.Blanket]), _types.TableCssClassName.TABLE_CONTAINER, _consts.tableMarginFullWidthMode);
|
|
32
38
|
};
|
|
@@ -11,6 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
11
11
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
var _react2 = require("@emotion/react");
|
|
14
|
+
var _coreUtils = require("@atlaskit/editor-common/core-utils");
|
|
14
15
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
15
16
|
var _widthDetector = require("@atlaskit/width-detector");
|
|
16
17
|
var _isFullPage = require("../../utils/is-full-page");
|
|
@@ -45,7 +46,8 @@ var ToolbarWithSizeDetector = exports.ToolbarWithSizeDetector = function Toolbar
|
|
|
45
46
|
var elementWidth = (0, _hooks.useElementWidth)(ref, {
|
|
46
47
|
skip: typeof width !== 'undefined'
|
|
47
48
|
});
|
|
48
|
-
var
|
|
49
|
+
var defaultToolbarSize = (0, _coreUtils.isSSR)() && (0, _isFullPage.isFullPage)(props.appearance) ? _types.ToolbarSize.XXL : undefined;
|
|
50
|
+
var toolbarSize = typeof width === 'undefined' && typeof elementWidth === 'undefined' ? defaultToolbarSize : (0, _toolbarSize.widthToToolbarSize)(width || elementWidth, props.appearance);
|
|
49
51
|
var toolbarStyle = (0, _react.useMemo)(function () {
|
|
50
52
|
var toolbarWidth = (0, _isFullPage.isFullPage)(props.appearance) && props.twoLineEditorToolbar ? _types.ToolbarSize.S : _types.ToolbarSize.M;
|
|
51
53
|
var toolbarMinWidth = (0, _toolbarSize.toolbarSizeToWidth)(toolbarWidth, props.appearance);
|