Skip to content

Commit 52588be

Browse files
committed
Fix state management of overrides not properly resetting loader; closes pterodactyl#3429
1 parent 7b42983 commit 52588be

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

resources/scripts/hoc/asModal.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export type SettableModalProps = Omit<ModalProps, 'appear' | 'visible' | 'onDism
1313
interface State {
1414
render: boolean;
1515
visible: boolean;
16-
showSpinnerOverlay?: boolean;
1716
propOverrides: Partial<SettableModalProps>;
1817
}
1918

@@ -31,15 +30,13 @@ function asModal<P extends {}> (modalProps?: SettableModalProps | ((props: P) =>
3130
this.state = {
3231
render: props.visible,
3332
visible: props.visible,
34-
showSpinnerOverlay: undefined,
3533
propOverrides: {},
3634
};
3735
}
3836

3937
get computedModalProps (): Readonly<SettableModalProps & { visible: boolean }> {
4038
return {
4139
...(typeof modalProps === 'function' ? modalProps(this.props) : modalProps),
42-
showSpinnerOverlay: this.state.showSpinnerOverlay,
4340
...this.state.propOverrides,
4441
visible: this.state.visible,
4542
};
@@ -50,7 +47,7 @@ function asModal<P extends {}> (modalProps?: SettableModalProps | ((props: P) =>
5047
*/
5148
componentDidUpdate (prevProps: Readonly<P & AsModalProps>, prevState: Readonly<State>) {
5249
if (prevProps.visible && !this.props.visible) {
53-
this.setState({ visible: false, showSpinnerOverlay: false });
50+
this.setState({ visible: false, propOverrides: {} });
5451
} else if (!prevProps.visible && this.props.visible) {
5552
this.setState({ render: true, visible: true });
5653
}

0 commit comments

Comments
 (0)