@atlaskit/editor-plugin-text-formatting 2.3.2 → 2.3.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 2.3.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.3.2
 
 ### Patch Changes

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

@@ -8,7 +8,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
 var _pluginKey = require("./plugin-key");
@@ -107,7 +106,7 @@ function keymapPlugin(schema, editorAnalyticsAPI) {
     props: {
       handleKeyDown: function handleKeyDown(view, event) {
         var keyboardEvent = (0, _keymaps.isCapsLockOnAndModifyKeyboardEvent)(event);
-        var keymapList = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_8') ? getEnabledKeylist(view) : list;
+        var keymapList = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? getEnabledKeylist(view) : list;
         return (0, _keymap.keydownHandler)(keymapList)(view, keyboardEvent);
       }
     }

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -128,7 +128,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     formattingIconState = (0, _objectWithoutProperties2.default)(textFormattingState, _excluded);
   var hasMultiplePartsWithFormattingSelected;
   var commonActiveMarks = [];
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7')) {
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     var selection = editorView.state.selection;
     var from = selection.from,
       to = selection.to;

package/dist/cjs/ui/Toolbar/dropdown-menu.js

@@ -59,7 +59,7 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
   var defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
   var iconBefore;
   var activeIconName = defaultIconName;
-  if (hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7')) {
+  if (hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
     iconBefore = defaultIcon;
   } else {
     iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;

package/dist/cjs/ui/Toolbar/formatting-in-selection-utils.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hasMultiplePartsWithFormattingInSelection = exports.getCommonActiveMarks = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("./types");
 var isMarkInIconTypes = function isMarkInIconTypes(node) {
   return node.marks.some(function (mark) {
@@ -16,19 +15,14 @@ var hasMultiplePartsWithFormattingInSelection = exports.hasMultiplePartsWithForm
   if (!selectedContent) {
     return false;
   }
-  if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_8')) {
-    // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
-    var contentWithMarks = selectedContent.filter(function (child) {
-      return isMarkInIconTypes(child);
-    });
-    var hasFormatting = contentWithMarks.length > 0;
-    var allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
-    return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
-  }
-  var marks = selectedContent.map(function (child) {
-    return isMarkInIconTypes(child) ? child.marks : undefined;
-  }).filter(Boolean);
-  return marks.length > 1;
+
+  // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
+  var contentWithMarks = selectedContent.filter(function (child) {
+    return isMarkInIconTypes(child);
+  });
+  var hasFormatting = contentWithMarks.length > 0;
+  var allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
+  return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
 };
 var getCommonActiveMarks = exports.getCommonActiveMarks = function getCommonActiveMarks(_ref2) {
   var selectedContent = _ref2.selectedContent;

package/dist/cjs/ui/Toolbar/hooks/use-icon-list.js

@@ -20,7 +20,7 @@ var useIconList = exports.useIconList = function useIconList(_ref) {
       }
       if (
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      shouldUnselect && icon.isActive && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) {
+      shouldUnselect && icon.isActive && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) {
         icon.isActive = false;
       }
       var isIconSingleButton = iconTypeList.includes(icon.iconMark);

package/dist/cjs/ui/Toolbar/single-toolbar-buttons.js

@@ -50,13 +50,13 @@ var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.de
         onClick: onClick(item.command),
         selected:
         // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
+        hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
         disabled: item.isDisabled,
         title: item.tooltipElement,
         iconBefore: item.iconElement,
         "aria-pressed":
         // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_7') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
+        hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
         "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
         "aria-keyshortcuts": item['aria-keyshortcuts']
       });

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

@@ -2,7 +2,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithEditorCommand, isCapsLockOnAndModifyKeyboardEvent, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
 import { pluginKey } from './plugin-key';
@@ -101,7 +100,7 @@ export default function keymapPlugin(schema, editorAnalyticsAPI) {
     props: {
       handleKeyDown(view, event) {
         const keyboardEvent = isCapsLockOnAndModifyKeyboardEvent(event);
-        const keymapList = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_8') ? getEnabledKeylist(view) : list;
+        const keymapList = editorExperiment('platform_editor_controls', 'variant1') ? getEnabledKeylist(view) : list;
         return keydownHandler(keymapList)(view, keyboardEvent);
       }
     }

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -122,7 +122,7 @@ const FloatingToolbarTextFormat = ({
   } = textFormattingState;
   let hasMultiplePartsWithFormattingSelected;
   let commonActiveMarks = [];
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     const {
       selection
     } = editorView.state;

package/dist/es2019/ui/Toolbar/dropdown-menu.js

@@ -41,7 +41,7 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
   const defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
   let iconBefore;
   let activeIconName = defaultIconName;
-  if (hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+  if (hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1')) {
     iconBefore = defaultIcon;
   } else {
     iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;

package/dist/es2019/ui/Toolbar/formatting-in-selection-utils.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { IconTypes } from './types';
 const isMarkInIconTypes = node => node.marks.some(mark => Object.values(IconTypes).includes(mark.type.name));
 export const hasMultiplePartsWithFormattingInSelection = ({
@@ -7,15 +6,12 @@ export const hasMultiplePartsWithFormattingInSelection = ({
   if (!selectedContent) {
     return false;
   }
-  if (fg('platform_editor_controls_patch_8')) {
-    // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
-    const contentWithMarks = selectedContent.filter(child => isMarkInIconTypes(child));
-    const hasFormatting = contentWithMarks.length > 0;
-    const allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
-    return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
-  }
-  const marks = selectedContent.map(child => isMarkInIconTypes(child) ? child.marks : undefined).filter(Boolean);
-  return marks.length > 1;
+
+  // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
+  const contentWithMarks = selectedContent.filter(child => isMarkInIconTypes(child));
+  const hasFormatting = contentWithMarks.length > 0;
+  const allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
+  return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
 };
 export const getCommonActiveMarks = ({
   selectedContent

package/dist/es2019/ui/Toolbar/hooks/use-icon-list.js

@@ -13,7 +13,7 @@ export const useIconList = ({
       }
       if (
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7') && !fg('platform_editor_controls_patch_10')) {
+      shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10')) {
         icon.isActive = false;
       }
       const isIconSingleButton = iconTypeList.includes(icon.iconMark);

package/dist/es2019/ui/Toolbar/single-toolbar-buttons.js

@@ -42,13 +42,13 @@ export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
         onClick: onClick(item.command),
         selected:
         // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
         disabled: item.isDisabled,
         title: item.tooltipElement,
         iconBefore: item.iconElement,
         "aria-pressed":
         // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
         "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
         "aria-keyshortcuts": item['aria-keyshortcuts']
       });

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

@@ -2,7 +2,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithEditorCommand, isCapsLockOnAndModifyKeyboardEvent, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
 import { pluginKey } from './plugin-key';
@@ -101,7 +100,7 @@ export default function keymapPlugin(schema, editorAnalyticsAPI) {
     props: {
       handleKeyDown: function handleKeyDown(view, event) {
         var keyboardEvent = isCapsLockOnAndModifyKeyboardEvent(event);
-        var keymapList = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_8') ? getEnabledKeylist(view) : list;
+        var keymapList = editorExperiment('platform_editor_controls', 'variant1') ? getEnabledKeylist(view) : list;
         return keydownHandler(keymapList)(view, keyboardEvent);
       }
     }

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -120,7 +120,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     formattingIconState = _objectWithoutProperties(textFormattingState, _excluded);
   var hasMultiplePartsWithFormattingSelected;
   var commonActiveMarks = [];
-  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+  if (editorExperiment('platform_editor_controls', 'variant1')) {
     var selection = editorView.state.selection;
     var from = selection.from,
       to = selection.to;

package/dist/esm/ui/Toolbar/dropdown-menu.js

@@ -50,7 +50,7 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
   var defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
   var iconBefore;
   var activeIconName = defaultIconName;
-  if (hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7')) {
+  if (hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1')) {
     iconBefore = defaultIcon;
   } else {
     iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;

package/dist/esm/ui/Toolbar/formatting-in-selection-utils.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { IconTypes } from './types';
 var isMarkInIconTypes = function isMarkInIconTypes(node) {
   return node.marks.some(function (mark) {
@@ -10,19 +9,14 @@ export var hasMultiplePartsWithFormattingInSelection = function hasMultipleParts
   if (!selectedContent) {
     return false;
   }
-  if (fg('platform_editor_controls_patch_8')) {
-    // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
-    var contentWithMarks = selectedContent.filter(function (child) {
-      return isMarkInIconTypes(child);
-    });
-    var hasFormatting = contentWithMarks.length > 0;
-    var allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
-    return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
-  }
-  var marks = selectedContent.map(function (child) {
-    return isMarkInIconTypes(child) ? child.marks : undefined;
-  }).filter(Boolean);
-  return marks.length > 1;
+
+  // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
+  var contentWithMarks = selectedContent.filter(function (child) {
+    return isMarkInIconTypes(child);
+  });
+  var hasFormatting = contentWithMarks.length > 0;
+  var allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
+  return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
 };
 export var getCommonActiveMarks = function getCommonActiveMarks(_ref2) {
   var selectedContent = _ref2.selectedContent;

package/dist/esm/ui/Toolbar/hooks/use-icon-list.js

@@ -13,7 +13,7 @@ export var useIconList = function useIconList(_ref) {
       }
       if (
       // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7') && !fg('platform_editor_controls_patch_10')) {
+      shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10')) {
         icon.isActive = false;
       }
       var isIconSingleButton = iconTypeList.includes(icon.iconMark);

package/dist/esm/ui/Toolbar/single-toolbar-buttons.js

@@ -41,13 +41,13 @@ export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
         onClick: onClick(item.command),
         selected:
         // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
         disabled: item.isDisabled,
         title: item.tooltipElement,
         iconBefore: item.iconElement,
         "aria-pressed":
         // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_7') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
         "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
         "aria-keyshortcuts": item['aria-keyshortcuts']
       });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,8 +45,8 @@
 		"@atlaskit/icon": "^27.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
-		"@atlaskit/tmp-editor-statsig": "^7.1.0",
-		"@atlaskit/tokens": "^5.2.0",
+		"@atlaskit/tmp-editor-statsig": "^8.0.0",
+		"@atlaskit/tokens": "^5.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -107,9 +107,6 @@
 		"platform_editor_resolve_marks": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_8": {
-			"type": "boolean"
-		},
 		"platform_editor_controls_patch_9": {
 			"type": "boolean"
 		},
@@ -127,9 +124,6 @@
 		},
 		"platform_editor_use_preferences_plugin": {
 			"type": "boolean"
-		},
-		"platform_editor_controls_patch_7": {
-			"type": "boolean"
 		}
 	}
 }