@atlaskit/editor-common 93.1.3 → 93.1.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-common
 
+## 93.1.4
+
+### Patch Changes
+
+- [#149749](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/149749)
+  [`0b3df6a89bf6c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0b3df6a89bf6c) -
+  [ux] ED-24886 Set marginTop of first heading with right or centre align to default marginTop
+
 ## 93.1.3
 
 ### 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 && {}.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 = "93.1.3";
+var packageVersion = "93.1.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/styles/shared/headings.js

@@ -1,18 +1,53 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.headingsSharedStyles = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
-/* eslint-disable @atlaskit/design-system/use-tokens-space */
-/* eslint-disable @atlaskit/design-system/use-tokens-typography */
-// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+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; } /* eslint-disable @atlaskit/design-system/use-tokens-space */ /* eslint-disable @atlaskit/design-system/use-tokens-typography */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+var headingWithAlignmentStyles = function headingWithAlignmentStyles() {
+  return (
+    // Override marginTop: 0 with default margin found in headingsSharedStyles for first heading in alignment block that is not the first child
+    (0, _platformFeatureFlags.fg)('platform_editor_heading_margin_fix') ? {
+      '.fabric-editor-block-mark.fabric-editor-alignment:not(:first-child)': {
+        '> h1:first-child': {
+          marginTop: '1.667em'
+        },
+        ' > h2:first-child': {
+          marginTop: '1.8em'
+        },
+        '> h3:first-child': {
+          marginTop: '2em'
+        },
+        '> h4:first-child': {
+          marginTop: '1.357em'
+        },
+        '> h5:first-child': {
+          marginTop: '1.667em'
+        },
+        '> h6:first-child': {
+          marginTop: '1.455em'
+        }
+      },
+      // Set marginTop: 0 if alignment block is next to a gap cursor or widget that is first child
+      '.ProseMirror-gapcursor:first-child + .fabric-editor-block-mark.fabric-editor-alignment, .ProseMirror-widget:first-child + .fabric-editor-block-mark.fabric-editor-alignment, .ProseMirror-widget:first-child + .ProseMirror-widget:nth-child(2) + .fabric-editor-block-mark.fabric-editor-alignment': {
+        '> :is(h1, h2, h3, h4, h5, h6):first-child': {
+          marginTop: '0'
+        }
+      }
+    } : {}
+  );
+};
 
 // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
 // text sizing prototype: http://proto/fabricrender/
 var headingsSharedStyles = exports.headingsSharedStyles = function headingsSharedStyles() {
-  return (0, _react.css)({
+  return (0, _react.css)(_objectSpread({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& h1': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
@@ -82,5 +117,5 @@ var headingsSharedStyles = exports.headingsSharedStyles = function headingsShare
       marginTop: '1.455em',
       textTransform: 'none'
     }
-  });
+  }, headingWithAlignmentStyles()));
 };

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

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

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 = "93.1.3";
+const packageVersion = "93.1.4";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -2,6 +2,38 @@
 /* eslint-disable @atlaskit/design-system/use-tokens-typography */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { fg } from '@atlaskit/platform-feature-flags';
+const headingWithAlignmentStyles = () =>
+// Override marginTop: 0 with default margin found in headingsSharedStyles for first heading in alignment block that is not the first child
+fg('platform_editor_heading_margin_fix') ? {
+  '.fabric-editor-block-mark.fabric-editor-alignment:not(:first-child)': {
+    '> h1:first-child': {
+      marginTop: '1.667em'
+    },
+    ' > h2:first-child': {
+      marginTop: '1.8em'
+    },
+    '> h3:first-child': {
+      marginTop: '2em'
+    },
+    '> h4:first-child': {
+      marginTop: '1.357em'
+    },
+    '> h5:first-child': {
+      marginTop: '1.667em'
+    },
+    '> h6:first-child': {
+      marginTop: '1.455em'
+    }
+  },
+  // Set marginTop: 0 if alignment block is next to a gap cursor or widget that is first child
+  '.ProseMirror-gapcursor:first-child + .fabric-editor-block-mark.fabric-editor-alignment, .ProseMirror-widget:first-child + .fabric-editor-block-mark.fabric-editor-alignment, .ProseMirror-widget:first-child + .ProseMirror-widget:nth-child(2) + .fabric-editor-block-mark.fabric-editor-alignment': {
+    '> :is(h1, h2, h3, h4, h5, h6):first-child': {
+      marginTop: '0'
+    }
+  }
+} : {};
+
 // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
 // text sizing prototype: http://proto/fabricrender/
 export const headingsSharedStyles = () => css({
@@ -73,5 +105,7 @@ export const headingsSharedStyles = () => css({
     fontWeight: "var(--ds-font-weight-bold, 700)",
     marginTop: '1.455em',
     textTransform: 'none'
-  }
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  ...headingWithAlignmentStyles()
 });

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

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 = "93.1.3";
+var packageVersion = "93.1.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/styles/shared/headings.js

@@ -1,11 +1,49 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _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; }
 /* eslint-disable @atlaskit/design-system/use-tokens-space */
 /* eslint-disable @atlaskit/design-system/use-tokens-typography */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
+import { fg } from '@atlaskit/platform-feature-flags';
+var headingWithAlignmentStyles = function headingWithAlignmentStyles() {
+  return (
+    // Override marginTop: 0 with default margin found in headingsSharedStyles for first heading in alignment block that is not the first child
+    fg('platform_editor_heading_margin_fix') ? {
+      '.fabric-editor-block-mark.fabric-editor-alignment:not(:first-child)': {
+        '> h1:first-child': {
+          marginTop: '1.667em'
+        },
+        ' > h2:first-child': {
+          marginTop: '1.8em'
+        },
+        '> h3:first-child': {
+          marginTop: '2em'
+        },
+        '> h4:first-child': {
+          marginTop: '1.357em'
+        },
+        '> h5:first-child': {
+          marginTop: '1.667em'
+        },
+        '> h6:first-child': {
+          marginTop: '1.455em'
+        }
+      },
+      // Set marginTop: 0 if alignment block is next to a gap cursor or widget that is first child
+      '.ProseMirror-gapcursor:first-child + .fabric-editor-block-mark.fabric-editor-alignment, .ProseMirror-widget:first-child + .fabric-editor-block-mark.fabric-editor-alignment, .ProseMirror-widget:first-child + .ProseMirror-widget:nth-child(2) + .fabric-editor-block-mark.fabric-editor-alignment': {
+        '> :is(h1, h2, h3, h4, h5, h6):first-child': {
+          marginTop: '0'
+        }
+      }
+    } : {}
+  );
+};
+
 // @see typography spreadsheet: https://docs.google.com/spreadsheets/d/1iYusRGCT4PoPfvxbJ8NrgjtfFgXLm5lpDWXzjua1W2E/edit#gid=93913128
 // text sizing prototype: http://proto/fabricrender/
 export var headingsSharedStyles = function headingsSharedStyles() {
-  return css({
+  return css(_objectSpread({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& h1': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
@@ -75,5 +113,5 @@ export var headingsSharedStyles = function headingsSharedStyles() {
       marginTop: '1.455em',
       textTransform: 'none'
     }
-  });
+  }, headingWithAlignmentStyles()));
 };

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "93.1.3",
+	"version": "93.1.4",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -125,7 +125,7 @@
 		"@atlaskit/editor-shared-styles": "^3.0.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/emoji": "^67.8.0",
-		"@atlaskit/icon": "^22.21.0",
+		"@atlaskit/icon": "^22.22.0",
 		"@atlaskit/icon-object": "^6.5.0",
 		"@atlaskit/link-datasource": "^3.4.0",
 		"@atlaskit/link-picker": "^1.47.0",
@@ -277,6 +277,9 @@
 		},
 		"platform_editor_allow_annotation_triple_click": {
 			"type": "boolean"
+		},
+		"platform_editor_heading_margin_fix": {
+			"type": "boolean"
 		}
 	}
 }