diff --git a/src/electron/renderer/components/DaemonsViewer.tsx b/src/electron/renderer/components/DaemonsViewer.tsx index bedfb9f0..04c95aa3 100644 --- a/src/electron/renderer/components/DaemonsViewer.tsx +++ b/src/electron/renderer/components/DaemonsViewer.tsx @@ -8,7 +8,6 @@ import { useMemo } from 'react'; import styled from 'styled-components'; import { Col, Row, Spacer } from './Flex'; import { Highlight } from './HistoryViewer'; -import { Only } from './Only'; const DaemonsWrapper = styled.div` display: flex; @@ -113,9 +112,9 @@ export const DaemonsViewer = ({ : undefined } > - + {types?.isValid && ( {eng[types.rawData[index]]} - + )} {raw.map((s, i) => ( {s} diff --git a/src/electron/renderer/components/JSONTree.tsx b/src/electron/renderer/components/JSONTree.tsx index de0351c3..2765bbbc 100644 --- a/src/electron/renderer/components/JSONTree.tsx +++ b/src/electron/renderer/components/JSONTree.tsx @@ -12,10 +12,6 @@ import styled from 'styled-components'; import { LinkButton } from './Buttons'; import { Col } from './Flex'; -const Only = ({ when, children }: PropsWithChildren<{ when: boolean }>) => { - return <>{when ? children : null}; -}; - type JSONObject = Extract; type JSONPrimitive = Exclude; @@ -277,14 +273,14 @@ const JSONViewerContainer = memo( return ( <> - - - - + {isObject && ( + <> + + + + )} {children} - - - + {isObject && } ); } @@ -321,13 +317,11 @@ const JSONViewer = memo( return ( - - - + {!isArray && } - , + {!isLast && <>,} ); })} diff --git a/src/electron/renderer/components/Navigation.tsx b/src/electron/renderer/components/Navigation.tsx index 227c1830..137089ea 100644 --- a/src/electron/renderer/components/Navigation.tsx +++ b/src/electron/renderer/components/Navigation.tsx @@ -3,7 +3,6 @@ import { useContext } from 'react'; import { Link, NavLink as RouterNavLink } from 'react-router-dom'; import styled from 'styled-components'; import { RouterExtContext } from '../router-ext'; -import { Only } from './Only'; const Nav = styled.nav` display: flex; @@ -51,11 +50,11 @@ export const Navigation = () => { return (