diff --git a/src/components/DataManager/Toolbar/ActionsButton.js b/src/components/DataManager/Toolbar/ActionsButton.js
index 560435ba..fd57fd6c 100644
--- a/src/components/DataManager/Toolbar/ActionsButton.js
+++ b/src/components/DataManager/Toolbar/ActionsButton.js
@@ -13,6 +13,8 @@ import { FaChevronRight } from "react-icons/fa";
import "./ActionsButton.styl";
import { useCallback } from "react";
+const isFFLOPSE3 = isFF(FF_LOPS_E_3);
+const isNewUI = isFF(FF_LOPS_E_10);
const injector = inject(({ store }) => ({
store,
hasSelected: store.currentView?.selected?.hasSelected ?? false,
@@ -66,7 +68,6 @@ export const ActionsButton = injector(observer(({ store, size, hasSelected, ...r
const ActionButton = (action, parentRef) => {
const isDeleteAction = action.id.includes("delete");
- const isFFLOPSE3 = isFF(FF_LOPS_E_3) && action.newStyle;
const hasChildren = !!action.children?.length;
const submenuRef = useRef();
const onClick = useCallback((e) => {
@@ -81,12 +82,12 @@ export const ActionsButton = injector(observer(({ store, size, hasSelected, ...r
tag={Menu.Item}
size={size}
onClick={onClick}
- {...(isDeleteAction ? { danger: isDeleteAction } : {})}
mod={{
hasSeperator: isDeleteAction,
hasSubMenu: action.children?.length > 0,
isSeperator: action.isSeperator,
isTitle: action.isTitle,
+ danger: isDeleteAction,
}}
name='actionButton'
>
@@ -97,44 +98,54 @@ export const ActionsButton = injector(observer(({ store, size, hasSelected, ...r
);
- return isFFLOPSE3 ? (
- hasChildren ? (
+ //&& action.newStyle
+ return hasChildren ? (
+ {action.children.map(ActionButton, parentRef)}}
+ >
+ {titleContainer}
+
+ ) : (
+ isNewUI ? (
{action.children.map(ActionButton, parentRef)}}
+ content={{action.children.map(ActionButton, parentRef)}}
>
{titleContainer}
- ) : titleContainer
- ) : (
-
{
- invokeAction(action, isDeleteAction);
- }}
- icon={isDeleteAction && }
- >
- {action.title}
-
+ ) : (
+ {
+ invokeAction(action, isDeleteAction);
+ }}
+ className={`actionButton${action.isSeperator ? "_isSeperator" : (action.isTitle ? "_isTitle" : "")}`}
+ icon={isDeleteAction && }
+ >
+ {action.title}
+
+ )
);
};
const actionButtons = actions.map(ActionButton);
- const isFFLOPSE3 = isFF(FF_LOPS_E_3);
- const isNewUI = isFF(FF_LOPS_E_10);
return (
{actionButtons} : }
+ content={isNewUI ? {actionButtons} : }
disabled={!hasSelected}
onToggle={(visible) => isFFLOPSE3 && setIsOpen(visible)}
>
-