admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Board compact view and Company Picker for opportunity special case (#3713)

Browse Source 
* Re-enabled board compact mode

* Add specific case for opportunity to display company picker

* Add infinite scroll

* Remove useEffect

* Fix

* Fix
This commit is contained in:
Charles Bochet
2024-01-31 11:37:03 +01:00
committed by GitHub
parent 29339ef99a
commit c8e4d0ab9a
16 changed files with 291 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-front/src/modules/ui/navigation/action-bar/components/ActionBar.tsx
View File

@ -5,8 +5,6 @@ import { useRecoilValue } from 'recoil';
import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
import { actionBarOpenState } from '../states/actionBarIsOpenState';
import { ActionBarItem } from './ActionBarItem';
const StyledContainerActionBar = styled.div`
@ -30,12 +28,11 @@ const StyledContainerActionBar = styled.div`
`;
export const ActionBar = () => {
const actionBarOpen = useRecoilValue(actionBarOpenState);
const contextMenuIsOpen = useRecoilValue(contextMenuIsOpenState);
const actionBarEntries = useRecoilValue(actionBarEntriesState);
const wrapperRef = useRef<HTMLDivElement>(null);
if (!actionBarOpen || contextMenuIsOpen) {
if (contextMenuIsOpen) {
return null;
}

3
packages/twenty-front/src/modules/ui/navigation/context-menu/components/ContextMenu.tsx
View File

@ -4,7 +4,6 @@ import { useRecoilValue, useSetRecoilState } from 'recoil';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState';
import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
@ -42,14 +41,12 @@ export const ContextMenu = () => {
const contextMenuIsOpen = useRecoilValue(contextMenuIsOpenState);
const contextMenuEntries = useRecoilValue(contextMenuEntriesState);
const setContextMenuOpenState = useSetRecoilState(contextMenuIsOpenState);
const setActionBarOpenState = useSetRecoilState(actionBarOpenState);
const wrapperRef = useRef<HTMLDivElement>(null);
useListenClickOutside({
refs: [wrapperRef],
callback: () => {
setContextMenuOpenState(false);
setActionBarOpenState(true);
},
});