From 0bccdc26e91d7c8e28156924f3ae8860ba13935c Mon Sep 17 00:00:00 2001
From: Chen-I Lim <chenilim@gmail.com>
Date: Thu, 8 Oct 2020 20:24:34 -0700
Subject: [PATCH] Search in TableComponent as well

---
 src/client/components/boardComponent.tsx |  5 +---
 src/client/components/tableComponent.tsx | 33 ++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/client/components/boardComponent.tsx b/src/client/components/boardComponent.tsx
index c6f41de65..89acd61e7 100644
--- a/src/client/components/boardComponent.tsx
+++ b/src/client/components/boardComponent.tsx
@@ -35,10 +35,7 @@ class BoardComponent extends React.Component<Props, State> {
 
 	constructor(props: Props) {
 		super(props)
-		this.state = {
-			isHoverOnCover: false,
-			isSearching: false
-		}
+		this.state = { isHoverOnCover: false, isSearching: !!this.props.boardTree?.getSearchText() }
 	}
 
 	componentDidUpdate(prevPros: Props, prevState: State) {
diff --git a/src/client/components/tableComponent.tsx b/src/client/components/tableComponent.tsx
index a7328af42..5177099ad 100644
--- a/src/client/components/tableComponent.tsx
+++ b/src/client/components/tableComponent.tsx
@@ -23,16 +23,24 @@ type Props = {
 
 type State = {
 	isHoverOnCover: boolean
+	isSearching: boolean
 }
 
 class TableComponent extends React.Component<Props, State> {
 	private draggedHeaderTemplate: IPropertyTemplate
 	private cardIdToRowMap = new Map<string, React.RefObject<TableRow>>()
 	private cardIdToFocusOnRender: string
+	private searchFieldRef = React.createRef<Editable>()
 
 	constructor(props: Props) {
 		super(props)
-		this.state = { isHoverOnCover: false }
+		this.state = { isHoverOnCover: false, isSearching: !!this.props.boardTree?.getSearchText() }
+	}
+
+	componentDidUpdate(prevPros: Props, prevState: State) {
+		if (this.state.isSearching && !prevState.isSearching) {
+			this.searchFieldRef.current.focus()
+		}
 	}
 
 	render() {
@@ -83,7 +91,15 @@ class TableComponent extends React.Component<Props, State> {
 							<div className="octo-button" onClick={(e) => { this.propertiesClicked(e) }}>Properties</div>
 							<div className={ hasFilter ? "octo-button active" : "octo-button"} onClick={(e) => { this.filterClicked(e) }}>Filter</div>
 							<div className={ hasSort ? "octo-button active" : "octo-button"} onClick={(e) => { this.sortClicked(e) }}>Sort</div>
-							<div className="octo-button">Search</div>
+							{this.state.isSearching
+								? <Editable
+									ref={this.searchFieldRef}
+									text={boardTree.getSearchText()}
+									placeholderText="Search text"
+									onChanged={(text) => { this.searchChanged(text) }}
+									onKeyDown={(e) => { this.onSearchKeyDown(e) }}></Editable>
+								: <div className="octo-button" onClick={() => { this.setState({ ...this.state, isSearching: true }) }}>Search</div>
+							}
 							<div className="octo-button" onClick={(e) => this.optionsClicked(e)}><div className="imageOptions"></div></div>
 							<div className="octo-button filled" onClick={() => { this.addCard(true) }}>New</div>
 						</div>
@@ -401,6 +417,19 @@ class TableComponent extends React.Component<Props, State> {
 		const destIndex = template ? board.cardProperties.indexOf(template) : 0
 		await mutator.changePropertyTemplateOrder(board, draggedHeaderTemplate, destIndex)
 	}
+
+	onSearchKeyDown(e: React.KeyboardEvent) {
+		if (e.keyCode === 27) {		// ESC: Clear search
+			this.searchFieldRef.current.text = ""
+			this.setState({ ...this.state, isSearching: false })
+			this.props.pageController.setSearchText(undefined)
+			e.preventDefault()
+		}
+	}
+
+	searchChanged(text?: string) {
+		this.props.pageController.setSearchText(text)
+	}
 }
 
 export { TableComponent }