@onehat/ui 0.3.331 → 0.3.333

package/package.json

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

package/src/Components/Grid/ColumnSelectorWindow.js

@@ -70,18 +70,20 @@ export default function ColumnSelectorWindow(props) {
 						{
 							header: 'Show',
 							fieldName: 'is_shown',
-							sortable: false,
+							isSortable: false,
 							isEditable: false,
-							reorderable: false,
-							resizable: false,
+							isReorderable: false,
+							isResizable: false,
 							w: '50px',
 							renderer: (datum) => {
 								const
 									[ix, header] = datum,
 									columnConfig = localColumnsConfig.current[ix],
-									isHidden = columnConfig.isHidden;
+									isHidden = columnConfig.isHidden,
+									isHidable = columnConfig.isHidable;
 								return <CheckboxButton
 											isChecked={!isHidden}
+											isDisabled={!isHidable}
 											onPress={() => {
 												if (isHidden) {
 													onShowColumn(ix);
@@ -95,10 +97,10 @@ export default function ColumnSelectorWindow(props) {
 						{
 							header: 'Column',
 							fieldName: 1, // ix
-							sortable: false,
+							isSortable: false,
 							isEditable: false,
-							reorderable: false,
-							resizable: false,
+							isReorderable: false,
+							isResizable: false,
 							flex: 3,
 						}
 					]}

package/src/Components/Grid/Grid.js

@@ -14,9 +14,6 @@ import {
 	SELECTION_MODE_SINGLE,
 	SELECTION_MODE_MULTI,
 } from '../../Constants/Selection.js';
-import {
-	v4 as uuid,
-} from 'uuid';
 import {
 	DROP_POSITION_BEFORE,
 	DROP_POSITION_AFTER,
@@ -92,6 +89,7 @@ function GridComponent(props) {
 
 			columnsConfig = [], // json configurations for each column
 			columnProps = {},
+			defaultHiddenColumns = [],
 			getRowProps = (item) => {
 				return {
 					borderBottomWidth: 1,
@@ -836,10 +834,11 @@ function GridComponent(props) {
 						const
 							defaults = {
 								isEditable: false,
-								reorderable: true,
-								resizable: true,
-								sortable: true,
-								isHidden: false,
+								isReorderable: true,
+								isResizable: true,
+								isSortable: true,
+								isHidden: inArray(columnConfig.id, defaultHiddenColumns),
+								isHidable: true,
 								isOver: false,
 							},
 							config = _.assign({}, defaults, columnConfig);

package/src/Components/Grid/GridHeaderRow.js

@@ -147,7 +147,7 @@ export default function GridHeaderRow(props) {
 			});
 
 			// Verify index can actually be used
-			if (typeof localColumnsConfig[newIx] === 'undefined' || !localColumnsConfig[newIx].reorderable) {
+			if (typeof localColumnsConfig[newIx] === 'undefined' || !localColumnsConfig[newIx].isReorderable) {
 				return;
 			}
 
@@ -222,7 +222,7 @@ export default function GridHeaderRow(props) {
 			});
 
 			// Verify index can actually be used
-			if (typeof localColumnsConfig[newIx] === 'undefined' || !localColumnsConfig[newIx].reorderable) {
+			if (typeof localColumnsConfig[newIx] === 'undefined' || !localColumnsConfig[newIx].isReorderable) {
 				return;
 			}
 
@@ -296,17 +296,17 @@ export default function GridHeaderRow(props) {
 					let {
 							fieldName,
 							header = _.upperFirst(fieldName),
-							reorderable,
-							resizable,
-							sortable,
+							isReorderable: configIsReorderable,
+							isResizable: configIsResizable,
+							isSortable,
 							w,
 							flex,
 							isOver = false,
 							isHidden = false,
 						} = config,
-						isSorter = sortable && canColumnsSort && sortField === fieldName,
-						isReorderable = canColumnsReorder && reorderable,
-						isResizable = canColumnsResize && resizable,
+						isSorter = isSortable && canColumnsSort && sortField === fieldName,
+						isReorderable = canColumnsReorder && configIsReorderable,
+						isResizable = canColumnsResize && configIsResizable,
 						propsToPass = {
 							borderRightWidth: 2,
 							borderRightColor: '#fff',
@@ -351,7 +351,7 @@ export default function GridHeaderRow(props) {
 									if (isBlocked.current) { // withDraggable initiates block
 										return;
 									}
-									if (sortable && canColumnsSort) {
+									if (isSortable && canColumnsSort) {
 										onSort(config, e);
 									}
 								}}

package/src/Components/Grid/GridRow.js

@@ -85,9 +85,9 @@ function GridRow(props) {
 								'editor',
 								'format',
 								'renderer',
-								'reorderable',
-								'resizable',
-								'sortable',
+								'isReorderable',
+								'isResizable',
+								'isSortable',
 								'w',
 								'flex',
 								'isOver',