aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/views/nodes/PDFBox.tsx2
-rw-r--r--src/client/views/search/FilterBox.tsx16
-rw-r--r--src/client/views/search/SearchBox.tsx33
3 files changed, 6 insertions, 45 deletions
diff --git a/src/client/views/nodes/PDFBox.tsx b/src/client/views/nodes/PDFBox.tsx
index 96852b9f7..02b883d57 100644
--- a/src/client/views/nodes/PDFBox.tsx
+++ b/src/client/views/nodes/PDFBox.tsx
@@ -11,7 +11,7 @@ import { PdfField } from "../../../new_fields/URLField";
import { RouteStore } from "../../../server/RouteStore";
import { DocComponent } from "../DocComponent";
import { InkingControl } from "../InkingControl";
-import { SearchBox } from "../search/FilterBox";
+import { FilterBox } from "../search/FilterBox";
import { Annotation } from './Annotation';
import { PDFViewer } from "../pdf/PDFViewer";
import { positionSchema } from "./DocumentView";
diff --git a/src/client/views/search/FilterBox.tsx b/src/client/views/search/FilterBox.tsx
index 364989125..8bcfda794 100644
--- a/src/client/views/search/FilterBox.tsx
+++ b/src/client/views/search/FilterBox.tsx
@@ -42,13 +42,9 @@ export class FilterBox extends React.Component {
static Instance: FilterBox;
public _allIcons: string[] = [DocTypes.AUDIO, DocTypes.COL, DocTypes.HIST, DocTypes.IMG, DocTypes.LINK, DocTypes.PDF, DocTypes.TEXT, DocTypes.VID, DocTypes.WEB];
- // @observable private _searchString: string = "";
//if true, any keywords can be used. if false, all keywords are required.
@observable private _basicWordStatus: boolean = true;
@observable private _filterOpen: boolean = false;
- // @observable private _resultsOpen: boolean = false;
- // @observable private _results: Doc[] = [];
- // @observable private _openNoResults: boolean = false;
@observable private _icons: string[] = this._allIcons;
@observable private _titleFieldStatus: boolean = true;
@observable private _authorFieldStatus: boolean = true;
@@ -62,7 +58,6 @@ export class FilterBox extends React.Component {
@observable private _fieldOpen: boolean = false;
public _pointerTime: number = -1;
-
constructor(props: Readonly<{}>) {
super(props);
FilterBox.Instance = this;
@@ -73,7 +68,6 @@ export class FilterBox extends React.Component {
document.addEventListener("pointerdown", (e) => {
if (e.timeStamp !== this._pointerTime) {
SearchBox.Instance.closeSearch();
- console.log("closing search from inside component did mount")
}
});
}
@@ -274,20 +268,11 @@ export class FilterBox extends React.Component {
});
return finalDocs;
}
- //--------------------------------------------------------------------------------------------------------------
- // enter = (e: React.KeyboardEvent) => {
- // if (e.key === "Enter") { this.submitSearch(); }
- // }
- //--------------------------------------------------------------------------------------------------------------
-
@action.bound
openFilter = () => {
this._filterOpen = !this._filterOpen;
- // this._resultsOpen = false;
- // this._results = [];
SearchBox.Instance.closeResults();
- // console.log("opening filter")
this.setupAccordion();
}
@@ -307,7 +292,6 @@ export class FilterBox extends React.Component {
stopProp = (e: React.PointerEvent) => {
e.stopPropagation();
this._pointerTime = e.timeStamp;
- console.log("stopping prop");
}
@action.bound
diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 24e617f7f..e9eefa29a 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -16,24 +16,16 @@ import { SearchUtil } from '../../util/SearchUtil';
import { RouteStore } from '../../../server/RouteStore';
import { FilterBox } from './FilterBox';
-export interface SearchBoxProps {
- // setUnfilteredResults(docs: Doc[]): void;
- // getFilteredResults(): Doc[];
- // getFinalQuery(str: string): string;
-
- // submitSearch(): void;
-}
-
-export class SearchBox extends React.Component<SearchBoxProps> {
+@observer
+export class SearchBox extends React.Component {
@observable private _searchString: string = "";
@observable private _resultsOpen: boolean = false;
@observable private _results: Doc[] = [];
@observable private _openNoResults: boolean = false;
- // private _pointerTime: number = -1;
static Instance: SearchBox;
- constructor(props: SearchBoxProps){
+ constructor(props: any){
super(props);
SearchBox.Instance = this;
@@ -52,8 +44,6 @@ export class SearchBox extends React.Component<SearchBoxProps> {
@action.bound
onChange(e: React.ChangeEvent<HTMLInputElement>) {
this._searchString = e.target.value;
- // console.log(this._searchString)
- // e.stopPropagation();
if (this._searchString === "") {
this._results = [];
@@ -62,7 +52,6 @@ export class SearchBox extends React.Component<SearchBoxProps> {
}
enter = (e: React.KeyboardEvent) => {
-
if (e.key === "Enter") { this.submitSearch(); }
}
@@ -85,12 +74,9 @@ export class SearchBox extends React.Component<SearchBoxProps> {
@action
submitSearch = async () => {
- // console.log("submitting")
let query = this._searchString; // searchbox gets query
- // console.log(this._searchString)
let results: Doc[];
- // query = this.props.getFinalQuery(query); // sends to filterbox to modify and gets final query back
query = FilterBox.Instance.getFinalQuery(query);
//if there is no query there should be no result
@@ -99,15 +85,12 @@ export class SearchBox extends React.Component<SearchBoxProps> {
}
else {
//gets json result into a list of documents that can be used
- // results = await this.props.getFilteredResults(query);
-
//these are filtered by type
results = await this.getResults(query);
}
runInAction(() => {
this._resultsOpen = true;
- // console.log("opening results")
this._results = results;
this._openNoResults = true;
});
@@ -136,7 +119,6 @@ export class SearchBox extends React.Component<SearchBoxProps> {
collectionRef = React.createRef<HTMLSpanElement>();
startDragCollection = async () => {
- // const results = await this.getResults(this._searchString);
const results = await this.getResults(FilterBox.Instance.getFinalQuery(this._searchString));
const docs = results.map(doc => {
const isProto = Doc.GetT(doc, "isPrototype", "boolean", true);
@@ -175,26 +157,21 @@ export class SearchBox extends React.Component<SearchBoxProps> {
@action.bound
openSearch(e: React.PointerEvent) {
- // console.log("opening search")
- // e.stopPropagation();
- // FilterBox.Instance.setPointerTime(e.timeStamp);
+ e.stopPropagation();
this._openNoResults = false;
FilterBox.Instance.closeFilter();
this._resultsOpen = true;
+ FilterBox.Instance._pointerTime = e.timeStamp;
}
@action.bound
closeSearch = () => {
- // console.log("closing search")
-
FilterBox.Instance.closeFilter();
this.closeResults();
- // console.log(this._resultsOpen)
}
@action.bound
closeResults() {
- // console.log("closing results")
this._resultsOpen = false;
this._results = [];
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-07 21:31:03 +0000