Implement menu option close functionality

iTwin · Dec 5, 2023 · ff9b08f · ff9b08f
1 parent 77e9241
commit ff9b08f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/packages/modules/imodel-browser/src/containers/iModelGrid/useIModelTableConfig.tsx b/packages/modules/imodel-browser/src/containers/iModelGrid/useIModelTableConfig.tsx
@@ -83,10 +83,11 @@ export const useIModelTableConfig = ({
             disableSortBy: true,
             maxWidth: 50,
             Cell: (props: CellProps<IModelFull>) => {
-              const moreOptions = () => {
+              const moreOptions = (close: () => void) => {
                 const options = _buildManagedContextMenuOptions(
                   iModelActions,
-                  props.row.original
+                  props.row.original,
+                  close
                 );
                 return options !== undefined ? options : [];
               };

diff --git a/packages/modules/imodel-browser/src/utils/_buildMenuOptions.tsx b/packages/modules/imodel-browser/src/utils/_buildMenuOptions.tsx
@@ -9,20 +9,29 @@ export interface ContextMenuBuilderItem<T = any>
   extends Omit<MenuItemProps, "onClick" | "value"> {
   key: string;
   visible?: boolean | ((value: T) => boolean);
-  onClick?: ((value?: unknown) => void) | undefined;
+  onClick?: (value: T, closeMenu?: () => void) => void | undefined;
 }
 
 /** Build MenuItem array for the value for each provided options
  * @private
  */
 export const _buildManagedContextMenuOptions: <T>(
   options: ContextMenuBuilderItem<T>[] | undefined,
-  value: T
-) => JSX.Element[] | undefined = (options, value) =>
-  options
+  value: T,
+  closeMenu?: () => void
+) => JSX.Element[] | undefined = (options, value, closeMenu) => {
+  return options
     ?.filter?.(({ visible }) => {
       return typeof visible === "function" ? visible(value) : visible ?? true;
     })
-    .map(({ key, visible, ...contextMenuProps }) => {
-      return <MenuItem {...contextMenuProps} key={key} value={value} />;
+    .map(({ key, visible, onClick, ...contextMenuProps }) => {
+      return (
+        <MenuItem
+          {...contextMenuProps}
+          onClick={() => onClick?.(value, closeMenu)}
+          key={key}
+          value={value}
+        />
+      );
     });
+};