@adaptabletools/adaptable 16.2.4 → 17.0.0-canary.1

package/src/View/Components/RangesComponent.js

@@ -1,21 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RangesComponent = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const ColorPicker_1 = require("../../components/ColorPicker");
-const clamp_1 = tslib_1.__importDefault(require("lodash/clamp"));
-const CheckBox_1 = require("../../components/CheckBox");
-const FormLayout_1 = tslib_1.__importStar(require("../../components/FormLayout"));
-const NumberInput_1 = require("../../components/Input/NumberInput");
-const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
-const UIHelper_1 = require("../UIHelper");
-const ColumnSelector_1 = require("./Selectors/ColumnSelector");
-const Enums_1 = require("../../PredefinedConfig/Common/Enums");
-const Tabs_1 = require("../../components/Tabs");
-const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
-class RangesComponent extends React.Component {
+import * as React from 'react';
+import { Box, Flex, Text } from 'rebass';
+import { ColorPicker } from '../../components/ColorPicker';
+import clamp from 'lodash/clamp';
+import { CheckBox } from '../../components/CheckBox';
+import FormLayout, { FormRow } from '../../components/FormLayout';
+import { NumberInput } from '../../components/Input/NumberInput';
+import SimpleButton from '../../components/SimpleButton';
+import { getHexForName, GRAY, DARK_GREEN } from '../UIHelper';
+import { ColumnSelector } from './Selectors/ColumnSelector';
+import { Tabs } from '../../components/Tabs';
+import Radio from '../../components/Radio';
+export class RangesComponent extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -49,63 +44,67 @@ class RangesComponent extends React.Component {
             : undefined;
         const isRangeValueTypeNumber = ((_a = this.props.rangeValueType) !== null && _a !== void 0 ? _a : 'Number') === 'Number';
         return (React.createElement(React.Fragment, null,
-            React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                React.createElement(CheckBox_1.CheckBox, { marginTop: 3, checked: this.state.rangesType == 'ColumnComparison', onChange: (checked) => this.onRangesTypeChanged(checked) }, "Use a Column Comparison")),
-            this.state.rangesType == 'Standard' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, marginTop: 2 },
-                React.createElement(Tabs_1.Tabs.Tab, null, "Ranges"),
-                React.createElement(Tabs_1.Tabs.Content, null,
-                    React.createElement(rebass_1.Flex, { alignItems: "center", mb: 2 },
-                        React.createElement(rebass_1.Text, { mr: 3 }, "Range Type"),
-                        React.createElement(Radio_1.default, { onChange: () => this.handleRangeValueTypeChange('Number'), checked: isRangeValueTypeNumber, mr: 2 }, "Number"),
-                        React.createElement(Radio_1.default, { onChange: () => this.handleRangeValueTypeChange('Percentage'), checked: !isRangeValueTypeNumber }, "Percentage")), (_b = this.props.ranges) === null || _b === void 0 ? void 0 :
-                    _b.map((range, index, list) => (React.createElement(rebass_1.Flex, { key: index, alignItems: "end", mb: 2, "data-name": "percent-bar-range" },
-                        React.createElement(rebass_1.Flex, { flexDirection: "column" },
-                            isRangeValueTypeNumber && index === 0 && (React.createElement(CheckBox_1.CheckBox, { onClick: () => this.setRangeColMin(range), checked: range.Min === 'Col-Min', mt: 0, mb: 1, fontSize: 3, disabled: this.props.disabled }, "Col Min")),
-                            React.createElement(NumberInput_1.NumberInput, { disabled: this.props.disabled ||
+            React.createElement(Flex, { flexDirection: "row" },
+                React.createElement(CheckBox, { marginTop: 3, checked: this.state.rangesType == 'ColumnComparison', onChange: (checked) => this.onRangesTypeChanged(checked) }, "Use a Column Comparison")),
+            this.state.rangesType == 'Standard' && (React.createElement(Tabs, { autoFocus: false, marginTop: 2 },
+                React.createElement(Tabs.Tab, null, "Ranges"),
+                React.createElement(Tabs.Content, null,
+                    React.createElement(Flex, { alignItems: "center", mb: 2 },
+                        React.createElement(Text, { mr: 3 }, "Range Type"),
+                        React.createElement(Radio, { onChange: () => this.handleRangeValueTypeChange('Number'), checked: isRangeValueTypeNumber, mr: 2 }, "Number"),
+                        React.createElement(Radio, { onChange: () => this.handleRangeValueTypeChange('Percentage'), checked: !isRangeValueTypeNumber }, "Percentage")), (_b = this.props.ranges) === null || _b === void 0 ? void 0 :
+                    _b.map((range, index, list) => (React.createElement(Flex, { key: index, alignItems: "end", mb: 2, "data-name": "percent-bar-range" },
+                        React.createElement(Flex, { flexDirection: "column" },
+                            isRangeValueTypeNumber && index === 0 && (React.createElement(CheckBox, { onClick: () => this.setRangeColMin(range), checked: range.Min === 'Col-Min', mt: 0, mb: 1, fontSize: 3, disabled: this.props.disabled }, "Col Min")),
+                            React.createElement(NumberInput, { disabled: this.props.disabled ||
                                     range.Min === 'Col-Min' ||
                                     (index === 0 && !isRangeValueTypeNumber), value: range.Min, onChange: (value) => {
                                     this.changeRangeMin(index, value);
                                 }, mr: 2 })),
-                        React.createElement(rebass_1.Flex, { flexDirection: "column" },
-                            isRangeValueTypeNumber && index === list.length - 1 && (React.createElement(CheckBox_1.CheckBox, { mt: 0, mb: 1, onClick: () => this.setRangeColMax(range), checked: range.Max === 'Col-Max', fontSize: 3, disabled: this.props.disabled }, "Col Max")),
-                            React.createElement(NumberInput_1.NumberInput, { value: range.Max, disabled: this.props.disabled ||
+                        React.createElement(Flex, { flexDirection: "column" },
+                            isRangeValueTypeNumber && index === list.length - 1 && (React.createElement(CheckBox, { mt: 0, mb: 1, onClick: () => this.setRangeColMax(range), checked: range.Max === 'Col-Max', fontSize: 3, disabled: this.props.disabled }, "Col Max")),
+                            React.createElement(NumberInput, { value: range.Max, disabled: this.props.disabled ||
                                     range.Max === 'Col-Max' ||
                                     (index === list.length - 1 && !isRangeValueTypeNumber), onChange: (value) => {
                                     this.changeRangeMax(index, value);
                                 }, mr: 2 })),
-                        React.createElement(rebass_1.Flex, { alignItems: "center", height: "100%" },
-                            React.createElement(ColorPicker_1.ColorPicker, { api: this.props.api, value: range.Color, onChange: (color) => {
+                        React.createElement(Flex, { alignItems: "center", height: "100%" },
+                            React.createElement(ColorPicker, { api: this.props.api, value: range.Color, onChange: (color) => {
                                     this.changeRangeColor(index, color);
                                 }, mr: 2, height: 33 })),
-                        this.props.showRangeDirection && (React.createElement(CheckBox_1.CheckBox, { disabled: this.props.disabled, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked), ml: 2 }, "Reverse Gradient")),
-                        React.createElement(SimpleButton_1.default, { ml: 2, mb: 1, icon: "delete", disabled: this.props.disabled || (this.props.ranges && this.props.ranges.length == 1), onClick: () => this.removeRange(index) })))),
+                        this.props.showRangeDirection && (React.createElement(CheckBox, { disabled: this.props.disabled, checked: range.ReverseGradient && range.ReverseGradient == true, onChange: (checked) => this.changeRangeDirectionUp(index, checked), ml: 2 }, "Reverse Gradient")),
+                        React.createElement(SimpleButton, { ml: 2, mb: 1, icon: "delete", disabled: this.props.disabled || (this.props.ranges && this.props.ranges.length == 1), onClick: () => this.removeRange(index) })))),
                     React.createElement("div", null,
-                        React.createElement(SimpleButton_1.default, { disabled: this.props.disabled, variant: "raised", "data-name": "add", onClick: () => this.addRange() }, "Add New Range"))))),
-            this.state.rangesType == 'ColumnComparison' && (React.createElement(Tabs_1.Tabs, { autoFocus: false, marginTop: 2 },
-                React.createElement(Tabs_1.Tabs.Tab, null, "Column Comparison"),
-                React.createElement(Tabs_1.Tabs.Content, null,
-                    React.createElement(rebass_1.Flex, { flexDirection: "column", key: 'cc', "data-name": "percent-bar-column-comparison" },
-                        React.createElement(rebass_1.Text, { padding: 2, fontSize: 2 },
+                        React.createElement(SimpleButton, { disabled: this.props.disabled, variant: "raised", "data-name": "add", onClick: () => this.addRange() }, "Add New Range"))))),
+            this.state.rangesType == 'ColumnComparison' && (React.createElement(Tabs, { autoFocus: false, marginTop: 2 },
+                React.createElement(Tabs.Tab, null, "Column Comparison"),
+                React.createElement(Tabs.Content, null,
+                    React.createElement(Flex, { flexDirection: "column", key: 'cc', "data-name": "percent-bar-column-comparison" },
+                        React.createElement(Text, { padding: 2, fontSize: 2 },
                             "Create Minimum and Maximum Values by providing a value or selecting another Column, and choose a",
                             ' ',
                             this.props.api.internalApi.getCorrectEnglishVariant('Colour'),
                             " for the Bar."),
-                        React.createElement(FormLayout_1.default, { columns: ['label', 'first', 'or', 'second'], sizes: ['auto', 'auto', 'auto', '1fr'] },
-                            React.createElement(FormLayout_1.FormRow, { label: "Min Value:", first: React.createElement(NumberInput_1.NumberInput, { disabled: this.props.disabled, type: "number", value: comparisonMinValueNumber, onChange: (value) => {
+                        React.createElement(FormLayout, { columns: ['label', 'first', 'or', 'second'], sizes: ['auto', 'auto', 'auto', '1fr'] },
+                            React.createElement(FormRow, { label: "Min Value:", first: React.createElement(NumberInput, { disabled: this.props.disabled, type: "number", value: comparisonMinValueNumber, onChange: (value) => {
                                         this.changeColumnComparisonMinValue(value);
-                                    } }), or: "OR", second: React.createElement(ColumnSelector_1.ColumnSelector, { disabled: this.props.disabled, style: { maxWidth: '15rem' }, SelectedColumnIds: [comparisonMinValueColumnId], ColumnList: this.props.api.columnApi.getNumericColumns(), onColumnChange: (columns) => this.onMinColumnSelectedChanged(columns), SelectionMode: Enums_1.SelectionMode.Single }) }),
+                                    } }), or: "OR", second: React.createElement(Box, { maxWidth: '15rem' },
+                                    React.createElement(ColumnSelector, { menuPosition: "fixed", disabled: this.props.disabled, value: comparisonMinValueColumnId, type: "Number", onChange: (columnId) => {
+                                            this.onMinColumnSelectedChanged(columnId);
+                                        } })) }),
                             ' ',
-                            React.createElement(FormLayout_1.FormRow, { label: "Max Value:", first: React.createElement(NumberInput_1.NumberInput, { disabled: this.props.disabled, type: "number", value: comparisonMaxValueNumber, onChange: (value) => {
+                            React.createElement(FormRow, { label: "Max Value:", first: React.createElement(NumberInput, { disabled: this.props.disabled, type: "number", value: comparisonMaxValueNumber, onChange: (value) => {
                                         this.changeColumnComparisonMaxValue(value);
-                                    } }), or: "OR", second: React.createElement(ColumnSelector_1.ColumnSelector, { disabled: this.props.disabled, style: { maxWidth: '15rem' }, SelectedColumnIds: [comparisonMaxValueColumnId], ColumnList: this.props.api.columnApi.getNumericColumns(), onColumnChange: (columns) => this.onMaxColumnSelectedChanged(columns), SelectionMode: Enums_1.SelectionMode.Single }) }),
-                            React.createElement(FormLayout_1.FormRow, { label: `Bar ${this.props.api.internalApi.getCorrectEnglishVariant('Colour')}`, first: React.createElement(ColorPicker_1.ColorPicker, { disabled: this.props.disabled, api: this.props.api, value: comparisonColor, onChange: (color) => {
+                                    } }), or: "OR", second: React.createElement(Box, { maxWidth: '15rem' },
+                                    React.createElement(ColumnSelector, { menuPosition: "fixed", disabled: this.props.disabled, value: comparisonMaxValueColumnId, type: "Number", onChange: (columnId) => this.onMaxColumnSelectedChanged(columnId) })) }),
+                            React.createElement(FormRow, { label: `Bar ${this.props.api.internalApi.getCorrectEnglishVariant('Colour')}`, first: React.createElement(ColorPicker, { disabled: this.props.disabled, api: this.props.api, value: comparisonColor, onChange: (color) => {
                                         this.changeColumnComparisonColor(color);
                                     } }) }))))))));
     }
     onRangesTypeChanged(checked) {
         if (checked) {
             let columnComparison = {
-                Color: (0, UIHelper_1.getHexForName)(UIHelper_1.DARK_GREEN),
+                Color: getHexForName(DARK_GREEN),
                 MinValue: undefined,
                 MaxValue: undefined,
             };
@@ -129,7 +128,7 @@ class RangesComponent extends React.Component {
         const { ranges } = this.props;
         let newMin = Number(value);
         if (this.props.rangeValueType === 'Percentage') {
-            newMin = (0, clamp_1.default)(newMin, 0, 100);
+            newMin = clamp(newMin, 0, 100);
         }
         ranges[index].Min = newMin;
         if (ranges[index - 1]) {
@@ -141,7 +140,7 @@ class RangesComponent extends React.Component {
         const { ranges } = this.props;
         let newMax = Number(value);
         if (this.props.rangeValueType === 'Percentage') {
-            newMax = (0, clamp_1.default)(newMax, 0, 100);
+            newMax = clamp(newMax, 0, 100);
         }
         ranges[index].Max = newMax;
         if (ranges[index + 1]) {
@@ -202,7 +201,7 @@ class RangesComponent extends React.Component {
         const newRange = {
             Min,
             Max: lastRange.Max,
-            Color: (0, UIHelper_1.getHexForName)(UIHelper_1.GRAY),
+            Color: getHexForName(GRAY),
         };
         const newRanges = [...this.props.ranges.slice(0, -1), previousRange, newRange];
         this.props.updateRanges(newRanges);
@@ -212,9 +211,9 @@ class RangesComponent extends React.Component {
         columnComparison.MinValue = value;
         this.props.updateColumnComparison(columnComparison);
     }
-    onMinColumnSelectedChanged(columns) {
+    onMinColumnSelectedChanged(columnId) {
         const { columnComparison } = this.props;
-        columnComparison.MinValue = columns.length > 0 ? columns[0].columnId : undefined;
+        columnComparison.MinValue = columnId || undefined;
         this.props.updateColumnComparison(columnComparison);
     }
     changeColumnComparisonMaxValue(value) {
@@ -222,9 +221,9 @@ class RangesComponent extends React.Component {
         columnComparison.MaxValue = value;
         this.props.updateColumnComparison(columnComparison);
     }
-    onMaxColumnSelectedChanged(columns) {
+    onMaxColumnSelectedChanged(columnId) {
         const { columnComparison } = this.props;
-        columnComparison.MaxValue = columns.length > 0 ? columns[0].columnId : undefined;
+        columnComparison.MaxValue = columnId || undefined;
         this.props.updateColumnComparison(columnComparison);
     }
     changeColumnComparisonColor(value) {
@@ -233,4 +232,3 @@ class RangesComponent extends React.Component {
         this.props.updateColumnComparison(columnComparison);
     }
 }
-exports.RangesComponent = RangesComponent;

package/src/View/Components/ScopeComponent.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScopeComponent = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const rebass_1 = require("rebass");
-const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
-const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
-const Radio_1 = tslib_1.__importDefault(require("../../components/Radio"));
-const DualListBoxEditor_1 = require("./ListBox/DualListBoxEditor");
-const CheckBox_1 = require("../../components/CheckBox");
-class ScopeComponent extends React.Component {
+import * as React from 'react';
+import { Flex, Box } from 'rebass';
+import Panel from '../../components/Panel';
+import HelpBlock from '../../components/HelpBlock';
+import Radio from '../../components/Radio';
+import { DualListBoxEditor } from './ListBox/DualListBoxEditor';
+import { CheckBox } from '../../components/CheckBox';
+export class ScopeComponent extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -27,36 +23,36 @@ class ScopeComponent extends React.Component {
             ? this.props.displayMessage
             : 'Apply Scope for: Row, or one or more Columns, or one or more Data Types';
         return (React.createElement("div", { "data-name": 'scope-component' },
-            React.createElement(Panel_1.default, { header: "Scope", margin: 2, className: "ab-ScopeComponent" },
-                React.createElement(rebass_1.Flex, { flexDirection: "column", "data-name": "scope-block" },
-                    React.createElement(HelpBlock_1.default, { marginBottom: 1 }, displayMessage),
+            React.createElement(Panel, { header: "Scope", margin: 2, className: "ab-ScopeComponent" },
+                React.createElement(Flex, { flexDirection: "column", "data-name": "scope-block" },
+                    React.createElement(HelpBlock, { marginBottom: 1 }, displayMessage),
                     ' ',
-                    React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "center", padding: 2 },
-                        React.createElement(Radio_1.default, { value: "Row", checked: this.state.ScopeChoice == 'All', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "All Columns"),
+                    React.createElement(Flex, { flexDirection: "row", alignItems: "center", padding: 2 },
+                        React.createElement(Radio, { value: "Row", checked: this.state.ScopeChoice == 'All', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "All Columns"),
                         ' ',
-                        React.createElement(Radio_1.default, { marginLeft: 3, value: "Column", checked: this.state.ScopeChoice == 'Column', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "Selected Column(s)"),
+                        React.createElement(Radio, { marginLeft: 3, value: "Column", checked: this.state.ScopeChoice == 'Column', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "Selected Column(s)"),
                         ' ',
-                        React.createElement(Radio_1.default, { marginLeft: 3, value: "DataType", checked: this.state.ScopeChoice == 'DataType', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "DataType(s)")),
-                    this.state.ScopeChoice == 'Column' && (React.createElement(rebass_1.Box, { marginBottom: 2, "data-name": "column-scope" },
-                        React.createElement(DualListBoxEditor_1.DualListBoxEditor, { style: { flex: 1, overflow: 'hidden', height: '250px' }, AvailableValues: availableValues, SelectedValues: this.state.selectedColumnValues, HeaderAvailable: "Columns", HeaderSelected: "Columns In Style", onChange: (SelectedValues) => this.onColumnsSelectedChanged(SelectedValues) }))),
-                    this.state.ScopeChoice == 'DataType' && (React.createElement(Panel_1.default, { "data-name": "datatype-scope", variant: "modern" },
-                        React.createElement(rebass_1.Flex, { flexDirection: "row" },
-                            this.state.availableDataTypes.includes('Date') && (React.createElement(CheckBox_1.CheckBox, { "data-name": "scope", "data-value": "date", checked: this.state.componentScope &&
+                        React.createElement(Radio, { marginLeft: 3, value: "DataType", checked: this.state.ScopeChoice == 'DataType', onChange: (checked, e) => this.onScopeSelectChanged(e) }, "DataType(s)")),
+                    this.state.ScopeChoice == 'Column' && (React.createElement(Box, { marginBottom: 2, "data-name": "column-scope" },
+                        React.createElement(DualListBoxEditor, { style: { flex: 1, overflow: 'hidden', height: '250px' }, AvailableValues: availableValues, SelectedValues: this.state.selectedColumnValues, HeaderAvailable: "Columns", HeaderSelected: "Columns In Style", onChange: (SelectedValues) => this.onColumnsSelectedChanged(SelectedValues) }))),
+                    this.state.ScopeChoice == 'DataType' && (React.createElement(Panel, { "data-name": "datatype-scope", variant: "modern" },
+                        React.createElement(Flex, { flexDirection: "row" },
+                            this.state.availableDataTypes.includes('Date') && (React.createElement(CheckBox, { "data-name": "scope", "data-value": "date", checked: this.state.componentScope &&
                                     'DataTypes' in this.state.componentScope &&
                                     this.props.api.scopeApi
                                         .getDataTypesInScope(this.state.componentScope)
                                         .includes('Date'), marginLeft: 2, onChange: (checked) => this.onCheckBoxDataTypeChecked(checked, 'Date') }, "Date")),
-                            this.state.availableDataTypes.includes('Number') && (React.createElement(CheckBox_1.CheckBox, { "data-name": "scope", "data-value": "number", checked: this.state.componentScope &&
+                            this.state.availableDataTypes.includes('Number') && (React.createElement(CheckBox, { "data-name": "scope", "data-value": "number", checked: this.state.componentScope &&
                                     'DataTypes' in this.state.componentScope &&
                                     this.props.api.scopeApi
                                         .getDataTypesInScope(this.state.componentScope)
                                         .includes('Number'), marginLeft: 4, onChange: (checked) => this.onCheckBoxDataTypeChecked(checked, 'Number') }, "Number")),
-                            this.state.availableDataTypes.includes('String') && (React.createElement(CheckBox_1.CheckBox, { "data-name": "scope", "data-value": "string", checked: this.state.componentScope &&
+                            this.state.availableDataTypes.includes('String') && (React.createElement(CheckBox, { "data-name": "scope", "data-value": "string", checked: this.state.componentScope &&
                                     'DataTypes' in this.state.componentScope &&
                                     this.props.api.scopeApi
                                         .getDataTypesInScope(this.state.componentScope)
                                         .includes('String'), marginLeft: 4, onChange: (checked) => this.onCheckBoxDataTypeChecked(checked, 'String') }, "String")),
-                            this.state.availableDataTypes.includes('Boolean') && (React.createElement(CheckBox_1.CheckBox, { "data-name": "scope", "data-value": "boolean", checked: this.state.componentScope &&
+                            this.state.availableDataTypes.includes('Boolean') && (React.createElement(CheckBox, { "data-name": "scope", "data-value": "boolean", checked: this.state.componentScope &&
                                     'DataTypes' in this.state.componentScope &&
                                     this.props.api.scopeApi
                                         .getDataTypesInScope(this.state.componentScope)
@@ -135,4 +131,3 @@ class ScopeComponent extends React.Component {
         this.props.updateScope(newScope);
     }
 }
-exports.ScopeComponent = ScopeComponent;

package/src/View/Components/Selectors/ColumnSelector.d.ts

@@ -1,18 +1,13 @@
-import * as React from 'react';
-import { SelectionMode } from '../../../PredefinedConfig/Common/Enums';
-import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
-export interface ColumnSelectorProps extends React.HTMLProps<ColumnSelector> {
-    ColumnList: AdaptableColumn[];
-    SelectedColumnIds: string[];
-    onColumnChange: (SelectedColumns: AdaptableColumn[]) => void;
-    SelectionMode: SelectionMode;
-    className?: string;
-    placeHolder?: string;
-    showClearButton?: boolean;
+/// <reference types="react" />
+import { SelectProps } from '../../../components/Select';
+import { AdaptableColumn } from '../../../types';
+export type ColumnSelectorProps<IsMulti extends boolean = false> = {
+    type?: AdaptableColumn['dataType'];
+    isMulti?: IsMulti;
     disabled?: boolean;
-}
-export declare class ColumnSelector extends React.Component<ColumnSelectorProps, {}> {
-    render(): JSX.Element;
-    onClearButton(): void;
-    onColumnChange(selected: AdaptableColumn[], isEmptySelection: boolean): void;
-}
+    menuPosition?: SelectProps<any>['menuPosition'];
+    filterColumn?: (column: AdaptableColumn) => boolean;
+    value?: IsMulti extends true ? string[] : string;
+    onChange: (column: IsMulti extends true ? string[] : string) => void;
+};
+export declare const ColumnSelector: <IsMulti extends boolean = false>(props: ColumnSelectorProps<IsMulti>) => JSX.Element;

package/src/View/Components/Selectors/ColumnSelector.js

@@ -1,51 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ColumnSelector = void 0;
-const tslib_1 = require("tslib");
-const React = tslib_1.__importStar(require("react"));
-const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
-const Enums_1 = require("../../../PredefinedConfig/Common/Enums");
-const ArrayExtensions_1 = require("../../../Utilities/Extensions/ArrayExtensions");
-const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
-class ColumnSelector extends React.Component {
-    render() {
+import * as React from 'react';
+import { Select } from '../../../components/Select';
+import { useAdaptable } from '../../AdaptableContext';
+export const ColumnSelector = function (props) {
+    const { api } = useAdaptable();
+    const columns = React.useMemo(() => {
+        return api.columnApi.getColumnsOfType(props.type);
+    }, []);
+    const getColumn = (columnId) => columns.find((c) => c.columnId === columnId);
+    const options = columns
+        .map((column) => {
         var _a;
-        const sortedColumns = ArrayExtensions_1.ArrayExtensions.sortArrayWithProperty(Enums_1.SortOrder.Asc, this.props.ColumnList, 'friendlyName');
-        const selectedColumnIds = this.props.SelectedColumnIds.filter((x) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(x));
-        const isEmptySelectedColumnIds = this.props.SelectedColumnIds.filter((x) => StringExtensions_1.StringExtensions.IsNotNullOrEmpty(x)).length == 0;
-        let sortedColumnOptions = sortedColumns.map((column) => {
-            return {
-                label: column.friendlyName,
-                value: column.columnId,
-                disabled: this.props.disabled,
-                onClick: () => {
-                    const selected = sortedColumns.filter((c) => c.columnId === column.columnId);
-                    if (!selected.length) {
-                        this.onClearButton();
-                    }
-                    else {
-                        this.onColumnChange(selected, isEmptySelectedColumnIds);
-                    }
-                },
-            };
+        return ({
+            label: (_a = column.friendlyName) !== null && _a !== void 0 ? _a : column.columnId,
+            value: column.columnId,
         });
-        let currentColumnName = selectedColumnIds.length > 0
-            ? (_a = this.props.ColumnList.find((c) => c.columnId == selectedColumnIds[0])) === null || _a === void 0 ? void 0 : _a.friendlyName
-            : 'Select a column';
-        return (React.createElement("div", { "data-name": 'column-selector' },
-            React.createElement(FormLayout_1.default, { columns: [{ name: 'columnSelector', style: { display: 'flex' } }], style: this.props.style },
-                React.createElement(FormLayout_1.FormRow, null,
-                    React.createElement(DropdownButton_1.default, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, items: sortedColumnOptions, disabled: this.props.disabled || sortedColumnOptions.length == 0 }, currentColumnName)))));
-    }
-    onClearButton() {
-        this.props.onColumnChange([]);
-    }
-    onColumnChange(selected, isEmptySelection) {
-        if (selected.length == 0 && isEmptySelection) {
-            return; // must be a nicer way but we want to avoid ridiculous amounts of prop calls
+    })
+        .filter((option) => {
+        if (props.filterColumn) {
+            return props.filterColumn(getColumn(option.value));
         }
-        this.props.onColumnChange(selected);
-    }
-}
-exports.ColumnSelector = ColumnSelector;
+        return true;
+    });
+    return (React.createElement(Select, { "data-name": "column-selector", disabled: props.disabled, isMulti: props.isMulti, menuPosition: props.menuPosition, value: props.value, onChange: (colId) => {
+            props.onChange(colId);
+        }, options: options }));
+};

package/src/View/Components/Selectors/ColumnSelectorOld.d.ts

@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { SelectionMode } from '../../../PredefinedConfig/Common/Enums';
+import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColumn';
+export interface ColumnSelectorProps extends React.HTMLProps<ColumnSelector> {
+    ColumnList: AdaptableColumn[];
+    SelectedColumnIds: string[];
+    onColumnChange: (SelectedColumns: AdaptableColumn[]) => void;
+    SelectionMode: SelectionMode;
+    className?: string;
+    placeHolder?: string;
+    showClearButton?: boolean;
+    disabled?: boolean;
+}
+export declare class ColumnSelector extends React.Component<ColumnSelectorProps, {}> {
+    render(): JSX.Element;
+    onClearButton(): void;
+    onColumnChange(selected: AdaptableColumn[], isEmptySelection: boolean): void;
+}

package/src/View/Components/Selectors/ColumnSelectorOld.js

@@ -0,0 +1,46 @@
+import * as React from 'react';
+import { StringExtensions } from '../../../Utilities/Extensions/StringExtensions';
+import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
+import { ArrayExtensions } from '../../../Utilities/Extensions/ArrayExtensions';
+import FormLayout, { FormRow } from '../../../components/FormLayout';
+import DropdownButton from '../../../components/DropdownButton';
+export class ColumnSelector extends React.Component {
+    render() {
+        var _a;
+        const sortedColumns = ArrayExtensions.sortArrayWithProperty(SortOrder.Asc, this.props.ColumnList, 'friendlyName');
+        const selectedColumnIds = this.props.SelectedColumnIds.filter((x) => StringExtensions.IsNotNullOrEmpty(x));
+        const isEmptySelectedColumnIds = this.props.SelectedColumnIds.filter((x) => StringExtensions.IsNotNullOrEmpty(x)).length == 0;
+        let sortedColumnOptions = sortedColumns.map((column) => {
+            return {
+                label: column.friendlyName,
+                value: column.columnId,
+                disabled: this.props.disabled,
+                onClick: () => {
+                    const selected = sortedColumns.filter((c) => c.columnId === column.columnId);
+                    if (!selected.length) {
+                        this.onClearButton();
+                    }
+                    else {
+                        this.onColumnChange(selected, isEmptySelectedColumnIds);
+                    }
+                },
+            };
+        });
+        let currentColumnName = selectedColumnIds.length > 0
+            ? (_a = this.props.ColumnList.find((c) => c.columnId == selectedColumnIds[0])) === null || _a === void 0 ? void 0 : _a.friendlyName
+            : 'Select a column';
+        return (React.createElement("div", { "data-name": 'column-selector' },
+            React.createElement(FormLayout, { columns: [{ name: 'columnSelector', style: { display: 'flex' } }], style: this.props.style },
+                React.createElement(FormRow, null,
+                    React.createElement(DropdownButton, { marginRight: 2, columns: ['label'], showClearButton: currentColumnName != 'Select a column', onClear: () => this.onClearButton(), style: { width: '100%', fontSize: 'small' }, items: sortedColumnOptions, disabled: this.props.disabled || sortedColumnOptions.length == 0 }, currentColumnName)))));
+    }
+    onClearButton() {
+        this.props.onColumnChange([]);
+    }
+    onColumnChange(selected, isEmptySelection) {
+        if (selected.length == 0 && isEmptySelection) {
+            return; // must be a nicer way but we want to avoid ridiculous amounts of prop calls
+        }
+        this.props.onColumnChange(selected);
+    }
+}

package/src/View/Components/Selectors/ColumnValueSelector.d.ts

@@ -3,7 +3,7 @@ import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColum
 import { DropdownButtonProps } from '../../../components/DropdownButton';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { GridCell } from '../../../types';
-export interface ColumnValueSelectorProps extends React.HTMLProps<ColumnValueSelector> {
+export interface ColumnValueSelectorProps {
     selectedColumn: AdaptableColumn;
     selectedColumnValue: string;
     onColumnValueChange: (columnvalue: any) => void;
@@ -14,26 +14,7 @@ export interface ColumnValueSelectorProps extends React.HTMLProps<ColumnValueSel
     existingLabel?: string;
     dropdownButtonProps?: DropdownButtonProps;
     selectedGridCells: GridCell[];
+    disabled?: boolean;
+    className?: string;
 }
-declare enum NEW_OR_EXISTING {
-    existing = "Existing value",
-    new = "New value"
-}
-interface ColumnValueSelectorState {
-    newOrExisting: NEW_OR_EXISTING;
-    distinctColumnValues: any[];
-    isDistinctColumnValuesLoading: boolean;
-}
-export declare class ColumnValueSelector extends React.Component<ColumnValueSelectorProps, ColumnValueSelectorState> {
-    static defaultProps: {
-        newLabel: string;
-        existingLabel: string;
-    };
-    constructor(props: ColumnValueSelectorProps);
-    componentDidUpdate(prevProps: ColumnValueSelectorProps): void;
-    loadPermittedValues: () => Promise<void>;
-    handleSelectedValueExpand: () => void;
-    render(): JSX.Element;
-    onSelectedValueChange(selected: any[]): void;
-}
-export {};
+export declare const ColumnValueSelector: (props: ColumnValueSelectorProps) => JSX.Element;