@atlaskit/editor-common 78.33.3 → 78.33.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 78.33.4
+
+### Patch Changes
+
+- [#94715](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94715) [`6606b85603b4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6606b85603b4) - [ux] Fixes issue where label hides behind smart link
+- [#92552](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92552) [`7cd874b858c8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7cd874b858c8) - Check target elements are actually HTMLElement rather than typecasting.
+- Updated dependencies
+
 ## 78.33.3
 
 ### Patch Changes

package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -12,6 +12,7 @@ var _colors = require("@atlaskit/theme/colors");
 /** @jsx jsx */
 
 var labelStyles = (0, _react2.css)({
+  zIndex: 1,
   opacity: 0,
   display: 'inline-flex',
   width: 'max-content',
@@ -22,7 +23,7 @@ var labelStyles = (0, _react2.css)({
   top: '-19px',
   '&.inline': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-    top: '-17px',
+    top: '-18px',
     marginLeft: "var(--ds-space-150, 12px)"
   },
   '&.show-label': {

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.33.3";
+var packageVersion = "78.33.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/selection/index.js

@@ -132,6 +132,7 @@ Object.defineProperty(exports, "startPositionOfParent", {
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorTables = require("@atlaskit/editor-tables");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _types = require("./types");
 var _selection = require("./gap-cursor/selection");
@@ -233,13 +234,22 @@ function createSelectionClickHandler(nodes, isValidTarget, options) {
       return false;
     }
     if (direct && nodes.indexOf(node.type.name) !== -1) {
-      if (event.target) {
-        var _target = event.target;
-        if (isValidTarget(_target)) {
+      var _target = event.target;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+        if (_target instanceof HTMLElement && isValidTarget(_target)) {
           var selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
           selectNode(selectionPos)(view.state, view.dispatch);
           return true;
         }
+      } else {
+        if (event.target) {
+          var _target2 = event.target;
+          if (isValidTarget(_target2)) {
+            var _selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
+            selectNode(_selectionPos)(view.state, view.dispatch);
+            return true;
+          }
+        }
       }
     }
     return false;

package/dist/cjs/ui/DropList/index.js

@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.33.3";
+var packageVersion = "78.33.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/cjs/ui-menu/ArrowKeyNavigationProvider/MenuArrowKeyNavigationProvider/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.MenuArrowKeyNavigationProvider = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var hasEnabledItems = function hasEnabledItems(list) {
@@ -81,7 +82,6 @@ var MenuArrowKeyNavigationProvider = exports.MenuArrowKeyNavigationProvider = fu
      * @param event
      */
     var handleKeyDown = function handleKeyDown(event) {
-      var _wrapperRef$current;
       var targetElement = event.target;
 
       // Tab key on menu items can be handled in the parent components of dropdown menus with KeydownHandlerContext
@@ -96,8 +96,16 @@ var MenuArrowKeyNavigationProvider = exports.MenuArrowKeyNavigationProvider = fu
       if (!focusableElements || (focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements.length) === 0) {
         return;
       }
-      if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
-        setCurrentSelectedItemIndex(-1);
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+        var _wrapperRef$current;
+        if (targetElement instanceof HTMLElement && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
+          setCurrentSelectedItemIndex(-1);
+        }
+      } else {
+        var _wrapperRef$current2;
+        if (!((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
+          setCurrentSelectedItemIndex(-1);
+        }
       }
       switch (event.key) {
         case 'ArrowDown':
@@ -125,22 +133,46 @@ var MenuArrowKeyNavigationProvider = exports.MenuArrowKeyNavigationProvider = fu
         // then logic to retain the focus can be handled in the parent components with KeydownHandlerContext
         case 'ArrowLeft':
           // Filter out the events from outside the menu
-          if (!targetElement.closest('.custom-key-handler-wrapper')) {
-            return;
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
+          } else {
+            if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest('.custom-key-handler-wrapper'))) {
+              return;
+            }
           }
           handleClose(event);
-          if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
-            keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowLeft();
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowLeft();
+            }
+          } else {
+            if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest('[data-testid="editor-floating-toolbar"]'))) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowLeft();
+            }
           }
           break;
         case 'ArrowRight':
           // Filter out the events from outside the menu
-          if (!targetElement.closest('.custom-key-handler-wrapper')) {
-            return;
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
+          } else {
+            if (!targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
           }
           handleClose(event);
-          if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
-            keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowRight();
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowRight();
+            }
+          } else {
+            if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowRight();
+            }
           }
           break;
         case 'Escape':

package/dist/cjs/ui-menu/DropdownMenu/index.js

@@ -291,7 +291,11 @@ function DropdownMenuItem(_ref) {
     }, item.content);
   }
   var _handleSubmenuActive = function _handleSubmenuActive(event) {
-    setSubmenuActive(!!event.target.closest(".".concat(_styles.DropdownMenuSharedCssClassName.SUBMENU)));
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+      setSubmenuActive(Boolean(event.target instanceof HTMLElement && event.target.closest(".".concat(_styles.DropdownMenuSharedCssClassName.SUBMENU))));
+    } else {
+      setSubmenuActive(!!event.target.closest(".".concat(_styles.DropdownMenuSharedCssClassName.SUBMENU)));
+    }
   };
   var dropListItem = (0, _react2.jsx)("div", {
     css: function css() {

package/dist/cjs/ui-menu/ToolbarArrowKeyNavigationProvider/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.ToolbarArrowKeyNavigationProvider = exports.KeyDownHandlerContext = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _messages = require("../../messages");
 var _ui = require("../../ui");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -115,18 +116,31 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
      * @param event
      */
     var handleKeyDown = function handleKeyDown(event) {
-      var _document$querySelect, _document$querySelect2, _wrapperRef$current;
       // To trap the focus inside the horizontal toolbar for left and right arrow keys
       var targetElement = event.target;
 
       // To filter out the events outside the child component
-      if (!targetElement.closest("".concat(childComponentSelector))) {
-        return;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+        if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
+          return;
+        }
+      } else {
+        if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest("".concat(childComponentSelector)))) {
+          return;
+        }
       }
 
       // The key events are from child components such as dropdown menus / popups are ignored
-      if ((_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
-        return;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+        var _document$querySelect, _document$querySelect2;
+        if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+          return;
+        }
+      } else {
+        var _document$querySelect3, _document$querySelect4;
+        if ((_document$querySelect3 = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect3 !== void 0 && _document$querySelect3.contains(targetElement) || (_document$querySelect4 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect4 !== void 0 && _document$querySelect4.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+          return;
+        }
       }
       var menuWrapper = document.querySelector('.menu-key-handler-wrapper');
       if (menuWrapper) {
@@ -140,10 +154,20 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
 
       // This is kind of hack to reset the current focused toolbar item
       // to handle some use cases such as Tab in/out of main toolbar
-      if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
-        selectedItemIndex.current = -1;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+        var _wrapperRef$current;
+        if (targetElement instanceof HTMLElement && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
+          selectedItemIndex.current = -1;
+        } else {
+          selectedItemIndex.current = targetElement instanceof HTMLElement && filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        }
       } else {
-        selectedItemIndex.current = filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        var _wrapperRef$current2;
+        if (!((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
+          selectedItemIndex.current = -1;
+        } else {
+          selectedItemIndex.current = filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        }
       }
 
       // do not scroll to focused element for sticky toolbar when navigating with arrows to avoid unnesessary scroll jump

package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -4,6 +4,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { N0, N30, N40, N500 } from '@atlaskit/theme/colors';
 const labelStyles = css({
+  zIndex: 1,
   opacity: 0,
   display: 'inline-flex',
   width: 'max-content',
@@ -14,7 +15,7 @@ const labelStyles = css({
   top: '-19px',
   '&.inline': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-    top: '-17px',
+    top: '-18px',
     marginLeft: "var(--ds-space-150, 12px)"
   },
   '&.show-label': {

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.33.3";
+const packageVersion = "78.33.4";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/selection/index.js

@@ -1,6 +1,7 @@
 import { AllSelection, NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { selectedRect } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../analytics';
 export { RelativeSelectionPos } from './types';
 export { GapCursorSelection, Side, JSON_ID, GapBookmark } from './gap-cursor/selection';
@@ -102,13 +103,22 @@ export function createSelectionClickHandler(nodes, isValidTarget, options) {
       return false;
     }
     if (direct && nodes.indexOf(node.type.name) !== -1) {
-      if (event.target) {
-        const target = event.target;
-        if (isValidTarget(target)) {
+      const target = event.target;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        if (target instanceof HTMLElement && isValidTarget(target)) {
           const selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
           selectNode(selectionPos)(view.state, view.dispatch);
           return true;
         }
+      } else {
+        if (event.target) {
+          const target = event.target;
+          if (isValidTarget(target)) {
+            const selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
+            selectNode(selectionPos)(view.state, view.dispatch);
+            return true;
+          }
+        }
       }
     }
     return false;

package/dist/es2019/ui/DropList/index.js

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.33.3";
+const packageVersion = "78.33.4";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/es2019/ui-menu/ArrowKeyNavigationProvider/MenuArrowKeyNavigationProvider/index.js

@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const hasEnabledItems = list => list.some(item => item.getAttribute('aria-disabled') !== 'true');
 
 /**
@@ -62,7 +63,6 @@ export const MenuArrowKeyNavigationProvider = ({
      * @param event
      */
     const handleKeyDown = event => {
-      var _wrapperRef$current;
       const targetElement = event.target;
 
       // Tab key on menu items can be handled in the parent components of dropdown menus with KeydownHandlerContext
@@ -77,8 +77,16 @@ export const MenuArrowKeyNavigationProvider = ({
       if (!focusableElements || (focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements.length) === 0) {
         return;
       }
-      if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
-        setCurrentSelectedItemIndex(-1);
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        var _wrapperRef$current;
+        if (targetElement instanceof HTMLElement && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
+          setCurrentSelectedItemIndex(-1);
+        }
+      } else {
+        var _wrapperRef$current2;
+        if (!((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
+          setCurrentSelectedItemIndex(-1);
+        }
       }
       switch (event.key) {
         case 'ArrowDown':
@@ -106,22 +114,46 @@ export const MenuArrowKeyNavigationProvider = ({
         // then logic to retain the focus can be handled in the parent components with KeydownHandlerContext
         case 'ArrowLeft':
           // Filter out the events from outside the menu
-          if (!targetElement.closest('.custom-key-handler-wrapper')) {
-            return;
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
+          } else {
+            if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest('.custom-key-handler-wrapper'))) {
+              return;
+            }
           }
           handleClose(event);
-          if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
-            keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowLeft();
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowLeft();
+            }
+          } else {
+            if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest('[data-testid="editor-floating-toolbar"]'))) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowLeft();
+            }
           }
           break;
         case 'ArrowRight':
           // Filter out the events from outside the menu
-          if (!targetElement.closest('.custom-key-handler-wrapper')) {
-            return;
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
+          } else {
+            if (!targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
           }
           handleClose(event);
-          if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
-            keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowRight();
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowRight();
+            }
+          } else {
+            if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 ? void 0 : keyDownHandlerContext.handleArrowRight();
+            }
           }
           break;
         case 'Escape':

package/dist/es2019/ui-menu/DropdownMenu/index.js

@@ -283,7 +283,11 @@ export function DropdownMenuItem({
     }, item.content);
   }
   const _handleSubmenuActive = event => {
-    setSubmenuActive(!!event.target.closest(`.${DropdownMenuSharedCssClassName.SUBMENU}`));
+    if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+      setSubmenuActive(Boolean(event.target instanceof HTMLElement && event.target.closest(`.${DropdownMenuSharedCssClassName.SUBMENU}`)));
+    } else {
+      setSubmenuActive(!!event.target.closest(`.${DropdownMenuSharedCssClassName.SUBMENU}`));
+    }
   };
   const dropListItem = jsx("div", {
     css: () => buttonStyles(item.isActive, submenuActive),

package/dist/es2019/ui-menu/ToolbarArrowKeyNavigationProvider/index.js

@@ -3,6 +3,7 @@
 
 import React, { useCallback, useLayoutEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { fullPageMessages as messages } from '../../messages';
 import { EDIT_AREA_ID } from '../../ui';
 /*
@@ -108,18 +109,31 @@ export const ToolbarArrowKeyNavigationProvider = ({
      * @param event
      */
     const handleKeyDown = event => {
-      var _document$querySelect, _document$querySelect2, _wrapperRef$current;
       // To trap the focus inside the horizontal toolbar for left and right arrow keys
       const targetElement = event.target;
 
       // To filter out the events outside the child component
-      if (!targetElement.closest(`${childComponentSelector}`)) {
-        return;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        if (targetElement instanceof HTMLElement && !targetElement.closest(`${childComponentSelector}`)) {
+          return;
+        }
+      } else {
+        if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest(`${childComponentSelector}`))) {
+          return;
+        }
       }
 
       // The key events are from child components such as dropdown menus / popups are ignored
-      if ((_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
-        return;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        var _document$querySelect, _document$querySelect2;
+        if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+          return;
+        }
+      } else {
+        var _document$querySelect3, _document$querySelect4;
+        if ((_document$querySelect3 = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect3 !== void 0 && _document$querySelect3.contains(targetElement) || (_document$querySelect4 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect4 !== void 0 && _document$querySelect4.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+          return;
+        }
       }
       const menuWrapper = document.querySelector('.menu-key-handler-wrapper');
       if (menuWrapper) {
@@ -133,10 +147,20 @@ export const ToolbarArrowKeyNavigationProvider = ({
 
       // This is kind of hack to reset the current focused toolbar item
       // to handle some use cases such as Tab in/out of main toolbar
-      if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
-        selectedItemIndex.current = -1;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        var _wrapperRef$current;
+        if (targetElement instanceof HTMLElement && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
+          selectedItemIndex.current = -1;
+        } else {
+          selectedItemIndex.current = targetElement instanceof HTMLElement && filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        }
       } else {
-        selectedItemIndex.current = filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        var _wrapperRef$current2;
+        if (!((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
+          selectedItemIndex.current = -1;
+        } else {
+          selectedItemIndex.current = filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        }
       }
 
       // do not scroll to focused element for sticky toolbar when navigating with arrows to avoid unnesessary scroll jump

package/dist/esm/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -4,6 +4,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { N0, N30, N40, N500 } from '@atlaskit/theme/colors';
 var labelStyles = css({
+  zIndex: 1,
   opacity: 0,
   display: 'inline-flex',
   width: 'max-content',
@@ -14,7 +15,7 @@ var labelStyles = css({
   top: '-19px',
   '&.inline': {
     // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
-    top: '-17px',
+    top: '-18px',
     marginLeft: "var(--ds-space-150, 12px)"
   },
   '&.show-label': {

package/dist/esm/monitoring/error.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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.33.3";
+var packageVersion = "78.33.4";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/selection/index.js

@@ -1,6 +1,7 @@
 import { AllSelection, NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { selectedRect } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '../analytics';
 export { RelativeSelectionPos } from './types';
 export { GapCursorSelection, Side, JSON_ID, GapBookmark } from './gap-cursor/selection';
@@ -102,13 +103,22 @@ export function createSelectionClickHandler(nodes, isValidTarget, options) {
       return false;
     }
     if (direct && nodes.indexOf(node.type.name) !== -1) {
-      if (event.target) {
-        var _target = event.target;
-        if (isValidTarget(_target)) {
+      var _target = event.target;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        if (_target instanceof HTMLElement && isValidTarget(_target)) {
           var selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
           selectNode(selectionPos)(view.state, view.dispatch);
           return true;
         }
+      } else {
+        if (event.target) {
+          var _target2 = event.target;
+          if (isValidTarget(_target2)) {
+            var _selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
+            selectNode(_selectionPos)(view.state, view.dispatch);
+            return true;
+          }
+        }
       }
     }
     return false;

package/dist/esm/ui/DropList/index.js

@@ -15,7 +15,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.33.3";
+var packageVersion = "78.33.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/esm/ui-menu/ArrowKeyNavigationProvider/MenuArrowKeyNavigationProvider/index.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var hasEnabledItems = function hasEnabledItems(list) {
   return list.some(function (item) {
     return item.getAttribute('aria-disabled') !== 'true';
@@ -71,7 +72,6 @@ export var MenuArrowKeyNavigationProvider = function MenuArrowKeyNavigationProvi
      * @param event
      */
     var handleKeyDown = function handleKeyDown(event) {
-      var _wrapperRef$current;
       var targetElement = event.target;
 
       // Tab key on menu items can be handled in the parent components of dropdown menus with KeydownHandlerContext
@@ -86,8 +86,16 @@ export var MenuArrowKeyNavigationProvider = function MenuArrowKeyNavigationProvi
       if (!focusableElements || (focusableElements === null || focusableElements === void 0 ? void 0 : focusableElements.length) === 0) {
         return;
       }
-      if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
-        setCurrentSelectedItemIndex(-1);
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        var _wrapperRef$current;
+        if (targetElement instanceof HTMLElement && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
+          setCurrentSelectedItemIndex(-1);
+        }
+      } else {
+        var _wrapperRef$current2;
+        if (!((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
+          setCurrentSelectedItemIndex(-1);
+        }
       }
       switch (event.key) {
         case 'ArrowDown':
@@ -115,22 +123,46 @@ export var MenuArrowKeyNavigationProvider = function MenuArrowKeyNavigationProvi
         // then logic to retain the focus can be handled in the parent components with KeydownHandlerContext
         case 'ArrowLeft':
           // Filter out the events from outside the menu
-          if (!targetElement.closest('.custom-key-handler-wrapper')) {
-            return;
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
+          } else {
+            if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest('.custom-key-handler-wrapper'))) {
+              return;
+            }
           }
           handleClose(event);
-          if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
-            keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowLeft();
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowLeft();
+            }
+          } else {
+            if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest('[data-testid="editor-floating-toolbar"]'))) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowLeft();
+            }
           }
           break;
         case 'ArrowRight':
           // Filter out the events from outside the menu
-          if (!targetElement.closest('.custom-key-handler-wrapper')) {
-            return;
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
+          } else {
+            if (!targetElement.closest('.custom-key-handler-wrapper')) {
+              return;
+            }
           }
           handleClose(event);
-          if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
-            keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowRight();
+          if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+            if (targetElement instanceof HTMLElement && !targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowRight();
+            }
+          } else {
+            if (!targetElement.closest('[data-testid="editor-floating-toolbar"]')) {
+              keyDownHandlerContext === null || keyDownHandlerContext === void 0 || keyDownHandlerContext.handleArrowRight();
+            }
           }
           break;
         case 'Escape':

package/dist/esm/ui-menu/DropdownMenu/index.js

@@ -282,7 +282,11 @@ export function DropdownMenuItem(_ref) {
     }, item.content);
   }
   var _handleSubmenuActive = function _handleSubmenuActive(event) {
-    setSubmenuActive(!!event.target.closest(".".concat(DropdownMenuSharedCssClassName.SUBMENU)));
+    if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+      setSubmenuActive(Boolean(event.target instanceof HTMLElement && event.target.closest(".".concat(DropdownMenuSharedCssClassName.SUBMENU))));
+    } else {
+      setSubmenuActive(!!event.target.closest(".".concat(DropdownMenuSharedCssClassName.SUBMENU)));
+    }
   };
   var dropListItem = jsx("div", {
     css: function css() {

package/dist/esm/ui-menu/ToolbarArrowKeyNavigationProvider/index.js

@@ -3,6 +3,7 @@
 
 import React, { useCallback, useLayoutEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { fullPageMessages as messages } from '../../messages';
 import { EDIT_AREA_ID } from '../../ui';
 /*
@@ -106,18 +107,31 @@ export var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigatio
      * @param event
      */
     var handleKeyDown = function handleKeyDown(event) {
-      var _document$querySelect, _document$querySelect2, _wrapperRef$current;
       // To trap the focus inside the horizontal toolbar for left and right arrow keys
       var targetElement = event.target;
 
       // To filter out the events outside the child component
-      if (!targetElement.closest("".concat(childComponentSelector))) {
-        return;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
+          return;
+        }
+      } else {
+        if (!(targetElement !== null && targetElement !== void 0 && targetElement.closest("".concat(childComponentSelector)))) {
+          return;
+        }
       }
 
       // The key events are from child components such as dropdown menus / popups are ignored
-      if ((_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
-        return;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        var _document$querySelect, _document$querySelect2;
+        if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+          return;
+        }
+      } else {
+        var _document$querySelect3, _document$querySelect4;
+        if ((_document$querySelect3 = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect3 !== void 0 && _document$querySelect3.contains(targetElement) || (_document$querySelect4 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect4 !== void 0 && _document$querySelect4.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+          return;
+        }
       }
       var menuWrapper = document.querySelector('.menu-key-handler-wrapper');
       if (menuWrapper) {
@@ -131,10 +145,20 @@ export var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigatio
 
       // This is kind of hack to reset the current focused toolbar item
       // to handle some use cases such as Tab in/out of main toolbar
-      if (!((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
-        selectedItemIndex.current = -1;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        var _wrapperRef$current;
+        if (targetElement instanceof HTMLElement && !((_wrapperRef$current = wrapperRef.current) !== null && _wrapperRef$current !== void 0 && _wrapperRef$current.contains(targetElement))) {
+          selectedItemIndex.current = -1;
+        } else {
+          selectedItemIndex.current = targetElement instanceof HTMLElement && filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        }
       } else {
-        selectedItemIndex.current = filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        var _wrapperRef$current2;
+        if (!((_wrapperRef$current2 = wrapperRef.current) !== null && _wrapperRef$current2 !== void 0 && _wrapperRef$current2.contains(targetElement))) {
+          selectedItemIndex.current = -1;
+        } else {
+          selectedItemIndex.current = filteredFocusableElements.indexOf(targetElement) > -1 ? filteredFocusableElements.indexOf(targetElement) : selectedItemIndex.current;
+        }
       }
 
       // do not scroll to focused element for sticky toolbar when navigating with arrows to avoid unnesessary scroll jump

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.33.3",
+  "version": "78.33.4",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -115,7 +115,7 @@
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/in-product-testing": "^0.2.0",
     "@atlaskit/link-datasource": "^1.29.0",
-    "@atlaskit/link-picker": "^1.35.0",
+    "@atlaskit/link-picker": "^1.36.0",
     "@atlaskit/media-card": "^77.11.0",
     "@atlaskit/media-client": "^26.3.0",
     "@atlaskit/media-client-react": "^2.0.0",
@@ -130,7 +130,7 @@
     "@atlaskit/primitives": "^5.6.0",
     "@atlaskit/profilecard": "^19.11.0",
     "@atlaskit/section-message": "^6.4.0",
-    "@atlaskit/smart-card": "^26.57.0",
+    "@atlaskit/smart-card": "^26.58.0",
     "@atlaskit/smart-user-picker": "^6.9.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/task-decision": "^17.9.0",
@@ -249,6 +249,9 @@
     },
     "platform.editor.mbe-update-params-change": {
       "type": "boolean"
+    },
+    "platform.editor.explicit-html-element-check": {
+      "type": "boolean"
     }
   }
 }