@atlaskit/editor-core 215.1.6 → 215.2.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 215.2.0
+
+### Minor Changes
+
+- [`0560b4dfd1361`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0560b4dfd1361) -
+  Experiment with disabling prosemirror rendering in SSR
+
+### Patch Changes
+
+- [`e22968790f2b5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e22968790f2b5) -
+  [ux] [EDITOR-2374] prevent style overrides on codemarks in excerpts
+- Updated dependencies
+
 ## 215.1.6
 
 ### Patch Changes
@@ -8903,8 +8916,7 @@
   -
   50. Another list item
 
-  Should NOT auto join to be 1 & 2 in a single list however... 49. A list item
-  -
+  ## Should NOT auto join to be 1 & 2 in a single list however... 49. A list item
   50. Another list item
 
   Should join to be 49 & 50 in a single list.

package/dist/cjs/create-editor/ReactEditorView.js

@@ -14,6 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _eventDispatcher = require("@atlaskit/editor-common/event-dispatcher");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _nodeVisibility = require("@atlaskit/editor-common/node-visibility");
@@ -30,6 +31,7 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _interactionMetrics = require("@atlaskit/react-ufo/interaction-metrics");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _useProviders = require("../composable-editor/hooks/useProviders");
 var _featureFlagsFromProps = require("../utils/feature-flags-from-props");
 var _getNodesCount = require("../utils/getNodesCount");
@@ -552,7 +554,11 @@ function ReactEditorView(props) {
     };
   }, []);
   var handleEditorViewRef = (0, _react.useCallback)(function (node) {
+    if ((0, _coreUtils.isSSR)() && (0, _expVal.expVal)('platform_editor_no_ssr', 'isEnabled', false)) {
+      return;
+    }
     if (node) {
+      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       var cleanupListeners = function cleanupListeners() {
         // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -195,7 +195,10 @@ var CommentEditorWithIntl = exports.CommentEditorWithIntl = function CommentEdit
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined
+    disabled: patch6Enabled ? !!disabled : undefined,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

package/dist/cjs/ui/Appearance/Comment/CommentToolbar.js

@@ -17,7 +17,10 @@ var CommentToolbar = exports.CommentToolbar = function CommentToolbar(_ref) {
   var editorAPI = _ref.editorAPI,
     editorView = _ref.editorView,
     editorAppearance = _ref.editorAppearance,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement;
   var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
   var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
     return component.key === _toolbar.TOOLBARS.PRIMARY_TOOLBAR;
@@ -31,6 +34,9 @@ var CommentToolbar = exports.CommentToolbar = function CommentToolbar(_ref) {
     editorView: editorView,
     editorAPI: editorAPI,
     editorAppearance: editorAppearance,
-    isDisabled: disabled
+    isDisabled: disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   });
 };

package/dist/cjs/ui/EditorContentContainer/styles/extensionStyles.js

@@ -368,13 +368,12 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
     }
   });
 
-  // Dense content mode TOC styling fix - addresses EDITOR-1992
+  // Dense content mode extensions styling fix - addresses EDITOR-1992
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   var fontSize = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') ? (0, _editorSharedStyles.relativeFontSizeToBase16)(_editorSharedStyles.akEditorFullPageDenseFontSize) : undefined;
-  // Fixes issue where TOC links fall back to default DST styles
-  var denseContentModeTocStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
+  var denseExtensionStyles = (0, _expValEquals.expValEquals)('cc_editor_ai_content_mode', 'variant', 'test') && (0, _platformFeatureFlags.fg)('platform_editor_content_mode_button_mvp') ? (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '.extension-container :not([data-inline-card-lozenge] *)': {
+    '.extension-container :not([data-inline-card-lozenge] *, [data-prosemirror-mark-name="code"])': {
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       fontSize: 'var(--ak-editor-base-font-size)'
     }
@@ -387,5 +386,5 @@ var getExtensionStyles = exports.getExtensionStyles = function getExtensionStyle
   }) : (0, _react.css)({});
 
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  return (0, _react.css)(baseExtensionStyles, denseContentModeTocStyles);
+  return (0, _react.css)(baseExtensionStyles, denseExtensionStyles);
 };

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 = "215.1.5";
+var version = exports.version = "215.1.6";

package/dist/es2019/create-editor/ReactEditorView.js

@@ -2,6 +2,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from '
 import { injectIntl } from 'react-intl-next';
 import uuid from 'uuid/v4';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent, PLATFORMS } from '@atlaskit/editor-common/analytics';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { createDispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { useConstructor, usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeVisibilityManager } from '@atlaskit/editor-common/node-visibility';
@@ -18,6 +19,7 @@ import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useProviders } from '../composable-editor/hooks/useProviders';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
 import { getNodesCount } from '../utils/getNodesCount';
@@ -509,7 +511,11 @@ export function ReactEditorView(props) {
     };
   }, []);
   const handleEditorViewRef = useCallback(node => {
+    if (isSSR() && expVal('platform_editor_no_ssr', 'isEnabled', false)) {
+      return;
+    }
     if (node) {
+      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       const cleanupListeners = () => {
         // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -183,7 +183,10 @@ export const CommentEditorWithIntl = props => {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined
+    disabled: patch6Enabled ? !!disabled : undefined,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

package/dist/es2019/ui/Appearance/Comment/CommentToolbar.js

@@ -9,7 +9,10 @@ export const CommentToolbar = ({
   editorAPI,
   editorView,
   editorAppearance,
-  disabled
+  disabled,
+  popupsBoundariesElement,
+  popupsMountPoint,
+  popupsScrollableElement
 }) => {
   var _editorAPI$toolbar;
   const components = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
@@ -23,6 +26,9 @@ export const CommentToolbar = ({
     editorView: editorView,
     editorAPI: editorAPI,
     editorAppearance: editorAppearance,
-    isDisabled: disabled
+    isDisabled: disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   });
 };

package/dist/es2019/ui/EditorContentContainer/styles/extensionStyles.js

@@ -362,13 +362,12 @@ export const getExtensionStyles = () => {
     }
   });
 
-  // Dense content mode TOC styling fix - addresses EDITOR-1992
+  // Dense content mode extensions styling fix - addresses EDITOR-1992
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   const fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
-  // Fixes issue where TOC links fall back to default DST styles
-  const denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
+  const denseExtensionStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '.extension-container :not([data-inline-card-lozenge] *)': {
+    '.extension-container :not([data-inline-card-lozenge] *, [data-prosemirror-mark-name="code"])': {
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       fontSize: 'var(--ak-editor-base-font-size)'
     }
@@ -381,5 +380,5 @@ export const getExtensionStyles = () => {
   }) : css({});
 
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  return css(baseExtensionStyles, denseContentModeTocStyles);
+  return css(baseExtensionStyles, denseExtensionStyles);
 };

package/dist/es2019/version-wrapper.js

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

package/dist/esm/create-editor/ReactEditorView.js

@@ -10,6 +10,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from '
 import { injectIntl } from 'react-intl-next';
 import uuid from 'uuid/v4';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent, PLATFORMS } from '@atlaskit/editor-common/analytics';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { createDispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import { useConstructor, usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeVisibilityManager } from '@atlaskit/editor-common/node-visibility';
@@ -26,6 +27,7 @@ import { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { abortAll, getActiveInteraction } from '@atlaskit/react-ufo/interaction-metrics';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 import { useProviders } from '../composable-editor/hooks/useProviders';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
 import { getNodesCount } from '../utils/getNodesCount';
@@ -542,7 +544,11 @@ export function ReactEditorView(props) {
     };
   }, []);
   var handleEditorViewRef = useCallback(function (node) {
+    if (isSSR() && expVal('platform_editor_no_ssr', 'isEnabled', false)) {
+      return;
+    }
     if (node) {
+      // eslint-disable-next-line @atlaskit/platform/no-direct-document-usage
       scrollElement.current = document.querySelector('[data-editor-scroll-container]');
       var cleanupListeners = function cleanupListeners() {
         // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -184,7 +184,10 @@ export var CommentEditorWithIntl = function CommentEditorWithIntl(props) {
     editorAPI: editorAPI,
     editorView: editorView,
     editorAppearance: appearance,
-    disabled: patch6Enabled ? !!disabled : undefined
+    disabled: patch6Enabled ? !!disabled : undefined,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   }), customPrimaryToolbarComponents ? customToolbarSlot : null) : jsx(ToolbarArrowKeyNavigationProvider, {
     editorView: editorView,
     childComponentSelector: "[data-testid='ak-editor-main-toolbar']",

package/dist/esm/ui/Appearance/Comment/CommentToolbar.js

@@ -10,7 +10,10 @@ export var CommentToolbar = function CommentToolbar(_ref) {
   var editorAPI = _ref.editorAPI,
     editorView = _ref.editorView,
     editorAppearance = _ref.editorAppearance,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement;
   var components = editorAPI === null || editorAPI === void 0 || (_editorAPI$toolbar = editorAPI.toolbar) === null || _editorAPI$toolbar === void 0 ? void 0 : _editorAPI$toolbar.actions.getComponents();
   var toolbar = components === null || components === void 0 ? void 0 : components.find(function (component) {
     return component.key === TOOLBARS.PRIMARY_TOOLBAR;
@@ -24,6 +27,9 @@ export var CommentToolbar = function CommentToolbar(_ref) {
     editorView: editorView,
     editorAPI: editorAPI,
     editorAppearance: editorAppearance,
-    isDisabled: disabled
+    isDisabled: disabled,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    popupsMountPoint: popupsMountPoint
   });
 };

package/dist/esm/ui/EditorContentContainer/styles/extensionStyles.js

@@ -362,13 +362,12 @@ export var getExtensionStyles = function getExtensionStyles() {
     }
   });
 
-  // Dense content mode TOC styling fix - addresses EDITOR-1992
+  // Dense content mode extensions styling fix - addresses EDITOR-1992
   // When cleaning up the experiment, move this logic into the baseExtensionStyles above
   var fontSize = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') ? relativeFontSizeToBase16(akEditorFullPageDenseFontSize) : undefined;
-  // Fixes issue where TOC links fall back to default DST styles
-  var denseContentModeTocStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
+  var denseExtensionStyles = expValEquals('cc_editor_ai_content_mode', 'variant', 'test') && fg('platform_editor_content_mode_button_mvp') ? css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors
-    '.extension-container :not([data-inline-card-lozenge] *)': {
+    '.extension-container :not([data-inline-card-lozenge] *, [data-prosemirror-mark-name="code"])': {
       // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
       fontSize: 'var(--ak-editor-base-font-size)'
     }
@@ -381,5 +380,5 @@ export var getExtensionStyles = function getExtensionStyles() {
   }) : css({});
 
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
-  return css(baseExtensionStyles, denseContentModeTocStyles);
+  return css(baseExtensionStyles, denseExtensionStyles);
 };

package/dist/esm/version-wrapper.js

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

package/dist/types/ui/Appearance/Comment/CommentToolbar.d.ts

@@ -8,9 +8,12 @@ type CommentToolbarProps = {
     editorAPI?: PublicPluginAPI<ToolbarEditorPlugins>;
     editorAppearance: EditorAppearance;
     editorView?: EditorView;
+    popupsBoundariesElement?: HTMLElement;
+    popupsMountPoint?: HTMLElement;
+    popupsScrollableElement?: HTMLElement;
 };
 /**
  * Primary toolbar driven by components registered by `editor-plugin-toolbar`, introduced in `platform_editor_toolbar_aifc`.
  */
-export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, }: CommentToolbarProps) => React.JSX.Element | null;
+export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, }: CommentToolbarProps) => React.JSX.Element | null;
 export {};

package/dist/types-ts4.5/ui/Appearance/Comment/CommentToolbar.d.ts

@@ -10,9 +10,12 @@ type CommentToolbarProps = {
     editorAPI?: PublicPluginAPI<ToolbarEditorPlugins>;
     editorAppearance: EditorAppearance;
     editorView?: EditorView;
+    popupsBoundariesElement?: HTMLElement;
+    popupsMountPoint?: HTMLElement;
+    popupsScrollableElement?: HTMLElement;
 };
 /**
  * Primary toolbar driven by components registered by `editor-plugin-toolbar`, introduced in `platform_editor_toolbar_aifc`.
  */
-export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, }: CommentToolbarProps) => React.JSX.Element | null;
+export declare const CommentToolbar: ({ editorAPI, editorView, editorAppearance, disabled, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, }: CommentToolbarProps) => React.JSX.Element | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.1.6",
+	"version": "215.2.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -64,8 +64,8 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.12.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^13.12.0",
-		"@atlaskit/tokens": "^6.5.0",
+		"@atlaskit/tmp-editor-statsig": "^13.13.0",
+		"@atlaskit/tokens": "^7.0.0",
 		"@atlaskit/tooltip": "^20.5.0",
 		"@atlaskit/width-detector": "^5.0.0",
 		"@babel/runtime": "^7.0.0",