Merge branch 'master' into dependabot/npm_and_yarn/typescript-4.5.5

fjmorant · web-flow · commit 4ba809d3871e · 2022-01-31T06:40:54.000+01:00
diff --git a/prettier.config.js b/prettier.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   bracketSpacing: true,
-  jsxBracketSameLine: true,
+  bracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
 };
diff --git a/src/NestedListView.tsx b/src/NestedListView.tsx
@@ -108,7 +108,7 @@ const NestedListView = React.memo(
       [generateIds],
     );
 
-    const [_root, setRoot]: [INode, (_root: INode) => void] =
+    const [_root, setRoot]: [INode, (_rootNode: INode) => void] =
       useState(defaultRootNode);
 
     useEffect(() => {
