@atlaskit/editor-common 86.2.1 → 86.2.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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.1";
+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/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.1";
+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/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.1";
+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/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.1";
+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/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.1";
+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/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.1";
+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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "86.2.1",
+	"version": "86.2.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -258,6 +258,9 @@
 		},
 		"platform.editor.review-text-highlighting-styling": {
 			"type": "boolean"
+		},
+		"react_18_color_picker_concurrent_mode": {
+			"type": "boolean"
 		}
 	}
 }