Skip to content

Commit 2814709

Browse files
authored
fix(core): refactor UNSAFE_ lifecycle methods in ContentType and OperationContainer (#10373)
Refs #10212
1 parent 5f5e006 commit 2814709

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

src/core/components/content-type.jsx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { fromJS } from "immutable"
66
const noop = ()=>{}
77

88
export default class ContentType extends React.Component {
9-
109
static propTypes = {
1110
ariaControls: PropTypes.string,
1211
contentTypes: PropTypes.oneOfType([ImPropTypes.list, ImPropTypes.set, ImPropTypes.seq]),
@@ -24,19 +23,22 @@ export default class ContentType extends React.Component {
2423
}
2524

2625
componentDidMount() {
27-
// Needed to populate the form, initially
28-
if(this.props.contentTypes) {
29-
this.props.onChange(this.props.contentTypes.first())
26+
// Populate the form initially
27+
const { contentTypes, onChange } = this.props
28+
if (contentTypes && contentTypes.size) {
29+
onChange(contentTypes.first())
3030
}
3131
}
3232

33-
UNSAFE_componentWillReceiveProps(nextProps) {
34-
if(!nextProps.contentTypes || !nextProps.contentTypes.size) {
33+
componentDidUpdate() {
34+
const { contentTypes, value, onChange } = this.props
35+
36+
if (!contentTypes || !contentTypes.size) {
3537
return
3638
}
3739

38-
if(!nextProps.contentTypes.includes(nextProps.value)) {
39-
nextProps.onChange(nextProps.contentTypes.first())
40+
if (!contentTypes.includes(value)) {
41+
onChange(contentTypes.first())
4042
}
4143
}
4244

@@ -58,4 +60,5 @@ export default class ContentType extends React.Component {
5860
</div>
5961
)
6062
}
61-
}
63+
64+
}

src/core/containers/OperationContainer.jsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ export default class OperationContainer extends PureComponent {
9090
}
9191
}
9292

93-
UNSAFE_componentWillReceiveProps(nextProps) {
94-
const { response, isShown } = nextProps
93+
componentDidUpdate(prevProps) {
94+
const { response, isShown } = this.props
9595
const resolvedSubtree = this.getResolvedSubtree()
96-
97-
if(response !== this.props.response) {
96+
97+
if (response !== prevProps.response) {
9898
this.setState({ executeInProgress: false })
9999
}
100-
101-
if(isShown && resolvedSubtree === undefined) {
100+
101+
if (isShown && resolvedSubtree === undefined && !prevProps.isShown) {
102102
this.requestResolvedSubtree()
103103
}
104104
}

0 commit comments

Comments
 (0)