Ubuntu 21.04 aarch64 portability; Bug fixes.

2021-10-02 05:23:56 -04:00
parent 64c1806ce3
commit 11b2a94b17
14 changed files with 418 additions and 33 deletions
@@ -0,0 +1,136 @@
+// Copyright (c) 2021 Robin Davies
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import React from 'react';
+import { Theme, withStyles, WithStyles, createStyles } from '@material-ui/core/styles';
+import Input from '@material-ui/core/Input';
+import IconButton from '@material-ui/core/IconButton';
+import SearchIcon from '@material-ui/icons/Search';
+import ClearIcon from '@material-ui/icons/Clear';
+import InputAdornment from '@material-ui/core/InputAdornment';
+
+const styles = (theme: Theme) => createStyles({
+});
+
+
+interface SearchControlProps extends WithStyles<typeof styles> {
+    theme: Theme,
+    collapsed?: boolean;
+    searchText: string;
+    onTextChanged: (searchString: string) => void;
+    onClick: () => void;
+    onClearFilterClick: () => void;
+    inputRef?: React.RefObject<HTMLInputElement>;
+    showSearchIcon?: boolean
+
+};
+
+interface SearchControlState {
+};
+
+const SearchControl = withStyles(styles, { withTheme: true })(
+
+    class extends React.Component<SearchControlProps, SearchControlState> {
+
+        defaultInputRef: React.RefObject<HTMLInputElement>;
+
+        constructor(props: SearchControlProps) {
+            super(props);
+            this.state = {
+
+            };
+            this.defaultInputRef = React.createRef<HTMLInputElement>();
+        }
+        getInputRef(): React.RefObject<HTMLInputElement> {
+            if (this.props.inputRef) {
+                return this.props.inputRef;
+            }
+            return this.defaultInputRef;
+        }
+        componentDidUpdate(oldProps: SearchControlProps) {
+            if (oldProps.collapsed ?? false !== this.props.collapsed ?? false) {
+                let inputRef = this.getInputRef();
+                if (inputRef.current) {
+                    if (!(this.props.collapsed ?? false)) {
+                        setTimeout(() => {
+                            let inputRef = this.getInputRef();
+                            if (inputRef.current) {
+                                inputRef.current.focus();
+                            }
+                        }, 0);
+
+                    } else {
+                        inputRef.current.value = "";
+                        this.props.onTextChanged("");
+                    }
+                }
+            }
+        }
+
+        render() {
+            return (
+                <div style={{ display: "flex", flexFlow: "row nowrap", justifyContent: "flex-end", alignItems: "center" }}>
+                    {(this.props.showSearchIcon ?? true) && (
+                        <IconButton onClick={() => { this.props.onClick(); }}
+                        >
+                            <SearchIcon />
+                        </IconButton>
+                    )
+
+                    }
+                    <Input style={{
+                        flex: "1 1", visibility: (this.props.collapsed ?? false) ? "collapse" : "visible", marginRight: 12, height: 32,
+                    }}
+                        inputRef={this.getInputRef()}
+                        defaultValue={this.props.searchText}
+                        placeholder="Search"
+                        endAdornment={(
+                            <InputAdornment position="end">
+                                <IconButton
+                                    aria-label="clear search filter"
+                                    onClick={() => {
+                                        this.props.onClearFilterClick();
+                                        let inputRef = this.getInputRef();
+                                        if (inputRef.current) {
+                                            inputRef.current.value = "";
+                                        }
+                                    }}
+                                    edge="end"
+                                >
+                                    <ClearIcon fontSize='small' style={{ opacity: 0.6 }} />
+                                </IconButton>
+                            </InputAdornment>
+
+                        )}
+                        onChange={
+                            (e) => {
+                                this.props.onTextChanged(e.target.value);
+                            }
+                        }
+
+                    />
+
+
+                </div>
+            );
+        }
+    }
+);
+
+export default SearchControl;