@atlaskit/editor-core 216.7.3 → 216.7.4
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 +13 -0
- package/dist/cjs/ui/Appearance/FullPage/FullPageToolbarNext.js +2 -2
- package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js +3 -3
- package/dist/cjs/ui/EditorContentContainer/styles/editorUGCTokenStyles.js +2 -4
- package/dist/cjs/ui/EditorContentContainer/styles/resizerStyles.js +1 -1
- package/dist/cjs/ui/Toolbar/Toolbar.js +2 -13
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPageToolbarNext.js +2 -2
- package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js +3 -3
- package/dist/es2019/ui/EditorContentContainer/styles/editorUGCTokenStyles.js +2 -4
- package/dist/es2019/ui/EditorContentContainer/styles/resizerStyles.js +3 -3
- package/dist/es2019/ui/Toolbar/Toolbar.js +2 -11
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/ui/Appearance/FullPage/FullPageToolbarNext.js +2 -2
- package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js +3 -3
- package/dist/esm/ui/EditorContentContainer/styles/editorUGCTokenStyles.js +2 -4
- package/dist/esm/ui/EditorContentContainer/styles/resizerStyles.js +2 -2
- package/dist/esm/ui/Toolbar/Toolbar.js +2 -13
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/ui/EditorContentContainer/styles/editorUGCTokenStyles.d.ts +2 -4
- package/dist/types-ts4.5/ui/EditorContentContainer/styles/editorUGCTokenStyles.d.ts +2 -4
- package/package.json +3 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 216.7.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`6e8029473620b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6e8029473620b) -
|
|
8
|
+
[EDITOR-4496] clean up experiment platform_editor_toolbar_aifc_patch_3 and remove view-mode plugin
|
|
9
|
+
dependency from loom plugin
|
|
10
|
+
- [`0a9962a3aa24c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0a9962a3aa24c) -
|
|
11
|
+
tidy up experiment platform_editor_resizer_styles_cleanup
|
|
12
|
+
- [`7080196995b11`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7080196995b11) -
|
|
13
|
+
Cleaning up FG platform_editor_ai_generic_prep_for_aifc
|
|
14
|
+
- Updated dependencies
|
|
15
|
+
|
|
3
16
|
## 216.7.3
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -43,7 +43,7 @@ var MainToolbarWrapper = function MainToolbarWrapper(_ref) {
|
|
|
43
43
|
showKeyline = _ref.showKeyline;
|
|
44
44
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
45
45
|
"data-testid": testId,
|
|
46
|
-
className: (0, _runtime.ax)([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, styles.
|
|
46
|
+
className: (0, _runtime.ax)([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, styles.mainToolbarZIndex, styles.mainToolbarNew, (0, _expValEquals.expValEquals)('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && (0, _expValEquals.expValEquals)('platform_editor_table_sticky_header_patch_9', 'isEnabled', true) && styles.backgroundColor])
|
|
47
47
|
}, children);
|
|
48
48
|
};
|
|
49
49
|
var FirstChildWrapper = function FirstChildWrapper(_ref2) {
|
|
@@ -123,7 +123,7 @@ var FullPageToolbarNext = exports.FullPageToolbarNext = function FullPageToolbar
|
|
|
123
123
|
showKeyline: showKeyline || ContextPanelWidth > 0
|
|
124
124
|
}, beforeIcon && /*#__PURE__*/_react.default.createElement("div", {
|
|
125
125
|
className: (0, _runtime.ax)([styles.mainToolbarIconBefore, styles.mainToolbarIconBeforeNew])
|
|
126
|
-
}, beforeIcon), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && (
|
|
126
|
+
}, beforeIcon), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && (0, _toolbar2.isToolbar)(toolbar) && ((0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true) && (0, _coreUtils.isSSR)() || editorView) && (!(0, _expValEquals.expValEquals)('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !(0, _coreUtils.isSSR)()) && /*#__PURE__*/_react.default.createElement(_Toolbar.ToolbarNext, {
|
|
127
127
|
toolbar: toolbar,
|
|
128
128
|
components: components,
|
|
129
129
|
editorView: editorView,
|
|
@@ -225,7 +225,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
225
225
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
226
226
|
_list.listsStyles,
|
|
227
227
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
228
|
-
|
|
228
|
+
_list.diffListStyles,
|
|
229
229
|
// Condense vertical spacing between list items when content mode dense is active
|
|
230
230
|
contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
|
|
231
231
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -237,7 +237,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
237
237
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
238
238
|
_rule.ruleStyles,
|
|
239
239
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
240
|
-
|
|
240
|
+
_smartCardStyles.smartCardDiffStyles,
|
|
241
241
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
242
242
|
(0, _platformFeatureFlags.fg)('platform_editor_ai_generic_prep_for_aifc_2') && _smartCardStyles.showDiffDeletedNodeStyles,
|
|
243
243
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -281,7 +281,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
|
|
|
281
281
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
282
282
|
(0, _extensionStyles.getExtensionStyles)(contentMode),
|
|
283
283
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
284
|
-
|
|
284
|
+
_extensionStyles.extensionDiffStyles,
|
|
285
285
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
286
286
|
_expandStyles.expandStyles, contentMode === 'compact' && ((0, _expValEquals.expValEquals)('confluence_compact_text_format', 'isEnabled', true) ||
|
|
287
287
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -23,8 +23,7 @@ var editorUGCTokensDefault = exports.editorUGCTokensDefault = (0, _react.css)({
|
|
|
23
23
|
});
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
|
-
* Use when fg('platform_editor_typography_ugc') is enabled, but
|
|
27
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
26
|
+
* Use when fg('platform_editor_typography_ugc') is enabled, but the following are not enabled:
|
|
28
27
|
* - fg('atlas_editor_typography_refreshed')
|
|
29
28
|
*/
|
|
30
29
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -40,8 +39,7 @@ var editorUGCTokensModernized = exports.editorUGCTokensModernized = (0, _react.c
|
|
|
40
39
|
});
|
|
41
40
|
|
|
42
41
|
/**
|
|
43
|
-
* Use when fg('platform_editor_typography_ugc') is enabled and
|
|
44
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
42
|
+
* Use when fg('platform_editor_typography_ugc') is enabled and the following is enabled:
|
|
45
43
|
* - fg('atlas_editor_typography_refreshed')
|
|
46
44
|
*/
|
|
47
45
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -148,7 +148,7 @@ var resizerStyles = exports.resizerStyles = (0, _react.css)((0, _defineProperty2
|
|
|
148
148
|
height: '100%',
|
|
149
149
|
minHeight: 36
|
|
150
150
|
}
|
|
151
|
-
}),
|
|
151
|
+
}), ".".concat(_editorSharedStyles.akEditorSelectedNodeClassName), (0, _defineProperty2.default)({}, "& .".concat(resizerHandleThumbClassName), {
|
|
152
152
|
background: "var(--ds-border-focused, #4688EC)"
|
|
153
153
|
})), ".ak-editor-no-interaction .ak-editor-selected-node .".concat(resizerHandleClassName, ":not(:hover) .").concat(resizerHandleThumbClassName), {
|
|
154
154
|
background: "var(--ds-border, #0B120E24)"
|
|
@@ -9,11 +9,9 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
var _hooks = require("@atlaskit/editor-common/hooks");
|
|
10
10
|
var _toolbar = require("@atlaskit/editor-common/toolbar");
|
|
11
11
|
var _types = require("@atlaskit/editor-common/types");
|
|
12
|
-
var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
|
|
13
12
|
var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
|
|
14
13
|
var _editorToolbar = require("@atlaskit/editor-toolbar");
|
|
15
14
|
var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
|
|
16
|
-
var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
|
|
17
15
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
18
16
|
var _ToolbarInner = require("./ToolbarInner");
|
|
19
17
|
/**
|
|
@@ -39,9 +37,7 @@ var Toolbar = exports.Toolbar = function Toolbar(props) {
|
|
|
39
37
|
containerElement: props.containerElement
|
|
40
38
|
});
|
|
41
39
|
};
|
|
42
|
-
var usePluginState =
|
|
43
|
-
return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
|
|
44
|
-
}, function (api) {
|
|
40
|
+
var usePluginState = function usePluginState(api) {
|
|
45
41
|
return (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity', 'editorViewMode', 'userPreferences'], function (state) {
|
|
46
42
|
var _state$connectivitySt, _state$editorViewMode, _state$userPreference;
|
|
47
43
|
return {
|
|
@@ -50,14 +46,7 @@ var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(fun
|
|
|
50
46
|
editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 || (_state$userPreference = _state$userPreference.preferences) === null || _state$userPreference === void 0 ? void 0 : _state$userPreference.toolbarDockingPosition
|
|
51
47
|
};
|
|
52
48
|
});
|
|
53
|
-
}
|
|
54
|
-
var connectivityStateMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'connectivity.mode');
|
|
55
|
-
return {
|
|
56
|
-
connectivityStateMode: connectivityStateMode,
|
|
57
|
-
editorViewMode: undefined,
|
|
58
|
-
editorToolbarDockingPreference: undefined
|
|
59
|
-
};
|
|
60
|
-
});
|
|
49
|
+
};
|
|
61
50
|
|
|
62
51
|
/**
|
|
63
52
|
* Renders a primary toolbar, driven by components registed by `editor-plugin-toolbar`. `ToolbarModelRenderer` will just
|
|
@@ -35,7 +35,7 @@ const MainToolbarWrapper = ({
|
|
|
35
35
|
}) => {
|
|
36
36
|
return /*#__PURE__*/React.createElement("div", {
|
|
37
37
|
"data-testid": testId,
|
|
38
|
-
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, styles.
|
|
38
|
+
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, styles.mainToolbarZIndex, styles.mainToolbarNew, expValEquals('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && expValEquals('platform_editor_table_sticky_header_patch_9', 'isEnabled', true) && styles.backgroundColor])
|
|
39
39
|
}, children);
|
|
40
40
|
};
|
|
41
41
|
const FirstChildWrapper = ({
|
|
@@ -117,7 +117,7 @@ export const FullPageToolbarNext = ({
|
|
|
117
117
|
showKeyline: showKeyline || ContextPanelWidth > 0
|
|
118
118
|
}, beforeIcon && /*#__PURE__*/React.createElement("div", {
|
|
119
119
|
className: ax([styles.mainToolbarIconBefore, styles.mainToolbarIconBeforeNew])
|
|
120
|
-
}, beforeIcon), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (
|
|
120
|
+
}, beforeIcon), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR()) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
121
121
|
toolbar: toolbar,
|
|
122
122
|
components: components,
|
|
123
123
|
editorView: editorView,
|
|
@@ -221,7 +221,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
221
221
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
222
222
|
listsStyles,
|
|
223
223
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
224
|
-
|
|
224
|
+
diffListStyles,
|
|
225
225
|
// Condense vertical spacing between list items when content mode dense is active
|
|
226
226
|
contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
|
|
227
227
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -233,7 +233,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
233
233
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
234
234
|
ruleStyles,
|
|
235
235
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
236
|
-
|
|
236
|
+
smartCardDiffStyles,
|
|
237
237
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
238
238
|
fg('platform_editor_ai_generic_prep_for_aifc_2') && showDiffDeletedNodeStyles,
|
|
239
239
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -277,7 +277,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
|
|
|
277
277
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
278
278
|
getExtensionStyles(contentMode),
|
|
279
279
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
280
|
-
|
|
280
|
+
extensionDiffStyles,
|
|
281
281
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
282
282
|
expandStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
|
|
283
283
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -17,8 +17,7 @@ export const editorUGCTokensDefault = css({
|
|
|
17
17
|
});
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
|
-
* Use when fg('platform_editor_typography_ugc') is enabled, but
|
|
21
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
20
|
+
* Use when fg('platform_editor_typography_ugc') is enabled, but the following are not enabled:
|
|
22
21
|
* - fg('atlas_editor_typography_refreshed')
|
|
23
22
|
*/
|
|
24
23
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -34,8 +33,7 @@ export const editorUGCTokensModernized = css({
|
|
|
34
33
|
});
|
|
35
34
|
|
|
36
35
|
/**
|
|
37
|
-
* Use when fg('platform_editor_typography_ugc') is enabled and
|
|
38
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
36
|
+
* Use when fg('platform_editor_typography_ugc') is enabled and the following is enabled:
|
|
39
37
|
* - fg('atlas_editor_typography_refreshed')
|
|
40
38
|
*/
|
|
41
39
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
2
2
|
import { css } from '@emotion/react';
|
|
3
|
-
import { akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
|
|
3
|
+
import { akEditorFullPageNarrowBreakout, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
|
|
4
4
|
export const resizerItemClassName = 'resizer-item';
|
|
5
5
|
export const resizerHoverZoneClassName = 'resizer-hover-zone';
|
|
6
6
|
export const resizerExtendedZone = 'resizer-is-extended';
|
|
@@ -179,8 +179,8 @@ export const resizerStyles = css({
|
|
|
179
179
|
minHeight: 36
|
|
180
180
|
}
|
|
181
181
|
},
|
|
182
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
|
|
183
|
-
|
|
182
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
|
|
183
|
+
[`.${akEditorSelectedNodeClassName}`]: {
|
|
184
184
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors,@atlaskit/ui-styling-standard/no-unsafe-values
|
|
185
185
|
[`& .${resizerHandleThumbClassName}`]: {
|
|
186
186
|
background: "var(--ds-border-focused, #4688EC)"
|
|
@@ -2,11 +2,9 @@ import React from 'react';
|
|
|
2
2
|
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
3
3
|
import { EditorToolbarProvider, EditorToolbarUIProvider } from '@atlaskit/editor-common/toolbar';
|
|
4
4
|
import { ToolbarSize } from '@atlaskit/editor-common/types';
|
|
5
|
-
import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
|
|
6
5
|
import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
|
|
7
6
|
import { ToolbarButtonGroup, ToolbarDropdownItemSection, ToolbarSection } from '@atlaskit/editor-toolbar';
|
|
8
7
|
import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
|
|
9
|
-
import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
|
|
10
8
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
11
9
|
import { ToolbarInner } from './ToolbarInner';
|
|
12
10
|
|
|
@@ -33,7 +31,7 @@ export const Toolbar = props => {
|
|
|
33
31
|
containerElement: props.containerElement
|
|
34
32
|
});
|
|
35
33
|
};
|
|
36
|
-
const usePluginState =
|
|
34
|
+
const usePluginState = api => {
|
|
37
35
|
return useSharedPluginStateWithSelector(api, ['connectivity', 'editorViewMode', 'userPreferences'], state => {
|
|
38
36
|
var _state$connectivitySt, _state$editorViewMode, _state$userPreference, _state$userPreference2;
|
|
39
37
|
return {
|
|
@@ -42,14 +40,7 @@ const usePluginState = conditionalHooksFactory(() => expValEquals('platform_edit
|
|
|
42
40
|
editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 ? void 0 : (_state$userPreference2 = _state$userPreference.preferences) === null || _state$userPreference2 === void 0 ? void 0 : _state$userPreference2.toolbarDockingPosition
|
|
43
41
|
};
|
|
44
42
|
});
|
|
45
|
-
}
|
|
46
|
-
const connectivityStateMode = useSharedPluginStateSelector(api, 'connectivity.mode');
|
|
47
|
-
return {
|
|
48
|
-
connectivityStateMode,
|
|
49
|
-
editorViewMode: undefined,
|
|
50
|
-
editorToolbarDockingPreference: undefined
|
|
51
|
-
};
|
|
52
|
-
});
|
|
43
|
+
};
|
|
53
44
|
|
|
54
45
|
/**
|
|
55
46
|
* Renders a primary toolbar, driven by components registed by `editor-plugin-toolbar`. `ToolbarModelRenderer` will just
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "216.7.
|
|
2
|
+
export const version = "216.7.3";
|
|
@@ -34,7 +34,7 @@ var MainToolbarWrapper = function MainToolbarWrapper(_ref) {
|
|
|
34
34
|
showKeyline = _ref.showKeyline;
|
|
35
35
|
return /*#__PURE__*/React.createElement("div", {
|
|
36
36
|
"data-testid": testId,
|
|
37
|
-
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, styles.
|
|
37
|
+
className: ax([styles.mainToolbarWrapper, showKeyline && styles.mainToolbarWithKeyline, styles.mainToolbarZIndex, styles.mainToolbarNew, expValEquals('platform_editor_table_sticky_header_improvements', 'cohort', 'test_with_overflow') && expValEquals('platform_editor_table_sticky_header_patch_9', 'isEnabled', true) && styles.backgroundColor])
|
|
38
38
|
}, children);
|
|
39
39
|
};
|
|
40
40
|
var FirstChildWrapper = function FirstChildWrapper(_ref2) {
|
|
@@ -114,7 +114,7 @@ export var FullPageToolbarNext = function FullPageToolbarNext(_ref4) {
|
|
|
114
114
|
showKeyline: showKeyline || ContextPanelWidth > 0
|
|
115
115
|
}, beforeIcon && /*#__PURE__*/React.createElement("div", {
|
|
116
116
|
className: ax([styles.mainToolbarIconBefore, styles.mainToolbarIconBeforeNew])
|
|
117
|
-
}, beforeIcon), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (
|
|
117
|
+
}, beforeIcon), /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FirstChildWrapper, null, primaryToolbarDockingConfigEnabled && components && isToolbar(toolbar) && (expValEquals('platform_editor_ssr_renderer', 'isEnabled', true) && isSSR() || editorView) && (!expValEquals('platform_editor_toolbar_delay_render_fix', 'isEnabled', true) || !isSSR()) && /*#__PURE__*/React.createElement(ToolbarNext, {
|
|
118
118
|
toolbar: toolbar,
|
|
119
119
|
components: components,
|
|
120
120
|
editorView: editorView,
|
|
@@ -217,7 +217,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
217
217
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
218
218
|
listsStyles,
|
|
219
219
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
220
|
-
|
|
220
|
+
diffListStyles,
|
|
221
221
|
// Condense vertical spacing between list items when content mode dense is active
|
|
222
222
|
contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
|
|
223
223
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -229,7 +229,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
229
229
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
230
230
|
ruleStyles,
|
|
231
231
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
232
|
-
|
|
232
|
+
smartCardDiffStyles,
|
|
233
233
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
234
234
|
fg('platform_editor_ai_generic_prep_for_aifc_2') && showDiffDeletedNodeStyles,
|
|
235
235
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
@@ -273,7 +273,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
|
|
|
273
273
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
274
274
|
getExtensionStyles(contentMode),
|
|
275
275
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
276
|
-
|
|
276
|
+
extensionDiffStyles,
|
|
277
277
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
278
278
|
expandStyles, contentMode === 'compact' && (expValEquals('confluence_compact_text_format', 'isEnabled', true) ||
|
|
279
279
|
// eslint-disable-next-line @atlaskit/platform/no-preconditioning
|
|
@@ -17,8 +17,7 @@ export var editorUGCTokensDefault = css({
|
|
|
17
17
|
});
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
|
-
* Use when fg('platform_editor_typography_ugc') is enabled, but
|
|
21
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
20
|
+
* Use when fg('platform_editor_typography_ugc') is enabled, but the following are not enabled:
|
|
22
21
|
* - fg('atlas_editor_typography_refreshed')
|
|
23
22
|
*/
|
|
24
23
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -34,8 +33,7 @@ export var editorUGCTokensModernized = css({
|
|
|
34
33
|
});
|
|
35
34
|
|
|
36
35
|
/**
|
|
37
|
-
* Use when fg('platform_editor_typography_ugc') is enabled and
|
|
38
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
36
|
+
* Use when fg('platform_editor_typography_ugc') is enabled and the following is enabled:
|
|
39
37
|
* - fg('atlas_editor_typography_refreshed')
|
|
40
38
|
*/
|
|
41
39
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
|
|
3
3
|
import { css } from '@emotion/react';
|
|
4
|
-
import { akEditorFullPageNarrowBreakout } from '@atlaskit/editor-shared-styles';
|
|
4
|
+
import { akEditorFullPageNarrowBreakout, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
|
|
5
5
|
export var resizerItemClassName = 'resizer-item';
|
|
6
6
|
export var resizerHoverZoneClassName = 'resizer-hover-zone';
|
|
7
7
|
export var resizerExtendedZone = 'resizer-is-extended';
|
|
@@ -140,7 +140,7 @@ export var resizerStyles = css(_defineProperty(_defineProperty(_defineProperty(_
|
|
|
140
140
|
height: '100%',
|
|
141
141
|
minHeight: 36
|
|
142
142
|
}
|
|
143
|
-
}),
|
|
143
|
+
}), ".".concat(akEditorSelectedNodeClassName), _defineProperty({}, "& .".concat(resizerHandleThumbClassName), {
|
|
144
144
|
background: "var(--ds-border-focused, #4688EC)"
|
|
145
145
|
})), ".ak-editor-no-interaction .ak-editor-selected-node .".concat(resizerHandleClassName, ":not(:hover) .").concat(resizerHandleThumbClassName), {
|
|
146
146
|
background: "var(--ds-border, #0B120E24)"
|
|
@@ -2,11 +2,9 @@ import React from 'react';
|
|
|
2
2
|
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
3
3
|
import { EditorToolbarProvider, EditorToolbarUIProvider } from '@atlaskit/editor-common/toolbar';
|
|
4
4
|
import { ToolbarSize } from '@atlaskit/editor-common/types';
|
|
5
|
-
import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
|
|
6
5
|
import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
|
|
7
6
|
import { ToolbarButtonGroup, ToolbarDropdownItemSection, ToolbarSection } from '@atlaskit/editor-toolbar';
|
|
8
7
|
import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
|
|
9
|
-
import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
|
|
10
8
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
11
9
|
import { ToolbarInner } from './ToolbarInner';
|
|
12
10
|
|
|
@@ -33,9 +31,7 @@ export var Toolbar = function Toolbar(props) {
|
|
|
33
31
|
containerElement: props.containerElement
|
|
34
32
|
});
|
|
35
33
|
};
|
|
36
|
-
var usePluginState =
|
|
37
|
-
return expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
|
|
38
|
-
}, function (api) {
|
|
34
|
+
var usePluginState = function usePluginState(api) {
|
|
39
35
|
return useSharedPluginStateWithSelector(api, ['connectivity', 'editorViewMode', 'userPreferences'], function (state) {
|
|
40
36
|
var _state$connectivitySt, _state$editorViewMode, _state$userPreference;
|
|
41
37
|
return {
|
|
@@ -44,14 +40,7 @@ var usePluginState = conditionalHooksFactory(function () {
|
|
|
44
40
|
editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 || (_state$userPreference = _state$userPreference.preferences) === null || _state$userPreference === void 0 ? void 0 : _state$userPreference.toolbarDockingPosition
|
|
45
41
|
};
|
|
46
42
|
});
|
|
47
|
-
}
|
|
48
|
-
var connectivityStateMode = useSharedPluginStateSelector(api, 'connectivity.mode');
|
|
49
|
-
return {
|
|
50
|
-
connectivityStateMode: connectivityStateMode,
|
|
51
|
-
editorViewMode: undefined,
|
|
52
|
-
editorToolbarDockingPreference: undefined
|
|
53
|
-
};
|
|
54
|
-
});
|
|
43
|
+
};
|
|
55
44
|
|
|
56
45
|
/**
|
|
57
46
|
* Renders a primary toolbar, driven by components registed by `editor-plugin-toolbar`. `ToolbarModelRenderer` will just
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "216.7.
|
|
2
|
+
export var version = "216.7.3";
|
|
@@ -4,14 +4,12 @@ import { type SerializedStyles } from '@emotion/react';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare const editorUGCTokensDefault: SerializedStyles;
|
|
6
6
|
/**
|
|
7
|
-
* Use when fg('platform_editor_typography_ugc') is enabled, but
|
|
8
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
7
|
+
* Use when fg('platform_editor_typography_ugc') is enabled, but the following are not enabled:
|
|
9
8
|
* - fg('atlas_editor_typography_refreshed')
|
|
10
9
|
*/
|
|
11
10
|
export declare const editorUGCTokensModernized: SerializedStyles;
|
|
12
11
|
/**
|
|
13
|
-
* Use when fg('platform_editor_typography_ugc') is enabled and
|
|
14
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
12
|
+
* Use when fg('platform_editor_typography_ugc') is enabled and the following is enabled:
|
|
15
13
|
* - fg('atlas_editor_typography_refreshed')
|
|
16
14
|
*/
|
|
17
15
|
export declare const editorUGCTokensRefreshed: SerializedStyles;
|
|
@@ -4,14 +4,12 @@ import { type SerializedStyles } from '@emotion/react';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare const editorUGCTokensDefault: SerializedStyles;
|
|
6
6
|
/**
|
|
7
|
-
* Use when fg('platform_editor_typography_ugc') is enabled, but
|
|
8
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
7
|
+
* Use when fg('platform_editor_typography_ugc') is enabled, but the following are not enabled:
|
|
9
8
|
* - fg('atlas_editor_typography_refreshed')
|
|
10
9
|
*/
|
|
11
10
|
export declare const editorUGCTokensModernized: SerializedStyles;
|
|
12
11
|
/**
|
|
13
|
-
* Use when fg('platform_editor_typography_ugc') is enabled and
|
|
14
|
-
* - fg('platform-dst-jira-web-fonts')
|
|
12
|
+
* Use when fg('platform_editor_typography_ugc') is enabled and the following is enabled:
|
|
15
13
|
* - fg('atlas_editor_typography_refreshed')
|
|
16
14
|
*/
|
|
17
15
|
export declare const editorUGCTokensRefreshed: SerializedStyles;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "216.7.
|
|
3
|
+
"version": "216.7.4",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@atlaskit/platform-feature-flags-react": "^0.4.0",
|
|
67
67
|
"@atlaskit/react-ufo": "^5.0.0",
|
|
68
68
|
"@atlaskit/task-decision": "^19.2.0",
|
|
69
|
-
"@atlaskit/tmp-editor-statsig": "^16.
|
|
69
|
+
"@atlaskit/tmp-editor-statsig": "^16.30.0",
|
|
70
70
|
"@atlaskit/tokens": "^10.1.0",
|
|
71
71
|
"@atlaskit/tooltip": "^20.14.0",
|
|
72
72
|
"@atlaskit/width-detector": "^5.0.0",
|
|
@@ -112,6 +112,7 @@
|
|
|
112
112
|
"@atlaskit/synchrony-test-helpers": "workspace:^",
|
|
113
113
|
"@atlaskit/toggle": "^15.2.0",
|
|
114
114
|
"@atlaskit/util-data-test": "^18.4.0",
|
|
115
|
+
"@atlassian/a11y-jest-testing": "^0.7.0",
|
|
115
116
|
"@atlassian/adf-schema-json": "^1.33.0",
|
|
116
117
|
"@atlassian/feature-flags-test-utils": "^1.0.0",
|
|
117
118
|
"@atlassian/search-provider": "^8.0.0",
|
|
@@ -197,9 +198,6 @@
|
|
|
197
198
|
"type": "boolean",
|
|
198
199
|
"referenceOnly": true
|
|
199
200
|
},
|
|
200
|
-
"platform_editor_ai_generic_prep_for_aifc": {
|
|
201
|
-
"type": "boolean"
|
|
202
|
-
},
|
|
203
201
|
"platform_editor_use_preferences_plugin": {
|
|
204
202
|
"type": "boolean",
|
|
205
203
|
"referenceOnly": true
|
|
@@ -288,9 +286,6 @@
|
|
|
288
286
|
"type": "boolean",
|
|
289
287
|
"referenceOnly": true
|
|
290
288
|
},
|
|
291
|
-
"platform-dst-jira-web-fonts": {
|
|
292
|
-
"type": "boolean"
|
|
293
|
-
},
|
|
294
289
|
"atlas_editor_typography_refreshed": {
|
|
295
290
|
"type": "boolean"
|
|
296
291
|
},
|