forked from binary-com/deriv-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from fasihali-deriv/poa-tablet-view
Fasih/UPM-642/Enabled POA for tablet view
- Loading branch information
Showing
5 changed files
with
66 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,35 @@ | ||
import React from 'react'; | ||
import { ScrollbarsContainer } from '../scrollbars-container/scrollbars-container'; | ||
import { Div100vhContainer, DesktopWrapper, MobileWrapper } from '@deriv/components'; | ||
import { Div100vhContainer } from '@deriv/components'; | ||
import classNames from 'classnames'; | ||
import { useDevice } from '@deriv-com/ui'; | ||
|
||
type TFormBody = { | ||
scroll_offset?: string; | ||
className?: string; | ||
isFullHeight?: boolean; | ||
}; | ||
|
||
export const FormBody = ({ children, scroll_offset, className }: React.PropsWithChildren<TFormBody>) => ( | ||
<React.Fragment> | ||
<DesktopWrapper> | ||
<ScrollbarsContainer | ||
className={classNames('account__scrollbars_container--grid-layout', className)} | ||
scroll_offset={scroll_offset} | ||
> | ||
{children} | ||
</ScrollbarsContainer> | ||
</DesktopWrapper> | ||
<MobileWrapper> | ||
<Div100vhContainer | ||
className={classNames('account__scrollbars_container--grid-layout', className)} | ||
height_offset={scroll_offset || '200px'} | ||
> | ||
{children} | ||
</Div100vhContainer> | ||
</MobileWrapper> | ||
</React.Fragment> | ||
); | ||
export const FormBody = ({ children, scroll_offset, className, isFullHeight }: React.PropsWithChildren<TFormBody>) => { | ||
const { isDesktop } = useDevice(); | ||
return ( | ||
<React.Fragment> | ||
{isDesktop ? ( | ||
<ScrollbarsContainer | ||
className={classNames('account__scrollbars_container--grid-layout', className)} | ||
scroll_offset={scroll_offset} | ||
isFullHeight={isFullHeight} | ||
> | ||
{children} | ||
</ScrollbarsContainer> | ||
) : ( | ||
<Div100vhContainer | ||
className={classNames('account__scrollbars_container--grid-layout', className)} | ||
height_offset={scroll_offset || '200px'} | ||
> | ||
{children} | ||
</Div100vhContainer> | ||
)} | ||
</React.Fragment> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 19 additions & 10 deletions
29
packages/account/src/Components/scrollbars-container/scrollbars-container.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,33 @@ | ||
import classNames from 'classnames'; | ||
import React from 'react'; | ||
import { ThemedScrollbars } from '@deriv/components'; | ||
import { isMobile } from '@deriv/shared'; | ||
import { useDevice } from '@deriv-com/ui'; | ||
|
||
type TScrollbarsContainer = { | ||
className?: string; | ||
scroll_offset?: string; | ||
isFullHeight?: boolean; | ||
}; | ||
|
||
export const ScrollbarsContainer = ({ | ||
children, | ||
className, | ||
scroll_offset, | ||
}: React.PropsWithChildren<TScrollbarsContainer>) => ( | ||
<ThemedScrollbars is_bypassed={isMobile()} height={scroll_offset ? `calc(100% - ${scroll_offset})` : '100%'}> | ||
<div | ||
className={classNames('account__scrollbars_container', className)} | ||
data-testid='dt_scrollbar_container_div' | ||
isFullHeight = false, | ||
}: React.PropsWithChildren<TScrollbarsContainer>) => { | ||
const { isDesktop } = useDevice(); | ||
const height_unit = isFullHeight ? '100vh' : '100%'; | ||
return ( | ||
<ThemedScrollbars | ||
is_bypassed={!isDesktop} | ||
height={scroll_offset ? `calc(${height_unit} - ${scroll_offset})` : '100%'} | ||
> | ||
{children} | ||
</div> | ||
</ThemedScrollbars> | ||
); | ||
<div | ||
className={classNames('account__scrollbars_container', className)} | ||
data-testid='dt_scrollbar_container_div' | ||
> | ||
{children} | ||
</div> | ||
</ThemedScrollbars> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters