@atlaskit/editor-core 216.6.4 → 216.6.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-core
 
+## 216.6.5
+
+### Patch Changes
+
+- [`5a01e256502a0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a01e256502a0) -
+  [EDITOR-3531] Fixed bug where focus is not set to the Editor for chromeless comments editor in
+  inline comments
+- Updated dependencies
+
 ## 216.6.4
 
 ### Patch Changes

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

@@ -17,9 +17,6 @@ function handleEditorFocus(view) {
   if (view !== null && view !== void 0 && view.isDestroyed) {
     return;
   }
-  if (view !== null && view !== void 0 && view.hasFocus()) {
-    return;
-  }
   if (!window.getSelection) {
     view === null || view === void 0 || view.focus();
     return;

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

@@ -37,6 +37,7 @@ var _useProviders = require("../composable-editor/hooks/useProviders");
 var _featureFlagsFromProps = require("../utils/feature-flags-from-props");
 var _getNodesCount = require("../utils/getNodesCount");
 var _getNodesVisibleInViewport = require("../utils/getNodesVisibleInViewport");
+var _isChromeless = require("../utils/is-chromeless");
 var _isFullPage = require("../utils/is-full-page");
 var _RenderTracking = require("../utils/performance/components/RenderTracking");
 var _measureEnum = _interopRequireDefault(require("../utils/performance/measure-enum"));
@@ -553,6 +554,9 @@ function ReactEditorView(props) {
         if (!liveDocWithContent) {
           focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(editorView);
         }
+        if ((0, _isChromeless.isChromeless)(props.editorProps.appearance) && (0, _expValEquals.expValEquals)('platform_editor_focus_on_chromeless_editor', 'isEnabled', true)) {
+          focusTimeoutId.current = (0, _handleEditorFocus.handleEditorFocus)(editorView);
+        }
         if ((0, _expValEquals.expValEquals)('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('cc_editor_focus_before_editor_on_load')) {
           if (!disabled && shouldFocus && !(0, _document.isEmptyDocument)(editorView.state.doc)) {
             (0, _focusEditorElement.focusEditorElement)(editorId.current);
@@ -560,7 +564,7 @@ function ReactEditorView(props) {
         }
       }
     }
-  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled]);
+  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled, props.editorProps.appearance]);
   var scrollElement = _react.default.useRef();
   var possibleListeners = _react.default.useRef([]);
   (0, _react.useEffect)(function () {

package/dist/cjs/utils/is-chromeless.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isChromeless = isChromeless;
+function isChromeless(appearance) {
+  return appearance === 'chromeless';
+}

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 = "216.6.3";
+var version = exports.version = "0.0.0-development";

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

@@ -11,9 +11,6 @@ export function handleEditorFocus(view) {
   if (view !== null && view !== void 0 && view.isDestroyed) {
     return;
   }
-  if (view !== null && view !== void 0 && view.hasFocus()) {
-    return;
-  }
   if (!window.getSelection) {
     view === null || view === void 0 ? void 0 : view.focus();
     return;

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

@@ -26,6 +26,7 @@ import { useProviders } from '../composable-editor/hooks/useProviders';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
 import { getNodesCount } from '../utils/getNodesCount';
 import { getNodesVisibleInViewport } from '../utils/getNodesVisibleInViewport';
+import { isChromeless } from '../utils/is-chromeless';
 import { isFullPage } from '../utils/is-full-page';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
 import measurements from '../utils/performance/measure-enum';
@@ -522,6 +523,9 @@ export function ReactEditorView(props) {
         if (!liveDocWithContent) {
           focusTimeoutId.current = handleEditorFocus(editorView);
         }
+        if (isChromeless(props.editorProps.appearance) && expValEquals('platform_editor_focus_on_chromeless_editor', 'isEnabled', true)) {
+          focusTimeoutId.current = handleEditorFocus(editorView);
+        }
         if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
           if (!disabled && shouldFocus && !isEmptyDocument(editorView.state.doc)) {
             focusEditorElement(editorId.current);
@@ -529,7 +533,7 @@ export function ReactEditorView(props) {
         }
       }
     }
-  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled]);
+  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled, props.editorProps.appearance]);
   const scrollElement = React.useRef();
   const possibleListeners = React.useRef([]);
   useEffect(() => {

package/dist/es2019/utils/is-chromeless.js

@@ -0,0 +1,3 @@
+export function isChromeless(appearance) {
+  return appearance === 'chromeless';
+}

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "216.6.3";
+export const version = "0.0.0-development";

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

@@ -11,9 +11,6 @@ export function handleEditorFocus(view) {
   if (view !== null && view !== void 0 && view.isDestroyed) {
     return;
   }
-  if (view !== null && view !== void 0 && view.hasFocus()) {
-    return;
-  }
   if (!window.getSelection) {
     view === null || view === void 0 || view.focus();
     return;

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

@@ -34,6 +34,7 @@ import { useProviders } from '../composable-editor/hooks/useProviders';
 import { createFeatureFlagsFromProps } from '../utils/feature-flags-from-props';
 import { getNodesCount } from '../utils/getNodesCount';
 import { getNodesVisibleInViewport } from '../utils/getNodesVisibleInViewport';
+import { isChromeless } from '../utils/is-chromeless';
 import { isFullPage } from '../utils/is-full-page';
 import { RenderTracking } from '../utils/performance/components/RenderTracking';
 import measurements from '../utils/performance/measure-enum';
@@ -544,6 +545,9 @@ export function ReactEditorView(props) {
         if (!liveDocWithContent) {
           focusTimeoutId.current = handleEditorFocus(editorView);
         }
+        if (isChromeless(props.editorProps.appearance) && expValEquals('platform_editor_focus_on_chromeless_editor', 'isEnabled', true)) {
+          focusTimeoutId.current = handleEditorFocus(editorView);
+        }
         if (expValEquals('platform_editor_no_cursor_on_edit_page_init', 'isEnabled', true) && fg('cc_editor_focus_before_editor_on_load')) {
           if (!disabled && shouldFocus && !isEmptyDocument(editorView.state.doc)) {
             focusEditorElement(editorId.current);
@@ -551,7 +555,7 @@ export function ReactEditorView(props) {
         }
       }
     }
-  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled]);
+  }, [editorView, shouldFocus, __livePage, mitigateScrollJump, disabled, props.editorProps.appearance]);
   var scrollElement = React.useRef();
   var possibleListeners = React.useRef([]);
   useEffect(function () {

package/dist/esm/utils/is-chromeless.js

@@ -0,0 +1,3 @@
+export function isChromeless(appearance) {
+  return appearance === 'chromeless';
+}

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "216.6.3";
+export var version = "0.0.0-development";

package/dist/types/utils/is-chromeless.d.ts

@@ -0,0 +1,2 @@
+import type { EditorAppearance } from '@atlaskit/editor-common/types';
+export declare function isChromeless(appearance?: EditorAppearance): appearance is "chromeless";

package/dist/types-ts4.5/utils/is-chromeless.d.ts

@@ -0,0 +1,2 @@
+import type { EditorAppearance } from '@atlaskit/editor-common/types';
+export declare function isChromeless(appearance?: EditorAppearance): appearance is "chromeless";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.6.4",
+	"version": "216.6.5",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -66,7 +66,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/react-ufo": "^4.17.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^16.19.0",
+		"@atlaskit/tmp-editor-statsig": "^16.22.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",