Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: navigation drawer clip while making folder in favorites #8619

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −3
Open

fix: navigation drawer clip while making folder in favorites #8619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a14d52
fix: navigation clip while making folder in fav
harshrajeevsingh Nov 20, 2024
38fe8b8
Merge remote-tracking branch 'upstream/main' into fix/navigation-clip
ehconitin Nov 22, 2024
6b7add3
remove padding from icon and add gap instead + navigation drawer open…
ehconitin Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...nt/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPickerFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import { FAVORITE_FOLDER_PICKER_DROPDOWN_ID } from '@/favorites/favorite-folder-
import { isFavoriteFolderCreatingState } from '@/favorites/states/isFavoriteFolderCreatingState';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { useRecoilState } from 'recoil';
import { useRecoilState, useSetRecoilState } from 'recoil';
import { IconPlus, MenuItem } from 'twenty-ui';

const StyledFooter = styled.div`
Expand All @@ -18,6 +19,9 @@ export const FavoriteFolderPickerFooter = () => {
const [, setIsFavoriteFolderCreating] = useRecoilState(
isFavoriteFolderCreatingState,
);
const setIsNavigationDrawerExpanded = useSetRecoilState(
isNavigationDrawerExpandedState,
);
const theme = useTheme();
const { closeDropdown } = useDropdown(FAVORITE_FOLDER_PICKER_DROPDOWN_ID);

Expand All @@ -27,6 +31,7 @@ export const FavoriteFolderPickerFooter = () => {
<MenuItem
className="add-folder"
onClick={() => {
setIsNavigationDrawerExpanded(true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@martmull How about this? I missed this earlier and added it here -- not related to the issue.

setIsFavoriteFolderCreating(true);
closeDropdown();
}}
Expand Down
7 changes: 5 additions & 2 deletions ...ty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const StyledItem = styled.div<{ isNavigationDrawerExpanded: boolean }>`

const StyledItemElementsContainer = styled.span`
align-items: center;

gap: ${({ theme }) => theme.spacing(2)};
display: flex;
width: 100%;
`;
Expand All @@ -53,6 +53,7 @@ const StyledTextInput = styled.input`
${TEXT_INPUT_STYLE}
margin: 0;
width: 100%;
padding: 0;
`;

export const NavigationDrawerInput = ({
Expand Down Expand Up @@ -115,7 +116,9 @@ export const NavigationDrawerInput = ({
<StyledItemElementsContainer>
{Icon && (
<Icon
style={{ minWidth: theme.icon.size.md }}
style={{
minWidth: theme.icon.size.md,
}}
size={theme.icon.size.md}
stroke={theme.icon.stroke.md}
color="currentColor"
Expand Down
Loading