Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(TableToolbarSearch): allow default values to be set #5089

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e1933aa
fix(TableToolbarSearch): allow default values to be set
tw15egan Jan 17, 2020
390eb0b
fix(TableToolbarSearch): sort on load when default value is present
tw15egan Jan 17, 2020
baca15e
fix(TableToolbarSearch): only run effect once
tw15egan Jan 18, 2020
8ea7a5b
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 18, 2020
c696f3b
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 18, 2020
d39d3f2
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 20, 2020
b86a393
fix(TableToolbarSearch): refactor defaultExpanded
tw15egan Jan 20, 2020
610f781
Merge branch 'table-toolbar-search-value-fix' of github.com:tw15egan/…
tw15egan Jan 20, 2020
204a0cd
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 20, 2020
dc860ba
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 20, 2020
7b3ab35
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 20, 2020
c92546b
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 21, 2020
2835ec0
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 21, 2020
63483eb
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 22, 2020
9a0f5b6
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 22, 2020
04e31ba
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 22, 2020
20f4fe1
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 24, 2020
56c7414
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 24, 2020
218df14
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 24, 2020
4a04d1e
fix(datatable): refactor focus management
tw15egan Jan 24, 2020
5c3241c
Merge branch 'table-toolbar-search-value-fix' of github.com:tw15egan/…
tw15egan Jan 24, 2020
5af8158
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 24, 2020
abb08ec
Merge branch 'master' into table-toolbar-search-value-fix
tw15egan Jan 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/react/src/components/DataTable/DataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -581,10 +581,14 @@ export default class DataTable extends React.Component {
*
* @param {Event} event
*/
handleOnInputValueChange = event => {
handleOnInputValueChange = (event, defaultValue) => {
if (event.target) {
this.setState({ filterInputValue: event.target.value });
}

if (defaultValue) {
this.setState({ filterInputValue: defaultValue });
}
};

render() {
Expand Down
33 changes: 26 additions & 7 deletions packages/react/src/components/DataTable/TableToolbarSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,32 @@ const TableToolbarSearch = ({
...rest
}) => {
const { current: controlled } = useRef(expandedProp !== undefined);
const [expandedState, setExpandedState] = useState(defaultExpanded);
const [expandedState, setExpandedState] = useState(
defaultExpanded || defaultValue
);
const expanded = controlled ? expandedProp : expandedState;
const searchRef = useRef(null);
const [value, setValue] = useState('');
const [value, setValue] = useState(defaultValue || '');
const uniqueId = useMemo(getInstanceId, []);

const [focusTarget, setFocusTarget] = useState(null);

useEffect(() => {
if (!controlled && expandedState && searchRef.current) {
searchRef.current.querySelector('input').focus();
if (focusTarget) {
focusTarget.current.querySelector('input').focus();
setFocusTarget(null);
}
}, [controlled, expandedState]);
}, [focusTarget]);

useEffect(
() => {
if (defaultValue) {
onChangeProp('', defaultValue);
tw15egan marked this conversation as resolved.
Show resolved Hide resolved
}
},
//eslint-disable-next-line react-hooks/exhaustive-deps
tw15egan marked this conversation as resolved.
Show resolved Hide resolved
[]
);

const searchContainerClasses = cx({
[searchContainerClass]: searchContainerClass,
Expand All @@ -71,6 +86,11 @@ const TableToolbarSearch = ({
}
};

const onClick = e => {
setFocusTarget(searchRef);
handleExpand(e, true);
};

const onChange = e => {
setValue(e.target.value);
if (onChangeProp) {
Expand All @@ -83,15 +103,14 @@ const TableToolbarSearch = ({
tabIndex={expandedState ? '-1' : tabIndex}
role="search"
ref={searchRef}
onClick={event => handleExpand(event, true)}
onClick={event => onClick(event)}
onFocus={event => handleExpand(event, true)}
onBlur={event => !value && handleExpand(event, false)}
className={searchContainerClasses}>
<Search
size="sm"
tabIndex={expandedState ? tabIndex : '-1'}
className={className}
defaultValue={defaultValue}
value={value}
id={typeof id !== 'undefined' ? id : uniqueId.toString()}
aria-hidden={!expanded}
Expand Down