@atlaskit/editor-core 207.14.3 → 207.14.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,38 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 207.14.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [#165439](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/165439)
8
+ [`1b15e228a1e86`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1b15e228a1e86) -
9
+ Fixed an issue which meant the new annotation manager still realied on a FG to be enabled when in
10
+ fact it should be enabled if an instance of the manager is supplied. Thie removed all dependencies
11
+ relying on the FG.
12
+ - Updated dependencies
13
+
14
+ ## 207.14.5
15
+
16
+ ### Patch Changes
17
+
18
+ - [#164233](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/164233)
19
+ [`4edd87321b895`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4edd87321b895) -
20
+ refactor scrollbar styles
21
+ - [#164129](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/164129)
22
+ [`ef34428363521`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef34428363521) -
23
+ [ux] ED-28058 fix left drag handle experience for new resizing under
24
+ platform_editor_breakout_resizing
25
+ - Updated dependencies
26
+
27
+ ## 207.14.4
28
+
29
+ ### Patch Changes
30
+
31
+ - [#163360](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/163360)
32
+ [`5166e50d3a4d8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5166e50d3a4d8) -
33
+ EDITOR-367 cleans up feature gate `platform_editor_transaction_skip_validation`
34
+ - Updated dependencies
35
+
3
36
  ## 207.14.3
4
37
 
5
38
  ### Patch Changes
@@ -1,22 +1,17 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.useDispatchTransaction = void 0;
8
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
7
  var _react = require("react");
10
8
  var _analytics = require("@atlaskit/editor-common/analytics");
11
9
  var _coreUtils = require("@atlaskit/editor-common/core-utils");
12
10
  var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
13
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
14
11
  var _findChangedNodesFromTransaction = require("../../utils/findChangedNodesFromTransaction");
15
12
  var _saferTransactions = require("../../utils/performance/safer-transactions");
16
13
  var _trackTransactions = require("../../utils/performance/track-transactions");
17
14
  var _validateNodes = require("../../utils/validateNodes");
18
- 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; }
19
- 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; }
20
15
  var useDispatchTransaction = exports.useDispatchTransaction = function useDispatchTransaction(_ref) {
21
16
  var onChange = _ref.onChange,
22
17
  dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
@@ -42,9 +37,7 @@ var useDispatchTransaction = exports.useDispatchTransaction = function useDispat
42
37
  // Remote replaceDocument transactions are fired when the document is replaced by initialization of editor-plugin-collab-edit
43
38
  // If there is a discrepancy in the ProseMirror schema at initialization, it results in the editor being loaded with no content,
44
39
  // giving the user the impression that content has been lost
45
- var isRemoteReplace = isRemoteReplaceDocumentTransaction ?
46
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
47
- (0, _platformFeatureFlags.fg)('platform_editor_transaction_skip_validation') && isRemoteReplaceDocumentTransaction(transaction) : false;
40
+ var isRemoteReplace = isRemoteReplaceDocumentTransaction ? isRemoteReplaceDocumentTransaction(transaction) : false;
48
41
  if (changedNodesValid || isRemoteReplace) {
49
42
  var oldEditorState = view.state;
50
43
 
@@ -83,12 +76,11 @@ var useDispatchTransaction = exports.useDispatchTransaction = function useDispat
83
76
  action: _analytics.ACTION.DISPATCHED_INVALID_TRANSACTION,
84
77
  actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
85
78
  eventType: _analytics.EVENT_TYPE.OPERATIONAL,
86
- attributes: _objectSpread({
79
+ attributes: {
87
80
  analyticsEventPayloads: (0, _analytics.getAnalyticsEventsFromTransaction)(transaction),
88
- invalidNodes: invalidNodes
89
- }, (0, _platformFeatureFlags.fg)('platform_editor_transaction_skip_validation') ? {
81
+ invalidNodes: invalidNodes,
90
82
  isRemoteReplaceDocumentTransaction: isRemoteReplace
91
- } : {})
83
+ }
92
84
  });
93
85
  }
94
86
  }, [dispatchAnalyticsEvent, onEditorViewUpdated, isRemoteReplaceDocumentTransaction]);
@@ -29,6 +29,30 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
29
29
  * @jsxRuntime classic
30
30
  * @jsx jsx
31
31
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
32
+ var scrollbarStylesNew = (0, _react2.css)({
33
+ '-ms-overflow-style': '-ms-autohiding-scrollbar',
34
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
35
+ '&::-webkit-scrollbar': {
36
+ overflow: 'hidden'
37
+ },
38
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
39
+ '&::-webkit-scrollbar-corner': {
40
+ display: 'none'
41
+ },
42
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
43
+ '&::-webkit-scrollbar-thumb': {
44
+ backgroundColor: "var(--ds-background-neutral-subtle, #00000000)"
45
+ },
46
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
47
+ '&:hover::-webkit-scrollbar-thumb': {
48
+ backgroundColor: "var(--ds-background-neutral-bold, #44546F)",
49
+ borderRadius: 8
50
+ },
51
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
52
+ '&::-webkit-scrollbar-thumb:hover': {
53
+ backgroundColor: "var(--ds-background-neutral-bold-hovered, #2C3E5D)"
54
+ }
55
+ });
32
56
  var chromelessEditorStyles = (0, _react2.css)({
33
57
  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
34
58
  lineHeight: '20px',
@@ -53,6 +77,27 @@ _scrollbar.scrollbarStyles, {
53
77
  }
54
78
  }
55
79
  });
80
+ var chromelessEditorStylesNew = (0, _react2.css)({
81
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
82
+ lineHeight: '20px',
83
+ height: 'auto',
84
+ overflowX: 'hidden',
85
+ overflowY: 'auto',
86
+ maxWidth: 'inherit',
87
+ boxSizing: 'border-box',
88
+ wordWrap: 'break-word',
89
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
90
+ 'div > .ProseMirror': {
91
+ outline: 'none',
92
+ whiteSpace: 'pre-wrap',
93
+ padding: 0,
94
+ margin: 0,
95
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
96
+ '& > :last-child': {
97
+ paddingBottom: "var(--ds-space-100, 0.5em)"
98
+ }
99
+ }
100
+ });
56
101
  var ContentArea = exports.ContentArea = (0, _ContentStyles.createEditorContentStyle)();
57
102
  ContentArea.displayName = 'ContentArea';
58
103
  var EditorContainer = (0, _platformFeatureFlagsReact.componentWithCondition)(function () {
@@ -109,7 +154,11 @@ var Editor = exports.default = /*#__PURE__*/function (_React$Component) {
109
154
  return (0, _react2.jsx)(_WithFlash.default, {
110
155
  animate: maxContentSizeReached
111
156
  }, (0, _react2.jsx)("div", {
112
- css: [chromelessEditorStyles, maxHeight &&
157
+ css: [(0, _experiments.editorExperiment)('platform_editor_core_static_emotion', true, {
158
+ exposure: true
159
+ }) ? chromelessEditorStylesNew : chromelessEditorStyles, (0, _experiments.editorExperiment)('platform_editor_core_static_emotion', true, {
160
+ exposure: true
161
+ }) && scrollbarStylesNew, maxHeight &&
113
162
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
114
163
  (0, _react2.css)({
115
164
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -11,12 +11,10 @@ var _react2 = require("@emotion/react");
11
11
  var _browser = require("@atlaskit/editor-common/browser");
12
12
  var _selection = require("@atlaskit/editor-common/selection");
13
13
  var _styles = require("@atlaskit/editor-common/styles");
14
- var _styles2 = require("@atlaskit/editor-plugins/find-replace/styles");
15
- var _styles3 = require("@atlaskit/editor-plugins/paste-options-toolbar/styles");
16
- var _styles4 = require("@atlaskit/editor-plugins/placeholder-text/styles");
14
+ var _styles2 = require("@atlaskit/editor-plugins/paste-options-toolbar/styles");
15
+ var _styles3 = require("@atlaskit/editor-plugins/placeholder-text/styles");
17
16
  var _commonStyles = require("@atlaskit/editor-plugins/table/ui/common-styles");
18
17
  var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
19
- var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
20
18
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
19
  var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
22
20
  var _tokens = require("@atlaskit/tokens");
@@ -37,6 +35,7 @@ var _dateStyles = require("./styles/dateStyles");
37
35
  var _editorUGCTokenStyles = require("./styles/editorUGCTokenStyles");
38
36
  var _embedCardStyles = require("./styles/embedCardStyles");
39
37
  var _emoji = require("./styles/emoji");
38
+ var _findReplaceStyles = require("./styles/findReplaceStyles");
40
39
  var _firstBlockNodeStyles = require("./styles/firstBlockNodeStyles");
41
40
  var _gridStyles = require("./styles/gridStyles");
42
41
  var _indentationStyles = require("./styles/indentationStyles");
@@ -105,7 +104,7 @@ var akEditorBreakpointForSmallDevice = "1266px";
105
104
 
106
105
  // jest warning: JSDOM version (22) doesn't support the new @container CSS rule
107
106
  var contentStyles = function contentStyles() {
108
- return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: var(--ak-editor-base-font-size);\n\n\t\t", ";\n\n\t\t", ";\n\n\t\t", ";\n\n\t\t", ";\n\t}\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t * https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\n\t", "\n\n\t", "\n\n\t", "\n\n\t", "\n\n\t", "\n\t", "\n \t", "\n\n\n \t", "\n\n\t", "\n\t", "\n\n\t", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n /* This needs to be after telepointer styles as some overlapping rules have equal specificity, and so the order is significant */\n ", "\n\n ", ";\n\n\t", "\n\n\t", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n // Switch between the two icons based on the visual refresh feature gate\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n\t.panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t// For FullPage only when inside a table\n\t// Related code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\t// In the \"editorContentAreaContainerStyle\" function\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n\t is bigger than the others, new ADS icon does not have this issue\n */\n\t", "\n"])), _editorSharedStyles.akEditorGutterPadding, (0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), _editorSharedStyles.akEditorDefaultLayoutWidth, _editorSharedStyles.akEditorFullWidthLayoutWidth, _editorSharedStyles.akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, _editorSharedStyles.akEditorCalculatedWideLayoutWidth, _whitespaceStyles.whitespaceStyles, _indentationStyles.indentationStyles, _shadowStyles.shadowStyles, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_hide_cursor_when_pm_hideselection') ? (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, (0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true) ? (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", _styles4.placeholderTextStyles, placeholderStyles, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null, _codeBlockStyles.codeBlockStyles, !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _editorUGCTokenStyles.editorUGCTokensDefault,
107
+ return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t--ak-editor--default-gutter-padding: ", "px;\n\t/* 52 is from akEditorGutterPaddingDynamic via editor-shared-styles */\n\t--ak-editor--large-gutter-padding: ", "px;\n\t--ak-editor--default-layout-width: ", "px;\n\t--ak-editor--full-width-layout-width: ", "px;\n\t/* calculate editor line length, 100cqw is the editor container width */\n\t--ak-editor--line-length: min(\n\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\tvar(--ak-editor--default-layout-width)\n\t);\n\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t--ak-editor--breakout-full-page-guttering-padding: calc(\n\t\tvar(--ak-editor--large-gutter-padding) * 2 + var(--ak-editor--default-gutter-padding)\n\t);\n\n\t.fabric-editor--full-width-mode {\n\t\t--ak-editor--line-length: min(\n\t\t\tcalc(100cqw - var(--ak-editor--large-gutter-padding) * 2),\n\t\t\tvar(--ak-editor--full-width-layout-width)\n\t\t);\n\t}\n\n\t.ProseMirror {\n\t\t--ak-editor-max-container-width: calc(100cqw - var(--ak-editor--large-gutter-padding));\n\t}\n\n\t/* We can't allow nodes that are inside other nodes to bleed from the parent container */\n\t.ProseMirror > div[data-prosemirror-node-block] [data-prosemirror-node-block] {\n\t\t--ak-editor-max-container-width: 100%;\n\t}\n\n\t/* container editor-area is defined in platform/packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts */\n\t@container editor-area (width >= ", ") {\n\t\t.ProseMirror {\n\t\t\t--ak-editor--breakout-wide-layout-width: ", "px;\n\t\t}\n\t}\n\n\t.ProseMirror {\n\t\toutline: none;\n\t\tfont-size: var(--ak-editor-base-font-size);\n\n\t\t", ";\n\n\t\t", ";\n\n\t\t", ";\n\n\t\t", ";\n\t}\n\n\t.ProseMirror-hideselection *::selection {\n\t\tbackground: transparent;\n\t}\n\n\t.ProseMirror-hideselection *::-moz-selection {\n\t\tbackground: transparent;\n\t}\n\n\t/**\n\t * This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24\n\t *\n\t * 1. Merge and Release platform_editor_hide_cursor_when_pm_hideselection\n\t * 2. Cleanup duplicated style from platform_editor_advanced_code_blocks\n\t * https://product-fabric.atlassian.net/browse/ED-26331\n\t */\n\t", "\n\n\t/* This prosemirror css style: https://github.com/ProseMirror/prosemirror-view/blob/f37ebb29befdbde3cd194fe13fe17b78e743d2f2/style/prosemirror.css#L24 */\n\t", "\n\n\t.ProseMirror-selectednode {\n\t\toutline: none;\n\t}\n\n\t.ProseMirror-selectednode:empty {\n\t\toutline: 2px solid ", ";\n\t}\n\n\t.ProseMirror.ProseMirror-focused:has(.ProseMirror-mark-boundary-cursor) {\n\t\tcaret-color: transparent;\n\t}\n\t.ProseMirror:not(.ProseMirror-focused) .ProseMirror-mark-boundary-cursor {\n\t\tdisplay: none;\n\t}\n\n\t", "\n\n\t", "\n\n\t", "\n\n\t", "\n\n\t", "\n\n\t", "\n\t", "\n \t", "\n\n\n \t", "\n\n\t", "\n\t", "\n\n\t", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n /* This needs to be after telepointer styles as some overlapping rules have equal specificity, and so the order is significant */\n ", "\n\n ", ";\n\n\t", "\n\n\t", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n // Switch between the two icons based on the visual refresh feature gate\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n ", "\n\n\t.panelView-content-wrap {\n\t\tbox-sizing: border-box;\n\t}\n\n\t.mediaGroupView-content-wrap ul {\n\t\tpadding: 0;\n\t}\n\n\t/** Needed to override any cleared floats, e.g. image wrapping */\n\n\tdiv.fabric-editor-block-mark[class^='fabric-editor-align'] {\n\t\tclear: none !important;\n\t}\n\n\t.fabric-editor-align-end {\n\t\ttext-align: right;\n\t}\n\n\t.fabric-editor-align-start {\n\t\ttext-align: left;\n\t}\n\n\t.fabric-editor-align-center {\n\t\ttext-align: center;\n\t}\n\n\t// For FullPage only when inside a table\n\t// Related code all lives inside: packages/editor/editor-core/src/ui/Appearance/FullPage/StyledComponents.ts\n\t// In the \"editorContentAreaContainerStyle\" function\n\t.fabric-editor--full-width-mode {\n\t\t.pm-table-container {\n\t\t\t.code-block,\n\t\t\t.extension-container,\n\t\t\t.multiBodiedExtension--container {\n\t\t\t\tmax-width: 100%;\n\t\t\t}\n\t\t}\n\t}\n\n\t.pm-table-header-content-wrap :not(.fabric-editor-alignment),\n\t.pm-table-header-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark,\n\t.pm-table-cell-content-wrap :not(p, .fabric-editor-block-mark) + div.fabric-editor-block-mark {\n\t\tp:first-of-type {\n\t\t\tmargin-top: 0;\n\t\t}\n\t}\n\t.pm-table-cell-content-wrap .mediaGroupView-content-wrap {\n\t\tclear: both;\n\t}\n\n\t.hyperlink-floating-toolbar {\n\t\tpadding: 0;\n\t}\n\n\t/* Legacy Link icon in the Atlaskit package\n\t is bigger than the others, new ADS icon does not have this issue\n */\n\t", "\n"])), _editorSharedStyles.akEditorGutterPadding, (0, _editorSharedStyles.akEditorGutterPaddingDynamic)(), _editorSharedStyles.akEditorDefaultLayoutWidth, _editorSharedStyles.akEditorFullWidthLayoutWidth, _editorSharedStyles.akEditorCalculatedWideLayoutWidthSmallViewport, akEditorBreakpointForSmallDevice, _editorSharedStyles.akEditorCalculatedWideLayoutWidth, _whitespaceStyles.whitespaceStyles, _indentationStyles.indentationStyles, _shadowStyles.shadowStyles, _getInlineNodeViewProducer.InlineNodeViewSharedStyles, (0, _platformFeatureFlags.fg)('platform_editor_hide_cursor_when_pm_hideselection') ? (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, (0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true) ? (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n\t\t\t\t.ProseMirror-hideselection {\n\t\t\t\t\tcaret-color: transparent;\n\t\t\t\t}\n\t\t\t"]))) : null, "var(--ds-border-focused, #8cf)", _styles3.placeholderTextStyles, placeholderStyles, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? placeholderOverflowStyles : null, (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_quick_insert_placeholder') ? placeholderWrapStyles : null, _codeBlockStyles.codeBlockStyles, !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _editorUGCTokenStyles.editorUGCTokensDefault,
109
108
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
110
109
  (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && ( /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
111
110
  (0, _platformFeatureFlags.fg)('platform-dst-jira-web-fonts') || (0, _platformFeatureFlags.fg)('confluence_typography_refreshed') || (0, _platformFeatureFlags.fg)('atlas_editor_typography_refreshed')) && _editorUGCTokenStyles.editorUGCTokensRefreshed
@@ -113,7 +112,7 @@ var contentStyles = function contentStyles() {
113
112
  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
114
113
  (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
115
114
  !((0, _platformFeatureFlags.fg)('platform-dst-jira-web-fonts') || (0, _platformFeatureFlags.fg)('confluence_typography_refreshed') || (0, _platformFeatureFlags.fg)('atlas_editor_typography_refreshed')) && _editorUGCTokenStyles.editorUGCTokensModernized
116
- /* eslint-enable @atlaskit/platform/ensure-feature-flag-prefix */, _blockTypeStyles.blocktypeStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _blockTypeStyles.blocktypeStyles_fg_platform_editor_typography_ugc, !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _blockTypeStyles.blocktypeStyles_without_fg_platform_editor_typography_ugc, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && _blockTypeStyles.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, _codeMarkStyles.codeMarkStyles, _textColorStyles.textColorStyles, _backgroundColorStyles.backgroundColorStyles, _list.listsStyles, _rule.ruleStyles, _mediaStyles.mediaStyles, (0, _platformFeatureFlags.fg)('confluence_team_presence_scroll_to_pointer') ? _telepointerStyles.telepointerStyle : _telepointerStyles.telepointerStyleWithInitialOnly, _telepointerStyles.telepointerColorAndCommonStyle, _selection.gapCursorStyles, (0, _panel.panelStyles)(), _mentions.mentionsStyles, _tasksAndDecisionsStyles.tasksAndDecisionsStyles, _gridStyles.gridStyles, _blockMarksStyles.blockMarksStyles, _dateStyles.dateStyles, _extension.extensionStyles, (0, _expand.expandStyles)(), _styles2.findReplaceStyles, _styles3.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true, {
115
+ /* eslint-enable @atlaskit/platform/ensure-feature-flag-prefix */, _blockTypeStyles.blocktypeStyles, (0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _blockTypeStyles.blocktypeStyles_fg_platform_editor_typography_ugc, !(0, _platformFeatureFlags.fg)('platform_editor_typography_ugc') && _blockTypeStyles.blocktypeStyles_without_fg_platform_editor_typography_ugc, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') && _blockTypeStyles.blocktypeStyles_fg_platform_editor_nested_dnd_styles_changes, _codeMarkStyles.codeMarkStyles, _textColorStyles.textColorStyles, _backgroundColorStyles.backgroundColorStyles, _list.listsStyles, _rule.ruleStyles, _mediaStyles.mediaStyles, (0, _platformFeatureFlags.fg)('confluence_team_presence_scroll_to_pointer') ? _telepointerStyles.telepointerStyle : _telepointerStyles.telepointerStyleWithInitialOnly, _telepointerStyles.telepointerColorAndCommonStyle, _selection.gapCursorStyles, (0, _panel.panelStyles)(), _mentions.mentionsStyles, _tasksAndDecisionsStyles.tasksAndDecisionsStyles, _gridStyles.gridStyles, _blockMarksStyles.blockMarksStyles, _dateStyles.dateStyles, _extension.extensionStyles, (0, _expand.expandStyles)(), _findReplaceStyles.findReplaceStyles, _styles2.textHighlightStyle, _tasksAndDecisions.taskDecisionStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true, {
117
116
  exposure: false
118
117
  }) && _tasksAndDecisions.vanillaTaskItemStyles, (0, _experiments.editorExperiment)('platform_editor_vanilla_dom', true, {
119
118
  exposure: false
@@ -156,9 +155,31 @@ var fullPageEditorStyles = (0, _react2.css)({
156
155
  display: 'flex',
157
156
  flexDirection: 'column',
158
157
  scrollBehavior: 'smooth'
159
- },
160
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
161
- _scrollbar.scrollbarStyles);
158
+ });
159
+ var scrollbarStyles = (0, _react2.css)({
160
+ '-ms-overflow-style': '-ms-autohiding-scrollbar',
161
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
162
+ '&::-webkit-scrollbar': {
163
+ overflow: 'hidden'
164
+ },
165
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
166
+ '&::-webkit-scrollbar-corner': {
167
+ display: 'none'
168
+ },
169
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
170
+ '&::-webkit-scrollbar-thumb': {
171
+ backgroundColor: "var(--ds-background-neutral-subtle, #00000000)"
172
+ },
173
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
174
+ '&:hover::-webkit-scrollbar-thumb': {
175
+ backgroundColor: "var(--ds-background-neutral-bold, #44546F)",
176
+ borderRadius: 8
177
+ },
178
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
179
+ '&::-webkit-scrollbar-thumb:hover': {
180
+ backgroundColor: "var(--ds-background-neutral-bold-hovered, #2C3E5D)"
181
+ }
182
+ });
162
183
  var listLayoutShiftFix = (0, _react2.css)({
163
184
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
164
185
  '.ProseMirror ul, .ProseMirror ol': {
@@ -221,7 +242,7 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
221
242
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
222
243
  colorMode === 'dark' && isFirefox && _aiPanel.aiPanelDarkFirefoxStyles,
223
244
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
224
- viewMode === 'view' && _layout.layoutViewStyles, isComment && commentEditorStyles, isFullPage && fullPageEditorStyles, (0, _platformFeatureFlags.fg)('platform_editor_ssr_fix_lists') && listLayoutShiftFix, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
245
+ viewMode === 'view' && _layout.layoutViewStyles, isComment && commentEditorStyles, isFullPage && fullPageEditorStyles, isFullPage && scrollbarStyles, (0, _platformFeatureFlags.fg)('platform_editor_ssr_fix_lists') && listLayoutShiftFix, (0, _platformFeatureFlags.fg)('platform_editor_nested_dnd_styles_changes') ?
225
246
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
226
247
  _codeBlockStyles.firstCodeBlockWithNoMargin :
227
248
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -0,0 +1,22 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.findReplaceStyles = void 0;
7
+ var _react = require("@emotion/react");
8
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
9
+
10
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
11
+ var findReplaceStyles = exports.findReplaceStyles = (0, _react.css)({
12
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
13
+ '.search-match': {
14
+ borderRadius: '3px',
15
+ backgroundColor: "var(--ds-background-accent-teal-subtlest, #E7F9FF)",
16
+ boxShadow: "var(--ds-shadow-raised, 0 1px 1px 0 rgba(9, 30, 66, 0.25), 0 0 1px 0 rgba(9, 30, 66, 0.31))".concat(", inset 0 0 0 1px ", "var(--ds-border-input, #8590A2)")
17
+ },
18
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
19
+ '.selected-search-match': {
20
+ backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
21
+ }
22
+ });
@@ -230,6 +230,7 @@ var pragmaticResizerStyles = exports.pragmaticResizerStyles = (0, _react.css)({
230
230
  cursor: 'col-resize',
231
231
  borderRadius: 4,
232
232
  transition: 'background-color 0.2s, visibility 0.2s, opacity 0.2s',
233
+ zIndex: 2,
233
234
  '&:hover': {
234
235
  background: "var(--ds-background-selected, #E9F2FF)",
235
236
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "207.14.3";
8
+ var version = exports.version = "207.14.6";
@@ -2,7 +2,6 @@ import { useCallback, useEffect, useRef } from 'react';
2
2
  import { ACTION, ACTION_SUBJECT, EVENT_TYPE, getAnalyticsEventsFromTransaction } from '@atlaskit/editor-common/analytics';
3
3
  import { getDocStructure } from '@atlaskit/editor-common/core-utils';
4
4
  import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
5
- import { fg } from '@atlaskit/platform-feature-flags';
6
5
  import { findChangedNodesFromTransaction } from '../../utils/findChangedNodesFromTransaction';
7
6
  import { freezeUnsafeTransactionProperties } from '../../utils/performance/safer-transactions';
8
7
  import { EVENT_NAME_ON_CHANGE } from '../../utils/performance/track-transactions';
@@ -33,9 +32,7 @@ export const useDispatchTransaction = ({
33
32
  // Remote replaceDocument transactions are fired when the document is replaced by initialization of editor-plugin-collab-edit
34
33
  // If there is a discrepancy in the ProseMirror schema at initialization, it results in the editor being loaded with no content,
35
34
  // giving the user the impression that content has been lost
36
- const isRemoteReplace = isRemoteReplaceDocumentTransaction ?
37
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
38
- fg('platform_editor_transaction_skip_validation') && isRemoteReplaceDocumentTransaction(transaction) : false;
35
+ const isRemoteReplace = isRemoteReplaceDocumentTransaction ? isRemoteReplaceDocumentTransaction(transaction) : false;
39
36
  if (changedNodesValid || isRemoteReplace) {
40
37
  const oldEditorState = view.state;
41
38
 
@@ -74,9 +71,7 @@ export const useDispatchTransaction = ({
74
71
  attributes: {
75
72
  analyticsEventPayloads: getAnalyticsEventsFromTransaction(transaction),
76
73
  invalidNodes,
77
- ...(fg('platform_editor_transaction_skip_validation') ? {
78
- isRemoteReplaceDocumentTransaction: isRemoteReplace
79
- } : {})
74
+ isRemoteReplaceDocumentTransaction: isRemoteReplace
80
75
  }
81
76
  });
82
77
  }
@@ -16,6 +16,30 @@ import { createEditorContentStyle } from '../ContentStyles';
16
16
  import EditorContentContainer from '../EditorContentContainer/EditorContentContainer';
17
17
  import PluginSlot from '../PluginSlot';
18
18
  import WithFlash from '../WithFlash';
19
+ const scrollbarStylesNew = css({
20
+ '-ms-overflow-style': '-ms-autohiding-scrollbar',
21
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
22
+ '&::-webkit-scrollbar': {
23
+ overflow: 'hidden'
24
+ },
25
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
26
+ '&::-webkit-scrollbar-corner': {
27
+ display: 'none'
28
+ },
29
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
30
+ '&::-webkit-scrollbar-thumb': {
31
+ backgroundColor: "var(--ds-background-neutral-subtle, #00000000)"
32
+ },
33
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
34
+ '&:hover::-webkit-scrollbar-thumb': {
35
+ backgroundColor: "var(--ds-background-neutral-bold, #44546F)",
36
+ borderRadius: 8
37
+ },
38
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
39
+ '&::-webkit-scrollbar-thumb:hover': {
40
+ backgroundColor: "var(--ds-background-neutral-bold-hovered, #2C3E5D)"
41
+ }
42
+ });
19
43
  const chromelessEditorStyles = css({
20
44
  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
21
45
  lineHeight: '20px',
@@ -40,6 +64,27 @@ scrollbarStyles, {
40
64
  }
41
65
  }
42
66
  });
67
+ const chromelessEditorStylesNew = css({
68
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
69
+ lineHeight: '20px',
70
+ height: 'auto',
71
+ overflowX: 'hidden',
72
+ overflowY: 'auto',
73
+ maxWidth: 'inherit',
74
+ boxSizing: 'border-box',
75
+ wordWrap: 'break-word',
76
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
77
+ 'div > .ProseMirror': {
78
+ outline: 'none',
79
+ whiteSpace: 'pre-wrap',
80
+ padding: 0,
81
+ margin: 0,
82
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
83
+ '& > :last-child': {
84
+ paddingBottom: "var(--ds-space-100, 0.5em)"
85
+ }
86
+ }
87
+ });
43
88
  export const ContentArea = createEditorContentStyle();
44
89
  ContentArea.displayName = 'ContentArea';
45
90
  const EditorContainer = componentWithCondition(() => editorExperiment('platform_editor_core_static_emotion', true, {
@@ -91,7 +136,11 @@ export default class Editor extends React.Component {
91
136
  return jsx(WithFlash, {
92
137
  animate: maxContentSizeReached
93
138
  }, jsx("div", {
94
- css: [chromelessEditorStyles, maxHeight &&
139
+ css: [editorExperiment('platform_editor_core_static_emotion', true, {
140
+ exposure: true
141
+ }) ? chromelessEditorStylesNew : chromelessEditorStyles, editorExperiment('platform_editor_core_static_emotion', true, {
142
+ exposure: true
143
+ }) && scrollbarStylesNew, maxHeight &&
95
144
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
96
145
  css({
97
146
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -12,12 +12,10 @@ import { css, jsx, useTheme } from '@emotion/react';
12
12
  import { browser } from '@atlaskit/editor-common/browser';
13
13
  import { gapCursorStyles } from '@atlaskit/editor-common/selection';
14
14
  import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
15
- import { findReplaceStyles } from '@atlaskit/editor-plugins/find-replace/styles';
16
15
  import { textHighlightStyle } from '@atlaskit/editor-plugins/paste-options-toolbar/styles';
17
16
  import { placeholderTextStyles } from '@atlaskit/editor-plugins/placeholder-text/styles';
18
17
  import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
19
18
  import { akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic, editorFontSize } from '@atlaskit/editor-shared-styles';
20
- import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
21
19
  import { fg } from '@atlaskit/platform-feature-flags';
22
20
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
23
21
  import { useThemeObserver } from '@atlaskit/tokens';
@@ -38,6 +36,7 @@ import { dateStyles, dateVanillaStyles } from './styles/dateStyles';
38
36
  import { editorUGCTokensDefault, editorUGCTokensModernized, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
39
37
  import { embedCardStyles } from './styles/embedCardStyles';
40
38
  import { reactEmojiStyles, vanillaEmojiStyles } from './styles/emoji';
39
+ import { findReplaceStyles } from './styles/findReplaceStyles';
41
40
  import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
42
41
  import { gridStyles } from './styles/gridStyles';
43
42
  import { indentationStyles } from './styles/indentationStyles';
@@ -392,9 +391,31 @@ const fullPageEditorStyles = css({
392
391
  display: 'flex',
393
392
  flexDirection: 'column',
394
393
  scrollBehavior: 'smooth'
395
- },
396
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
397
- scrollbarStyles);
394
+ });
395
+ const scrollbarStyles = css({
396
+ '-ms-overflow-style': '-ms-autohiding-scrollbar',
397
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
398
+ '&::-webkit-scrollbar': {
399
+ overflow: 'hidden'
400
+ },
401
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
402
+ '&::-webkit-scrollbar-corner': {
403
+ display: 'none'
404
+ },
405
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
406
+ '&::-webkit-scrollbar-thumb': {
407
+ backgroundColor: "var(--ds-background-neutral-subtle, #00000000)"
408
+ },
409
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
410
+ '&:hover::-webkit-scrollbar-thumb': {
411
+ backgroundColor: "var(--ds-background-neutral-bold, #44546F)",
412
+ borderRadius: 8
413
+ },
414
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
415
+ '&::-webkit-scrollbar-thumb:hover': {
416
+ backgroundColor: "var(--ds-background-neutral-bold-hovered, #2C3E5D)"
417
+ }
418
+ });
398
419
  const listLayoutShiftFix = css({
399
420
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
400
421
  '.ProseMirror ul, .ProseMirror ol': {
@@ -460,7 +481,7 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
460
481
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
461
482
  colorMode === 'dark' && isFirefox && aiPanelDarkFirefoxStyles,
462
483
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
463
- viewMode === 'view' && layoutViewStyles, isComment && commentEditorStyles, isFullPage && fullPageEditorStyles, fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix, fg('platform_editor_nested_dnd_styles_changes') ?
484
+ viewMode === 'view' && layoutViewStyles, isComment && commentEditorStyles, isFullPage && fullPageEditorStyles, isFullPage && scrollbarStyles, fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix, fg('platform_editor_nested_dnd_styles_changes') ?
464
485
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
465
486
  firstCodeBlockWithNoMargin :
466
487
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -0,0 +1,15 @@
1
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
+ import { css } from '@emotion/react';
3
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
4
+ export const findReplaceStyles = css({
5
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
6
+ '.search-match': {
7
+ borderRadius: '3px',
8
+ backgroundColor: "var(--ds-background-accent-teal-subtlest, #E7F9FF)",
9
+ boxShadow: `${"var(--ds-shadow-raised, 0 1px 1px 0 rgba(9, 30, 66, 0.25), 0 0 1px 0 rgba(9, 30, 66, 0.31))"}, inset 0 0 0 1px ${"var(--ds-border-input, #8590A2)"}`
10
+ },
11
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
12
+ '.selected-search-match': {
13
+ backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
14
+ }
15
+ });
@@ -275,6 +275,7 @@ export const pragmaticResizerStyles = css({
275
275
  cursor: 'col-resize',
276
276
  borderRadius: 4,
277
277
  transition: 'background-color 0.2s, visibility 0.2s, opacity 0.2s',
278
+ zIndex: 2,
278
279
  '&:hover': {
279
280
  background: "var(--ds-background-selected, #E9F2FF)",
280
281
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "207.14.3";
2
+ export const version = "207.14.6";
@@ -1,11 +1,7 @@
1
- import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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; }
4
1
  import { useCallback, useEffect, useRef } from 'react';
5
2
  import { ACTION, ACTION_SUBJECT, EVENT_TYPE, getAnalyticsEventsFromTransaction } from '@atlaskit/editor-common/analytics';
6
3
  import { getDocStructure } from '@atlaskit/editor-common/core-utils';
7
4
  import { startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
8
- import { fg } from '@atlaskit/platform-feature-flags';
9
5
  import { findChangedNodesFromTransaction } from '../../utils/findChangedNodesFromTransaction';
10
6
  import { freezeUnsafeTransactionProperties } from '../../utils/performance/safer-transactions';
11
7
  import { EVENT_NAME_ON_CHANGE } from '../../utils/performance/track-transactions';
@@ -35,9 +31,7 @@ export var useDispatchTransaction = function useDispatchTransaction(_ref) {
35
31
  // Remote replaceDocument transactions are fired when the document is replaced by initialization of editor-plugin-collab-edit
36
32
  // If there is a discrepancy in the ProseMirror schema at initialization, it results in the editor being loaded with no content,
37
33
  // giving the user the impression that content has been lost
38
- var isRemoteReplace = isRemoteReplaceDocumentTransaction ?
39
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
40
- fg('platform_editor_transaction_skip_validation') && isRemoteReplaceDocumentTransaction(transaction) : false;
34
+ var isRemoteReplace = isRemoteReplaceDocumentTransaction ? isRemoteReplaceDocumentTransaction(transaction) : false;
41
35
  if (changedNodesValid || isRemoteReplace) {
42
36
  var oldEditorState = view.state;
43
37
 
@@ -76,12 +70,11 @@ export var useDispatchTransaction = function useDispatchTransaction(_ref) {
76
70
  action: ACTION.DISPATCHED_INVALID_TRANSACTION,
77
71
  actionSubject: ACTION_SUBJECT.EDITOR,
78
72
  eventType: EVENT_TYPE.OPERATIONAL,
79
- attributes: _objectSpread({
73
+ attributes: {
80
74
  analyticsEventPayloads: getAnalyticsEventsFromTransaction(transaction),
81
- invalidNodes: invalidNodes
82
- }, fg('platform_editor_transaction_skip_validation') ? {
75
+ invalidNodes: invalidNodes,
83
76
  isRemoteReplaceDocumentTransaction: isRemoteReplace
84
- } : {})
77
+ }
85
78
  });
86
79
  }
87
80
  }, [dispatchAnalyticsEvent, onEditorViewUpdated, isRemoteReplaceDocumentTransaction]);
@@ -23,6 +23,30 @@ import { createEditorContentStyle } from '../ContentStyles';
23
23
  import EditorContentContainer from '../EditorContentContainer/EditorContentContainer';
24
24
  import PluginSlot from '../PluginSlot';
25
25
  import WithFlash from '../WithFlash';
26
+ var scrollbarStylesNew = css({
27
+ '-ms-overflow-style': '-ms-autohiding-scrollbar',
28
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
29
+ '&::-webkit-scrollbar': {
30
+ overflow: 'hidden'
31
+ },
32
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
33
+ '&::-webkit-scrollbar-corner': {
34
+ display: 'none'
35
+ },
36
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
37
+ '&::-webkit-scrollbar-thumb': {
38
+ backgroundColor: "var(--ds-background-neutral-subtle, #00000000)"
39
+ },
40
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
41
+ '&:hover::-webkit-scrollbar-thumb': {
42
+ backgroundColor: "var(--ds-background-neutral-bold, #44546F)",
43
+ borderRadius: 8
44
+ },
45
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
46
+ '&::-webkit-scrollbar-thumb:hover': {
47
+ backgroundColor: "var(--ds-background-neutral-bold-hovered, #2C3E5D)"
48
+ }
49
+ });
26
50
  var chromelessEditorStyles = css({
27
51
  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
28
52
  lineHeight: '20px',
@@ -47,6 +71,27 @@ scrollbarStyles, {
47
71
  }
48
72
  }
49
73
  });
74
+ var chromelessEditorStylesNew = css({
75
+ // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
76
+ lineHeight: '20px',
77
+ height: 'auto',
78
+ overflowX: 'hidden',
79
+ overflowY: 'auto',
80
+ maxWidth: 'inherit',
81
+ boxSizing: 'border-box',
82
+ wordWrap: 'break-word',
83
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
84
+ 'div > .ProseMirror': {
85
+ outline: 'none',
86
+ whiteSpace: 'pre-wrap',
87
+ padding: 0,
88
+ margin: 0,
89
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
90
+ '& > :last-child': {
91
+ paddingBottom: "var(--ds-space-100, 0.5em)"
92
+ }
93
+ }
94
+ });
50
95
  export var ContentArea = createEditorContentStyle();
51
96
  ContentArea.displayName = 'ContentArea';
52
97
  var EditorContainer = componentWithCondition(function () {
@@ -103,7 +148,11 @@ var Editor = /*#__PURE__*/function (_React$Component) {
103
148
  return jsx(WithFlash, {
104
149
  animate: maxContentSizeReached
105
150
  }, jsx("div", {
106
- css: [chromelessEditorStyles, maxHeight &&
151
+ css: [editorExperiment('platform_editor_core_static_emotion', true, {
152
+ exposure: true
153
+ }) ? chromelessEditorStylesNew : chromelessEditorStyles, editorExperiment('platform_editor_core_static_emotion', true, {
154
+ exposure: true
155
+ }) && scrollbarStylesNew, maxHeight &&
107
156
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
108
157
  css({
109
158
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -14,12 +14,10 @@ import { css, jsx, useTheme } from '@emotion/react';
14
14
  import { browser } from '@atlaskit/editor-common/browser';
15
15
  import { gapCursorStyles } from '@atlaskit/editor-common/selection';
16
16
  import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
17
- import { findReplaceStyles } from '@atlaskit/editor-plugins/find-replace/styles';
18
17
  import { textHighlightStyle } from '@atlaskit/editor-plugins/paste-options-toolbar/styles';
19
18
  import { placeholderTextStyles } from '@atlaskit/editor-plugins/placeholder-text/styles';
20
19
  import { tableCommentEditorStyles } from '@atlaskit/editor-plugins/table/ui/common-styles';
21
20
  import { akEditorCalculatedWideLayoutWidth, akEditorCalculatedWideLayoutWidthSmallViewport, akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorGutterPaddingDynamic, editorFontSize } from '@atlaskit/editor-shared-styles';
22
- import { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
23
21
  import { fg } from '@atlaskit/platform-feature-flags';
24
22
  import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
25
23
  import { useThemeObserver } from '@atlaskit/tokens';
@@ -40,6 +38,7 @@ import { dateStyles, dateVanillaStyles } from './styles/dateStyles';
40
38
  import { editorUGCTokensDefault, editorUGCTokensModernized, editorUGCTokensRefreshed } from './styles/editorUGCTokenStyles';
41
39
  import { embedCardStyles } from './styles/embedCardStyles';
42
40
  import { reactEmojiStyles, vanillaEmojiStyles } from './styles/emoji';
41
+ import { findReplaceStyles } from './styles/findReplaceStyles';
43
42
  import { firstBlockNodeStyles } from './styles/firstBlockNodeStyles';
44
43
  import { gridStyles } from './styles/gridStyles';
45
44
  import { indentationStyles } from './styles/indentationStyles';
@@ -150,9 +149,31 @@ var fullPageEditorStyles = css({
150
149
  display: 'flex',
151
150
  flexDirection: 'column',
152
151
  scrollBehavior: 'smooth'
153
- },
154
- // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
155
- scrollbarStyles);
152
+ });
153
+ var scrollbarStyles = css({
154
+ '-ms-overflow-style': '-ms-autohiding-scrollbar',
155
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
156
+ '&::-webkit-scrollbar': {
157
+ overflow: 'hidden'
158
+ },
159
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
160
+ '&::-webkit-scrollbar-corner': {
161
+ display: 'none'
162
+ },
163
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
164
+ '&::-webkit-scrollbar-thumb': {
165
+ backgroundColor: "var(--ds-background-neutral-subtle, #00000000)"
166
+ },
167
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
168
+ '&:hover::-webkit-scrollbar-thumb': {
169
+ backgroundColor: "var(--ds-background-neutral-bold, #44546F)",
170
+ borderRadius: 8
171
+ },
172
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-selectors
173
+ '&::-webkit-scrollbar-thumb:hover': {
174
+ backgroundColor: "var(--ds-background-neutral-bold-hovered, #2C3E5D)"
175
+ }
176
+ });
156
177
  var listLayoutShiftFix = css({
157
178
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
158
179
  '.ProseMirror ul, .ProseMirror ol': {
@@ -215,7 +236,7 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
215
236
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
216
237
  colorMode === 'dark' && isFirefox && aiPanelDarkFirefoxStyles,
217
238
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
218
- viewMode === 'view' && layoutViewStyles, isComment && commentEditorStyles, isFullPage && fullPageEditorStyles, fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix, fg('platform_editor_nested_dnd_styles_changes') ?
239
+ viewMode === 'view' && layoutViewStyles, isComment && commentEditorStyles, isFullPage && fullPageEditorStyles, isFullPage && scrollbarStyles, fg('platform_editor_ssr_fix_lists') && listLayoutShiftFix, fg('platform_editor_nested_dnd_styles_changes') ?
219
240
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
220
241
  firstCodeBlockWithNoMargin :
221
242
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
@@ -0,0 +1,15 @@
1
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled
2
+ import { css } from '@emotion/react';
3
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
4
+ export var findReplaceStyles = css({
5
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
6
+ '.search-match': {
7
+ borderRadius: '3px',
8
+ backgroundColor: "var(--ds-background-accent-teal-subtlest, #E7F9FF)",
9
+ boxShadow: "var(--ds-shadow-raised, 0 1px 1px 0 rgba(9, 30, 66, 0.25), 0 0 1px 0 rgba(9, 30, 66, 0.31))".concat(", inset 0 0 0 1px ", "var(--ds-border-input, #8590A2)")
10
+ },
11
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
12
+ '.selected-search-match': {
13
+ backgroundColor: "var(--ds-background-accent-teal-subtle, #6CC3E0)"
14
+ }
15
+ });
@@ -222,6 +222,7 @@ export var pragmaticResizerStyles = css({
222
222
  cursor: 'col-resize',
223
223
  borderRadius: 4,
224
224
  transition: 'background-color 0.2s, visibility 0.2s, opacity 0.2s',
225
+ zIndex: 2,
225
226
  '&:hover': {
226
227
  background: "var(--ds-background-selected, #E9F2FF)",
227
228
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "207.14.3";
2
+ export var version = "207.14.6";
@@ -0,0 +1 @@
1
+ export declare const findReplaceStyles: import("@emotion/react").SerializedStyles;
@@ -0,0 +1 @@
1
+ export declare const findReplaceStyles: import("@emotion/react").SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "207.14.3",
3
+ "version": "207.14.6",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -62,9 +62,9 @@
62
62
  "@atlaskit/platform-feature-flags-react": "^0.2.0",
63
63
  "@atlaskit/react-ufo": "^3.13.0",
64
64
  "@atlaskit/task-decision": "^19.2.0",
65
- "@atlaskit/tmp-editor-statsig": "^5.8.0",
65
+ "@atlaskit/tmp-editor-statsig": "^5.10.0",
66
66
  "@atlaskit/tokens": "^5.0.0",
67
- "@atlaskit/tooltip": "^20.2.0",
67
+ "@atlaskit/tooltip": "^20.3.0",
68
68
  "@atlaskit/width-detector": "^5.0.0",
69
69
  "@babel/runtime": "^7.0.0",
70
70
  "@emotion/react": "^11.7.1",
@@ -79,7 +79,7 @@
79
79
  "uuid": "^3.1.0"
80
80
  },
81
81
  "peerDependencies": {
82
- "@atlaskit/link-provider": "^3.2.0",
82
+ "@atlaskit/link-provider": "^3.3.0",
83
83
  "@atlaskit/media-core": "^36.1.0",
84
84
  "react": "^18.2.0",
85
85
  "react-dom": "^18.2.0",
@@ -95,7 +95,7 @@
95
95
  "@atlaskit/editor-plugin-card": "^6.4.0",
96
96
  "@atlaskit/editor-plugin-list": "^4.2.0",
97
97
  "@atlaskit/editor-plugin-paste": "^3.3.0",
98
- "@atlaskit/link-provider": "^3.2.0",
98
+ "@atlaskit/link-provider": "^3.3.0",
99
99
  "@atlaskit/logo": "^19.0.0",
100
100
  "@atlaskit/media-core": "^36.1.0",
101
101
  "@atlaskit/media-integration-test-helpers": "workspace:^",
@@ -104,7 +104,7 @@
104
104
  "@atlaskit/primitives": "^14.8.0",
105
105
  "@atlaskit/renderer": "^118.6.0",
106
106
  "@atlaskit/section-message": "^8.2.0",
107
- "@atlaskit/smart-card": "^38.5.0",
107
+ "@atlaskit/smart-card": "^38.6.0",
108
108
  "@atlaskit/synchrony-test-helpers": "workspace:^",
109
109
  "@atlaskit/toggle": "^15.0.0",
110
110
  "@atlaskit/util-data-test": "^18.0.0",
@@ -411,10 +411,6 @@
411
411
  "type": "boolean",
412
412
  "referenceOnly": true
413
413
  },
414
- "platform_editor_nbm_backspace_fixes": {
415
- "type": "boolean",
416
- "referenceOnly": true
417
- },
418
414
  "platform_editor_split_list_item_for_gap_cursor": {
419
415
  "type": "boolean",
420
416
  "referenceOnly": true
@@ -440,9 +436,6 @@
440
436
  "platform_editor_add_media_from_url_rollout": {
441
437
  "type": "boolean"
442
438
  },
443
- "platform_editor_transaction_skip_validation": {
444
- "type": "boolean"
445
- },
446
439
  "platform_editor_elements_dnd_multi_select_patch_2": {
447
440
  "type": "boolean",
448
441
  "referenceOnly": true