@gpa-gemstone/react-table 1.2.35 → 1.2.37

package/lib/AdjustableTable/AdjustableColumn.js

@@ -72,13 +72,13 @@ function AdjColumnHeaderWrapper(props) {
         props.setWidth(w, (_b = props.MinWidth) !== null && _b !== void 0 ? _b : 100);
     });
     var onClick = React.useCallback(function (e) {
-        props.onSort(props.Key, e, props.Field);
+        var _a;
+        if ((_a = props.AllowSort) !== null && _a !== void 0 ? _a : true)
+            props.onSort(props.Key, e, props.Field);
         e.stopPropagation();
-        console.log('onCLick th');
     }, [props.onSort]);
     var onClickBorder = React.useCallback(function (e) {
         props.startAdjustment(e);
-        console.log('onCLick border div');
     }, [props.startAdjustment]);
     return React.createElement("th", { ref: thref, style: style, onClick: onClick, onDrag: function (e) { e.stopPropagation(); } },
         React.createElement("div", { style: {

package/lib/AdjustableTable/AdjustableTable.d.ts

@@ -87,7 +87,7 @@ interface TableProps<T> {
      * @param data the item to be turned into a key
      * @returns a unique Key
      */
-    KeySelector: (data: T) => string | number;
+    KeySelector: (data: T, index?: number) => string | number;
     /**
      * Optional Element to display in the last row of the Table
      * use this for displaying warnings when the Table content gets cut off

package/lib/AdjustableTable/AdjustableTable.js

@@ -177,7 +177,7 @@ function Rows(props) {
             style.cursor = 'pointer';
         if (props.Selected !== undefined && props.Selected(d))
             style.backgroundColor = 'yellow';
-        var key = props.KeySelector(d);
+        var key = props.KeySelector(d, i);
         return React.createElement("tr", { key: key, style: __assign({ display: (props.FixedLayout ? 'block' : undefined) }, style) },
             React.Children.map(props.children, function (element) {
                 if (!React.isValidElement(element))

package/lib/AdjustableTable/Column.d.ts

@@ -30,6 +30,7 @@ export interface IColumnProps<T> {
         key: string;
         field: keyof T | undefined;
         index: number;
+        style?: React.CSSProperties;
     }) => React.ReactNode;
 }
 export default function Column<T>(props: React.PropsWithChildren<IColumnProps<T>>): JSX.Element;

package/lib/AdjustableTable/Column.js

@@ -71,11 +71,13 @@ function ColumnHeaderWrapper(props) {
         props.setWidth(w);
     });
     var onClick = React.useCallback(function (e) {
-        props.onSort(props.Key, e, props.Field);
-    }, [props.onSort]);
+        var _a;
+        if ((_a = props.AllowSort) !== null && _a !== void 0 ? _a : true)
+            props.onSort(props.Key, e, props.Field);
+    }, [props.onSort, props.AllowSort]);
     return React.createElement("th", { ref: thref, style: style, onClick: onClick, onDrag: function (e) { e.stopPropagation(); } },
-        props.sorted && props.asc ? React.createElement("div", { style: { position: 'absolute', width: 25 } }, gpa_symbols_1.SVGIcons.ArrowDropDown) : null,
-        props.sorted && !props.asc ? React.createElement("div", { style: { position: 'absolute', width: 25 } }, gpa_symbols_1.SVGIcons.ArrowDropUp) : null,
+        props.sorted && !props.asc ? React.createElement("div", { style: { position: 'absolute', width: 25 } }, gpa_symbols_1.SVGIcons.ArrowDropDown) : null,
+        props.sorted && props.asc ? React.createElement("div", { style: { position: 'absolute', width: 25 } }, gpa_symbols_1.SVGIcons.ArrowDropUp) : null,
         React.createElement("div", { style: {
                 marginLeft: (props.sorted ? 25 : 0),
             } }, (_b = props.children) !== null && _b !== void 0 ? _b : props.Key));
@@ -97,6 +99,7 @@ function ColumnDataWrapper(props) {
         item: props.item,
         key: props.Key,
         field: props.Field,
+        style: css,
         index: props.index
     }) : getFieldValue(); };
     var onClick = React.useCallback(function (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gpa-gemstone/react-table",
-  "version": "1.2.35",
+  "version": "1.2.37",
   "description": "Table for GPA web applications",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -42,7 +42,7 @@
     "typescript": "4.4.4"
   },
   "dependencies":   {
-    "@gpa-gemstone/gpa-symbols": "0.0.28",
+    "@gpa-gemstone/gpa-symbols": "0.0.29",
     "@gpa-gemstone/helper-functions": "0.0.27",
     "@types/lodash": "^4.14.171",
     "@types/react": "^17.0.14",