Merge branch 'brendanlaschke-context-menu-vertical'

front/src/modules/ui/table/action-bar/components/EntityTableActionBar.tsx

@@ -5,12 +5,8 @@ import { ActionBar } from '@/ui/action-bar/components/ActionBar';
 
 import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector';
 
-type OwnProps = {
-  children: React.ReactNode | React.ReactNode[];
-};
-
-export function EntityTableActionBar({ children }: OwnProps) {
+export function EntityTableActionBar() {
   const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
 
-  return <ActionBar selectedIds={selectedRowIds}>{children}</ActionBar>;
+  return <ActionBar selectedIds={selectedRowIds}></ActionBar>;
 }

front/src/modules/ui/table/action-bar/components/EntityTableActionBarButton.tsx

@@ -1,51 +0,0 @@
-import { ReactNode } from 'react';
-import styled from '@emotion/styled';
-
-type OwnProps = {
-  icon: ReactNode;
-  label: string;
-  type?: 'standard' | 'warning';
-  onClick: () => void;
-};
-
-type StyledButtonProps = {
-  type: 'standard' | 'warning';
-};
-
-const StyledButton = styled.div<StyledButtonProps>`
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  color: ${(props) =>
-    props.type === 'warning'
-      ? props.theme.color.red
-      : props.theme.font.color.secondary};
-  cursor: pointer;
-  display: flex;
-  justify-content: center;
-
-  padding: ${({ theme }) => theme.spacing(2)};
-  transition: background 0.1s ease;
-  user-select: none;
-
-  &:hover {
-    background: ${({ theme }) => theme.background.tertiary};
-  }
-`;
-
-const StyledButtonLabel = styled.div`
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  margin-left: ${({ theme }) => theme.spacing(2)};
-`;
-
-export function EntityTableActionBarButton({
-  label,
-  icon,
-  type = 'standard',
-  onClick,
-}: OwnProps) {
-  return (
-    <StyledButton type={type} onClick={onClick}>
-      {icon}
-      <StyledButtonLabel>{label}</StyledButtonLabel>
-    </StyledButton>
-  );
-}

front/src/modules/ui/table/action-bar/components/TableActionBarButtonOpenComments.tsx

@@ -1,17 +0,0 @@
-import { IconNotes } from '@/ui/icon/index';
-
-import { EntityTableActionBarButton } from './EntityTableActionBarButton';
-
-type OwnProps = {
-  onClick: () => void;
-};
-
-export function TableActionBarButtonToggleComments({ onClick }: OwnProps) {
-  return (
-    <EntityTableActionBarButton
-      label="Note"
-      icon={<IconNotes size={16} />}
-      onClick={onClick}
-    />
-  );
-}

front/src/modules/ui/table/action-bar/components/TableActionBarButtonOpenTasks.tsx

@@ -1,17 +0,0 @@
-import { IconCheckbox } from '@/ui/icon/index';
-
-import { EntityTableActionBarButton } from './EntityTableActionBarButton';
-
-type OwnProps = {
-  onClick: () => void;
-};
-
-export function TableActionBarButtonToggleTasks({ onClick }: OwnProps) {
-  return (
-    <EntityTableActionBarButton
-      label="Task"
-      icon={<IconCheckbox size={16} />}
-      onClick={onClick}
-    />
-  );
-}

front/src/modules/ui/table/components/CheckboxCell.tsx

@@ -2,10 +2,10 @@ import { useCallback } from 'react';
 import styled from '@emotion/styled';
 import { useSetRecoilState } from 'recoil';
 
+import { actionBarOpenState } from '@/ui/action-bar/states/ActionBarIsOpenState';
 import { Checkbox } from '@/ui/input/checkbox/components/Checkbox';
 
 import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
-import { contextMenuPositionState } from '../states/contextMenuPositionState';
 
 const StyledContainer = styled.div`
   align-items: center;
@@ -18,14 +18,13 @@ const StyledContainer = styled.div`
 `;
 
 export function CheckboxCell() {
-  const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);
-
+  const setActionBarOpenState = useSetRecoilState(actionBarOpenState);
   const { currentRowSelected, setCurrentRowSelected } = useCurrentRowSelected();
 
   const handleClick = useCallback(() => {
     setCurrentRowSelected(!currentRowSelected);
-    setContextMenuPosition({ x: null, y: null });
-  }, [currentRowSelected, setContextMenuPosition, setCurrentRowSelected]);
+    setActionBarOpenState(true);
+  }, [currentRowSelected, setActionBarOpenState, setCurrentRowSelected]);
 
   return (
     <StyledContainer onClick={handleClick}>

front/src/modules/ui/table/components/EntityTableCell.tsx

@@ -1,28 +1,29 @@
 import { useContext } from 'react';
 import { useSetRecoilState } from 'recoil';
 
+import { contextMenuOpenState } from '@/ui/context-menu/states/ContextMenuIsOpenState';
+import { contextMenuPositionState } from '@/ui/context-menu/states/ContextMenuPositionState';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
 import { ColumnIndexContext } from '../contexts/ColumnIndexContext';
 import { ViewFieldContext } from '../contexts/ViewFieldContext';
 import { GenericEditableCell } from '../editable-cell/components/GenericEditableCell';
 import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
-import { contextMenuPositionState } from '../states/contextMenuPositionState';
 
 export function EntityTableCell({ cellIndex }: { cellIndex: number }) {
   const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);
+  const setContextMenuOpenState = useSetRecoilState(contextMenuOpenState);
 
   const { setCurrentRowSelected } = useCurrentRowSelected();
 
   function handleContextMenu(event: React.MouseEvent) {
     event.preventDefault();
-
     setCurrentRowSelected(true);
-
     setContextMenuPosition({
       x: event.clientX,
       y: event.clientY,
     });
+    setContextMenuOpenState(true);
   }
 
   const viewField = useContext(ViewFieldContext);

front/src/modules/ui/table/components/GenericEntityTableData.tsx

@@ -8,12 +8,16 @@ export function GenericEntityTableData({
   orderBy = defaultOrderBy,
   whereFilters,
   filterDefinitionArray,
+  setActionBar,
+  setContextMenu,
 }: {
   useGetRequest: any;
   getRequestResultKey: string;
   orderBy?: any;
   whereFilters?: any;
   filterDefinitionArray: FilterDefinition[];
+  setActionBar?: () => void;
+  setContextMenu?: () => void;
 }) {
   const setEntityTableData = useSetEntityTableData();
   useGetRequest({
@@ -24,5 +28,11 @@ export function GenericEntityTableData({
     },
   });
 
+  if (setActionBar) {
+    setActionBar();
+  }
+  if (setContextMenu) {
+    setContextMenu();
+  }
   return <></>;
 }

front/src/modules/ui/table/context-menu/components/EntityTableContextMenu.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { useRecoilValue } from 'recoil';
+
+import { ContextMenu } from '@/ui/context-menu/components/ContextMenu';
+
+import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector';
+
+export function EntityTableContextMenu() {
+  const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
+  return <ContextMenu selectedIds={selectedRowIds}></ContextMenu>;
+}

front/src/modules/ui/table/states/contextMenuPositionState.ts

@@ -1,11 +0,0 @@
-import { atom } from 'recoil';
-
-import { PositionType } from '@/ui/action-bar/types/PositionType';
-
-export const contextMenuPositionState = atom<PositionType>({
-  key: 'contextMenuPositionState',
-  default: {
-    x: null,
-    y: null,
-  },
-});