From 9e3d7cfbf63a971de58fa6055dba784962a85839 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 17 Aug 2018 18:05:55 +0800 Subject: [PATCH 1/2] Fixed missing null from getContentAnchorEl. --- packages/material-ui/src/Popover/Popover.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/material-ui/src/Popover/Popover.d.ts b/packages/material-ui/src/Popover/Popover.d.ts index faabdab2998a78..5e688e7eefe4ec 100644 --- a/packages/material-ui/src/Popover/Popover.d.ts +++ b/packages/material-ui/src/Popover/Popover.d.ts @@ -25,7 +25,7 @@ export interface PopoverProps anchorReference?: PopoverReference; children?: React.ReactNode; elevation?: number; - getContentAnchorEl?: (element: HTMLElement) => HTMLElement; + getContentAnchorEl?: null | ((element: HTMLElement) => HTMLElement); marginThreshold?: number; modal?: boolean; ModalClasses?: ModalClassKey; From b8434ca74e29adfeb9474908033e1e4d710efbae Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 18 Aug 2018 16:19:36 +0200 Subject: [PATCH 2/2] let's merge --- packages/material-ui/src/Popover/Popover.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/material-ui/src/Popover/Popover.js b/packages/material-ui/src/Popover/Popover.js index 514eaddc4afb90..4ecca8da9365c3 100644 --- a/packages/material-ui/src/Popover/Popover.js +++ b/packages/material-ui/src/Popover/Popover.js @@ -239,7 +239,8 @@ class Popover extends React.Component { 'Material-UI: you can not change the default `anchorOrigin.vertical` value ', 'when also providing the `getContentAnchorEl` property to the popover component.', 'Only use one of the two properties.', - 'Set `getContentAnchorEl` to null or leave `anchorOrigin.vertical` unchanged.', + 'Set `getContentAnchorEl` to `null | undefined`' + + ' or leave `anchorOrigin.vertical` unchanged.', ].join('\n'), ); }