@atlaskit/editor-plugin-floating-toolbar 1.7.6 → 1.7.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.7.8
+
+### Patch Changes
+
+- [#116612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116612)
+  [`51b4df656c8d0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/51b4df656c8d0) -
+  Floating toolbar radiogroup markup, feature flag removal
+
+## 1.7.7
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.7.6
 
 ### Patch Changes

package/dist/cjs/ui/Toolbar.js

@@ -25,7 +25,6 @@ var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorPalette = require("@atlaskit/editor-palette");
 var _commands = require("@atlaskit/editor-plugin-table/commands");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _forceFocus = require("../pm-plugins/force-focus");
 var _commands2 = require("../pm-plugins/toolbar-data/commands");
 var _Dropdown = _interopRequireDefault(require("./Dropdown"));
@@ -261,32 +260,30 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         });
     }
   };
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.a11y-floating-toolbar-markup_vexmo')) {
-    var groupedItems = groupItems(items.filter(function (item) {
-      return !item.hidden;
-    }));
-    return (0, _react2.jsx)(_buttonGroup.default, null, groupedItems.map(function (element, index) {
-      var isGroup = Array.isArray(element);
-      if (isGroup) {
-        return (0, _react2.jsx)("div", {
-          key: index,
-          css: buttonGroupStyles,
-          role: "radiogroup",
-          "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined
-        }, element.map(function (item, idx) {
-          return renderItem(item, idx);
-        }));
-      } else {
-        return renderItem(element, index);
-      }
-    }));
-  } else {
-    return (0, _react2.jsx)(_buttonGroup.default, null, items.filter(function (item) {
-      return !item.hidden;
-    }).map(function (item, index) {
-      return renderItem(item, index);
-    }));
-  }
+  var groupedItems = groupItems(items.filter(function (item) {
+    return !item.hidden;
+  }));
+  return (0, _react2.jsx)(_buttonGroup.default, null, groupedItems.map(function (element, index) {
+    var isGroup = Array.isArray(element);
+    if (isGroup) {
+      return (0, _react2.jsx)("div", {
+        key: index,
+        css: buttonGroupStyles,
+        role: "radiogroup",
+        "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined
+      }, element.map(function (element) {
+        var indexInAllItems = items.findIndex(function (item) {
+          return item === element;
+        });
+        return renderItem(element, indexInAllItems);
+      }));
+    } else {
+      var indexInAllItems = items.findIndex(function (item) {
+        return item === element;
+      });
+      return renderItem(element, indexInAllItems);
+    }
+  }));
 }, function (prevProps, nextProps) {
   if (!nextProps.node) {
     return false;

package/dist/es2019/ui/Toolbar.js

@@ -14,7 +14,6 @@ import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-col
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import Dropdown from './Dropdown';
@@ -233,28 +232,24 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
         });
     }
   };
-  if (getBooleanFF('platform.editor.a11y-floating-toolbar-markup_vexmo')) {
-    const groupedItems = groupItems(items.filter(item => !item.hidden));
-    return jsx(ButtonGroup, null, groupedItems.map((element, index) => {
-      const isGroup = Array.isArray(element);
-      if (isGroup) {
-        return jsx("div", {
-          key: index,
-          css: buttonGroupStyles,
-          role: "radiogroup",
-          "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined
-        }, element.map((item, idx) => {
-          return renderItem(item, idx);
-        }));
-      } else {
-        return renderItem(element, index);
-      }
-    }));
-  } else {
-    return jsx(ButtonGroup, null, items.filter(item => !item.hidden).map((item, index) => {
-      return renderItem(item, index);
-    }));
-  }
+  const groupedItems = groupItems(items.filter(item => !item.hidden));
+  return jsx(ButtonGroup, null, groupedItems.map((element, index) => {
+    const isGroup = Array.isArray(element);
+    if (isGroup) {
+      return jsx("div", {
+        key: index,
+        css: buttonGroupStyles,
+        role: "radiogroup",
+        "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined
+      }, element.map(element => {
+        const indexInAllItems = items.findIndex(item => item === element);
+        return renderItem(element, indexInAllItems);
+      }));
+    } else {
+      const indexInAllItems = items.findIndex(item => item === element);
+      return renderItem(element, indexInAllItems);
+    }
+  }));
 }, (prevProps, nextProps) => {
   if (!nextProps.node) {
     return false;

package/dist/esm/ui/Toolbar.js

@@ -22,7 +22,6 @@ import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-col
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { clearHoverSelection } from '@atlaskit/editor-plugin-table/commands';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import Dropdown from './Dropdown';
@@ -254,32 +253,30 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
         });
     }
   };
-  if (getBooleanFF('platform.editor.a11y-floating-toolbar-markup_vexmo')) {
-    var groupedItems = groupItems(items.filter(function (item) {
-      return !item.hidden;
-    }));
-    return jsx(ButtonGroup, null, groupedItems.map(function (element, index) {
-      var isGroup = Array.isArray(element);
-      if (isGroup) {
-        return jsx("div", {
-          key: index,
-          css: buttonGroupStyles,
-          role: "radiogroup",
-          "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined
-        }, element.map(function (item, idx) {
-          return renderItem(item, idx);
-        }));
-      } else {
-        return renderItem(element, index);
-      }
-    }));
-  } else {
-    return jsx(ButtonGroup, null, items.filter(function (item) {
-      return !item.hidden;
-    }).map(function (item, index) {
-      return renderItem(item, index);
-    }));
-  }
+  var groupedItems = groupItems(items.filter(function (item) {
+    return !item.hidden;
+  }));
+  return jsx(ButtonGroup, null, groupedItems.map(function (element, index) {
+    var isGroup = Array.isArray(element);
+    if (isGroup) {
+      return jsx("div", {
+        key: index,
+        css: buttonGroupStyles,
+        role: "radiogroup",
+        "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined
+      }, element.map(function (element) {
+        var indexInAllItems = items.findIndex(function (item) {
+          return item === element;
+        });
+        return renderItem(element, indexInAllItems);
+      }));
+    } else {
+      var indexInAllItems = items.findIndex(function (item) {
+        return item === element;
+      });
+      return renderItem(element, indexInAllItems);
+    }
+  }));
 }, function (prevProps, nextProps) {
   if (!nextProps.node) {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "1.7.6",
+	"version": "1.7.8",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -25,9 +25,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-utils": "^19.4.0",
-		"@atlaskit/button": "^18.0.0",
+		"@atlaskit/button": "^18.1.0",
 		"@atlaskit/checkbox": "^13.5.0",
-		"@atlaskit/editor-common": "^83.5.0",
+		"@atlaskit/editor-common": "^84.0.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-block-controls": "^1.5.0",
 		"@atlaskit/editor-plugin-context-panel": "^1.1.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/emoji": "^67.6.0",
 		"@atlaskit/icon": "^22.5.0",
-		"@atlaskit/menu": "^2.6.0",
+		"@atlaskit/menu": "^2.7.0",
 		"@atlaskit/modal-dialog": "^12.14.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/select": "^17.11.0",
@@ -59,7 +59,7 @@
 	},
 	"devDependencies": {
 		"@atlaskit/visual-regression": "*",
-		"@testing-library/dom": "^8.17.1",
+		"@testing-library/dom": "^10.1.0",
 		"@testing-library/react": "^12.1.5",
 		"@testing-library/user-event": "^14.4.3",
 		"enzyme": "^3.10.0",
@@ -104,10 +104,5 @@
 				"dist/types-ts4.5/index.d.ts"
 			]
 		}
-	},
-	"platform-feature-flags": {
-		"platform.editor.a11y-floating-toolbar-markup_vexmo": {
-			"type": "boolean"
-		}
 	}
 }