[desk-tool] Fix fallback edit intent pane not updating properly (#987)

sanity-io · Sep 28, 2018 · 5db1f4b · 5db1f4b
1 parent a06e11d
commit 5db1f4b
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/packages/@sanity/desk-tool/src/DeskTool.js b/packages/@sanity/desk-tool/src/DeskTool.js
@@ -171,7 +171,15 @@ export default withRouterHOC(
 
     shouldComponentUpdate(nextProps, nextState) {
       // @todo move this out of sCU - cWRP is deprecated, gDSFP does not have previous props
-      if (!shallowEquals(nextProps.router.state.panes, this.props.router.state.panes)) {
+      const nextRouterState = nextProps.router.state
+      const prevRouterState = this.props.router.state
+      if (
+        !shallowEquals(nextRouterState.panes, prevRouterState.panes) ||
+        nextRouterState.editDocumentId !== prevRouterState.editDocumentId ||
+        nextRouterState.legacyEditDocumentId !== prevRouterState.legacyEditDocumentId ||
+        nextRouterState.type !== prevRouterState.type ||
+        nextRouterState.action !== prevRouterState.action
+      ) {
         this.derivePanes(nextProps)
       }
 
@@ -208,20 +216,24 @@ export default withRouterHOC(
       }
     }
 
+    getFallbackKeys() {
+      const routerState = this.props.router.state
+      return routerState.type && routerState.editDocumentId
+        ? [`${routerState.type}-${routerState.editDocumentId}`]
+        : EMPTY_PANE_KEYS
+    }
+
     render() {
       const {panes, error} = this.state
       if (error) {
         return <StructureError error={error} />
       }
 
+      const keys = this.props.router.state.panes || this.getFallbackKeys()
+
       return (
         <div className={styles.deskTool}>
-          {panes && (
-            <DeskToolPanes
-              panes={this.state.panes}
-              keys={this.props.router.state.panes || EMPTY_PANE_KEYS}
-            />
-          )}
+          {panes && <DeskToolPanes panes={this.state.panes} keys={keys} />}
         </div>
       )
     }