@atlaskit/editor-plugin-layout 2.9.4 → 2.9.6

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 CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-plugin-layout
2
2
 
3
+ ## 2.9.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [#171530](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/171530)
8
+ [`d76bccd99e797`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d76bccd99e797) -
9
+ ED-26662: make platform_editor_convert_multiple_columns_to_single dependent on
10
+ platform_editor_single_column_layout
11
+ - Updated dependencies
12
+
13
+ ## 2.9.5
14
+
15
+ ### Patch Changes
16
+
17
+ - Updated dependencies
18
+
3
19
  ## 2.9.4
4
20
 
5
21
  ### Patch Changes
@@ -211,7 +211,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
211
211
  // check if the column only contains a paragraph with a placeholder text
212
212
  // if so, remove the whole column, otherwise just remove the paragraph
213
213
  if ((0, _utils.isEmptyDocument)(column)) {
214
- var fromPos = (0, _platformFeatureFlags.fg)('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
214
+ var fromPos = (0, _experiments.editorExperiment)('single_column_layouts', true) && (0, _platformFeatureFlags.fg)('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
215
215
  tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), _model.Slice.empty);
216
216
  } else {
217
217
  tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), _model.Slice.empty);
@@ -190,7 +190,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
190
190
  // check if the column only contains a paragraph with a placeholder text
191
191
  // if so, remove the whole column, otherwise just remove the paragraph
192
192
  if (isEmptyDocument(column)) {
193
- const fromPos = fg('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
193
+ const fromPos = editorExperiment('single_column_layouts', true) && fg('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
194
194
  tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), Slice.empty);
195
195
  } else {
196
196
  tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), Slice.empty);
@@ -202,7 +202,7 @@ function removeLastColumnInLayout(column, columnPos, insideRightEdgePos) {
202
202
  // check if the column only contains a paragraph with a placeholder text
203
203
  // if so, remove the whole column, otherwise just remove the paragraph
204
204
  if (isEmptyDocument(column)) {
205
- var fromPos = fg('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
205
+ var fromPos = editorExperiment('single_column_layouts', true) && fg('platform_editor_convert_multiple_columns_to_single') ? columnPos : columnPos - 1;
206
206
  tr.replaceRange(tr.mapping.map(fromPos), tr.mapping.map(insideRightEdgePos), Slice.empty);
207
207
  } else {
208
208
  tr.replaceRange(tr.mapping.map(columnPos - 1), tr.mapping.map(columnPos + 1), Slice.empty);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-layout",
3
- "version": "2.9.4",
3
+ "version": "2.9.6",
4
4
  "description": "Layout plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -34,7 +34,7 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@atlaskit/adf-schema": "^47.6.0",
37
- "@atlaskit/editor-common": "^106.5.0",
37
+ "@atlaskit/editor-common": "^106.9.0",
38
38
  "@atlaskit/editor-plugin-analytics": "^2.3.0",
39
39
  "@atlaskit/editor-plugin-decorations": "^2.0.0",
40
40
  "@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -45,10 +45,10 @@
45
45
  "@atlaskit/editor-prosemirror": "7.0.0",
46
46
  "@atlaskit/editor-shared-styles": "^3.4.0",
47
47
  "@atlaskit/icon": "^26.4.0",
48
- "@atlaskit/icon-lab": "^4.18.0",
48
+ "@atlaskit/icon-lab": "^4.19.0",
49
49
  "@atlaskit/platform-feature-flags": "^1.1.0",
50
- "@atlaskit/tmp-editor-statsig": "^6.0.0",
51
- "@atlaskit/tokens": "^5.1.0",
50
+ "@atlaskit/tmp-editor-statsig": "^7.1.0",
51
+ "@atlaskit/tokens": "^5.2.0",
52
52
  "@babel/runtime": "^7.0.0",
53
53
  "@emotion/react": "^11.7.1"
54
54
  },