@atlaskit/editor-core 195.0.4 → 195.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/ui/Appearance/FullPage/FullPage.js +4 -3
  3. package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js +1 -1
  4. package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js +4 -2
  5. package/dist/cjs/ui/Appearance/FullPage/MainToolbar.js +59 -47
  6. package/dist/cjs/ui/Appearance/FullPage/StyledComponents.js +23 -17
  7. package/dist/cjs/version-wrapper.js +1 -1
  8. package/dist/es2019/ui/Appearance/FullPage/FullPage.js +4 -3
  9. package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js +1 -1
  10. package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js +5 -3
  11. package/dist/es2019/ui/Appearance/FullPage/MainToolbar.js +69 -57
  12. package/dist/es2019/ui/Appearance/FullPage/StyledComponents.js +24 -18
  13. package/dist/es2019/version-wrapper.js +1 -1
  14. package/dist/esm/ui/Appearance/FullPage/FullPage.js +4 -3
  15. package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js +1 -1
  16. package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js +5 -3
  17. package/dist/esm/ui/Appearance/FullPage/MainToolbar.js +60 -48
  18. package/dist/esm/ui/Appearance/FullPage/StyledComponents.js +24 -18
  19. package/dist/esm/version-wrapper.js +1 -1
  20. package/dist/types/ui/Appearance/FullPage/MainToolbar.d.ts +3 -3
  21. package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts +2 -2
  22. package/dist/types-ts4.5/ui/Appearance/FullPage/MainToolbar.d.ts +3 -3
  23. package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts +2 -2
  24. package/package.json +13 -13
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 195.0.9
4
+
5
+ ### Patch Changes
6
+
7
+ - [#125980](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125980)
8
+ [`93070430085a6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/93070430085a6) -
9
+ add editor content area as default popup boundaries element for full page editor and comment
10
+ editor
11
+ - [#125082](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/125082)
12
+ [`ba605ab4da0e1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba605ab4da0e1) -
13
+ [ED-23977] This change cleans up the use of the feature flag
14
+ 'platform.editor.a11y-main-toolbar-navigation_osrty'.
15
+ - Updated dependencies
16
+
3
17
  ## 195.0.4
4
18
 
5
19
  ### Patch Changes
package/dist/cjs/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -55,7 +55,7 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
55
55
  return showKeyline;
56
56
  };
57
57
  var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
58
- var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
58
+ var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
59
59
  var wrapperElementRef = (0, _react.useMemo)(function () {
60
60
  return props.innerRef;
61
61
  }, [props.innerRef]);
@@ -70,6 +70,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
70
70
  primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
71
71
  }
72
72
  var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
73
+ var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || undefined;
73
74
  return (0, _react2.jsx)(_ui.ContextPanelWidthProvider, null, (0, _react2.jsx)("div", {
74
75
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
75
76
  css: _StyledComponents.fullPageEditorWrapper
@@ -81,7 +82,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
81
82
  appearance: props.appearance,
82
83
  beforeIcon: props.primaryToolbarIconBefore,
83
84
  collabEdit: props.collabEdit,
84
- containerElement: (_scrollContentContain = (_scrollContentContain2 = scrollContentContainerRef.current) === null || _scrollContentContain2 === void 0 ? void 0 : _scrollContentContain2.scrollContainer) !== null && _scrollContentContain !== void 0 ? _scrollContentContain : null,
85
+ containerElement: (_scrollContentContain2 = (_scrollContentContain3 = scrollContentContainerRef.current) === null || _scrollContentContain3 === void 0 ? void 0 : _scrollContentContain3.scrollContainer) !== null && _scrollContentContain2 !== void 0 ? _scrollContentContain2 : null,
85
86
  customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
86
87
  disabled: !!props.disabled,
87
88
  dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
@@ -110,7 +111,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
110
111
  editorDOMElement: props.editorDOMElement,
111
112
  editorView: props.editorView,
112
113
  eventDispatcher: props.eventDispatcher,
113
- popupsBoundariesElement: props.popupsBoundariesElement,
114
+ popupsBoundariesElement: popupsBoundariesElement,
114
115
  popupsMountPoint: props.popupsMountPoint,
115
116
  popupsScrollableElement: props.popupsScrollableElement,
116
117
  providerFactory: props.providerFactory,
package/dist/cjs/ui/Appearance/FullPage/FullPageContentArea.js CHANGED
@@ -75,7 +75,7 @@ var Content = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
75
75
  ref: contentAreaRef
76
76
  }, (0, _react2.jsx)("div", {
77
77
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
78
- css: _StyledComponents.editorContentGutterStyle
78
+ css: (0, _StyledComponents.editorContentGutterStyle)()
79
79
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
80
80
  ,
81
81
  className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' '),
package/dist/cjs/ui/Appearance/FullPage/FullPageToolbar.js CHANGED
@@ -100,8 +100,10 @@ var EditorToolbar = exports.EditorToolbar = /*#__PURE__*/_react.default.memo(fun
100
100
  };
101
101
  var handleEscape = function handleEscape(event) {
102
102
  var _props$editorView;
103
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-main-toolbar-navigation_osrty') && !props.popupsMountPoint) {
104
- return;
103
+ if (!(0, _platformFeatureFlags.fg)('editor-fix-esc-main-toolbar-navigation')) {
104
+ if (!props.popupsMountPoint) {
105
+ return;
106
+ }
105
107
  }
106
108
  if (!((_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.hasFocus())) {
107
109
  var _props$editorView2;
package/dist/cjs/ui/Appearance/FullPage/MainToolbar.js CHANGED
@@ -16,39 +16,45 @@ var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = exports.MAXIMUM_TWO_LINE_TOOLBAR_BREAK
16
16
  // box-shadow is overriden by the mainToolbar
17
17
  var mainToolbarWithKeyline = (0, _react.css)({
18
18
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
19
- boxShadow: (0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)" : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
19
+ boxShadow: (0, _platformFeatureFlags.fg)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)" : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
20
20
  "0 ".concat(_editorSharedStyles.akEditorToolbarKeylineHeight, "px 0 0 ", "var(--ds-background-accent-gray-subtlest, #F1F2F4)")
21
21
  });
22
- var mainToolbarTwoLineStyle = (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
23
- flexWrap: 'wrap',
24
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
25
- height: "calc(".concat((0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(), " * 2)")
26
- }));
27
- var mainToolbar = (0, _react.css)((0, _defineProperty2.default)({
28
- position: 'relative',
29
- alignItems: 'center',
30
- boxShadow: 'none',
31
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
32
- borderBottom: (0, _platformFeatureFlags.getBooleanFF)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "1px solid ".concat("var(--ds-border, #091E4224)") : undefined,
33
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
34
- transition: "box-shadow 200ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier),
35
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
36
- zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
37
- display: 'flex',
38
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
39
- height: (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(),
40
- flexShrink: 0,
41
- backgroundColor: "var(--ds-surface, white)",
42
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
43
- '& object': {
44
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
45
- height: '0 !important'
46
- }
47
- }, "@media (max-width: ".concat(_editorSharedStyles.akEditorMobileMaxWidth, "px)"), {
48
- display: 'grid',
49
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
50
- height: "calc(".concat((0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(), " * 2)")
51
- }));
22
+ var mainToolbarTwoLineStyle = function mainToolbarTwoLineStyle() {
23
+ var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
24
+ return (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
25
+ flexWrap: 'wrap',
26
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
27
+ height: "calc(".concat(editorToolbarHeight, " * 2)")
28
+ }));
29
+ };
30
+ var mainToolbar = function mainToolbar() {
31
+ var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
32
+ return (0, _react.css)((0, _defineProperty2.default)({
33
+ position: 'relative',
34
+ alignItems: 'center',
35
+ boxShadow: 'none',
36
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
37
+ borderBottom: (0, _platformFeatureFlags.fg)('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "1px solid ".concat("var(--ds-border, #091E4224)") : undefined,
38
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
39
+ transition: "box-shadow 200ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier),
40
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
41
+ zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex,
42
+ display: 'flex',
43
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
44
+ height: editorToolbarHeight,
45
+ flexShrink: 0,
46
+ backgroundColor: "var(--ds-surface, white)",
47
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
48
+ '& object': {
49
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
50
+ height: '0 !important'
51
+ }
52
+ }, "@media (max-width: ".concat(_editorSharedStyles.akEditorMobileMaxWidth, "px)"), {
53
+ display: 'grid',
54
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
55
+ height: "calc(".concat(editorToolbarHeight, " * 2)")
56
+ }));
57
+ };
52
58
  var mainToolbarStyle = exports.mainToolbarStyle = function mainToolbarStyle(showKeyline, twoLineEditorToolbar) {
53
59
  return [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
54
60
  };
@@ -69,28 +75,34 @@ var mainToolbarFirstChild = (0, _react.css)((0, _defineProperty2.default)({
69
75
  gridColumn: 1,
70
76
  gridRow: 1
71
77
  }));
72
- var mainToolbarFirstChildTowLine = (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
73
- flex: '1 1 100%',
74
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
75
- height: (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(),
76
- justifyContent: 'flex-end',
77
- minWidth: 'fit-content'
78
- }));
78
+ var mainToolbarFirstChildTowLine = function mainToolbarFirstChildTowLine() {
79
+ var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
80
+ return (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
81
+ flex: '1 1 100%',
82
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
83
+ height: editorToolbarHeight,
84
+ justifyContent: 'flex-end',
85
+ minWidth: 'fit-content'
86
+ }));
87
+ };
79
88
  var mainToolbarFirstChildStyle = exports.mainToolbarFirstChildStyle = function mainToolbarFirstChildStyle(twoLineEditorToolbar) {
80
89
  return [mainToolbarFirstChild, twoLineEditorToolbar && mainToolbarFirstChildTowLine];
81
90
  };
82
91
  var mainToolbarSecondChild = (0, _react.css)({
83
92
  minWidth: 'fit-content'
84
93
  });
85
- var mainToolbarSecondChildTwoLine = (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
86
- display: 'flex',
87
- flexGrow: 1,
88
- flex: '1 1 100%',
89
- margin: 'auto',
90
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
91
- height: (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(),
92
- minWidth: 0
93
- }));
94
+ var mainToolbarSecondChildTwoLine = function mainToolbarSecondChildTwoLine() {
95
+ var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
96
+ return (0, _react.css)((0, _defineProperty2.default)({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
97
+ display: 'flex',
98
+ flexGrow: 1,
99
+ flex: '1 1 100%',
100
+ margin: 'auto',
101
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
102
+ height: editorToolbarHeight,
103
+ minWidth: 0
104
+ }));
105
+ };
94
106
  var mainToolbarSecondChildStyle = exports.mainToolbarSecondChildStyle = function mainToolbarSecondChildStyle(twoLineEditorToolbar) {
95
107
  return [mainToolbarSecondChild, twoLineEditorToolbar && mainToolbarSecondChildTwoLine];
96
108
  };
package/dist/cjs/ui/Appearance/FullPage/StyledComponents.js CHANGED
@@ -63,17 +63,20 @@ var positionedOverEditorStyle = exports.positionedOverEditorStyle = (0, _react.c
63
63
  });
64
64
 
65
65
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
66
- var contentArea = exports.contentArea = (0, _react.css)({
67
- display: 'flex',
68
- flexDirection: 'row',
69
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
70
- height: "calc(100% - ".concat((0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)(), ")"),
71
- boxSizing: 'border-box',
72
- margin: 0,
73
- padding: 0,
74
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
75
- transition: "padding 0ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier)
76
- });
66
+ var contentArea = exports.contentArea = function contentArea() {
67
+ var editorToolbarHeight = (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)();
68
+ return (0, _react.css)({
69
+ display: 'flex',
70
+ flexDirection: 'row',
71
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
72
+ height: "calc(100% - ".concat(editorToolbarHeight, ")"),
73
+ boxSizing: 'border-box',
74
+ margin: 0,
75
+ padding: 0,
76
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
77
+ transition: "padding 0ms ".concat(_editorSharedStyles.akEditorSwoopCubicBezier)
78
+ });
79
+ };
77
80
 
78
81
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
79
82
  var contentAreaHeightNoToolbar = exports.contentAreaHeightNoToolbar = (0, _react.css)({
@@ -194,9 +197,12 @@ _commonStyles.tableFullPageEditorStyles, {
194
197
  });
195
198
 
196
199
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
197
- var editorContentGutterStyle = exports.editorContentGutterStyle = (0, _react.css)({
198
- boxSizing: 'border-box',
199
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
200
- padding: (0, _platformFeatureFlags.getBooleanFF)('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
201
- "0 52px" : "0 ".concat("var(--ds-space-400, 32px)")
202
- });
200
+ var editorContentGutterStyle = exports.editorContentGutterStyle = function editorContentGutterStyle() {
201
+ var padding = (0, _platformFeatureFlags.fg)('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
202
+ "0 52px" : "0 ".concat("var(--ds-space-400, 32px)");
203
+ return (0, _react.css)({
204
+ boxSizing: 'border-box',
205
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
206
+ padding: padding
207
+ });
208
+ };
package/dist/cjs/version-wrapper.js CHANGED
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "195.0.4";
8
+ var version = exports.version = "195.0.9";
package/dist/es2019/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -38,7 +38,7 @@ const useShowKeyline = contentAreaRef => {
38
38
  return showKeyline;
39
39
  };
40
40
  export const FullPageEditor = props => {
41
- var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
41
+ var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
42
42
  const wrapperElementRef = useMemo(() => props.innerRef, [props.innerRef]);
43
43
  const scrollContentContainerRef = useRef(null);
44
44
  const showKeyline = useShowKeyline(scrollContentContainerRef);
@@ -52,6 +52,7 @@ export const FullPageEditor = props => {
52
52
  primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
53
53
  }
54
54
  const isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
55
+ const popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 ? void 0 : (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || undefined;
55
56
  return jsx(ContextPanelWidthProvider, null, jsx("div", {
56
57
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
57
58
  css: fullPageEditorWrapper
@@ -63,7 +64,7 @@ export const FullPageEditor = props => {
63
64
  appearance: props.appearance,
64
65
  beforeIcon: props.primaryToolbarIconBefore,
65
66
  collabEdit: props.collabEdit,
66
- containerElement: (_scrollContentContain = (_scrollContentContain2 = scrollContentContainerRef.current) === null || _scrollContentContain2 === void 0 ? void 0 : _scrollContentContain2.scrollContainer) !== null && _scrollContentContain !== void 0 ? _scrollContentContain : null,
67
+ containerElement: (_scrollContentContain2 = (_scrollContentContain3 = scrollContentContainerRef.current) === null || _scrollContentContain3 === void 0 ? void 0 : _scrollContentContain3.scrollContainer) !== null && _scrollContentContain2 !== void 0 ? _scrollContentContain2 : null,
67
68
  customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
68
69
  disabled: !!props.disabled,
69
70
  dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
@@ -92,7 +93,7 @@ export const FullPageEditor = props => {
92
93
  editorDOMElement: props.editorDOMElement,
93
94
  editorView: props.editorView,
94
95
  eventDispatcher: props.eventDispatcher,
95
- popupsBoundariesElement: props.popupsBoundariesElement,
96
+ popupsBoundariesElement: popupsBoundariesElement,
96
97
  popupsMountPoint: props.popupsMountPoint,
97
98
  popupsScrollableElement: props.popupsScrollableElement,
98
99
  providerFactory: props.providerFactory,
package/dist/es2019/ui/Appearance/FullPage/FullPageContentArea.js CHANGED
@@ -64,7 +64,7 @@ const Content = /*#__PURE__*/React.forwardRef((props, ref) => {
64
64
  ref: contentAreaRef
65
65
  }, jsx("div", {
66
66
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
67
- css: editorContentGutterStyle
67
+ css: editorContentGutterStyle()
68
68
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
69
69
  ,
70
70
  className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' '),
package/dist/es2019/ui/Appearance/FullPage/FullPageToolbar.js CHANGED
@@ -11,7 +11,7 @@ import { injectIntl } from 'react-intl-next';
11
11
  import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
12
12
  import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
13
13
  import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
14
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
14
+ import { fg } from '@atlaskit/platform-feature-flags';
15
15
  import { usePresetContext } from '../../../presets/context';
16
16
  import Toolbar from '../../Toolbar';
17
17
  import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
@@ -84,8 +84,10 @@ export const EditorToolbar = /*#__PURE__*/React.memo(props => {
84
84
  };
85
85
  const handleEscape = event => {
86
86
  var _props$editorView;
87
- if (getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && !props.popupsMountPoint) {
88
- return;
87
+ if (!fg('editor-fix-esc-main-toolbar-navigation')) {
88
+ if (!props.popupsMountPoint) {
89
+ return;
90
+ }
89
91
  }
90
92
  if (!((_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.hasFocus())) {
91
93
  var _props$editorView2;
package/dist/es2019/ui/Appearance/FullPage/MainToolbar.js CHANGED
@@ -1,51 +1,57 @@
1
1
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
2
2
  import { css } from '@emotion/react';
3
3
  import { akEditorFloatingDialogZIndex, akEditorMobileMaxWidth, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
4
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
4
+ import { fg } from '@atlaskit/platform-feature-flags';
5
5
  export const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
6
6
 
7
7
  // box-shadow is overriden by the mainToolbar
8
8
  const mainToolbarWithKeyline = css({
9
9
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
10
- boxShadow: getBooleanFF('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}` :
10
+ boxShadow: fg('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `${"var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)"}` :
11
11
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
12
12
  `0 ${akEditorToolbarKeylineHeight}px 0 0 ${"var(--ds-background-accent-gray-subtlest, #F1F2F4)"}`
13
13
  });
14
- const mainToolbarTwoLineStyle = css({
15
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
16
- [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
17
- flexWrap: 'wrap',
14
+ const mainToolbarTwoLineStyle = () => {
15
+ const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
16
+ return css({
17
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
18
+ [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
19
+ flexWrap: 'wrap',
20
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
21
+ height: `calc(${editorToolbarHeight} * 2)`
22
+ }
23
+ });
24
+ };
25
+ const mainToolbar = () => {
26
+ const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
27
+ return css({
28
+ position: 'relative',
29
+ alignItems: 'center',
30
+ boxShadow: 'none',
18
31
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
19
- height: `calc(${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} * 2)`
20
- }
21
- });
22
- const mainToolbar = css({
23
- position: 'relative',
24
- alignItems: 'center',
25
- boxShadow: 'none',
26
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
27
- borderBottom: getBooleanFF('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `1px solid ${"var(--ds-border, #091E4224)"}` : undefined,
28
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
29
- transition: `box-shadow 200ms ${akEditorSwoopCubicBezier}`,
30
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
31
- zIndex: akEditorFloatingDialogZIndex,
32
- display: 'flex',
33
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
34
- height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
35
- flexShrink: 0,
36
- backgroundColor: "var(--ds-surface, white)",
37
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
38
- '& object': {
39
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
40
- height: '0 !important'
41
- },
42
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
43
- [`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
44
- display: 'grid',
32
+ borderBottom: fg('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? `1px solid ${"var(--ds-border, #091E4224)"}` : undefined,
45
33
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
46
- height: `calc(${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()} * 2)`
47
- }
48
- });
34
+ transition: `box-shadow 200ms ${akEditorSwoopCubicBezier}`,
35
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
36
+ zIndex: akEditorFloatingDialogZIndex,
37
+ display: 'flex',
38
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
39
+ height: editorToolbarHeight,
40
+ flexShrink: 0,
41
+ backgroundColor: "var(--ds-surface, white)",
42
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
43
+ '& object': {
44
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
45
+ height: '0 !important'
46
+ },
47
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
48
+ [`@media (max-width: ${akEditorMobileMaxWidth}px)`]: {
49
+ display: 'grid',
50
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
51
+ height: `calc(${editorToolbarHeight} * 2)`
52
+ }
53
+ });
54
+ };
49
55
  export const mainToolbarStyle = (showKeyline, twoLineEditorToolbar) => [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
50
56
 
51
57
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
@@ -68,32 +74,38 @@ const mainToolbarFirstChild = css({
68
74
  gridRow: 1
69
75
  }
70
76
  });
71
- const mainToolbarFirstChildTowLine = css({
72
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
73
- [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
74
- flex: '1 1 100%',
75
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
76
- height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
77
- justifyContent: 'flex-end',
78
- minWidth: 'fit-content'
79
- }
80
- });
77
+ const mainToolbarFirstChildTowLine = () => {
78
+ const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
79
+ return css({
80
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
81
+ [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
82
+ flex: '1 1 100%',
83
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
84
+ height: editorToolbarHeight,
85
+ justifyContent: 'flex-end',
86
+ minWidth: 'fit-content'
87
+ }
88
+ });
89
+ };
81
90
  export const mainToolbarFirstChildStyle = twoLineEditorToolbar => [mainToolbarFirstChild, twoLineEditorToolbar && mainToolbarFirstChildTowLine];
82
91
  const mainToolbarSecondChild = css({
83
92
  minWidth: 'fit-content'
84
93
  });
85
- const mainToolbarSecondChildTwoLine = css({
86
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
87
- [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
88
- display: 'flex',
89
- flexGrow: 1,
90
- flex: '1 1 100%',
91
- margin: 'auto',
92
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
93
- height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
94
- minWidth: 0
95
- }
96
- });
94
+ const mainToolbarSecondChildTwoLine = () => {
95
+ const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
96
+ return css({
97
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
98
+ [`@media (max-width: ${MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT}px)`]: {
99
+ display: 'flex',
100
+ flexGrow: 1,
101
+ flex: '1 1 100%',
102
+ margin: 'auto',
103
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
104
+ height: editorToolbarHeight,
105
+ minWidth: 0
106
+ }
107
+ });
108
+ };
97
109
  export const mainToolbarSecondChildStyle = twoLineEditorToolbar => [mainToolbarSecondChild, twoLineEditorToolbar && mainToolbarSecondChildTwoLine];
98
110
 
99
111
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
package/dist/es2019/ui/Appearance/FullPage/StyledComponents.js CHANGED
@@ -5,7 +5,7 @@ import { tableFullPageEditorStyles } from '@atlaskit/editor-plugins/table/ui/com
5
5
  import { tableMarginFullWidthMode } from '@atlaskit/editor-plugins/table/ui/consts';
6
6
  import { akEditorContextPanelWidth, akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akLayoutGutterOffset, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
7
7
  import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
8
+ import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { createEditorContentStyle } from '../../ContentStyles';
10
10
 
11
11
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -54,17 +54,20 @@ export const positionedOverEditorStyle = css({
54
54
  });
55
55
 
56
56
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
57
- export const contentArea = css({
58
- display: 'flex',
59
- flexDirection: 'row',
60
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
61
- height: `calc(100% - ${FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()})`,
62
- boxSizing: 'border-box',
63
- margin: 0,
64
- padding: 0,
65
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
66
- transition: `padding 0ms ${akEditorSwoopCubicBezier}`
67
- });
57
+ export const contentArea = () => {
58
+ const editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
59
+ return css({
60
+ display: 'flex',
61
+ flexDirection: 'row',
62
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
63
+ height: `calc(100% - ${editorToolbarHeight})`,
64
+ boxSizing: 'border-box',
65
+ margin: 0,
66
+ padding: 0,
67
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
68
+ transition: `padding 0ms ${akEditorSwoopCubicBezier}`
69
+ });
70
+ };
68
71
 
69
72
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
70
73
  export const contentAreaHeightNoToolbar = css({
@@ -184,10 +187,13 @@ tableFullPageEditorStyles, {
184
187
  });
185
188
 
186
189
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
187
- export const editorContentGutterStyle = css({
188
- boxSizing: 'border-box',
189
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
190
- padding: getBooleanFF('platform.editor.core.increase-full-page-guttering') ?
190
+ export const editorContentGutterStyle = () => {
191
+ const padding = fg('platform.editor.core.increase-full-page-guttering') ?
191
192
  // there is no space token for 52px
192
- `0 52px` : `0 ${"var(--ds-space-400, 32px)"}`
193
- });
193
+ `0 52px` : `0 ${"var(--ds-space-400, 32px)"}`;
194
+ return css({
195
+ boxSizing: 'border-box',
196
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
197
+ padding: padding
198
+ });
199
+ };
package/dist/es2019/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "195.0.4";
2
+ export const version = "195.0.9";
package/dist/esm/ui/Appearance/FullPage/FullPage.js CHANGED
@@ -44,7 +44,7 @@ var useShowKeyline = function useShowKeyline(contentAreaRef) {
44
44
  return showKeyline;
45
45
  };
46
46
  export var FullPageEditor = function FullPageEditor(props) {
47
- var _scrollContentContain, _scrollContentContain2, _wrapperElementRef$cu;
47
+ var _scrollContentContain, _scrollContentContain2, _scrollContentContain3, _wrapperElementRef$cu;
48
48
  var wrapperElementRef = useMemo(function () {
49
49
  return props.innerRef;
50
50
  }, [props.innerRef]);
@@ -59,6 +59,7 @@ export var FullPageEditor = function FullPageEditor(props) {
59
59
  primaryToolbarComponents = primaryToolbarState.components.concat(primaryToolbarComponents);
60
60
  }
61
61
  var isEditorToolbarHidden = (editorViewModeState === null || editorViewModeState === void 0 ? void 0 : editorViewModeState.mode) === 'view';
62
+ var popupsBoundariesElement = props.popupsBoundariesElement || (scrollContentContainerRef === null || scrollContentContainerRef === void 0 || (_scrollContentContain = scrollContentContainerRef.current) === null || _scrollContentContain === void 0 ? void 0 : _scrollContentContain.scrollContainer) || undefined;
62
63
  return jsx(ContextPanelWidthProvider, null, jsx("div", {
63
64
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
64
65
  css: fullPageEditorWrapper
@@ -70,7 +71,7 @@ export var FullPageEditor = function FullPageEditor(props) {
70
71
  appearance: props.appearance,
71
72
  beforeIcon: props.primaryToolbarIconBefore,
72
73
  collabEdit: props.collabEdit,
73
- containerElement: (_scrollContentContain = (_scrollContentContain2 = scrollContentContainerRef.current) === null || _scrollContentContain2 === void 0 ? void 0 : _scrollContentContain2.scrollContainer) !== null && _scrollContentContain !== void 0 ? _scrollContentContain : null,
74
+ containerElement: (_scrollContentContain2 = (_scrollContentContain3 = scrollContentContainerRef.current) === null || _scrollContentContain3 === void 0 ? void 0 : _scrollContentContain3.scrollContainer) !== null && _scrollContentContain2 !== void 0 ? _scrollContentContain2 : null,
74
75
  customPrimaryToolbarComponents: props.customPrimaryToolbarComponents,
75
76
  disabled: !!props.disabled,
76
77
  dispatchAnalyticsEvent: props.dispatchAnalyticsEvent,
@@ -99,7 +100,7 @@ export var FullPageEditor = function FullPageEditor(props) {
99
100
  editorDOMElement: props.editorDOMElement,
100
101
  editorView: props.editorView,
101
102
  eventDispatcher: props.eventDispatcher,
102
- popupsBoundariesElement: props.popupsBoundariesElement,
103
+ popupsBoundariesElement: popupsBoundariesElement,
103
104
  popupsMountPoint: props.popupsMountPoint,
104
105
  popupsScrollableElement: props.popupsScrollableElement,
105
106
  providerFactory: props.providerFactory,
package/dist/esm/ui/Appearance/FullPage/FullPageContentArea.js CHANGED
@@ -65,7 +65,7 @@ var Content = /*#__PURE__*/React.forwardRef(function (props, ref) {
65
65
  ref: contentAreaRef
66
66
  }, jsx("div", {
67
67
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
68
- css: editorContentGutterStyle
68
+ css: editorContentGutterStyle()
69
69
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
70
70
  ,
71
71
  className: ['ak-editor-content-area', fullWidthMode ? 'fabric-editor--full-width-mode' : ''].join(' '),
package/dist/esm/ui/Appearance/FullPage/FullPageToolbar.js CHANGED
@@ -12,7 +12,7 @@ import { injectIntl } from 'react-intl-next';
12
12
  import { fullPageMessages as messages } from '@atlaskit/editor-common/messages';
13
13
  import { ContextPanelConsumer } from '@atlaskit/editor-common/ui';
14
14
  import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
15
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
15
+ import { fg } from '@atlaskit/platform-feature-flags';
16
16
  import { usePresetContext } from '../../../presets/context';
17
17
  import Toolbar from '../../Toolbar';
18
18
  import { BeforePrimaryToolbarWrapper } from './BeforeWrapper';
@@ -90,8 +90,10 @@ export var EditorToolbar = /*#__PURE__*/React.memo(function (props) {
90
90
  };
91
91
  var handleEscape = function handleEscape(event) {
92
92
  var _props$editorView;
93
- if (getBooleanFF('platform.editor.a11y-main-toolbar-navigation_osrty') && !props.popupsMountPoint) {
94
- return;
93
+ if (!fg('editor-fix-esc-main-toolbar-navigation')) {
94
+ if (!props.popupsMountPoint) {
95
+ return;
96
+ }
95
97
  }
96
98
  if (!((_props$editorView = props.editorView) !== null && _props$editorView !== void 0 && _props$editorView.hasFocus())) {
97
99
  var _props$editorView2;
package/dist/esm/ui/Appearance/FullPage/MainToolbar.js CHANGED
@@ -2,45 +2,51 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
3
3
  import { css } from '@emotion/react';
4
4
  import { akEditorFloatingDialogZIndex, akEditorMobileMaxWidth, akEditorSwoopCubicBezier, akEditorToolbarKeylineHeight, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
5
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
5
+ import { fg } from '@atlaskit/platform-feature-flags';
6
6
  export var MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
7
7
 
8
8
  // box-shadow is overriden by the mainToolbar
9
9
  var mainToolbarWithKeyline = css({
10
10
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
11
- boxShadow: getBooleanFF('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)" : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
11
+ boxShadow: fg('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "var(--ds-shadow-overflow, 0px 0px 8px #091E4228, 0px 0px 1px #091E421e)" : // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
12
12
  "0 ".concat(akEditorToolbarKeylineHeight, "px 0 0 ", "var(--ds-background-accent-gray-subtlest, #F1F2F4)")
13
13
  });
14
- var mainToolbarTwoLineStyle = css(_defineProperty({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
15
- flexWrap: 'wrap',
16
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
17
- height: "calc(".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(), " * 2)")
18
- }));
19
- var mainToolbar = css(_defineProperty({
20
- position: 'relative',
21
- alignItems: 'center',
22
- boxShadow: 'none',
23
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
24
- borderBottom: getBooleanFF('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "1px solid ".concat("var(--ds-border, #091E4224)") : undefined,
25
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
26
- transition: "box-shadow 200ms ".concat(akEditorSwoopCubicBezier),
27
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
28
- zIndex: akEditorFloatingDialogZIndex,
29
- display: 'flex',
30
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
31
- height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
32
- flexShrink: 0,
33
- backgroundColor: "var(--ds-surface, white)",
34
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
35
- '& object': {
36
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
37
- height: '0 !important'
38
- }
39
- }, "@media (max-width: ".concat(akEditorMobileMaxWidth, "px)"), {
40
- display: 'grid',
41
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
42
- height: "calc(".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(), " * 2)")
43
- }));
14
+ var mainToolbarTwoLineStyle = function mainToolbarTwoLineStyle() {
15
+ var editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
16
+ return css(_defineProperty({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
17
+ flexWrap: 'wrap',
18
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
19
+ height: "calc(".concat(editorToolbarHeight, " * 2)")
20
+ }));
21
+ };
22
+ var mainToolbar = function mainToolbar() {
23
+ var editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
24
+ return css(_defineProperty({
25
+ position: 'relative',
26
+ alignItems: 'center',
27
+ boxShadow: 'none',
28
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
29
+ borderBottom: fg('platform.confluence.frontend.narrow-full-page-editor-toolbar') ? "1px solid ".concat("var(--ds-border, #091E4224)") : undefined,
30
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
31
+ transition: "box-shadow 200ms ".concat(akEditorSwoopCubicBezier),
32
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
33
+ zIndex: akEditorFloatingDialogZIndex,
34
+ display: 'flex',
35
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
36
+ height: editorToolbarHeight,
37
+ flexShrink: 0,
38
+ backgroundColor: "var(--ds-surface, white)",
39
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
40
+ '& object': {
41
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
42
+ height: '0 !important'
43
+ }
44
+ }, "@media (max-width: ".concat(akEditorMobileMaxWidth, "px)"), {
45
+ display: 'grid',
46
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
47
+ height: "calc(".concat(editorToolbarHeight, " * 2)")
48
+ }));
49
+ };
44
50
  export var mainToolbarStyle = function mainToolbarStyle(showKeyline, twoLineEditorToolbar) {
45
51
  return [mainToolbar, showKeyline && mainToolbarWithKeyline, twoLineEditorToolbar && mainToolbarTwoLineStyle];
46
52
  };
@@ -61,28 +67,34 @@ var mainToolbarFirstChild = css(_defineProperty({
61
67
  gridColumn: 1,
62
68
  gridRow: 1
63
69
  }));
64
- var mainToolbarFirstChildTowLine = css(_defineProperty({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
65
- flex: '1 1 100%',
66
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
67
- height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
68
- justifyContent: 'flex-end',
69
- minWidth: 'fit-content'
70
- }));
70
+ var mainToolbarFirstChildTowLine = function mainToolbarFirstChildTowLine() {
71
+ var editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
72
+ return css(_defineProperty({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
73
+ flex: '1 1 100%',
74
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
75
+ height: editorToolbarHeight,
76
+ justifyContent: 'flex-end',
77
+ minWidth: 'fit-content'
78
+ }));
79
+ };
71
80
  export var mainToolbarFirstChildStyle = function mainToolbarFirstChildStyle(twoLineEditorToolbar) {
72
81
  return [mainToolbarFirstChild, twoLineEditorToolbar && mainToolbarFirstChildTowLine];
73
82
  };
74
83
  var mainToolbarSecondChild = css({
75
84
  minWidth: 'fit-content'
76
85
  });
77
- var mainToolbarSecondChildTwoLine = css(_defineProperty({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
78
- display: 'flex',
79
- flexGrow: 1,
80
- flex: '1 1 100%',
81
- margin: 'auto',
82
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
83
- height: FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(),
84
- minWidth: 0
85
- }));
86
+ var mainToolbarSecondChildTwoLine = function mainToolbarSecondChildTwoLine() {
87
+ var editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
88
+ return css(_defineProperty({}, "@media (max-width: ".concat(MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT, "px)"), {
89
+ display: 'flex',
90
+ flexGrow: 1,
91
+ flex: '1 1 100%',
92
+ margin: 'auto',
93
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
94
+ height: editorToolbarHeight,
95
+ minWidth: 0
96
+ }));
97
+ };
86
98
  export var mainToolbarSecondChildStyle = function mainToolbarSecondChildStyle(twoLineEditorToolbar) {
87
99
  return [mainToolbarSecondChild, twoLineEditorToolbar && mainToolbarSecondChildTwoLine];
88
100
  };
package/dist/esm/ui/Appearance/FullPage/StyledComponents.js CHANGED
@@ -7,7 +7,7 @@ import { tableFullPageEditorStyles } from '@atlaskit/editor-plugins/table/ui/com
7
7
  import { tableMarginFullWidthMode } from '@atlaskit/editor-plugins/table/ui/consts';
8
8
  import { akEditorContextPanelWidth, akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorSwoopCubicBezier, akLayoutGutterOffset, FULL_PAGE_EDITOR_TOOLBAR_HEIGHT } from '@atlaskit/editor-shared-styles';
9
9
  import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
10
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
10
+ import { fg } from '@atlaskit/platform-feature-flags';
11
11
  import { createEditorContentStyle } from '../../ContentStyles';
12
12
 
13
13
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -58,17 +58,20 @@ export var positionedOverEditorStyle = css({
58
58
  });
59
59
 
60
60
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
61
- export var contentArea = css({
62
- display: 'flex',
63
- flexDirection: 'row',
64
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
65
- height: "calc(100% - ".concat(FULL_PAGE_EDITOR_TOOLBAR_HEIGHT(), ")"),
66
- boxSizing: 'border-box',
67
- margin: 0,
68
- padding: 0,
69
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
70
- transition: "padding 0ms ".concat(akEditorSwoopCubicBezier)
71
- });
61
+ export var contentArea = function contentArea() {
62
+ var editorToolbarHeight = FULL_PAGE_EDITOR_TOOLBAR_HEIGHT();
63
+ return css({
64
+ display: 'flex',
65
+ flexDirection: 'row',
66
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
67
+ height: "calc(100% - ".concat(editorToolbarHeight, ")"),
68
+ boxSizing: 'border-box',
69
+ margin: 0,
70
+ padding: 0,
71
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
72
+ transition: "padding 0ms ".concat(akEditorSwoopCubicBezier)
73
+ });
74
+ };
72
75
 
73
76
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
74
77
  export var contentAreaHeightNoToolbar = css({
@@ -189,9 +192,12 @@ tableFullPageEditorStyles, {
189
192
  });
190
193
 
191
194
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
192
- export var editorContentGutterStyle = css({
193
- boxSizing: 'border-box',
194
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
195
- padding: getBooleanFF('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
196
- "0 52px" : "0 ".concat("var(--ds-space-400, 32px)")
197
- });
195
+ export var editorContentGutterStyle = function editorContentGutterStyle() {
196
+ var padding = fg('platform.editor.core.increase-full-page-guttering') ? // there is no space token for 52px
197
+ "0 52px" : "0 ".concat("var(--ds-space-400, 32px)");
198
+ return css({
199
+ boxSizing: 'border-box',
200
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
201
+ padding: padding
202
+ });
203
+ };
package/dist/esm/version-wrapper.js CHANGED
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "195.0.4";
2
+ export var version = "195.0.9";
package/dist/types/ui/Appearance/FullPage/MainToolbar.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export declare const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
2
- export declare const mainToolbarStyle: (showKeyline: boolean, twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles)[];
2
+ export declare const mainToolbarStyle: (showKeyline: boolean, twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles | (() => import("@emotion/react").SerializedStyles))[];
3
3
  export declare const mainToolbarIconBeforeStyle: import("@emotion/react").SerializedStyles;
4
- export declare const mainToolbarFirstChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles)[];
5
- export declare const mainToolbarSecondChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles)[];
4
+ export declare const mainToolbarFirstChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles | (() => import("@emotion/react").SerializedStyles))[];
5
+ export declare const mainToolbarSecondChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles | (() => import("@emotion/react").SerializedStyles))[];
6
6
  export declare const nonCustomToolbarWrapperStyle: import("@emotion/react").SerializedStyles;
7
7
  export declare const customToolbarWrapperStyle: import("@emotion/react").SerializedStyles;
package/dist/types/ui/Appearance/FullPage/StyledComponents.d.ts CHANGED
@@ -12,7 +12,7 @@ export declare const ScrollContainer: import("react").ForwardRefExoticComponent<
12
12
  viewMode?: "view" | "edit" | undefined;
13
13
  } | "accept" | "acceptCharset" | "allowFullScreen" | "allowTransparency" | "alt" | "as" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "checked" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "download" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "mediaGroup" | "min" | "minLength" | "multiple" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "size" | "sizes" | "src" | "srcDoc" | "srcLang" | "srcSet" | "target" | "useMap" | "wmode" | "defaultChecked" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "contentEditable" | "contextMenu" | "draggable" | "lang" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture"> & import("react").RefAttributes<HTMLDivElement>>;
14
14
  export declare const positionedOverEditorStyle: import("@emotion/react").SerializedStyles;
15
- export declare const contentArea: import("@emotion/react").SerializedStyles;
15
+ export declare const contentArea: () => import("@emotion/react").SerializedStyles;
16
16
  export declare const contentAreaHeightNoToolbar: import("@emotion/react").SerializedStyles;
17
17
  export declare const sidebarArea: import("@emotion/react").SerializedStyles;
18
18
  export declare const editorContentAreaHideContainer: import("@emotion/react").SerializedStyles;
@@ -21,4 +21,4 @@ export declare const editorContentAreaStyle: ({ layoutMaxWidth, fullWidthMode, c
21
21
  fullWidthMode: boolean;
22
22
  containerWidth?: number | undefined;
23
23
  }) => (false | import("@emotion/react").SerializedStyles)[];
24
- export declare const editorContentGutterStyle: import("@emotion/react").SerializedStyles;
24
+ export declare const editorContentGutterStyle: () => import("@emotion/react").SerializedStyles;
package/dist/types-ts4.5/ui/Appearance/FullPage/MainToolbar.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export declare const MAXIMUM_TWO_LINE_TOOLBAR_BREAKPOINT = 868;
2
- export declare const mainToolbarStyle: (showKeyline: boolean, twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles)[];
2
+ export declare const mainToolbarStyle: (showKeyline: boolean, twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles | (() => import("@emotion/react").SerializedStyles))[];
3
3
  export declare const mainToolbarIconBeforeStyle: import("@emotion/react").SerializedStyles;
4
- export declare const mainToolbarFirstChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles)[];
5
- export declare const mainToolbarSecondChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles)[];
4
+ export declare const mainToolbarFirstChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles | (() => import("@emotion/react").SerializedStyles))[];
5
+ export declare const mainToolbarSecondChildStyle: (twoLineEditorToolbar: boolean) => (false | import("@emotion/react").SerializedStyles | (() => import("@emotion/react").SerializedStyles))[];
6
6
  export declare const nonCustomToolbarWrapperStyle: import("@emotion/react").SerializedStyles;
7
7
  export declare const customToolbarWrapperStyle: import("@emotion/react").SerializedStyles;
package/dist/types-ts4.5/ui/Appearance/FullPage/StyledComponents.d.ts CHANGED
@@ -12,7 +12,7 @@ export declare const ScrollContainer: import("react").ForwardRefExoticComponent<
12
12
  viewMode?: "view" | "edit" | undefined;
13
13
  } | "accept" | "acceptCharset" | "allowFullScreen" | "allowTransparency" | "alt" | "as" | "async" | "autoComplete" | "autoFocus" | "autoPlay" | "capture" | "cellPadding" | "cellSpacing" | "charSet" | "challenge" | "checked" | "classID" | "cols" | "colSpan" | "controls" | "coords" | "crossOrigin" | "dateTime" | "defer" | "download" | "encType" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "frameBorder" | "high" | "href" | "hrefLang" | "htmlFor" | "httpEquiv" | "integrity" | "keyParams" | "keyType" | "kind" | "loop" | "low" | "manifest" | "marginHeight" | "marginWidth" | "max" | "maxLength" | "mediaGroup" | "min" | "minLength" | "multiple" | "muted" | "nonce" | "noValidate" | "optimum" | "playsInline" | "poster" | "preload" | "readOnly" | "rel" | "required" | "reversed" | "rows" | "rowSpan" | "sandbox" | "scope" | "scoped" | "scrolling" | "seamless" | "selected" | "shape" | "size" | "sizes" | "src" | "srcDoc" | "srcLang" | "srcSet" | "target" | "useMap" | "wmode" | "defaultChecked" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "contentEditable" | "contextMenu" | "draggable" | "lang" | "spellCheck" | "tabIndex" | "radioGroup" | "about" | "datatype" | "inlist" | "prefix" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture"> & import("react").RefAttributes<HTMLDivElement>>;
14
14
  export declare const positionedOverEditorStyle: import("@emotion/react").SerializedStyles;
15
- export declare const contentArea: import("@emotion/react").SerializedStyles;
15
+ export declare const contentArea: () => import("@emotion/react").SerializedStyles;
16
16
  export declare const contentAreaHeightNoToolbar: import("@emotion/react").SerializedStyles;
17
17
  export declare const sidebarArea: import("@emotion/react").SerializedStyles;
18
18
  export declare const editorContentAreaHideContainer: import("@emotion/react").SerializedStyles;
@@ -21,4 +21,4 @@ export declare const editorContentAreaStyle: ({ layoutMaxWidth, fullWidthMode, c
21
21
  fullWidthMode: boolean;
22
22
  containerWidth?: number | undefined;
23
23
  }) => (false | import("@emotion/react").SerializedStyles)[];
24
- export declare const editorContentGutterStyle: import("@emotion/react").SerializedStyles;
24
+ export declare const editorContentGutterStyle: () => import("@emotion/react").SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "195.0.4",
3
+ "version": "195.0.9",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -45,12 +45,12 @@
45
45
  "@atlaskit/analytics-next": "^9.3.0",
46
46
  "@atlaskit/analytics-next-stable-react-context": "1.0.1",
47
47
  "@atlaskit/button": "^19.1.0",
48
- "@atlaskit/editor-common": "^87.0.0",
49
- "@atlaskit/editor-plugins": "^3.5.0",
48
+ "@atlaskit/editor-common": "^87.2.0",
49
+ "@atlaskit/editor-plugins": "^3.6.0",
50
50
  "@atlaskit/editor-prosemirror": "5.0.1",
51
51
  "@atlaskit/editor-shared-styles": "^2.13.0",
52
- "@atlaskit/emoji": "^67.6.0",
53
- "@atlaskit/icon": "^22.8.0",
52
+ "@atlaskit/emoji": "^67.7.0",
53
+ "@atlaskit/icon": "^22.9.0",
54
54
  "@atlaskit/media-card": "^78.0.0",
55
55
  "@atlaskit/mention": "^23.2.0",
56
56
  "@atlaskit/platform-feature-flags": "^0.3.0",
@@ -88,7 +88,7 @@
88
88
  "@atlaskit/collab-provider": "9.36.1",
89
89
  "@atlaskit/editor-json-transformer": "^8.17.0",
90
90
  "@atlaskit/editor-plugin-annotation": "1.18.1",
91
- "@atlaskit/editor-plugin-card": "^2.8.0",
91
+ "@atlaskit/editor-plugin-card": "^2.9.0",
92
92
  "@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
93
93
  "@atlaskit/editor-plugin-list": "^3.7.0",
94
94
  "@atlaskit/editor-plugin-paste": "^1.7.0",
@@ -100,7 +100,7 @@
100
100
  "@atlaskit/media-test-helpers": "^34.0.0",
101
101
  "@atlaskit/modal-dialog": "^12.14.0",
102
102
  "@atlaskit/primitives": "^11.1.0",
103
- "@atlaskit/renderer": "^109.44.0",
103
+ "@atlaskit/renderer": "^109.45.0",
104
104
  "@atlaskit/smart-card": "^27.11.0",
105
105
  "@atlaskit/synchrony-test-helpers": "^2.5.0",
106
106
  "@atlaskit/toggle": "^13.2.0",
@@ -270,9 +270,6 @@
270
270
  "type": "boolean",
271
271
  "referenceOnly": "true"
272
272
  },
273
- "platform.editor.a11y-main-toolbar-navigation_osrty": {
274
- "type": "boolean"
275
- },
276
273
  "platform.editor.elements.drag-and-drop-remove-wrapper_fyqr2": {
277
274
  "type": "boolean"
278
275
  },
@@ -307,6 +304,10 @@
307
304
  "type": "boolean",
308
305
  "referenceOnly": true
309
306
  },
307
+ "editor_react_18_fix_table_delete_col_decorations": {
308
+ "type": "boolean",
309
+ "referenceOnly": true
310
+ },
310
311
  "react_18_color_picker_concurrent_mode": {
311
312
  "type": "boolean",
312
313
  "referenceOnly": true
@@ -314,9 +315,8 @@
314
315
  "linking-platform-contenteditable-false-live-view": {
315
316
  "type": "boolean"
316
317
  },
317
- "editor_react_18_fix_table_delete_col_decorations": {
318
- "type": "boolean",
319
- "referenceOnly": true
318
+ "editor-fix-esc-main-toolbar-navigation": {
319
+ "type": "boolean"
320
320
  },
321
321
  "platform_editor_lazy-node-views": {
322
322
  "type": "boolean",