@atlaskit/editor-common 96.5.3 → 96.5.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-common
 
+## 96.5.4
+
+### Patch Changes
+
+- [#179422](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179422)
+  [`9ca38d44fc209`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9ca38d44fc209) -
+  ED-26031-update-cursor-to-inherit-when-editing-lcm
+- Updated dependencies
+
 ## 96.5.3
 
 ### Patch Changes

package/dist/cjs/extensibility/Extension/Extension/index.js

@@ -12,6 +12,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames2 = _interopRequireDefault(require("classnames"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _hooks = require("../../../hooks");
 var _ui = require("../../../ui");
 var _utils = require("../../../utils");
@@ -133,10 +134,10 @@ function ExtensionWithPluginState(props) {
     "data-layout": node.attrs.layout
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: classNames
+    className: classNames,
+    css:
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    ,
-    css: _styles2.wrapperStyle
+    (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? _styles2.wrapperStyleInheritedCursor : _styles2.wrapperStyle
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: customContainerStyles,

package/dist/cjs/extensibility/Extension/Extension/styles.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapperStyle = exports.widerLayoutClassName = exports.overflowWrapperStyles = exports.header = exports.contentWrapper = exports.content = void 0;
+exports.wrapperStyleInheritedCursor = exports.wrapperStyle = exports.widerLayoutClassName = exports.overflowWrapperStyles = exports.header = exports.contentWrapper = exports.content = void 0;
 var _react = require("@emotion/react");
 var _styles = require("../styles");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -11,12 +11,11 @@ var _styles = require("../styles");
 var widerLayoutClassName = exports.widerLayoutClassName = 'wider-layout';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault, {
+var wrapperStyleWithoutCursor = (0, _react.css)(_styles.wrapperDefault, {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.without-frame': {
     background: 'transparent'
   },
-  cursor: 'pointer',
   width: '100%',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.extension-overflow-wrapper:not(.with-body)': {
@@ -37,6 +36,23 @@ var wrapperStyle = exports.wrapperStyle = (0, _react.css)(_styles.wrapperDefault
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+var wrapperStyleInheritedCursor = exports.wrapperStyleInheritedCursor = (0, _react.css)(wrapperStyleWithoutCursor, {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.extension-overflow-wrapper:has(.extension-editable-area)': {
+    cursor: 'inherit'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.extension-overflow-wrapper:not(:has(.extension-editable-area))': {
+    cursor: 'pointer'
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+var wrapperStyle = exports.wrapperStyle = (0, _react.css)(wrapperStyleWithoutCursor, {
+  cursor: 'pointer'
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var header = exports.header = (0, _react.css)({
   padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " 0px"),

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 && {}.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 = "96.5.3";
+var packageVersion = "96.5.4";
 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

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "96.5.3";
+var packageVersion = "96.5.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/extensibility/Extension/Extension/index.js

@@ -9,12 +9,13 @@ import React, { Fragment } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import classnames from 'classnames';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useSharedPluginState } from '../../../hooks';
 import { overflowShadow } from '../../../ui';
 import { calculateBreakoutStyles } from '../../../utils';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
-import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle } from './styles';
+import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
 function ExtensionWithPluginState(props) {
   const {
     node,
@@ -131,10 +132,10 @@ function ExtensionWithPluginState(props) {
     "data-layout": node.attrs.layout
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: classNames
+    className: classNames,
+    css:
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    ,
-    css: wrapperStyle
+    fg('platform_editor_legacy_content_macro') ? wrapperStyleInheritedCursor : wrapperStyle
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: customContainerStyles,

package/dist/es2019/extensibility/Extension/Extension/styles.js

@@ -4,12 +4,11 @@ import { wrapperDefault } from '../styles';
 export const widerLayoutClassName = 'wider-layout';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-export const wrapperStyle = css(wrapperDefault, {
+const wrapperStyleWithoutCursor = css(wrapperDefault, {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.without-frame': {
     background: 'transparent'
   },
-  cursor: 'pointer',
   width: '100%',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.extension-overflow-wrapper:not(.with-body)': {
@@ -30,6 +29,23 @@ export const wrapperStyle = css(wrapperDefault, {
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+export const wrapperStyleInheritedCursor = css(wrapperStyleWithoutCursor, {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.extension-overflow-wrapper:has(.extension-editable-area)': {
+    cursor: 'inherit'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.extension-overflow-wrapper:not(:has(.extension-editable-area))': {
+    cursor: 'pointer'
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+export const wrapperStyle = css(wrapperStyleWithoutCursor, {
+  cursor: 'pointer'
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export const header = css({
   padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-050, 4px)"} 0px`,

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 = "96.5.3";
+const packageVersion = "96.5.4";
 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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "96.5.3";
+const packageVersion = "96.5.4";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/extensibility/Extension/Extension/index.js

@@ -14,12 +14,13 @@ import React, { Fragment } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import classnames from 'classnames';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useSharedPluginState } from '../../../hooks';
 import { overflowShadow } from '../../../ui';
 import { calculateBreakoutStyles } from '../../../utils';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
-import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle } from './styles';
+import { content, contentWrapper, header, overflowWrapperStyles, widerLayoutClassName, wrapperStyle, wrapperStyleInheritedCursor } from './styles';
 function ExtensionWithPluginState(props) {
   var node = props.node,
     handleContentDOMRef = props.handleContentDOMRef,
@@ -125,10 +126,10 @@ function ExtensionWithPluginState(props) {
     "data-layout": node.attrs.layout
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: classNames
+    className: classNames,
+    css:
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
-    ,
-    css: wrapperStyle
+    fg('platform_editor_legacy_content_macro') ? wrapperStyleInheritedCursor : wrapperStyle
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: customContainerStyles,

package/dist/esm/extensibility/Extension/Extension/styles.js

@@ -4,12 +4,11 @@ import { wrapperDefault } from '../styles';
 export var widerLayoutClassName = 'wider-layout';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-export var wrapperStyle = css(wrapperDefault, {
+var wrapperStyleWithoutCursor = css(wrapperDefault, {
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '&.without-frame': {
     background: 'transparent'
   },
-  cursor: 'pointer',
   width: '100%',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.extension-overflow-wrapper:not(.with-body)': {
@@ -30,6 +29,23 @@ export var wrapperStyle = css(wrapperDefault, {
   }
 });
 
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+export var wrapperStyleInheritedCursor = css(wrapperStyleWithoutCursor, {
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.extension-overflow-wrapper:has(.extension-editable-area)': {
+    cursor: 'inherit'
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.extension-overflow-wrapper:not(:has(.extension-editable-area))': {
+    cursor: 'pointer'
+  }
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles, @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+export var wrapperStyle = css(wrapperStyleWithoutCursor, {
+  cursor: 'pointer'
+});
+
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var header = css({
   padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-050, 4px)", " 0px"),

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 = "96.5.3";
+var packageVersion = "96.5.4";
 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

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "96.5.3";
+var packageVersion = "96.5.4";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/extensibility/Extension/Extension/styles.d.ts

@@ -1,4 +1,5 @@
 export declare const widerLayoutClassName = "wider-layout";
+export declare const wrapperStyleInheritedCursor: import("@emotion/react").SerializedStyles;
 export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
 export declare const header: import("@emotion/react").SerializedStyles;
 export declare const content: import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/extensibility/Extension/Extension/styles.d.ts

@@ -1,4 +1,5 @@
 export declare const widerLayoutClassName = "wider-layout";
+export declare const wrapperStyleInheritedCursor: import("@emotion/react").SerializedStyles;
 export declare const wrapperStyle: import("@emotion/react").SerializedStyles;
 export declare const header: import("@emotion/react").SerializedStyles;
 export declare const content: import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "96.5.3",
+	"version": "96.5.4",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -155,7 +155,7 @@
 		"@atlaskit/task-decision": "^17.11.0",
 		"@atlaskit/textfield": "^6.7.0",
 		"@atlaskit/tmp-editor-statsig": "^2.27.0",
-		"@atlaskit/tokens": "^2.4.0",
+		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@atlaskit/width-detector": "^4.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -303,6 +303,9 @@
 		},
 		"platform_editor_selection_toolbar_scroll_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_legacy_content_macro": {
+			"type": "boolean"
 		}
 	}
 }