@atlaskit/editor-core 213.2.2 → 213.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +20 -0
- package/dist/cjs/composable-editor/editor-internal.js +1 -1
- package/dist/cjs/composable-editor/hooks/useMemoEditorProps.js +2 -1
- package/dist/cjs/composable-editor/utils/getBaseFontSize.js +9 -1
- package/dist/cjs/ui/Appearance/FullPage/FullPage.js +2 -5
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/composable-editor/editor-internal.js +1 -1
- package/dist/es2019/composable-editor/hooks/useMemoEditorProps.js +2 -1
- package/dist/es2019/composable-editor/utils/getBaseFontSize.js +10 -1
- package/dist/es2019/ui/Appearance/FullPage/FullPage.js +2 -5
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/composable-editor/editor-internal.js +1 -1
- package/dist/esm/composable-editor/hooks/useMemoEditorProps.js +2 -1
- package/dist/esm/composable-editor/utils/getBaseFontSize.js +10 -1
- package/dist/esm/ui/Appearance/FullPage/FullPage.js +2 -5
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/composable-editor/utils/getBaseFontSize.d.ts +2 -2
- package/dist/types/types/editor-props.d.ts +12 -0
- package/dist/types-ts4.5/composable-editor/utils/getBaseFontSize.d.ts +2 -2
- package/dist/types-ts4.5/types/editor-props.d.ts +12 -0
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/editor-core
|
|
2
2
|
|
|
3
|
+
## 213.3.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`3463fb9dbb744`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3463fb9dbb744) -
|
|
8
|
+
[ux] Add experiment for new compact mode
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
|
|
14
|
+
## 213.2.3
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- [`0fc247d192ca0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0fc247d192ca0) -
|
|
19
|
+
ED-29276 [SoftServ] Word ‘Color' is shown in pinned toolbar and 'Colour’ in Primary (unpinned)
|
|
20
|
+
toolbar, same in tooltips
|
|
21
|
+
- Updated dependencies
|
|
22
|
+
|
|
3
23
|
## 213.2.2
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -101,7 +101,7 @@ var EditorInternal = exports.EditorInternal = /*#__PURE__*/(0, _react.memo)(func
|
|
|
101
101
|
editorRef = _ref2.editorRef,
|
|
102
102
|
editorAPI = _ref2.editorAPI;
|
|
103
103
|
return (0, _react2.jsx)(_BaseThemeWrapper.BaseThemeWrapper, {
|
|
104
|
-
baseFontSize: (0, _getBaseFontSize.getBaseFontSize)(props.appearance)
|
|
104
|
+
baseFontSize: (0, _getBaseFontSize.getBaseFontSize)(props.appearance, props.contentMode)
|
|
105
105
|
}, (0, _react2.jsx)(AppearanceComponent, {
|
|
106
106
|
innerRef: editorRef,
|
|
107
107
|
editorAPI: editorAPI
|
|
@@ -15,6 +15,7 @@ var useMemoEditorProps = exports.useMemoEditorProps = function useMemoEditorProp
|
|
|
15
15
|
var allProps = {
|
|
16
16
|
preset: passedProps.preset,
|
|
17
17
|
appearance: passedProps.appearance,
|
|
18
|
+
contentMode: passedProps.contentMode,
|
|
18
19
|
contentComponents: passedProps.contentComponents,
|
|
19
20
|
primaryToolbarIconBefore: passedProps.primaryToolbarIconBefore,
|
|
20
21
|
secondaryToolbarComponents: passedProps.secondaryToolbarComponents,
|
|
@@ -114,7 +115,7 @@ var useMemoEditorProps = exports.useMemoEditorProps = function useMemoEditorProp
|
|
|
114
115
|
};
|
|
115
116
|
var nextProps = _objectSpread(_objectSpread({}, defaultProps), allProps);
|
|
116
117
|
return nextProps;
|
|
117
|
-
}, [passedProps.preset, passedProps.appearance, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation]);
|
|
118
|
+
}, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation]);
|
|
118
119
|
return memodProps;
|
|
119
120
|
};
|
|
120
121
|
var _default = exports.default = useMemoEditorProps;
|
|
@@ -5,11 +5,19 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.getBaseFontSize = getBaseFontSize;
|
|
7
7
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
8
|
+
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
9
|
+
var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
|
|
8
10
|
/**
|
|
9
11
|
* @param appearance
|
|
10
12
|
* @returns default font size if valid
|
|
11
13
|
*/
|
|
12
|
-
function getBaseFontSize(appearance) {
|
|
14
|
+
function getBaseFontSize(appearance, contentMode) {
|
|
15
|
+
if ((0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test')) {
|
|
16
|
+
if (contentMode === 'dense') {
|
|
17
|
+
var baseFontSize = (0, _expVal.expVal)('cc_editor_ai_content_mode', 'baseFontSize', 13);
|
|
18
|
+
return baseFontSize;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
13
21
|
if (appearance === undefined) {
|
|
14
22
|
return _editorSharedStyles.akEditorFullPageDefaultFontSize;
|
|
15
23
|
}
|
|
@@ -9,7 +9,6 @@ exports.FullPageEditor = void 0;
|
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
10
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
var _react2 = require("@emotion/react");
|
|
12
|
-
var _reactIntlNext = require("react-intl-next");
|
|
13
12
|
var _browser = require("@atlaskit/editor-common/browser");
|
|
14
13
|
var _hooks = require("@atlaskit/editor-common/hooks");
|
|
15
14
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
@@ -154,9 +153,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
|
|
|
154
153
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
155
154
|
'--ak-editor-fullpage-toolbar-height': (0, _editorSharedStyles.FULL_PAGE_EDITOR_TOOLBAR_HEIGHT)()
|
|
156
155
|
}
|
|
157
|
-
}, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) ? (0, _react2.jsx)(
|
|
158
|
-
locale: "en"
|
|
159
|
-
}, (0, _react2.jsx)(_FullPageToolbarNext.FullPageToolbarNext, {
|
|
156
|
+
}, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) ? (0, _react2.jsx)(_FullPageToolbarNext.FullPageToolbarNext, {
|
|
160
157
|
disabled: (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? !!props.disabled : undefined,
|
|
161
158
|
toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,
|
|
162
159
|
beforeIcon: props.primaryToolbarIconBefore,
|
|
@@ -167,7 +164,7 @@ var FullPageEditor = exports.FullPageEditor = function FullPageEditor(props) {
|
|
|
167
164
|
popupsScrollableElement: props.popupsScrollableElement,
|
|
168
165
|
showKeyline: showKeyline,
|
|
169
166
|
customPrimaryToolbarComponents: props.customPrimaryToolbarComponents
|
|
170
|
-
})
|
|
167
|
+
}) : (0, _react2.jsx)(_FullPageToolbar.FullPageToolbar, {
|
|
171
168
|
appearance: props.appearance,
|
|
172
169
|
editorAPI: editorAPI,
|
|
173
170
|
beforeIcon: props.primaryToolbarIconBefore,
|
|
@@ -90,7 +90,7 @@ export const EditorInternal = /*#__PURE__*/memo(({
|
|
|
90
90
|
}) => {
|
|
91
91
|
var _props$featureFlags, _props$featureFlags2;
|
|
92
92
|
return jsx(BaseThemeWrapper, {
|
|
93
|
-
baseFontSize: getBaseFontSize(props.appearance)
|
|
93
|
+
baseFontSize: getBaseFontSize(props.appearance, props.contentMode)
|
|
94
94
|
}, jsx(AppearanceComponent, {
|
|
95
95
|
innerRef: editorRef,
|
|
96
96
|
editorAPI: editorAPI
|
|
@@ -5,6 +5,7 @@ export const useMemoEditorProps = passedProps => {
|
|
|
5
5
|
const allProps = {
|
|
6
6
|
preset: passedProps.preset,
|
|
7
7
|
appearance: passedProps.appearance,
|
|
8
|
+
contentMode: passedProps.contentMode,
|
|
8
9
|
contentComponents: passedProps.contentComponents,
|
|
9
10
|
primaryToolbarIconBefore: passedProps.primaryToolbarIconBefore,
|
|
10
11
|
secondaryToolbarComponents: passedProps.secondaryToolbarComponents,
|
|
@@ -107,7 +108,7 @@ export const useMemoEditorProps = passedProps => {
|
|
|
107
108
|
...allProps
|
|
108
109
|
};
|
|
109
110
|
return nextProps;
|
|
110
|
-
}, [passedProps.preset, passedProps.appearance, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation]);
|
|
111
|
+
}, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation]);
|
|
111
112
|
return memodProps;
|
|
112
113
|
};
|
|
113
114
|
export default useMemoEditorProps;
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
import { akEditorFullPageDefaultFontSize } from '@atlaskit/editor-shared-styles';
|
|
2
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
3
|
+
import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
|
|
4
|
+
|
|
2
5
|
/**
|
|
3
6
|
* @param appearance
|
|
4
7
|
* @returns default font size if valid
|
|
5
8
|
*/
|
|
6
|
-
export function getBaseFontSize(appearance) {
|
|
9
|
+
export function getBaseFontSize(appearance, contentMode) {
|
|
10
|
+
if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) {
|
|
11
|
+
if (contentMode === 'dense') {
|
|
12
|
+
const baseFontSize = expVal('cc_editor_ai_content_mode', 'baseFontSize', 13);
|
|
13
|
+
return baseFontSize;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
7
16
|
if (appearance === undefined) {
|
|
8
17
|
return akEditorFullPageDefaultFontSize;
|
|
9
18
|
}
|
|
@@ -6,7 +6,6 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
|
6
6
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
8
8
|
import { jsx } from '@emotion/react';
|
|
9
|
-
import { IntlProvider } from 'react-intl-next';
|
|
10
9
|
import { browser } from '@atlaskit/editor-common/browser';
|
|
11
10
|
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
12
11
|
import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
|
|
@@ -139,9 +138,7 @@ export const FullPageEditor = props => {
|
|
|
139
138
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
140
139
|
'--ak-editor-fullpage-toolbar-height': FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()
|
|
141
140
|
}
|
|
142
|
-
}, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(
|
|
143
|
-
locale: "en"
|
|
144
|
-
}, jsx(FullPageToolbarNext, {
|
|
141
|
+
}, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(FullPageToolbarNext, {
|
|
145
142
|
disabled: expValEquals('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? !!props.disabled : undefined,
|
|
146
143
|
toolbarDockingPosition: (_toolbarDockingPositi = toolbarDockingPosition) !== null && _toolbarDockingPositi !== void 0 ? _toolbarDockingPositi : toolbarDocking,
|
|
147
144
|
beforeIcon: props.primaryToolbarIconBefore,
|
|
@@ -152,7 +149,7 @@ export const FullPageEditor = props => {
|
|
|
152
149
|
popupsScrollableElement: props.popupsScrollableElement,
|
|
153
150
|
showKeyline: showKeyline,
|
|
154
151
|
customPrimaryToolbarComponents: props.customPrimaryToolbarComponents
|
|
155
|
-
})
|
|
152
|
+
}) : jsx(FullPageToolbar, {
|
|
156
153
|
appearance: props.appearance,
|
|
157
154
|
editorAPI: editorAPI,
|
|
158
155
|
beforeIcon: props.primaryToolbarIconBefore,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = "@atlaskit/editor-core";
|
|
2
|
-
export const version = "
|
|
2
|
+
export const version = "0.0.0-development";
|
|
@@ -97,7 +97,7 @@ export var EditorInternal = /*#__PURE__*/memo(function (_ref) {
|
|
|
97
97
|
editorRef = _ref2.editorRef,
|
|
98
98
|
editorAPI = _ref2.editorAPI;
|
|
99
99
|
return jsx(BaseThemeWrapper, {
|
|
100
|
-
baseFontSize: getBaseFontSize(props.appearance)
|
|
100
|
+
baseFontSize: getBaseFontSize(props.appearance, props.contentMode)
|
|
101
101
|
}, jsx(AppearanceComponent, {
|
|
102
102
|
innerRef: editorRef,
|
|
103
103
|
editorAPI: editorAPI
|
|
@@ -8,6 +8,7 @@ export var useMemoEditorProps = function useMemoEditorProps(passedProps) {
|
|
|
8
8
|
var allProps = {
|
|
9
9
|
preset: passedProps.preset,
|
|
10
10
|
appearance: passedProps.appearance,
|
|
11
|
+
contentMode: passedProps.contentMode,
|
|
11
12
|
contentComponents: passedProps.contentComponents,
|
|
12
13
|
primaryToolbarIconBefore: passedProps.primaryToolbarIconBefore,
|
|
13
14
|
secondaryToolbarComponents: passedProps.secondaryToolbarComponents,
|
|
@@ -107,7 +108,7 @@ export var useMemoEditorProps = function useMemoEditorProps(passedProps) {
|
|
|
107
108
|
};
|
|
108
109
|
var nextProps = _objectSpread(_objectSpread({}, defaultProps), allProps);
|
|
109
110
|
return nextProps;
|
|
110
|
-
}, [passedProps.preset, passedProps.appearance, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation]);
|
|
111
|
+
}, [passedProps.preset, passedProps.appearance, passedProps.contentMode, passedProps.contentComponents, passedProps.primaryToolbarIconBefore, passedProps.secondaryToolbarComponents, passedProps.persistScrollGutter, passedProps.quickInsert, passedProps.shouldFocus, passedProps.disabled, passedProps.contextPanel, passedProps.errorReporterHandler, passedProps.contentTransformerProvider, passedProps.maxHeight, passedProps.minHeight, passedProps.placeholder, passedProps.placeholderBracketHint, passedProps.performanceTracking, passedProps.inputSamplingLimit, passedProps.defaultValue, passedProps.assistiveLabel, passedProps.assistiveDescribedBy, passedProps.popupsMountPoint, passedProps.popupsBoundariesElement, passedProps.popupsScrollableElement, passedProps.editorActions, passedProps.onEditorReady, passedProps.onDestroy, passedProps.onChange, passedProps.onCancel, passedProps.extensionProviders, passedProps.UNSAFE_useAnalyticsContext, passedProps.useStickyToolbar, passedProps.featureFlags, passedProps.onSave, passedProps.sanitizePrivateContent, passedProps.media, passedProps.collabEdit, passedProps.primaryToolbarComponents, passedProps.allowUndoRedoButtons, passedProps.linking, passedProps.activityProvider, passedProps.searchProvider, passedProps.annotationProviders, passedProps.collabEditProvider, passedProps.presenceProvider, passedProps.emojiProvider, passedProps.taskDecisionProvider, passedProps.legacyImageUploadProvider, passedProps.mentionProvider, passedProps.autoformattingProvider, passedProps.macroProvider, passedProps.contextIdentifierProvider, passedProps.allowExpand, passedProps.allowNestedTasks, passedProps.allowBlockType, passedProps.allowTasksAndDecisions, passedProps.allowBreakout, passedProps.allowRule, passedProps.allowHelpDialog, passedProps.allowPanel, passedProps.allowExtension, passedProps.allowConfluenceInlineComment, passedProps.allowTemplatePlaceholders, passedProps.allowDate, passedProps.allowLayouts, passedProps.allowStatus, passedProps.allowTextAlignment, passedProps.allowIndentation, passedProps.showIndentationButtons, passedProps.allowFindReplace, passedProps.allowBorderMark, passedProps.allowFragmentMark, passedProps.autoScrollIntoView, passedProps.elementBrowser, passedProps.maxContentSize, passedProps.saveOnEnter, passedProps.feedbackInfo, passedProps.mention, passedProps.mentionInsertDisplayName, passedProps.uploadErrorHandler, passedProps.waitForMediaUpload, passedProps.extensionHandlers, passedProps.allowTextColor, passedProps.allowTables, passedProps.insertMenuItems, passedProps.UNSAFE_cards, passedProps.smartLinks, passedProps.allowAnalyticsGASV3, passedProps.codeBlock, passedProps.textFormatting, passedProps.__livePage, passedProps.AppearanceComponent, passedProps.skipValidation]);
|
|
111
112
|
return memodProps;
|
|
112
113
|
};
|
|
113
114
|
export default useMemoEditorProps;
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
import { akEditorFullPageDefaultFontSize } from '@atlaskit/editor-shared-styles';
|
|
2
|
+
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
3
|
+
import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
|
|
4
|
+
|
|
2
5
|
/**
|
|
3
6
|
* @param appearance
|
|
4
7
|
* @returns default font size if valid
|
|
5
8
|
*/
|
|
6
|
-
export function getBaseFontSize(appearance) {
|
|
9
|
+
export function getBaseFontSize(appearance, contentMode) {
|
|
10
|
+
if (expValEquals('cc_editor_ai_content_mode', 'variant', 'test')) {
|
|
11
|
+
if (contentMode === 'dense') {
|
|
12
|
+
var baseFontSize = expVal('cc_editor_ai_content_mode', 'baseFontSize', 13);
|
|
13
|
+
return baseFontSize;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
7
16
|
if (appearance === undefined) {
|
|
8
17
|
return akEditorFullPageDefaultFontSize;
|
|
9
18
|
}
|
|
@@ -7,7 +7,6 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
|
7
7
|
|
|
8
8
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
9
9
|
import { jsx } from '@emotion/react';
|
|
10
|
-
import { IntlProvider } from 'react-intl-next';
|
|
11
10
|
import { browser } from '@atlaskit/editor-common/browser';
|
|
12
11
|
import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
|
|
13
12
|
import { ContextPanelWidthProvider } from '@atlaskit/editor-common/ui';
|
|
@@ -144,9 +143,7 @@ export var FullPageEditor = function FullPageEditor(props) {
|
|
|
144
143
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
|
|
145
144
|
'--ak-editor-fullpage-toolbar-height': FULL_PAGE_EDITOR_TOOLBAR_HEIGHT()
|
|
146
145
|
}
|
|
147
|
-
}, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(
|
|
148
|
-
locale: "en"
|
|
149
|
-
}, jsx(FullPageToolbarNext, {
|
|
146
|
+
}, !isEditorToolbarHidden && (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true) ? jsx(FullPageToolbarNext, {
|
|
150
147
|
disabled: expValEquals('platform_editor_toolbar_aifc_patch_4', 'isEnabled', true) ? !!props.disabled : undefined,
|
|
151
148
|
toolbarDockingPosition: toolbarDockingPosition !== null && toolbarDockingPosition !== void 0 ? toolbarDockingPosition : toolbarDocking,
|
|
152
149
|
beforeIcon: props.primaryToolbarIconBefore,
|
|
@@ -157,7 +154,7 @@ export var FullPageEditor = function FullPageEditor(props) {
|
|
|
157
154
|
popupsScrollableElement: props.popupsScrollableElement,
|
|
158
155
|
showKeyline: showKeyline,
|
|
159
156
|
customPrimaryToolbarComponents: props.customPrimaryToolbarComponents
|
|
160
|
-
})
|
|
157
|
+
}) : jsx(FullPageToolbar, {
|
|
161
158
|
appearance: props.appearance,
|
|
162
159
|
editorAPI: editorAPI,
|
|
163
160
|
beforeIcon: props.primaryToolbarIconBefore,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export var name = "@atlaskit/editor-core";
|
|
2
|
-
export var version = "
|
|
2
|
+
export var version = "0.0.0-development";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { EditorAppearance } from '@atlaskit/editor-common/types';
|
|
1
|
+
import type { EditorAppearance, EditorContentMode } from '@atlaskit/editor-common/types';
|
|
2
2
|
/**
|
|
3
3
|
* @param appearance
|
|
4
4
|
* @returns default font size if valid
|
|
5
5
|
*/
|
|
6
|
-
export declare function getBaseFontSize(appearance?: EditorAppearance): number | undefined;
|
|
6
|
+
export declare function getBaseFontSize(appearance?: EditorAppearance, contentMode?: EditorContentMode): number | undefined;
|
|
@@ -55,6 +55,18 @@ interface EditorBaseProps {
|
|
|
55
55
|
appearance?: EditorAppearance;
|
|
56
56
|
assistiveLabel?: string;
|
|
57
57
|
contentComponents?: ContentComponents;
|
|
58
|
+
/**
|
|
59
|
+
* **WARNING** this attribute is not supported outside of Confluence Full Page editors
|
|
60
|
+
*
|
|
61
|
+
* Configures the content mode of the editor.
|
|
62
|
+
*
|
|
63
|
+
* - `"standard"` | `undefined` - normal content mode <- Default
|
|
64
|
+
* - `"dense"` - content in editor has reduced size
|
|
65
|
+
*
|
|
66
|
+
* @private
|
|
67
|
+
* @deprecated this attribute is not supported outside of Confluence Full Page editors
|
|
68
|
+
*/
|
|
69
|
+
contentMode?: 'standard' | 'dense' | undefined;
|
|
58
70
|
contentTransformerProvider?: (schema: Schema) => Transformer<string>;
|
|
59
71
|
contextPanel?: ReactComponents;
|
|
60
72
|
defaultValue?: Node | string | Object;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { EditorAppearance } from '@atlaskit/editor-common/types';
|
|
1
|
+
import type { EditorAppearance, EditorContentMode } from '@atlaskit/editor-common/types';
|
|
2
2
|
/**
|
|
3
3
|
* @param appearance
|
|
4
4
|
* @returns default font size if valid
|
|
5
5
|
*/
|
|
6
|
-
export declare function getBaseFontSize(appearance?: EditorAppearance): number | undefined;
|
|
6
|
+
export declare function getBaseFontSize(appearance?: EditorAppearance, contentMode?: EditorContentMode): number | undefined;
|
|
@@ -55,6 +55,18 @@ interface EditorBaseProps {
|
|
|
55
55
|
appearance?: EditorAppearance;
|
|
56
56
|
assistiveLabel?: string;
|
|
57
57
|
contentComponents?: ContentComponents;
|
|
58
|
+
/**
|
|
59
|
+
* **WARNING** this attribute is not supported outside of Confluence Full Page editors
|
|
60
|
+
*
|
|
61
|
+
* Configures the content mode of the editor.
|
|
62
|
+
*
|
|
63
|
+
* - `"standard"` | `undefined` - normal content mode <- Default
|
|
64
|
+
* - `"dense"` - content in editor has reduced size
|
|
65
|
+
*
|
|
66
|
+
* @private
|
|
67
|
+
* @deprecated this attribute is not supported outside of Confluence Full Page editors
|
|
68
|
+
*/
|
|
69
|
+
contentMode?: 'standard' | 'dense' | undefined;
|
|
58
70
|
contentTransformerProvider?: (schema: Schema) => Transformer<string>;
|
|
59
71
|
contextPanel?: ReactComponents;
|
|
60
72
|
defaultValue?: Node | string | Object;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-core",
|
|
3
|
-
"version": "213.
|
|
3
|
+
"version": "213.3.0",
|
|
4
4
|
"description": "A package contains Atlassian editor core functionality",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@atlaskit/platform-feature-flags-react": "^0.3.0",
|
|
65
65
|
"@atlaskit/react-ufo": "^4.7.0",
|
|
66
66
|
"@atlaskit/task-decision": "^19.2.0",
|
|
67
|
-
"@atlaskit/tmp-editor-statsig": "^12.
|
|
67
|
+
"@atlaskit/tmp-editor-statsig": "^12.25.0",
|
|
68
68
|
"@atlaskit/tokens": "^6.3.0",
|
|
69
69
|
"@atlaskit/tooltip": "^20.4.0",
|
|
70
70
|
"@atlaskit/width-detector": "^5.0.0",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"uuid": "^3.1.0"
|
|
82
82
|
},
|
|
83
83
|
"peerDependencies": {
|
|
84
|
-
"@atlaskit/editor-common": "^109.
|
|
84
|
+
"@atlaskit/editor-common": "^109.9.0",
|
|
85
85
|
"@atlaskit/link-provider": "^4.0.0",
|
|
86
86
|
"@atlaskit/media-core": "^37.0.0",
|
|
87
87
|
"react": "^18.2.0",
|
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
"@atlaskit/media-test-helpers": "^39.0.0",
|
|
106
106
|
"@atlaskit/modal-dialog": "^14.3.0",
|
|
107
107
|
"@atlaskit/primitives": "^14.14.0",
|
|
108
|
-
"@atlaskit/renderer": "^123.
|
|
108
|
+
"@atlaskit/renderer": "^123.3.0",
|
|
109
109
|
"@atlaskit/section-message": "^8.7.0",
|
|
110
110
|
"@atlaskit/smart-card": "^41.0.0",
|
|
111
111
|
"@atlaskit/synchrony-test-helpers": "workspace:^",
|