@atlaskit/editor-plugin-text-formatting 1.16.11 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 1.17.0
+
+### Minor Changes
+
+- [#109060](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109060)
+  [`4660ec858a305`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4660ec858a305) -
+  Update `React` from v16 to v18
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.16.12
+
+### Patch Changes
+
+- [#107473](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107473)
+  [`962b3297548df`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/962b3297548df) -
+  [ux] Implement variation 2 for editor contextual toolbar formatting experiment
+
 ## 1.16.11
 
 ### Patch Changes

package/dist/cjs/editor-commands/clear-formatting.js

@@ -25,9 +25,6 @@ var formatTypes = {
 function clearFormattingWithAnalytics(inputMethod, editorAnalyticsAPI) {
   return clearFormatting(inputMethod, editorAnalyticsAPI);
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName, formattingCleared) {
   return function (node, pos) {
     if (node.type === formattedNodeType) {

package/dist/cjs/editor-commands/utils/cell-selection.js

@@ -4,10 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cellSelectionNodesBetween = void 0;
-var cellSelectionNodesBetween = exports.cellSelectionNodesBetween = function cellSelectionNodesBetween(selection, doc, f, startPos
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var cellSelectionNodesBetween = exports.cellSelectionNodesBetween = function cellSelectionNodesBetween(selection, doc, f, startPos) {
   selection.forEachCell(function (cell, cellPos) {
     doc.nodesBetween(cellPos, cellPos + cell.nodeSize, f, startPos);
   });

package/dist/cjs/editor-commands/utils/marks.js

@@ -72,9 +72,7 @@ var nextToggleMarkInRange = function nextToggleMarkInRange(mark, api) {
     return null;
   };
 };
-var nextApplyMarkOnRange = exports.nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, removeMark, mark, tr, api
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var nextApplyMarkOnRange = exports.nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, removeMark, mark, tr, api) {
   var schema = tr.doc.type.schema;
   var code = schema.marks.code;
   if (mark.type === code) {

package/dist/cjs/pm-plugins/clear-formatting.js

@@ -16,8 +16,6 @@ var plugin = exports.plugin = function plugin(dispatch) {
           formattingIsPresent: (0, _utils.checkFormattingIsPresent)(state)
         };
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(_tr, pluginState, _oldState, newState) {
         var formattingIsPresent = (0, _utils.checkFormattingIsPresent)(newState);
         if (formattingIsPresent !== pluginState.formattingIsPresent) {

package/dist/cjs/pm-plugins/input-rule.js

@@ -61,11 +61,7 @@ ValidAutoformatChars.STRIKE,
 ValidAutoformatChars.STRONG_MARKDOWN]), ValidAutoformatChars.CODE, [
 // e.g: loko (`some code`
 '( ']);
-
-// eslint-disable-next-line @typescript-eslint/max-params
 function addMark(markType, _schema, char, api) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   return function (state, _match, start, end) {
     var _schema$marks;
     var doc = state.doc,

package/dist/cjs/pm-plugins/main.js

@@ -89,8 +89,6 @@ var plugin = exports.plugin = function plugin(dispatch, editorAnalyticsAPI) {
       init: function init(_config, state) {
         return getTextFormattingState(state, editorAnalyticsAPI);
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(_tr, pluginState, _oldState, newState) {
         var state = getTextFormattingState(newState, editorAnalyticsAPI);
         if (!(0, _utils.shallowEqual)(pluginState, state)) {
@@ -112,8 +110,6 @@ var plugin = exports.plugin = function plugin(dispatch, editorAnalyticsAPI) {
         }
         return false;
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       handleTextInput: function handleTextInput(view, from, to, text) {
         var state = view.state,
           dispatch = view.dispatch;

package/dist/cjs/pm-plugins/smart-input-rule.js

@@ -21,8 +21,6 @@ var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
  * @param text text to replace with
  */
 function replaceTextUsingCaptureGroup(text) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   return function (state, match, start, end) {
     var _match = (0, _slicedToArray2.default)(match, 4),
       prefix = _match[1],
@@ -67,8 +65,7 @@ function createReplacementRules(replMap, replacementRuleWithAnalytics) {
 function createSingleQuotesRules() {
   return [
   // wrapped text
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp, @typescript-eslint/max-params
+  // eslint-disable-next-line require-unicode-regexp
   (0, _utils.createRule)(/(\s|^)'(\S+.*\S+)'$/, function (state, match, start, end) {
     var OPEN_SMART_QUOTE_CHAR = '‘';
     var CLOSED_SMART_QUOTE_CHAR = '’';

package/dist/cjs/textFormattingPlugin.js

@@ -135,6 +135,8 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
       selectionToolbar: function selectionToolbar() {
         if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true, {
           exposure: true
+        }) || (0, _experiments.editorExperiment)('platform_editor_contextual_formatting_toolbar_v2', 'variant1', {
+          exposure: true
         }) || (0, _experiments.editorExperiment)('platform_editor_contextual_formatting_toolbar_v2', 'variant2', {
           exposure: true
         })) {

package/dist/es2019/editor-commands/clear-formatting.js

@@ -17,9 +17,6 @@ const formatTypes = {
 export function clearFormattingWithAnalytics(inputMethod, editorAnalyticsAPI) {
   return clearFormatting(inputMethod, editorAnalyticsAPI);
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName, formattingCleared) {
   return function (node, pos) {
     if (node.type === formattedNodeType) {

package/dist/es2019/editor-commands/utils/cell-selection.js

@@ -1,7 +1,4 @@
-export const cellSelectionNodesBetween = (selection, doc, f, startPos
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+export const cellSelectionNodesBetween = (selection, doc, f, startPos) => {
   selection.forEachCell((cell, cellPos) => {
     doc.nodesBetween(cellPos, cellPos + cell.nodeSize, f, startPos);
   });

package/dist/es2019/editor-commands/utils/marks.js

@@ -65,9 +65,7 @@ const nextToggleMarkInRange = (mark, api) => ({
   }
   return null;
 };
-export const nextApplyMarkOnRange = (from, to, removeMark, mark, tr, api
-// eslint-disable-next-line @typescript-eslint/max-params
-) => {
+export const nextApplyMarkOnRange = (from, to, removeMark, mark, tr, api) => {
   const {
     schema
   } = tr.doc.type;

package/dist/es2019/pm-plugins/clear-formatting.js

@@ -9,8 +9,6 @@ export const plugin = dispatch => new SafePlugin({
         formattingIsPresent: checkFormattingIsPresent(state)
       };
     },
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     apply(_tr, pluginState, _oldState, newState) {
       const formattingIsPresent = checkFormattingIsPresent(newState);
       if (formattingIsPresent !== pluginState.formattingIsPresent) {

package/dist/es2019/pm-plugins/input-rule.js

@@ -47,11 +47,7 @@ export const ValidCombinations = {
   // e.g: loko (`some code`
   '( ']
 };
-
-// eslint-disable-next-line @typescript-eslint/max-params
 function addMark(markType, _schema, char, api) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   return (state, _match, start, end) => {
     var _schema$marks, _schema$marks$code;
     const {

package/dist/es2019/pm-plugins/main.js

@@ -79,8 +79,6 @@ export const plugin = (dispatch, editorAnalyticsAPI) => new SafePlugin({
     init(_config, state) {
       return getTextFormattingState(state, editorAnalyticsAPI);
     },
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     apply(_tr, pluginState, _oldState, newState) {
       const state = getTextFormattingState(newState, editorAnalyticsAPI);
       if (!shallowEqual(pluginState, state)) {
@@ -104,8 +102,6 @@ export const plugin = (dispatch, editorAnalyticsAPI) => new SafePlugin({
       }
       return false;
     },
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     handleTextInput(view, from, to, text) {
       const {
         state,

package/dist/es2019/pm-plugins/smart-input-rule.js

@@ -12,8 +12,6 @@ import { createPlugin } from '@atlaskit/prosemirror-input-rules';
  * @param text text to replace with
  */
 function replaceTextUsingCaptureGroup(text) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   return (state, match, start, end) => {
     const [, prefix,, suffix] = match;
     const replacement = text + (suffix || '');
@@ -60,8 +58,7 @@ function createReplacementRules(replMap, replacementRuleWithAnalytics) {
 function createSingleQuotesRules() {
   return [
   // wrapped text
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp, @typescript-eslint/max-params
+  // eslint-disable-next-line require-unicode-regexp
   createRule(/(\s|^)'(\S+.*\S+)'$/, (state, match, start, end) => {
     const OPEN_SMART_QUOTE_CHAR = '‘';
     const CLOSED_SMART_QUOTE_CHAR = '’';

package/dist/es2019/textFormattingPlugin.js

@@ -129,6 +129,8 @@ export const textFormattingPlugin = ({
       selectionToolbar: () => {
         if (editorExperiment('contextual_formatting_toolbar', true, {
           exposure: true
+        }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant1', {
+          exposure: true
         }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant2', {
           exposure: true
         })) {

package/dist/esm/editor-commands/clear-formatting.js

@@ -17,9 +17,6 @@ var formatTypes = {
 export function clearFormattingWithAnalytics(inputMethod, editorAnalyticsAPI) {
   return clearFormatting(inputMethod, editorAnalyticsAPI);
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName, formattingCleared) {
   return function (node, pos) {
     if (node.type === formattedNodeType) {

package/dist/esm/editor-commands/utils/cell-selection.js

@@ -1,7 +1,4 @@
-export var cellSelectionNodesBetween = function cellSelectionNodesBetween(selection, doc, f, startPos
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var cellSelectionNodesBetween = function cellSelectionNodesBetween(selection, doc, f, startPos) {
   selection.forEachCell(function (cell, cellPos) {
     doc.nodesBetween(cellPos, cellPos + cell.nodeSize, f, startPos);
   });

package/dist/esm/editor-commands/utils/marks.js

@@ -66,9 +66,7 @@ var nextToggleMarkInRange = function nextToggleMarkInRange(mark, api) {
     return null;
   };
 };
-export var nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, removeMark, mark, tr, api
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+export var nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, removeMark, mark, tr, api) {
   var schema = tr.doc.type.schema;
   var code = schema.marks.code;
   if (mark.type === code) {

package/dist/esm/pm-plugins/clear-formatting.js

@@ -10,8 +10,6 @@ export var plugin = function plugin(dispatch) {
           formattingIsPresent: checkFormattingIsPresent(state)
         };
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(_tr, pluginState, _oldState, newState) {
         var formattingIsPresent = checkFormattingIsPresent(newState);
         if (formattingIsPresent !== pluginState.formattingIsPresent) {

package/dist/esm/pm-plugins/input-rule.js

@@ -52,11 +52,7 @@ ValidAutoformatChars.STRIKE,
 ValidAutoformatChars.STRONG_MARKDOWN]), ValidAutoformatChars.CODE, [
 // e.g: loko (`some code`
 '( ']);
-
-// eslint-disable-next-line @typescript-eslint/max-params
 function addMark(markType, _schema, char, api) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   return function (state, _match, start, end) {
     var _schema$marks;
     var doc = state.doc,

package/dist/esm/pm-plugins/main.js

@@ -79,8 +79,6 @@ export var plugin = function plugin(dispatch, editorAnalyticsAPI) {
       init: function init(_config, state) {
         return getTextFormattingState(state, editorAnalyticsAPI);
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(_tr, pluginState, _oldState, newState) {
         var state = getTextFormattingState(newState, editorAnalyticsAPI);
         if (!shallowEqual(pluginState, state)) {
@@ -102,8 +100,6 @@ export var plugin = function plugin(dispatch, editorAnalyticsAPI) {
         }
         return false;
       },
-      // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/max-params
       handleTextInput: function handleTextInput(view, from, to, text) {
         var state = view.state,
           dispatch = view.dispatch;

package/dist/esm/pm-plugins/smart-input-rule.js

@@ -15,8 +15,6 @@ import { createPlugin } from '@atlaskit/prosemirror-input-rules';
  * @param text text to replace with
  */
 function replaceTextUsingCaptureGroup(text) {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   return function (state, match, start, end) {
     var _match = _slicedToArray(match, 4),
       prefix = _match[1],
@@ -61,8 +59,7 @@ function createReplacementRules(replMap, replacementRuleWithAnalytics) {
 function createSingleQuotesRules() {
   return [
   // wrapped text
-  // Ignored via go/ees005
-  // eslint-disable-next-line require-unicode-regexp, @typescript-eslint/max-params
+  // eslint-disable-next-line require-unicode-regexp
   createRule(/(\s|^)'(\S+.*\S+)'$/, function (state, match, start, end) {
     var OPEN_SMART_QUOTE_CHAR = '‘';
     var CLOSED_SMART_QUOTE_CHAR = '’';

package/dist/esm/textFormattingPlugin.js

@@ -129,6 +129,8 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
       selectionToolbar: function selectionToolbar() {
         if (editorExperiment('contextual_formatting_toolbar', true, {
           exposure: true
+        }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant1', {
+          exposure: true
         }) || editorExperiment('platform_editor_contextual_formatting_toolbar_v2', 'variant2', {
           exposure: true
         })) {

package/dist/types/ui/FloatingToolbarComponent.d.ts

@@ -4,14 +4,12 @@ import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TextFormattingPlugin } from '../textFormattingPluginType';
-export declare const FloatingToolbarTextFormalWithIntl: import("react").FC<import("react-intl-next").WithIntlProps<{
+type FloatingToolbarComponentProps = {
     editorView: EditorView;
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
-    editorAnalyticsAPI?: EditorAnalyticsAPI | undefined;
-} & WrappedComponentProps>> & {
-    WrappedComponent: import("react").ComponentType<{
-        editorView: EditorView;
-        api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
-        editorAnalyticsAPI?: EditorAnalyticsAPI | undefined;
-    } & WrappedComponentProps>;
+    editorAnalyticsAPI?: EditorAnalyticsAPI;
+} & WrappedComponentProps;
+export declare const FloatingToolbarTextFormalWithIntl: import("react").FC<import("react-intl-next").WithIntlProps<FloatingToolbarComponentProps>> & {
+    WrappedComponent: import("react").ComponentType<FloatingToolbarComponentProps>;
 };
+export {};

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

@@ -4,14 +4,12 @@ import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TextFormattingPlugin } from '../textFormattingPluginType';
-export declare const FloatingToolbarTextFormalWithIntl: import("react").FC<import("react-intl-next").WithIntlProps<{
+type FloatingToolbarComponentProps = {
     editorView: EditorView;
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
-    editorAnalyticsAPI?: EditorAnalyticsAPI | undefined;
-} & WrappedComponentProps>> & {
-    WrappedComponent: import("react").ComponentType<{
-        editorView: EditorView;
-        api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
-        editorAnalyticsAPI?: EditorAnalyticsAPI | undefined;
-    } & WrappedComponentProps>;
+    editorAnalyticsAPI?: EditorAnalyticsAPI;
+} & WrappedComponentProps;
+export declare const FloatingToolbarTextFormalWithIntl: import("react").FC<import("react-intl-next").WithIntlProps<FloatingToolbarComponentProps>> & {
+    WrappedComponent: import("react").ComponentType<FloatingToolbarComponentProps>;
 };
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "1.16.11",
+	"version": "1.17.0",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,18 +32,18 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.5.0",
+		"@atlaskit/editor-common": "^99.6.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-base": "^2.1.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.4.0",
+		"@atlaskit/icon": "^23.5.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
-		"@atlaskit/tmp-editor-statsig": "^2.39.0",
-		"@atlaskit/tokens": "^3.2.0",
+		"@atlaskit/tmp-editor-statsig": "^2.41.0",
+		"@atlaskit/tokens": "^3.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -53,9 +53,9 @@
 	},
 	"devDependencies": {
 		"@atlaskit/editor-plugin-composition": "^1.2.0",
-		"@atlaskit/editor-plugin-decorations": "^1.3.0",
+		"@atlaskit/editor-plugin-decorations": "^1.4.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
-		"@testing-library/react": "^12.1.5",
+		"@testing-library/react": "^13.4.0",
 		"typescript": "~5.4.2"
 	},
 	"techstack": {