@atlaskit/editor-common 76.27.2 → 76.27.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-common
 
+## 76.27.3
+
+### Patch Changes
+
+- [#61839](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/61839) [`4c12f0d11959`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4c12f0d11959) - Fix react 18 popup flicker issue by synchronously flushing the position state.
+
 ## 76.27.2
 
 ### 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.27.2";
+var packageVersion = "76.27.3";
 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.27.2";
+var packageVersion = "76.27.3";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

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

@@ -23,7 +23,6 @@ var _focusTrap = _interopRequireDefault(require("focus-trap"));
 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(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; }
@@ -141,6 +140,7 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "updatePosition",
     value: function updatePosition() {
+      var _this2 = this;
       var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props;
       var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state;
       var popup = state.popup;
@@ -148,9 +148,11 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
         position = _this$calculatePositi.position,
         validPosition = _this$calculatePositi.validPosition;
       if (position && validPosition) {
-        this.setState({
-          position: position,
-          validPosition: validPosition
+        (0, _reactDom.flushSync)(function () {
+          _this2.setState({
+            position: position,
+            validPosition: validPosition
+          });
         });
       }
     }
@@ -289,10 +291,6 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
 
       //In some cases we don't want to use default "Popup" text as an aria-label. It might be tedious for screen reader users.
       var ariaLabel = this.props.ariaLabel === null ? undefined : this.props.ariaLabel || 'Popup';
-
-      // If the position is not defined, render null because we haven't
-      // calculated where on the page the children should render yet.
-      var childrenDisplayed = position !== undefined ? this.props.children : null;
       return /*#__PURE__*/_react.default.createElement("div", {
         ref: this.handleRef,
         style: _objectSpread(_objectSpread({
@@ -304,7 +302,7 @@ var Popup = exports.default = /*#__PURE__*/function (_React$Component) {
         // Indicates component is an editor pop. Required for focus handling in Message.tsx
         ,
         "data-editor-popup": true
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.popup.fix-flicker-react-18') ? childrenDisplayed : this.props.children);
+      }, this.props.children);
     }
   }, {
     key: "render",

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

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

@@ -2,9 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import createFocusTrap from 'focus-trap';
 import rafSchedule from 'raf-schd';
-import { createPortal } from 'react-dom';
+import { createPortal, flushSync } 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) {
@@ -113,9 +112,11 @@ export default class Popup extends React.Component {
       validPosition
     } = this.calculatePosition(props, popup);
     if (position && validPosition) {
-      this.setState({
-        position,
-        validPosition
+      flushSync(() => {
+        this.setState({
+          position,
+          validPosition
+        });
       });
     }
   }
@@ -243,10 +244,6 @@ export default class Popup extends React.Component {
 
     //In some cases we don't want to use default "Popup" text as an aria-label. It might be tedious for screen reader users.
     const ariaLabel = this.props.ariaLabel === null ? undefined : this.props.ariaLabel || 'Popup';
-
-    // If the position is not defined, render null because we haven't
-    // calculated where on the page the children should render yet.
-    const childrenDisplayed = position !== undefined ? this.props.children : null;
     return /*#__PURE__*/React.createElement("div", {
       ref: this.handleRef,
       style: {
@@ -260,7 +257,7 @@ export default class Popup extends React.Component {
       // Indicates component is an editor pop. Required for focus handling in Message.tsx
       ,
       "data-editor-popup": true
-    }, getBooleanFF('platform.editor.popup.fix-flicker-react-18') ? childrenDisplayed : this.props.children);
+    }, this.props.children);
   }
   render() {
     const {

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

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

@@ -12,9 +12,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import createFocusTrap from 'focus-trap';
 import rafSchedule from 'raf-schd';
-import { createPortal } from 'react-dom';
+import { createPortal, flushSync } 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);
@@ -128,6 +127,7 @@ var Popup = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "updatePosition",
     value: function updatePosition() {
+      var _this2 = this;
       var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props;
       var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.state;
       var popup = state.popup;
@@ -135,9 +135,11 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         position = _this$calculatePositi.position,
         validPosition = _this$calculatePositi.validPosition;
       if (position && validPosition) {
-        this.setState({
-          position: position,
-          validPosition: validPosition
+        flushSync(function () {
+          _this2.setState({
+            position: position,
+            validPosition: validPosition
+          });
         });
       }
     }
@@ -276,10 +278,6 @@ var Popup = /*#__PURE__*/function (_React$Component) {
 
       //In some cases we don't want to use default "Popup" text as an aria-label. It might be tedious for screen reader users.
       var ariaLabel = this.props.ariaLabel === null ? undefined : this.props.ariaLabel || 'Popup';
-
-      // If the position is not defined, render null because we haven't
-      // calculated where on the page the children should render yet.
-      var childrenDisplayed = position !== undefined ? this.props.children : null;
       return /*#__PURE__*/React.createElement("div", {
         ref: this.handleRef,
         style: _objectSpread(_objectSpread({
@@ -291,7 +289,7 @@ var Popup = /*#__PURE__*/function (_React$Component) {
         // Indicates component is an editor pop. Required for focus handling in Message.tsx
         ,
         "data-editor-popup": true
-      }, getBooleanFF('platform.editor.popup.fix-flicker-react-18') ? childrenDisplayed : this.props.children);
+      }, this.props.children);
     }
   }, {
     key: "render",

package/package.json

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