@atlaskit/popup 1.24.0 → 1.24.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/popup
 
+## 1.24.2
+
+### Patch Changes
+
+- [#136611](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136611)
+  [`9755fb019113f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9755fb019113f) -
+  Clean up emotion Globals usage
+
+## 1.24.1
+
+### Patch Changes
+
+- [#135608](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/135608)
+  [`7498a45496f8a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7498a45496f8a) -
+  Update to remove react-uid
+
 ## 1.24.0
 
 ### Minor Changes

package/dist/cjs/compositional/popup.js

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.PopupTrigger = exports.PopupContent = exports.Popup = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _reactUid = require("react-uid");
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _noop = _interopRequireDefault(require("@atlaskit/ds-lib/noop"));
+var _reactUid = require("@atlaskit/ds-lib/react-uid");
 var _layering = require("@atlaskit/layering");
 var _popper = require("@atlaskit/popper");
 var _portal = _interopRequireDefault(require("@atlaskit/portal"));
@@ -59,7 +59,7 @@ var Popup = exports.Popup = function Popup(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     triggerRef = _useState2[0],
     setTriggerRef = _useState2[1];
-  var generatedId = (0, _reactUid.useUID)();
+  var generatedId = (0, _reactUid.useId)();
   var id = providedId || generatedId;
   return /*#__PURE__*/_react.default.createElement(EnsureIsInsidePopupContext.Provider, {
     value: true

package/dist/cjs/popper-wrapper.js

@@ -13,7 +13,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _layering = require("@atlaskit/layering");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _popper = require("@atlaskit/popper");
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
@@ -27,7 +26,6 @@ var _css;
  * @jsxRuntime classic
  * @jsx jsx
  */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var popupFullWidthStyles = (0, _react2.css)({
   width: '100%'
 });
@@ -49,15 +47,6 @@ var popupStyles = (0, _react2.css)((_css = {
 var popupOverflowStyles = (0, _react2.css)({
   overflow: 'auto'
 });
-
-// disables iframe pointer events while popup is open, except if iframe is nested inside popup
-// solves an issue of popup not being closed on iframe click
-var blockPointerEventsOnExternalIframeStyles = (0, _react2.css)({
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-  'iframe:not([data-ds--level] iframe)': {
-    pointerEvents: 'none'
-  }
-});
 var DefaultPopupComponent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var shouldRenderToParent = props.shouldRenderToParent,
     shouldFitContainer = props.shouldFitContainer,
@@ -181,9 +170,7 @@ function PopperWrapper(_ref) {
       tabIndex: autoFocus ? 0 : undefined,
       shouldRenderToParent: shouldRenderToParent,
       shouldFitContainer: shouldFitContainer
-    }, (0, _platformFeatureFlags.fg)('platform.design-system-team.iframe_gojiv') && (0, _react2.jsx)(_react2.Global, {
-      styles: blockPointerEventsOnExternalIframeStyles
-    }), (0, _react2.jsx)(_repositionOnUpdate.RepositionOnUpdate, {
+    }, (0, _react2.jsx)(_repositionOnUpdate.RepositionOnUpdate, {
       update: update
     }, content({
       update: update,

package/dist/cjs/popup.js

@@ -8,7 +8,7 @@ exports.default = exports.Popup = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _reactUid = require("react-uid");
+var _reactUid = require("@atlaskit/ds-lib/react-uid");
 var _layering = require("@atlaskit/layering");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _popper = require("@atlaskit/popper");
@@ -72,7 +72,7 @@ var Popup = exports.Popup = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     setTriggerRef = _useState2[1];
   var getMergedTriggerRef = (0, _useGetMemoizedMergedTriggerRef.useGetMemoizedMergedTriggerRef)();
   var getMergedTriggerRefNew = (0, _useGetMemoizedMergedTriggerRefNew.useGetMemoizedMergedTriggerRefNew)();
-  var generatedId = (0, _reactUid.useUID)();
+  var generatedId = (0, _reactUid.useId)();
   var id = providedId || generatedId;
   var renderPopperWrapper = (0, _react2.jsx)(_layering.UNSAFE_LAYERING, {
     isDisabled: false

package/dist/es2019/compositional/popup.js

@@ -1,7 +1,7 @@
 import React, { createContext, useContext, useState } from 'react';
-import { useUID } from 'react-uid';
 import invariant from 'tiny-invariant';
 import noop from '@atlaskit/ds-lib/noop';
+import { useId } from '@atlaskit/ds-lib/react-uid';
 import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import { Manager, Reference } from '@atlaskit/popper';
 import Portal from '@atlaskit/portal';
@@ -45,7 +45,7 @@ export const Popup = ({
   isOpen = false
 }) => {
   const [triggerRef, setTriggerRef] = useState(null);
-  const generatedId = useUID();
+  const generatedId = useId();
   const id = providedId || generatedId;
   return /*#__PURE__*/React.createElement(EnsureIsInsidePopupContext.Provider, {
     value: true

package/dist/es2019/popper-wrapper.js

@@ -4,11 +4,8 @@ import _extends from "@babel/runtime/helpers/extends";
  * @jsx jsx
  */
 import { forwardRef, useMemo, useState } from 'react';
-
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { css, Global, jsx } from '@emotion/react';
+import { css, jsx } from '@emotion/react';
 import { UNSAFE_useLayering } from '@atlaskit/layering';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Popper } from '@atlaskit/popper';
 import { N0, N50A, N60A } from '@atlaskit/theme/colors';
 import { layers } from '@atlaskit/theme/constants';
@@ -39,15 +36,6 @@ const popupStyles = css({
 const popupOverflowStyles = css({
   overflow: 'auto'
 });
-
-// disables iframe pointer events while popup is open, except if iframe is nested inside popup
-// solves an issue of popup not being closed on iframe click
-const blockPointerEventsOnExternalIframeStyles = css({
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-  'iframe:not([data-ds--level] iframe)': {
-    pointerEvents: 'none'
-  }
-});
 const DefaultPopupComponent = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     shouldRenderToParent,
@@ -165,9 +153,7 @@ function PopperWrapper({
       tabIndex: autoFocus ? 0 : undefined,
       shouldRenderToParent: shouldRenderToParent,
       shouldFitContainer: shouldFitContainer
-    }, fg('platform.design-system-team.iframe_gojiv') && jsx(Global, {
-      styles: blockPointerEventsOnExternalIframeStyles
-    }), jsx(RepositionOnUpdate, {
+    }, jsx(RepositionOnUpdate, {
       update: update
     }, content({
       update,

package/dist/es2019/popup.js

@@ -7,7 +7,7 @@ import { memo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { useUID } from 'react-uid';
+import { useId } from '@atlaskit/ds-lib/react-uid';
 import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Manager, Reference } from '@atlaskit/popper';
@@ -51,7 +51,7 @@ export const Popup = /*#__PURE__*/memo(({
   const [triggerRef, setTriggerRef] = useState(null);
   const getMergedTriggerRef = useGetMemoizedMergedTriggerRef();
   const getMergedTriggerRefNew = useGetMemoizedMergedTriggerRefNew();
-  const generatedId = useUID();
+  const generatedId = useId();
   const id = providedId || generatedId;
   const renderPopperWrapper = jsx(UNSAFE_LAYERING, {
     isDisabled: false

package/dist/esm/compositional/popup.js

@@ -1,8 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { createContext, useContext, useState } from 'react';
-import { useUID } from 'react-uid';
 import invariant from 'tiny-invariant';
 import noop from '@atlaskit/ds-lib/noop';
+import { useId } from '@atlaskit/ds-lib/react-uid';
 import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import { Manager, Reference } from '@atlaskit/popper';
 import Portal from '@atlaskit/portal';
@@ -49,7 +49,7 @@ export var Popup = function Popup(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     triggerRef = _useState2[0],
     setTriggerRef = _useState2[1];
-  var generatedId = useUID();
+  var generatedId = useId();
   var id = providedId || generatedId;
   return /*#__PURE__*/React.createElement(EnsureIsInsidePopupContext.Provider, {
     value: true

package/dist/esm/popper-wrapper.js

@@ -10,11 +10,8 @@ var _css;
  * @jsx jsx
  */
 import { forwardRef, useMemo, useState } from 'react';
-
-// eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-import { css, Global, jsx } from '@emotion/react';
+import { css, jsx } from '@emotion/react';
 import { UNSAFE_useLayering } from '@atlaskit/layering';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Popper } from '@atlaskit/popper';
 import { N0, N50A, N60A } from '@atlaskit/theme/colors';
 import { layers } from '@atlaskit/theme/constants';
@@ -43,15 +40,6 @@ var popupStyles = css((_css = {
 var popupOverflowStyles = css({
   overflow: 'auto'
 });
-
-// disables iframe pointer events while popup is open, except if iframe is nested inside popup
-// solves an issue of popup not being closed on iframe click
-var blockPointerEventsOnExternalIframeStyles = css({
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
-  'iframe:not([data-ds--level] iframe)': {
-    pointerEvents: 'none'
-  }
-});
 var DefaultPopupComponent = /*#__PURE__*/forwardRef(function (props, ref) {
   var shouldRenderToParent = props.shouldRenderToParent,
     shouldFitContainer = props.shouldFitContainer,
@@ -175,9 +163,7 @@ function PopperWrapper(_ref) {
       tabIndex: autoFocus ? 0 : undefined,
       shouldRenderToParent: shouldRenderToParent,
       shouldFitContainer: shouldFitContainer
-    }, fg('platform.design-system-team.iframe_gojiv') && jsx(Global, {
-      styles: blockPointerEventsOnExternalIframeStyles
-    }), jsx(RepositionOnUpdate, {
+    }, jsx(RepositionOnUpdate, {
       update: update
     }, content({
       update: update,

package/dist/esm/popup.js

@@ -8,7 +8,7 @@ import { memo, useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { useUID } from 'react-uid';
+import { useId } from '@atlaskit/ds-lib/react-uid';
 import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Manager, Reference } from '@atlaskit/popper';
@@ -64,7 +64,7 @@ export var Popup = /*#__PURE__*/memo(function (_ref) {
     setTriggerRef = _useState2[1];
   var getMergedTriggerRef = useGetMemoizedMergedTriggerRef();
   var getMergedTriggerRefNew = useGetMemoizedMergedTriggerRefNew();
-  var generatedId = useUID();
+  var generatedId = useId();
   var id = providedId || generatedId;
   var renderPopperWrapper = jsx(UNSAFE_LAYERING, {
     isDisabled: false

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/popup",
-	"version": "1.24.0",
+	"version": "1.24.2",
 	"description": "A popup displays brief content in an overlay.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -49,7 +49,6 @@
 		"bind-event-listener": "^3.0.0",
 		"focus-trap": "^2.4.5",
 		"memoize-one": "^6.0.0",
-		"react-uid": "^2.2.0",
 		"tiny-invariant": "^1.2.0"
 	},
 	"peerDependencies": {
@@ -104,9 +103,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform.design-system-team.iframe_gojiv": {
-			"type": "boolean"
-		},
 		"platform_dst_popup-disable-focuslock": {
 			"type": "boolean"
 		},