@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.1

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

@@ -1,46 +1,27 @@
 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() {
+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.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);
-                    }
-                },
-            };
+        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, { 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
+    })
+        .filter((option) => {
+        if (props.filterColumn) {
+            return props.filterColumn(getColumn(option.value));
         }
-        this.props.onColumnChange(selected);
-    }
-}
+        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;

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

@@ -1,133 +1,41 @@
 import * as React from 'react';
-import { StringExtensions } from '../../../Utilities/Extensions/StringExtensions';
-import { SortOrder } from '../../../PredefinedConfig/Common/Enums';
-import { ArrayExtensions } from '../../../Utilities/Extensions/ArrayExtensions';
 import FieldWrap from '../../../components/FieldWrap';
-import DropdownButton from '../../../components/DropdownButton';
 import UIHelper from '../../UIHelper';
 import AdaptableInput from '../AdaptableInput';
-import { runIfNotResolvedIn } from '../../../Utilities/runIfNotResolvedIn';
-import join from '../../../components/utils/join';
-var NEW_OR_EXISTING;
-(function (NEW_OR_EXISTING) {
-    NEW_OR_EXISTING["existing"] = "Existing value";
-    NEW_OR_EXISTING["new"] = "New value";
-})(NEW_OR_EXISTING || (NEW_OR_EXISTING = {}));
-export class ColumnValueSelector extends React.Component {
-    constructor(props) {
-        super(props);
-        this.loadPermittedValues = async () => {
-            var _a;
-            if (!((_a = this.props.selectedColumn) === null || _a === void 0 ? void 0 : _a.columnId)) {
-                return;
-            }
-            // JW "fixed" this by replacing display values with raw values but really we should do it nicer in some way
-            // so that you we show the display value but we work on the raw value
-            const columnDisplayValuePairs = await runIfNotResolvedIn(this.props.api.gridApi.internalApi.getDistinctBulkUpdateDisplayValuesForColumn(this.props.selectedColumn.columnId, this.props.selectedGridCells), () => this.setState({ isDistinctColumnValuesLoading: true }));
-            this.setState({ isDistinctColumnValuesLoading: false });
-            const newSortedColumnValues = ArrayExtensions.sortArray(columnDisplayValuePairs, SortOrder.Asc).map((v) => ({
-                label: v,
-                value: v,
-                onClick: () => this.onSelectedValueChange([{ DisplayValue: v }]),
-            }));
-            this.setState({
-                distinctColumnValues: newSortedColumnValues,
-            });
-        };
-        this.handleSelectedValueExpand = () => {
-            // load only if not loaded
-            if (!this.state.distinctColumnValues.length) {
-                this.loadPermittedValues();
-            }
-        };
-        this.state = {
-            newOrExisting: NEW_OR_EXISTING.existing,
-            distinctColumnValues: [],
-            isDistinctColumnValuesLoading: false,
-        };
-    }
-    componentDidUpdate(prevProps) {
-        if (this.props.selectedColumn !== prevProps.selectedColumn ||
-            this.props.selectedGridCells !== prevProps.selectedGridCells) {
-            this.loadPermittedValues();
-        }
-    }
-    render() {
-        let placeholderText = 'Select';
-        let allowNew = this.props.allowNew != null ? this.props.allowNew : true;
-        if (allowNew) {
-            // placeholderText += ' or enter free text';
-        }
-        const baseClassName = 'ab-column-value-selector';
-        const className = join('ab-column-value-selector', this.state.isDistinctColumnValuesLoading && `${baseClassName}--loading`);
-        const fieldWidth = 150;
-        const items = this.state.isDistinctColumnValuesLoading
-            ? [
-                {
-                    label: 'Loading',
-                    disabled: true,
-                },
-            ]
-            : this.state.distinctColumnValues;
-        const dd = (React.createElement("div", null,
-            React.createElement(DropdownButton, { "data-name": "bulkupdate-value-selector", className: className, columns: ['label'], variant: "text", showClearButton: true, onClear: () => this.onSelectedValueChange([]), style: { fontSize: 'small' }, disabled: this.props.disabled, items: items, onExpand: this.handleSelectedValueExpand }, this.props.selectedColumnValue ? this.props.selectedColumnValue : placeholderText)));
-        const input = (React.createElement(AdaptableInput, { "data-name": "bulkupdate-value-input", type: this.props.selectedColumn
-                ? UIHelper.getDescriptionForDataType(this.props.selectedColumn.dataType)
-                : 'text', placeholder: this.props.selectedColumn
-                ? UIHelper.getPlaceHolderforDataType(this.props.selectedColumn.dataType)
-                : 'Enter Value', autoFocus: true, disabled: this.props.disabled, style: { width: fieldWidth }, value: this.props.selectedColumnValue, onChange: (e) => {
-                this.onSelectedValueChange([
-                    { customOption: true, DisplayValue: e.target.value },
-                ]);
+import { Box } from 'rebass';
+import { PermittedValuesSelector } from './PermittedValuesSelector';
+import { Select } from '../../../components/Select';
+export const ColumnValueSelector = (props) => {
+    var _a, _b;
+    const [valueType, setValueType] = React.useState('existing');
+    const columnType = (_a = props.selectedColumn) === null || _a === void 0 ? void 0 : _a.dataType;
+    const isDateType = props.selectedColumn && columnType === 'Date';
+    const permittedValueSelector = (React.createElement(Box, null,
+        React.createElement(PermittedValuesSelector, { allowNewValues: true, disabled: props.disabled || !props.selectedColumn, value: props.selectedColumnValue === '' ? null : props.selectedColumnValue, columnId: (_b = props.selectedColumn) === null || _b === void 0 ? void 0 : _b.columnId, placeholder: isDateType ? 'Select' : 'Select or type new value', onChange: (value) => {
+                if (!value) {
+                    props.onColumnValueChange(null);
+                }
+                else {
+                    props.onColumnValueChange(value);
+                }
+            } })));
+    const input = (React.createElement(AdaptableInput, { "data-name": "bulkupdate-value-input", type: props.selectedColumn
+            ? UIHelper.getDescriptionForDataType(props.selectedColumn.dataType)
+            : 'text', placeholder: props.selectedColumn
+            ? UIHelper.getPlaceHolderforDataType(props.selectedColumn.dataType)
+            : 'Enter Value', autoFocus: true, disabled: props.disabled, style: { width: '100%' }, value: props.selectedColumnValue, onChange: (e) => {
+            props.onColumnValueChange(e.target.value);
+        } }));
+    let valueTypeSelector = null;
+    if (isDateType) {
+        valueTypeSelector = (React.createElement(Select, { options: [
+                { label: 'New', value: 'new' },
+                { label: 'Existing', value: 'existing' },
+            ], value: valueType, onChange: (value) => {
+                setValueType(value);
             } }));
-        return (React.createElement(FieldWrap, { style: Object.assign(Object.assign({}, this.props.style), { overflow: 'visible' }) },
-            this.state.newOrExisting === NEW_OR_EXISTING.existing ? dd : input,
-            React.createElement(DropdownButton, Object.assign({ variant: "raised", tone: "neutral", columns: ['label'], style: {
-                    boxShadow: 'none',
-                    color: 'var(--ab-cmp-dashboardpanel__fill)',
-                    background: 'var(--ab-color-defaultbackground)',
-                }, disabled: this.props.disabled, marginRight: 1, items: [
-                    {
-                        label: NEW_OR_EXISTING.existing,
-                        onClick: () => {
-                            this.setState({
-                                newOrExisting: NEW_OR_EXISTING.existing,
-                            });
-                            this.onSelectedValueChange([]);
-                        },
-                    },
-                    {
-                        label: NEW_OR_EXISTING.new,
-                        onClick: () => {
-                            this.setState({
-                                newOrExisting: NEW_OR_EXISTING.new,
-                            });
-                            this.onSelectedValueChange([]);
-                        },
-                    },
-                ] }, this.props.dropdownButtonProps), this.state.newOrExisting === NEW_OR_EXISTING.existing
-                ? this.props.existingLabel
-                : this.props.newLabel)));
-    }
-    onSelectedValueChange(selected) {
-        if (ArrayExtensions.IsEmpty(selected) &&
-            StringExtensions.IsNullOrEmpty(this.props.selectedColumnValue)) {
-            return; // must be a nicer way but we want to avoid ridiculous amounts of prop calls
-        }
-        if (ArrayExtensions.IsEmpty(selected)) {
-            this.props.onColumnValueChange('');
-        }
-        else {
-            if (selected[0].customOption) {
-                this.props.onColumnValueChange(selected[0].DisplayValue);
-            }
-            else {
-                this.props.onColumnValueChange(selected[0].DisplayValue);
-            }
-        }
     }
-}
-ColumnValueSelector.defaultProps = {
-    newLabel: 'New value',
-    existingLabel: 'Existing value',
+    return (React.createElement(FieldWrap, { className: props.className, style: Object.assign(Object.assign({}, props.style), { overflow: 'visible', maxWidth: '100%' }) }, isDateType ? (React.createElement(React.Fragment, null,
+        valueType === 'new' ? input : permittedValueSelector,
+        valueTypeSelector)) : (permittedValueSelector)));
 };

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

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+export type ValueType = number | string | Date;
+interface PermittedValuesSelectorProps<Value extends ValueType> {
+    columnId: string;
+    value: Value;
+    onChange: (value: Value) => void;
+    allowNewValues?: boolean;
+    className?: string;
+    disabled?: boolean;
+    placeholder?: string;
+}
+export declare const PermittedValuesSelector: <Value extends ValueType>(props: PermittedValuesSelectorProps<Value>) => JSX.Element;
+export {};

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

@@ -0,0 +1,46 @@
+import * as React from 'react';
+import { Select } from '../../../components/Select';
+import { runIfNotResolvedIn } from '../../../Utilities/runIfNotResolvedIn';
+import { useAdaptable } from '../../AdaptableContext';
+export const PermittedValuesSelector = function (props) {
+    const adaptable = useAdaptable();
+    const [isLoading, setIsLoading] = React.useState(true);
+    const [options, setOptions] = React.useState([]);
+    const [filter, setFilter] = React.useState('');
+    const columnType = React.useMemo(() => {
+        return adaptable.api.columnApi.getColumnDataTypeForColumnId(props.columnId);
+    }, []);
+    React.useEffect(() => {
+        if (!props.columnId) {
+            setIsLoading(false);
+            return;
+        }
+        setIsLoading(true);
+        (async () => {
+            const { values: distinctColumnValues } = await runIfNotResolvedIn(adaptable.api.gridApi.internalApi.getDistinctFilterDisplayValuesForColumn(props.columnId, filter, adaptable.api.optionsApi.getColumnFilterOptions().valuesFilterOptions
+                .showDistinctFilteredValuesOnly), () => {
+                setIsLoading(true);
+            });
+            setIsLoading(false);
+            setOptions(distinctColumnValues);
+        })();
+    }, [props.columnId, filter]);
+    const isCreatable = props.allowNewValues && ['String', 'Number'].includes(columnType);
+    const handleOnChange = (value) => {
+        // convert numbers
+        if (isCreatable) {
+            if (columnType === 'Number') {
+                let num = parseFloat(value);
+                num = isNaN(num) ? null : num;
+                props.onChange(num);
+            }
+            else {
+                props.onChange(value);
+            }
+        }
+        else {
+            props.onChange(value);
+        }
+    };
+    return (React.createElement(Select, { className: props.className, disabled: props.disabled, "data-name": "permitted-values-selector", placeholder: props.placeholder || (props.allowNewValues ? 'Select or type new value' : 'Select value'), isCreatable: isCreatable, isClearable: true, options: options, isLoding: isLoading, onInputChange: setFilter, onChange: handleOnChange, value: props.value }));
+};

package/src/View/Components/StyleComponent.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 import { CSSProperties } from 'react';
 import { AdaptableApi } from '../../Api/AdaptableApi';
+import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
 export interface StyleComponentProps extends React.ClassAttributes<StyleComponent> {
     className?: string;
     style?: CSSProperties;
@@ -20,10 +20,9 @@ export declare class StyleComponent extends React.Component<StyleComponentProps,
     constructor(props: StyleComponentProps);
     static getDerivedStateFromProps(nextProps: StyleComponentProps, prevState: StyleComponentState): {
         componentStyle: AdaptableStyle;
-        ShowClassName: boolean;
     };
     render(): JSX.Element;
-    private onShowClassNameChanged;
+    onShowClassNameChanged: (checked: boolean) => void;
     private onStyleClassNameChanged;
     private onUseBackColorCheckChange;
     private onUseForeColorCheckChange;

package/src/View/Components/StyleComponent.js

@@ -1,23 +1,37 @@
 import * as React from 'react';
-import { FontWeight, FontStyle, FontSize } from '../../PredefinedConfig/Common/Enums';
-import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';
-import { ColorPicker } from '../../components/ColorPicker';
-import { Text, Flex, Box } from 'rebass';
-import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
+import { Box, Flex, Text } from 'rebass';
 import { CheckBox } from '../../components/CheckBox';
-import Panel from '../../components/Panel';
-import HelpBlock from '../../components/HelpBlock';
+import { ColorPicker } from '../../components/ColorPicker';
 import FormLayout, { FormRow } from '../../components/FormLayout';
-import DropdownButton from '../../components/DropdownButton';
-import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import HelpBlock from '../../components/HelpBlock';
+import Panel from '../../components/Panel';
 import Radio from '../../components/Radio';
+import { Select } from '../../components/Select';
 import { StylePreview } from '../../components/StylePreview';
-import { ToggleGroup } from '../../components/Toggle/ToggleGroup';
 import { Toggle } from '../../components/Toggle/Toggle';
+import { ToggleGroup } from '../../components/Toggle/ToggleGroup';
+import { FontSize, FontStyle, FontWeight } from '../../PredefinedConfig/Common/Enums';
+import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { EnumExtensions } from '../../Utilities/Extensions/EnumExtensions';
+import { StringExtensions } from '../../Utilities/Extensions/StringExtensions';
 import AdaptableInput from './AdaptableInput';
 export class StyleComponent extends React.Component {
     constructor(props) {
         super(props);
+        this.onShowClassNameChanged = (checked) => {
+            this.setState((state) => {
+                const newState = Object.assign({}, state);
+                delete newState.componentStyle.BackColor;
+                delete newState.componentStyle.ForeColor;
+                delete newState.componentStyle.BorderColor;
+                delete newState.componentStyle.FontSize;
+                delete newState.componentStyle.FontStyle;
+                delete newState.componentStyle.FontWeight;
+                newState.componentStyle.ClassName = '';
+                newState.ShowClassName = checked;
+                return newState;
+            });
+        };
         this.state = {
             componentStyle: this.props.Style,
             ShowClassName: StringExtensions.IsNotNullOrEmpty(this.props.Style.ClassName),
@@ -26,7 +40,6 @@ export class StyleComponent extends React.Component {
     static getDerivedStateFromProps(nextProps, prevState) {
         return {
             componentStyle: nextProps.Style,
-            ShowClassName: StringExtensions.IsNotNullOrEmpty(nextProps.Style.ClassName),
         };
     }
     render() {
@@ -46,22 +59,19 @@ export class StyleComponent extends React.Component {
         fontSizes.push(...EnumExtensions.getNames(FontSize));
         return (React.createElement(Cmp, Object.assign({}, cmpProps, { className: "ab-StyleComponent" }),
             ArrayExtensions.IsNotNullOrEmpty(styleClassNames) && (React.createElement(Flex, { flexDirection: "row", padding: 2 },
-                React.createElement(Radio, { "data-name": "show-class-name", value: "Predicate", checked: this.state.ShowClassName, onChange: (checked) => this.onShowClassNameChanged(checked) }, "Use Style Class Name"),
+                React.createElement(Radio, { "data-name": "show-class-name", value: "classname", checked: this.state.ShowClassName, onChange: () => this.onShowClassNameChanged(true) }, "Use Style Class Name"),
                 ' ',
-                React.createElement(Radio, { "data-name": "create-style", marginLeft: 3, value: "Expression", checked: !this.state.ShowClassName, onChange: (checked) => this.onShowClassNameChanged(!checked) }, "Create Style"),
+                React.createElement(Radio, { "data-name": "create-style", marginLeft: 3, value: "expression", checked: !this.state.ShowClassName, onChange: () => this.onShowClassNameChanged(false) }, "Create Style"),
                 ' ')),
             this.state.ShowClassName ? (React.createElement("div", null,
                 React.createElement(HelpBlock, { fontSize: 2 }, 'Select a CSS Class Name'),
-                React.createElement(DropdownButton, { "data-name": "select-class-anme", margin: 3, placeholder: "Select", variant: "outlined", columns: ['label'], tone: "none", disabled: ArrayExtensions.IsNullOrEmpty(styleClassNames), style: {
-                        minWidth: '15rem',
-                        whiteSpace: 'nowrap',
-                        overflow: 'hidden',
-                        textOverflow: 'ellipsis',
-                    }, items: styleClassNames.map((item) => ({
-                        value: item,
-                        label: item,
-                        onClick: () => this.onStyleClassNameChanged(item),
-                    })) }, this.state.componentStyle.ClassName),
+                React.createElement(Box, { style: { maxWidth: '15rem' }, m: 3 },
+                    React.createElement(Select, { options: ArrayExtensions.IsNullOrEmpty(styleClassNames)
+                            ? []
+                            : styleClassNames.map((item) => ({
+                                label: item,
+                                value: item,
+                            })), value: this.state.componentStyle.ClassName, onChange: (value) => this.onStyleClassNameChanged(value) })),
                 React.createElement(Text, { color: 'var(--ab-color-warn)', style: { flex: 2 }, margin: 2 }, 'Please ensure that the styles listed are in the current stylesheet'))) : (React.createElement(Flex, { flexDirection: "column" },
                 React.createElement(Flex, { flex: 1 },
                     React.createElement("div", null,
@@ -98,18 +108,16 @@ export class StyleComponent extends React.Component {
                                     React.createElement(Toggle, { icon: "strikethrough", pressed: this.state.componentStyle.TextDecoration === 'LineThrough', onPressedChange: (checked) => this.onTextDecorationChange(checked ? 'LineThrough' : 'None') }),
                                     React.createElement(Toggle, { icon: "overline", pressed: this.state.componentStyle.TextDecoration === 'Overline', onPressedChange: (checked) => this.onTextDecorationChange(checked ? 'Overline' : 'None') }))),
                             React.createElement(FormRow, { label: "Font Size" }, !this.props.showFontSizeAs || this.props.showFontSizeAs === 'dropdown' ? (React.createElement(Flex, { flexDirection: "row", alignItems: "center" },
-                                React.createElement(DropdownButton, { width: "100px", mr: 1, items: [
+                                React.createElement(Select, { placeholder: "Default", options: [
                                         {
-                                            value: '',
                                             label: 'Default',
-                                            onClick: () => this.onFontSizeChange(''),
+                                            value: '',
                                         },
                                         ...EnumExtensions.getNames(FontSize).map((enumName) => ({
-                                            value: enumName,
                                             label: enumName,
-                                            onClick: () => this.onFontSizeChange(enumName),
+                                            value: enumName,
                                         })),
-                                    ], columns: ['label'] }, (_b = (_a = this.state.componentStyle.FontSize) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : 'Default'))) : (React.createElement(Box, null, fontSizes.map((enumName) => {
+                                    ], value: (_b = (_a = this.state.componentStyle.FontSize) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '', onChange: (value) => this.onFontSizeChange(value) }))) : (React.createElement(Box, null, fontSizes.map((enumName) => {
                                 return (React.createElement(Radio, { onClick: () => this.onFontSizeChange(enumName), checked: (enumName == 'Default' && !this.state.componentStyle.FontSize) ||
                                         this.state.componentStyle.FontSize === enumName, mr: 3, key: enumName }, enumName));
                             })))),
@@ -127,17 +135,6 @@ export class StyleComponent extends React.Component {
                 React.createElement(HelpBlock, { fontSize: 2, marginTop: 2, marginBottom: 2 }, "Preview"),
                 React.createElement(StylePreview, { styleObject: this.state.componentStyle })))));
     }
-    onShowClassNameChanged(checked) {
-        // clear everything
-        delete this.state.componentStyle.BackColor;
-        delete this.state.componentStyle.ForeColor;
-        delete this.state.componentStyle.BorderColor;
-        delete this.state.componentStyle.FontSize;
-        delete this.state.componentStyle.FontStyle;
-        delete this.state.componentStyle.FontWeight;
-        this.state.componentStyle.ClassName = '';
-        this.setState({ ShowClassName: checked });
-    }
     onStyleClassNameChanged(value) {
         this.state.componentStyle.ClassName = value == 'select' ? '' : value;
         this.props.UpdateStyle(this.state.componentStyle);

package/src/View/Components/ToolPanel/ToolPanelPopup.js

@@ -66,14 +66,14 @@ class ToolPanelPopupComponent extends React.Component {
             }
             return false;
         };
-        return (React.createElement(PopupPanel, { headerText: "ToolPanel", glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
+        return (React.createElement(PopupPanel, { headerText: "Tool Panel", glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(Tabs, { "data-name": 'toolPanelPopup-component', className: "ab-ToolPanelPopup", value: this.state.ToolPanelConfigView, style: { height: '100%' }, onValueChange: (value) => this.setState({ ToolPanelConfigView: value }) },
                 React.createElement(Tabs.Tab, { value: ToolPanelConfigView.ToolPanels },
                     React.createElement(Radio, { margin: 0, value: ToolPanelConfigView.ToolPanels, checked: this.state.ToolPanelConfigView == ToolPanelConfigView.ToolPanels, tabIndex: -1 }, "Tool Panels")),
                 React.createElement(Tabs.Tab, { value: ToolPanelConfigView.Buttons },
                     React.createElement(Radio, { margin: 0, value: ToolPanelConfigView.Buttons, checked: this.state.ToolPanelConfigView == ToolPanelConfigView.Buttons, tabIndex: -1 }, "Module Buttons")),
                 React.createElement(Tabs.Content, { value: ToolPanelConfigView.ToolPanels, style: { flex: 1, overflow: 'auto' } },
-                    React.createElement(ModuleValueSelector, { options: availableToolPanels, value: selectedToolPanels, noSelectionLabel: 'No selected Tool Panel', xSelectedLabel: () => `Visible ToolPanels:`, onChange: (selectedValues) => this.onToolPanelToolPanelsChanged(selectedValues), disabled: isToolPanelReadOnly })),
+                    React.createElement(ModuleValueSelector, { options: availableToolPanels, value: selectedToolPanels, noSelectionLabel: 'No selected Tool Panel', xSelectedLabel: () => `Visible Tool Panels:`, onChange: (selectedValues) => this.onToolPanelToolPanelsChanged(selectedValues), disabled: isToolPanelReadOnly })),
                 React.createElement(Tabs.Content, { value: ToolPanelConfigView.Buttons, style: { flex: 1, overflow: 'auto' } },
                     React.createElement(ModuleValueSelector, { options: allModuleButtons, value: selectedModuleButtons, noSelectionLabel: 'No selected Module Button', xSelectedLabel: () => `Visible Module Buttons:`, isOptionDisabled: isModuleCheckboxDisabled, disabled: isToolPanelReadOnly, onChange: (selectedValues) => this.props.onToolPanelSetModuleButtons(selectedValues) })))));
     }

package/src/View/Components/ToolPanel/ToolPanelWrapper.d.ts

@@ -2,7 +2,7 @@
 import { AdaptableToolPanel } from '../../../PredefinedConfig/Common/Types';
 import { CustomToolPanel } from '../../../AdaptableOptions/ToolPanelOptions';
 import { ToolPanelVisibilityMode } from '../../../PredefinedConfig/ToolPanelState';
-export declare type ToolPanelWrapperProps = {
+export type ToolPanelWrapperProps = {
     adaptableToolPanel: AdaptableToolPanel;
     customToolPanel?: undefined;
     visibilityMode: ToolPanelVisibilityMode;

package/src/View/Components/ValueSelector/index.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ReactNode } from 'react';
-export declare type ValueSelectorProps<OPTION_TYPE, ID_TYPE extends number | string> = {
+export type ValueSelectorProps<OPTION_TYPE, ID_TYPE extends number | string> = {
     options: OPTION_TYPE[];
     value: ID_TYPE[];
     onChange: (selected: ID_TYPE[], selectedMap: Map<ID_TYPE, OPTION_TYPE>) => void;
@@ -33,7 +33,7 @@ export declare namespace ValueSelector {
         allowReorder: boolean;
     };
 }
-declare type ValueOptionsTagsProps<OPTION_TYPE, ID_TYPE extends number | string> = {
+type ValueOptionsTagsProps<OPTION_TYPE, ID_TYPE extends number | string> = {
     style?: React.CSSProperties;
     options: OPTION_TYPE[];
     value: ID_TYPE[];

package/src/View/CustomSort/Wizard/CustomSortColumnWizardSection.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { CustomSort } from '../../../PredefinedConfig/CustomSortState';
-export declare type CustomSortColumnWizardSectionProps = {
+export type CustomSortColumnWizardSectionProps = {
     onChange: (data: CustomSort) => void;
     isNew: boolean;
 };

package/src/View/CustomSort/Wizard/CustomSortValuesWizardSection.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { CustomSort } from '../../../PredefinedConfig/CustomSortState';
-export declare type CustomSortValuesWizardSectionProps = {
+export type CustomSortValuesWizardSectionProps = {
     onChange: (data: CustomSort) => void;
 };
 export declare const isValidCustomSortOrder: (data: CustomSort) => true | string;