favorite folders followup (#8570)
Something changed, which affected the Favorite folder picker checkbox styles -- fixed it! Cleaned up code in `CurrentWorkspaceMemberFavoritesFolders` - removed redundant filtering since favorites are already filtered in `usePrefetchedFavoritesData`. Regarding issue #8569 - I am not sure what to do in this case. Since Folders data is gated by a feature flag, we can't use it in `CurrentWorkspaceMemberFavoritesFolders` to ensure the favorite section renders with empty folders. Currently, the section only appears when at least one favorite exists - may be leave this section open at all times or fix this bug after removal of the feature flag? --------- Co-authored-by: Nitin Koche <nitinkoche@Nitins-MacBook-Pro.local> Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
@ -23,12 +23,17 @@ const StyledScrollWrapper = styled.div`
|
||||
}
|
||||
`;
|
||||
|
||||
const StyledInnerContainer = styled.div`
|
||||
flex: 1;
|
||||
`;
|
||||
|
||||
export type ScrollWrapperProps = {
|
||||
children: React.ReactNode;
|
||||
className?: string;
|
||||
enableXScroll?: boolean;
|
||||
enableYScroll?: boolean;
|
||||
contextProviderName: ContextProviderName;
|
||||
scrollHide?: boolean;
|
||||
};
|
||||
|
||||
export const ScrollWrapper = ({
|
||||
@ -37,6 +42,7 @@ export const ScrollWrapper = ({
|
||||
enableXScroll = true,
|
||||
enableYScroll = true,
|
||||
contextProviderName,
|
||||
scrollHide = false,
|
||||
}: ScrollWrapperProps) => {
|
||||
const scrollableRef = useRef<HTMLDivElement>(null);
|
||||
const Context = getContextByProviderName(contextProviderName);
|
||||
@ -55,7 +61,10 @@ export const ScrollWrapper = ({
|
||||
|
||||
const [initialize, instance] = useOverlayScrollbars({
|
||||
options: {
|
||||
scrollbars: { autoHide: 'scroll' },
|
||||
scrollbars: {
|
||||
autoHide: scrollHide ? 'scroll' : 'never',
|
||||
visibility: scrollHide ? 'hidden' : 'visible',
|
||||
},
|
||||
overflow: {
|
||||
x: enableXScroll ? undefined : 'hidden',
|
||||
y: enableYScroll ? undefined : 'hidden',
|
||||
@ -84,7 +93,7 @@ export const ScrollWrapper = ({
|
||||
}}
|
||||
>
|
||||
<StyledScrollWrapper ref={scrollableRef} className={className}>
|
||||
{children}
|
||||
<StyledInnerContainer>{children}</StyledInnerContainer>
|
||||
</StyledScrollWrapper>
|
||||
</Context.Provider>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user