@atlaskit/editor-plugin-layout 17.1.3 → 17.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/dist/cjs/layoutPlugin.js +16 -16
- package/dist/cjs/nodeviews/index.js +3 -3
- package/dist/cjs/pm-plugins/actions.js +13 -13
- package/dist/cjs/pm-plugins/main.js +7 -7
- package/dist/cjs/pm-plugins/utils/index.js +2 -2
- package/dist/cjs/ui/global-styles.js +3 -3
- package/dist/cjs/ui/toolbar.js +3 -3
- package/dist/es2019/layoutPlugin.js +7 -7
- package/dist/es2019/nodeviews/index.js +1 -1
- package/dist/es2019/pm-plugins/actions.js +1 -1
- package/dist/es2019/pm-plugins/main.js +1 -1
- package/dist/es2019/pm-plugins/utils/index.js +1 -1
- package/dist/es2019/ui/global-styles.js +1 -1
- package/dist/es2019/ui/toolbar.js +1 -1
- package/dist/esm/layoutPlugin.js +7 -7
- package/dist/esm/nodeviews/index.js +1 -1
- package/dist/esm/pm-plugins/actions.js +1 -1
- package/dist/esm/pm-plugins/main.js +1 -1
- package/dist/esm/pm-plugins/utils/index.js +1 -1
- package/dist/esm/ui/global-styles.js +1 -1
- package/dist/esm/ui/toolbar.js +1 -1
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-layout
|
|
2
2
|
|
|
3
|
+
## 17.1.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 17.1.4
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`4df90d6af7dc0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4df90d6af7dc0) -
|
|
14
|
+
Clean up experiment `platform_editor_layout_keywords` and retain the launched layout search
|
|
15
|
+
keywords.
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
3
18
|
## 17.1.3
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
package/dist/cjs/layoutPlugin.js
CHANGED
|
@@ -17,7 +17,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
|
17
17
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
18
18
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
19
19
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
20
|
-
var
|
|
20
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
21
21
|
var _actions = require("./pm-plugins/actions");
|
|
22
22
|
var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
|
|
23
23
|
var _main = _interopRequireDefault(require("./pm-plugins/main"));
|
|
@@ -40,7 +40,7 @@ var LAYOUT_SECTION_NODE_NAME = 'layoutSection';
|
|
|
40
40
|
*/
|
|
41
41
|
var selectIntoLayoutSection = exports.selectIntoLayoutSection = function selectIntoLayoutSection(tr) {
|
|
42
42
|
var _nodeWithPos$node$fir;
|
|
43
|
-
if (!(0,
|
|
43
|
+
if (!(0, _editorExperiment.editorExperiment)('single_column_layouts', true)) {
|
|
44
44
|
return tr;
|
|
45
45
|
}
|
|
46
46
|
var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
|
|
@@ -64,12 +64,12 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
64
64
|
options = _ref$config === void 0 ? {} : _ref$config,
|
|
65
65
|
api = _ref.api;
|
|
66
66
|
var blockControlMigrationEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_block_control_migration');
|
|
67
|
-
var isAdvancedLayoutEnabled = (0,
|
|
68
|
-
var allowAdvancedSingleColumnLayout = isAdvancedLayoutEnabled && (0,
|
|
67
|
+
var isAdvancedLayoutEnabled = (0, _editorExperiment.editorExperiment)('advanced_layouts', true);
|
|
68
|
+
var allowAdvancedSingleColumnLayout = isAdvancedLayoutEnabled && (0, _editorExperiment.editorExperiment)('single_column_layouts', true, {
|
|
69
69
|
exposure: true
|
|
70
70
|
});
|
|
71
71
|
var isRegisteredSlashCommandEnabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command') && isAdvancedLayoutEnabled;
|
|
72
|
-
if ((0,
|
|
72
|
+
if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
|
|
73
73
|
var _api$blockMenu;
|
|
74
74
|
api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 || _api$blockMenu.actions.registerBlockMenuComponents([{
|
|
75
75
|
type: 'block-menu-item',
|
|
@@ -103,7 +103,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
103
103
|
nodes: function nodes() {
|
|
104
104
|
return [{
|
|
105
105
|
name: 'layoutSection',
|
|
106
|
-
node: (0,
|
|
106
|
+
node: (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? (0, _fg.fg)('platform_editor_adf_with_localid') ? _schema.layoutSectionWithSingleColumnLocalId : _schema.layoutSectionWithSingleColumn : (0, _fg.fg)('platform_editor_adf_with_localid') ? _adfSchema.layoutSectionWithLocalId : _adfSchema.layoutSection
|
|
107
107
|
}, {
|
|
108
108
|
name: 'layoutColumn',
|
|
109
109
|
node: (0, _fg.fg)('platform_editor_adf_with_localid') ? _adfSchema.layoutColumnWithLocalId : _adfSchema.layoutColumn
|
|
@@ -127,7 +127,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
127
127
|
}
|
|
128
128
|
});
|
|
129
129
|
}
|
|
130
|
-
if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && (0,
|
|
130
|
+
if ((options.editorAppearance === 'full-page' || options.editorAppearance === 'full-width' || options.editorAppearance === 'max') && api && (0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
131
131
|
plugins.push({
|
|
132
132
|
name: 'layoutResizing',
|
|
133
133
|
plugin: function plugin(_ref2) {
|
|
@@ -154,7 +154,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
154
154
|
addSidebarLayouts = layoutState.addSidebarLayouts,
|
|
155
155
|
allowSingleColumnLayout = layoutState.allowSingleColumnLayout,
|
|
156
156
|
isResizing = layoutState.isResizing;
|
|
157
|
-
var shouldHideToolbar = isResizing && (0,
|
|
157
|
+
var shouldHideToolbar = isResizing && (0, _editorExperiment.editorExperiment)('single_column_layouts', true);
|
|
158
158
|
if (pos !== null && !shouldHideToolbar) {
|
|
159
159
|
return (0, _toolbar.buildToolbar)(state, intl, pos, allowBreakout, addSidebarLayouts, allowSingleColumnLayout, allowAdvancedSingleColumnLayout, api);
|
|
160
160
|
}
|
|
@@ -176,12 +176,12 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
176
176
|
})(tr);
|
|
177
177
|
return tr;
|
|
178
178
|
};
|
|
179
|
-
if ((0,
|
|
179
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
180
180
|
var advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
|
|
181
181
|
id: 'onecolumnlayout',
|
|
182
182
|
title: formatMessage(_messages.layoutMessages.singleColumnAdvancedLayout),
|
|
183
183
|
description: formatMessage(_messages.toolbarInsertBlockMessages.singleColumnsDescriptionAdvancedLayout),
|
|
184
|
-
keywords:
|
|
184
|
+
keywords: ['layout', 'column', 'section', 'col', 'single column'],
|
|
185
185
|
priority: 1100,
|
|
186
186
|
icon: function icon() {
|
|
187
187
|
return /*#__PURE__*/_react.default.createElement(_quickInsert.IconOneColumnLayout, null);
|
|
@@ -211,7 +211,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
211
211
|
description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
|
|
212
212
|
numberOfColumns: descriptionColumnCount
|
|
213
213
|
}),
|
|
214
|
-
keywords:
|
|
214
|
+
keywords: ['layout', 'column', 'section', 'col', keyword],
|
|
215
215
|
priority: 1100,
|
|
216
216
|
icon: Icon,
|
|
217
217
|
action: function action(insert, state) {
|
|
@@ -270,7 +270,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
270
270
|
description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
|
|
271
271
|
numberOfColumns: 'two'
|
|
272
272
|
}),
|
|
273
|
-
keywords:
|
|
273
|
+
keywords: ['layout', 'column', 'section', 'col', 'two column'],
|
|
274
274
|
priority: 1100,
|
|
275
275
|
icon: function icon() {
|
|
276
276
|
return /*#__PURE__*/_react.default.createElement(_quickInsert.IconTwoColumnLayout, null);
|
|
@@ -291,7 +291,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
291
291
|
description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
|
|
292
292
|
numberOfColumns: 'three'
|
|
293
293
|
}),
|
|
294
|
-
keywords:
|
|
294
|
+
keywords: ['layout', 'column', 'section', 'col', 'three column'],
|
|
295
295
|
priority: 1100,
|
|
296
296
|
icon: function icon() {
|
|
297
297
|
return /*#__PURE__*/_react.default.createElement(_quickInsert.IconThreeColumnLayout, null);
|
|
@@ -312,7 +312,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
312
312
|
description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
|
|
313
313
|
numberOfColumns: 'four'
|
|
314
314
|
}),
|
|
315
|
-
keywords:
|
|
315
|
+
keywords: ['layout', 'column', 'section', 'col', 'four column'],
|
|
316
316
|
priority: 1100,
|
|
317
317
|
icon: function icon() {
|
|
318
318
|
return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFourColumnLayout, null);
|
|
@@ -333,7 +333,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
333
333
|
description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
|
|
334
334
|
numberOfColumns: 'five'
|
|
335
335
|
}),
|
|
336
|
-
keywords:
|
|
336
|
+
keywords: ['layout', 'column', 'section', 'col', 'five column'],
|
|
337
337
|
priority: 1100,
|
|
338
338
|
icon: function icon() {
|
|
339
339
|
return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFiveColumnLayout, null);
|
|
@@ -382,7 +382,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
|
|
|
382
382
|
popupsMountPoint = _ref5.popupsMountPoint,
|
|
383
383
|
popupsBoundariesElement = _ref5.popupsBoundariesElement,
|
|
384
384
|
popupsScrollableElement = _ref5.popupsScrollableElement;
|
|
385
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0,
|
|
385
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? /*#__PURE__*/_react.default.createElement(_globalStyles.GlobalStylesWrapper, null) : null, (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) && editorView ? /*#__PURE__*/_react.default.createElement(_LayoutColumnMenu.LayoutColumnMenu, {
|
|
386
386
|
api: api,
|
|
387
387
|
editorView: editorView,
|
|
388
388
|
mountTo: popupsMountPoint,
|
|
@@ -21,7 +21,7 @@ var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-
|
|
|
21
21
|
var _model = require("@atlaskit/editor-prosemirror/model");
|
|
22
22
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
23
23
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
24
|
-
var
|
|
24
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
25
25
|
var _utils = require("../pm-plugins/utils");
|
|
26
26
|
var _LayoutSSRReactContextsProvider = require("../ui/LayoutSSRReactContextsProvider");
|
|
27
27
|
var _utils2 = require("./utils");
|
|
@@ -84,11 +84,11 @@ var LayoutBreakoutResizer = function LayoutBreakoutResizer(_ref) {
|
|
|
84
84
|
editorView: view,
|
|
85
85
|
nodeType: "layoutSection",
|
|
86
86
|
getEditorWidth: getEditorWidth,
|
|
87
|
-
disabled: (0,
|
|
87
|
+
disabled: (0, _editorExperiment.editorExperiment)('platform_editor_breakout_resizing', true) ? true : editorDisabled === true || !isBreakoutAvailable(view.state.schema),
|
|
88
88
|
hidden: interactionState === 'hasNotHadInteraction' && (0, _expValEquals.expValEquals)('platform_editor_breakout_interaction_rerender', 'isEnabled', true),
|
|
89
89
|
parentRef: parentRef,
|
|
90
90
|
editorAnalyticsApi: pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 ? void 0 : _pluginInjectionApi$a.actions,
|
|
91
|
-
displayGuidelines: (0,
|
|
91
|
+
displayGuidelines: (0, _editorExperiment.editorExperiment)('single_column_layouts', true) ? displayGuidelines : undefined,
|
|
92
92
|
displayGapCursor: displayGapCursor
|
|
93
93
|
// eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
|
|
94
94
|
,
|
|
@@ -18,7 +18,7 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
|
|
|
18
18
|
var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
19
19
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
20
20
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
21
|
-
var
|
|
21
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
22
22
|
var _consts = require("./consts");
|
|
23
23
|
var _pluginKey = require("./plugin-key");
|
|
24
24
|
var _layoutColumnDistribution = require("./utils/layout-column-distribution");
|
|
@@ -29,7 +29,7 @@ var ONE_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = ['single'];
|
|
|
29
29
|
var TWO_COL_LAYOUTS = exports.TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
|
|
30
30
|
var THREE_COL_LAYOUTS = exports.THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
|
|
31
31
|
var getWidthsForPreset = function getWidthsForPreset(presetLayout) {
|
|
32
|
-
if ((0,
|
|
32
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
33
33
|
switch (presetLayout) {
|
|
34
34
|
case 'single':
|
|
35
35
|
return [100];
|
|
@@ -92,7 +92,7 @@ var getPresetLayout = exports.getPresetLayout = function getPresetLayout(section
|
|
|
92
92
|
var widths = (0, _utils.mapChildren)(section, function (column) {
|
|
93
93
|
return column.attrs.width;
|
|
94
94
|
}).join(',');
|
|
95
|
-
if ((0,
|
|
95
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
96
96
|
switch (widths) {
|
|
97
97
|
case '100':
|
|
98
98
|
return 'single';
|
|
@@ -137,7 +137,7 @@ var isLayoutOutOfSync = function isLayoutOutOfSync(node, presetLayout) {
|
|
|
137
137
|
return node.childCount !== getWidthsForPreset(presetLayout).length;
|
|
138
138
|
};
|
|
139
139
|
var getSelectedLayout = exports.getSelectedLayout = function getSelectedLayout(maybeLayoutSection, current) {
|
|
140
|
-
if (maybeLayoutSection && isLayoutOutOfSync(maybeLayoutSection, current) && (0,
|
|
140
|
+
if (maybeLayoutSection && isLayoutOutOfSync(maybeLayoutSection, current) && (0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
141
141
|
return getDefaultPresetLayout(maybeLayoutSection);
|
|
142
142
|
}
|
|
143
143
|
if (maybeLayoutSection && getPresetLayout(maybeLayoutSection)) {
|
|
@@ -202,7 +202,7 @@ var insertLayoutColumnsWithAnalytics = exports.insertLayoutColumnsWithAnalytics
|
|
|
202
202
|
* Add a column to the right of existing layout
|
|
203
203
|
*/
|
|
204
204
|
function addColumn(schema, pos) {
|
|
205
|
-
if ((0,
|
|
205
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', false)) {
|
|
206
206
|
return function (tr) {
|
|
207
207
|
tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos), schema.nodes.layoutColumn.createAndFill());
|
|
208
208
|
};
|
|
@@ -216,7 +216,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
|
|
|
216
216
|
// check if the column only contains a paragraph with a placeholder text
|
|
217
217
|
// if so, remove the whole column, otherwise just remove the paragraph
|
|
218
218
|
if ((0, _utils.isEmptyDocument)(column)) {
|
|
219
|
-
var fromPos = (0,
|
|
219
|
+
var fromPos = (0, _editorExperiment.editorExperiment)('single_column_layouts', true) ? columnPos : columnPos - 1;
|
|
220
220
|
tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), _model.Slice.empty);
|
|
221
221
|
} else {
|
|
222
222
|
tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), _model.Slice.empty);
|
|
@@ -341,7 +341,7 @@ function forceColumnWidths(state, tr, pos, presetLayout) {
|
|
|
341
341
|
* its column structure and widths, then restoring the original selection.
|
|
342
342
|
*/
|
|
343
343
|
function forceSectionToPresetLayout(state, node, pos, presetLayout) {
|
|
344
|
-
var forceColumnStructureFn = (0,
|
|
344
|
+
var forceColumnStructureFn = (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? forceColumnStructureNew : forceColumnStructure;
|
|
345
345
|
var tr = forceColumnStructureFn(state, node, pos, presetLayout);
|
|
346
346
|
|
|
347
347
|
// save the selection here, since forcing column widths causes a change over the
|
|
@@ -390,7 +390,7 @@ var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorA
|
|
|
390
390
|
};
|
|
391
391
|
};
|
|
392
392
|
function layoutNeedChanges(node) {
|
|
393
|
-
if ((0,
|
|
393
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
394
394
|
// Custom widths that sum to 100% are valid and should not be forced back to presets.
|
|
395
395
|
return !isValidLayoutWidthDistributions(node);
|
|
396
396
|
}
|
|
@@ -421,7 +421,7 @@ function getLayoutChange(node, pos, schema) {
|
|
|
421
421
|
if (!layoutNeedChanges(node)) {
|
|
422
422
|
return;
|
|
423
423
|
}
|
|
424
|
-
var presetLayout = (0,
|
|
424
|
+
var presetLayout = (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? getDefaultPresetLayout(node) : node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
|
|
425
425
|
var fixedColumns = columnWidth(node, schema, getWidthsForPreset(presetLayout));
|
|
426
426
|
return {
|
|
427
427
|
from: pos + 1,
|
|
@@ -473,12 +473,12 @@ var fixColumnStructure = exports.fixColumnStructure = function fixColumnStructur
|
|
|
473
473
|
if (node) {
|
|
474
474
|
if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
|
|
475
475
|
// Valid custom widths may use a different column count from the selected preset.
|
|
476
|
-
if ((0,
|
|
476
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true) && isValidLayoutWidthDistributions(node)) {
|
|
477
477
|
return;
|
|
478
478
|
}
|
|
479
479
|
return forceSectionToPresetLayout(state, node, pos, selectedLayout);
|
|
480
480
|
}
|
|
481
|
-
if (!isValidLayoutWidthDistributions(node) && (0,
|
|
481
|
+
if (!isValidLayoutWidthDistributions(node) && (0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
482
482
|
return forceSectionToPresetLayout(state, node, pos, selectedLayout);
|
|
483
483
|
}
|
|
484
484
|
}
|
|
@@ -511,7 +511,7 @@ var deleteActiveLayoutNode = exports.deleteActiveLayoutNode = function deleteAct
|
|
|
511
511
|
};
|
|
512
512
|
};
|
|
513
513
|
var formatLayoutName = function formatLayoutName(layout) {
|
|
514
|
-
if ((0,
|
|
514
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
515
515
|
switch (layout) {
|
|
516
516
|
case 'single':
|
|
517
517
|
return _analytics.LAYOUT_TYPE.SINGLE_COL;
|
|
@@ -615,7 +615,7 @@ var mapLayoutColumnPreservedSelection = function mapLayoutColumnPreservedSelecti
|
|
|
615
615
|
* Returns the active maximum layout column count for the current advanced layouts experiment state.
|
|
616
616
|
*/
|
|
617
617
|
function getEffectiveMaxLayoutColumns() {
|
|
618
|
-
return (0,
|
|
618
|
+
return (0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? _consts.MAX_LAYOUT_COLUMNS : _consts.MAX_STANDARD_LAYOUT_COLUMNS;
|
|
619
619
|
}
|
|
620
620
|
var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAPI) {
|
|
621
621
|
var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU;
|
|
@@ -17,7 +17,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
|
|
|
17
17
|
var _utils2 = require("@atlaskit/editor-prosemirror/utils");
|
|
18
18
|
var _view2 = require("@atlaskit/editor-prosemirror/view");
|
|
19
19
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
20
|
-
var
|
|
20
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
21
21
|
var _actions = require("./actions");
|
|
22
22
|
var _columnResizeDivider = require("./column-resize-divider");
|
|
23
23
|
var _consts = require("./consts");
|
|
@@ -35,7 +35,7 @@ var DEFAULT_LAYOUT = exports.DEFAULT_LAYOUT = 'two_equal';
|
|
|
35
35
|
* Returns `true` when it placed a selection and consumed the click, else `false`.
|
|
36
36
|
*/
|
|
37
37
|
var applyBlankSpaceGapCursor = function applyBlankSpaceGapCursor(view, event) {
|
|
38
|
-
if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) || !(0,
|
|
38
|
+
if (!(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) || !(0, _editorExperiment.editorExperiment)('advanced_layouts', true)) {
|
|
39
39
|
return false;
|
|
40
40
|
}
|
|
41
41
|
var gapTarget = (0, _utils3.getGapCursorTargetForBlankSpaceClick)(view, event);
|
|
@@ -195,7 +195,7 @@ var reduceLayoutColumnMenuState = function reduceLayoutColumnMenuState(pluginSta
|
|
|
195
195
|
// see packages/editor/editor-plugin-layout-tests/src/__tests__/unit/delete.ts
|
|
196
196
|
var handleDeleteLayoutColumn = function handleDeleteLayoutColumn(state, dispatch) {
|
|
197
197
|
var sel = state.selection;
|
|
198
|
-
if (sel instanceof _state.NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && (0,
|
|
198
|
+
if (sel instanceof _state.NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && (0, _editorExperiment.editorExperiment)('advanced_layouts', true) && !(0, _editorExperiment.editorExperiment)('single_column_layouts', true)) {
|
|
199
199
|
var _sel$$from$parent$las, _sel$$from$parent$fir;
|
|
200
200
|
var tr = state.tr;
|
|
201
201
|
var layoutContentFragment = sel.$from.parentOffset === 0 ? _model.Fragment.from((_sel$$from$parent$las = sel.$from.parent.lastChild) === null || _sel$$from$parent$las === void 0 ? void 0 : _sel$$from$parent$las.content) : _model.Fragment.from((_sel$$from$parent$fir = sel.$from.parent.firstChild) === null || _sel$$from$parent$fir === void 0 ? void 0 : _sel$$from$parent$fir.content);
|
|
@@ -258,7 +258,7 @@ var _default = exports.default = function _default(options, editorAnalyticsAPI)
|
|
|
258
258
|
type: 'clearDangerPreview'
|
|
259
259
|
});
|
|
260
260
|
}
|
|
261
|
-
var isResizing = (0,
|
|
261
|
+
var isResizing = (0, _editorExperiment.editorExperiment)('single_column_layouts', true) ? (_tr$getMeta = tr.getMeta('is-resizer-resizing')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : (_pluginKey$getState = _pluginKey.pluginKey.getState(oldState)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.isResizing : false;
|
|
262
262
|
nextPluginState = reduceLayoutColumnMenuState(nextPluginState, {
|
|
263
263
|
isResizing: isResizing,
|
|
264
264
|
type: 'setResizeState'
|
|
@@ -276,7 +276,7 @@ var _default = exports.default = function _default(options, editorAnalyticsAPI)
|
|
|
276
276
|
decorations: function decorations(state) {
|
|
277
277
|
var layoutState = _pluginKey.pluginKey.getState(state);
|
|
278
278
|
var isLayoutResizingPluginAvailable = _resizing.pluginKey.get(state) !== undefined;
|
|
279
|
-
if ((0,
|
|
279
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true) && isLayoutResizingPluginAvailable) {
|
|
280
280
|
var dividerDecorations = (0, _columnResizeDivider.getColumnDividerDecorations)(state, editorViewRef, editorAnalyticsAPI);
|
|
281
281
|
var selectedDecorations = layoutState.pos !== null ? getNodeDecoration(layoutState.pos, state.doc.nodeAt(layoutState.pos)) : [];
|
|
282
282
|
var _dangerPreviewDecorations = getDangerPreviewDecorations(state, layoutState.dangerPreviewLayoutColumnPositions);
|
|
@@ -379,13 +379,13 @@ var _default = exports.default = function _default(options, editorAnalyticsAPI)
|
|
|
379
379
|
changes.push(change);
|
|
380
380
|
}
|
|
381
381
|
});
|
|
382
|
-
if ((0,
|
|
382
|
+
if ((0, _editorExperiment.editorExperiment)('advanced_layouts', true) && changes.length === 1) {
|
|
383
383
|
var _change$slice$content, _change$slice$content2;
|
|
384
384
|
var change = changes[0];
|
|
385
385
|
// When editorExperiment('single_column_layouts', true) is on
|
|
386
386
|
// delete can create a single column layout
|
|
387
387
|
// otherwise we replace the single column layout with its content
|
|
388
|
-
if (!(0,
|
|
388
|
+
if (!(0, _editorExperiment.editorExperiment)('single_column_layouts', true) && change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === _consts.EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
|
|
389
389
|
var tr = newState.tr;
|
|
390
390
|
var content = change.slice.content.firstChild.content;
|
|
391
391
|
tr.replaceWith(change.from - 1, change.to, content);
|
|
@@ -10,7 +10,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
|
|
|
10
10
|
var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
|
|
11
11
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
12
12
|
var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
|
|
13
|
-
var
|
|
13
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
14
14
|
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
|
|
15
15
|
|
|
16
16
|
var getMaybeLayoutSection = exports.getMaybeLayoutSection = function getMaybeLayoutSection(state) {
|
|
@@ -18,7 +18,7 @@ var getMaybeLayoutSection = exports.getMaybeLayoutSection = function getMaybeLay
|
|
|
18
18
|
layoutSection = _state$schema$nodes.layoutSection,
|
|
19
19
|
layoutColumn = _state$schema$nodes.layoutColumn,
|
|
20
20
|
selection = state.selection;
|
|
21
|
-
var isLayoutColumn = (0,
|
|
21
|
+
var isLayoutColumn = (0, _editorExperiment.editorExperiment)('advanced_layouts', true) && (0, _utils.findSelectedNodeOfType)([layoutColumn])(selection);
|
|
22
22
|
|
|
23
23
|
// When selection is on layoutColumn, we want to hide floating toolbar, hence don't return layoutSection node here
|
|
24
24
|
return isLayoutColumn ? undefined : (0, _utils.findParentNodeOfType)(layoutSection)(selection) || (0, _utils.findSelectedNodeOfType)([layoutSection])(selection);
|
|
@@ -10,7 +10,7 @@ var _react = require("react");
|
|
|
10
10
|
var _react2 = require("@emotion/react");
|
|
11
11
|
var _reactIntl = require("react-intl");
|
|
12
12
|
var _messages = require("@atlaskit/editor-common/messages");
|
|
13
|
-
var
|
|
13
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
14
14
|
/**
|
|
15
15
|
* @jsxRuntime classic
|
|
16
16
|
* @jsx jsx
|
|
@@ -31,7 +31,7 @@ var layoutColumnDangerPreviewStyle = (0, _react2.css)({
|
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
var getPlaceholderStyle = function getPlaceholderStyle(message) {
|
|
34
|
-
if ((0,
|
|
34
|
+
if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
|
|
35
35
|
return (0, _react2.css)((0, _defineProperty2.default)({}, "".concat(PLACEHOLDER_SELECTOR), {
|
|
36
36
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-important-styles -- Ignored via go/DSP-18766
|
|
37
37
|
'&::before': {
|
|
@@ -64,7 +64,7 @@ var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWra
|
|
|
64
64
|
var _useIntl = (0, _reactIntl.useIntl)(),
|
|
65
65
|
formatMessage = _useIntl.formatMessage;
|
|
66
66
|
var placeholderStyle = (0, _react.useMemo)(function () {
|
|
67
|
-
var placeholderText = (0,
|
|
67
|
+
var placeholderText = (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? _messages.layoutMessages.controlslayoutPlaceholder : _messages.layoutMessages.layoutPlaceholder;
|
|
68
68
|
return getPlaceholderStyle(formatMessage(placeholderText));
|
|
69
69
|
}, [formatMessage]);
|
|
70
70
|
var globalStyles = (0, _react.useMemo)(function () {
|
package/dist/cjs/ui/toolbar.js
CHANGED
|
@@ -24,7 +24,7 @@ var _layoutTwoColumnsSidebarLeft = _interopRequireDefault(require("@atlaskit/ico
|
|
|
24
24
|
var _layoutTwoColumnsSidebarRight = _interopRequireDefault(require("@atlaskit/icon/core/layout-two-columns-sidebar-right"));
|
|
25
25
|
var _tableColumnsDistribute = _interopRequireDefault(require("@atlaskit/icon/core/table-columns-distribute"));
|
|
26
26
|
var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
|
|
27
|
-
var
|
|
27
|
+
var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
|
|
28
28
|
var _actions = require("../pm-plugins/actions");
|
|
29
29
|
var _layoutColumnDistribution = require("../pm-plugins/utils/layout-column-distribution");
|
|
30
30
|
var _LayoutColumnsIcon = require("./icons/LayoutColumnsIcon");
|
|
@@ -155,7 +155,7 @@ var iconPlaceholder = /*#__PURE__*/_react.default.createElement(_layoutTwoColumn
|
|
|
155
155
|
}); // TODO: ED-25466 - Replace with proper icon
|
|
156
156
|
|
|
157
157
|
var getLayoutColumnsIcons = function getLayoutColumnsIcons(colCount) {
|
|
158
|
-
if (!(0,
|
|
158
|
+
if (!(0, _editorExperiment.editorExperiment)('single_column_layouts', true) && !(0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
|
|
159
159
|
return undefined;
|
|
160
160
|
}
|
|
161
161
|
switch (colCount) {
|
|
@@ -355,7 +355,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(state, intl, pos
|
|
|
355
355
|
},
|
|
356
356
|
nodeType: nodeType,
|
|
357
357
|
groupLabel: intl.formatMessage(_messages.layoutMessages.floatingToolbarRadioGroupAriaLabel),
|
|
358
|
-
items: [].concat((0, _toConsumableArray2.default)((0,
|
|
358
|
+
items: [].concat((0, _toConsumableArray2.default)((0, _editorExperiment.editorExperiment)('advanced_layouts', true) ? getAdvancedLayoutItems({
|
|
359
359
|
addSidebarLayouts: addSidebarLayouts,
|
|
360
360
|
intl: intl,
|
|
361
361
|
editorAnalyticsAPI: editorAnalyticsAPI,
|
|
@@ -10,7 +10,7 @@ import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
|
|
|
10
10
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
11
11
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
12
12
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
13
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
14
14
|
import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn, distributeLayoutColumns, insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnDangerPreview, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
|
|
15
15
|
import { default as createLayoutKeymapPlugin } from './pm-plugins/keymap';
|
|
16
16
|
import { default as createLayoutPlugin } from './pm-plugins/main';
|
|
@@ -173,7 +173,7 @@ export const layoutPlugin = ({
|
|
|
173
173
|
id: 'onecolumnlayout',
|
|
174
174
|
title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
|
|
175
175
|
description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
|
|
176
|
-
keywords:
|
|
176
|
+
keywords: ['layout', 'column', 'section', 'col', 'single column'],
|
|
177
177
|
priority: 1100,
|
|
178
178
|
icon: () => /*#__PURE__*/React.createElement(IconOneColumnLayout, null),
|
|
179
179
|
action(insert, state) {
|
|
@@ -201,7 +201,7 @@ export const layoutPlugin = ({
|
|
|
201
201
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
202
202
|
numberOfColumns: descriptionColumnCount
|
|
203
203
|
}),
|
|
204
|
-
keywords:
|
|
204
|
+
keywords: ['layout', 'column', 'section', 'col', keyword],
|
|
205
205
|
priority: 1100,
|
|
206
206
|
icon: Icon,
|
|
207
207
|
action(insert, state) {
|
|
@@ -251,7 +251,7 @@ export const layoutPlugin = ({
|
|
|
251
251
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
252
252
|
numberOfColumns: 'two'
|
|
253
253
|
}),
|
|
254
|
-
keywords:
|
|
254
|
+
keywords: ['layout', 'column', 'section', 'col', 'two column'],
|
|
255
255
|
priority: 1100,
|
|
256
256
|
icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
|
|
257
257
|
action(insert, state) {
|
|
@@ -270,7 +270,7 @@ export const layoutPlugin = ({
|
|
|
270
270
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
271
271
|
numberOfColumns: 'three'
|
|
272
272
|
}),
|
|
273
|
-
keywords:
|
|
273
|
+
keywords: ['layout', 'column', 'section', 'col', 'three column'],
|
|
274
274
|
priority: 1100,
|
|
275
275
|
icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
|
|
276
276
|
action(insert, state) {
|
|
@@ -289,7 +289,7 @@ export const layoutPlugin = ({
|
|
|
289
289
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
290
290
|
numberOfColumns: 'four'
|
|
291
291
|
}),
|
|
292
|
-
keywords:
|
|
292
|
+
keywords: ['layout', 'column', 'section', 'col', 'four column'],
|
|
293
293
|
priority: 1100,
|
|
294
294
|
icon: () => /*#__PURE__*/React.createElement(IconFourColumnLayout, null),
|
|
295
295
|
action(insert, state) {
|
|
@@ -308,7 +308,7 @@ export const layoutPlugin = ({
|
|
|
308
308
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
309
309
|
numberOfColumns: 'five'
|
|
310
310
|
}),
|
|
311
|
-
keywords:
|
|
311
|
+
keywords: ['layout', 'column', 'section', 'col', 'five column'],
|
|
312
312
|
priority: 1100,
|
|
313
313
|
icon: () => /*#__PURE__*/React.createElement(IconFiveColumnLayout, null),
|
|
314
314
|
action(insert, state) {
|
|
@@ -7,7 +7,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
|
|
|
7
7
|
import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
|
|
8
8
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
9
9
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
10
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
10
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
11
11
|
import { selectIntoLayout } from '../pm-plugins/utils';
|
|
12
12
|
import { LayoutSSRReactContextsProvider } from '../ui/LayoutSSRReactContextsProvider';
|
|
13
13
|
import { isEmptyLayout } from './utils';
|
|
@@ -7,7 +7,7 @@ import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
|
|
|
7
7
|
import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
|
|
8
8
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
9
9
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
10
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
10
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
11
11
|
import { DEFAULT_LAYOUT_COLUMN_VALIGN, EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
|
|
12
12
|
import { pluginKey } from './plugin-key';
|
|
13
13
|
import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';
|
|
@@ -8,7 +8,7 @@ import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosem
|
|
|
8
8
|
import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
|
|
9
9
|
import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
10
10
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
11
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
11
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
12
12
|
import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
|
|
13
13
|
import { getColumnDividerDecorations } from './column-resize-divider';
|
|
14
14
|
import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
|
|
@@ -5,7 +5,7 @@ import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-p
|
|
|
5
5
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
6
6
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
7
7
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
8
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
8
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
9
9
|
export const getMaybeLayoutSection = state => {
|
|
10
10
|
const {
|
|
11
11
|
schema: {
|
|
@@ -8,7 +8,7 @@ import { useMemo } from 'react';
|
|
|
8
8
|
import { Global, css, jsx } from '@emotion/react';
|
|
9
9
|
import { useIntl } from 'react-intl';
|
|
10
10
|
import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
|
|
11
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
11
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
12
12
|
const PLACEHOLDER_SELECTOR = '.ProseMirror-focused .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)';
|
|
13
13
|
const layoutColumnDangerPreviewStyle = css({
|
|
14
14
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
@@ -14,7 +14,7 @@ import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-colu
|
|
|
14
14
|
import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
|
|
15
15
|
import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
|
|
16
16
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
17
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
17
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
18
18
|
import { deleteActiveLayoutNode, distributeLayoutColumns, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
|
|
19
19
|
import { isDistributedUniformly } from '../pm-plugins/utils/layout-column-distribution';
|
|
20
20
|
import { EditorLayoutFiveColumnsIcon, EditorLayoutFourColumnsIcon } from './icons/LayoutColumnsIcon';
|
package/dist/esm/layoutPlugin.js
CHANGED
|
@@ -10,7 +10,7 @@ import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
|
|
|
10
10
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
11
11
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
12
12
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
13
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
14
14
|
import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn as _deleteLayoutColumn, distributeLayoutColumns as _distributeLayoutColumns, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnDangerPreview, setLayoutColumnValign as _setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
|
|
15
15
|
import { default as createLayoutKeymapPlugin } from './pm-plugins/keymap';
|
|
16
16
|
import { default as createLayoutPlugin } from './pm-plugins/main';
|
|
@@ -174,7 +174,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
|
|
|
174
174
|
id: 'onecolumnlayout',
|
|
175
175
|
title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
|
|
176
176
|
description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
|
|
177
|
-
keywords:
|
|
177
|
+
keywords: ['layout', 'column', 'section', 'col', 'single column'],
|
|
178
178
|
priority: 1100,
|
|
179
179
|
icon: function icon() {
|
|
180
180
|
return /*#__PURE__*/React.createElement(IconOneColumnLayout, null);
|
|
@@ -204,7 +204,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
|
|
|
204
204
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
205
205
|
numberOfColumns: descriptionColumnCount
|
|
206
206
|
}),
|
|
207
|
-
keywords:
|
|
207
|
+
keywords: ['layout', 'column', 'section', 'col', keyword],
|
|
208
208
|
priority: 1100,
|
|
209
209
|
icon: Icon,
|
|
210
210
|
action: function action(insert, state) {
|
|
@@ -263,7 +263,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
|
|
|
263
263
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
264
264
|
numberOfColumns: 'two'
|
|
265
265
|
}),
|
|
266
|
-
keywords:
|
|
266
|
+
keywords: ['layout', 'column', 'section', 'col', 'two column'],
|
|
267
267
|
priority: 1100,
|
|
268
268
|
icon: function icon() {
|
|
269
269
|
return /*#__PURE__*/React.createElement(IconTwoColumnLayout, null);
|
|
@@ -284,7 +284,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
|
|
|
284
284
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
285
285
|
numberOfColumns: 'three'
|
|
286
286
|
}),
|
|
287
|
-
keywords:
|
|
287
|
+
keywords: ['layout', 'column', 'section', 'col', 'three column'],
|
|
288
288
|
priority: 1100,
|
|
289
289
|
icon: function icon() {
|
|
290
290
|
return /*#__PURE__*/React.createElement(IconThreeColumnLayout, null);
|
|
@@ -305,7 +305,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
|
|
|
305
305
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
306
306
|
numberOfColumns: 'four'
|
|
307
307
|
}),
|
|
308
|
-
keywords:
|
|
308
|
+
keywords: ['layout', 'column', 'section', 'col', 'four column'],
|
|
309
309
|
priority: 1100,
|
|
310
310
|
icon: function icon() {
|
|
311
311
|
return /*#__PURE__*/React.createElement(IconFourColumnLayout, null);
|
|
@@ -326,7 +326,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
|
|
|
326
326
|
description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
|
|
327
327
|
numberOfColumns: 'five'
|
|
328
328
|
}),
|
|
329
|
-
keywords:
|
|
329
|
+
keywords: ['layout', 'column', 'section', 'col', 'five column'],
|
|
330
330
|
priority: 1100,
|
|
331
331
|
icon: function icon() {
|
|
332
332
|
return /*#__PURE__*/React.createElement(IconFiveColumnLayout, null);
|
|
@@ -17,7 +17,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
|
|
|
17
17
|
import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
|
|
18
18
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
19
19
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
20
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
20
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
21
21
|
import { selectIntoLayout } from '../pm-plugins/utils';
|
|
22
22
|
import { LayoutSSRReactContextsProvider } from '../ui/LayoutSSRReactContextsProvider';
|
|
23
23
|
import { isEmptyLayout } from './utils';
|
|
@@ -10,7 +10,7 @@ import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
|
|
|
10
10
|
import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
|
|
11
11
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
12
12
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
13
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
13
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
14
14
|
import { DEFAULT_LAYOUT_COLUMN_VALIGN, EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
|
|
15
15
|
import { pluginKey } from './plugin-key';
|
|
16
16
|
import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';
|
|
@@ -12,7 +12,7 @@ import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosem
|
|
|
12
12
|
import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
|
|
13
13
|
import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
|
|
14
14
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
15
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
15
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
16
16
|
import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
|
|
17
17
|
import { getColumnDividerDecorations } from './column-resize-divider';
|
|
18
18
|
import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
|
|
@@ -5,7 +5,7 @@ import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-p
|
|
|
5
5
|
import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
|
|
6
6
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
7
7
|
import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
|
|
8
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
8
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
9
9
|
export var getMaybeLayoutSection = function getMaybeLayoutSection(state) {
|
|
10
10
|
var _state$schema$nodes = state.schema.nodes,
|
|
11
11
|
layoutSection = _state$schema$nodes.layoutSection,
|
|
@@ -9,7 +9,7 @@ import { useMemo } from 'react';
|
|
|
9
9
|
import { Global, css, jsx } from '@emotion/react';
|
|
10
10
|
import { useIntl } from 'react-intl';
|
|
11
11
|
import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
|
|
12
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
12
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
13
13
|
var PLACEHOLDER_SELECTOR = '.ProseMirror-focused .layoutSectionView-content-wrap.selected [data-layout-column] > [data-layout-content] > p:only-child:has(.ProseMirror-trailingBreak:only-child)';
|
|
14
14
|
var layoutColumnDangerPreviewStyle = css({
|
|
15
15
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
package/dist/esm/ui/toolbar.js
CHANGED
|
@@ -18,7 +18,7 @@ import LayoutTwoColumnsSidebarLeftIcon from '@atlaskit/icon/core/layout-two-colu
|
|
|
18
18
|
import LayoutTwoColumnsSidebarRightIcon from '@atlaskit/icon/core/layout-two-columns-sidebar-right';
|
|
19
19
|
import TableColumnsDistributeIcon from '@atlaskit/icon/core/table-columns-distribute';
|
|
20
20
|
import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
|
|
21
|
-
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/
|
|
21
|
+
import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
|
|
22
22
|
import { deleteActiveLayoutNode, distributeLayoutColumns, getPresetLayout, setPresetLayout } from '../pm-plugins/actions';
|
|
23
23
|
import { isDistributedUniformly } from '../pm-plugins/utils/layout-column-distribution';
|
|
24
24
|
import { EditorLayoutFiveColumnsIcon, EditorLayoutFourColumnsIcon } from './icons/LayoutColumnsIcon';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-layout",
|
|
3
|
-
"version": "17.1.
|
|
3
|
+
"version": "17.1.5",
|
|
4
4
|
"description": "Layout plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -43,14 +43,14 @@
|
|
|
43
43
|
"@atlaskit/icon-lab": "^7.7.0",
|
|
44
44
|
"@atlaskit/platform-feature-experiments": "^0.3.0",
|
|
45
45
|
"@atlaskit/platform-feature-flags": "^2.1.0",
|
|
46
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
47
|
-
"@atlaskit/tokens": "^16.
|
|
46
|
+
"@atlaskit/tmp-editor-statsig": "^168.0.0",
|
|
47
|
+
"@atlaskit/tokens": "^16.9.0",
|
|
48
48
|
"@babel/runtime": "^7.0.0",
|
|
49
49
|
"@emotion/react": "^11.7.1",
|
|
50
50
|
"bind-event-listener": "^3.0.0"
|
|
51
51
|
},
|
|
52
52
|
"peerDependencies": {
|
|
53
|
-
"@atlaskit/editor-common": "^120.
|
|
53
|
+
"@atlaskit/editor-common": "^120.7.0",
|
|
54
54
|
"react": "^18.2.0 || ^19.2.0",
|
|
55
55
|
"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
|
|
56
56
|
},
|