Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/tiny-peaches-tease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": minor
---

Remove the CSS modules feature flag from the ConfirmationDialog component
70 changes: 6 additions & 64 deletions packages/react/src/ConfirmationDialog/ConfirmationDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import React, {useCallback} from 'react'
import {createRoot} from 'react-dom/client'
import styled from 'styled-components'
import Box from '../Box'
import type {ThemeProviderProps} from '../ThemeProvider'
import {ThemeProvider, useTheme} from '../ThemeProvider'
import {FocusKeys} from '@primer/behaviors'
import {get} from '../constants'
import type {DialogProps, DialogHeaderProps, DialogButtonProps} from '../Dialog/Dialog'
import {Dialog} from '../Dialog/Dialog'
import {useFocusZone} from '../hooks/useFocusZone'
import BaseStyles from '../BaseStyles'
import {toggleStyledComponent} from '../internal/utils/toggleStyledComponent'
import {useFeatureFlag} from '../FeatureFlags'
import classes from './ConfirmationDialog.module.css'

/**
Expand Down Expand Up @@ -46,87 +41,34 @@ export interface ConfirmationDialogProps {
confirmButtonType?: 'normal' | 'primary' | 'danger'
}

const CSS_MODULES_FEATURE_FLAG = 'primer_react_css_modules_ga'

const StyledConfirmationHeader = toggleStyledComponent(
CSS_MODULES_FEATURE_FLAG,
'div',
styled.div`
padding: ${get('space.2')};
display: flex;
flex-direction: row;
`,
)

const StyledTitle = toggleStyledComponent(
CSS_MODULES_FEATURE_FLAG,
'h1',
styled(Box).attrs({as: 'h1'})`
font-size: ${get('fontSizes.3')};
font-weight: ${get('fontWeights.bold')};
padding: 6px ${get('space.2')};
flex-grow: 1;
margin: 0; /* override default margin */
`,
)

const ConfirmationHeader: React.FC<React.PropsWithChildren<DialogHeaderProps>> = ({title, onClose, dialogLabelId}) => {
const onCloseClick = useCallback(() => {
onClose('close-button')
}, [onClose])

const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)
return (
<StyledConfirmationHeader className={enabled && classes.ConfirmationHeader}>
<StyledTitle id={dialogLabelId}>{title}</StyledTitle>
<div className={classes.ConfirmationHeader}>
<h1 id={dialogLabelId}>{title}</h1>
<Dialog.CloseButton onClose={onCloseClick} />
</StyledConfirmationHeader>
</div>
)
}
const StyledConfirmationBody = toggleStyledComponent(
CSS_MODULES_FEATURE_FLAG,
'div',
styled(Box)`
font-size: ${get('fontSizes.1')};
padding: 0 ${get('space.3')} ${get('space.3')} ${get('space.3')};
flex-grow: 1;
`,
)

const ConfirmationBody: React.FC<React.PropsWithChildren<DialogProps>> = ({children}) => {
const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)
return <StyledConfirmationBody className={enabled && classes.ConfirmationBody}>{children}</StyledConfirmationBody>
return <div className={classes.ConfirmationBody}>{children}</div>
}
const StyledConfirmationFooter = toggleStyledComponent(
CSS_MODULES_FEATURE_FLAG,
'div',
styled(Box)`
display: grid;
grid-auto-flow: column;
grid-auto-columns: max-content;
grid-gap: ${get('space.2')};
align-items: end;
justify-content: end;
padding: ${get('space.1')} ${get('space.3')} ${get('space.3')};
`,
)

const ConfirmationFooter: React.FC<React.PropsWithChildren<DialogProps>> = ({footerButtons}) => {
const {containerRef: footerRef} = useFocusZone({
bindKeys: FocusKeys.ArrowHorizontal | FocusKeys.Tab,
focusInStrategy: 'closest',
})

const enabled = useFeatureFlag(CSS_MODULES_FEATURE_FLAG)

// Must have exactly 2 buttons!
return (
<StyledConfirmationFooter
ref={footerRef as React.RefObject<HTMLDivElement>}
className={enabled && classes.ConfirmationFooter}
>
<div ref={footerRef as React.RefObject<HTMLDivElement>} className={classes.ConfirmationFooter}>
<Dialog.Buttons buttons={footerButtons ?? []} />
</StyledConfirmationFooter>
</div>
)
}

Expand Down
Loading