Skip to content

Commit ead745f

Browse files
committed
Remove redundant minimap style check on componentDidUpdate
1 parent 13841d4 commit ead745f

1 file changed

Lines changed: 7 additions & 21 deletions

File tree

app/src/ui/diff/side-by-side-diff.tsx

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,6 @@ export class SideBySideDiff extends React.Component<
457457
) {
458458
let resetDiff = false
459459

460-
this.invalidateMeasurementsIfDiffStyleChanged()
461-
462460
if (
463461
!highlightParametersEqual(this.props, prevProps, this.state, prevState)
464462
) {
@@ -674,24 +672,6 @@ export class SideBySideDiff extends React.Component<
674672
this.virtualListRef.current?.recomputeRowHeights()
675673
}
676674

677-
private applyDiffStyleKey(styleKey: string) {
678-
if (styleKey === this.lastDiffStyleKey) {
679-
return
680-
}
681-
682-
this.lastDiffStyleKey = styleKey
683-
this.invalidateMeasurements()
684-
}
685-
686-
private invalidateMeasurementsIfDiffStyleChanged() {
687-
const root = document.getElementById('desktop-app-chrome')
688-
if (root === null) {
689-
return
690-
}
691-
692-
this.applyDiffStyleKey(SideBySideDiff.getDiffStyleKey(root))
693-
}
694-
695675
private setupStyleObserver() {
696676
const root = document.getElementById('desktop-app-chrome')
697677
if (root === null) {
@@ -706,7 +686,13 @@ export class SideBySideDiff extends React.Component<
706686
return
707687
}
708688

709-
this.applyDiffStyleKey(SideBySideDiff.getDiffStyleKey(target))
689+
const newKey = SideBySideDiff.getDiffStyleKey(target)
690+
if (newKey === this.lastDiffStyleKey) {
691+
return
692+
}
693+
694+
this.lastDiffStyleKey = newKey
695+
this.invalidateMeasurements()
710696
})
711697

712698
this.styleObserver.observe(root, {

0 commit comments

Comments
 (0)