filter - made small finishing changes

1 files changed, 50 insertions, 50 deletions

diff --git a/src/client/views/FilterPanel.tsx b/src/client/views/FilterPanel.tsx
index 93f4cf818..f1eeb6fa7 100644
--- a/src/client/views/FilterPanel.tsx
+++ b/src/client/views/FilterPanel.tsx
@@ -2,6 +2,7 @@ import React = require('react');
 import { action, computed, observable, ObservableMap } from 'mobx';
 import { observer } from 'mobx-react';
 import Select from 'react-select';
+import { Checkbox, Tooltip } from '@material-ui/core';
 import { Doc, DocListCast, Field, StrListCast } from '../../fields/Doc';
 import { RichTextField } from '../../fields/RichTextField';
 import { StrCast } from '../../fields/Types';
@@ -18,11 +19,6 @@ import { TooltipRail, Handle, Tick, Track } from './nodes/SliderBox-components';
 import { DocumentOptions, FInfo } from '../documents/Documents';
 import { string32 } from 'pdfjs-dist/types/src/shared/util';
 
-//slight bug when you don't click on background canvas before creating filter and the you click on the canvas
-
-//use to -- & determine amount of sigfinict digits -- make all sections blue evn when collapsed
-// transform switch to x and y not x coordinate and y coordinate
-
 interface filterProps {
     rootDoc: Doc;
 }
@@ -224,8 +220,8 @@ export class FilterPanel extends React.Component<filterProps> {
         this._collapseReturnKeys.splice(0);
 
         Array.from(this.activeRenderedFacetInfos.keys()).map(renderInfo => {
-            if (renderInfo.renderType === 'range' && renderInfo.facetHeader === facetHeader) {
-                this._collapseReturnKeys.push(renderInfo.range);
+            if (renderInfo.renderType === 'range' && renderInfo.facetHeader === facetHeader && renderInfo.range) {
+                this._collapseReturnKeys.push(renderInfo.range.map(number => number.toFixed(2)));
             }
         });
 
@@ -395,49 +391,53 @@ export class FilterPanel extends React.Component<filterProps> {
                     console.log('this is info domain ' + domain[0] + ', ' + domain[1]);
 
                     return (
-                        <div className="sliderBox-outerDiv" style={{ width: '95%', height: 45 }}>
-                            <Slider
-                                mode={2}
-                                step={Math.min(1, 0.1 * (domain[1] - domain[0]))}
-                                domain={[domain[0], domain[1]]} // -1000, 1000
-                                rootStyle={{ position: 'relative', width: '100%' }}
-                                onChange={values => Doc.setDocRangeFilter(this.targetDoc, facetHeader, values)}
-                                values={renderInfoRange!}>
-                                <Rail>{railProps => <TooltipRail {...railProps} />}</Rail>
-                                <Handles>
-                                    {({ handles, activeHandleID, getHandleProps }) => (
-                                        <div className="slider-handles">
-                                            {handles.map((handle, i) => {
-                                                // const value = i === 0 ? defaultValues[0] : defaultValues[1];
-                                                return (
-                                                    <div>
-                                                        <Handle key={handle.id} handle={handle} domain={domain} isActive={handle.id === activeHandleID} getHandleProps={getHandleProps} />
-                                                    </div>
-                                                );
-                                            })}
-                                        </div>
-                                    )}
-                                </Handles>
-                                <Tracks left={false} right={false}>
-                                    {({ tracks, getTrackProps }) => (
-                                        <div className="slider-tracks">
-                                            {tracks.map(({ id, source, target }) => (
-                                                <Track key={id} source={source} target={target} disabled={false} getTrackProps={getTrackProps} />
-                                            ))}
-                                        </div>
-                                    )}
-                                </Tracks>
-                                <Ticks count={5}>
-                                    {({ ticks }) => (
-                                        <div className="slider-ticks">
-                                            {ticks.map(tick => (
-                                                <Tick key={tick.id} tick={tick} count={ticks.length} format={(val: number) => val.toString()} />
-                                            ))}
-                                        </div>
-                                    )}
-                                </Ticks>
-                            </Slider>
-                        </div>
+                        <>
+                            <div className="sliderBox-outerDiv" style={{ width: '95%', height: 45 }}>
+                                {/* <Checkbox color="primary" onChange={action(() => console.log('on change'))} /> */}
+
+                                <Slider
+                                    mode={2}
+                                    step={Math.min(1, 0.1 * (domain[1] - domain[0]))}
+                                    domain={[domain[0], domain[1]]} // -1000, 1000
+                                    rootStyle={{ position: 'relative', width: '100%' }}
+                                    onChange={values => Doc.setDocRangeFilter(this.targetDoc, facetHeader, values)}
+                                    values={renderInfoRange!}>
+                                    <Rail>{railProps => <TooltipRail {...railProps} />}</Rail>
+                                    <Handles>
+                                        {({ handles, activeHandleID, getHandleProps }) => (
+                                            <div className="slider-handles">
+                                                {handles.map((handle, i) => {
+                                                    // const value = i === 0 ? defaultValues[0] : defaultValues[1];
+                                                    return (
+                                                        <div>
+                                                            <Handle key={handle.id} handle={handle} domain={domain} isActive={handle.id === activeHandleID} getHandleProps={getHandleProps} />
+                                                        </div>
+                                                    );
+                                                })}
+                                            </div>
+                                        )}
+                                    </Handles>
+                                    <Tracks left={false} right={false}>
+                                        {({ tracks, getTrackProps }) => (
+                                            <div className="slider-tracks">
+                                                {tracks.map(({ id, source, target }) => (
+                                                    <Track key={id} source={source} target={target} disabled={false} getTrackProps={getTrackProps} />
+                                                ))}
+                                            </div>
+                                        )}
+                                    </Tracks>
+                                    <Ticks count={5}>
+                                        {({ ticks }) => (
+                                            <div className="slider-ticks">
+                                                {ticks.map(tick => (
+                                                    <Tick key={tick.id} tick={tick} count={ticks.length} format={(val: number) => val.toString()} />
+                                                ))}
+                                            </div>
+                                        )}
+                                    </Ticks>
+                                </Slider>
+                            </div>
+                        </>
                     );
                 }