@atlaskit/editor-common 76.26.4 → 76.26.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-common
 
+## 76.26.6
+
+### Patch Changes
+
+- [#60295](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60295) [`48109245628a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/48109245628a) - Optimised the change node diff scan which occurs for every dispatched transaction within the editor
+
+## 76.26.5
+
+### Patch Changes
+
+- [#60035](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/60035) [`5cf5779a8cbe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5cf5779a8cbe) - [ux] [ED-19814] Fixed infinite loop when none of the dropdown menu items were enabled during keyboard navigation
+
 ## 76.26.4
 
 ### 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 = "76.26.4";
+var packageVersion = "76.26.6";
 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 = "76.26.4";
+var packageVersion = "76.26.6";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -10,6 +10,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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 hasEnabledItems = function hasEnabledItems(list) {
+  return list.some(function (item) {
+    return item.getAttribute('aria-disabled') !== 'true';
+  });
+};
+
 /**
  * This component is a wrapper of vertical menus which listens to keydown events of children
  * and handles up/down arrow key navigation
@@ -96,18 +102,22 @@ var MenuArrowKeyNavigationProvider = exports.MenuArrowKeyNavigationProvider = fu
       switch (event.key) {
         case 'ArrowDown':
           {
-            var _focusableElements$fo;
-            var focusIndex = incrementIndex(focusableElements);
-            (_focusableElements$fo = focusableElements[focusIndex]) === null || _focusableElements$fo === void 0 || _focusableElements$fo.focus();
-            event.preventDefault();
+            if (hasEnabledItems(focusableElements)) {
+              var _focusableElements$fo;
+              var focusIndex = incrementIndex(focusableElements);
+              (_focusableElements$fo = focusableElements[focusIndex]) === null || _focusableElements$fo === void 0 || _focusableElements$fo.focus();
+              event.preventDefault();
+            }
             break;
           }
         case 'ArrowUp':
           {
-            var _focusableElements$_f;
-            var _focusIndex = decrementIndex(focusableElements);
-            (_focusableElements$_f = focusableElements[_focusIndex]) === null || _focusableElements$_f === void 0 || _focusableElements$_f.focus();
-            event.preventDefault();
+            if (hasEnabledItems(focusableElements)) {
+              var _focusableElements$_f;
+              var _focusIndex = decrementIndex(focusableElements);
+              (_focusableElements$_f = focusableElements[_focusIndex]) === null || _focusableElements$_f === void 0 || _focusableElements$_f.focus();
+              event.preventDefault();
+            }
             break;
           }
 

package/dist/cjs/utils/nodes.js

@@ -9,6 +9,7 @@ exports.toJSON = toJSON;
 exports.validateNodes = exports.validNode = void 0;
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * Finds all top level nodes affected by the transaction
  * Uses from/to positions in transaction's steps to work out which nodes will
@@ -17,25 +18,36 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var findChangedNodesFromTransaction = exports.findChangedNodesFromTransaction = function findChangedNodesFromTransaction(tr) {
   var nodes = [];
   var steps = tr.steps || [];
-  steps.forEach(function (step) {
-    var to = step.to,
-      from = step.from,
-      slice = step.slice;
-    var size = slice && slice.content ? slice.content.size : 0;
-    var _loop = function _loop() {
-      if (i <= tr.doc.content.size) {
-        var topLevelNode = tr.doc.resolve(i).node(1);
-        if (topLevelNode && !nodes.find(function (n) {
-          return n === topLevelNode;
-        })) {
-          nodes.push(topLevelNode);
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.find-changed-nodes-from-transaction-optimisation')) {
+    steps.forEach(function (step) {
+      step.getMap().forEach(function (oldStart, oldEnd, newStart, newEnd) {
+        tr.doc.nodesBetween(newStart, newEnd, function (node) {
+          nodes.push(node);
+          return false;
+        });
+      });
+    });
+  } else {
+    steps.forEach(function (step) {
+      var to = step.to,
+        from = step.from,
+        slice = step.slice;
+      var size = slice && slice.content ? slice.content.size : 0;
+      var _loop = function _loop() {
+        if (i <= tr.doc.content.size) {
+          var topLevelNode = tr.doc.resolve(i).node(1);
+          if (topLevelNode && !nodes.find(function (n) {
+            return n === topLevelNode;
+          })) {
+            nodes.push(topLevelNode);
+          }
         }
+      };
+      for (var i = from; i <= to + size; i++) {
+        _loop();
       }
-    };
-    for (var i = from; i <= to + size; i++) {
-      _loop();
-    }
-  });
+    });
+  }
   return nodes;
 };
 var validNode = exports.validNode = function validNode(node) {

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 = "76.26.4";
+const packageVersion = "76.26.6";
 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

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

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

@@ -1,4 +1,6 @@
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+const hasEnabledItems = list => list.some(item => item.getAttribute('aria-disabled') !== 'true');
+
 /**
  * This component is a wrapper of vertical menus which listens to keydown events of children
  * and handles up/down arrow key navigation
@@ -81,18 +83,22 @@ export const MenuArrowKeyNavigationProvider = ({
       switch (event.key) {
         case 'ArrowDown':
           {
-            var _focusableElements$fo;
-            const focusIndex = incrementIndex(focusableElements);
-            (_focusableElements$fo = focusableElements[focusIndex]) === null || _focusableElements$fo === void 0 ? void 0 : _focusableElements$fo.focus();
-            event.preventDefault();
+            if (hasEnabledItems(focusableElements)) {
+              var _focusableElements$fo;
+              const focusIndex = incrementIndex(focusableElements);
+              (_focusableElements$fo = focusableElements[focusIndex]) === null || _focusableElements$fo === void 0 ? void 0 : _focusableElements$fo.focus();
+              event.preventDefault();
+            }
             break;
           }
         case 'ArrowUp':
           {
-            var _focusableElements$fo2;
-            const focusIndex = decrementIndex(focusableElements);
-            (_focusableElements$fo2 = focusableElements[focusIndex]) === null || _focusableElements$fo2 === void 0 ? void 0 : _focusableElements$fo2.focus();
-            event.preventDefault();
+            if (hasEnabledItems(focusableElements)) {
+              var _focusableElements$fo2;
+              const focusIndex = decrementIndex(focusableElements);
+              (_focusableElements$fo2 = focusableElements[focusIndex]) === null || _focusableElements$fo2 === void 0 ? void 0 : _focusableElements$fo2.focus();
+              event.preventDefault();
+            }
             break;
           }
 

package/dist/es2019/utils/nodes.js

@@ -1,5 +1,6 @@
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 /**
  * Finds all top level nodes affected by the transaction
  * Uses from/to positions in transaction's steps to work out which nodes will
@@ -8,22 +9,33 @@ import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export const findChangedNodesFromTransaction = tr => {
   const nodes = [];
   const steps = tr.steps || [];
-  steps.forEach(step => {
-    const {
-      to,
-      from,
-      slice
-    } = step;
-    const size = slice && slice.content ? slice.content.size : 0;
-    for (let i = from; i <= to + size; i++) {
-      if (i <= tr.doc.content.size) {
-        const topLevelNode = tr.doc.resolve(i).node(1);
-        if (topLevelNode && !nodes.find(n => n === topLevelNode)) {
-          nodes.push(topLevelNode);
+  if (getBooleanFF('platform.editor.find-changed-nodes-from-transaction-optimisation')) {
+    steps.forEach(step => {
+      step.getMap().forEach((oldStart, oldEnd, newStart, newEnd) => {
+        tr.doc.nodesBetween(newStart, newEnd, node => {
+          nodes.push(node);
+          return false;
+        });
+      });
+    });
+  } else {
+    steps.forEach(step => {
+      const {
+        to,
+        from,
+        slice
+      } = step;
+      const size = slice && slice.content ? slice.content.size : 0;
+      for (let i = from; i <= to + size; i++) {
+        if (i <= tr.doc.content.size) {
+          const topLevelNode = tr.doc.resolve(i).node(1);
+          if (topLevelNode && !nodes.find(n => n === topLevelNode)) {
+            nodes.push(topLevelNode);
+          }
         }
       }
-    }
-  });
+    });
+  }
   return nodes;
 };
 export const validNode = node => {

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 = "76.26.4";
+var packageVersion = "76.26.6";
 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

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

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

@@ -1,5 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
+var hasEnabledItems = function hasEnabledItems(list) {
+  return list.some(function (item) {
+    return item.getAttribute('aria-disabled') !== 'true';
+  });
+};
+
 /**
  * This component is a wrapper of vertical menus which listens to keydown events of children
  * and handles up/down arrow key navigation
@@ -86,18 +92,22 @@ export var MenuArrowKeyNavigationProvider = function MenuArrowKeyNavigationProvi
       switch (event.key) {
         case 'ArrowDown':
           {
-            var _focusableElements$fo;
-            var focusIndex = incrementIndex(focusableElements);
-            (_focusableElements$fo = focusableElements[focusIndex]) === null || _focusableElements$fo === void 0 || _focusableElements$fo.focus();
-            event.preventDefault();
+            if (hasEnabledItems(focusableElements)) {
+              var _focusableElements$fo;
+              var focusIndex = incrementIndex(focusableElements);
+              (_focusableElements$fo = focusableElements[focusIndex]) === null || _focusableElements$fo === void 0 || _focusableElements$fo.focus();
+              event.preventDefault();
+            }
             break;
           }
         case 'ArrowUp':
           {
-            var _focusableElements$_f;
-            var _focusIndex = decrementIndex(focusableElements);
-            (_focusableElements$_f = focusableElements[_focusIndex]) === null || _focusableElements$_f === void 0 || _focusableElements$_f.focus();
-            event.preventDefault();
+            if (hasEnabledItems(focusableElements)) {
+              var _focusableElements$_f;
+              var _focusIndex = decrementIndex(focusableElements);
+              (_focusableElements$_f = focusableElements[_focusIndex]) === null || _focusableElements$_f === void 0 || _focusableElements$_f.focus();
+              event.preventDefault();
+            }
             break;
           }
 

package/dist/esm/utils/nodes.js

@@ -1,5 +1,6 @@
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 /**
  * Finds all top level nodes affected by the transaction
  * Uses from/to positions in transaction's steps to work out which nodes will
@@ -8,25 +9,36 @@ import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export var findChangedNodesFromTransaction = function findChangedNodesFromTransaction(tr) {
   var nodes = [];
   var steps = tr.steps || [];
-  steps.forEach(function (step) {
-    var to = step.to,
-      from = step.from,
-      slice = step.slice;
-    var size = slice && slice.content ? slice.content.size : 0;
-    var _loop = function _loop() {
-      if (i <= tr.doc.content.size) {
-        var topLevelNode = tr.doc.resolve(i).node(1);
-        if (topLevelNode && !nodes.find(function (n) {
-          return n === topLevelNode;
-        })) {
-          nodes.push(topLevelNode);
+  if (getBooleanFF('platform.editor.find-changed-nodes-from-transaction-optimisation')) {
+    steps.forEach(function (step) {
+      step.getMap().forEach(function (oldStart, oldEnd, newStart, newEnd) {
+        tr.doc.nodesBetween(newStart, newEnd, function (node) {
+          nodes.push(node);
+          return false;
+        });
+      });
+    });
+  } else {
+    steps.forEach(function (step) {
+      var to = step.to,
+        from = step.from,
+        slice = step.slice;
+      var size = slice && slice.content ? slice.content.size : 0;
+      var _loop = function _loop() {
+        if (i <= tr.doc.content.size) {
+          var topLevelNode = tr.doc.resolve(i).node(1);
+          if (topLevelNode && !nodes.find(function (n) {
+            return n === topLevelNode;
+          })) {
+            nodes.push(topLevelNode);
+          }
         }
+      };
+      for (var i = from; i <= to + size; i++) {
+        _loop();
       }
-    };
-    for (var i = from; i <= to + size; i++) {
-      _loop();
-    }
-  });
+    });
+  }
   return nodes;
 };
 export var validNode = function validNode(node) {

package/dist/types/ui-menu/ArrowKeyNavigationProvider/types.d.ts

@@ -15,6 +15,7 @@ export type ColorPaletteArrowKeyNavigationOptions = {
     selectedColumnIndex: number;
     isOpenedByKeyboard: boolean;
     isPopupPositioned: boolean;
+    children?: React.ReactNode;
 };
 export type ColorPaletteArrowKeyNavigationProps = ColorPaletteArrowKeyNavigationOptions & {
     handleClose?: SimpleEventHandler<KeyboardEvent>;
@@ -25,6 +26,7 @@ export type MenuArrowKeyNavigationOptions = {
     type: ArrowKeyNavigationType.MENU;
     disableArrowKeyNavigation?: boolean;
     keyDownHandlerContext?: KeyDownHandlerContext;
+    children?: React.ReactNode;
 };
 export type MenuArrowKeyNavigationProviderProps = MenuArrowKeyNavigationOptions & {
     handleClose?: SimpleEventHandler<KeyboardEvent>;

package/dist/types-ts4.5/ui-menu/ArrowKeyNavigationProvider/types.d.ts

@@ -15,6 +15,7 @@ export type ColorPaletteArrowKeyNavigationOptions = {
     selectedColumnIndex: number;
     isOpenedByKeyboard: boolean;
     isPopupPositioned: boolean;
+    children?: React.ReactNode;
 };
 export type ColorPaletteArrowKeyNavigationProps = ColorPaletteArrowKeyNavigationOptions & {
     handleClose?: SimpleEventHandler<KeyboardEvent>;
@@ -25,6 +26,7 @@ export type MenuArrowKeyNavigationOptions = {
     type: ArrowKeyNavigationType.MENU;
     disableArrowKeyNavigation?: boolean;
     keyDownHandlerContext?: KeyDownHandlerContext;
+    children?: React.ReactNode;
 };
 export type MenuArrowKeyNavigationProviderProps = MenuArrowKeyNavigationOptions & {
     handleClose?: SimpleEventHandler<KeyboardEvent>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "76.26.4",
+  "version": "76.26.6",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -219,6 +219,9 @@
     },
     "platform.editor.popup.fix-flicker-react-18": {
       "type": "boolean"
+    },
+    "platform.editor.find-changed-nodes-from-transaction-optimisation": {
+      "type": "boolean"
     }
   }
 }