@atlaskit/editor-plugin-block-controls 9.0.13 → 9.0.15

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 9.0.15
+
+### Patch Changes
+
+- [`c9d8de9fd5a33`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c9d8de9fd5a33) -
+  Avoid wrapping block controls in any block mark - fixes issues with font size mark.
+- Updated dependencies
+
+## 9.0.14
+
+### Patch Changes
+
+- [`3895f6d32cc49`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3895f6d32cc49) -
+  Replace expValEquals with editorExperiment for platform_synced_block experiment to ensure
+  consistent exposure firing
+- Updated dependencies
+
 ## 9.0.13
 
 ### Patch Changes

package/dist/cjs/editor-commands/move-to-layout.js

@@ -143,7 +143,9 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
   }
   var $to = tr.doc.resolve(to);
   var allowedParentTypes = [doc, layoutSection];
-  if (bodiedSyncBlock && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _expValEquals.expValEquals)('platform_synced_block_patch_6', 'isEnabled', true)) {
+  if (bodiedSyncBlock && (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+    exposure: true
+  })) {
     allowedParentTypes.push(bodiedSyncBlock);
   }
 

package/dist/cjs/pm-plugins/decorations-drag-handle.js

@@ -62,7 +62,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: (0, _marks.getActiveBlockMarks)(editorState, pos),
+    marks: (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, pos),
     destroy: function destroy(node) {
       unbind && unbind();
       if ((0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) && node instanceof HTMLElement) {
@@ -74,7 +74,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
     type: _decorationsCommon.TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(_decorationsCommon.TYPE_HANDLE_DEC, "-").concat((0, _uuid.default)()),
-    marks: (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_native_anchor_patch_1') ? (0, _marks.getActiveBlockMarks)(editorState, pos) : undefined,
+    marks: (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_native_anchor_patch_1') ? (0, _marks.getActiveBlockMarks)(editorState, pos) : undefined,
     destroy: function destroy(node) {
       unbind && unbind();
       if ((0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) && node instanceof HTMLElement) {

package/dist/cjs/pm-plugins/decorations-drop-target-active.js

@@ -214,7 +214,9 @@ var getActiveDropTargetDecorations = exports.getActiveDropTargetDecorations = fu
   }
   var anchorEmitNodeWithPos = rootNodeWithPos;
   if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
-    if ((0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _expValEquals.expValEquals)('platform_synced_block_patch_6', 'isEnabled', true)) {
+    if ((0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+      exposure: true
+    })) {
       var schema = rootNodeWithPos.node.type.schema;
       var layoutSection = schema.nodes.layoutSection;
       var isLayoutSectionChildOfRoot = (0, _utils2.findChildrenByType)(rootNodeWithPos.node, layoutSection, false).length > 0;

package/dist/cjs/pm-plugins/decorations-quick-insert-button.js

@@ -46,7 +46,7 @@ var quickInsertButtonDecoration = exports.quickInsertButtonDecoration = function
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: (0, _marks.getActiveBlockMarks)(editorState, rootPos),
+    marks: (0, _expValEquals.expValEquals)('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : (0, _marks.getActiveBlockMarks)(editorState, rootPos),
     destroy: function destroy(_) {
       if ((0, _platformFeatureFlags.fg)('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/cjs/pm-plugins/utils/marks.js

@@ -7,6 +7,8 @@ exports.getActiveBlockMarks = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
+ * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
+ *
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
  * - indent

package/dist/cjs/ui/drop-target.js

@@ -113,7 +113,9 @@ var HoverZone = function HoverZone(_ref) {
     _useActiveAnchorTrack2 = (0, _slicedToArray2.default)(_useActiveAnchorTrack, 2),
     _isActive = _useActiveAnchorTrack2[0],
     setActiveAnchor = _useActiveAnchorTrack2[1];
-  var isInsideBodiedSyncBlock = parent && parent.type.name === 'bodiedSyncBlock' && (0, _expValEquals.expValEquals)('platform_synced_block', 'isEnabled', true) && (0, _expValEquals.expValEquals)('platform_synced_block_patch_6', 'isEnabled', true);
+  var isInsideBodiedSyncBlock = parent && parent.type.name === 'bodiedSyncBlock' && (0, _experiments.editorExperiment)('platform_synced_block', true) && (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+    exposure: true
+  });
   (0, _react.useEffect)(function () {
     if (ref.current) {
       return (0, _adapter.dropTargetForElements)({

package/dist/es2019/editor-commands/move-to-layout.js

@@ -140,7 +140,9 @@ const canMoveToLayout = (api, from, to, tr, moveNodeAtCursorPos) => {
   }
   const $to = tr.doc.resolve(to);
   const allowedParentTypes = [doc, layoutSection];
-  if (bodiedSyncBlock && expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
+  if (bodiedSyncBlock && editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true, {
+    exposure: true
+  })) {
     allowedParentTypes.push(bodiedSyncBlock);
   }
 

package/dist/es2019/pm-plugins/decorations-drag-handle.js

@@ -53,7 +53,7 @@ export const dragHandleDecoration = ({
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: getActiveBlockMarks(editorState, pos),
+    marks: expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
     destroy: node => {
       unbind && unbind();
       if (editorExperiment('platform_editor_block_control_optimise_render', true) && node instanceof HTMLElement) {
@@ -65,7 +65,7 @@ export const dragHandleDecoration = ({
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: `${TYPE_HANDLE_DEC}-${uuid()}`,
-    marks: expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1') ? getActiveBlockMarks(editorState, pos) : undefined,
+    marks: expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1') ? getActiveBlockMarks(editorState, pos) : undefined,
     destroy: node => {
       unbind && unbind();
       if (editorExperiment('platform_editor_block_control_optimise_render', true) && node instanceof HTMLElement) {

package/dist/es2019/pm-plugins/decorations-drop-target-active.js

@@ -197,7 +197,9 @@ export const getActiveDropTargetDecorations = (activeDropTargetNode, state, api,
   }
   let anchorEmitNodeWithPos = rootNodeWithPos;
   if (editorExperiment('advanced_layouts', true)) {
-    if (expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
+    if (editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true, {
+      exposure: true
+    })) {
       const schema = rootNodeWithPos.node.type.schema;
       const {
         layoutSection

package/dist/es2019/pm-plugins/decorations-quick-insert-button.js

@@ -37,7 +37,7 @@ export const quickInsertButtonDecoration = ({
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: getActiveBlockMarks(editorState, rootPos),
+    marks: expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
     destroy: _ => {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/es2019/pm-plugins/utils/marks.js

@@ -2,6 +2,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
+ * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
+ *
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
  * - indent

package/dist/es2019/ui/drop-target.js

@@ -101,7 +101,9 @@ const HoverZone = ({
     return node ? getNodeAnchor(node) : '';
   }, [api, node, pos, position]);
   const [_isActive, setActiveAnchor] = useActiveAnchorTracker(anchorName);
-  const isInsideBodiedSyncBlock = parent && parent.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true);
+  const isInsideBodiedSyncBlock = parent && parent.type.name === 'bodiedSyncBlock' && editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true, {
+    exposure: true
+  });
   useEffect(() => {
     if (ref.current) {
       return dropTargetForElements({

package/dist/esm/editor-commands/move-to-layout.js

@@ -137,7 +137,9 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
   }
   var $to = tr.doc.resolve(to);
   var allowedParentTypes = [doc, layoutSection];
-  if (bodiedSyncBlock && expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
+  if (bodiedSyncBlock && editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true, {
+    exposure: true
+  })) {
     allowedParentTypes.push(bodiedSyncBlock);
   }
 

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -54,7 +54,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
      * Exclude 'breakout' on purpose, so the widgets render at the top of the document to avoid z-index issues
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
-    marks: getActiveBlockMarks(editorState, pos),
+    marks: expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, pos),
     destroy: function destroy(node) {
       unbind && unbind();
       if (editorExperiment('platform_editor_block_control_optimise_render', true) && node instanceof HTMLElement) {
@@ -66,7 +66,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
-    marks: expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1') ? getActiveBlockMarks(editorState, pos) : undefined,
+    marks: expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1') ? getActiveBlockMarks(editorState, pos) : undefined,
     destroy: function destroy(node) {
       unbind && unbind();
       if (editorExperiment('platform_editor_block_control_optimise_render', true) && node instanceof HTMLElement) {

package/dist/esm/pm-plugins/decorations-drop-target-active.js

@@ -209,7 +209,9 @@ export var getActiveDropTargetDecorations = function getActiveDropTargetDecorati
   }
   var anchorEmitNodeWithPos = rootNodeWithPos;
   if (editorExperiment('advanced_layouts', true)) {
-    if (expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true)) {
+    if (editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true, {
+      exposure: true
+    })) {
       var schema = rootNodeWithPos.node.type.schema;
       var layoutSection = schema.nodes.layoutSection;
       var isLayoutSectionChildOfRoot = findChildrenByType(rootNodeWithPos.node, layoutSection, false).length > 0;

package/dist/esm/pm-plugins/decorations-quick-insert-button.js

@@ -38,7 +38,7 @@ export var quickInsertButtonDecoration = function quickInsertButtonDecoration(_r
      * Other block marks must be added, otherwise PM will split the DOM elements causing mutations and re-draws
      */
 
-    marks: getActiveBlockMarks(editorState, rootPos),
+    marks: expValEquals('platform_editor_clean_up_widget_mark_logic', 'isEnabled', true) ? [] : getActiveBlockMarks(editorState, rootPos),
     destroy: function destroy(_) {
       if (fg('platform_editor_fix_widget_destroy')) {
         nodeViewPortalProviderAPI.remove(key);

package/dist/esm/pm-plugins/utils/marks.js

@@ -2,6 +2,8 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
+ * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
+ *
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
  * - indent

package/dist/esm/ui/drop-target.js

@@ -105,7 +105,9 @@ var HoverZone = function HoverZone(_ref) {
     _useActiveAnchorTrack2 = _slicedToArray(_useActiveAnchorTrack, 2),
     _isActive = _useActiveAnchorTrack2[0],
     setActiveAnchor = _useActiveAnchorTrack2[1];
-  var isInsideBodiedSyncBlock = parent && parent.type.name === 'bodiedSyncBlock' && expValEquals('platform_synced_block', 'isEnabled', true) && expValEquals('platform_synced_block_patch_6', 'isEnabled', true);
+  var isInsideBodiedSyncBlock = parent && parent.type.name === 'bodiedSyncBlock' && editorExperiment('platform_synced_block', true) && editorExperiment('platform_synced_block_patch_6', true, {
+    exposure: true
+  });
   useEffect(function () {
     if (ref.current) {
       return dropTargetForElements({

package/dist/types/pm-plugins/utils/marks.d.ts

@@ -1,6 +1,8 @@
 import type { Mark } from '@atlaskit/editor-prosemirror/model';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 /**
+ * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
+ *
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
  * - indent

package/dist/types-ts4.5/pm-plugins/utils/marks.d.ts

@@ -1,6 +1,8 @@
 import type { Mark } from '@atlaskit/editor-prosemirror/model';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 /**
+ * Remove this when platform_editor_clean_up_widget_mark_logic is cleaned up.
+ *
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
  * - indent

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "9.0.13",
+	"version": "9.0.15",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^41.0.0",
+		"@atlaskit/tmp-editor-statsig": "^43.0.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@atlaskit/tooltip": "^21.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.6.0",
+		"@atlaskit/editor-common": "^112.7.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"