Filter case gui

plotly · Oct 9, 2019 · 2372f39 · 2372f39
1 parent 1342391
commit 2372f39
Show file tree

Hide file tree

Showing 4 changed files with 293 additions and 217 deletions.
diff --git a/src/dash-table/components/Filter/Column.tsx b/src/dash-table/components/Filter/Column.tsx
@@ -1,18 +1,24 @@
+import * as R from 'ramda';
 import React, { CSSProperties, PureComponent } from 'react';
 
 import IsolatedInput from 'core/components/IsolatedInput';
 
-import { ColumnId } from 'dash-table/components/Table/props';
+import { ColumnId, Case, SetProps, IColumn } from 'dash-table/components/Table/props';
 
 type SetFilter = (ev: any) => void;
 
 interface IColumnFilterProps {
     classes: string;
     columnId: ColumnId;
+    columns: IColumn[];
     isValid: boolean;
     setFilter: SetFilter;
+    setProps: SetProps;
     style?: CSSProperties;
     value?: string;
+    globalFilterCase?: Case;
+    columnFilterCaseSensitive?: boolean;
+    columnFilterCaseInsensitive?: boolean;
 }
 
 interface IState {
@@ -40,22 +46,51 @@ export default class ColumnFilter extends PureComponent<IColumnFilterProps, ISta
         const {
             classes,
             columnId,
+            columns,
             isValid,
             style,
-            value
+            value,
+            globalFilterCase,
+            columnFilterCaseSensitive,
+            columnFilterCaseInsensitive,
+            setProps
         } = this.props;
 
+        const filterCaseClass: string =
+            (globalFilterCase !== Case.Insensitive && !columnFilterCaseInsensitive) ?
+                'dash-filter--case--sensitive' : 'dash-filter--case--insensitive';
+
+        function setColumnCase() {
+            const cols: IColumn[] = R.clone(columns);
+            const inx: number = R.findIndex(R.propEq('id', columnId))(cols);
+
+            cols[inx].filter_case_sensitive = !columnFilterCaseSensitive &&
+                globalFilterCase === Case.Insensitive;
+            cols[inx].filter_case_insensitive = !columnFilterCaseInsensitive &&
+                (globalFilterCase === Case.Sensitive || globalFilterCase === Case.Default);
+
+            setProps({ columns: cols });
+        }
+
         return (<th
             className={classes + (isValid ? '' : ' invalid')}
             data-dash-column={columnId}
             style={style}
         >
             <IsolatedInput
                 value={value}
-                placeholder={`filter data...`}
+                placeholder='filter data...'
                 stopPropagation={true}
                 submit={this.submit}
             />
+            <div>
+                <input
+                    type='button'
+                    className={'dash-filter--case ' + filterCaseClass}
+                    onClick={setColumnCase}
+                    value='Aa'
+                />
+            </div>
         </th>);
     }
 }
diff --git a/src/dash-table/components/FilterFactory.tsx b/src/dash-table/components/FilterFactory.tsx
@@ -7,7 +7,7 @@ import memoizerCache from 'core/cache/memoizer';
 import { memoizeOne } from 'core/memoizer';
 
 import ColumnFilter from 'dash-table/components/Filter/Column';
-import { ColumnId, IColumn, TableAction, IFilterFactoryProps, SetFilter, Case } from 'dash-table/components/Table/props';
+import { ColumnId, IColumn, TableAction, IFilterFactoryProps, SetFilter, Case, SetProps } from 'dash-table/components/Table/props';
 import derivedFilterStyles, { derivedFilterOpStyles } from 'dash-table/derived/filter/wrapperStyles';
 import derivedHeaderOperations from 'dash-table/derived/header/operations';
 import { derivedRelevantFilterStyles } from 'dash-table/derived/style';
@@ -42,9 +42,11 @@ export default class FilterFactory {
 
     private filter = memoizerCache<[ColumnId, number]>()((
         column: IColumn,
+        columns: IColumn[],
         index: number,
         map: Map<string, SingleColumnSyntaxTree>,
         setFilter: SetFilter,
+        setProps: SetProps,
         filter_case: Case
     ) => {
         const ast = map.get(column.id.toString());
@@ -53,9 +55,14 @@ export default class FilterFactory {
             key={`column-${index}`}
             classes={`dash-filter column-${index}`}
             columnId={column.id}
+            columns={columns}
             isValid={!ast || ast.isValid}
             setFilter={this.onChange.bind(this, column, map, setFilter, filter_case)}
+            setProps={setProps}
             value={ast && ast.query}
+            globalFilterCase={filter_case}
+            columnFilterCaseSensitive={column.filter_case_sensitive}
+            columnFilterCaseInsensitive={column.filter_case_insensitive}
         />);
     });
 
@@ -64,7 +71,7 @@ export default class FilterFactory {
         edges: IEdgesMatrices | undefined
     ) => arrayMap(
         styles,
-        (s, j) => R.merge(
+        (s, j) => R.mergeRight(
             s,
             edges && edges.getStyle(0, j)
         )
@@ -75,11 +82,13 @@ export default class FilterFactory {
         filterOpEdges: IEdgesMatrices | undefined
     ) {
         const {
+            columns,
             filter_action,
             map,
             row_deletable,
             row_selectable,
             setFilter,
+            setProps,
             style_cell,
             style_cell_conditional,
             style_filter,
@@ -113,9 +122,11 @@ export default class FilterFactory {
         const filters = R.addIndex<IColumn, JSX.Element>(R.map)((column, index) => {
             return this.filter.get(column.id, index)(
                 column,
+                columns,
                 index,
                 map,
                 setFilter,
+                setProps,
                 filter_case
             );
         }, visibleColumns);