@atlaskit/editor-plugin-toolbar 10.0.3 → 10.1.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 10.1.0
+
+### Minor Changes
+
+- [`b7e3a66378c6e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b7e3a66378c6e) -
+  [ux] Restore the contextual toolbar when selecting text inside a reference synced block, behind
+  `platform_editor_blocks_patch_7`.
+  - `@atlaskit/editor-plugin-toolbar`: the toolbar no longer treats focus inside a nested editable
+    region that ProseMirror does not own - such as the content island a reference synced block
+    renders - as the editor being blurred.
+  - `@atlaskit/editor-synced-block-provider`: `getProviderFactory` is now side-effect free. Applying
+    parent and dynamically created providers moved to a new `syncProviders` method. Previously this
+    ran during render, scheduling a `setState` on another component mid-render, which forced an
+    extra render pass that replaced the synced block DOM and destroyed any in-progress text
+    selection.
+
+  `syncProviders` mutates the cached factory and notifies its subscribers, so call it from an effect
+  rather than during render:
+
+  ```ts
+  const providerFactory = manager.referenceManager.getProviderFactory(resourceId);
+
+  useEffect(() => {
+  	manager.referenceManager.syncProviders(resourceId);
+  }, [manager.referenceManager, resourceId, syncBlockInstance]);
+  ```
+
+  With the flag off, `getProviderFactory` keeps applying providers inline, so existing behaviour is
+  unchanged.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.0.3
 
 ### Patch Changes

package/dist/cjs/toolbarPlugin.js

@@ -14,6 +14,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _selectionToolbarOpenExperience = require("./pm-plugins/experiences/selection-toolbar-open-experience");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _consts = require("./ui/consts");
@@ -196,8 +197,12 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
                   // due to a click outside the editor.
                   var editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
                   var isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
+                  // Focus can sit inside a nested editable region ProseMirror does not own -
+                  // such as a reference synced block's island - where `view.hasFocus()` is
+                  // false but the user is still interacting with the editor.
+                  var hasEditorFocus = (0, _fg.fg)('platform_editor_blocks_patch_7') ? _view.hasFocus() || _view.dom.contains(_view.root.activeElement) : _view.hasFocus();
                   _view.dispatch(_view.state.tr.setMeta(_pluginKey.editorToolbarPluginKey, {
-                    shouldShowToolbar: !isViewModeEnabled ? _view.hasFocus() || isInToolbar || isInPortal : true
+                    shouldShowToolbar: !isViewModeEnabled ? hasEditorFocus || isInToolbar || isInPortal : true
                   }));
                 }
               });

package/dist/es2019/toolbarPlugin.js

@@ -4,6 +4,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createComponentRegistry } from '@atlaskit/editor-toolbar-model';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getSelectionToolbarOpenExperiencePlugin } from './pm-plugins/experiences/selection-toolbar-open-experience';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
 import { DEFAULT_POPUP_SELECTORS } from './ui/consts';
@@ -188,8 +189,12 @@ export const toolbarPlugin = ({
                   // due to a click outside the editor.
                   const editorViewModePlugin = api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
                   const isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
+                  // Focus can sit inside a nested editable region ProseMirror does not own -
+                  // such as a reference synced block's island - where `view.hasFocus()` is
+                  // false but the user is still interacting with the editor.
+                  const hasEditorFocus = fg('platform_editor_blocks_patch_7') ? view.hasFocus() || view.dom.contains(view.root.activeElement) : view.hasFocus();
                   view.dispatch(view.state.tr.setMeta(editorToolbarPluginKey, {
-                    shouldShowToolbar: !isViewModeEnabled ? view.hasFocus() || isInToolbar || isInPortal : true
+                    shouldShowToolbar: !isViewModeEnabled ? hasEditorFocus || isInToolbar || isInPortal : true
                   }));
                 }
               });

package/dist/esm/toolbarPlugin.js

@@ -10,6 +10,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createComponentRegistry } from '@atlaskit/editor-toolbar-model';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getSelectionToolbarOpenExperiencePlugin } from './pm-plugins/experiences/selection-toolbar-open-experience';
 import { editorToolbarPluginKey } from './pm-plugins/plugin-key';
 import { DEFAULT_POPUP_SELECTORS } from './ui/consts';
@@ -189,8 +190,12 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
                   // due to a click outside the editor.
                   var editorViewModePlugin = api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.sharedState.currentState();
                   var isViewModeEnabled = (editorViewModePlugin === null || editorViewModePlugin === void 0 ? void 0 : editorViewModePlugin.mode) === 'view';
+                  // Focus can sit inside a nested editable region ProseMirror does not own -
+                  // such as a reference synced block's island - where `view.hasFocus()` is
+                  // false but the user is still interacting with the editor.
+                  var hasEditorFocus = fg('platform_editor_blocks_patch_7') ? _view.hasFocus() || _view.dom.contains(_view.root.activeElement) : _view.hasFocus();
                   _view.dispatch(_view.state.tr.setMeta(editorToolbarPluginKey, {
-                    shouldShowToolbar: !isViewModeEnabled ? _view.hasFocus() || isInToolbar || isInPortal : true
+                    shouldShowToolbar: !isViewModeEnabled ? hasEditorFocus || isInToolbar || isInPortal : true
                   }));
                 }
               });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "10.0.3",
+	"version": "10.1.0",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,16 +32,21 @@
 		"@atlaskit/editor-toolbar": "^2.4.0",
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^141.0.0",
+		"@atlaskit/tmp-editor-statsig": "^141.1.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^117.2.0",
+		"@atlaskit/editor-common": "^117.3.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
-	"platform-feature-flags": {},
+	"platform-feature-flags": {
+		"platform_editor_blocks_patch_7": {
+			"type": "boolean",
+			"referenceOnly": true
+		}
+	},
 	"techstack": {
 		"@atlassian/frontend": {
 			"code-structure": [

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
-	"extends": "../../../tsconfig.json",
-	"include": [
-		"src/**/*.ts",
-		"src/**/*.tsx"
-	]
+	"extends": "./tsconfig.dev.json",
+	"compilerOptions": {
+		"disableReferencedProjectLoad": true,
+		"disableSolutionSearching": true
+	}
 }