From a4aac76d5a8d9c26f2663e9627463f169c0c6c34 Mon Sep 17 00:00:00 2001 From: lucataglia Date: Mon, 22 May 2023 12:47:55 +0200 Subject: [PATCH] run prettier --- .../react-json-tree/src/JSONNestedNode.tsx | 50 ++++++++++++------- .../src/createStylingFromTheme.ts | 2 +- .../src/expandableButtonsContext.tsx | 10 +++- packages/react-json-tree/test/index.spec.tsx | 4 +- 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/packages/react-json-tree/src/JSONNestedNode.tsx b/packages/react-json-tree/src/JSONNestedNode.tsx index f4492484..38aa299c 100644 --- a/packages/react-json-tree/src/JSONNestedNode.tsx +++ b/packages/react-json-tree/src/JSONNestedNode.tsx @@ -118,37 +118,46 @@ export default function JSONNestedNode(props: Props) { const [defaultExpanded] = useState( // calculate individual node expansion if necessary - isCircular - ? false - : (function getDefault(){ + isCircular + ? false + : (function getDefault() { switch (shouldExpandNode) { - case 'expand': return true; - case 'collapse': return false; - default: return shouldExpandNodeInitially(keyPath, data, level); - } - })() + case 'expand': + return true; + case 'collapse': + return false; + default: + return shouldExpandNodeInitially(keyPath, data, level); + } + })() ); const [, setTriggerReRender] = useState(defaultExpanded); /** * Used the useRef to handle expanded because calling a setState in a recursive implementation - * could lead to a "Maximum update depth exceeded" error */ - const expandedRef = useRef(defaultExpanded) - + * could lead to a "Maximum update depth exceeded" error */ + const expandedRef = useRef(defaultExpanded); + switch (shouldExpandNode) { - case 'expand': expandedRef.current = isCircular ? false : true; break; - case 'collapse': expandedRef.current = false; break; - case 'default': expandedRef.current = defaultExpanded; break; + case 'expand': + expandedRef.current = isCircular ? false : true; + break; + case 'collapse': + expandedRef.current = false; + break; + case 'default': + expandedRef.current = defaultExpanded; + break; default: //Do nothing; } const handleClick = useCallback(() => { if (expandable) { - expandedRef.current = !expandedRef.current - setTriggerReRender((e) => !e) + expandedRef.current = !expandedRef.current; + setTriggerReRender((e) => !e); setEnableDefaultButton(true); - setShouldExpandNode(undefined) + setShouldExpandNode(undefined); } }, [expandable, setEnableDefaultButton, setShouldExpandNode]); @@ -169,7 +178,12 @@ export default function JSONNestedNode(props: Props) { createItemString(data, collectionLimit), keyPath ); - const stylingArgs = [keyPath, nodeType, expandedRef.current, expandable] as const; + const stylingArgs = [ + keyPath, + nodeType, + expandedRef.current, + expandable, + ] as const; return hideRoot ? (
  • diff --git a/packages/react-json-tree/src/createStylingFromTheme.ts b/packages/react-json-tree/src/createStylingFromTheme.ts index 189f5651..f43b88cf 100644 --- a/packages/react-json-tree/src/createStylingFromTheme.ts +++ b/packages/react-json-tree/src/createStylingFromTheme.ts @@ -58,7 +58,7 @@ const getDefaultThemeStyling = (theme: Base16Theme): StylingConfig => { WebkitUserSelect: 'none', backgroundColor: colors.BACKGROUND_COLOR, }, - + expandable: { color: colors.TEXT_COLOR, backgroundColor: colors.BACKGROUND_COLOR, diff --git a/packages/react-json-tree/src/expandableButtonsContext.tsx b/packages/react-json-tree/src/expandableButtonsContext.tsx index b1a2f82c..41e15f47 100644 --- a/packages/react-json-tree/src/expandableButtonsContext.tsx +++ b/packages/react-json-tree/src/expandableButtonsContext.tsx @@ -24,7 +24,11 @@ interface Props { const ExpandableButtonsContext = createContext({} as Context); -function ExpandableButtonsContextProvider({ expandable, children, styling }: Props) { +function ExpandableButtonsContextProvider({ + expandable, + children, + styling, +}: Props) { const [enableDefaultButton, setEnableDefaultButton] = useState(false); const [shouldExpandNode, setShouldExpandNode] = useState(); @@ -41,7 +45,9 @@ function ExpandableButtonsContextProvider({ expandable, children, styling }: Pro return ( {children} - {expandable && } + {expandable && ( + + )} ); } diff --git a/packages/react-json-tree/test/index.spec.tsx b/packages/react-json-tree/test/index.spec.tsx index 3db514ee..198975ac 100644 --- a/packages/react-json-tree/test/index.spec.tsx +++ b/packages/react-json-tree/test/index.spec.tsx @@ -17,6 +17,8 @@ describe('JSONTree', () => { const result = render(); expect(result.type).toBe('ul'); - expect(result.props.children.type.name).toBe(ExpandableButtonsContextProvider.name); + expect(result.props.children.type.name).toBe( + ExpandableButtonsContextProvider.name + ); }); });