@onehat/ui 0.3.9 → 0.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",

package/src/Components/Grid/Grid.js

@@ -799,7 +799,7 @@ function GridComponent(props) {
 	let listFooterComponent = null;
 	if (!disableBottomToolbar) {
 		if (Repository && bottomToolbar === 'pagination' && !disablePagination && Repository.isPaginated) {
-			listFooterComponent = <PaginationToolbar Repository={Repository} toolbarItems={footerToolbarItemComponents} />;
+			listFooterComponent = <PaginationToolbar Repository={Repository} toolbarItems={footerToolbarItemComponents} disablePageSize={!disableAdjustingPageSizeToHeight} />;
 		} else if (footerToolbarItemComponents.length) {
 			listFooterComponent = <Toolbar>{footerToolbarItemComponents}</Toolbar>;
 		}

package/src/Components/Toolbar/Pagination.js

@@ -17,6 +17,7 @@ import PageSizeCombo from '../Form/Field/Combo/PageSizeCombo.js';
 export default function Pagination(props) {
 	const {
 			minimize = false,
+			disablePageSize = false,
 	
 			// withData
 			Repository,
@@ -116,7 +117,7 @@ export default function Pagination(props) {
 						/>);
 		}
 
-		if (!minimize) {
+		if (!minimize && !disablePageSize) {
 			items.push(<PageSizeCombo key="pageSize" pageSize={pageSize} Repository={Repository} />);
 		}
 

package/src/Components/Toolbar/PaginationToolbar.js

@@ -9,6 +9,7 @@ import _ from 'lodash';
 export default function PaginationToolbar(props) {
 	const {
 			toolbarItems = [],
+			disablePageSize = false,
 		} = props,
 		[minimize, setMinimize] = useState(false),
 		propsToPass = _.omit(props, 'toolbarItems'),
@@ -48,7 +49,7 @@ export default function PaginationToolbar(props) {
 				w="100%"
 				onLayout={(e) => onLayout(e)}
 			>
-				{showPagination && <Pagination {...propsToPass} w={toolbarItems.length ? null : '100%'} minimize={minimize} />}
+				{showPagination && <Pagination {...propsToPass} w={toolbarItems.length ? null : '100%'} minimize={minimize} disablePageSize={disablePageSize} />}
 				{toolbarItems.length ? <Row flex={1} {...toolbarProps}>{toolbarItems}</Row> : null}
 			</Toolbar>;
 };