@atlaskit/editor-core 216.6.4 → 216.6.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-core
 
+## 216.6.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 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/afm-products/tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"extends": "../../../../tsconfig.entry-points.products.json",
+	"extends": "../../../../tsconfig.local-consumption.json",
 	"compilerOptions": {
 		"declaration": true,
 		"target": "es5",

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/ui/CollapsedEditor/index.js

@@ -46,7 +46,9 @@ var CollapsedEditor = exports.default = /*#__PURE__*/function (_React$Component)
     }
   }, {
     key: "render",
-    value: function render() {
+    value:
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    function render() {
       var _this2 = this;
       var child = _react.default.Children.only(this.props.children);
       this.functionalEditor = typeof child.type === '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 = "216.6.5";

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/ui/CollapsedEditor/index.js

@@ -21,6 +21,7 @@ export default class CollapsedEditor extends React.Component {
     }
     this.previouslyExpanded = this.props.isExpanded;
   }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   render() {
     const child = React.Children.only(this.props.children);
     this.functionalEditor = typeof child.type === 'function';

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 = "216.6.5";

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/ui/CollapsedEditor/index.js

@@ -39,7 +39,9 @@ var CollapsedEditor = /*#__PURE__*/function (_React$Component) {
     }
   }, {
     key: "render",
-    value: function render() {
+    value:
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    function render() {
       var _this2 = this;
       var child = React.Children.only(this.props.children);
       this.functionalEditor = typeof child.type === '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 = "216.6.5";

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/docs/0-intro.tsx

@@ -2,7 +2,8 @@ import React from 'react';
 
 import { AtlassianInternalWarning, code, Example, md, Props } from '@atlaskit/docs';
 
-export default md`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const _default_1: any = md`
 ${(<AtlassianInternalWarning />)}
   ## Introduction
 
@@ -387,26 +388,27 @@ function EditorInternal() {
 
 
 ${(
-	<Example
-		packageName="@atlaskit/editor-core/composable-editor"
-		// Ignored via go/ees005
-		// eslint-disable-next-line import/no-commonjs
-		Component={require('../examples/1-basic-composable-editor').default}
-		title="Basic"
-		// Ignored via go/ees005
-		// eslint-disable-next-line import/no-commonjs
-		source={require('!!raw-loader!../examples/1-basic-composable-editor')}
-	/>
-)}
+    <Example
+      packageName="@atlaskit/editor-core/composable-editor"
+      // Ignored via go/ees005
+      // eslint-disable-next-line import/no-commonjs
+      Component={require('../examples/1-basic-composable-editor').default}
+      title="Basic"
+      // Ignored via go/ees005
+      // eslint-disable-next-line import/no-commonjs
+      source={require('!!raw-loader!../examples/1-basic-composable-editor')}
+    />
+  )}
 
   ${(
-		<Props
-			shouldCollapseProps
-			heading="Props"
-			// Ignored via go/ees005
-			// eslint-disable-next-line import/no-commonjs
-			props={require('!!extract-react-types-loader!../src/composable-editor/composable-editor')}
-		/>
-	)}
+    <Props
+      shouldCollapseProps
+      heading="Props"
+      // Ignored via go/ees005
+      // eslint-disable-next-line import/no-commonjs
+      props={require('!!extract-react-types-loader!../src/composable-editor/composable-editor')}
+    />
+  )}
 
 `;
+export default _default_1;

package/docs/1-legacy-editor.tsx

@@ -2,7 +2,8 @@ import React from 'react';
 
 import { AtlassianInternalWarning, code, Example, md, Props } from '@atlaskit/docs';
 
-export default md`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const _default_1: any = md`
 ${(<AtlassianInternalWarning />)}
 
   ### Note:
@@ -250,25 +251,26 @@ ${code`
 `}
 
 ${(
-	<Example
-		packageName="@atlaskit/editor-core"
-		// Ignored via go/ees005
-		// eslint-disable-next-line import/no-commonjs
-		Component={require('../examples/1-basic-composable-editor').default}
-		title="Basic"
-		// Ignored via go/ees005
-		// eslint-disable-next-line import/no-commonjs
-		source={require('!!raw-loader!../examples/1-basic-composable-editor')}
-	/>
-)}
+    <Example
+      packageName="@atlaskit/editor-core"
+      // Ignored via go/ees005
+      // eslint-disable-next-line import/no-commonjs
+      Component={require('../examples/1-basic-composable-editor').default}
+      title="Basic"
+      // Ignored via go/ees005
+      // eslint-disable-next-line import/no-commonjs
+      source={require('!!raw-loader!../examples/1-basic-composable-editor')}
+    />
+  )}
 
   ${(
-		<Props
-			shouldCollapseProps
-			heading="Props"
-			// Ignored via go/ees005
-			// eslint-disable-next-line import/no-commonjs
-			props={require('!!extract-react-types-loader!../src/editor')}
-		/>
-	)}
+    <Props
+      shouldCollapseProps
+      heading="Props"
+      // Ignored via go/ees005
+      // eslint-disable-next-line import/no-commonjs
+      props={require('!!extract-react-types-loader!../src/editor')}
+    />
+  )}
 `;
+export default _default_1;

package/docs/2-labs.tsx

@@ -1,6 +1,7 @@
 import { code, md } from '@atlaskit/docs';
 
-export default md`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const _default_1: any = md`
   # Editor Labs
 
   Where API changes can sit for experimental use
@@ -108,3 +109,4 @@ ${code`
   )
 `}
 `;
+export default _default_1;

package/docs/3-autoformatting.tsx

@@ -1,6 +1,7 @@
 import { code, md } from '@atlaskit/docs';
 
-export default md`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const _default_1: any = md`
 # Autoformatting Provider
 
 The custom autoformatting provider lets you specify your own function that triggers on particular regex strings, and asynchronously replace them with some content. More precisely, it returns a Promise containing ADF to replace the trigger text with.
@@ -41,3 +42,4 @@ ${code`export const autoformattingProvider: AutoformattingProvider = {
 
 At the moment, only text or \`inlineCard\` ADF nodes are permitted to be replaced.
 `;
+export default _default_1;

package/docs/4-annotations.tsx

@@ -230,7 +230,8 @@ class SplitExample extends React.Component<{ initialAdf: object }> {
 	}
 }
 
-export default md`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const _default_1: any = md`
 # Annotations
 
 ## Introduction
@@ -244,20 +245,20 @@ Currently, there is only the \`inlineComment\` type of annotation. In the future
 These denote a comment thread about the given text, and are denoted by a yellow highlight. This is commonly seen within Confluence after selecting some text in View mode.
 
 ${(
-	<div
-		style={{
-			// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-			margin: token('space.100', '8px'),
-			// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-			padding: token('space.100', '8px'),
-			// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-			backgroundColor: N20,
-			border: `${token('border.width')} solid ${N30}`,
-		}}
-	>
-		{inlineCommentEditor(initialExample)}
-	</div>
-)}
+		<div
+			style={{
+				// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+				margin: token('space.100', '8px'),
+				// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+				padding: token('space.100', '8px'),
+				// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+				backgroundColor: N20,
+				border: `${token('border.width')} solid ${N30}`,
+			}}
+		>
+			{inlineCommentEditor(initialExample)}
+		</div>
+	)}
 
 ### Example ADF
 
@@ -386,3 +387,4 @@ It is unmounted when exiting a region of text with an annotation.
 
 * [ADF change proposal](https://product-fabric.atlassian.net/wiki/spaces/E/pages/853377081/ADF+Change+38+Annotation+mark)
 `;
+export default _default_1;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "216.6.4",
+	"version": "216.6.6",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -56,7 +56,7 @@
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-ssr-renderer": "^2.0.0",
 		"@atlaskit/editor-toolbar": "^0.19.0",
-		"@atlaskit/editor-toolbar-model": "^0.2.0",
+		"@atlaskit/editor-toolbar-model": "^0.3.0",
 		"@atlaskit/emoji": "^69.10.0",
 		"@atlaskit/icon": "^29.4.0",
 		"@atlaskit/link": "^3.3.0",
@@ -66,8 +66,8 @@
 		"@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/tokens": "^9.1.0",
+		"@atlaskit/tmp-editor-statsig": "^16.23.0",
+		"@atlaskit/tokens": "^10.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -107,7 +107,7 @@
 		"@atlaskit/media-integration-test-helpers": "workspace:^",
 		"@atlaskit/media-test-helpers": "^39.0.0",
 		"@atlaskit/modal-dialog": "^14.10.0",
-		"@atlaskit/renderer": "^125.4.0",
+		"@atlaskit/renderer": "^126.0.0",
 		"@atlaskit/section-message": "^8.12.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.2.0",