@atlaskit/editor-core 195.4.3 → 195.4.5

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-core
 
+## 195.4.5
+
+### Patch Changes
+
+- [#129496](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129496)
+  [`5776cd6d4856e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5776cd6d4856e) -
+  remove no editor selection in view mode ff
+
+## 195.4.4
+
+### Patch Changes
+
+- [#129411](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129411)
+  [`080325d254926`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/080325d254926) -
+  Added PTW 40% scale to comment editor and renderer in confluence
+- [#129415](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/129415)
+  [`f5c556c716ddf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f5c556c716ddf) -
+  Allow collapsed editor to have any child as its child may be a wrapper.
+- Updated dependencies
+
 ## 195.4.3
 
 ### Patch Changes

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

@@ -26,7 +26,6 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _eventDispatcher = require("../event-dispatcher");
 var _document = require("../utils/document");
 var _isFullPage = require("../utils/is-full-page");
@@ -220,41 +219,27 @@ var ReactEditorView = exports.ReactEditorView = /*#__PURE__*/function (_React$Co
       var api = _this.pluginInjectionAPI.api();
       var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState().mode) === 'view';
       var selection;
-      if ((0, _platformFeatureFlags.fg)('platform.editor.live-view.no-editor-selection-in-view-mode')) {
-        if (doc) {
-          if (isViewMode) {
-            var emptySelection = new _state2.TextSelection(doc.resolve(0));
-            return _state2.EditorState.create({
-              schema: schema,
-              plugins: plugins,
-              doc: doc,
-              selection: emptySelection
-            });
-          } else {
-            selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
-          }
-        }
-        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-        var patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-        return _state2.EditorState.create({
-          schema: schema,
-          plugins: plugins,
-          doc: doc,
-          selection: patchedSelection
-        });
-      } else {
-        if (doc) {
+      if (doc) {
+        if (isViewMode) {
+          var emptySelection = new _state2.TextSelection(doc.resolve(0));
+          return _state2.EditorState.create({
+            schema: schema,
+            plugins: plugins,
+            doc: doc,
+            selection: emptySelection
+          });
+        } else {
           selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
         }
-        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-        var _patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-        return _state2.EditorState.create({
-          schema: schema,
-          plugins: plugins,
-          doc: doc,
-          selection: _patchedSelection
-        });
       }
+      // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+      var patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      return _state2.EditorState.create({
+        schema: schema,
+        plugins: plugins,
+        doc: doc,
+        selection: patchedSelection
+      });
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onEditorViewStateUpdated", function (_ref2) {
       var originalTransaction = _ref2.originalTransaction,

package/dist/cjs/presets/universal.js

@@ -143,7 +143,7 @@ function createUniversalPresetInternal(_ref) {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     tableResizingEnabled: isFullPage || isComment && (0, _platformFeatureFlags.fg)('platform_editor_table_support_in_comment'),
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && (0, _platformFeatureFlags.fg)('platform_editor_table_support_in_comment')),
-    isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && isFullPage,
+    isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && (isFullPage || isComment && (0, _platformFeatureFlags.fg)('platform_editor_table_support_in_comment')),
     allowContextualMenu: !isMobile,
     fullWidthEnabled: appearance === 'full-width',
     wasFullWidthEnabled: prevAppearance && prevAppearance === 'full-width',

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

@@ -14,9 +14,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _composableEditor = require("../../composable-editor");
-var _editor = _interopRequireDefault(require("../../editor"));
-var _EditorWithActions = _interopRequireDefault(require("../../EditorWithActions"));
 var _ChromeCollapsed = _interopRequireDefault(require("../ChromeCollapsed"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -52,10 +49,7 @@ var CollapsedEditor = exports.default = /*#__PURE__*/function (_React$Component)
     value: function render() {
       var _this2 = this;
       var child = _react.default.Children.only(this.props.children);
-      if (child.type !== _editor.default && child.type !== _EditorWithActions.default && child.type !== _composableEditor.ComposableEditor) {
-        throw new Error('Expected child to be of type `Editor`');
-      }
-      this.functionalEditor = child.type === _composableEditor.ComposableEditor;
+      this.functionalEditor = typeof child.type === 'function';
       if (!this.props.isExpanded) {
         return /*#__PURE__*/_react.default.createElement(_ui.IntlProviderIfMissingWrapper, null, /*#__PURE__*/_react.default.createElement(_ChromeCollapsed.default, {
           onFocus: this.props.onFocus,

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

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

@@ -12,7 +12,6 @@ import { EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { analyticsEventKey, browser, countNodes, findChangedNodesFromTransaction, getAnalyticsEventSeverity, getResponseEndTime, measureRender, processRawValue, shouldForceTracking, validateNodes, validNode } from '@atlaskit/editor-common/utils';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
 import { getNodesCount } from '../utils/document';
 import { isFullPage } from '../utils/is-full-page';
@@ -214,41 +213,27 @@ export class ReactEditorView extends React.Component {
       const api = this.pluginInjectionAPI.api();
       const isViewMode = (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState().mode) === 'view';
       let selection;
-      if (fg('platform.editor.live-view.no-editor-selection-in-view-mode')) {
-        if (doc) {
-          if (isViewMode) {
-            const emptySelection = new TextSelection(doc.resolve(0));
-            return EditorState.create({
-              schema,
-              plugins: plugins,
-              doc,
-              selection: emptySelection
-            });
-          } else {
-            selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
-          }
-        }
-        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-        const patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-        return EditorState.create({
-          schema,
-          plugins: plugins,
-          doc,
-          selection: patchedSelection
-        });
-      } else {
-        if (doc) {
+      if (doc) {
+        if (isViewMode) {
+          const emptySelection = new TextSelection(doc.resolve(0));
+          return EditorState.create({
+            schema,
+            plugins: plugins,
+            doc,
+            selection: emptySelection
+          });
+        } else {
           selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
         }
-        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-        const patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-        return EditorState.create({
-          schema,
-          plugins: plugins,
-          doc,
-          selection: patchedSelection
-        });
       }
+      // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+      const patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      return EditorState.create({
+        schema,
+        plugins: plugins,
+        doc,
+        selection: patchedSelection
+      });
     });
     _defineProperty(this, "onEditorViewStateUpdated", ({
       originalTransaction,

package/dist/es2019/presets/universal.js

@@ -134,7 +134,7 @@ export default function createUniversalPresetInternal({
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     tableResizingEnabled: isFullPage || isComment && fg('platform_editor_table_support_in_comment'),
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && fg('platform_editor_table_support_in_comment')),
-    isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && isFullPage,
+    isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && (isFullPage || isComment && fg('platform_editor_table_support_in_comment')),
     allowContextualMenu: !isMobile,
     fullWidthEnabled: appearance === 'full-width',
     wasFullWidthEnabled: prevAppearance && prevAppearance === 'full-width',

package/dist/es2019/ui/CollapsedEditor/index.js

@@ -1,9 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
-import { ComposableEditor } from '../../composable-editor';
-import Editor from '../../editor';
-import EditorWithActions from '../../EditorWithActions';
 import ChromeCollapsed from '../ChromeCollapsed';
 export default class CollapsedEditor extends React.Component {
   constructor(...args) {
@@ -24,10 +21,7 @@ export default class CollapsedEditor extends React.Component {
   }
   render() {
     const child = React.Children.only(this.props.children);
-    if (child.type !== Editor && child.type !== EditorWithActions && child.type !== ComposableEditor) {
-      throw new Error('Expected child to be of type `Editor`');
-    }
-    this.functionalEditor = child.type === ComposableEditor;
+    this.functionalEditor = typeof child.type === 'function';
     if (!this.props.isExpanded) {
       return /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(ChromeCollapsed, {
         onFocus: this.props.onFocus,

package/dist/es2019/version-wrapper.js

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

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

@@ -23,7 +23,6 @@ import { EDIT_AREA_ID } from '@atlaskit/editor-common/ui';
 import { analyticsEventKey, browser, countNodes as _countNodes, findChangedNodesFromTransaction, getAnalyticsEventSeverity, getResponseEndTime, measureRender, processRawValue, shouldForceTracking, validateNodes, validNode } from '@atlaskit/editor-common/utils';
 import { EditorState, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { createDispatch, EventDispatcher } from '../event-dispatcher';
 import { getNodesCount } from '../utils/document';
 import { isFullPage } from '../utils/is-full-page';
@@ -213,41 +212,27 @@ export var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       var api = _this.pluginInjectionAPI.api();
       var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState().mode) === 'view';
       var selection;
-      if (fg('platform.editor.live-view.no-editor-selection-in-view-mode')) {
-        if (doc) {
-          if (isViewMode) {
-            var emptySelection = new TextSelection(doc.resolve(0));
-            return EditorState.create({
-              schema: schema,
-              plugins: plugins,
-              doc: doc,
-              selection: emptySelection
-            });
-          } else {
-            selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
-          }
-        }
-        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-        var patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-        return EditorState.create({
-          schema: schema,
-          plugins: plugins,
-          doc: doc,
-          selection: patchedSelection
-        });
-      } else {
-        if (doc) {
+      if (doc) {
+        if (isViewMode) {
+          var emptySelection = new TextSelection(doc.resolve(0));
+          return EditorState.create({
+            schema: schema,
+            plugins: plugins,
+            doc: doc,
+            selection: emptySelection
+          });
+        } else {
           selection = options.selectionAtStart ? Selection.atStart(doc) : Selection.atEnd(doc);
         }
-        // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-        var _patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-        return EditorState.create({
-          schema: schema,
-          plugins: plugins,
-          doc: doc,
-          selection: _patchedSelection
-        });
       }
+      // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
+      var patchedSelection = selection ? Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      return EditorState.create({
+        schema: schema,
+        plugins: plugins,
+        doc: doc,
+        selection: patchedSelection
+      });
     });
     _defineProperty(_assertThisInitialized(_this), "onEditorViewStateUpdated", function (_ref2) {
       var originalTransaction = _ref2.originalTransaction,

package/dist/esm/presets/universal.js

@@ -136,7 +136,7 @@ export default function createUniversalPresetInternal(_ref) {
     tableOptions: !props.allowTables || typeof props.allowTables === 'boolean' ? {} : props.allowTables,
     tableResizingEnabled: isFullPage || isComment && fg('platform_editor_table_support_in_comment'),
     dragAndDropEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tableDragAndDrop) && (isFullPage || (isComment || isChromeless) && fg('platform_editor_table_support_in_comment')),
-    isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && isFullPage,
+    isTableScalingEnabled: (featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.tablePreserveWidth) && (isFullPage || isComment && fg('platform_editor_table_support_in_comment')),
     allowContextualMenu: !isMobile,
     fullWidthEnabled: appearance === 'full-width',
     wasFullWidthEnabled: prevAppearance && prevAppearance === 'full-width',

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

@@ -9,9 +9,6 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import { IntlProviderIfMissingWrapper } from '@atlaskit/editor-common/ui';
-import { ComposableEditor } from '../../composable-editor';
-import Editor from '../../editor';
-import EditorWithActions from '../../EditorWithActions';
 import ChromeCollapsed from '../ChromeCollapsed';
 var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
   _inherits(CollapsedEditor, _React$Component);
@@ -45,10 +42,7 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
       var child = React.Children.only(this.props.children);
-      if (child.type !== Editor && child.type !== EditorWithActions && child.type !== ComposableEditor) {
-        throw new Error('Expected child to be of type `Editor`');
-      }
-      this.functionalEditor = child.type === ComposableEditor;
+      this.functionalEditor = typeof child.type === 'function';
       if (!this.props.isExpanded) {
         return /*#__PURE__*/React.createElement(IntlProviderIfMissingWrapper, null, /*#__PURE__*/React.createElement(ChromeCollapsed, {
           onFocus: this.props.onFocus,

package/dist/esm/version-wrapper.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "195.4.3",
+	"version": "195.4.5",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
 		"@atlaskit/analytics-next": "^10.1.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^19.2.0",
-		"@atlaskit/editor-common": "^87.9.0",
+		"@atlaskit/editor-common": "^87.10.0",
 		"@atlaskit/editor-plugins": "^3.6.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/task-decision": "^17.10.0",
-		"@atlaskit/theme": "^12.12.0",
+		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tokens": "^1.58.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@atlaskit/width-detector": "^4.3.0",
@@ -80,15 +80,15 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
-		"@af/editor-examples-helpers": "0.1.4",
+		"@af/editor-examples-helpers": "0.1.5",
 		"@af/editor-libra": "*",
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-utils": "^19.8.0",
 		"@atlaskit/analytics-listeners": "^8.11.0",
-		"@atlaskit/collab-provider": "9.37.1",
+		"@atlaskit/collab-provider": "9.37.2",
 		"@atlaskit/editor-json-transformer": "^8.18.0",
 		"@atlaskit/editor-plugin-annotation": "1.19.0",
-		"@atlaskit/editor-plugin-card": "^2.12.0",
+		"@atlaskit/editor-plugin-card": "^2.13.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-list": "^3.8.0",
 		"@atlaskit/editor-plugin-paste": "^1.8.0",
@@ -101,14 +101,14 @@
 		"@atlaskit/modal-dialog": "^12.15.0",
 		"@atlaskit/primitives": "^12.0.0",
 		"@atlaskit/renderer": "^109.46.0",
-		"@atlaskit/smart-card": "^27.14.0",
+		"@atlaskit/smart-card": "^27.16.0",
 		"@atlaskit/synchrony-test-helpers": "^2.5.0",
 		"@atlaskit/toggle": "^13.3.0",
 		"@atlaskit/util-data-test": "^17.9.0",
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/adf-schema-json": "^1.22.0",
 		"@atlassian/feature-flags-test-utils": "*",
-		"@atlassian/search-provider": "2.4.103",
+		"@atlassian/search-provider": "2.4.104",
 		"@emotion/jest": "^11.8.0",
 		"@storybook/addon-knobs": "^5.3.18",
 		"@testing-library/react": "^12.1.5",
@@ -243,9 +243,6 @@
 			"type": "boolean",
 			"referenceOnly": "true"
 		},
-		"platform.editor.live-view.no-editor-selection-in-view-mode": {
-			"type": "boolean"
-		},
 		"platform.editor.table.allow-table-alignment": {
 			"type": "boolean"
 		},