Merge pull request #4295 from JedWatson/fix-menuplacement-context

JedWatson · Nov 23, 2020 · 709b0bc · 709b0bc
2 parents 3f82ae5 + 665443b
commit 709b0bc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.changeset/rotten-sheep-check.md b/.changeset/rotten-sheep-check.md
@@ -0,0 +1,6 @@
+---
+"react-select": patch
+"@react-select/docs": patch
+---
+
+Fix menuplacement context
diff --git a/docs/examples/MenuPortal.js b/docs/examples/MenuPortal.js
@@ -51,6 +51,7 @@ export default class MenuPortal extends Component<*, State> {
               menuPosition={isFixed ? 'fixed' : 'absolute'}
               menuPlacement={portalPlacement}
               options={colourOptions}
+              menuShouldScrollIntoView={false}
             />
             <Note Tag="label">
               <select

diff --git a/packages/react-select/src/components/Menu.js b/packages/react-select/src/components/Menu.js
@@ -258,7 +258,9 @@ export const menuCSS = ({
   zIndex: 1,
 });
 
-const PortalPlacementContext = createContext<() => void>(() => { });
+const PortalPlacementContext = createContext<{
+  getPortalPlacement?: (() => void) | null,
+}>({ getPortalPlacement: null });
 
 // NOTE: internal only
 export class MenuPlacer extends Component<MenuPlacerProps, MenuState> {
@@ -277,7 +279,6 @@ export class MenuPlacer extends Component<MenuPlacerProps, MenuState> {
       menuShouldScrollIntoView,
       theme,
     } = this.props;
-    const { getPortalPlacement } = this.context;
 
     if (!ref) return;
 
@@ -295,6 +296,7 @@ export class MenuPlacer extends Component<MenuPlacerProps, MenuState> {
       theme,
     });
 
+    const { getPortalPlacement } = this.context;
     if (getPortalPlacement) getPortalPlacement(state);
 
     this.setState(state);
@@ -520,7 +522,9 @@ export class MenuPortal extends Component<MenuPortalProps, MenuPortalState> {
     );
 
     return (
-      <PortalPlacementContext.Provider value={this.getPortalPlacement}>
+      <PortalPlacementContext.Provider
+        value={{ getPortalPlacement: this.getPortalPlacement }}
+      >
         {appendTo ? createPortal(menuWrapper, appendTo) : menuWrapper}
       </PortalPlacementContext.Provider>
     );