development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Render all popups in the stack

Browse source
This commit is contained in:
tidy-dev 2022-11-22 10:41:33 -05:00
parent 9a990d19b9
commit 431b2d0653
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/ui/app.tsx
View file

@ -1397,13 +1397,23 @@ export class App extends React.Component<IAppProps, IAppState> {
private onUpdateAvailableDismissed = () =>
this.props.dispatcher.setUpdateBannerVisibility(false)
private currentPopupContent(): JSX.Element | null {
const popup = this.state.currentPopup
private allPopupContent(): JSX.Element | null {
const { allPopups } = this.state
if (!popup) {
if (allPopups.length === 0) {
return null
}
return (
<>
{allPopups.map(popup => {
return <div key={popup.id}>{this.popupContent(popup)}</div>
})}
</>
)
}
private popupContent(popup: Popup): JSX.Element | null {
if (popup.id === undefined) {
// Should not be possible... but if it does we want to know about it.
sendNonFatalException(
@ -2461,8 +2471,8 @@ export class App extends React.Component<IAppProps, IAppState> {
this.props.dispatcher.showPopup({ type: PopupType.TermsAndConditions })
}
private renderPopup() {
const popupContent = this.currentPopupContent()
private renderPopups() {
const popupContent = this.allPopupContent()
return (
<TransitionGroup>
@ -2550,7 +2560,7 @@ export class App extends React.Component<IAppProps, IAppState> {
{this.renderToolbar()}
{this.renderBanner()}
{this.renderRepository()}
{this.renderPopup()}
{this.renderPopups()}
{this.renderDragElement()}
</div>
)