Skip to content

✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.

add next node feature to search

AykutSarac665b38b489c5
diff --git a/src/components/Input/index.tsx b/src/components/Input/index.tsx
index 2af2c729..b7c36982 100644
--- a/src/components/Input/index.tsx
+++ b/src/components/Input/index.tsx
@@ -13,6 +13,10 @@ const StyledInputWrapper = styled.div`
padding: 4px 6px;
`;
+const StyledForm = styled.form`
+ display: flex;
+`;
+
const StyledInput = styled.input`
background: none;
color: ${({ theme }) => theme.TEXT_NORMAL};
@@ -48,18 +52,25 @@ const StyledSearchButton = styled.button`
`;
export const Input: React.FC = () => {
- const [content, setContent] = useFocusNode();
+ const [content, setContent, skip] = useFocusNode();
+
+ const onSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+ e.preventDefault();
+ skip();
+ };
return (
<StyledInputWrapper>
- <StyledInput
- type="text"
- value={content.value}
- onChange={(e) =>
- setContent((val) => ({ ...val, value: e.target.value }))
- }
- placeholder="Search Node"
- />
+ <StyledForm onSubmit={onSubmit}>
+ <StyledInput
+ type="text"
+ value={content.value}
+ onChange={(e) =>
+ setContent((val) => ({ ...val, value: e.target.value }))
+ }
+ placeholder="Search Node"
+ />
+ </StyledForm>
<StyledSearchButton
aria-label="search"
onClick={() => setContent({ value: "", debounced: "" })}
diff --git a/src/hooks/useFocusNode.tsx b/src/hooks/useFocusNode.tsx
index d9fbf115..b8c739a4 100644
--- a/src/hooks/useFocusNode.tsx
+++ b/src/hooks/useFocusNode.tsx
@@ -8,6 +8,7 @@ import {
} from "src/utils/search";
export const useFocusNode = () => {
+ const [selectedNode, setSelectedNode] = React.useState(0);
const [content, setContent] = React.useState({
value: "",
debounced: "",
@@ -17,6 +18,8 @@ export const useFocusNode = () => {
states: { settings },
} = useConfig();
+ const skip = () => setSelectedNode((current) => current + 1);
+
React.useEffect(() => {
const debouncer = setTimeout(() => {
setContent((val) => ({ ...val, debounced: content.value }));
@@ -32,29 +35,35 @@ export const useFocusNode = () => {
const matchedNodes: NodeListOf<Element> = searchQuery(
`span[data-key*='${content.debounced}' i]`
);
- const firstMatchedNode: Element | null = matchedNodes[0] || null;
+ const matchedNode: Element | null = matchedNodes[selectedNode] || null;
cleanupHighlight();
- if (zoomPanPinch && firstMatchedNode && firstMatchedNode.parentElement) {
+ if (zoomPanPinch && matchedNode && matchedNode.parentElement) {
const newScale = 1;
- const x = Number(firstMatchedNode.getAttribute("data-x"));
- const y = Number(firstMatchedNode.getAttribute("data-y"));
+ const x = Number(matchedNode.getAttribute("data-x"));
+ const y = Number(matchedNode.getAttribute("data-y"));
const newPositionX =
(zoomPanPinch.offsetLeft - x) * newScale +
zoomPanPinch.clientWidth / 2 -
- firstMatchedNode.getBoundingClientRect().width / 2;
+ matchedNode.getBoundingClientRect().width / 2;
const newPositionY =
(zoomPanPinch.offsetLeft - y) * newScale +
zoomPanPinch.clientHeight / 2 -
- firstMatchedNode.getBoundingClientRect().height / 2;
+ matchedNode.getBoundingClientRect().height / 2;
highlightMatchedNodes(matchedNodes);
settings.zoomPanPinch?.setTransform(newPositionX, newPositionY, newScale);
+ } else {
+ setSelectedNode(0);
}
- }, [content.debounced, settings.zoomPanPinch]);
- return [content, setContent] as const;
+ return () => {
+ if (!content.value) setSelectedNode(0);
+ };
+ }, [content.debounced, settings.zoomPanPinch, selectedNode, setSelectedNode]);
+
+ return [content, setContent, skip] as const;
};