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

[FX-5688] Migrate PageHamburger to TailwindCSS #4579

Merged
merged 4 commits into from
Sep 30, 2024
Merged

[FX-5688] Migrate PageHamburger to TailwindCSS #4579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7a53f2
Remove material-ui styles
AdrianContiu Sep 26, 2024
c89130c
Update snapshots
AdrianContiu Sep 26, 2024
668291f
Add changeset
AdrianContiu Sep 26, 2024
947d11e
Address review comments
AdrianContiu Sep 27, 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
5 changes: 5 additions & 0 deletions .changeset/violet-trainers-begin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@toptal/picasso-page': patch
---

- migrate `PageHamburger` to TailwindCSS, material-ui@4 is no longer required
17 changes: 3 additions & 14 deletions packages/base/Page/src/PageHamburger/PageHamburger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,29 @@
import React, { useState } from 'react'
import type { Theme } from '@material-ui/core/styles'
import { makeStyles } from '@material-ui/core/styles'
import cx from 'classnames'
import { ButtonCircular } from '@toptal/picasso-button'
import { Dropdown } from '@toptal/picasso-dropdown'
import { Close24, Overview24 } from '@toptal/picasso-icons'

import { useHamburgerContext } from './PageHamburgerContext'
import styles from './styles'

interface Props {
id: string
'data-testid'?: string
}

const useStyles = makeStyles<Theme>(styles, {
name: 'PageHamburger',
})

const PageHamburger = ({ id, 'data-testid': dataTestId }: Props) => {
const { showSidebarMenu, hamburgerRef } = useHamburgerContext()
const [showContent, setShowContent] = useState<boolean>(false)
const classes = useStyles()

const handleShowContent = () => setShowContent(true)
const handleHideContent = () => setShowContent(false)

return (
<Dropdown
content={<div id={id} ref={hamburgerRef} />}
className={cx(classes.root, {
[classes.hidden]: !showSidebarMenu,
})}
className={!showSidebarMenu ? 'hidden' : 'min-[1280px]:hidden'}
classes={{
content: `!shadow-[inset_-1px_0px_0px_0px] !shadow-gray-200 max-h-[calc(100vh-var(--header-height,3.5rem))] !bg-gray-100`,
popper: classes.popper,
popper: 'mt-4',
}}
// The "disablePortal" is needed for testing the dropdown hamburger menu in Cypress.
// Without it, React fails to create portal inside of portal (via `createPortal()`), so
Expand All @@ -60,7 +49,7 @@ const PageHamburger = ({ id, 'data-testid': dataTestId }: Props) => {
showContent ? (
<Close24 />
) : (
<Overview24 className={classes.hamburger} />
<Overview24 className='pointer-events-none' />
)
}
data-testid={dataTestId}
Expand Down
24 changes: 0 additions & 24 deletions packages/base/Page/src/PageHamburger/styles.ts
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions packages/base/Page/src/PageTopBar/__snapshots__/test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`Page.TopBar render with custom logo 1`] = `
class="gap-4 items-center flex"
>
<div
class="flex items-center PageHamburger-root PageHamburger-hidden"
class="items-center hidden"
>
<div
class="inline-flex items-center cursor-pointer"
Expand All @@ -38,7 +38,7 @@ exports[`Page.TopBar render with custom logo 1`] = `
class="items-center inline-flex font-semibold whitespace-nowrap text-button"
>
<svg
class="PicassoSvgOverview24-root text-[1.2em] flex-1 PageHamburger-hamburger"
class="PicassoSvgOverview24-root text-[1.2em] flex-1 pointer-events"
style="min-width: 24px; min-height: 24px;"
viewBox="0 0 24 24"
>
Expand All @@ -50,7 +50,7 @@ exports[`Page.TopBar render with custom logo 1`] = `
</button>
</div>
<div
class="PicassoPopper-root shadow-2 PageHamburger-popper"
class="PicassoPopper-root shadow-2 mt-4"
role="navigation"
style="position: fixed; top: 0px; left: 0px; display: none;"
>
Expand Down Expand Up @@ -120,7 +120,7 @@ exports[`Page.TopBar render with link 1`] = `
class="gap-4 items-center flex"
>
<div
class="flex items-center PageHamburger-root PageHamburger-hidden"
class="items-center hidden"
>
<div
class="inline-flex items-center cursor-pointer"
Expand All @@ -137,7 +137,7 @@ exports[`Page.TopBar render with link 1`] = `
class="items-center inline-flex font-semibold whitespace-nowrap text-button"
>
<svg
class="PicassoSvgOverview24-root text-[1.2em] flex-1 PageHamburger-hamburger"
class="PicassoSvgOverview24-root text-[1.2em] flex-1 pointer-events"
style="min-width: 24px; min-height: 24px;"
viewBox="0 0 24 24"
>
Expand All @@ -149,7 +149,7 @@ exports[`Page.TopBar render with link 1`] = `
</button>
</div>
<div
class="PicassoPopper-root shadow-2 PageHamburger-popper"
class="PicassoPopper-root shadow-2 mt-4"
role="navigation"
style="position: fixed; top: 0px; left: 0px; display: none;"
>
Expand Down Expand Up @@ -245,7 +245,7 @@ exports[`Page.TopBar renders 1`] = `
class="gap-4 items-center flex"
>
<div
class="flex items-center PageHamburger-root PageHamburger-hidden"
class="items-center hidden"
>
<div
class="inline-flex items-center cursor-pointer"
Expand All @@ -262,7 +262,7 @@ exports[`Page.TopBar renders 1`] = `
class="items-center inline-flex font-semibold whitespace-nowrap text-button"
>
<svg
class="PicassoSvgOverview24-root text-[1.2em] flex-1 PageHamburger-hamburger"
class="PicassoSvgOverview24-root text-[1.2em] flex-1 pointer-events"
style="min-width: 24px; min-height: 24px;"
viewBox="0 0 24 24"
>
Expand All @@ -274,7 +274,7 @@ exports[`Page.TopBar renders 1`] = `
</button>
</div>
<div
class="PicassoPopper-root shadow-2 PageHamburger-popper"
class="PicassoPopper-root shadow-2 mt-4"
role="navigation"
style="position: fixed; top: 0px; left: 0px; display: none;"
>
Expand Down
Loading