greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: type error for solution display widget's dropdown (#51448)

pull/51515/head
Muhammed Mustafa 2023-09-08 20:36:24 +03:00 committed by GitHub
parent 3383370790
commit 409afb7afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/solution-display-widget/index.tsx
View File

@ -45,7 +45,7 @@ export function SolutionDisplayWidget({
); );
const ShowProjectAndGithubLinkForCertification = ( const ShowProjectAndGithubLinkForCertification = (
<Dropdown id={`dropdown-for-${id}-${randomIdSuffix}`}> <Dropdown id={`dropdown-for-${id}-${randomIdSuffix}`}>
<Dropdown.Toggle block={true} bsStyle='primary' className='btn-invert'> <Dropdown.Toggle className='btn-invert'>
{viewText}{' '} {viewText}{' '}
<span className='sr-only'> <span className='sr-only'>
{t('settings.labels.solution-for', { projectTitle })} {t('settings.labels.solution-for', { projectTitle })}
@ -53,7 +53,7 @@ export function SolutionDisplayWidget({
</Dropdown.Toggle> </Dropdown.Toggle>
<Dropdown.Menu> <Dropdown.Menu>
<MenuItem <MenuItem
bsStyle='primary' variant='primary'
href={solution ?? ''} href={solution ?? ''}
rel='noopener noreferrer' rel='noopener noreferrer'
target='_blank' target='_blank'
@ -63,7 +63,7 @@ export function SolutionDisplayWidget({
<FontAwesomeIcon icon={faExternalLinkAlt} /> <FontAwesomeIcon icon={faExternalLinkAlt} />
</MenuItem> </MenuItem>
<MenuItem <MenuItem
bsStyle='primary' variant='primary'
href={githubLink} href={githubLink}
rel='noopener noreferrer' rel='noopener noreferrer'
target='_blank' target='_blank'
@ -97,7 +97,7 @@ export function SolutionDisplayWidget({
const ShowUserCode = ( const ShowUserCode = (
<Button <Button
block={true} block={true}
bsStyle='primary' variant='primary'
className='btn-invert' className='btn-invert'
data-cy={dataCy} data-cy={dataCy}
onClick={showUserCode} onClick={showUserCode}
@ -111,17 +111,17 @@ export function SolutionDisplayWidget({
const ShowMultifileProjectSolution = ( const ShowMultifileProjectSolution = (
<div className='solutions-dropdown'> <div className='solutions-dropdown'>
<Dropdown id={`dropdown-for-${id}-${randomIdSuffix}`}> <Dropdown id={`dropdown-for-${id}-${randomIdSuffix}`}>
<Dropdown.Toggle block={true} bsStyle='primary' className='btn-invert'> <Dropdown.Toggle className='btn-invert'>
{viewText}{' '} {viewText}{' '}
<span className='sr-only'> <span className='sr-only'>
{t('settings.labels.solution-for', { projectTitle })} {t('settings.labels.solution-for', { projectTitle })}
</span> </span>
</Dropdown.Toggle> </Dropdown.Toggle>
<Dropdown.Menu> <Dropdown.Menu>
<MenuItem bsStyle='primary' onClick={showUserCode}> <MenuItem variant='primary' onClick={showUserCode}>
{viewCode} {viewCode}
</MenuItem> </MenuItem>
<MenuItem bsStyle='primary' onClick={showProjectPreview}> <MenuItem variant='primary' onClick={showProjectPreview}>
{viewProject} {viewProject}
</MenuItem> </MenuItem>
</Dropdown.Menu> </Dropdown.Menu>
@ -132,7 +132,7 @@ export function SolutionDisplayWidget({
const ShowProjectAndGithubLinks = ( const ShowProjectAndGithubLinks = (
<div className='solutions-dropdown'> <div className='solutions-dropdown'>
<Dropdown id={`dropdown-for-${id}-${randomIdSuffix}`}> <Dropdown id={`dropdown-for-${id}-${randomIdSuffix}`}>
<Dropdown.Toggle block={true} bsStyle='primary' className='btn-invert'> <Dropdown.Toggle className='btn-invert'>
{viewText}{' '} {viewText}{' '}
<span className='sr-only'> <span className='sr-only'>
{t('settings.labels.solution-for', { projectTitle })} {t('settings.labels.solution-for', { projectTitle })}
@ -140,7 +140,7 @@ export function SolutionDisplayWidget({
</Dropdown.Toggle> </Dropdown.Toggle>
<Dropdown.Menu> <Dropdown.Menu>
<MenuItem <MenuItem
bsStyle='primary' variant='primary'
href={solution} href={solution}
rel='noopener noreferrer' rel='noopener noreferrer'
target='_blank' target='_blank'
@ -150,7 +150,7 @@ export function SolutionDisplayWidget({
<FontAwesomeIcon icon={faExternalLinkAlt} /> <FontAwesomeIcon icon={faExternalLinkAlt} />
</MenuItem> </MenuItem>
<MenuItem <MenuItem
bsStyle='primary' variant='primary'
href={githubLink} href={githubLink}
rel='noopener noreferrer' rel='noopener noreferrer'
target='_blank' target='_blank'

1
tools/ui-components/src/drop-down/drop-down.tsx
View File

@ -25,6 +25,7 @@ type DropdownMenuProps = Props<
export type DropdownProps = DropdownMenuProps & { export type DropdownProps = DropdownMenuProps & {
dropup?: boolean; dropup?: boolean;
id?: string;
}; };
export interface ButtonRenderPropArg { export interface ButtonRenderPropArg {