Merge branch 'master' into nathan-starter

1 files changed, 8 insertions, 5 deletions

diff --git a/src/client/views/nodes/DataVizBox/components/TableBox.tsx b/src/client/views/nodes/DataVizBox/components/TableBox.tsx
index 5cd77e274..a1deb1625 100644
--- a/src/client/views/nodes/DataVizBox/components/TableBox.tsx
+++ b/src/client/views/nodes/DataVizBox/components/TableBox.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable jsx-a11y/no-noninteractive-tabindex */
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 import { Button, Type } from 'browndash-components';
-import { IReactionDisposer, action, computed, makeObservable, observable, reaction } from 'mobx';
+import { IReactionDisposer, action, computed, makeObservable, observable, reaction, runInAction } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { ClientUtils, setupMoveUpEvents } from '../../../../../ClientUtils';
@@ -64,7 +64,10 @@ export class TableBox extends ObservableReactComponent<TableBoxProps> {
         // then we need to remove any selected rows that are no longer part of the visualized dataset.
         this._inputChangedDisposer = reaction(() => this._tableData.slice(), this.filterSelectedRowsDown, { fireImmediately: true });
         const selected = NumListCast(this._props.layoutDoc.dataViz_selectedRows);
-        if (selected.length > 0) this.hasRowsToFilter = true;
+        if (selected.length > 0)
+            runInAction(() => {
+                this.hasRowsToFilter = true;
+            });
         this.handleScroll();
     }
     componentWillUnmount() {
@@ -141,7 +144,7 @@ export class TableBox extends ObservableReactComponent<TableBoxProps> {
                 const targetCreator = (annotationOn: Doc | undefined) => {
                     const embedding = Doc.MakeEmbedding(this._props.docView?.()!.Document!);
                     embedding._dataViz = DataVizView.TABLE;
-                    embedding._dataViz_axes = new List<string>([col, col]);
+                    embedding._dataViz_axes = new List<string>([col]);
                     embedding._dataViz_parentViz = this._props.Document;
                     embedding.annotationOn = annotationOn;
                     embedding.histogramBarColors = Field.Copy(this._props.layoutDoc.histogramBarColors);
@@ -188,8 +191,8 @@ export class TableBox extends ObservableReactComponent<TableBoxProps> {
         let start: any;
         let end: any;
         if (this.filteringType === 'Range') {
-            start = (this.filteringVal[0] as Number) ? Number(this.filteringVal[0]) : this.filteringVal[0];
-            end = (this.filteringVal[1] as Number) ? Number(this.filteringVal[1]) : this.filteringVal[0];
+            start = Number.isNaN(Number(this.filteringVal[0])) ? this.filteringVal[0] : Number(this.filteringVal[0]);
+            end = Number.isNaN(Number(this.filteringVal[1])) ? this.filteringVal[1] : Number(this.filteringVal[1]);
         }
 
         this._tableDataIds.forEach(rowID => {