@atlaskit/editor-common 78.20.1 → 78.20.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-common
 
+## 78.20.2
+
+### Patch Changes
+
+- [#84054](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/84054) [`43605c45b445`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/43605c45b445) - EDF-468 Added disableFloatingToolbar plugin option to disable showing floating toolbar when hyperlink is clicked.
+- [#83121](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/83121) [`97ee7097d940`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/97ee7097d940) - [ux] Prevents contenteditable inside resize handle.
+
 ## 78.20.1
 
 ### Patch Changes

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.20.1";
+var packageVersion = "78.20.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/resizer/Resizer.js

@@ -13,6 +13,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _reResizable = require("re-resizable");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _resizer = require("../styles/shared/resizer");
 var _excluded = ["width", "children", "handleClassName", "className", "handleResize", "handleResizeStart", "handleResizeStop", "handleSize", "handleAlignmentMethod", "handlePositioning", "appearance", "handleStyles", "resizeRatio", "snap", "snapGap", "isHandleVisible", "handleHighlight", "handleTooltipContent", "needExtendedResizeZone"];
@@ -21,6 +22,15 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 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) { (0, _defineProperty2.default)(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 SUPPORTED_HANDLES = ['left', 'right'];
+var inheritedCSS = {
+  position: 'inherit',
+  height: 'inherit',
+  width: 'inherit',
+  display: 'inherit',
+  flexDirection: 'inherit',
+  justifyContent: 'inherit',
+  alignItems: 'inherit'
+};
 var ResizerNext = function ResizerNext(props, ref) {
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -127,23 +137,49 @@ var ResizerNext = function ResizerNext(props, ref) {
       if ((!handleHighlight || handleHighlight === 'none') && !handleTooltipContent) {
         return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, thumb));
       }
-      var thumbWithTrack =
-      /*#__PURE__*/
-      //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
-      _react.default.createElement(_react.default.Fragment, null, thumb, /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames3.default)(_resizer.resizerHandleTrackClassName, handleHighlight),
-        "data-testid": "resizer-handle-".concat(position, "-track")
-      }));
-      if (!!handleTooltipContent) {
-        return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
-          content: handleTooltipContent,
-          hideTooltipOnClick: true,
-          position: "mouse",
-          mousePosition: "auto-start",
-          testId: "resizer-handle-".concat(position, "-tooltip")
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.resizer.prevent-contenteditable')) {
+        var thumbWithTrack =
+        /*#__PURE__*/
+        //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
+        _react.default.createElement(_react.default.Fragment, null, thumb, /*#__PURE__*/_react.default.createElement("div", {
+          className: (0, _classnames3.default)(_resizer.resizerHandleTrackClassName, handleHighlight),
+          "data-testid": "resizer-handle-".concat(position, "-track")
+        }));
+        if (!!handleTooltipContent) {
+          return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, /*#__PURE__*/_react.default.createElement("div", {
+            contentEditable: false,
+            style: inheritedCSS
+          }, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+            content: handleTooltipContent,
+            hideTooltipOnClick: true,
+            position: "mouse",
+            mousePosition: "auto-start",
+            testId: "resizer-handle-".concat(position, "-tooltip")
+          }, thumbWithTrack))));
+        }
+        return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, /*#__PURE__*/_react.default.createElement("div", {
+          contentEditable: false,
+          style: inheritedCSS
         }, thumbWithTrack)));
+      } else {
+        var _thumbWithTrack =
+        /*#__PURE__*/
+        //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
+        _react.default.createElement(_react.default.Fragment, null, thumb, /*#__PURE__*/_react.default.createElement("div", {
+          className: (0, _classnames3.default)(_resizer.resizerHandleTrackClassName, handleHighlight),
+          "data-testid": "resizer-handle-".concat(position, "-track")
+        }));
+        if (!!handleTooltipContent) {
+          return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+            content: handleTooltipContent,
+            hideTooltipOnClick: true,
+            position: "mouse",
+            mousePosition: "auto-start",
+            testId: "resizer-handle-".concat(position, "-tooltip")
+          }, _thumbWithTrack)));
+        }
+        return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, _thumbWithTrack));
       }
-      return _objectSpread(_objectSpread({}, result), {}, (0, _defineProperty2.default)({}, position, thumbWithTrack));
     }, {});
   }, [handleHighlight, handleTooltipContent]);
 

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

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 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.20.1";
+var packageVersion = "78.20.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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.20.1";
+const packageVersion = "78.20.2";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/resizer/Resizer.js

@@ -2,9 +2,19 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import classnames from 'classnames';
 import { Resizable } from 're-resizable';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Tooltip from '@atlaskit/tooltip';
 import { handleWrapperClass, resizerDangerClassName, resizerExtendedZone, resizerHandleClassName, resizerHandleThumbClassName, resizerHandleTrackClassName, resizerHandleZIndex, resizerHoverZoneClassName, resizerItemClassName } from '../styles/shared/resizer';
 const SUPPORTED_HANDLES = ['left', 'right'];
+const inheritedCSS = {
+  position: 'inherit',
+  height: 'inherit',
+  width: 'inherit',
+  display: 'inherit',
+  flexDirection: 'inherit',
+  justifyContent: 'inherit',
+  alignItems: 'inherit'
+};
 const ResizerNext = (props, ref) => {
   const [isResizing, setIsResizing] = useState(false);
   const resizable = useRef(null);
@@ -114,29 +124,61 @@ const ResizerNext = (props, ref) => {
           [position]: thumb
         };
       }
-      const thumbWithTrack =
-      /*#__PURE__*/
-      //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
-      React.createElement(React.Fragment, null, thumb, /*#__PURE__*/React.createElement("div", {
-        className: classnames(resizerHandleTrackClassName, handleHighlight),
-        "data-testid": `resizer-handle-${position}-track`
-      }));
-      if (!!handleTooltipContent) {
+      if (getBooleanFF('platform.editor.resizer.prevent-contenteditable')) {
+        const thumbWithTrack =
+        /*#__PURE__*/
+        //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
+        React.createElement(React.Fragment, null, thumb, /*#__PURE__*/React.createElement("div", {
+          className: classnames(resizerHandleTrackClassName, handleHighlight),
+          "data-testid": `resizer-handle-${position}-track`
+        }));
+        if (!!handleTooltipContent) {
+          return {
+            ...result,
+            [position]: /*#__PURE__*/React.createElement("div", {
+              contentEditable: false,
+              style: inheritedCSS
+            }, /*#__PURE__*/React.createElement(Tooltip, {
+              content: handleTooltipContent,
+              hideTooltipOnClick: true,
+              position: "mouse",
+              mousePosition: "auto-start",
+              testId: `resizer-handle-${position}-tooltip`
+            }, thumbWithTrack))
+          };
+        }
         return {
           ...result,
-          [position]: /*#__PURE__*/React.createElement(Tooltip, {
-            content: handleTooltipContent,
-            hideTooltipOnClick: true,
-            position: "mouse",
-            mousePosition: "auto-start",
-            testId: `resizer-handle-${position}-tooltip`
+          [position]: /*#__PURE__*/React.createElement("div", {
+            contentEditable: false,
+            style: inheritedCSS
           }, thumbWithTrack)
         };
+      } else {
+        const thumbWithTrack =
+        /*#__PURE__*/
+        //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
+        React.createElement(React.Fragment, null, thumb, /*#__PURE__*/React.createElement("div", {
+          className: classnames(resizerHandleTrackClassName, handleHighlight),
+          "data-testid": `resizer-handle-${position}-track`
+        }));
+        if (!!handleTooltipContent) {
+          return {
+            ...result,
+            [position]: /*#__PURE__*/React.createElement(Tooltip, {
+              content: handleTooltipContent,
+              hideTooltipOnClick: true,
+              position: "mouse",
+              mousePosition: "auto-start",
+              testId: `resizer-handle-${position}-tooltip`
+            }, thumbWithTrack)
+          };
+        }
+        return {
+          ...result,
+          [position]: thumbWithTrack
+        };
       }
-      return {
-        ...result,
-        [position]: thumbWithTrack
-      };
     }, {});
   }, [handleHighlight, handleTooltipContent]);
 

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.20.1";
+const packageVersion = "78.20.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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.20.1";
+var packageVersion = "78.20.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/resizer/Resizer.js

@@ -8,9 +8,19 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import classnames from 'classnames';
 import { Resizable } from 're-resizable';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Tooltip from '@atlaskit/tooltip';
 import { handleWrapperClass, resizerDangerClassName, resizerExtendedZone, resizerHandleClassName, resizerHandleThumbClassName, resizerHandleTrackClassName, resizerHandleZIndex, resizerHoverZoneClassName, resizerItemClassName } from '../styles/shared/resizer';
 var SUPPORTED_HANDLES = ['left', 'right'];
+var inheritedCSS = {
+  position: 'inherit',
+  height: 'inherit',
+  width: 'inherit',
+  display: 'inherit',
+  flexDirection: 'inherit',
+  justifyContent: 'inherit',
+  alignItems: 'inherit'
+};
 var ResizerNext = function ResizerNext(props, ref) {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -117,23 +127,49 @@ var ResizerNext = function ResizerNext(props, ref) {
       if ((!handleHighlight || handleHighlight === 'none') && !handleTooltipContent) {
         return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, thumb));
       }
-      var thumbWithTrack =
-      /*#__PURE__*/
-      //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
-      React.createElement(React.Fragment, null, thumb, /*#__PURE__*/React.createElement("div", {
-        className: classnames(resizerHandleTrackClassName, handleHighlight),
-        "data-testid": "resizer-handle-".concat(position, "-track")
-      }));
-      if (!!handleTooltipContent) {
-        return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, /*#__PURE__*/React.createElement(Tooltip, {
-          content: handleTooltipContent,
-          hideTooltipOnClick: true,
-          position: "mouse",
-          mousePosition: "auto-start",
-          testId: "resizer-handle-".concat(position, "-tooltip")
+      if (getBooleanFF('platform.editor.resizer.prevent-contenteditable')) {
+        var thumbWithTrack =
+        /*#__PURE__*/
+        //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
+        React.createElement(React.Fragment, null, thumb, /*#__PURE__*/React.createElement("div", {
+          className: classnames(resizerHandleTrackClassName, handleHighlight),
+          "data-testid": "resizer-handle-".concat(position, "-track")
+        }));
+        if (!!handleTooltipContent) {
+          return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, /*#__PURE__*/React.createElement("div", {
+            contentEditable: false,
+            style: inheritedCSS
+          }, /*#__PURE__*/React.createElement(Tooltip, {
+            content: handleTooltipContent,
+            hideTooltipOnClick: true,
+            position: "mouse",
+            mousePosition: "auto-start",
+            testId: "resizer-handle-".concat(position, "-tooltip")
+          }, thumbWithTrack))));
+        }
+        return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, /*#__PURE__*/React.createElement("div", {
+          contentEditable: false,
+          style: inheritedCSS
         }, thumbWithTrack)));
+      } else {
+        var _thumbWithTrack =
+        /*#__PURE__*/
+        //It's important to have {thumb} element before the div, the thumb element is the one that gets focus and only the 1st element recives aria-descibedby attribute which is important for screen reader users
+        React.createElement(React.Fragment, null, thumb, /*#__PURE__*/React.createElement("div", {
+          className: classnames(resizerHandleTrackClassName, handleHighlight),
+          "data-testid": "resizer-handle-".concat(position, "-track")
+        }));
+        if (!!handleTooltipContent) {
+          return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, /*#__PURE__*/React.createElement(Tooltip, {
+            content: handleTooltipContent,
+            hideTooltipOnClick: true,
+            position: "mouse",
+            mousePosition: "auto-start",
+            testId: "resizer-handle-".concat(position, "-tooltip")
+          }, _thumbWithTrack)));
+        }
+        return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, _thumbWithTrack));
       }
-      return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, position, thumbWithTrack));
     }, {});
   }, [handleHighlight, handleTooltipContent]);
 

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

@@ -17,7 +17,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.20.1";
+var packageVersion = "78.20.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/types/hyperlink.d.ts

@@ -32,4 +32,5 @@ export interface HyperlinkPluginOptions {
     platform?: 'mobile' | 'web';
     editorAppearance?: EditorAppearance;
     lpLinkPicker?: boolean;
+    disableFloatingToolbar?: boolean;
 }

package/dist/types-ts4.5/types/hyperlink.d.ts

@@ -32,4 +32,5 @@ export interface HyperlinkPluginOptions {
     platform?: 'mobile' | 'web';
     editorAppearance?: EditorAppearance;
     lpLinkPicker?: boolean;
+    disableFloatingToolbar?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.20.1",
+  "version": "78.20.2",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -234,6 +234,9 @@
     "platform.editor.ordered-list-auto-join-improvements_mrlv5": {
       "type": "boolean"
     },
+    "platform.editor.resizer.prevent-contenteditable": {
+      "type": "boolean"
+    },
     "platform.editor.a11y-floating-toolbar-markup_vexmo": {
       "type": "boolean"
     },