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

Fixed Warning during state update. #1448

Merged
merged 8 commits into from
Jul 7, 2021
Merged

Fixed Warning during state update. #1448

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01ccf19
Update modal.component.tsx
sergeushenecz Jun 12, 2021
512190f
Merge branch 'master' into fix-modal-update
sergeushenecz Jun 18, 2021
3878b07
Merge remote-tracking branch 'upstream/master' into fix-modal-update
sergeushenecz Jun 18, 2021
7c64f8e
Merge branch 'fix-modal-update' of https://github.com/sergeu90/react-…
sergeushenecz Jun 18, 2021
3c97a6d
Revert "Merge remote-tracking branch 'upstream/master' into fix-modal…
sergeushenecz Jun 20, 2021
f728eae
Revert "Revert "Merge remote-tracking branch 'upstream/master' into f…
sergeushenecz Jun 20, 2021
389461a
Merge branch 'master' into fix-modal-update
malashkevich Jul 1, 2021
f6dd37d
Merge branch 'master' into fix-modal-update
whitestranger7 Jul 5, 2021
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
8 changes: 4 additions & 4 deletions src/components/ui/modal/modal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ export class Modal extends React.PureComponent<ModalProps, State> {
if (this.modalId && !this.props.visible) {
this.hide();
}

if (this.modalId && this.props.visible) {
ModalService.update(this.modalId, this.renderContentElement());
}
}

public componentWillUnmount(): void {
Expand Down Expand Up @@ -158,10 +162,6 @@ export class Modal extends React.PureComponent<ModalProps, State> {
};

public render(): React.ReactNode {
if (this.modalId && this.props.visible) {
ModalService.update(this.modalId, this.renderContentElement());
}

return null;
}
}
Expand Down