@sapui5/sap.fe.macros 1.141.2 → 1.142.1

package/src/sap/fe/macros/table/ActionsTemplating.tsx

@@ -35,6 +35,7 @@ import Menu from "sap/m/Menu";
 import MenuButton from "sap/m/MenuButton";
 import MenuItem from "sap/m/MenuItem";
 import OverflowToolbarLayoutData from "sap/m/OverflowToolbarLayoutData";
+import ToolbarSeparator from "sap/m/ToolbarSeparator";
 import { MenuButtonMode } from "sap/m/library";
 import ActionsPlaceholder from "sap/m/upload/ActionsPlaceholder";
 import type UI5Event from "sap/ui/base/Event";
@@ -80,9 +81,10 @@ function getMenuItemForAction(
 	const isOperationAvailable = dataField.ActionTarget?.annotations?.Core?.OperationAvailable?.valueOf() !== false;
 	const command = !forContextMenu ? menuItemAction.command : menuItemAction.command + "::ContextMenu";
 	const contextMenuText = forContextMenu ? "ContextMenu" : "ActionMenu";
+	// Here check the parent/child
 	const pressHandler = menuItemAction.command
 		? undefined
-		: parameters.handlerProvider.getDataFieldForActionButtonPressHandler(dataField, menuItemAction, action, forContextMenu);
+		: parameters.handlerProvider.getDataFieldForActionButtonPressHandler(dataField, menuItemAction, forContextMenu);
 	const pressCommand = menuItemAction.command ? `cmd:${command}|press` : undefined;
 
 	let enabled: string | boolean | CompiledBindingToolkitExpression =
@@ -295,7 +297,7 @@ function getDataFieldButtonForAction(
 	const command = !forContextMenu ? action.command : action.command + "::ContextMenu";
 	const pressHandler = action.command
 		? undefined
-		: parameters.handlerProvider.getDataFieldForActionButtonPressHandler(dataField, action, undefined, forContextMenu);
+		: parameters.handlerProvider.getDataFieldForActionButtonPressHandler(dataField, action, forContextMenu);
 	const pressCommand = action.command ? `cmd:${command}|press` : undefined;
 	const enabled =
 		action.enabled !== undefined
@@ -324,6 +326,7 @@ function getDataFieldButtonForAction(
 				type={ButtonType.Transparent}
 				enabled={enabled}
 				visible={action.visible}
+				ariaDescribedBy={action.isAIOperation === true ? ["fe::AiAction::AriaText"] : undefined}
 			>
 				{{
 					customData: [createCustomData("actionId", toolbarActionId)],
@@ -526,7 +529,6 @@ function getDefaultMenuButtonAction(
 					handler: parameters.handlerProvider.getDataFieldForActionButtonPressHandler(
 						dataFieldForDefaultAction as DataFieldForAction,
 						defaultAction,
-						undefined,
 						false
 					)
 				};
@@ -608,6 +610,7 @@ function getMenuButton(
 						buttonMode={(action as CustomAndAction).defaultAction ? MenuButtonMode.Split : MenuButtonMode.Regular}
 						defaultAction={defaultActionHandlers.handler}
 						jsx:command={defaultActionHandlers.command}
+						ariaDescribedBy={action.isAIOperation === true ? ["fe::AiAction::AriaText"] : undefined}
 					>
 						{{
 							customData: [createCustomData("actionId", menuId)],
@@ -699,6 +702,7 @@ function getDefaultButton(
 					visible={action.visible}
 					enabled={action.enabled}
 					icon={action.isAIOperation === true ? aiIcon : undefined}
+					ariaDescribedBy={action.isAIOperation === true ? ["fe::AiAction::AriaText"] : undefined}
 				>
 					{{
 						customData: [createCustomData("actionId", generate([table.contentId, action.id]))],
@@ -785,7 +789,7 @@ function getCopyAction(
 		: undefined;
 	const isBound = dataField?.ActionTarget?.isBound;
 	const press = dataField
-		? parameters.handlerProvider.getDataFieldForActionButtonPressHandler(dataField, action, undefined, forContextMenu)
+		? parameters.handlerProvider.getDataFieldForActionButtonPressHandler(dataField, action, forContextMenu)
 		: undefined;
 
 	let enabled: string | boolean | CompiledBindingToolkitExpression = operationAvailable
@@ -1186,6 +1190,17 @@ export function getActions(
 					return getStandardAction(action as StandardAction, table, forContextMenu, parameters.handlerProvider, collectionEntity);
 				case ActionType.Copy:
 					return getCopyAction(action, table, forContextMenu, collectionContext, parameters);
+				case ActionType.Separator:
+					if (!forContextMenu) {
+						return (
+							<ToolbarSeparator>
+								{{
+									layoutData: <OverflowToolbarLayoutData group={action.group}></OverflowToolbarLayoutData>
+								}}
+							</ToolbarSeparator>
+						);
+					}
+					return undefined;
 				default:
 					return getAction(action, table, forContextMenu, collectionContext, parameters);
 			}