@atlaskit/editor-plugin-block-controls 9.0.8 → 9.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/dist/cjs/pm-plugins/main.js +10 -3
  3. package/dist/cjs/pm-plugins/utils/inline-drop-target.js +2 -3
  4. package/dist/es2019/pm-plugins/main.js +10 -3
  5. package/dist/es2019/pm-plugins/utils/inline-drop-target.js +2 -3
  6. package/dist/esm/pm-plugins/main.js +10 -3
  7. package/dist/esm/pm-plugins/utils/inline-drop-target.js +2 -3
  8. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/editor-plugin-block-controls
2
2
 
3
+ ## 9.0.10
4
+
5
+ ### Patch Changes
6
+
7
+ - [`3bc16a4221f74`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3bc16a4221f74) -
8
+ [ux] EDITOR-5746 fix bug where drop targets appeared (and never cleared) after table row drag
9
+ - Updated dependencies
10
+
11
+ ## 9.0.9
12
+
13
+ ### Patch Changes
14
+
15
+ - [`97fd2b35b4ba3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/97fd2b35b4ba3) -
16
+ Editor-5020: fix inline drop hint outside synced block
17
+ - Updated dependencies
18
+
3
19
  ## 9.0.8
4
20
 
5
21
  ### Patch Changes
package/dist/cjs/pm-plugins/main.js CHANGED
@@ -869,10 +869,17 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
869
869
  return false;
870
870
  },
871
871
  dragenter: function dragenter(view, event) {
872
- var _api$limitedMode3;
872
+ var _api$limitedMode3, _key$getState3;
873
873
  if (api !== null && api !== void 0 && (_api$limitedMode3 = api.limitedMode) !== null && _api$limitedMode3 !== void 0 && (_api$limitedMode3 = _api$limitedMode3.sharedState.currentState()) !== null && _api$limitedMode3 !== void 0 && _api$limitedMode3.enabled) {
874
874
  return;
875
875
  }
876
+
877
+ // Only process dragenter for block control drags.
878
+ // Other drag types (e.g. table row) should not create
879
+ // drop target decorations or emit active anchors.
880
+ if (!((_key$getState3 = key.getState(view.state)) !== null && _key$getState3 !== void 0 && _key$getState3.isDragging) && (0, _expValEquals.expValEquals)('platform_editor_fix_table_row_drag_drop_target', 'isEnabled', true)) {
881
+ return;
882
+ }
876
883
  if (isHTMLElement(event.target) && (0, _expValEquals.expValEquals)('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
877
884
  var targetElement = event.target.closest('[data-prosemirror-node-name]');
878
885
  if (targetElement) {
@@ -921,13 +928,13 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
921
928
  })));
922
929
  },
923
930
  dragend: function dragend(view) {
924
- var _api$limitedMode5, _key$getState3;
931
+ var _api$limitedMode5, _key$getState4;
925
932
  if (api !== null && api !== void 0 && (_api$limitedMode5 = api.limitedMode) !== null && _api$limitedMode5 !== void 0 && (_api$limitedMode5 = _api$limitedMode5.sharedState.currentState()) !== null && _api$limitedMode5 !== void 0 && _api$limitedMode5.enabled) {
926
933
  return;
927
934
  }
928
935
  var state = view.state,
929
936
  dispatch = view.dispatch;
930
- if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
937
+ if ((_key$getState4 = key.getState(state)) !== null && _key$getState4 !== void 0 && _key$getState4.isPMDragging) {
931
938
  var tr = state.tr;
932
939
  tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
933
940
  isPMDragging: false
package/dist/cjs/pm-plugins/utils/inline-drop-target.js CHANGED
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.shouldAllowInlineDropTarget = void 0;
7
7
  var _utils = require("@atlaskit/editor-common/utils");
8
- var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
9
8
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
10
9
  var _checkMediaLayout = require("./check-media-layout");
11
10
  var _consts = require("./consts");
@@ -17,7 +16,7 @@ var shouldAllowInlineDropTarget = exports.shouldAllowInlineDropTarget = function
17
16
  var isInsideBodiedSyncBlock = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) === 'bodiedSyncBlock';
18
17
  if ((0, _experiments.editorExperiment)('advanced_layouts', false) || isNested) {
19
18
  // If nested inside bodiedSyncBlock, enable inline drop target so user can drop to create a layout inside it
20
- if (isInsideBodiedSyncBlock && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _expValEquals.expValEquals)('platform_synced_block_patch_6', 'isEnabled', true)) {
19
+ if (isInsideBodiedSyncBlock && (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true)) {
21
20
  return true;
22
21
  }
23
22
  return false;
@@ -28,7 +27,7 @@ var shouldAllowInlineDropTarget = exports.shouldAllowInlineDropTarget = function
28
27
  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
29
28
  return false;
30
29
  }
31
- if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && (0, _experiments.editorExperiment)('platform_synced_block', true) && !(0, _expValEquals.expValEquals)('platform_synced_block_patch_6', 'isEnabled', true)) {
30
+ if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && (0, _experiments.editorExperiment)('platform_synced_block', true)) {
32
31
  return false;
33
32
  }
34
33
  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
package/dist/es2019/pm-plugins/main.js CHANGED
@@ -771,10 +771,17 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
771
771
  return false;
772
772
  },
773
773
  dragenter(view, event) {
774
- var _api$limitedMode3, _api$limitedMode3$sha;
774
+ var _api$limitedMode3, _api$limitedMode3$sha, _key$getState3;
775
775
  if (api !== null && api !== void 0 && (_api$limitedMode3 = api.limitedMode) !== null && _api$limitedMode3 !== void 0 && (_api$limitedMode3$sha = _api$limitedMode3.sharedState.currentState()) !== null && _api$limitedMode3$sha !== void 0 && _api$limitedMode3$sha.enabled) {
776
776
  return;
777
777
  }
778
+
779
+ // Only process dragenter for block control drags.
780
+ // Other drag types (e.g. table row) should not create
781
+ // drop target decorations or emit active anchors.
782
+ if (!((_key$getState3 = key.getState(view.state)) !== null && _key$getState3 !== void 0 && _key$getState3.isDragging) && expValEquals('platform_editor_fix_table_row_drag_drop_target', 'isEnabled', true)) {
783
+ return;
784
+ }
778
785
  if (isHTMLElement(event.target) && expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
779
786
  const targetElement = event.target.closest('[data-prosemirror-node-name]');
780
787
  if (targetElement) {
@@ -824,7 +831,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
824
831
  }));
825
832
  },
826
833
  dragend(view) {
827
- var _api$limitedMode5, _api$limitedMode5$sha, _key$getState3;
834
+ var _api$limitedMode5, _api$limitedMode5$sha, _key$getState4;
828
835
  if (api !== null && api !== void 0 && (_api$limitedMode5 = api.limitedMode) !== null && _api$limitedMode5 !== void 0 && (_api$limitedMode5$sha = _api$limitedMode5.sharedState.currentState()) !== null && _api$limitedMode5$sha !== void 0 && _api$limitedMode5$sha.enabled) {
829
836
  return;
830
837
  }
@@ -832,7 +839,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
832
839
  state,
833
840
  dispatch
834
841
  } = view;
835
- if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
842
+ if ((_key$getState4 = key.getState(state)) !== null && _key$getState4 !== void 0 && _key$getState4.isPMDragging) {
836
843
  const tr = state.tr;
837
844
  tr.setMeta(key, {
838
845
  ...state.tr.getMeta(key),
package/dist/es2019/pm-plugins/utils/inline-drop-target.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
2
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
2
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
4
3
  import { isWrappedMedia } from './check-media-layout';
5
4
  import { maxLayoutColumnSupported } from './consts';
@@ -12,7 +11,7 @@ isSameLayout = false, activeNode, parentNode) => {
12
11
  const isInsideBodiedSyncBlock = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) === 'bodiedSyncBlock';
13
12
  if (editorExperiment('advanced_layouts', false) || isNested) {
14
13
  // If nested inside bodiedSyncBlock, enable inline drop target so user can drop to create a layout inside it
15
- if (isInsideBodiedSyncBlock && expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
14
+ if (isInsideBodiedSyncBlock && editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true)) {
16
15
  return true;
17
16
  }
18
17
  return false;
@@ -23,7 +22,7 @@ isSameLayout = false, activeNode, parentNode) => {
23
22
  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
24
23
  return false;
25
24
  }
26
- if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && editorExperiment('platform_synced_block', true) && !expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
25
+ if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && editorExperiment('platform_synced_block', true)) {
27
26
  return false;
28
27
  }
29
28
  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
package/dist/esm/pm-plugins/main.js CHANGED
@@ -863,10 +863,17 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
863
863
  return false;
864
864
  },
865
865
  dragenter: function dragenter(view, event) {
866
- var _api$limitedMode3;
866
+ var _api$limitedMode3, _key$getState3;
867
867
  if (api !== null && api !== void 0 && (_api$limitedMode3 = api.limitedMode) !== null && _api$limitedMode3 !== void 0 && (_api$limitedMode3 = _api$limitedMode3.sharedState.currentState()) !== null && _api$limitedMode3 !== void 0 && _api$limitedMode3.enabled) {
868
868
  return;
869
869
  }
870
+
871
+ // Only process dragenter for block control drags.
872
+ // Other drag types (e.g. table row) should not create
873
+ // drop target decorations or emit active anchors.
874
+ if (!((_key$getState3 = key.getState(view.state)) !== null && _key$getState3 !== void 0 && _key$getState3.isDragging) && expValEquals('platform_editor_fix_table_row_drag_drop_target', 'isEnabled', true)) {
875
+ return;
876
+ }
870
877
  if (isHTMLElement(event.target) && expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
871
878
  var targetElement = event.target.closest('[data-prosemirror-node-name]');
872
879
  if (targetElement) {
@@ -915,13 +922,13 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
915
922
  })));
916
923
  },
917
924
  dragend: function dragend(view) {
918
- var _api$limitedMode5, _key$getState3;
925
+ var _api$limitedMode5, _key$getState4;
919
926
  if (api !== null && api !== void 0 && (_api$limitedMode5 = api.limitedMode) !== null && _api$limitedMode5 !== void 0 && (_api$limitedMode5 = _api$limitedMode5.sharedState.currentState()) !== null && _api$limitedMode5 !== void 0 && _api$limitedMode5.enabled) {
920
927
  return;
921
928
  }
922
929
  var state = view.state,
923
930
  dispatch = view.dispatch;
924
- if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
931
+ if ((_key$getState4 = key.getState(state)) !== null && _key$getState4 !== void 0 && _key$getState4.isPMDragging) {
925
932
  var tr = state.tr;
926
933
  tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
927
934
  isPMDragging: false
package/dist/esm/pm-plugins/utils/inline-drop-target.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
2
- import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
3
2
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
4
3
  import { isWrappedMedia } from './check-media-layout';
5
4
  import { maxLayoutColumnSupported } from './consts';
@@ -11,7 +10,7 @@ export var shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(is
11
10
  var isInsideBodiedSyncBlock = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.type.name) === 'bodiedSyncBlock';
12
11
  if (editorExperiment('advanced_layouts', false) || isNested) {
13
12
  // If nested inside bodiedSyncBlock, enable inline drop target so user can drop to create a layout inside it
14
- if (isInsideBodiedSyncBlock && expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
13
+ if (isInsideBodiedSyncBlock && editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true)) {
15
14
  return true;
16
15
  }
17
16
  return false;
@@ -22,7 +21,7 @@ export var shouldAllowInlineDropTarget = function shouldAllowInlineDropTarget(is
22
21
  if ((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) === 'layoutSection') {
23
22
  return false;
24
23
  }
25
- if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && editorExperiment('platform_synced_block', true) && !expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
24
+ if ((syncedBlockTypes.includes((activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeType) || '') || syncedBlockTypes.includes((node === null || node === void 0 ? void 0 : node.type.name) || '')) && editorExperiment('platform_synced_block', true)) {
26
25
  return false;
27
26
  }
28
27
  if ((node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection') {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-block-controls",
3
- "version": "9.0.8",
3
+ "version": "9.0.10",
4
4
  "description": "Block controls plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -56,7 +56,7 @@
56
56
  "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
57
57
  "@atlaskit/primitives": "^18.0.0",
58
58
  "@atlaskit/theme": "^22.0.0",
59
- "@atlaskit/tmp-editor-statsig": "^40.3.0",
59
+ "@atlaskit/tmp-editor-statsig": "^40.5.0",
60
60
  "@atlaskit/tokens": "^11.1.0",
61
61
  "@atlaskit/tooltip": "^20.14.0",
62
62
  "@babel/runtime": "^7.0.0",