Merge branch 'master' of https://github.com/5app/base5-ui

5app · May 29, 2020 · b6c85f1 · b6c85f1
2 parents 2fbde07 + 16ebc85
commit b6c85f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [9.2.2](https://github.com/5app/base5-ui/compare/v9.2.1...v9.2.2) (2020-05-27)
+
+
+### Bug Fixes
+
+* pass props through InnerBodyScrollLock component ([#88](https://github.com/5app/base5-ui/issues/88)) ([7461459](https://github.com/5app/base5-ui/commit/7461459587d6f7909f2b2e489893ef4e8e0566c5))
+
+## [9.2.1](https://github.com/5app/base5-ui/compare/v9.2.0...v9.2.1) (2020-05-27)
+
+
+### Bug Fixes
+
+* **Modal:** Add demo link to readme, noissue ([3285f48](https://github.com/5app/base5-ui/commit/3285f48b04ba4ccfe56c84fb1d67dbd04f6373c5))
+
 # [9.2.0](https://github.com/5app/base5-ui/compare/v9.1.2...v9.2.0) (2020-05-27)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "base5-ui",
-	"version": "9.2.0",
+	"version": "9.2.2",
 	"description": "5app's reusable UI component library",
 	"main": "index.js",
 	"scripts": {

diff --git a/src/Modal/BodyScrollLock.js b/src/Modal/BodyScrollLock.js
@@ -35,7 +35,7 @@ function useScrollLockStyles({isLocked}) {
 }
 
 function InnerBodyScrollLock(props, ref) {
-	const {as: Component = 'div', children, style} = props;
+	const {as: Component = 'div', children, style, ...otherProps} = props;
 	const modalStack = useContext(ModalStackContext);
 	const hasModal = modalStack?.length;
 	const bodyLockStyles = useScrollLockStyles({isLocked: hasModal});
@@ -44,6 +44,7 @@ function InnerBodyScrollLock(props, ref) {
 		<Component
 			ref={ref}
 			style={style ? {...style, ...bodyLockStyles} : bodyLockStyles}
+			{...otherProps}
 		>
 			{children}
 		</Component>