@atlaskit/editor-plugin-block-controls 9.1.16 → 9.1.18

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 9.1.18
+
+### Patch Changes
+
+- [`1bd298ad0a152`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bd298ad0a152) -
+  [ux] EDITOR-6280 Clean up platform_editor_block_menu_v2_patch_3 to fix icon and copy in jira block
+  menu
+- Updated dependencies
+
+## 9.1.17
+
+### Patch Changes
+
+- [`73b2fc243f544`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73b2fc243f544) -
+  Cleaning up getBrowserInfo which was behind experiment platform_editor_hydratable_ui and is now
+  rolled out
+- Updated dependencies
+
 ## 9.1.16
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -306,7 +306,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
       if (activeNode && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== true) {
         var _mappedRootPos$pos, _mappedRootPos;
         var _mappedPos;
-        var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
+        var browser = (0, _browser.getBrowserInfo)();
         // In safari, when platform_editor_controls is on,
         // sometimes the drag handle for the layout disppears after you click on the handle for a few times
         // Which caused the drag handle onClick event not firing, then block menu wouldn't be opened

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

@@ -9,7 +9,6 @@ var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(doc, start, nodeSize) {
   var $startPos = doc.resolve(start);
@@ -97,21 +96,11 @@ var newGetSelection = exports.newGetSelection = function newGetSelection(doc, se
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if ((0, _experiments.editorExperiment)('platform_editor_block_menu', true)) {
-    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       var $mediaStartPos = doc.resolve(start + 1);
       return new _state.NodeSelection($mediaStartPos);
     }
-
-    // if heading with alignment nested inside a layout column, return TextSelection
-    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
-    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
-    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(function (mark) {
-      return mark.type.name === 'alignment';
-    }) && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn' && !(0, _platformFeatureFlags.fg)('platform_editor_block_menu_v2_patch_3')) {
-      return _state.TextSelection.create(doc, start, start + nodeSize);
-    }
     return new _state.NodeSelection(doc.resolve(start));
   }
 

package/dist/cjs/ui/drag-handle.js

@@ -302,7 +302,7 @@ var selectedStyles = (0, _react2.css)({
 // icon span receives dragStart event, instead of button, and since it is not registered as a draggable element
 // with pragmatic DnD and pragmatic DnD is not triggered
 var handleIconDragStart = function handleIconDragStart(e) {
-  var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
+  var browser = (0, _browser.getBrowserInfo)();
   if (!browser.chrome) {
     return;
   }
@@ -1071,7 +1071,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
   };
   var hasHadInteraction = interactionState !== 'hasNotHadInteraction';
-  var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
+  var browser = (0, _browser.getBrowserInfo)();
   var renderButton = function renderButton() {
     return (
       // eslint-disable-next-line @atlaskit/design-system/no-html-button

package/dist/cjs/ui/drag-preview.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.dragPreview = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _browser = require("@atlaskit/editor-common/browser");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var previewStyle = {
   borderColor: "var(--ds-border, #0B120E24)",
   borderStyle: 'solid',
@@ -69,7 +68,7 @@ var createContentPreviewElement = function createContentPreviewElement(dom, node
   // Ignored via go/ees005
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   dom.cloneNode(true);
-  var browser = (0, _expValEquals.expValEquals)('platform_editor_hydratable_ui', 'isEnabled', true) ? (0, _browser.getBrowserInfo)() : _browser.browser;
+  var browser = (0, _browser.getBrowserInfo)();
   clonedDom.style.marginLeft = '0';
   clonedDom.style.marginTop = nodeSpacing ? "".concat(nodeSpacing.top) : '0';
   clonedDom.style.marginRight = '0';

package/dist/es2019/pm-plugins/main.js

@@ -1,6 +1,6 @@
 import rafSchedule from 'raf-schd';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { getNodeIdProvider } from '@atlaskit/editor-common/node-anchor';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -297,7 +297,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
       if (activeNode && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== true) {
         var _mappedRootPos$pos, _mappedRootPos;
         let mappedPos;
-        const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+        const browser = getBrowserInfo();
         // In safari, when platform_editor_controls is on,
         // sometimes the drag handle for the layout disppears after you click on the handle for a few times
         // Which caused the drag handle onClick event not firing, then block menu wouldn't be opened

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

@@ -3,7 +3,6 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const getInlineNodePos = (doc, start, nodeSize) => {
   const $startPos = doc.resolve(start);
@@ -92,19 +91,11 @@ export const newGetSelection = (doc, selectionEmpty, start) => {
   const nodeSize = node ? node.nodeSize : 1;
   const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if (editorExperiment('platform_editor_block_menu', true)) {
-    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       const $mediaStartPos = doc.resolve(start + 1);
       return new NodeSelection($mediaStartPos);
     }
-
-    // if heading with alignment nested inside a layout column, return TextSelection
-    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
-    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
-    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(mark => mark.type.name === 'alignment') && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn' && !fg('platform_editor_block_menu_v2_patch_3')) {
-      return TextSelection.create(doc, start, start + nodeSize);
-    }
     return new NodeSelection(doc.resolve(start));
   }
 

package/dist/es2019/ui/drag-handle.js

@@ -9,7 +9,7 @@ import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
 import { getDocument } from '@atlaskit/browser-apis';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
@@ -296,7 +296,7 @@ const selectedStyles = css({
 // icon span receives dragStart event, instead of button, and since it is not registered as a draggable element
 // with pragmatic DnD and pragmatic DnD is not triggered
 const handleIconDragStart = e => {
-  const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  const browser = getBrowserInfo();
   if (!browser.chrome) {
     return;
   }
@@ -1053,7 +1053,7 @@ export const DragHandle = ({
     editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
   };
   const hasHadInteraction = interactionState !== 'hasNotHadInteraction';
-  const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  const browser = getBrowserInfo();
   const renderButton = () =>
   // eslint-disable-next-line @atlaskit/design-system/no-html-button
   jsx("button", {

package/dist/es2019/ui/drag-preview.js

@@ -1,5 +1,4 @@
-import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 const previewStyle = {
   borderColor: "var(--ds-border, #0B120E24)",
   borderStyle: 'solid',
@@ -62,7 +61,7 @@ const createContentPreviewElement = (dom, nodeType, nodeSpacing) => {
   // Ignored via go/ees005
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   dom.cloneNode(true);
-  const browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  const browser = getBrowserInfo();
   clonedDom.style.marginLeft = '0';
   clonedDom.style.marginTop = nodeSpacing ? `${nodeSpacing.top}` : '0';
   clonedDom.style.marginRight = '0';

package/dist/esm/pm-plugins/main.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import rafSchedule from 'raf-schd';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { getNodeIdProvider } from '@atlaskit/editor-common/node-anchor';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -299,7 +299,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
       if (activeNode && (meta === null || meta === void 0 ? void 0 : meta.isDragging) !== true) {
         var _mappedRootPos$pos, _mappedRootPos;
         var _mappedPos;
-        var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+        var browser = getBrowserInfo();
         // In safari, when platform_editor_controls is on,
         // sometimes the drag handle for the layout disppears after you click on the handle for a few times
         // Which caused the drag handle onClick event not firing, then block menu wouldn't be opened

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

@@ -3,7 +3,6 @@ import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-che
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { selectTableClosestToPos } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var getInlineNodePos = function getInlineNodePos(doc, start, nodeSize) {
   var $startPos = doc.resolve(start);
@@ -91,21 +90,11 @@ export var newGetSelection = function newGetSelection(doc, selectionEmpty, start
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if (editorExperiment('platform_editor_block_menu', true)) {
-    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       var $mediaStartPos = doc.resolve(start + 1);
       return new NodeSelection($mediaStartPos);
     }
-
-    // if heading with alignment nested inside a layout column, return TextSelection
-    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
-    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
-    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(function (mark) {
-      return mark.type.name === 'alignment';
-    }) && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn' && !fg('platform_editor_block_menu_v2_patch_3')) {
-      return TextSelection.create(doc, start, start + nodeSize);
-    }
     return new NodeSelection(doc.resolve(start));
   }
 

package/dist/esm/ui/drag-handle.js

@@ -14,7 +14,7 @@ import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
 import { getDocument } from '@atlaskit/browser-apis';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
+import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
@@ -298,7 +298,7 @@ var selectedStyles = css({
 // icon span receives dragStart event, instead of button, and since it is not registered as a draggable element
 // with pragmatic DnD and pragmatic DnD is not triggered
 var handleIconDragStart = function handleIconDragStart(e) {
-  var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  var browser = getBrowserInfo();
   if (!browser.chrome) {
     return;
   }
@@ -1067,7 +1067,7 @@ export var DragHandle = function DragHandle(_ref) {
     editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
   };
   var hasHadInteraction = interactionState !== 'hasNotHadInteraction';
-  var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  var browser = getBrowserInfo();
   var renderButton = function renderButton() {
     return (
       // eslint-disable-next-line @atlaskit/design-system/no-html-button

package/dist/esm/ui/drag-preview.js

@@ -1,6 +1,5 @@
 import _typeof from "@babel/runtime/helpers/typeof";
-import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 var previewStyle = {
   borderColor: "var(--ds-border, #0B120E24)",
   borderStyle: 'solid',
@@ -62,7 +61,7 @@ var createContentPreviewElement = function createContentPreviewElement(dom, node
   // Ignored via go/ees005
   // eslint-disable-next-line @atlaskit/editor/no-as-casting
   dom.cloneNode(true);
-  var browser = expValEquals('platform_editor_hydratable_ui', 'isEnabled', true) ? getBrowserInfo() : browserLegacy;
+  var browser = getBrowserInfo();
   clonedDom.style.marginLeft = '0';
   clonedDom.style.marginTop = nodeSpacing ? "".concat(nodeSpacing.top) : '0';
   clonedDom.style.marginRight = '0';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "9.1.16",
+	"version": "9.1.18",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -47,8 +47,8 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^34.0.0",
-		"@atlaskit/icon-lab": "^6.4.0",
+		"@atlaskit/icon": "^34.1.0",
+		"@atlaskit/icon-lab": "^6.5.0",
 		"@atlaskit/link": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/theme": "^23.0.0",
-		"@atlaskit/tmp-editor-statsig": "^61.0.0",
+		"@atlaskit/tmp-editor-statsig": "^62.2.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^21.1.0",
 		"@babel/runtime": "^7.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.20.0",
+		"@atlaskit/editor-common": "^112.21.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -132,9 +132,6 @@
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_v2_patch_3": {
-			"type": "boolean"
-		},
 		"platform_editor_table_sticky_header_patch_6": {
 			"type": "boolean"
 		},