@topconsultnpm/sdkui-react 6.20.0-dev1.80 → 6.20.0-dev1.82

package/lib/components/base/TMFileManager.d.ts

@@ -1,4 +1,5 @@
-import { FileItem, TMFileManagerContextMenuItem } from "./TMFileManagerUtils";
+import { FileItem } from "./TMFileManagerUtils";
+import { TMContextMenuItemProps } from '../NewComponents/ContextMenu/types';
 interface TMFileManagerProps {
     /** The currently focused file */
     focusedFile: FileItem | undefined;
@@ -17,9 +18,9 @@ interface TMFileManagerProps {
     /** Represents the file system tree structure */
     treeFs: FileItem;
     /** Context menu items for folders */
-    folderContextMenuItems: Array<TMFileManagerContextMenuItem>;
+    folderContextMenuItems: Array<TMContextMenuItemProps>;
     /** Context menu items for files */
-    fileContextMenuItems: Array<TMFileManagerContextMenuItem>;
+    fileContextMenuItems: Array<TMContextMenuItemProps>;
     /** Optional: Callback to handle folder selection changes */
     handleSelectedFolder?: (folderItem: FileItem | undefined) => void;
     /** Optional: Callback for handling double-click events on a file */

package/lib/components/base/TMFileManager.js

@@ -3,11 +3,12 @@ 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, TMCommandsContextMenu, TMConditionalWrapper } from "../../helper";
+import TMContextMenu from '../NewComponents/ContextMenu/TMContextMenu';
 import TMTooltip from "./TMTooltip";
 import { TMColors } from "../../utils/theme";
 import TMPanel from "./TMPanel";
 import { TMSplitterLayout } from "./TMLayout";
-import { ContextMenu, TreeView } from "devextreme-react";
+import { TreeView } from "devextreme-react";
 import Toolbar, { Item as ToolbarItem } from 'devextreme-react/toolbar';
 import TMButton from "./TMButton";
 import { TMSearchBar } from "../sidebar/TMHeader";
@@ -29,12 +30,12 @@ const TMFileManager = (props) => {
     const [viewMode, setViewMode] = useState(initialViewMode ?? 'details');
     // State to store transformed directory data for file manager
     const [treeViewData, setTreeViewData] = useState([]);
-    // State to store the anchor element for the tree view context men
-    const [treeViewAnchor, setTreeViewAnchor] = useState(null);
+    // State to store the tree view context menu control
+    const [treeViewContextMenuControl, setTreeViewContextMenuControl] = useState({ visible: false, position: { x: 0, y: 0 } });
     // State to store the filtered file items after search or filtering
     const [filteredFileItems, setFilteredFileItems] = useState([]);
-    // State to store the anchor element for draft thumbnails view
-    const [draftThumbViewAnchor, setDraftThumbViewAnchor] = useState(null);
+    // State to store the thumbnails view context menu control
+    const [thumbViewContextMenuControl, setThumbViewContextMenuControl] = useState({ visible: false, position: { x: 0, y: 0 } });
     // State to store the search text entered by the user
     const [searchText, setSearchText] = useState('');
     // State to control the collapse/expand of the left panel
@@ -112,7 +113,7 @@ const TMFileManager = (props) => {
         ], 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);
+        setTreeViewContextMenuControl(prev => ({ ...prev, visible: false }));
     }, []);
     const handleTreeViewItemClick = useCallback((e) => {
         if (!e)
@@ -161,7 +162,10 @@ const TMFileManager = (props) => {
         if (event === undefined)
             return;
         event.preventDefault();
-        setTreeViewAnchor(event.currentTarget);
+        setTreeViewContextMenuControl({
+            visible: true,
+            position: { x: event.clientX, y: event.clientY }
+        });
         handleFocusedFolder?.(undefined);
     }, []);
     const onItemTreeViewContextMenu = useCallback((contextMenuEvent) => {
@@ -198,11 +202,15 @@ const TMFileManager = (props) => {
     const handleDragLeave = (e) => {
         setIsDragging(false);
     };
-    return _jsx(TMPanel, { title: SDKUI_Localizator.Drafts, totalItems: dcmtsFound ?? 0, showHeader: showPanel, onBack: (isMobile && openDraftList) ? onBackCallback : undefined, onClose: onClosePanel, allowMaximize: !isMobile ? allowMaximize : false, onMaximize: !isMobile ? onMaximizePanel : undefined, onHeaderDoubleClick: !isMobile ? onMaximizePanel : undefined, toolbar: toolbar, children: _jsx("div", { style: { flexDirection: "column", height: "100%", width: "100%", }, children: _jsxs(TMConditionalWrapper, { condition: !isMobile, wrapper: children => _jsx("div", { style: { display: "flex", flexGrow: 1, height: "100%" }, children: _jsx(TMSplitterLayout, { direction: 'horizontal', showSeparator: true, separatorColor: 'transparent', separatorActiveColor: 'transparent', min: ['0', '0'], start: [isLeftPanelCollapsed ? '0%' : "32%", isLeftPanelCollapsed ? '100%' : "68%"], children: children }, "TMWGs-panels-treeView") }), children: [_jsxs("div", { style: {
+    return _jsx(TMPanel, { title: SDKUI_Localizator.Drafts, totalItems: dcmtsFound ?? 0, showHeader: showPanel, onBack: (isMobile && openDraftList) ? onBackCallback : undefined, onClose: onClosePanel, allowMaximize: !isMobile ? allowMaximize : false, onMaximize: !isMobile ? onMaximizePanel : undefined, onHeaderDoubleClick: !isMobile ? onMaximizePanel : undefined, toolbar: toolbar, children: _jsx("div", { style: { flexDirection: "column", height: "100%", width: "100%", }, children: _jsxs(TMConditionalWrapper, { condition: !isMobile, wrapper: children => _jsx("div", { style: { display: "flex", flexGrow: 1, height: "100%" }, children: _jsx(TMSplitterLayout, { direction: 'horizontal', showSeparator: true, separatorColor: 'transparent', separatorActiveColor: 'transparent', min: ['0', '0'], start: [isLeftPanelCollapsed ? '0%' : "32%", isLeftPanelCollapsed ? '100%' : "68%"], children: children }, "TMWGs-panels-treeView") }), children: [_jsxs("div", { id: "file-manager-tree-view-container", style: {
                             height: "100%",
                             width: "100%",
                             ...(isMobile && { display: openDraftList ? 'none' : 'block', transition: "opacity 0.3s ease-in-out" }),
-                        }, onContextMenu: onBackgroundTreeViewContextMenu, children: [_jsx(TreeView, { height: "100%", width: "100%", useNativeScrolling: SDKUI_Globals.userSettings?.themeSettings.gridSettings.useNativeScrollbar === 1, dataSource: treeViewData, displayExpr: "text", itemRender: renderTreeViewItem, onItemClick: handleTreeViewItemClick, onItemContextMenu: onItemTreeViewContextMenu }), treeViewAnchor && _jsx(ContextMenu, { id: "treeViewContextMenuDesktop", target: treeViewAnchor, dataSource: folderContextMenuItems, onHiding: closeTreeViewContextMenu })] }), _jsxs("div", { style: {
+                        }, onContextMenu: onBackgroundTreeViewContextMenu, children: [_jsx(TreeView, { height: "100%", width: "100%", useNativeScrolling: SDKUI_Globals.userSettings?.themeSettings.gridSettings.useNativeScrollbar === 1, dataSource: treeViewData, displayExpr: "text", itemRender: renderTreeViewItem, onItemClick: handleTreeViewItemClick, onItemContextMenu: onItemTreeViewContextMenu }), _jsx(TMContextMenu, { items: folderContextMenuItems, target: "#file-manager-tree-view-container", externalControl: {
+                                    visible: treeViewContextMenuControl.visible,
+                                    position: treeViewContextMenuControl.position,
+                                    onClose: closeTreeViewContextMenu
+                                } })] }), _jsxs("div", { style: {
                             backgroundColor: "#fff",
                             width: "100%",
                             height: "100%",
@@ -228,6 +236,6 @@ const TMFileManager = (props) => {
                                             pointerEvents: "none",
                                             backdropFilter: "blur(3px)",
                                             textShadow: "0 2px 4px rgba(0,0,0,0.5)"
-                                        }, children: SDKUI_Localizator.DropFileToShare }), viewMode === 'thumbnails' && _jsx(TMFileManagerThumbnailsView, { items: filteredFileItems ?? [], allUsers: allUsers, focusedFile: focusedFile, handleFocusedFile: handleFocusedFile, selectedFiles: selectedFiles, handleSelectedFiles: handleSelectedFiles, fileContextMenuItems: fileContextMenuItems, searchText: searchText, userID: userID, draftThumbViewAnchor: draftThumbViewAnchor, setDraftThumbViewAnchor: setDraftThumbViewAnchor, onDoubleClickHandler: onDoubleClickHandler }), viewMode === 'details' && _jsx(TMFileManagerDataGridView, { items: filteredFileItems ?? [], allUsers: allUsers, focusedFile: focusedFile, handleFocusedFile: handleFocusedFile, selectedFiles: selectedFiles, handleSelectedFiles: handleSelectedFiles, fileContextMenuItems: fileContextMenuItems, searchText: searchText, userID: userID, onDoubleClickHandler: onDoubleClickHandler })] })] })] }) }) });
+                                        }, children: SDKUI_Localizator.DropFileToShare }), viewMode === 'thumbnails' && _jsx(TMFileManagerThumbnailsView, { items: filteredFileItems ?? [], allUsers: allUsers, focusedFile: focusedFile, handleFocusedFile: handleFocusedFile, selectedFiles: selectedFiles, handleSelectedFiles: handleSelectedFiles, fileContextMenuItems: fileContextMenuItems, searchText: searchText, userID: userID, thumbViewContextMenuControl: thumbViewContextMenuControl, setThumbViewContextMenuControl: setThumbViewContextMenuControl, onDoubleClickHandler: onDoubleClickHandler }), viewMode === 'details' && _jsx(TMFileManagerDataGridView, { items: filteredFileItems ?? [], allUsers: allUsers, focusedFile: focusedFile, handleFocusedFile: handleFocusedFile, selectedFiles: selectedFiles, handleSelectedFiles: handleSelectedFiles, fileContextMenuItems: fileContextMenuItems, searchText: searchText, userID: userID, onDoubleClickHandler: onDoubleClickHandler })] })] })] }) }) });
 };
 export default TMFileManager;

package/lib/components/base/TMFileManagerDataGridView.d.ts

@@ -1,5 +1,6 @@
-import { FileItem, TMFileManagerContextMenuItem } from "./TMFileManagerUtils";
+import { FileItem } from "./TMFileManagerUtils";
 import { UserDescriptor } from "@topconsultnpm/sdk-ts";
+import { TMContextMenuItemProps } from "../NewComponents/ContextMenu/types";
 interface TMFileManagerDataGridViewProps {
     items: Array<FileItem>;
     allUsers: Array<UserDescriptor>;
@@ -7,7 +8,7 @@ interface TMFileManagerDataGridViewProps {
     handleFocusedFile: (fileItem: FileItem | undefined) => void;
     selectedFiles: Array<FileItem>;
     handleSelectedFiles: (fileItems: Array<FileItem>) => void;
-    fileContextMenuItems: Array<TMFileManagerContextMenuItem>;
+    fileContextMenuItems: Array<TMContextMenuItemProps>;
     searchText: string;
     userID?: number;
     onDoubleClickHandler?: (fileItem: FileItem | undefined) => void;

package/lib/components/base/TMFileManagerDataGridView.js

@@ -48,16 +48,6 @@ const TMFileManagerDataGridView = (props) => {
         if (onDoubleClickHandler)
             onDoubleClickHandler(e.data);
     }, [onDoubleClickHandler]);
-    const onContextMenuPreparing = (e) => {
-        if (e === undefined)
-            return;
-        if (e.target === 'content') {
-            if (handleFocusedFile && e.row)
-                handleFocusedFile(e.row.data);
-            e.items = e.items || [];
-            e.items = fileContextMenuItems ? [...fileContextMenuItems] : [];
-        }
-    };
     const cellDefaultRender = useCallback((cellData) => {
         const value = cellData.value ?? '';
         return renderHighlightedText(value.toString(), searchText, false);
@@ -96,6 +86,6 @@ const TMFileManagerDataGridView = (props) => {
             { dataField: "creationTime", caption: SDKUI_Localizator.CreationTime, dataType: 'datetime', format: 'dd/MM/yyyy HH:mm', cellRender: cellDatetimeRender },
         ];
     }, [searchText]);
-    return _jsx(TMDataGrid, { dataSource: items ?? [], dataColumns: dataColumns, focusedRowKey: focusedRowKey, selectedRowKeys: selectedRowKeys, onFocusedRowChanged: onFocusedRowChanged, onSelectionChanged: onSelectionChanged, onCellDblClick: onCellDblClick, onContextMenuPreparing: onContextMenuPreparing, showSearchPanel: false, noDataText: SDKUI_Localizator.FolderIsEmpty }, items.length);
+    return _jsx(TMDataGrid, { dataSource: items ?? [], dataColumns: dataColumns, focusedRowKey: focusedRowKey, selectedRowKeys: selectedRowKeys, onFocusedRowChanged: onFocusedRowChanged, onSelectionChanged: onSelectionChanged, onCellDblClick: onCellDblClick, customContextMenuItems: fileContextMenuItems, showSearchPanel: false, noDataText: SDKUI_Localizator.FolderIsEmpty }, items.length);
 };
 export default TMFileManagerDataGridView;

package/lib/components/base/TMFileManagerThumbnailItems.d.ts

@@ -10,7 +10,13 @@ export interface TMFileManagerThumbnailItemsProps {
     selectedFiles: Array<FileItem>;
     handleSelectedFiles: (fileItems: Array<FileItem>) => void;
     searchText: string;
-    setDraftThumbViewAnchor: React.Dispatch<React.SetStateAction<HTMLElement | null>>;
+    setThumbViewContextMenuControl: React.Dispatch<React.SetStateAction<{
+        visible: boolean;
+        position: {
+            x: number;
+            y: number;
+        };
+    }>>;
     onDoubleClick?: (file: FileItem) => void;
     userID?: number;
 }

package/lib/components/base/TMFileManagerThumbnailItems.js

@@ -6,7 +6,7 @@ import TMTooltip from './TMTooltip';
 import TMDcmtIcon from '../features/documents/TMDcmtIcon';
 const TMFileManagerThumbnailItems = (props) => {
     // Destructuring props for cleaner usage
-    const { items, allUsers, paginatedItems, selectedFiles, searchText, userID, onDoubleClick, handleSelectedFiles, handleFocusedFile, setDraftThumbViewAnchor } = props;
+    const { items, allUsers, paginatedItems, selectedFiles, searchText, userID, onDoubleClick, handleSelectedFiles, handleFocusedFile, setThumbViewContextMenuControl } = props;
     // Ref for the scrollable container
     const containerRef = useRef(null);
     // Stores index of the last selected item for shift selection
@@ -109,7 +109,10 @@ const TMFileManagerThumbnailItems = (props) => {
     // Right-click to open context menu and set focus
     const onContextMenu = useCallback((e, item) => {
         e.preventDefault();
-        setDraftThumbViewAnchor(e.currentTarget);
+        setThumbViewContextMenuControl({
+            visible: true,
+            position: { x: e.clientX, y: e.clientY }
+        });
         handleFocusedFile(item);
     }, []);
     const findCheckOutUserName = useCallback((item) => {

package/lib/components/base/TMFileManagerThumbnailsView.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
-import { FileItem, TMFileManagerContextMenuItem } from "./TMFileManagerUtils";
+import { FileItem } from "./TMFileManagerUtils";
 import { UserDescriptor } from "@topconsultnpm/sdk-ts";
+import { TMContextMenuItemProps } from '../NewComponents/ContextMenu/types';
 interface TMFileManagerThumbnailsViewProps {
     items: Array<FileItem>;
     allUsers: Array<UserDescriptor>;
@@ -8,12 +9,24 @@ interface TMFileManagerThumbnailsViewProps {
     handleFocusedFile: (fileItem: FileItem | undefined) => void;
     selectedFiles: Array<FileItem>;
     handleSelectedFiles: (fileItems: Array<FileItem>) => void;
-    fileContextMenuItems: Array<TMFileManagerContextMenuItem>;
+    fileContextMenuItems: Array<TMContextMenuItemProps>;
     searchText: string;
     userID?: number;
     onDoubleClickHandler?: (fileItem: FileItem | undefined) => void;
-    draftThumbViewAnchor: HTMLElement | null;
-    setDraftThumbViewAnchor: React.Dispatch<React.SetStateAction<HTMLElement | null>>;
+    thumbViewContextMenuControl: {
+        visible: boolean;
+        position: {
+            x: number;
+            y: number;
+        };
+    };
+    setThumbViewContextMenuControl: React.Dispatch<React.SetStateAction<{
+        visible: boolean;
+        position: {
+            x: number;
+            y: number;
+        };
+    }>>;
 }
 declare const TMFileManagerThumbnailsView: (props: TMFileManagerThumbnailsViewProps) => import("react/jsx-runtime").JSX.Element;
 export default TMFileManagerThumbnailsView;

package/lib/components/base/TMFileManagerThumbnailsView.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useState } from "react";
 import { TMFileManagerPageSize } from "./TMFileManagerUtils";
-import { ContextMenu, Pagination, ScrollView } from "devextreme-react";
+import { Pagination, ScrollView } from "devextreme-react";
+import TMContextMenu from '../NewComponents/ContextMenu/TMContextMenu';
 import TMFileManagerThumbnailItems from "./TMFileManagerThumbnailItems";
 import { SDKUI_Localizator } from "../../helper";
 const TMFileManagerThumbnailsView = (props) => {
-    const { items, allUsers, focusedFile, handleFocusedFile, selectedFiles = [], handleSelectedFiles, fileContextMenuItems, searchText, userID, onDoubleClickHandler, draftThumbViewAnchor, setDraftThumbViewAnchor } = props;
+    const { items, allUsers, focusedFile, handleFocusedFile, selectedFiles = [], handleSelectedFiles, fileContextMenuItems, searchText, userID, onDoubleClickHandler, thumbViewContextMenuControl, setThumbViewContextMenuControl } = props;
     const PAGE_SIZES = [TMFileManagerPageSize.Small, TMFileManagerPageSize.Medium, TMFileManagerPageSize.Large];
     const initPageSize = TMFileManagerPageSize.Small;
     const showPagination = (items?.length ?? 0) > initPageSize;
@@ -26,7 +27,7 @@ const TMFileManagerThumbnailsView = (props) => {
     }, []);
     // Handle closing the context menu
     const closeViewContextMenu = useCallback(() => {
-        setDraftThumbViewAnchor(null);
+        setThumbViewContextMenuControl(prev => ({ ...prev, visible: false }));
     }, []);
     const onBackgroundContextMenu = (event) => {
         if (event === undefined)
@@ -34,13 +35,24 @@ const TMFileManagerThumbnailsView = (props) => {
         if (event.target.closest('.tm-file-manager-thumbnail-items'))
             return;
         event.preventDefault();
-        setDraftThumbViewAnchor(event.currentTarget);
+        setThumbViewContextMenuControl({
+            visible: true,
+            position: { x: event.clientX, y: event.clientY }
+        });
         handleFocusedFile?.(undefined);
         handleSelectedFiles?.([]);
     };
     return items.length > 0 ?
-        _jsxs("div", { style: { width: "100%", height: "100%" }, onContextMenu: onBackgroundContextMenu, children: [_jsx(ScrollView, { width: "100%", height: showPagination ? "calc(100% - 50px)" : "100%", useNative: true, direction: 'vertical', children: _jsx(TMFileManagerThumbnailItems, { items: items, allUsers: allUsers, paginatedItems: paginatedItems, focusedFile: focusedFile, selectedFiles: selectedFiles, userID: userID, searchText: searchText, handleFocusedFile: handleFocusedFile, handleSelectedFiles: handleSelectedFiles, onDoubleClick: handleItemDoubleClick, setDraftThumbViewAnchor: setDraftThumbViewAnchor }) }), showPagination && _jsx(Pagination, { height: "50px", showInfo: true, showNavigationButtons: true, allowedPageSizes: PAGE_SIZES, displayMode: 'compact', itemCount: items.length, pageIndex: pageIndex, pageSize: pageSize, onPageIndexChange: setPageIndex, onPageSizeChange: setPageSize }), draftThumbViewAnchor && _jsx(ContextMenu, { id: 'fileViewContextMenuMobile', dataSource: fileContextMenuItems, target: draftThumbViewAnchor, onHiding: closeViewContextMenu })] })
+        _jsxs("div", { id: "file-manager-thumbnails-view", style: { width: "100%", height: "100%" }, onContextMenu: onBackgroundContextMenu, children: [_jsx(ScrollView, { width: "100%", height: showPagination ? "calc(100% - 50px)" : "100%", useNative: true, direction: 'vertical', children: _jsx(TMFileManagerThumbnailItems, { items: items, allUsers: allUsers, paginatedItems: paginatedItems, focusedFile: focusedFile, selectedFiles: selectedFiles, userID: userID, searchText: searchText, handleFocusedFile: handleFocusedFile, handleSelectedFiles: handleSelectedFiles, onDoubleClick: handleItemDoubleClick, setThumbViewContextMenuControl: setThumbViewContextMenuControl }) }), showPagination && _jsx(Pagination, { height: "50px", showInfo: true, showNavigationButtons: true, allowedPageSizes: PAGE_SIZES, displayMode: 'compact', itemCount: items.length, pageIndex: pageIndex, pageSize: pageSize, onPageIndexChange: setPageIndex, onPageSizeChange: setPageSize }), _jsx(TMContextMenu, { items: fileContextMenuItems, target: "#file-manager-thumbnails-view", externalControl: {
+                        visible: thumbViewContextMenuControl.visible,
+                        position: thumbViewContextMenuControl.position,
+                        onClose: closeViewContextMenu
+                    } })] })
         :
-            _jsxs("div", { onContextMenu: onBackgroundContextMenu, style: { width: "100%", height: "100%", display: 'flex', justifyContent: 'center', alignItems: 'center', marginTop: '10px' }, children: [SDKUI_Localizator.FolderIsEmpty, draftThumbViewAnchor && _jsx(ContextMenu, { id: 'fileViewContextMenuMobile', dataSource: fileContextMenuItems, target: draftThumbViewAnchor, onHiding: closeViewContextMenu })] });
+            _jsxs("div", { id: "file-manager-thumbnails-view-empty", onContextMenu: onBackgroundContextMenu, style: { width: "100%", height: "100%", display: 'flex', justifyContent: 'center', alignItems: 'center', marginTop: '10px' }, children: [SDKUI_Localizator.FolderIsEmpty, _jsx(TMContextMenu, { items: fileContextMenuItems, target: "#file-manager-thumbnails-view-empty", externalControl: {
+                            visible: thumbViewContextMenuControl.visible,
+                            position: thumbViewContextMenuControl.position,
+                            onClose: closeViewContextMenu
+                        } })] });
 };
 export default TMFileManagerThumbnailsView;

package/lib/components/base/TMFileManagerUtils.d.ts

@@ -19,18 +19,6 @@ export interface FileItem {
     size?: number;
     version?: number;
 }
-export interface TMFileManagerContextMenuItem {
-    text: string;
-    icon: string;
-    onClick?: (param?: any) => void;
-    operationType?: 'singleRow' | 'multiRow';
-    disabled?: boolean;
-    id?: string;
-    items?: Array<TMFileManagerContextMenuItem>;
-    beginGroup?: boolean;
-    tooltip?: string;
-    visible?: boolean;
-}
 export interface TMFileManagerTreeViewDirectory {
     id: number;
     text: string;

package/lib/components/features/search/TMSearch.js

@@ -142,6 +142,9 @@ const TMSearch = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTask
     }, []);
     const onRefreshSearchAsync = async () => {
         try {
+            if (lastQdSearched) {
+                lastQdSearched.maxDcmtsToBeReturned = maxDcmtsToBeReturned;
+            }
             const newResult = (await refreshLastSearch(lastQdSearched)) ?? [];
             setSearchResult(newResult);
         }

package/lib/components/features/workflow/diagram/WFDiagram.js

@@ -1662,24 +1662,11 @@ const WFDiagram = ({ xmlDiagramString, currentSetID, allowEdit = true, onDiagram
         const finalPercentage = Math.min(roundedPercentage, 100);
         return finalPercentage / 100;
     }, [wfDiagram]);
-    const handleZoomToFit = useCallback(() => {
-        const optimalZoom = calculateOptimalZoom();
-        setZoomLevel(optimalZoom);
-        setTranslateX(0);
-        setTranslateY(0);
-        setIsAutoZoomEnabled(true);
-    }, [calculateOptimalZoom]);
     const handleToggleAutoZoom = useCallback(() => {
         setIsAutoZoomEnabled(prev => {
             const newValue = !prev;
-            if (!newValue) {
-                // Se si disattiva AutoZoom, riporta lo zoom a 1
-                setZoomLevel(1);
-                setTranslateX(0);
-                setTranslateY(0);
-            }
-            else {
-                // Se si attiva AutoZoom, calcola lo zoom ottimale
+            if (newValue) {
+                // Se si attiva AutoZoom, calcola lo zoom ottimale, altrimenti mantieni il livello di zoom corrente
                 const optimalZoom = calculateOptimalZoom();
                 setZoomLevel(optimalZoom);
                 setTranslateX(0);

package/package.json

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