@atlaskit/editor-plugin-toolbar 4.1.11 → 4.1.13

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 4.1.13
+
+### Patch Changes
+
+- [`b43aaf2b5d0ff`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b43aaf2b5d0ff) -
+  Remove platform_editor_toolbar_aifc_undo_redo_confluence feature gate
+- Updated dependencies
+
+## 4.1.12
+
+### Patch Changes
+
+- [`fb3129f46e923`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fb3129f46e923) -
+  Update config options
+- Updated dependencies
+
 ## 4.1.11
 
 ### Patch Changes

package/dist/cjs/ui/toolbar-components.js

@@ -10,7 +10,6 @@ var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _consts = require("./consts");
 var _OverflowMenu = require("./OverflowMenu");
 var _OverflowMenuSection = require("./OverflowMenuSection");
@@ -209,7 +208,7 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       key: _toolbar.TOOLBARS.PRIMARY_TOOLBAR,
       rank: _toolbar.TOOLBAR_RANK[_toolbar.PIN_SECTION.key]
     }],
-    component: (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_undo_redo_confluence') ? function (_ref9) {
+    component: function component(_ref9) {
       var children = _ref9.children,
         parents = _ref9.parents;
       return /*#__PURE__*/_react.default.createElement(_Section.Section, {
@@ -218,7 +217,7 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         api: api,
         showSeparatorInFullPagePrimaryToolbar: true
       }, children);
-    } : undefined
+    }
   }];
   components.push({
     type: _toolbar.OVERFLOW_SECTION_PRIMARY_TOOLBAR.type,
@@ -265,26 +264,24 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       components.unshift.apply(components, (0, _toConsumableArray2.default)(getPrimaryToolbarComponents(breakpointPreset)));
       break;
   }
-  if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_undo_redo_confluence')) {
-    components.push({
-      type: _toolbar.TRACK_CHANGES_SECTION.type,
-      key: _toolbar.TRACK_CHANGES_SECTION.key,
-      parents: [{
-        type: 'toolbar',
-        key: _toolbar.TOOLBARS.PRIMARY_TOOLBAR,
-        rank: _toolbar.TOOLBAR_RANK[_toolbar.TRACK_CHANGES_SECTION.key]
-      }],
-      component: function component(_ref10) {
-        var children = _ref10.children,
-          parents = _ref10.parents;
-        return /*#__PURE__*/_react.default.createElement(_Section.Section, {
-          testId: "track-changes-section",
-          parents: parents,
-          api: api,
-          showSeparatorInFullPagePrimaryToolbar: true
-        }, children);
-      }
-    });
-  }
+  components.push({
+    type: _toolbar.TRACK_CHANGES_SECTION.type,
+    key: _toolbar.TRACK_CHANGES_SECTION.key,
+    parents: [{
+      type: 'toolbar',
+      key: _toolbar.TOOLBARS.PRIMARY_TOOLBAR,
+      rank: _toolbar.TOOLBAR_RANK[_toolbar.TRACK_CHANGES_SECTION.key]
+    }],
+    component: function component(_ref10) {
+      var children = _ref10.children,
+        parents = _ref10.parents;
+      return /*#__PURE__*/_react.default.createElement(_Section.Section, {
+        testId: "track-changes-section",
+        parents: parents,
+        api: api,
+        showSeparatorInFullPagePrimaryToolbar: true
+      }, children);
+    }
+  });
   return components;
 };

package/dist/es2019/ui/toolbar-components.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { INSERT_BLOCK_SECTION, LINKING_SECTION, OVERFLOW_GROUP, OVERFLOW_GROUP_PRIMARY_TOOLBAR, OVERFLOW_GROUP_PRIMARY_TOOLBAR_RANK, OVERFLOW_GROUP_RANK, OVERFLOW_MENU, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_SECTION, OVERFLOW_SECTION_PRIMARY_TOOLBAR, OVERFLOW_SECTION_PRIMARY_TOOLBAR_RANK, OVERFLOW_SECTION_RANK, PIN_SECTION, TEXT_COLLAPSED_GROUP, TEXT_SECTION, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_COLLAPSED, TEXT_COLLAPSED_MENU, TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_MENU_RANK } from '@atlaskit/editor-common/toolbar';
 import { Show, Toolbar } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SELECTION_TOOLBAR_LABEL } from './consts';
 import { OverflowMenu } from './OverflowMenu';
 import { OverflowMenuSection } from './OverflowMenuSection';
@@ -203,7 +202,7 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, breakpoin
       key: TOOLBARS.PRIMARY_TOOLBAR,
       rank: TOOLBAR_RANK[PIN_SECTION.key]
     }],
-    component: fg('platform_editor_toolbar_aifc_undo_redo_confluence') ? ({
+    component: ({
       children,
       parents
     }) => {
@@ -213,7 +212,7 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, breakpoin
         api: api,
         showSeparatorInFullPagePrimaryToolbar: true
       }, children);
-    } : undefined
+    }
   }];
   components.push({
     type: OVERFLOW_SECTION_PRIMARY_TOOLBAR.type,
@@ -262,27 +261,25 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, breakpoin
       components.unshift(...getPrimaryToolbarComponents(breakpointPreset));
       break;
   }
-  if (fg('platform_editor_toolbar_aifc_undo_redo_confluence')) {
-    components.push({
-      type: TRACK_CHANGES_SECTION.type,
-      key: TRACK_CHANGES_SECTION.key,
-      parents: [{
-        type: 'toolbar',
-        key: TOOLBARS.PRIMARY_TOOLBAR,
-        rank: TOOLBAR_RANK[TRACK_CHANGES_SECTION.key]
-      }],
-      component: ({
-        children,
-        parents
-      }) => {
-        return /*#__PURE__*/React.createElement(Section, {
-          testId: "track-changes-section",
-          parents: parents,
-          api: api,
-          showSeparatorInFullPagePrimaryToolbar: true
-        }, children);
-      }
-    });
-  }
+  components.push({
+    type: TRACK_CHANGES_SECTION.type,
+    key: TRACK_CHANGES_SECTION.key,
+    parents: [{
+      type: 'toolbar',
+      key: TOOLBARS.PRIMARY_TOOLBAR,
+      rank: TOOLBAR_RANK[TRACK_CHANGES_SECTION.key]
+    }],
+    component: ({
+      children,
+      parents
+    }) => {
+      return /*#__PURE__*/React.createElement(Section, {
+        testId: "track-changes-section",
+        parents: parents,
+        api: api,
+        showSeparatorInFullPagePrimaryToolbar: true
+      }, children);
+    }
+  });
   return components;
 };

package/dist/esm/ui/toolbar-components.js

@@ -3,7 +3,6 @@ import React from 'react';
 import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { INSERT_BLOCK_SECTION, LINKING_SECTION, OVERFLOW_GROUP, OVERFLOW_GROUP_PRIMARY_TOOLBAR, OVERFLOW_GROUP_PRIMARY_TOOLBAR_RANK, OVERFLOW_GROUP_RANK, OVERFLOW_MENU, OVERFLOW_MENU_PRIMARY_TOOLBAR, OVERFLOW_SECTION, OVERFLOW_SECTION_PRIMARY_TOOLBAR, OVERFLOW_SECTION_PRIMARY_TOOLBAR_RANK, OVERFLOW_SECTION_RANK, PIN_SECTION, TEXT_COLLAPSED_GROUP, TEXT_SECTION, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_COLLAPSED, TEXT_COLLAPSED_MENU, TOOLBAR_RANK, TOOLBARS, TRACK_CHANGES_SECTION, OVERFLOW_EXTENSIONS_MENU_SECTION, OVERFLOW_MENU_RANK } from '@atlaskit/editor-common/toolbar';
 import { Show, Toolbar } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SELECTION_TOOLBAR_LABEL } from './consts';
 import { OverflowMenu } from './OverflowMenu';
 import { OverflowMenuSection } from './OverflowMenuSection';
@@ -202,7 +201,7 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
       key: TOOLBARS.PRIMARY_TOOLBAR,
       rank: TOOLBAR_RANK[PIN_SECTION.key]
     }],
-    component: fg('platform_editor_toolbar_aifc_undo_redo_confluence') ? function (_ref9) {
+    component: function component(_ref9) {
       var children = _ref9.children,
         parents = _ref9.parents;
       return /*#__PURE__*/React.createElement(Section, {
@@ -211,7 +210,7 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
         api: api,
         showSeparatorInFullPagePrimaryToolbar: true
       }, children);
-    } : undefined
+    }
   }];
   components.push({
     type: OVERFLOW_SECTION_PRIMARY_TOOLBAR.type,
@@ -258,26 +257,24 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
       components.unshift.apply(components, _toConsumableArray(getPrimaryToolbarComponents(breakpointPreset)));
       break;
   }
-  if (fg('platform_editor_toolbar_aifc_undo_redo_confluence')) {
-    components.push({
-      type: TRACK_CHANGES_SECTION.type,
-      key: TRACK_CHANGES_SECTION.key,
-      parents: [{
-        type: 'toolbar',
-        key: TOOLBARS.PRIMARY_TOOLBAR,
-        rank: TOOLBAR_RANK[TRACK_CHANGES_SECTION.key]
-      }],
-      component: function component(_ref10) {
-        var children = _ref10.children,
-          parents = _ref10.parents;
-        return /*#__PURE__*/React.createElement(Section, {
-          testId: "track-changes-section",
-          parents: parents,
-          api: api,
-          showSeparatorInFullPagePrimaryToolbar: true
-        }, children);
-      }
-    });
-  }
+  components.push({
+    type: TRACK_CHANGES_SECTION.type,
+    key: TRACK_CHANGES_SECTION.key,
+    parents: [{
+      type: 'toolbar',
+      key: TOOLBARS.PRIMARY_TOOLBAR,
+      rank: TOOLBAR_RANK[TRACK_CHANGES_SECTION.key]
+    }],
+    component: function component(_ref10) {
+      var children = _ref10.children,
+        parents = _ref10.parents;
+      return /*#__PURE__*/React.createElement(Section, {
+        testId: "track-changes-section",
+        parents: parents,
+        api: api,
+        showSeparatorInFullPagePrimaryToolbar: true
+      }, children);
+    }
+  });
   return components;
 };

package/dist/types/toolbarPluginType.d.ts

@@ -30,7 +30,8 @@ export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
          * @returns The active contextual formatting mode:
          * - `always-inline`: Formatting controls appear in a floating toolbar near selected text
          * - `always-pinned`: Formatting controls are pinned to the top toolbar (default)
-         * - `controlled`: Both inline and primary toolbars are available
+         * - `controlled`: Both inline and primary toolbars are available - this option requires editor-plugin-selection-toolbar to be configured with
+         * userPreferencesProvider to control the toolbar pinning.
          */
         contextualFormattingMode: () => ContextualFormattingEnabledOptions;
         /**

package/dist/types/types/index.d.ts

@@ -10,12 +10,21 @@ export type ToolbarPluginOptions = {
      * Controls which toolbars are available for in the editor.
      *
      * The contextual formatting toolbar provides text formatting options (bold, italic, links, etc.)
-     * that appear contextually based on user selection and interaction.
+     * that appear contextually based on user selection.
+     *
+     * **Notes:**
+     * - The inline text toolbar has only been tested to work in the full-page and chromless editor appearances.
+     *
+     * **Options:**
+     * - `always-inline`: Formatting controls appear in a floating toolbar near selected text
+     * - `always-pinned`: Formatting controls are pinned to the top toolbar (default)
+     * - `controlled`: Both inline and primary toolbars are available - this option requires editor-plugin-selection-toolbar to be configured with
+     * userPreferencesProvider to control the toolbar pinning.
      *
      * @remarks
      * This option determines where and when the formatting toolbar is displayed:
-     * - **Primary Toolbar**: The toolbar mounted at the top of the editor that is always visible
-     * - **Inline Text Toolbar**: A floating toolbar that appears near the selected text
+     * - **Primary toolbar**: The toolbar mounted at the top of the editor that is always visible
+     * - **Inline text toolbar**: A floating toolbar that appears near the selected text
      *
      * @example
      * ```tsx
@@ -35,6 +44,7 @@ export type ToolbarPluginOptions = {
      *
      * @example
      * ```tsx
+     * // Must have editor-plugin-selection-toolbar configured with userPreferencesProvider
      * // Allow dynamic control of toolbar placement (both inline and primary available)
      * const toolbarPlugin = createToolbarPlugin({
      *   contextualFormattingEnabled: 'controlled',

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

@@ -30,7 +30,8 @@ export type ToolbarPlugin = NextEditorPlugin<'toolbar', {
          * @returns The active contextual formatting mode:
          * - `always-inline`: Formatting controls appear in a floating toolbar near selected text
          * - `always-pinned`: Formatting controls are pinned to the top toolbar (default)
-         * - `controlled`: Both inline and primary toolbars are available
+         * - `controlled`: Both inline and primary toolbars are available - this option requires editor-plugin-selection-toolbar to be configured with
+         * userPreferencesProvider to control the toolbar pinning.
          */
         contextualFormattingMode: () => ContextualFormattingEnabledOptions;
         /**

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

@@ -10,12 +10,21 @@ export type ToolbarPluginOptions = {
      * Controls which toolbars are available for in the editor.
      *
      * The contextual formatting toolbar provides text formatting options (bold, italic, links, etc.)
-     * that appear contextually based on user selection and interaction.
+     * that appear contextually based on user selection.
+     *
+     * **Notes:**
+     * - The inline text toolbar has only been tested to work in the full-page and chromless editor appearances.
+     *
+     * **Options:**
+     * - `always-inline`: Formatting controls appear in a floating toolbar near selected text
+     * - `always-pinned`: Formatting controls are pinned to the top toolbar (default)
+     * - `controlled`: Both inline and primary toolbars are available - this option requires editor-plugin-selection-toolbar to be configured with
+     * userPreferencesProvider to control the toolbar pinning.
      *
      * @remarks
      * This option determines where and when the formatting toolbar is displayed:
-     * - **Primary Toolbar**: The toolbar mounted at the top of the editor that is always visible
-     * - **Inline Text Toolbar**: A floating toolbar that appears near the selected text
+     * - **Primary toolbar**: The toolbar mounted at the top of the editor that is always visible
+     * - **Inline text toolbar**: A floating toolbar that appears near the selected text
      *
      * @example
      * ```tsx
@@ -35,6 +44,7 @@ export type ToolbarPluginOptions = {
      *
      * @example
      * ```tsx
+     * // Must have editor-plugin-selection-toolbar configured with userPreferencesProvider
      * // Allow dynamic control of toolbar placement (both inline and primary available)
      * const toolbarPlugin = createToolbarPlugin({
      *   contextualFormattingEnabled: 'controlled',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "4.1.11",
+	"version": "4.1.13",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-toolbar": "^0.19.0",
 		"@atlaskit/editor-toolbar-model": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^21.0.0",
+		"@atlaskit/tmp-editor-statsig": "^22.1.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -51,9 +51,6 @@
 	"platform-feature-flags": {
 		"platform_editor_toolbar_aifc_placement_overridden": {
 			"type": "boolean"
-		},
-		"platform_editor_toolbar_aifc_undo_redo_confluence": {
-			"type": "boolean"
 		}
 	},
 	"techstack": {