diff --git a/package.json b/package.json index 0dca311f..2d62cb30 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ }, "dependencies": { "@babel/runtime": "^7.13.8", - "@popperjs/core": "^2.8.6", + "@popperjs/core": "^2.11.6", "@restart/hooks": "^0.4.7", "@types/warning": "^3.0.0", "dom-helpers": "^5.2.0", diff --git a/src/usePopper.ts b/src/usePopper.ts index 45f1eb5f..8807275a 100644 --- a/src/usePopper.ts +++ b/src/usePopper.ts @@ -15,8 +15,17 @@ const initialPopperStyles = ( const disabledApplyStylesModifier = { name: 'applyStyles', enabled: false }; +// In order to satisfy the current usage of options, including undefined +type OptionsWithUndefined< + T extends Popper.Obj | undefined +> = T extends Popper.Obj ? T : Popper.Obj; + // until docjs supports type exports... -export type Modifier = Popper.Modifier; +export type Modifier< + Name, + Options extends Popper.Obj | undefined +> = Popper.Modifier>; + export type Options = Popper.Options; export type Instance = Popper.Instance; export type Placement = Popper.Placement; diff --git a/yarn.lock b/yarn.lock index 36d9eb30..db2c99ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1535,10 +1535,10 @@ dependencies: mkdirp "^1.0.4" -"@popperjs/core@^2.8.6": - version "2.8.6" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.8.6.tgz#ad75ebe8dbecfa145af3c7e4d0ae98016458d005" - integrity sha512-1oXH2bAFXz9SttE1v/0Jp+2ZVePsPEAPGIuPKrmljWZcS3FPBEn2Q4WcANozZC0YiCjTWOF55k0g6rbSZS39ew== +"@popperjs/core@^2.11.6": + version "2.11.6" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" + integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== "@react-bootstrap/eslint-config@^1.3.2": version "1.3.2"