@atlaskit/editor-common 96.5.3 → 96.5.5
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 +18 -0
- package/dist/cjs/extensibility/Extension/Extension/index.js +4 -3
- package/dist/cjs/extensibility/Extension/Extension/styles.js +19 -3
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/resizer/BreakoutResizer.js +17 -2
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/es2019/extensibility/Extension/Extension/index.js +5 -4
- package/dist/es2019/extensibility/Extension/Extension/styles.js +18 -2
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/resizer/BreakoutResizer.js +17 -2
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/esm/extensibility/Extension/Extension/index.js +5 -4
- package/dist/esm/extensibility/Extension/Extension/styles.js +18 -2
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/resizer/BreakoutResizer.js +17 -2
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/types/extensibility/Extension/Extension/styles.d.ts +1 -0
- package/dist/types-ts4.5/extensibility/Extension/Extension/styles.d.ts +1 -0
- package/package.json +11 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 96.5.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#179495](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179495)
|
|
8
|
+
[`5df4aaaa16713`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5df4aaaa16713) -
|
|
9
|
+
[ux] Fixed resizing issue when layout is stacked on a narrow screen and resizer item gets
|
|
10
|
+
min-width bigger than max-width.
|
|
11
|
+
|
|
12
|
+
## 96.5.4
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [#179422](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179422)
|
|
17
|
+
[`9ca38d44fc209`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9ca38d44fc209) -
|
|
18
|
+
ED-26031-update-cursor-to-inherit-when-editing-lcm
|
|
19
|
+
- Updated dependencies
|
|
20
|
+
|
|
3
21
|
## 96.5.3
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
|
@@ -12,6 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
|
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
var _react2 = require("@emotion/react");
|
|
14
14
|
var _classnames2 = _interopRequireDefault(require("classnames"));
|
|
15
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
15
16
|
var _hooks = require("../../../hooks");
|
|
16
17
|
var _ui = require("../../../ui");
|
|
17
18
|
var _utils = require("../../../utils");
|
|
@@ -133,10 +134,10 @@ function ExtensionWithPluginState(props) {
|
|
|
133
134
|
"data-layout": node.attrs.layout
|
|
134
135
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
135
136
|
,
|
|
136
|
-
className: classNames
|
|
137
|
+
className: classNames,
|
|
138
|
+
css:
|
|
137
139
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
138
|
-
,
|
|
139
|
-
css: _styles2.wrapperStyle
|
|
140
|
+
(0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? _styles2.wrapperStyleInheritedCursor : _styles2.wrapperStyle
|
|
140
141
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
141
142
|
,
|
|
142
143
|
style: customContainerStyles,
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.wrapperStyle = exports.widerLayoutClassName = exports.overflowWrapperStyles = exports.header = exports.contentWrapper = exports.content = void 0;
|
|
6
|
+
exports.wrapperStyleInheritedCursor = exports.wrapperStyle = exports.widerLayoutClassName = exports.overflowWrapperStyles = exports.header = exports.contentWrapper = exports.content = void 0;
|
|
7
7
|
var _react = require("@emotion/react");
|
|
8
8
|
var _styles = require("../styles");
|
|
9
9
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
@@ -11,12 +11,11 @@ var _styles = require("../styles");
|
|
|
11
11
|
var widerLayoutClassName = exports.widerLayoutClassName = 'wider-layout';
|
|
12
12
|
|
|
13
13
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
14
|
-
var
|
|
14
|
+
var wrapperStyleWithoutCursor = (0, _react.css)(_styles.wrapperDefault, {
|
|
15
15
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
16
16
|
'&.without-frame': {
|
|
17
17
|
background: 'transparent'
|
|
18
18
|
},
|
|
19
|
-
cursor: 'pointer',
|
|
20
19
|
width: '100%',
|
|
21
20
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
22
21
|
'.extension-overflow-wrapper:not(.with-body)': {
|
|
@@ -37,6 +36,23 @@ var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault
|
|
|
37
36
|
}
|
|
38
37
|
});
|
|
39
38
|
|
|
39
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
40
|
+
var wrapperStyleInheritedCursor = exports.wrapperStyleInheritedCursor = (0, _react.css)(wrapperStyleWithoutCursor, {
|
|
41
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
42
|
+
'.extension-overflow-wrapper:has(.extension-editable-area)': {
|
|
43
|
+
cursor: 'inherit'
|
|
44
|
+
},
|
|
45
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
46
|
+
'.extension-overflow-wrapper:not(:has(.extension-editable-area))': {
|
|
47
|
+
cursor: 'pointer'
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
52
|
+
var wrapperStyle = exports.wrapperStyle = (0, _react.css)(wrapperStyleWithoutCursor, {
|
|
53
|
+
cursor: 'pointer'
|
|
54
|
+
});
|
|
55
|
+
|
|
40
56
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
41
57
|
var header = exports.header = (0, _react.css)({
|
|
42
58
|
padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " 0px"),
|
|
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
17
17
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
18
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
19
19
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
20
|
-
var packageVersion = "96.5.
|
|
20
|
+
var packageVersion = "96.5.5";
|
|
21
21
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
22
22
|
// Remove URL as it has UGC
|
|
23
23
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -9,6 +9,7 @@ exports.ignoreResizerMutations = exports.BreakoutResizer = void 0;
|
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
12
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
12
13
|
var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
|
|
13
14
|
var _analytics = require("../analytics");
|
|
14
15
|
var _styles = require("../styles");
|
|
@@ -47,7 +48,17 @@ var getHandleStyle = function getHandleStyle(node) {
|
|
|
47
48
|
}
|
|
48
49
|
};
|
|
49
50
|
var ignoreResizerMutations = exports.ignoreResizerMutations = function ignoreResizerMutations(mutation) {
|
|
50
|
-
|
|
51
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_breakoutresizer_remove_assertion')) {
|
|
52
|
+
if (mutation.target instanceof Element) {
|
|
53
|
+
return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
|
|
54
|
+
}
|
|
55
|
+
return mutation.type === 'attributes' && mutation.attributeName === 'style';
|
|
56
|
+
} else {
|
|
57
|
+
return (
|
|
58
|
+
// eslint-disable-next-line @atlaskit/editor/no-as-casting
|
|
59
|
+
mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style'
|
|
60
|
+
);
|
|
61
|
+
}
|
|
51
62
|
};
|
|
52
63
|
var resizingStyles = {
|
|
53
64
|
left: '50%',
|
|
@@ -113,8 +124,12 @@ var BreakoutResizer = exports.BreakoutResizer = function BreakoutResizer(_ref) {
|
|
|
113
124
|
state = editorView.state;
|
|
114
125
|
displayGapCursor(false);
|
|
115
126
|
if (widthState !== undefined && widthState.lineLength !== undefined && widthState.width !== undefined) {
|
|
116
|
-
newMinWidth = Math.min(widthState.lineLength, _editorSharedStyles.akEditorDefaultLayoutWidth);
|
|
117
127
|
newMaxWidth = Math.min(widthState.width - (0, _editorSharedStyles.akEditorGutterPaddingDynamic)() * 2 - _editorSharedStyles.akEditorGutterPadding, _editorSharedStyles.akEditorFullWidthLayoutWidth);
|
|
128
|
+
if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_2')) {
|
|
129
|
+
newMinWidth = Math.min(widthState.lineLength, _editorSharedStyles.akEditorDefaultLayoutWidth, newMaxWidth);
|
|
130
|
+
} else {
|
|
131
|
+
newMinWidth = Math.min(widthState.lineLength, _editorSharedStyles.akEditorDefaultLayoutWidth);
|
|
132
|
+
}
|
|
118
133
|
}
|
|
119
134
|
setResizingState({
|
|
120
135
|
isResizing: true,
|
|
@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
23
23
|
* @jsx jsx
|
|
24
24
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
25
25
|
var packageName = "@atlaskit/editor-common";
|
|
26
|
-
var packageVersion = "96.5.
|
|
26
|
+
var packageVersion = "96.5.5";
|
|
27
27
|
var halfFocusRing = 1;
|
|
28
28
|
var dropOffset = '0, 8';
|
|
29
29
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -9,12 +9,13 @@ import React, { Fragment } from 'react';
|
|
|
9
9
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
10
10
|
import { jsx } from '@emotion/react';
|
|
11
11
|
import classnames from 'classnames';
|
|
12
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
12
13
|
import { useSharedPluginState } from '../../../hooks';
|
|
13
14
|
import { overflowShadow } from '../../../ui';
|
|
14
15
|
import { calculateBreakoutStyles } from '../../../utils';
|
|
15
16
|
import ExtensionLozenge from '../Lozenge';
|
|
16
17
|
import { overlay } from '../styles';
|
|
17
|
-
import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle } from './styles';
|
|
18
|
+
import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
|
|
18
19
|
function ExtensionWithPluginState(props) {
|
|
19
20
|
const {
|
|
20
21
|
node,
|
|
@@ -131,10 +132,10 @@ function ExtensionWithPluginState(props) {
|
|
|
131
132
|
"data-layout": node.attrs.layout
|
|
132
133
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
133
134
|
,
|
|
134
|
-
className: classNames
|
|
135
|
+
className: classNames,
|
|
136
|
+
css:
|
|
135
137
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
136
|
-
|
|
137
|
-
css: wrapperStyle
|
|
138
|
+
fg('platform_editor_legacy_content_macro') ? wrapperStyleInheritedCursor : wrapperStyle
|
|
138
139
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
139
140
|
,
|
|
140
141
|
style: customContainerStyles,
|
|
@@ -4,12 +4,11 @@ import { wrapperDefault } from '../styles';
|
|
|
4
4
|
export const widerLayoutClassName = 'wider-layout';
|
|
5
5
|
|
|
6
6
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
7
|
-
|
|
7
|
+
const wrapperStyleWithoutCursor = css(wrapperDefault, {
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
9
9
|
'&.without-frame': {
|
|
10
10
|
background: 'transparent'
|
|
11
11
|
},
|
|
12
|
-
cursor: 'pointer',
|
|
13
12
|
width: '100%',
|
|
14
13
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
15
14
|
'.extension-overflow-wrapper:not(.with-body)': {
|
|
@@ -30,6 +29,23 @@ export const wrapperStyle = css(wrapperDefault, {
|
|
|
30
29
|
}
|
|
31
30
|
});
|
|
32
31
|
|
|
32
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
33
|
+
export const wrapperStyleInheritedCursor = css(wrapperStyleWithoutCursor, {
|
|
34
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
35
|
+
'.extension-overflow-wrapper:has(.extension-editable-area)': {
|
|
36
|
+
cursor: 'inherit'
|
|
37
|
+
},
|
|
38
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
39
|
+
'.extension-overflow-wrapper:not(:has(.extension-editable-area))': {
|
|
40
|
+
cursor: 'pointer'
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
45
|
+
export const wrapperStyle = css(wrapperStyleWithoutCursor, {
|
|
46
|
+
cursor: 'pointer'
|
|
47
|
+
});
|
|
48
|
+
|
|
33
49
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
34
50
|
export const header = css({
|
|
35
51
|
padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-050, 4px)"} 0px`,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isFedRamp } from './environment';
|
|
2
2
|
const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
3
3
|
const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
4
|
-
const packageVersion = "96.5.
|
|
4
|
+
const packageVersion = "96.5.5";
|
|
5
5
|
const sanitiseSentryEvents = (data, _hint) => {
|
|
6
6
|
// Remove URL as it has UGC
|
|
7
7
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
2
2
|
import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
|
|
3
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
3
4
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
4
5
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
|
|
5
6
|
import { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN } from '../styles';
|
|
@@ -36,7 +37,17 @@ const getHandleStyle = node => {
|
|
|
36
37
|
}
|
|
37
38
|
};
|
|
38
39
|
export const ignoreResizerMutations = mutation => {
|
|
39
|
-
|
|
40
|
+
if (fg('platform_editor_breakoutresizer_remove_assertion')) {
|
|
41
|
+
if (mutation.target instanceof Element) {
|
|
42
|
+
return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
|
|
43
|
+
}
|
|
44
|
+
return mutation.type === 'attributes' && mutation.attributeName === 'style';
|
|
45
|
+
} else {
|
|
46
|
+
return (
|
|
47
|
+
// eslint-disable-next-line @atlaskit/editor/no-as-casting
|
|
48
|
+
mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style'
|
|
49
|
+
);
|
|
50
|
+
}
|
|
40
51
|
};
|
|
41
52
|
const resizingStyles = {
|
|
42
53
|
left: '50%',
|
|
@@ -104,8 +115,12 @@ const BreakoutResizer = ({
|
|
|
104
115
|
} = editorView;
|
|
105
116
|
displayGapCursor(false);
|
|
106
117
|
if (widthState !== undefined && widthState.lineLength !== undefined && widthState.width !== undefined) {
|
|
107
|
-
newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
|
|
108
118
|
newMaxWidth = Math.min(widthState.width - akEditorGutterPaddingDynamic() * 2 - akEditorGutterPadding, akEditorFullWidthLayoutWidth);
|
|
119
|
+
if (fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
|
|
120
|
+
newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth, newMaxWidth);
|
|
121
|
+
} else {
|
|
122
|
+
newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
|
|
123
|
+
}
|
|
109
124
|
}
|
|
110
125
|
setResizingState({
|
|
111
126
|
isResizing: true,
|
|
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
13
13
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
14
14
|
import Layer from '../Layer';
|
|
15
15
|
const packageName = "@atlaskit/editor-common";
|
|
16
|
-
const packageVersion = "96.5.
|
|
16
|
+
const packageVersion = "96.5.5";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
class DropList extends Component {
|
|
@@ -14,12 +14,13 @@ import React, { Fragment } from 'react';
|
|
|
14
14
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
15
15
|
import { jsx } from '@emotion/react';
|
|
16
16
|
import classnames from 'classnames';
|
|
17
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
17
18
|
import { useSharedPluginState } from '../../../hooks';
|
|
18
19
|
import { overflowShadow } from '../../../ui';
|
|
19
20
|
import { calculateBreakoutStyles } from '../../../utils';
|
|
20
21
|
import ExtensionLozenge from '../Lozenge';
|
|
21
22
|
import { overlay } from '../styles';
|
|
22
|
-
import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle } from './styles';
|
|
23
|
+
import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
|
|
23
24
|
function ExtensionWithPluginState(props) {
|
|
24
25
|
var node = props.node,
|
|
25
26
|
handleContentDOMRef = props.handleContentDOMRef,
|
|
@@ -125,10 +126,10 @@ function ExtensionWithPluginState(props) {
|
|
|
125
126
|
"data-layout": node.attrs.layout
|
|
126
127
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
127
128
|
,
|
|
128
|
-
className: classNames
|
|
129
|
+
className: classNames,
|
|
130
|
+
css:
|
|
129
131
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
|
|
130
|
-
|
|
131
|
-
css: wrapperStyle
|
|
132
|
+
fg('platform_editor_legacy_content_macro') ? wrapperStyleInheritedCursor : wrapperStyle
|
|
132
133
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
133
134
|
,
|
|
134
135
|
style: customContainerStyles,
|
|
@@ -4,12 +4,11 @@ import { wrapperDefault } from '../styles';
|
|
|
4
4
|
export var widerLayoutClassName = 'wider-layout';
|
|
5
5
|
|
|
6
6
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
7
|
-
|
|
7
|
+
var wrapperStyleWithoutCursor = css(wrapperDefault, {
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
9
9
|
'&.without-frame': {
|
|
10
10
|
background: 'transparent'
|
|
11
11
|
},
|
|
12
|
-
cursor: 'pointer',
|
|
13
12
|
width: '100%',
|
|
14
13
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
15
14
|
'.extension-overflow-wrapper:not(.with-body)': {
|
|
@@ -30,6 +29,23 @@ export var wrapperStyle = css(wrapperDefault, {
|
|
|
30
29
|
}
|
|
31
30
|
});
|
|
32
31
|
|
|
32
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
33
|
+
export var wrapperStyleInheritedCursor = css(wrapperStyleWithoutCursor, {
|
|
34
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
35
|
+
'.extension-overflow-wrapper:has(.extension-editable-area)': {
|
|
36
|
+
cursor: 'inherit'
|
|
37
|
+
},
|
|
38
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
39
|
+
'.extension-overflow-wrapper:not(:has(.extension-editable-area))': {
|
|
40
|
+
cursor: 'pointer'
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
45
|
+
export var wrapperStyle = css(wrapperStyleWithoutCursor, {
|
|
46
|
+
cursor: 'pointer'
|
|
47
|
+
});
|
|
48
|
+
|
|
33
49
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
|
|
34
50
|
export var header = css({
|
|
35
51
|
padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " 0px"),
|
|
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { isFedRamp } from './environment';
|
|
8
8
|
var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
|
|
9
9
|
var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
|
|
10
|
-
var packageVersion = "96.5.
|
|
10
|
+
var packageVersion = "96.5.5";
|
|
11
11
|
var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
|
|
12
12
|
// Remove URL as it has UGC
|
|
13
13
|
// TODO: Sanitise the URL instead of just removing it
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
2
|
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
3
3
|
import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
|
|
4
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
4
5
|
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
|
|
5
6
|
import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
|
|
6
7
|
import { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN } from '../styles';
|
|
@@ -37,7 +38,17 @@ var getHandleStyle = function getHandleStyle(node) {
|
|
|
37
38
|
}
|
|
38
39
|
};
|
|
39
40
|
export var ignoreResizerMutations = function ignoreResizerMutations(mutation) {
|
|
40
|
-
|
|
41
|
+
if (fg('platform_editor_breakoutresizer_remove_assertion')) {
|
|
42
|
+
if (mutation.target instanceof Element) {
|
|
43
|
+
return mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style';
|
|
44
|
+
}
|
|
45
|
+
return mutation.type === 'attributes' && mutation.attributeName === 'style';
|
|
46
|
+
} else {
|
|
47
|
+
return (
|
|
48
|
+
// eslint-disable-next-line @atlaskit/editor/no-as-casting
|
|
49
|
+
mutation.target.classList.contains('resizer-item') || mutation.type === 'attributes' && mutation.attributeName === 'style'
|
|
50
|
+
);
|
|
51
|
+
}
|
|
41
52
|
};
|
|
42
53
|
var resizingStyles = {
|
|
43
54
|
left: '50%',
|
|
@@ -103,8 +114,12 @@ var BreakoutResizer = function BreakoutResizer(_ref) {
|
|
|
103
114
|
state = editorView.state;
|
|
104
115
|
displayGapCursor(false);
|
|
105
116
|
if (widthState !== undefined && widthState.lineLength !== undefined && widthState.width !== undefined) {
|
|
106
|
-
newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
|
|
107
117
|
newMaxWidth = Math.min(widthState.width - akEditorGutterPaddingDynamic() * 2 - akEditorGutterPadding, akEditorFullWidthLayoutWidth);
|
|
118
|
+
if (fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
|
|
119
|
+
newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth, newMaxWidth);
|
|
120
|
+
} else {
|
|
121
|
+
newMinWidth = Math.min(widthState.lineLength, akEditorDefaultLayoutWidth);
|
|
122
|
+
}
|
|
108
123
|
}
|
|
109
124
|
setResizingState({
|
|
110
125
|
isResizing: true,
|
|
@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
20
20
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
21
21
|
import Layer from '../Layer';
|
|
22
22
|
var packageName = "@atlaskit/editor-common";
|
|
23
|
-
var packageVersion = "96.5.
|
|
23
|
+
var packageVersion = "96.5.5";
|
|
24
24
|
var halfFocusRing = 1;
|
|
25
25
|
var dropOffset = '0, 8';
|
|
26
26
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare const widerLayoutClassName = "wider-layout";
|
|
2
|
+
export declare const wrapperStyleInheritedCursor: import("@emotion/react").SerializedStyles;
|
|
2
3
|
export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
|
|
3
4
|
export declare const header: import("@emotion/react").SerializedStyles;
|
|
4
5
|
export declare const content: import("@emotion/react").SerializedStyles;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare const widerLayoutClassName = "wider-layout";
|
|
2
|
+
export declare const wrapperStyleInheritedCursor: import("@emotion/react").SerializedStyles;
|
|
2
3
|
export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
|
|
3
4
|
export declare const header: import("@emotion/react").SerializedStyles;
|
|
4
5
|
export declare const content: import("@emotion/react").SerializedStyles;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-common",
|
|
3
|
-
"version": "96.5.
|
|
3
|
+
"version": "96.5.5",
|
|
4
4
|
"description": "A package that contains common classes and components for editor and renderer",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -155,7 +155,7 @@
|
|
|
155
155
|
"@atlaskit/task-decision": "^17.11.0",
|
|
156
156
|
"@atlaskit/textfield": "^6.7.0",
|
|
157
157
|
"@atlaskit/tmp-editor-statsig": "^2.27.0",
|
|
158
|
-
"@atlaskit/tokens": "^2.
|
|
158
|
+
"@atlaskit/tokens": "^2.5.0",
|
|
159
159
|
"@atlaskit/tooltip": "^19.0.0",
|
|
160
160
|
"@atlaskit/width-detector": "^4.3.0",
|
|
161
161
|
"@babel/runtime": "^7.0.0",
|
|
@@ -303,6 +303,15 @@
|
|
|
303
303
|
},
|
|
304
304
|
"platform_editor_selection_toolbar_scroll_fix": {
|
|
305
305
|
"type": "boolean"
|
|
306
|
+
},
|
|
307
|
+
"platform_editor_legacy_content_macro": {
|
|
308
|
+
"type": "boolean"
|
|
309
|
+
},
|
|
310
|
+
"platform_editor_advanced_layouts_post_fix_patch_2": {
|
|
311
|
+
"type": "boolean"
|
|
312
|
+
},
|
|
313
|
+
"platform_editor_breakoutresizer_remove_assertion": {
|
|
314
|
+
"type": "boolean"
|
|
306
315
|
}
|
|
307
316
|
}
|
|
308
317
|
}
|