@atlaskit/editor-plugin-primary-toolbar 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-primary-toolbar
 
+## 2.0.2
+
+### Patch Changes
+
+- [#138118](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138118)
+  [`5e4d9eb1aefe4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e4d9eb1aefe4) -
+  NOISSUE: Upgrades editor React peer dependencies to v18
+- Updated dependencies
+
+## 2.0.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.0.0
 
 ### Major Changes

package/dist/cjs/pm-plugin.js

@@ -12,9 +12,9 @@ var createPlugin = exports.createPlugin = function createPlugin(componentRegistr
   return new _safePlugin.SafePlugin({
     key: primaryToolbarPluginKey,
     state: {
-      init: function init() {
+      init: function init(_config, editorState) {
         return {
-          components: (0, _toolbarConfiguration.getToolbarComponents)(componentRegistry)
+          components: (0, _toolbarConfiguration.getToolbarComponents)(componentRegistry, editorState)
         };
       },
       apply: function apply(_tr, pluginState) {

package/dist/cjs/toolbar-configuration.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getToolbarComponents = void 0;
-var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(componentRegistry) {
+var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(componentRegistry, editorState) {
   return toolbarConfiguration.filter(function (toolbarElement) {
-    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry);
+    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState);
   }).reduce(function (acc, toolbarElement) {
     if (componentRegistry.has(toolbarElement.name)) {
       var component = componentRegistry.get(toolbarElement.name);
@@ -37,8 +37,10 @@ var blockTypeGroup = [{
   name: 'blockType'
 }, {
   name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('blockType');
+  enabled: function enabled(componentRegistry, editorState) {
+    return componentRegistry.has('blockType') &&
+    // Use case where you want to have the block plugin but not render any toolbar items (when you exclude headings), we should be able to get rid of this when we split block type plugin up and check for the presence of the heading plugin directly
+    !!editorState.schema.nodes.heading;
   }
 }];
 var textFormattingGroup = [{
@@ -77,13 +79,6 @@ var listFormatting = [{
 }];
 var insertBlockGroup = [{
   name: 'insertBlock'
-}, {
-  name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('insertBlock') &&
-    // is last group in the toolbar
-    !componentRegistry.has('beforePrimaryToolbar') && !componentRegistry.has('avatarGroup') && !componentRegistry.has('findReplace') && !componentRegistry.has('aiExperience') && !componentRegistry.has('loom');
-  }
 }];
 var others = [{
   name: 'beforePrimaryToolbar'

package/dist/es2019/pm-plugin.js

@@ -6,8 +6,8 @@ export const createPlugin = componentRegistry => {
   return new SafePlugin({
     key: primaryToolbarPluginKey,
     state: {
-      init: () => ({
-        components: getToolbarComponents(componentRegistry)
+      init: (_config, editorState) => ({
+        components: getToolbarComponents(componentRegistry, editorState)
       }),
       apply: (_tr, pluginState) => pluginState
     }

package/dist/es2019/toolbar-configuration.js

@@ -1,4 +1,4 @@
-export const getToolbarComponents = componentRegistry => toolbarConfiguration.filter(toolbarElement => typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry)).reduce((acc, toolbarElement) => {
+export const getToolbarComponents = (componentRegistry, editorState) => toolbarConfiguration.filter(toolbarElement => typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState)).reduce((acc, toolbarElement) => {
   if (componentRegistry.has(toolbarElement.name)) {
     const component = componentRegistry.get(toolbarElement.name);
     if (!!component) {
@@ -23,7 +23,9 @@ const blockTypeGroup = [{
   name: 'blockType'
 }, {
   name: 'separator',
-  enabled: componentRegistry => componentRegistry.has('blockType')
+  enabled: (componentRegistry, editorState) => componentRegistry.has('blockType') &&
+  // Use case where you want to have the block plugin but not render any toolbar items (when you exclude headings), we should be able to get rid of this when we split block type plugin up and check for the presence of the heading plugin directly
+  !!editorState.schema.nodes.heading
 }];
 const textFormattingGroup = [{
   name: 'textFormatting'
@@ -53,11 +55,6 @@ const listFormatting = [{
 }];
 const insertBlockGroup = [{
   name: 'insertBlock'
-}, {
-  name: 'separator',
-  enabled: componentRegistry => componentRegistry.has('insertBlock') &&
-  // is last group in the toolbar
-  !componentRegistry.has('beforePrimaryToolbar') && !componentRegistry.has('avatarGroup') && !componentRegistry.has('findReplace') && !componentRegistry.has('aiExperience') && !componentRegistry.has('loom')
 }];
 const others = [{
   name: 'beforePrimaryToolbar'

package/dist/esm/pm-plugin.js

@@ -6,9 +6,9 @@ export var createPlugin = function createPlugin(componentRegistry) {
   return new SafePlugin({
     key: primaryToolbarPluginKey,
     state: {
-      init: function init() {
+      init: function init(_config, editorState) {
         return {
-          components: getToolbarComponents(componentRegistry)
+          components: getToolbarComponents(componentRegistry, editorState)
         };
       },
       apply: function apply(_tr, pluginState) {

package/dist/esm/toolbar-configuration.js

@@ -1,6 +1,6 @@
-export var getToolbarComponents = function getToolbarComponents(componentRegistry) {
+export var getToolbarComponents = function getToolbarComponents(componentRegistry, editorState) {
   return toolbarConfiguration.filter(function (toolbarElement) {
-    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry);
+    return typeof toolbarElement.enabled === 'undefined' || toolbarElement.enabled(componentRegistry, editorState);
   }).reduce(function (acc, toolbarElement) {
     if (componentRegistry.has(toolbarElement.name)) {
       var component = componentRegistry.get(toolbarElement.name);
@@ -31,8 +31,10 @@ var blockTypeGroup = [{
   name: 'blockType'
 }, {
   name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('blockType');
+  enabled: function enabled(componentRegistry, editorState) {
+    return componentRegistry.has('blockType') &&
+    // Use case where you want to have the block plugin but not render any toolbar items (when you exclude headings), we should be able to get rid of this when we split block type plugin up and check for the presence of the heading plugin directly
+    !!editorState.schema.nodes.heading;
   }
 }];
 var textFormattingGroup = [{
@@ -71,13 +73,6 @@ var listFormatting = [{
 }];
 var insertBlockGroup = [{
   name: 'insertBlock'
-}, {
-  name: 'separator',
-  enabled: function enabled(componentRegistry) {
-    return componentRegistry.has('insertBlock') &&
-    // is last group in the toolbar
-    !componentRegistry.has('beforePrimaryToolbar') && !componentRegistry.has('avatarGroup') && !componentRegistry.has('findReplace') && !componentRegistry.has('aiExperience') && !componentRegistry.has('loom');
-  }
 }];
 var others = [{
   name: 'beforePrimaryToolbar'

package/dist/types/toolbar-configuration.d.ts

@@ -1,3 +1,4 @@
 import type { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { ComponentRegistry } from './types';
-export declare const getToolbarComponents: (componentRegistry: ComponentRegistry) => ToolbarUIComponentFactory[];
+export declare const getToolbarComponents: (componentRegistry: ComponentRegistry, editorState: EditorState) => ToolbarUIComponentFactory[];

package/dist/types/types.d.ts

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     sharedState: PrimaryToolbarPluginState | undefined;
     actions: {
@@ -12,7 +13,7 @@ export type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
 export type ToolbarElementNames = 'separator' | 'undoRedoPlugin' | 'blockType' | 'textFormatting' | 'alignment' | 'textColor' | 'highlight' | 'toolbarListsIndentation' | 'insertBlock' | 'beforePrimaryToolbar' | 'avatarGroup' | 'findReplace' | 'aiExperience' | 'loom' | 'spellCheck';
 export type ToolbarElementConfig = {
     name: ToolbarElementNames;
-    enabled?: (componentRegistry: ComponentRegistry) => boolean;
+    enabled?: (componentRegistry: ComponentRegistry, editorState: EditorState) => boolean;
 };
 export type PrimaryToolbarPluginState = {
     components: ToolbarUIComponentFactory[];

package/dist/types-ts4.5/toolbar-configuration.d.ts

@@ -1,3 +1,4 @@
 import type { ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { ComponentRegistry } from './types';
-export declare const getToolbarComponents: (componentRegistry: ComponentRegistry) => ToolbarUIComponentFactory[];
+export declare const getToolbarComponents: (componentRegistry: ComponentRegistry, editorState: EditorState) => ToolbarUIComponentFactory[];

package/dist/types-ts4.5/types.d.ts

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin, ToolbarUIComponentFactory } from '@atlaskit/editor-common/types';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 export type PrimaryToolbarPlugin = NextEditorPlugin<'primaryToolbar', {
     sharedState: PrimaryToolbarPluginState | undefined;
     actions: {
@@ -12,7 +13,7 @@ export type ComponentRegistry = Map<string, ToolbarUIComponentFactory>;
 export type ToolbarElementNames = 'separator' | 'undoRedoPlugin' | 'blockType' | 'textFormatting' | 'alignment' | 'textColor' | 'highlight' | 'toolbarListsIndentation' | 'insertBlock' | 'beforePrimaryToolbar' | 'avatarGroup' | 'findReplace' | 'aiExperience' | 'loom' | 'spellCheck';
 export type ToolbarElementConfig = {
     name: ToolbarElementNames;
-    enabled?: (componentRegistry: ComponentRegistry) => boolean;
+    enabled?: (componentRegistry: ComponentRegistry, editorState: EditorState) => boolean;
 };
 export type PrimaryToolbarPluginState = {
     components: ToolbarUIComponentFactory[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-primary-toolbar",
-	"version": "2.0.0",
+	"version": "2.0.2",
 	"description": "Primary toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -9,13 +9,11 @@
 	},
 	"atlassian": {
 		"team": "Editor: Core Experiences",
-		"inPublicMirror": false,
-		"releaseModel": "continuous",
 		"website": {
 			"name": "EditorPluginPrimaryToolbar",
 			"category": "Components"
 		},
-		"runReact18": false
+		"runReact18": true
 	},
 	"repository": "https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo",
 	"main": "dist/cjs/index.js",
@@ -38,13 +36,13 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^87.3.0",
+		"@atlaskit/editor-common": "^88.12.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"react": "^16.8.0"
+		"react": "^16.8.0 || ^17.0.0 || ~18.2.0"
 	},
 	"devDependencies": {
 		"typescript": "~5.4.2"