@topconsultnpm/sdkui-react 6.20.0-dev1.71 → 6.20.0-dev1.73

package/lib/components/NewComponents/ContextMenu/TMContextMenu.js

@@ -323,7 +323,7 @@ const TMContextMenu = ({ items, trigger = 'right', children, target, externalCon
             }
         }
         else {
-            if (item.onClick || !keepOpenOnClick) {
+            if (!keepOpenOnClick) {
                 handleClose();
             }
         }

package/lib/components/base/TMFileManager.js

@@ -1,8 +1,8 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { extractTextsFromDirectory, findFileItems, setFolderTreeViewItems } from "./TMFileManagerUtils";
 import { DeviceType, useDeviceType } from "./TMDeviceProvider";
-import { formatBytes, Globalization, IconDashboard, IconFolder, IconHide, IconList, IconMenuVertical, IconRefresh, IconShow, SDKUI_Globals, SDKUI_Localizator, svgToString, TMCommandsContextMenu, TMConditionalWrapper } from "../../helper";
+import { formatBytes, Globalization, IconDashboard, IconFolder, IconHide, IconList, IconMenuVertical, IconRefresh, IconShow, SDKUI_Globals, SDKUI_Localizator, TMCommandsContextMenu, TMConditionalWrapper } from "../../helper";
 import TMTooltip from "./TMTooltip";
 import { TMColors } from "../../utils/theme";
 import TMPanel from "./TMPanel";
@@ -98,18 +98,18 @@ const TMFileManager = (props) => {
     const onBackCallback = useCallback(() => {
         setOpenDraftList(false);
     }, []);
-    const toolbar = useMemo(() => _jsxs(_Fragment, { children: [_jsx(IconMenuVertical, { id: "TMPanel-FileManager-Commands-Header", color: 'white', cursor: 'pointer' }), _jsx(TMCommandsContextMenu, { target: '#TMPanel-FileManager-Commands-Header', menuItems: [
-                    {
-                        icon: isLeftPanelCollapsed ? "eyeclose" : "eyeopen",
-                        onClick: () => setIsLeftPanelCollapsed(prev => !prev),
-                        text: isLeftPanelCollapsed ? SDKUI_Localizator.ShowLeftPanel : SDKUI_Localizator.HideLeftPanel,
-                    },
-                    {
-                        icon: svgToString(_jsx(IconRefresh, {})),
-                        onClick: async () => await refreshCallback(),
-                        text: SDKUI_Localizator.Refresh,
-                    },
-                ], showEvent: "click" })] }), [isLeftPanelCollapsed]);
+    const toolbar = useMemo(() => _jsx(TMCommandsContextMenu, { target: '#TMPanel-FileManager-Commands-Header', menuItems: [
+            {
+                icon: isLeftPanelCollapsed ? _jsx(IconShow, {}) : _jsx(IconHide, {}),
+                onClick: () => setIsLeftPanelCollapsed(prev => !prev),
+                text: isLeftPanelCollapsed ? SDKUI_Localizator.ShowLeftPanel : SDKUI_Localizator.HideLeftPanel,
+            },
+            {
+                icon: _jsx(IconRefresh, {}),
+                onClick: async () => await refreshCallback(),
+                text: SDKUI_Localizator.Refresh,
+            },
+        ], showEvent: "click", children: _jsx(IconMenuVertical, { id: "TMPanel-FileManager-Commands-Header", color: 'white', cursor: 'pointer' }) }), [isLeftPanelCollapsed]);
     // Handle closing the context menu
     const closeTreeViewContextMenu = useCallback(() => {
         setTreeViewAnchor(null);

package/lib/components/features/documents/TMDcmtTasks.js

@@ -1,6 +1,6 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
-import { IconMenuVertical, IconRefresh, SDKUI_Localizator, svgToString, TMCommandsContextMenu } from "../../../helper";
+import { IconMenuVertical, IconRefresh, SDKUI_Localizator, TMCommandsContextMenu } from "../../../helper";
 import { DeviceType, useDeviceType } from "../../base/TMDeviceProvider";
 import { useTMPanelManagerContext } from "../../layout/panelManager/TMPanelManagerContext";
 import TMPanel from "../../base/TMPanel";
@@ -12,13 +12,13 @@ const TMDcmtTasks = (props) => {
     // This avoids unnecessary re-renders by only recalculating when deviceType changes.
     let isMobile = useMemo(() => { return deviceType === DeviceType.MOBILE; }, [deviceType]);
     const { togglePanelVisibility, toggleMaximize, countVisibleLeafPanels } = useTMPanelManagerContext();
-    const toolbar = useMemo(() => _jsxs(_Fragment, { children: [_jsx(IconMenuVertical, { id: "TMTaksPanel-Commands-Header", color: 'white', cursor: 'pointer' }), _jsx(TMCommandsContextMenu, { target: '#TMTaksPanel-Commands-Header', showEvent: "click", menuItems: [
-                    {
-                        icon: svgToString(_jsx(IconRefresh, {})),
-                        onClick: async () => await getAllTasks(),
-                        text: SDKUI_Localizator.Refresh,
-                    },
-                ] })] }), []);
+    const toolbar = useMemo(() => _jsx(TMCommandsContextMenu, { target: '#TMTaksPanel-Commands-Header', showEvent: "click", menuItems: [
+            {
+                icon: _jsx(IconRefresh, {}),
+                onClick: async () => await getAllTasks(),
+                text: SDKUI_Localizator.Refresh,
+            },
+        ], children: _jsx(IconMenuVertical, { id: "TMTaksPanel-Commands-Header", color: 'white', cursor: 'pointer' }) }), []);
     return _jsx("div", { style: { width: "100%", height: "100%", position: 'relative' }, children: _jsx(TMPanel, { title: SDKUI_Localizator.Widget_Activities, allowMaximize: !isMobile && countVisibleLeafPanels() > 1, onClose: countVisibleLeafPanels() > 1 ? () => togglePanelVisibility("tmDcmtTasks") : undefined, onMaximize: countVisibleLeafPanels() > 1 ? () => toggleMaximize("tmDcmtTasks") : undefined, toolbar: toolbar, children: _jsx(TMTasksPanelContent, { id: "dcmtTasks", taskContext: taskContext, allTasks: allTasks, getAllTasks: getAllTasks, deleteTaskByIdsCallback: deleteTaskByIdsCallback, addTaskCallback: addTaskCallback, editTaskCallback: editTaskCallback, handleNavigateToWGs: () => { return Promise.resolve(); }, handleNavigateToDossiers: () => { return Promise.resolve(); }, afterTaskSaved: afterTaskSaved }) }) });
 };
 export default TMDcmtTasks;

package/lib/helper/TMCommandsContextMenu.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { HidingEvent } from "devextreme/ui/context_menu";
 interface TMCommandsContextMenuProps {
-    target: string | Element | undefined;
+    target?: string | Element | undefined;
     menuItems: Array<any>;
     id?: string;
     showEvent?: string | {
@@ -9,6 +9,8 @@ interface TMCommandsContextMenuProps {
         name?: string;
     } | undefined;
     onHiding?: ((e: HidingEvent<any>) => void) | undefined;
+    trigger?: 'right' | 'left';
+    children?: React.ReactNode;
 }
-export declare const TMCommandsContextMenu: React.MemoExoticComponent<({ target, menuItems, id, showEvent, onHiding }: TMCommandsContextMenuProps) => import("react/jsx-runtime").JSX.Element>;
+export declare const TMCommandsContextMenu: React.MemoExoticComponent<({ target, menuItems, id, showEvent, onHiding, trigger, children }: TMCommandsContextMenuProps) => import("react/jsx-runtime").JSX.Element>;
 export {};

package/lib/helper/TMCommandsContextMenu.js

@@ -1,6 +1,17 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from "react";
-import { ContextMenu } from "devextreme-react";
-export const TMCommandsContextMenu = React.memo(({ target, menuItems, id, showEvent = 'contextmenu', onHiding }) => {
-    return (_jsx(ContextMenu, { target: target, dataSource: menuItems, id: id, showEvent: showEvent, onHiding: onHiding }));
+import React, { useMemo } from "react";
+import { ContextMenu } from "../components/NewComponents/ContextMenu";
+export const TMCommandsContextMenu = React.memo(({ target, menuItems, id, showEvent = 'contextmenu', onHiding, trigger = 'left', children }) => {
+    // Convert DevExtreme menu items format to TMContextMenu format
+    const convertedItems = useMemo(() => {
+        return menuItems.map(item => ({
+            name: item.text,
+            icon: item.icon,
+            onClick: item.onClick,
+            disabled: item.disabled,
+            beginGroup: item.beginGroup,
+            visible: item.visible,
+        }));
+    }, [menuItems]);
+    return (_jsx(ContextMenu, { target: typeof target === 'string' ? target : undefined, items: convertedItems, trigger: trigger, children: children }));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topconsultnpm/sdkui-react",
-  "version": "6.20.0-dev1.71",
+  "version": "6.20.0-dev1.73",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",