@gpa-gemstone/react-table 1.2.114 → 1.2.116

package/lib/ConfigurableTable/ConfigurableTable.js

@@ -131,7 +131,7 @@ function ConfigurableTable(props) {
         return isSortKey || isInLocal || isDefault;
     }
     return (React.createElement(React.Fragment, null,
-        React.createElement(Table_1.Table, Object.assign({}, props, { LastColumn: React.createElement("div", { style: { marginLeft: -5, marginBottom: 12, cursor: 'pointer' }, onMouseEnter: () => setHover(true), onMouseLeave: () => setHover(false), id: guid + '-tooltip', onClick: () => setShowSettings(true) },
+        React.createElement(Table_1.Table, Object.assign({}, props, { LastColumn: React.createElement("div", { style: { marginBottom: 12, cursor: 'pointer' }, onMouseEnter: () => setHover(true), onMouseLeave: () => setHover(false), id: guid + '-tooltip', onClick: () => setShowSettings(true) },
                 React.createElement(gpa_symbols_1.ReactIcons.Settings, null)), ReduceWidthCallback: handleReduceWidthCallback }), React.Children.map(props.children, (element) => {
             var _a, _b;
             if (!React.isValidElement(element))
@@ -189,16 +189,10 @@ function ColumnSelection(props) {
         return undefined;
     };
     return (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: "row" },
-            React.createElement("div", { className: "col-4" }, props.columns.map((c, i) => i % 3 == 0 ? (React.createElement(react_forms_1.CheckBox, { Label: c.Label, Field: 'Enabled', Record: c, Setter: () => props.onChange(c.Key), key: c.Key, Disabled: c.Key === props.sortKey ||
+        React.createElement("div", { className: "row" }, props.columns.map((c) => React.createElement("div", { className: "col-4", key: c.Key },
+            React.createElement(react_forms_1.CheckBox, { Label: c.Label, Field: 'Enabled', Record: c, Setter: () => props.onChange(c.Key), Disabled: c.Key === props.sortKey ||
                     (props.disableAdd && !c.Enabled) ||
-                    (isOnlyOneEnabled && c.Enabled), Help: helpMessage(c) })) : null)),
-            React.createElement("div", { className: "col-4" }, props.columns.map((c, i) => i % 3 == 1 ? (React.createElement(react_forms_1.CheckBox, { Label: c.Label, Field: 'Enabled', Record: c, Setter: () => props.onChange(c.Key), key: c.Key, Disabled: c.Key === props.sortKey ||
-                    (props.disableAdd && !c.Enabled) ||
-                    (isOnlyOneEnabled && c.Enabled), Help: helpMessage(c) })) : null)),
-            React.createElement("div", { className: "col-4" }, props.columns.map((c, i) => i % 3 == 2 ? (React.createElement(react_forms_1.CheckBox, { Label: c.Label, Field: 'Enabled', Record: c, Setter: () => props.onChange(c.Key), key: c.Key, Disabled: c.Key === props.sortKey ||
-                    (props.disableAdd && !c.Enabled) ||
-                    (isOnlyOneEnabled && c.Enabled), Help: helpMessage(c) })) : null))),
+                    (isOnlyOneEnabled && c.Enabled), Help: helpMessage(c) })))),
         props.disableAdd ?
             React.createElement(react_interactive_1.Alert, { Class: 'alert-primary', Style: { marginBottom: 0, marginTop: '0.5em' } }, "Additional columns disabled due to table size.")
             : null));

package/lib/GetConfigurableColumnsFromTypeEntries.d.ts

@@ -0,0 +1,2 @@
+import { Gemstone } from '@gpa-gemstone/application-typings';
+export declare const GetConfigurableColumnsFromTypeEntries: <T>(recordFields: Gemstone.TSX.Interfaces.IRecordFields<T>, timeFormat: string, configurable?: boolean) => (JSX.Element | null)[];

package/lib/GetConfigurableColumnsFromTypeEntries.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetConfigurableColumnsFromTypeEntries = void 0;
+//******************************************************************************************************
+//  GetConfigurableColumnsFromTypeEntries.tsx - Gbtc
+//
+//  Copyright (c) 2024, Grid Protection Alliance.  All Rights Reserved.
+//
+//  Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
+//  the NOTICE file distributed with this work for additional information regarding copyright ownership.
+//  The GPA may license this file to you under the MIT License (MIT), the "License"; you may not use this
+//  file except in compliance with the License. You may obtain a copy of the License at:
+//
+//      http://opensource.org/licenses/MIT
+//
+//  Unless agreed to in writing, the subject software distributed under the License is distributed on an
+//  "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
+//  License for the specific language governing permissions and limitations.
+//
+//  Code Modification History:
+//  ----------------------------------------------------------------------------------------------------
+//  08/26/2024 - Preston Crawford
+//       Generated original version of source code.
+//
+//******************************************************************************************************
+const React = require("react");
+const _ = require("lodash");
+const Column_1 = require("./Table/Column");
+const moment = require("moment");
+const gpa_symbols_1 = require("@gpa-gemstone/gpa-symbols");
+const ConfigurableColumn_1 = require("./ConfigurableTable/ConfigurableColumn");
+const getTypedEntries = (obj) => {
+    return Object.entries(obj);
+};
+const GetConfigurableColumnsFromTypeEntries = (recordFields, timeFormat, configurable = true) => {
+    return _.sortBy(getTypedEntries(recordFields), ([key, value]) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.Label) !== null && _a !== void 0 ? _a : key; })
+        .map(([key, value]) => {
+        var _a, _b, _c;
+        if (value == null)
+            return null;
+        if (configurable)
+            return (React.createElement(ConfigurableColumn_1.default, { key: key, Key: key, Label: (_a = value.Label) !== null && _a !== void 0 ? _a : key, Default: value.IsDefaultColumn },
+                React.createElement(Column_1.Column, { Key: key, AllowSort: value.AllowSort, Field: key, Content: ({ item }) => getContent(item, key, value, timeFormat) }, ((_b = value.Label) !== null && _b !== void 0 ? _b : key))));
+        return (React.createElement(Column_1.Column, { Key: key, AllowSort: value.AllowSort, Field: key, Content: ({ item }) => getContent(item, key, value, timeFormat) }, ((_c = value.Label) !== null && _c !== void 0 ? _c : key)));
+    });
+};
+exports.GetConfigurableColumnsFromTypeEntries = GetConfigurableColumnsFromTypeEntries;
+const getContent = (record, field, recordValue, timeFormat) => {
+    if (field === 'CreatedOn' || field == 'UpdatedOn')
+        return moment.utc(record[field]).format(timeFormat);
+    if (typeof record[field] === 'boolean')
+        return record[field] ? React.createElement(gpa_symbols_1.ReactIcons.CheckMark, { Color: 'green' }) : React.createElement(gpa_symbols_1.ReactIcons.CrossMark, { Color: 'red' });
+    if (recordValue.Content == null)
+        return record[field];
+    return recordValue.Content(record);
+};

package/lib/Table/Header.d.ts

@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { Search } from '@gpa-gemstone/react-interactive';
+export type width = {
+    width: number;
+    minWidth: number;
+    maxWidth?: number;
+};
+interface IProps<T> {
+    Class?: string;
+    Style?: React.CSSProperties;
+    SortKey: string;
+    Ascending: boolean;
+    OnSort: (data: {
+        colKey: string;
+        colField?: keyof T;
+        ascending: boolean;
+    }, event: React.MouseEvent<HTMLElement, MouseEvent>) => void;
+    ColWidths: React.MutableRefObject<Map<string, width>>;
+    TriggerRerender: () => void;
+    Trigger: number;
+    SetLastColumnWidth: (width: number) => void;
+    LastColumn?: string | React.ReactNode;
+    SetFilters?: (filters: Search.IFilter<T>[]) => void;
+    Filters?: Search.IFilter<T>[];
+}
+declare const Header: <T>(props: React.PropsWithChildren<IProps<T>>) => JSX.Element;
+export default Header;

package/lib/Table/Header.js

@@ -0,0 +1,226 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//  ******************************************************************************************************
+//  Header.tsx - Gbtc
+//
+//  Copyright © 2023, Grid Protection Alliance.  All Rights Reserved.
+//
+//  Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
+//  the NOTICE file distributed with this work for additional information regarding copyright ownership.
+//  The GPA licenses this file to you under the MIT License (MIT), the "License"; you may not use this
+//  file except in compliance with the License. You may obtain a copy of the License at:
+//
+//      http://opensource.org/licenses/MIT
+//
+//  Unless agreed to in writing, the subject software distributed under the License is distributed on an
+//  "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
+//  License for the specific language governing permissions and limitations.
+//
+//  Code Modification History:
+//  ----------------------------------------------------------------------------------------------------
+//  11/18/2023 - C. Lackner
+//       Generated original version of source code.
+//  05/31/2024 - C. Lackner
+//       Refactored to fix sizing issues.
+//  12/04/2024 - G. Santos
+//       Refactored to fix performance issues.
+//
+//  ******************************************************************************************************
+const React = require("react");
+const Column_1 = require("./Column");
+const helper_functions_1 = require("@gpa-gemstone/helper-functions");
+const FilterableColumn_1 = require("./FilterableColumn");
+const defaultHeadStyle = {
+    fontSize: 'auto',
+    tableLayout: 'fixed',
+    display: 'table',
+    width: '100%'
+};
+const defaultDataHeadStyle = {
+    display: 'inline-block',
+    position: 'relative',
+    borderTop: 'none',
+    width: 'auto'
+};
+const IsColumnProps = (props) => ((props === null || props === void 0 ? void 0 : props['Key']) != null);
+const IsColumnAdjustable = (props) => {
+    const propValue = props === null || props === void 0 ? void 0 : props['Adjustable'];
+    if (propValue === false || propValue === true)
+        return propValue;
+    return false;
+};
+const Header = (props) => {
+    var _a;
+    const headStyle = React.useMemo(() => (Object.assign(Object.assign({}, defaultHeadStyle), props.Style)), [props.Style]);
+    const lastColRef = React.useRef(null);
+    const { width: lastColWidth } = (0, helper_functions_1.useGetContainerPosition)(lastColRef);
+    // Consts for adjustable columns
+    const [mouseDown, setMouseDown] = React.useState(0);
+    const [currentKeys, setCurrentKeys] = React.useState(undefined);
+    const [deltaW, setDeltaW] = React.useState(0);
+    const [tentativeLimits, setTentativeLimits] = React.useState({ min: -Infinity, max: Infinity });
+    // Consts for filterable columns
+    const [filters, setFilters] = React.useState(((_a = props.Filters) !== null && _a !== void 0 ? _a : []));
+    const [guid] = React.useState((0, helper_functions_1.CreateGuid)());
+    const getLeftKey = React.useCallback((key, colWidthsRef) => {
+        // Filtering down to shown adjustables only
+        var _a, _b;
+        const mapCallback = (element) => {
+            var _a;
+            if (!React.isValidElement(element))
+                return null;
+            const keyWidth = (_a = colWidthsRef.current.get(key)) === null || _a === void 0 ? void 0 : _a.width;
+            if (keyWidth == null || keyWidth <= 0)
+                return null;
+            if (IsColumnProps(element.props) && IsColumnAdjustable(element.props))
+                return element.props.Key;
+            return null;
+        };
+        const children = (_a = props.children) !== null && _a !== void 0 ? _a : [];
+        const keys = ((_b = React.Children.map(children, mapCallback)) !== null && _b !== void 0 ? _b : []).filter((item) => item !== null);
+        const index = keys.indexOf(key);
+        if (index <= 0)
+            return undefined;
+        return keys[index - 1];
+    }, [props.children]);
+    const calculateDeltaLimits = React.useCallback((mapKeys, colWidthsRef) => {
+        if (mapKeys === undefined)
+            return ({ min: -Infinity, max: Infinity });
+        const widthObjLeft = colWidthsRef.current.get(mapKeys[0]);
+        const widthObjRight = colWidthsRef.current.get(mapKeys[1]);
+        if (widthObjLeft == null || widthObjRight == null)
+            return ({ min: -Infinity, max: Infinity });
+        const limitByShrinkLeft = widthObjLeft.width - widthObjLeft.minWidth;
+        const limitByGrowthLeft = widthObjLeft.maxWidth == null ? Number.MAX_SAFE_INTEGER : (widthObjLeft.maxWidth - widthObjLeft.width);
+        const limitByShrinkRight = widthObjRight.width - widthObjRight.minWidth;
+        const limitByGrowthRight = widthObjRight.maxWidth == null ? Number.MAX_SAFE_INTEGER : (widthObjRight.maxWidth - widthObjRight.width);
+        // Recall that a left movement is a negative deltaW
+        const minDeltaW = -(limitByShrinkLeft < limitByGrowthRight ? limitByShrinkLeft : limitByGrowthRight);
+        const maxDeltaW = limitByShrinkRight < limitByGrowthLeft ? limitByShrinkRight : limitByGrowthLeft;
+        return ({ min: minDeltaW, max: maxDeltaW });
+    }, []);
+    const getDeltaSign = React.useCallback((index) => {
+        // Recall that a left movement is a negative deltaW
+        if (index === 0)
+            return 1;
+        else if (index === 1)
+            return -1;
+        else
+            return 0;
+    }, []);
+    const finishAdjustment = React.useCallback((adjustment, adjustKeys, colWidthsRef) => {
+        const deltaLimits = calculateDeltaLimits(adjustKeys, colWidthsRef);
+        let delta;
+        if (adjustment > deltaLimits.max)
+            delta = deltaLimits.max;
+        else if (adjustment < deltaLimits.min)
+            delta = deltaLimits.min;
+        else
+            delta = adjustment;
+        if (Math.abs(delta) > 5) {
+            const leftWidthObj = colWidthsRef.current.get(adjustKeys[0]);
+            const rightWidthObj = colWidthsRef.current.get(adjustKeys[1]);
+            if (leftWidthObj == null || rightWidthObj == null) {
+                console.error(`Unable to finalize adjustment on keys ${adjustKeys[0]}, ${adjustKeys[1]}`);
+            }
+            else {
+                leftWidthObj.width += (getDeltaSign(0) * delta);
+                rightWidthObj.width += (getDeltaSign(1) * delta);
+            }
+        }
+        setMouseDown(0);
+        setTentativeLimits({ min: -Infinity, max: Infinity });
+        setCurrentKeys(undefined);
+        setDeltaW(0);
+    }, [calculateDeltaLimits, getDeltaSign]);
+    const onMove = React.useCallback((e) => {
+        if (currentKeys === undefined)
+            return;
+        const w = e.screenX - mouseDown;
+        setDeltaW(w);
+    }, [mouseDown, currentKeys]);
+    const updateFilters = React.useCallback((flts, fld) => {
+        setFilters((fls) => {
+            const newFilters = fls.filter(item => item.FieldName !== fld).concat(flts);
+            if (props.SetFilters == null)
+                console.error("Attempted to set filters from column when no set filter arguement to table was provided. Data has not been filtered!");
+            else
+                props.SetFilters(newFilters);
+            return newFilters;
+        });
+    }, [props.SetFilters]);
+    React.useEffect(() => { var _a; return setFilters((_a = props.Filters) !== null && _a !== void 0 ? _a : []); }, [props.Filters]);
+    React.useEffect(() => props.SetLastColumnWidth(lastColWidth), [lastColWidth, props.SetLastColumnWidth]);
+    return (React.createElement("thead", { className: props.Class, style: headStyle, onMouseMove: (e) => {
+            onMove(e.nativeEvent);
+            e.stopPropagation();
+        }, onMouseUp: (e) => {
+            e.stopPropagation();
+            if (currentKeys == null)
+                return;
+            finishAdjustment(deltaW, currentKeys, props.ColWidths);
+            props.TriggerRerender();
+        }, onMouseLeave: (e) => {
+            e.stopPropagation();
+            if (currentKeys == null)
+                return;
+            finishAdjustment(deltaW, currentKeys, props.ColWidths);
+            props.TriggerRerender();
+        } },
+        React.createElement("tr", { style: { width: '100%', display: 'table' } },
+            React.Children.map(props.children, (element) => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+                if (!React.isValidElement(element))
+                    return null;
+                if (!IsColumnProps(element.props))
+                    return null;
+                const colWidth = props.ColWidths.current.get(element.props.Key);
+                if (colWidth == null || colWidth.width === 0)
+                    return null;
+                // Handling temporary width changes due to being in mid-adjustments
+                let currentWidth = colWidth.width;
+                const keyIndex = (_a = currentKeys === null || currentKeys === void 0 ? void 0 : currentKeys.indexOf(element.props.Key)) !== null && _a !== void 0 ? _a : -1;
+                if (keyIndex > -1) {
+                    let delta;
+                    if (deltaW > tentativeLimits.max)
+                        delta = tentativeLimits.max;
+                    else if (deltaW < tentativeLimits.min)
+                        delta = tentativeLimits.min;
+                    else
+                        delta = deltaW;
+                    currentWidth += (getDeltaSign(keyIndex) * delta);
+                }
+                let cursor = undefined;
+                if (((_c = (_b = element.props) === null || _b === void 0 ? void 0 : _b.HeaderStyle) === null || _c === void 0 ? void 0 : _c.cursor) != null)
+                    cursor = element.props.HeaderStyle.cursor;
+                else if (((_e = (_d = element.props) === null || _d === void 0 ? void 0 : _d.AllowSort) !== null && _e !== void 0 ? _e : true))
+                    cursor = 'pointer';
+                const style = Object.assign(Object.assign(Object.assign({}, defaultDataHeadStyle), (_f = element.props) === null || _f === void 0 ? void 0 : _f.HeaderStyle), { width: currentWidth, cursor: cursor });
+                let startAdjustment;
+                if (IsColumnAdjustable(element.props))
+                    startAdjustment = (e) => {
+                        const leftKey = getLeftKey(element.props.Key, props.ColWidths);
+                        if (leftKey != null) {
+                            const newCurrentKeys = [leftKey, element.props.Key];
+                            setCurrentKeys(newCurrentKeys);
+                            setMouseDown(e.screenX);
+                            setTentativeLimits(calculateDeltaLimits(newCurrentKeys, props.ColWidths));
+                            setDeltaW(0);
+                        }
+                    };
+                return (React.createElement(Column_1.ColumnHeaderWrapper, { onSort: (e) => {
+                        var _a;
+                        return props.OnSort({ colKey: element.props.Key, colField: (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field, ascending: props.Ascending }, e);
+                    }, sorted: props.SortKey === element.props.Key && ((_h = (_g = element.props) === null || _g === void 0 ? void 0 : _g.AllowSort) !== null && _h !== void 0 ? _h : true), asc: props.Ascending, colKey: element.props.Key, key: element.props.Key, allowSort: (_j = element.props) === null || _j === void 0 ? void 0 : _j.AllowSort, startAdjustment: startAdjustment, style: style },
+                    ' ',
+                    (element.type === FilterableColumn_1.default) ?
+                        React.createElement(FilterableColumn_1.FilterableColumnHeader, { Label: (_k = element.props) === null || _k === void 0 ? void 0 : _k.children, Filter: filters.filter(f => { var _a, _b; return f.FieldName === ((_b = (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field) === null || _b === void 0 ? void 0 : _b.toString()); }), SetFilter: (f) => { var _a; return updateFilters(f, (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field); }, Field: (_l = element.props) === null || _l === void 0 ? void 0 : _l.Field, Type: (_m = element.props) === null || _m === void 0 ? void 0 : _m.Type, Options: (_o = element.props) === null || _o === void 0 ? void 0 : _o.Enum, ExpandedLabel: (_p = element.props) === null || _p === void 0 ? void 0 : _p.ExpandedLabel, Guid: guid, Unit: (_q = element.props) === null || _q === void 0 ? void 0 : _q.Unit }) :
+                        ((_r = element.props.children) !== null && _r !== void 0 ? _r : element.props.Key),
+                    ' '));
+            }),
+            props.LastColumn !== undefined ?
+                React.createElement("th", { style: { width: lastColWidth, padding: 0, maxWidth: lastColWidth } },
+                    React.createElement("div", { ref: lastColRef, style: { width: 'max-content' } }, props.LastColumn))
+                : null)));
+};
+exports.default = Header;

package/lib/Table/Rows.d.ts

@@ -0,0 +1,35 @@
+import * as React from 'react';
+export type width = {
+    width: number;
+    minWidth: number;
+    maxWidth?: number;
+};
+interface IProps<T> {
+    Data: T[];
+    RowStyle?: React.CSSProperties;
+    BodyStyle?: React.CSSProperties;
+    BodyClass?: string;
+    OnClick?: (data: {
+        colKey?: string;
+        colField?: keyof T;
+        row: T;
+        data: T[keyof T] | null;
+        index: number;
+    }, e: React.MouseEvent<HTMLElement, MouseEvent>) => void;
+    DragStart?: (data: {
+        colKey: string;
+        colField?: keyof T;
+        row: T;
+        data: T[keyof T] | null;
+        index: number;
+    }, e: React.DragEvent<Element>) => void;
+    Selected?: (data: T, index: number) => boolean;
+    KeySelector: (data: T, index?: number) => string | number;
+    BodyRef?: React.MutableRefObject<HTMLTableSectionElement | null>;
+    BodyScrolled: boolean;
+    ColWidths: React.MutableRefObject<Map<string, width>>;
+    Trigger: number;
+}
+declare const Rows: <T>(props: React.PropsWithChildren<IProps<T>>) => JSX.Element;
+export declare const IsColumnProps: (props: unknown) => boolean;
+export default Rows;

package/lib/Table/Rows.js

@@ -0,0 +1,113 @@
+"use strict";
+//  ******************************************************************************************************
+//  Rows.tsx - Gbtc
+//
+//  Copyright © 2023, Grid Protection Alliance.  All Rights Reserved.
+//
+//  Licensed to the Grid Protection Alliance (GPA) under one or more contributor license agreements. See
+//  the NOTICE file distributed with this work for additional information regarding copyright ownership.
+//  The GPA licenses this file to you under the MIT License (MIT), the "License"; you may not use this
+//  file except in compliance with the License. You may obtain a copy of the License at:
+//
+//      http://opensource.org/licenses/MIT
+//
+//  Unless agreed to in writing, the subject software distributed under the License is distributed on an
+//  "AS-IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Refer to the
+//  License for the specific language governing permissions and limitations.
+//
+//  Code Modification History:
+//  ----------------------------------------------------------------------------------------------------
+//  11/18/2023 - C. Lackner
+//       Generated original version of source code.
+//  05/31/2024 - C. Lackner
+//       Refactored to fix sizing issues.
+//  12/04/2024 - G. Santos
+//       Refactored to fix performance issues.
+//
+//  ******************************************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IsColumnProps = void 0;
+const React = require("react");
+const Column_1 = require("./Column");
+const defaultDataCellStyle = {
+    overflowX: 'hidden',
+    display: 'inline-block',
+    width: 'auto'
+};
+const Rows = (props) => {
+    const bodyStyle = React.useMemo(() => (Object.assign(Object.assign({}, props.BodyStyle), { display: "block" })), [props.BodyStyle]);
+    const onClick = React.useCallback((e, item, index) => {
+        if (props.OnClick !== undefined)
+            props.OnClick({
+                colKey: undefined,
+                colField: undefined,
+                row: item,
+                data: null,
+                index: index,
+            }, e);
+    }, [props.OnClick]);
+    return (React.createElement("tbody", { style: bodyStyle, className: props.BodyClass, ref: props.BodyRef }, props.Data.map((d, i) => {
+        const style = props.RowStyle !== undefined ? Object.assign({}, props.RowStyle) : {};
+        if (style.cursor === undefined && (props.OnClick !== undefined || props.DragStart !== undefined))
+            style.cursor = 'pointer';
+        if (props.Selected !== undefined && props.Selected(d, i))
+            style.backgroundColor = 'var(--warning)';
+        const key = props.KeySelector(d, i);
+        return (React.createElement("tr", { key: key, style: style, onClick: (e) => onClick(e, d, i) }, React.Children.map(props.children, (element) => {
+            var _a, _b, _c, _d, _e, _f;
+            if (!React.isValidElement(element))
+                return null;
+            if (!(0, exports.IsColumnProps)(element.props))
+                return null;
+            const colWidth = props.ColWidths.current.get(element.props.Key);
+            if (colWidth == null || colWidth.width === 0)
+                return null;
+            let cursor = undefined;
+            if (((_b = (_a = element.props) === null || _a === void 0 ? void 0 : _a.RowStyle) === null || _b === void 0 ? void 0 : _b.cursor) != null)
+                cursor = element.props.RowStyle.cursor;
+            else if ((props === null || props === void 0 ? void 0 : props.OnClick) != null) {
+                cursor = 'pointer';
+            }
+            else if ((props === null || props === void 0 ? void 0 : props.DragStart) != null)
+                cursor = 'grab';
+            const style = Object.assign(Object.assign(Object.assign({}, defaultDataCellStyle), ((_c = element.props) === null || _c === void 0 ? void 0 : _c.RowStyle)), { width: colWidth.width, cursor: cursor });
+            return (React.createElement(Column_1.ColumnDataWrapper, { key: element.key, onClick: (e) => {
+                    var _a, _b;
+                    if (props.OnClick == null)
+                        return;
+                    return props.OnClick({
+                        colKey: element.props.Key,
+                        colField: (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field,
+                        row: d,
+                        data: d[(_b = element.props) === null || _b === void 0 ? void 0 : _b.Field],
+                        index: i,
+                    }, e);
+                }, dragStart: props.DragStart == null ? undefined :
+                    (e) => {
+                        var _a, _b;
+                        if (props.DragStart == null)
+                            return;
+                        return props.DragStart({
+                            colKey: element.props.Key,
+                            colField: (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field,
+                            row: d,
+                            data: d[(_b = element.props) === null || _b === void 0 ? void 0 : _b.Field],
+                            index: i,
+                        }, e);
+                    }, style: style }, ((_d = element.props) === null || _d === void 0 ? void 0 : _d.Content) != null
+                ? element.props.Content({
+                    item: d,
+                    key: element.props.Key,
+                    field: (_e = element.props) === null || _e === void 0 ? void 0 : _e.Field,
+                    style: style,
+                    index: i,
+                })
+                : ((_f = element.props) === null || _f === void 0 ? void 0 : _f.Field) != null
+                    ? d[element.props.Field]
+                    : null));
+        })));
+    })));
+};
+const IsColumnProps = (props) => ((props === null || props === void 0 ? void 0 : props['Key']) != null);
+exports.IsColumnProps = IsColumnProps;
+exports.default = Rows;

package/lib/Table/Table.js

@@ -28,10 +28,9 @@ exports.Table = Table;
 //
 //  ******************************************************************************************************
 const React = require("react");
-const _ = require("lodash");
-const Column_1 = require("./Column");
 const helper_functions_1 = require("@gpa-gemstone/helper-functions");
-const FilterableColumn_1 = require("./FilterableColumn");
+const Rows_1 = require("./Rows");
+const Header_1 = require("./Header");
 const defaultTableStyle = {
     padding: 0,
     flex: 1,
@@ -58,29 +57,11 @@ const defaultRowStyle = {
     tableLayout: 'fixed',
     width: '100%'
 };
-const defaultDataHeadStyle = {
-    display: 'inline-block',
-    position: 'relative',
-    borderTop: 'none',
-    width: 'auto'
-};
-const defaultDataCellStyle = {
-    overflowX: 'hidden',
-    display: 'inline-block',
-    width: 'auto'
-};
-const IsColumnProps = (props) => ((props === null || props === void 0 ? void 0 : props['Key']) != null);
-const IsColumnAdjustable = (props) => {
-    const propValue = props === null || props === void 0 ? void 0 : props['Adjustable'];
-    if (propValue === false || propValue === true)
-        return propValue;
-    return false;
-};
-const lastColumnWidth = 17;
 function Table(props) {
     const bodyRef = React.useRef(null);
     const colWidthsRef = React.useRef(new Map());
     const oldWidthRef = React.useRef(0);
+    const [lastColumnWidth, setLastColumnWidth] = React.useState(0);
     const [currentTableWidth, setCurrentTableWidth] = React.useState(0);
     const [scrolled, setScrolled] = React.useState(false);
     const [trigger, setTrigger] = React.useState(0);
@@ -117,7 +98,7 @@ function Table(props) {
         // Construct base map
         const newMap = new Map();
         React.Children.forEach(props.children, (element) => {
-            if (React.isValidElement(element) && IsColumnProps(element.props)) {
+            if (React.isValidElement(element) && (0, Rows_1.IsColumnProps)(element.props)) {
                 if (newMap.get(element.props.Key) != null)
                     console.error("Multiple of the same key detected in table, this will cause issues.");
                 newMap.set(element.props.Key, { minWidth: 10, maxWidth: undefined, width: 100 });
@@ -137,7 +118,7 @@ function Table(props) {
             const autoKeys = [];
             const measureKeys = [];
             React.Children.forEach(props.children, (element) => {
-                if (React.isValidElement(element) && IsColumnProps(element.props)) {
+                if (React.isValidElement(element) && (0, Rows_1.IsColumnProps)(element.props)) {
                     let widthValue = getWidthfromProps(element.props, type);
                     if (type === 'width' && widthValue == null)
                         widthValue = 'auto';
@@ -219,26 +200,26 @@ function Table(props) {
         oldWidthRef.current = currentTableWidth;
         setTrigger(c => c + 1);
     }, [props.children, currentTableWidth]);
-    const setTableWidth = React.useCallback(_.debounce(() => {
-        var _a, _b, _c, _d;
-        if (bodyRef.current == null)
-            return;
-        // Note: certain body classes may break this check if they set overflow to scroll
-        let newScroll = false;
-        const dims = (_a = bodyRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(); //use getBoundClientRect() to get un rounded values
-        if (((_b = props.TbodyStyle) === null || _b === void 0 ? void 0 : _b.overflowY) === 'scroll' || ((_c = props.TbodyStyle) === null || _c === void 0 ? void 0 : _c.overflow) === 'scroll')
-            newScroll = true;
-        else
-            newScroll = (dims === null || dims === void 0 ? void 0 : dims.height) < bodyRef.current.scrollHeight;
-        setScrolled(newScroll);
-        // Pick whichever is larger so we dont double subtract
-        const scrollbar = newScroll ? (0, helper_functions_1.GetScrollbarWidth)() : 0;
-        const last = props.LastColumn !== undefined ? lastColumnWidth : 0;
-        const spacer = Math.max(scrollbar, last);
-        setCurrentTableWidth(((_d = dims.width) !== null && _d !== void 0 ? _d : 17) - spacer);
-    }, 100), []);
     React.useEffect(() => {
         let resizeObserver;
+        const setTableWidth = () => {
+            var _a, _b, _c, _d;
+            if (bodyRef.current == null)
+                return;
+            // Note: certain body classes may break this check if they set overflow to scroll
+            let newScroll = false;
+            const dims = (_a = bodyRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(); //use getBoundClientRect() to get un rounded values
+            if (((_b = props.TbodyStyle) === null || _b === void 0 ? void 0 : _b.overflowY) === 'scroll' || ((_c = props.TbodyStyle) === null || _c === void 0 ? void 0 : _c.overflow) === 'scroll')
+                newScroll = true;
+            else
+                newScroll = (dims === null || dims === void 0 ? void 0 : dims.height) < bodyRef.current.scrollHeight;
+            setScrolled(newScroll);
+            // Pick whichever is larger so we dont double subtract
+            const scrollbar = newScroll ? (0, helper_functions_1.GetScrollbarWidth)() : 0;
+            const last = props.LastColumn !== undefined ? lastColumnWidth : 0;
+            const spacer = Math.max(scrollbar, last);
+            setCurrentTableWidth(((_d = dims.width) !== null && _d !== void 0 ? _d : 17) - spacer);
+        };
         const intervalHandle = setInterval(() => {
             if ((bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) == null)
                 return;
@@ -253,258 +234,14 @@ function Table(props) {
             if (resizeObserver != null && resizeObserver.disconnect != null)
                 resizeObserver.disconnect();
         };
-    }, []);
+    }, [lastColumnWidth]);
     const handleSort = React.useCallback((data, event) => {
         if (data.colKey !== null)
             props.OnSort(data, event);
     }, [props.OnSort]);
     return (React.createElement("table", { className: props.TableClass !== undefined ? props.TableClass : 'table table-hover', style: tableStyle },
-        React.createElement(Header, { Class: props.TheadClass, Style: headStyle, SortKey: props.SortKey, Ascending: props.Ascending, LastColumn: props.LastColumn, OnSort: handleSort, ColWidths: colWidthsRef, SetFilters: props.SetFilters, Filters: props.Filters, Trigger: trigger, TriggerRerender: () => setTrigger(c => c + 1) }, props.children),
-        React.createElement(Rows, { DragStart: props.OnDragStart, Data: props.Data, RowStyle: rowStyle, BodyStyle: bodyStyle, BodyClass: props.TbodyClass, OnClick: props.OnClick, Selected: props.Selected, KeySelector: props.KeySelector, BodyRef: bodyRef, BodyScrolled: scrolled, ColWidths: colWidthsRef, Trigger: trigger }, props.children),
+        React.createElement(Header_1.default, { Class: props.TheadClass, Style: headStyle, SortKey: props.SortKey, Ascending: props.Ascending, LastColumn: props.LastColumn, OnSort: handleSort, ColWidths: colWidthsRef, SetFilters: props.SetFilters, Filters: props.Filters, Trigger: trigger, TriggerRerender: () => setTrigger(c => c + 1), SetLastColumnWidth: setLastColumnWidth }, props.children),
+        React.createElement(Rows_1.default, { DragStart: props.OnDragStart, Data: props.Data, RowStyle: rowStyle, BodyStyle: bodyStyle, BodyClass: props.TbodyClass, OnClick: props.OnClick, Selected: props.Selected, KeySelector: props.KeySelector, BodyRef: bodyRef, BodyScrolled: scrolled, ColWidths: colWidthsRef, Trigger: trigger }, props.children),
         props.LastRow !== undefined ? (React.createElement("tfoot", { style: props.TfootStyle, className: props.TfootClass },
             React.createElement("tr", { style: props.RowStyle !== undefined ? Object.assign({}, props.RowStyle) : {} }, props.LastRow))) : null));
 }
-function Rows(props) {
-    const bodyStyle = React.useMemo(() => (Object.assign(Object.assign({}, props.BodyStyle), { display: "block" })), [props.BodyStyle]);
-    const onClick = React.useCallback((e, item, index) => {
-        if (props.OnClick !== undefined)
-            props.OnClick({
-                colKey: undefined,
-                colField: undefined,
-                row: item,
-                data: null,
-                index: index,
-            }, e);
-    }, [props.OnClick]);
-    return (React.createElement("tbody", { style: bodyStyle, className: props.BodyClass, ref: props.BodyRef }, props.Data.map((d, i) => {
-        const style = props.RowStyle !== undefined ? Object.assign({}, props.RowStyle) : {};
-        if (style.cursor === undefined && (props.OnClick !== undefined || props.DragStart !== undefined))
-            style.cursor = 'pointer';
-        if (props.Selected !== undefined && props.Selected(d, i))
-            style.backgroundColor = 'var(--warning)';
-        const key = props.KeySelector(d, i);
-        return (React.createElement("tr", { key: key, style: style, onClick: (e) => onClick(e, d, i) }, React.Children.map(props.children, (element) => {
-            var _a, _b, _c, _d, _e, _f;
-            if (!React.isValidElement(element))
-                return null;
-            if (!IsColumnProps(element.props))
-                return null;
-            const colWidth = props.ColWidths.current.get(element.props.Key);
-            if (colWidth == null || colWidth.width === 0)
-                return null;
-            let cursor = undefined;
-            if (((_b = (_a = element.props) === null || _a === void 0 ? void 0 : _a.RowStyle) === null || _b === void 0 ? void 0 : _b.cursor) != null)
-                cursor = element.props.RowStyle.cursor;
-            else if ((props === null || props === void 0 ? void 0 : props.OnClick) != null) {
-                cursor = 'pointer';
-            }
-            else if ((props === null || props === void 0 ? void 0 : props.DragStart) != null)
-                cursor = 'grab';
-            const style = Object.assign(Object.assign(Object.assign({}, defaultDataCellStyle), ((_c = element.props) === null || _c === void 0 ? void 0 : _c.RowStyle)), { width: colWidth.width, cursor: cursor });
-            return (React.createElement(Column_1.ColumnDataWrapper, { key: element.key, onClick: (e) => {
-                    var _a, _b;
-                    if (props.OnClick == null)
-                        return;
-                    return props.OnClick({
-                        colKey: element.props.Key,
-                        colField: (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field,
-                        row: d,
-                        data: d[(_b = element.props) === null || _b === void 0 ? void 0 : _b.Field],
-                        index: i,
-                    }, e);
-                }, dragStart: props.DragStart == null ? undefined :
-                    (e) => {
-                        var _a, _b;
-                        if (props.DragStart == null)
-                            return;
-                        return props.DragStart({
-                            colKey: element.props.Key,
-                            colField: (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field,
-                            row: d,
-                            data: d[(_b = element.props) === null || _b === void 0 ? void 0 : _b.Field],
-                            index: i,
-                        }, e);
-                    }, style: style }, ((_d = element.props) === null || _d === void 0 ? void 0 : _d.Content) != null
-                ? element.props.Content({
-                    item: d,
-                    key: element.props.Key,
-                    field: (_e = element.props) === null || _e === void 0 ? void 0 : _e.Field,
-                    style: style,
-                    index: i,
-                })
-                : ((_f = element.props) === null || _f === void 0 ? void 0 : _f.Field) != null
-                    ? d[element.props.Field]
-                    : null));
-        })));
-    })));
-}
-function Header(props) {
-    var _a;
-    const headStyle = React.useMemo(() => (Object.assign(Object.assign({}, defaultHeadStyle), props.Style)), [props.Style]);
-    // Consts for adjustable columns
-    const [mouseDown, setMouseDown] = React.useState(0);
-    const [currentKeys, setCurrentKeys] = React.useState(undefined);
-    const [deltaW, setDeltaW] = React.useState(0);
-    const [tentativeLimits, setTentativeLimits] = React.useState({ min: -Infinity, max: Infinity });
-    // Consts for filterable columns
-    const [filters, setFilters] = React.useState(((_a = props.Filters) !== null && _a !== void 0 ? _a : []));
-    const [guid] = React.useState((0, helper_functions_1.CreateGuid)());
-    const getLeftKey = React.useCallback((key, colWidthsRef) => {
-        // Filtering down to shown adjustables only
-        var _a, _b;
-        const mapCallback = (element) => {
-            var _a;
-            if (!React.isValidElement(element))
-                return null;
-            const keyWidth = (_a = colWidthsRef.current.get(key)) === null || _a === void 0 ? void 0 : _a.width;
-            if (keyWidth == null || keyWidth <= 0)
-                return null;
-            if (IsColumnProps(element.props) && IsColumnAdjustable(element.props))
-                return element.props.Key;
-            return null;
-        };
-        const children = (_a = props.children) !== null && _a !== void 0 ? _a : [];
-        const keys = ((_b = React.Children.map(children, mapCallback)) !== null && _b !== void 0 ? _b : []).filter((item) => item !== null);
-        const index = keys.indexOf(key);
-        if (index <= 0)
-            return undefined;
-        return keys[index - 1];
-    }, [props.children]);
-    const calculateDeltaLimits = React.useCallback((mapKeys, colWidthsRef) => {
-        if (mapKeys === undefined)
-            return ({ min: -Infinity, max: Infinity });
-        const widthObjLeft = colWidthsRef.current.get(mapKeys[0]);
-        const widthObjRight = colWidthsRef.current.get(mapKeys[1]);
-        if (widthObjLeft == null || widthObjRight == null)
-            return ({ min: -Infinity, max: Infinity });
-        const limitByShrinkLeft = widthObjLeft.width - widthObjLeft.minWidth;
-        const limitByGrowthLeft = widthObjLeft.maxWidth == null ? Number.MAX_SAFE_INTEGER : (widthObjLeft.maxWidth - widthObjLeft.width);
-        const limitByShrinkRight = widthObjRight.width - widthObjRight.minWidth;
-        const limitByGrowthRight = widthObjRight.maxWidth == null ? Number.MAX_SAFE_INTEGER : (widthObjRight.maxWidth - widthObjRight.width);
-        // Recall that a left movement is a negative deltaW
-        const minDeltaW = -(limitByShrinkLeft < limitByGrowthRight ? limitByShrinkLeft : limitByGrowthRight);
-        const maxDeltaW = limitByShrinkRight < limitByGrowthLeft ? limitByShrinkRight : limitByGrowthLeft;
-        return ({ min: minDeltaW, max: maxDeltaW });
-    }, []);
-    const getDeltaSign = React.useCallback((index) => {
-        // Recall that a left movement is a negative deltaW
-        if (index === 0)
-            return 1;
-        else if (index === 1)
-            return -1;
-        else
-            return 0;
-    }, []);
-    const finishAdjustment = React.useCallback((adjustment, adjustKeys, colWidthsRef) => {
-        const deltaLimits = calculateDeltaLimits(adjustKeys, colWidthsRef);
-        let delta;
-        if (adjustment > deltaLimits.max)
-            delta = deltaLimits.max;
-        else if (adjustment < deltaLimits.min)
-            delta = deltaLimits.min;
-        else
-            delta = adjustment;
-        if (Math.abs(delta) > 5) {
-            const leftWidthObj = colWidthsRef.current.get(adjustKeys[0]);
-            const rightWidthObj = colWidthsRef.current.get(adjustKeys[1]);
-            if (leftWidthObj == null || rightWidthObj == null) {
-                console.error(`Unable to finalize adjustment on keys ${adjustKeys[0]}, ${adjustKeys[1]}`);
-            }
-            else {
-                leftWidthObj.width += (getDeltaSign(0) * delta);
-                rightWidthObj.width += (getDeltaSign(1) * delta);
-            }
-        }
-        setMouseDown(0);
-        setTentativeLimits({ min: -Infinity, max: Infinity });
-        setCurrentKeys(undefined);
-        setDeltaW(0);
-    }, [calculateDeltaLimits, getDeltaSign]);
-    const onMove = React.useCallback((e) => {
-        if (currentKeys === undefined)
-            return;
-        const w = e.screenX - mouseDown;
-        setDeltaW(w);
-    }, [mouseDown, currentKeys]);
-    const updateFilters = React.useCallback((flts, fld) => {
-        setFilters((fls) => {
-            const newFilters = fls.filter(item => item.FieldName !== fld).concat(flts);
-            if (props.SetFilters == null)
-                console.error("Attempted to set filters from column when no set filter arguement to table was provided. Data has not been filtered!");
-            else
-                props.SetFilters(newFilters);
-            return newFilters;
-        });
-    }, [props.SetFilters]);
-    React.useEffect(() => { var _a; return setFilters((_a = props.Filters) !== null && _a !== void 0 ? _a : []); }, [props.Filters]);
-    return (React.createElement("thead", { className: props.Class, style: headStyle, onMouseMove: (e) => {
-            onMove(e.nativeEvent);
-            e.stopPropagation();
-        }, onMouseUp: (e) => {
-            e.stopPropagation();
-            if (currentKeys == null)
-                return;
-            finishAdjustment(deltaW, currentKeys, props.ColWidths);
-            props.TriggerRerender();
-        }, onMouseLeave: (e) => {
-            e.stopPropagation();
-            if (currentKeys == null)
-                return;
-            finishAdjustment(deltaW, currentKeys, props.ColWidths);
-            props.TriggerRerender();
-        } },
-        React.createElement("tr", { style: { width: '100%', display: 'table' } },
-            React.Children.map(props.children, (element) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-                if (!React.isValidElement(element))
-                    return null;
-                if (!IsColumnProps(element.props))
-                    return null;
-                const colWidth = props.ColWidths.current.get(element.props.Key);
-                if (colWidth == null || colWidth.width === 0)
-                    return null;
-                // Handling temporary width changes due to being in mid-adjustments
-                let currentWidth = colWidth.width;
-                const keyIndex = (_a = currentKeys === null || currentKeys === void 0 ? void 0 : currentKeys.indexOf(element.props.Key)) !== null && _a !== void 0 ? _a : -1;
-                if (keyIndex > -1) {
-                    let delta;
-                    if (deltaW > tentativeLimits.max)
-                        delta = tentativeLimits.max;
-                    else if (deltaW < tentativeLimits.min)
-                        delta = tentativeLimits.min;
-                    else
-                        delta = deltaW;
-                    currentWidth += (getDeltaSign(keyIndex) * delta);
-                }
-                let cursor = undefined;
-                if (((_c = (_b = element.props) === null || _b === void 0 ? void 0 : _b.HeaderStyle) === null || _c === void 0 ? void 0 : _c.cursor) != null)
-                    cursor = element.props.HeaderStyle.cursor;
-                else if (((_e = (_d = element.props) === null || _d === void 0 ? void 0 : _d.AllowSort) !== null && _e !== void 0 ? _e : true))
-                    cursor = 'pointer';
-                const style = Object.assign(Object.assign(Object.assign({}, defaultDataHeadStyle), (_f = element.props) === null || _f === void 0 ? void 0 : _f.HeaderStyle), { width: currentWidth, cursor: cursor });
-                let startAdjustment;
-                if (IsColumnAdjustable(element.props))
-                    startAdjustment = (e) => {
-                        const leftKey = getLeftKey(element.props.Key, props.ColWidths);
-                        if (leftKey != null) {
-                            const newCurrentKeys = [leftKey, element.props.Key];
-                            setCurrentKeys(newCurrentKeys);
-                            setMouseDown(e.screenX);
-                            setTentativeLimits(calculateDeltaLimits(newCurrentKeys, props.ColWidths));
-                            setDeltaW(0);
-                        }
-                    };
-                return (React.createElement(Column_1.ColumnHeaderWrapper, { onSort: (e) => {
-                        var _a;
-                        return props.OnSort({ colKey: element.props.Key, colField: (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field, ascending: props.Ascending }, e);
-                    }, sorted: props.SortKey === element.props.Key && ((_h = (_g = element.props) === null || _g === void 0 ? void 0 : _g.AllowSort) !== null && _h !== void 0 ? _h : true), asc: props.Ascending, colKey: element.props.Key, key: element.props.Key, allowSort: (_j = element.props) === null || _j === void 0 ? void 0 : _j.AllowSort, startAdjustment: startAdjustment, style: style },
-                    ' ',
-                    (element.type === FilterableColumn_1.default) ?
-                        React.createElement(FilterableColumn_1.FilterableColumnHeader, { Label: (_k = element.props) === null || _k === void 0 ? void 0 : _k.children, Filter: filters.filter(f => { var _a, _b; return f.FieldName === ((_b = (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field) === null || _b === void 0 ? void 0 : _b.toString()); }), SetFilter: (f) => { var _a; return updateFilters(f, (_a = element.props) === null || _a === void 0 ? void 0 : _a.Field); }, Field: (_l = element.props) === null || _l === void 0 ? void 0 : _l.Field, Type: (_m = element.props) === null || _m === void 0 ? void 0 : _m.Type, Options: (_o = element.props) === null || _o === void 0 ? void 0 : _o.Enum, ExpandedLabel: (_p = element.props) === null || _p === void 0 ? void 0 : _p.ExpandedLabel, Guid: guid, Unit: (_q = element.props) === null || _q === void 0 ? void 0 : _q.Unit }) :
-                        ((_r = element.props.children) !== null && _r !== void 0 ? _r : element.props.Key),
-                    ' '));
-            }),
-            props.LastColumn !== undefined ?
-                React.createElement("th", { style: { width: lastColumnWidth, padding: 0, maxWidth: lastColumnWidth } }, props.LastColumn)
-                : null)));
-}

package/lib/index.d.ts

@@ -5,4 +5,5 @@ import { Column } from './Table/Column';
 import FilterableColumn from './Table/FilterableColumn';
 import ConfigurableTable from './ConfigurableTable/ConfigurableTable';
 import ConfigurableColumn from './ConfigurableTable/ConfigurableColumn';
-export { ReactTableProps, Table, Column, FilterableColumn, ConfigurableTable, ConfigurableColumn, Paging };
+import { GetConfigurableColumnsFromTypeEntries } from './GetConfigurableColumnsFromTypeEntries';
+export { ReactTableProps, Table, Column, FilterableColumn, ConfigurableTable, ConfigurableColumn, Paging, GetConfigurableColumnsFromTypeEntries };

package/lib/index.js

@@ -24,7 +24,7 @@
 //
 //  ******************************************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Paging = exports.ConfigurableColumn = exports.ConfigurableTable = exports.FilterableColumn = exports.Column = exports.Table = exports.ReactTableProps = void 0;
+exports.GetConfigurableColumnsFromTypeEntries = exports.Paging = exports.ConfigurableColumn = exports.ConfigurableTable = exports.FilterableColumn = exports.Column = exports.Table = exports.ReactTableProps = void 0;
 const Paging_1 = require("./Paging");
 exports.Paging = Paging_1.default;
 const ReactTableProps = require("./Table/Types");
@@ -39,3 +39,5 @@ const ConfigurableTable_1 = require("./ConfigurableTable/ConfigurableTable");
 exports.ConfigurableTable = ConfigurableTable_1.default;
 const ConfigurableColumn_1 = require("./ConfigurableTable/ConfigurableColumn");
 exports.ConfigurableColumn = ConfigurableColumn_1.default;
+const GetConfigurableColumnsFromTypeEntries_1 = require("./GetConfigurableColumnsFromTypeEntries");
+Object.defineProperty(exports, "GetConfigurableColumnsFromTypeEntries", { enumerable: true, get: function () { return GetConfigurableColumnsFromTypeEntries_1.GetConfigurableColumnsFromTypeEntries; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gpa-gemstone/react-table",
-  "version": "1.2.114",
+  "version": "1.2.116",
   "description": "Table for GPA web applications",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -45,9 +45,9 @@
     "typescript": "5.5.3"
   },
   "dependencies":   {
-    "@gpa-gemstone/gpa-symbols": "0.0.62",
-    "@gpa-gemstone/helper-functions": "0.0.60",
-    "@gpa-gemstone/react-interactive": "1.0.190",
+    "@gpa-gemstone/gpa-symbols": "0.0.64",
+    "@gpa-gemstone/helper-functions": "0.0.61",
+    "@gpa-gemstone/react-interactive": "1.0.192",
     "lodash": "^4.17.21",
     "react-portal": "4.2.2"
   },