@atlaskit/editor-common 86.2.0 → 86.2.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-common
 
+## 86.2.2
+
+### Patch Changes
+
+- [#121764](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/121764)
+  [`50becb2c435c7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/50becb2c435c7) -
+  Fix color picker popup not opening in react 18
+
+## 86.2.1
+
+### Patch Changes
+
+- [#121315](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/121315)
+  [`f550b1a0c6e85`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f550b1a0c6e85) -
+  [ux] ED-24237 Fix comment appearances in renderer to match editor
+- [#120992](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/120992)
+  [`a61cfb5567823`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a61cfb5567823) -
+  ED-23357 Update annotation node name calculations to avoid crashes on invalid ranges
+- Updated dependencies
+
 ## 86.2.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,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 = "86.2.0";
+var packageVersion = "86.2.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/styles/shared/annotation.js

@@ -36,7 +36,9 @@ var AnnotationSharedCSSByState = exports.AnnotationSharedCSSByState = function A
         borderBottom: '2px solid transparent',
         cursor: 'pointer',
         padding: '1px 0 2px',
-        '&:has(.card), &:has([data-inline-card])': {
+        '&:has(.card), &:has([data-inline-card])': (0, _platformFeatureFlags.fg)('annotations_align_editor_and_renderer_styles') ? {
+          padding: '5px 0 3px 0'
+        } : {
           paddingTop: '4px',
           border: 'none',
           boxShadow: "0 2px 0 0 ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")"))

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 */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "86.2.0";
+var packageVersion = "86.2.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -11,10 +11,12 @@ var _react2 = require("@emotion/react");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _analytics = require("../../analytics");
 var _uiColor = require("../../ui-color");
+var _uiReact = require("../../ui-react");
 var _Popup = _interopRequireDefault(require("../../ui/Popup"));
 var _withOuterListeners = _interopRequireDefault(require("../../ui/with-outer-listeners"));
 var _ArrowKeyNavigationProvider = require("../ArrowKeyNavigationProvider");
@@ -46,6 +48,7 @@ var colorPickerWrapper = function colorPickerWrapper() {
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
 var ColorPaletteWithListeners = (0, _withOuterListeners.default)(_uiColor.ColorPalette);
+var ColorPaletteWithReactViewListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_uiColor.ColorPalette);
 var ColorPickerButton = function ColorPickerButton(props) {
   var buttonRef = _react.default.useRef(null);
   var _React$useState = _react.default.useState(false),
@@ -158,7 +161,18 @@ var ColorPickerButton = function ColorPickerButton(props) {
       isOpenedByKeyboard: isOpenedByKeyboard,
       isPopupPositioned: isPopupPositioned,
       ignoreEscapeKey: props.returnEscToButton
-    }, (0, _react2.jsx)(ColorPaletteWithListeners, {
+    }, (0, _platformFeatureFlags.fg)('react_18_color_picker_concurrent_mode') ? (0, _react2.jsx)(ColorPaletteWithReactViewListeners, {
+      cols: props.cols,
+      selectedColor: selectedColor,
+      onClick: onColorSelected,
+      handleClickOutside: togglePopup,
+      handleEscapeKeydown: handleEsc,
+      paletteOptions: {
+        palette: props.colorPalette,
+        hexToPaletteColor: props.hexToPaletteColor,
+        paletteColorTooltipMessages: props.paletteColorTooltipMessages
+      }
+    }) : (0, _react2.jsx)(ColorPaletteWithListeners, {
       cols: props.cols,
       selectedColor: selectedColor,
       onClick: onColorSelected,

package/dist/cjs/utils/annotation/index.js

@@ -107,15 +107,23 @@ function getRangeInlineNodeNames(_ref) {
     return undefined;
   }
   var nodeNames = new Set();
-  doc.nodesBetween(pos.from, pos.to, function (node) {
-    if (node.isInline) {
-      nodeNames.add(node.type.name);
-    }
-  });
+  try {
+    doc.nodesBetween(pos.from, pos.to, function (node) {
+      if (node.isInline) {
+        nodeNames.add(node.type.name);
+      }
+    });
 
-  // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
-  var sortedNames = (0, _toConsumableArray2.default)(nodeNames).sort();
-  return sortedNames;
+    // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
+    var sortedNames = (0, _toConsumableArray2.default)(nodeNames).sort();
+    return sortedNames;
+  } catch (_unused) {
+    // Some callers have existing gaps where the positions are not valid,
+    // and so when called in the current document can throw an error if out of range.
+    //
+    // This is a defensive check to ensure we don't throw an error in those cases.
+    return undefined;
+  }
 }
 
 /**

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "86.2.0";
+const packageVersion = "86.2.2";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/styles/shared/annotation.js

@@ -28,7 +28,9 @@ export const AnnotationSharedCSSByState = () => {
         borderBottom: '2px solid transparent',
         cursor: 'pointer',
         padding: '1px 0 2px',
-        '&:has(.card), &:has([data-inline-card])': {
+        '&:has(.card), &:has([data-inline-card])': fg('annotations_align_editor_and_renderer_styles') ? {
+          padding: '5px 0 3px 0'
+        } : {
           paddingTop: '4px',
           border: 'none',
           boxShadow: `0 2px 0 0 ${`var(--ds-border-accent-yellow, ${Y200a})`}`

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

@@ -9,7 +9,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 = "86.2.0";
+const packageVersion = "86.2.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

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

@@ -6,10 +6,12 @@ import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, editorAnalyticsChannel, EVENT_TYPE } from '../../analytics';
 import { ColorPalette, DEFAULT_BORDER_COLOR, getSelectedRowAndColumnFromPalette } from '../../ui-color';
+import { withReactEditorViewOuterListeners } from '../../ui-react';
 import { default as Popup } from '../../ui/Popup';
 import { default as withOuterListeners } from '../../ui/with-outer-listeners';
 import { ArrowKeyNavigationProvider } from '../ArrowKeyNavigationProvider';
@@ -36,6 +38,7 @@ const colorPickerWrapper = () => css({
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
 const ColorPaletteWithListeners = withOuterListeners(ColorPalette);
+const ColorPaletteWithReactViewListeners = withReactEditorViewOuterListeners(ColorPalette);
 const ColorPickerButton = props => {
   const buttonRef = React.useRef(null);
   const [isPopupOpen, setIsPopupOpen] = React.useState(false);
@@ -138,7 +141,18 @@ const ColorPickerButton = props => {
       isOpenedByKeyboard: isOpenedByKeyboard,
       isPopupPositioned: isPopupPositioned,
       ignoreEscapeKey: props.returnEscToButton
-    }, jsx(ColorPaletteWithListeners, {
+    }, fg('react_18_color_picker_concurrent_mode') ? jsx(ColorPaletteWithReactViewListeners, {
+      cols: props.cols,
+      selectedColor: selectedColor,
+      onClick: onColorSelected,
+      handleClickOutside: togglePopup,
+      handleEscapeKeydown: handleEsc,
+      paletteOptions: {
+        palette: props.colorPalette,
+        hexToPaletteColor: props.hexToPaletteColor,
+        paletteColorTooltipMessages: props.paletteColorTooltipMessages
+      }
+    }) : jsx(ColorPaletteWithListeners, {
       cols: props.cols,
       selectedColor: selectedColor,
       onClick: onColorSelected,

package/dist/es2019/utils/annotation/index.js

@@ -105,15 +105,23 @@ export function getRangeInlineNodeNames({
     return undefined;
   }
   let nodeNames = new Set();
-  doc.nodesBetween(pos.from, pos.to, node => {
-    if (node.isInline) {
-      nodeNames.add(node.type.name);
-    }
-  });
+  try {
+    doc.nodesBetween(pos.from, pos.to, node => {
+      if (node.isInline) {
+        nodeNames.add(node.type.name);
+      }
+    });
 
-  // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
-  const sortedNames = [...nodeNames].sort();
-  return sortedNames;
+    // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
+    const sortedNames = [...nodeNames].sort();
+    return sortedNames;
+  } catch {
+    // Some callers have existing gaps where the positions are not valid,
+    // and so when called in the current document can throw an error if out of range.
+    //
+    // This is a defensive check to ensure we don't throw an error in those cases.
+    return undefined;
+  }
 }
 
 /**

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "86.2.0";
+var packageVersion = "86.2.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/styles/shared/annotation.js

@@ -30,7 +30,9 @@ export var AnnotationSharedCSSByState = function AnnotationSharedCSSByState() {
         borderBottom: '2px solid transparent',
         cursor: 'pointer',
         padding: '1px 0 2px',
-        '&:has(.card), &:has([data-inline-card])': {
+        '&:has(.card), &:has([data-inline-card])': fg('annotations_align_editor_and_renderer_styles') ? {
+          padding: '5px 0 3px 0'
+        } : {
           paddingTop: '4px',
           border: 'none',
           boxShadow: "0 2px 0 0 ".concat("var(--ds-border-accent-yellow, ".concat(Y200a, ")"))

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

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

@@ -7,10 +7,12 @@ import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext, withAnalyticsEvents } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, editorAnalyticsChannel, EVENT_TYPE } from '../../analytics';
 import { ColorPalette, DEFAULT_BORDER_COLOR, getSelectedRowAndColumnFromPalette } from '../../ui-color';
+import { withReactEditorViewOuterListeners } from '../../ui-react';
 import { default as Popup } from '../../ui/Popup';
 import { default as withOuterListeners } from '../../ui/with-outer-listeners';
 import { ArrowKeyNavigationProvider } from '../ArrowKeyNavigationProvider';
@@ -39,6 +41,7 @@ var colorPickerWrapper = function colorPickerWrapper() {
 /* eslint-enable @atlaskit/design-system/ensure-design-token-usage */
 
 var ColorPaletteWithListeners = withOuterListeners(ColorPalette);
+var ColorPaletteWithReactViewListeners = withReactEditorViewOuterListeners(ColorPalette);
 var ColorPickerButton = function ColorPickerButton(props) {
   var buttonRef = React.useRef(null);
   var _React$useState = React.useState(false),
@@ -151,7 +154,18 @@ var ColorPickerButton = function ColorPickerButton(props) {
       isOpenedByKeyboard: isOpenedByKeyboard,
       isPopupPositioned: isPopupPositioned,
       ignoreEscapeKey: props.returnEscToButton
-    }, jsx(ColorPaletteWithListeners, {
+    }, fg('react_18_color_picker_concurrent_mode') ? jsx(ColorPaletteWithReactViewListeners, {
+      cols: props.cols,
+      selectedColor: selectedColor,
+      onClick: onColorSelected,
+      handleClickOutside: togglePopup,
+      handleEscapeKeydown: handleEsc,
+      paletteOptions: {
+        palette: props.colorPalette,
+        hexToPaletteColor: props.hexToPaletteColor,
+        paletteColorTooltipMessages: props.paletteColorTooltipMessages
+      }
+    }) : jsx(ColorPaletteWithListeners, {
       cols: props.cols,
       selectedColor: selectedColor,
       onClick: onColorSelected,

package/dist/esm/utils/annotation/index.js

@@ -95,15 +95,23 @@ export function getRangeInlineNodeNames(_ref) {
     return undefined;
   }
   var nodeNames = new Set();
-  doc.nodesBetween(pos.from, pos.to, function (node) {
-    if (node.isInline) {
-      nodeNames.add(node.type.name);
-    }
-  });
+  try {
+    doc.nodesBetween(pos.from, pos.to, function (node) {
+      if (node.isInline) {
+        nodeNames.add(node.type.name);
+      }
+    });
 
-  // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
-  var sortedNames = _toConsumableArray(nodeNames).sort();
-  return sortedNames;
+    // We sort the list alphabetically to make human consumption of the list easier (in tools like the analytics extension)
+    var sortedNames = _toConsumableArray(nodeNames).sort();
+    return sortedNames;
+  } catch (_unused) {
+    // Some callers have existing gaps where the positions are not valid,
+    // and so when called in the current document can throw an error if out of range.
+    //
+    // This is a defensive check to ensure we don't throw an error in those cases.
+    return undefined;
+  }
 }
 
 /**

package/dist/types/react-node-view/generateUniqueNodeKey.d.ts

@@ -1 +1 @@
-export declare const generateUniqueNodeKey: () => string;
+export declare const generateUniqueNodeKey: () => any;

package/dist/types/styles/shared/annotation.d.ts

@@ -16,9 +16,15 @@ export declare const AnnotationSharedCSSByState: () => {
         cursor: string;
         padding: string;
         '&:has(.card), &:has([data-inline-card])': {
+            padding: string;
+            paddingTop?: undefined;
+            border?: undefined;
+            boxShadow?: undefined;
+        } | {
             paddingTop: string;
             border: string;
             boxShadow: string;
+            padding?: undefined;
         };
         '&:has(.date-lozenger-container)': {
             paddingTop: string;

package/dist/types-ts4.5/react-node-view/generateUniqueNodeKey.d.ts

@@ -1 +1 @@
-export declare const generateUniqueNodeKey: () => string;
+export declare const generateUniqueNodeKey: () => any;

package/dist/types-ts4.5/styles/shared/annotation.d.ts

@@ -16,9 +16,15 @@ export declare const AnnotationSharedCSSByState: () => {
         cursor: string;
         padding: string;
         '&:has(.card), &:has([data-inline-card])': {
+            padding: string;
+            paddingTop?: undefined;
+            border?: undefined;
+            boxShadow?: undefined;
+        } | {
             paddingTop: string;
             border: string;
             boxShadow: string;
+            padding?: undefined;
         };
         '&:has(.date-lozenger-container)': {
             paddingTop: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "86.2.0",
+	"version": "86.2.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -103,7 +103,7 @@
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/atlassian-context": "^0.0.0",
-		"@atlaskit/button": "^18.4.0",
+		"@atlaskit/button": "^19.0.0",
 		"@atlaskit/code": "^15.4.0",
 		"@atlaskit/codemod-utils": "^4.2.0",
 		"@atlaskit/custom-steps": "^0.4.0",
@@ -125,7 +125,7 @@
 		"@atlaskit/media-file-preview": "^0.6.0",
 		"@atlaskit/media-picker": "^66.4.0",
 		"@atlaskit/media-ui": "^25.10.0",
-		"@atlaskit/media-viewer": "48.6.11",
+		"@atlaskit/media-viewer": "48.6.12",
 		"@atlaskit/mention": "^23.2.0",
 		"@atlaskit/menu": "^2.8.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
@@ -138,7 +138,7 @@
 		"@atlaskit/task-decision": "^17.10.0",
 		"@atlaskit/textfield": "^6.4.0",
 		"@atlaskit/theme": "^12.11.0",
-		"@atlaskit/tokens": "^1.55.0",
+		"@atlaskit/tokens": "^1.56.0",
 		"@atlaskit/tooltip": "^18.5.0",
 		"@atlaskit/ufo": "^0.2.0",
 		"@atlaskit/width-detector": "^4.2.0",
@@ -176,7 +176,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/media-core": "^34.2.0",
-		"@atlaskit/media-test-helpers": "^33.0.0",
+		"@atlaskit/media-test-helpers": "^34.0.0",
 		"@atlaskit/util-data-test": "^17.9.0",
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/feature-flags-test-utils": "*",
@@ -244,6 +244,9 @@
 		"platform_editor_tables_padding_increase": {
 			"type": "boolean"
 		},
+		"annotations_align_editor_and_renderer_styles": {
+			"type": "boolean"
+		},
 		"platform-editor-a11y-image-border-options-dropdown": {
 			"type": "boolean"
 		},
@@ -255,6 +258,9 @@
 		},
 		"platform.editor.review-text-highlighting-styling": {
 			"type": "boolean"
+		},
+		"react_18_color_picker_concurrent_mode": {
+			"type": "boolean"
 		}
 	}
 }