@atlaskit/editor-common 74.9.1 → 74.10.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-common
 
+## 74.10.0
+
+### Minor Changes
+
+- [`ac5a05f5929`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ac5a05f5929) - We are testing an upgrade to the `focus-trap` dependency behind a feature flag. If this fix is successful it will be available in a later release.
+
+## 74.9.2
+
+### Patch Changes
+
+- [`87070f514cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/87070f514cd) - [ux] ED-18024 Adds an enter keydown handler on the main toolbar droplist (BlockInsertMenuLegacy) to prevent the editor capturing the keypress when the keyboard is used to insert nodes.
+
 ## 74.9.1
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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 = "74.9.1";
+var packageVersion = "74.10.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -24,7 +24,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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.9.1";
+var packageVersion = "74.10.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -19,10 +19,12 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _focusTrap = _interopRequireDefault(require("focus-trap"));
+var _focusTrap = require("focus-trap");
+var _focusTrapV = _interopRequireDefault(require("focus-trap-v2"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _reactDom = require("react-dom");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("./utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -75,7 +77,11 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         fallbackFocus: popup,
         returnFocusOnDeactivate: false
       };
-      _this.focusTrap = (0, _focusTrap.default)(popup, trapConfig);
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.design-system-team.focus-trap-upgrade_p2cei')) {
+        _this.focusTrap = (0, _focusTrap.createFocusTrap)(popup, trapConfig);
+      } else {
+        _this.focusTrap = (0, _focusTrapV.default)(popup, trapConfig);
+      }
       _this.focusTrap.activate();
     }));
     return _this;

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

@@ -179,6 +179,10 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
         isTriggerNotTabbable: true,
         handleClickOutside: this.handleClose,
         handleEscapeKeydown: this.handleCloseAndFocus,
+        handleEnterKeydown: function handleEnterKeydown(e) {
+          e.preventDefault();
+          e.stopPropagation();
+        },
         targetRef: this.state.target
       }, (0, _react2.jsx)("div", {
         style: {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.9.1",
+	"version": "74.10.0",
 	"sideEffects": false
 }

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

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

@@ -8,7 +8,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "74.9.1";
+const packageVersion = "74.10.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -1,9 +1,11 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
-import createFocusTrap from 'focus-trap';
+import { createFocusTrap } from 'focus-trap';
+import createFocusTrapV2 from 'focus-trap-v2';
 import rafSchedule from 'raf-schd';
 import { createPortal } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { calculatePlacement, calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 export default class Popup extends React.Component {
   constructor(...args) {
@@ -43,7 +45,11 @@ export default class Popup extends React.Component {
         fallbackFocus: popup,
         returnFocusOnDeactivate: false
       };
-      this.focusTrap = createFocusTrap(popup, trapConfig);
+      if (getBooleanFF('platform.design-system-team.focus-trap-upgrade_p2cei')) {
+        this.focusTrap = createFocusTrap(popup, trapConfig);
+      } else {
+        this.focusTrap = createFocusTrapV2(popup, trapConfig);
+      }
       this.focusTrap.activate();
     }));
   }

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

@@ -187,6 +187,10 @@ export default class DropdownMenuWrapper extends PureComponent {
       isTriggerNotTabbable: true,
       handleClickOutside: this.handleClose,
       handleEscapeKeydown: this.handleCloseAndFocus,
+      handleEnterKeydown: e => {
+        e.preventDefault();
+        e.stopPropagation();
+      },
       targetRef: this.state.target
     }, jsx("div", {
       style: {

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.9.1",
+	"version": "74.10.0",
 	"sideEffects": false
 }

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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 = "74.9.1";
+var packageVersion = "74.10.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -18,7 +18,7 @@ import { themed } from '@atlaskit/theme/components';
 import { borderRadius } from '@atlaskit/theme/constants';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "74.9.1";
+var packageVersion = "74.10.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -10,10 +10,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 import React from 'react';
-import createFocusTrap from 'focus-trap';
+import { createFocusTrap } from 'focus-trap';
+import createFocusTrapV2 from 'focus-trap-v2';
 import rafSchedule from 'raf-schd';
 import { createPortal } from 'react-dom';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { calculatePlacement, calculatePosition as _calculatePosition, findOverflowScrollParent, validatePosition } from './utils';
 var Popup = /*#__PURE__*/function (_React$Component) {
   _inherits(Popup, _React$Component);
@@ -62,7 +64,11 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         fallbackFocus: popup,
         returnFocusOnDeactivate: false
       };
-      _this.focusTrap = createFocusTrap(popup, trapConfig);
+      if (getBooleanFF('platform.design-system-team.focus-trap-upgrade_p2cei')) {
+        _this.focusTrap = createFocusTrap(popup, trapConfig);
+      } else {
+        _this.focusTrap = createFocusTrapV2(popup, trapConfig);
+      }
       _this.focusTrap.activate();
     }));
     return _this;

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

@@ -169,6 +169,10 @@ var DropdownMenuWrapper = /*#__PURE__*/function (_PureComponent) {
         isTriggerNotTabbable: true,
         handleClickOutside: this.handleClose,
         handleEscapeKeydown: this.handleCloseAndFocus,
+        handleEnterKeydown: function handleEnterKeydown(e) {
+          e.preventDefault();
+          e.stopPropagation();
+        },
         targetRef: this.state.target
       }, jsx("div", {
         style: {

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "74.9.1",
+	"version": "74.10.0",
 	"sideEffects": false
 }

package/dist/types/ui/Popup/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FocusTrap } from 'focus-trap';
 import { Position } from './utils';
 export interface Props {
     zIndex?: number;
@@ -69,7 +70,7 @@ export default class Popup extends React.Component<Props, State> {
     /**
      * Handle pausing, unpausing, and initialising (if not yet initialised) of the focus trap
      */
-    handleChangedFocusTrapProp(prevProps: Props): void;
+    handleChangedFocusTrapProp(prevProps: Props): void | FocusTrap;
     componentDidUpdate(prevProps: Props): void;
     componentDidMount(): void;
     componentWillUnmount(): void;

package/dist/types-ts4.5/ui/Popup/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { FocusTrap } from 'focus-trap';
 import { Position } from './utils';
 export interface Props {
     zIndex?: number;
@@ -72,7 +73,7 @@ export default class Popup extends React.Component<Props, State> {
     /**
      * Handle pausing, unpausing, and initialising (if not yet initialised) of the focus trap
      */
-    handleChangedFocusTrapProp(prevProps: Props): void;
+    handleChangedFocusTrapProp(prevProps: Props): void | FocusTrap;
     componentDidUpdate(prevProps: Props): void;
     componentDidMount(): void;
     componentWillUnmount(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "74.9.1",
+  "version": "74.10.0",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -92,7 +92,7 @@
     "@atlaskit/media-client": "^23.1.0",
     "@atlaskit/media-picker": "^66.1.0",
     "@atlaskit/mention": "^22.1.0",
-    "@atlaskit/menu": "^1.7.0",
+    "@atlaskit/menu": "^1.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/profilecard": "^19.5.0",
     "@atlaskit/smart-user-picker": "^6.1.0",
@@ -113,7 +113,8 @@
     "chromatism": "^2.6.0",
     "classnames": "^2.2.5",
     "date-fns": "^2.17.0",
-    "focus-trap": "^2.4.5",
+    "focus-trap": "^7.0.0",
+    "focus-trap-v2": "npm:focus-trap@^2.4.5",
     "linkify-it": "^2.0.3",
     "lodash": "^4.17.21",
     "markdown-it": "^12.3.2",
@@ -152,6 +153,7 @@
     "@atlaskit/util-data-test": "^17.8.0",
     "@atlaskit/visual-regression": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
+    "@atlassian/feature-flags-test-utils": "*",
     "@sentry/types": "^6.18.2",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
@@ -188,6 +190,9 @@
     },
     "platform.design-system-team.menu-selected-state-change_0see9": {
       "type": "boolean"
+    },
+    "platform.design-system-team.focus-trap-upgrade_p2cei": {
+      "type": "boolean"
     }
   }
 }