@atlaskit/editor-core 209.0.2 → 209.0.3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-core
 
+## 209.0.3
+
+### Patch Changes
+
+- [#181948](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/181948)
+  [`e7e5b1bee5fb2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e7e5b1bee5fb2) -
+  [ux] [EDF-2688] Fix extra space for last line in comment editor
+- Updated dependencies
+
 ## 209.0.2
 
 ### Patch Changes

package/dist/cjs/ui/Appearance/Chromeless.js

@@ -17,6 +17,7 @@ var _react2 = require("@emotion/react");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -95,6 +96,15 @@ var chromelessEditorStylesNew = (0, _react2.css)({
     }
   }
 });
+var extraSpaceLastLineFix = (0, _react2.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '& > p:last-of-type': {
+      marginBottom: "var(--ds-space-0, 0px)"
+    }
+  }
+});
 var ContentArea = exports.ContentArea = (0, _ContentStyles.createEditorContentStyle)();
 ContentArea.displayName = 'ContentArea';
 var EditorContainer = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
@@ -223,7 +233,7 @@ function ChromelessEditorContainerNext(_ref3) {
     children = _ref3.children,
     containerRef = _ref3.containerRef;
   return (0, _react2.jsx)("div", {
-    css: [chromelessEditorStylesNew, scrollbarStylesNew],
+    css: [chromelessEditorStylesNew, scrollbarStylesNew, (0, _platformFeatureFlags.fg)('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     style: {
       maxHeight: maxHeight ? "".concat(maxHeight, "px") : undefined,
       minHeight: "".concat(minHeight, "px")
@@ -249,7 +259,7 @@ function ChromelessEditorContainerOld(_ref4) {
     (0, _react2.css)({
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
       minHeight: "".concat(minHeight, "px")
-    })],
+    }), (0, _platformFeatureFlags.fg)('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     "data-testid": "chromeless-editor",
     id: "chromeless-editor",
     ref: containerRef

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "209.0.1";
+var version = exports.version = "209.0.2";

package/dist/es2019/ui/Appearance/Chromeless.js

@@ -10,6 +10,7 @@ import { css, jsx } from '@emotion/react';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -82,6 +83,15 @@ const chromelessEditorStylesNew = css({
     }
   }
 });
+const extraSpaceLastLineFix = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '& > p:last-of-type': {
+      marginBottom: "var(--ds-space-0, 0px)"
+    }
+  }
+});
 export const ContentArea = createEditorContentStyle();
 ContentArea.displayName = 'ContentArea';
 const EditorContainer = componentWithCondition(() => editorExperiment('platform_editor_core_static_emotion', true, {
@@ -202,7 +212,7 @@ function ChromelessEditorContainerNext({
   containerRef
 }) {
   return jsx("div", {
-    css: [chromelessEditorStylesNew, scrollbarStylesNew],
+    css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     style: {
       maxHeight: maxHeight ? `${maxHeight}px` : undefined,
       minHeight: `${minHeight}px`
@@ -229,7 +239,7 @@ function ChromelessEditorContainerOld({
     css({
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
       minHeight: `${minHeight}px`
-    })],
+    }), fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     "data-testid": "chromeless-editor",
     id: "chromeless-editor",
     ref: containerRef

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "209.0.1";
+export const version = "209.0.2";

package/dist/esm/ui/Appearance/Chromeless.js

@@ -17,6 +17,7 @@ import { css, jsx } from '@emotion/react';
 import { sharedPluginStateHookMigratorFactory, useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { componentWithCondition } from '@atlaskit/platform-feature-flags-react';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -89,6 +90,15 @@ var chromelessEditorStylesNew = css({
     }
   }
 });
+var extraSpaceLastLineFix = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror': {
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '& > p:last-of-type': {
+      marginBottom: "var(--ds-space-0, 0px)"
+    }
+  }
+});
 export var ContentArea = createEditorContentStyle();
 ContentArea.displayName = 'ContentArea';
 var EditorContainer = componentWithCondition(function () {
@@ -218,7 +228,7 @@ function ChromelessEditorContainerNext(_ref3) {
     children = _ref3.children,
     containerRef = _ref3.containerRef;
   return jsx("div", {
-    css: [chromelessEditorStylesNew, scrollbarStylesNew],
+    css: [chromelessEditorStylesNew, scrollbarStylesNew, fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     style: {
       maxHeight: maxHeight ? "".concat(maxHeight, "px") : undefined,
       minHeight: "".concat(minHeight, "px")
@@ -244,7 +254,7 @@ function ChromelessEditorContainerOld(_ref4) {
     css({
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
       minHeight: "".concat(minHeight, "px")
-    })],
+    }), fg('platform_fix_extra_space_last_line_comment_editor') && extraSpaceLastLineFix],
     "data-testid": "chromeless-editor",
     id: "chromeless-editor",
     ref: containerRef

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "209.0.1";
+export var version = "209.0.2";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "209.0.2",
+	"version": "209.0.3",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -61,7 +61,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.2.0",
 		"@atlaskit/react-ufo": "^3.14.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^8.8.0",
+		"@atlaskit/tmp-editor-statsig": "^9.0.0",
 		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -580,6 +580,9 @@
 		},
 		"platform_editor_vanilla_codebidi_warning": {
 			"type": "boolean"
+		},
+		"platform_fix_extra_space_last_line_comment_editor": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {