Fix key warnings

Signed-off-by: Steve Ayers <[email protected]>
connectrpc · Oct 1, 2024 · 247310b · 247310b
1 parent 816a6c7
commit 247310b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 296 deletions.
diff --git a/docs/faq.md b/docs/faq.md
@@ -226,7 +226,7 @@ will return the wire error.
 Alternatively, if you wish to cancel the operation and immediately stop
 the client stream, see [below](#cancel-stream) to cancel the operation.
 
-### How do I cancel a client response stream in Connect-Go?
+### How do I cancel a client response stream in Connect-Go? {#cancel-stream}
 
 To cancel and abort a stream, call the cancel function of the underlying
 context associated with the stream. This context is provided on stream

diff --git a/src/components/home/examples.tsx b/src/components/home/examples.tsx
@@ -203,23 +203,23 @@ function CodeBlock({
 
                     const lineProps = getLineProps({
                       line,
-                      key: i,
                     });
 
                     if (lineClassNames[i]) {
                       lineProps.className += lineClassNames[i].join(" ");
                     }
 
-                    const { key: _, ...rest } = lineProps;
-
                     return (
-                      <span key={i} {...rest}>
+                      <span key={i} {...lineProps}>
                         {line.map((token, key) => {
-                          const { key: _, ...restOf } = getTokenProps({
-                            token,
-                            key,
-                          });
-                          return <span key={key} {...restOf} />;
+                          return (
+                            <span
+                              key={key}
+                              {...getTokenProps({
+                                token,
+                              })}
+                            />
+                          );
                         })}
                         <br />
                       </span>
@@ -243,23 +243,17 @@ function CodeBlock({
                         line[0].content = "\n"; // eslint-disable-line no-param-reassign
                       }
 
-                      const lineProps = getLineProps({ line, key: i });
+                      const lineProps = getLineProps({ line });
                       // Do not apply syntax highlighting to console output
                       delete lineProps.style;
 
-                      const { key, ...rest } = lineProps;
-
                       return (
-                        <span key={i} {...rest}>
+                        <span key={i} {...lineProps}>
                           {line.map((token, key) => {
-                            const tokenProps = getTokenProps({ token, key });
+                            const tokenProps = getTokenProps({ token });
                             // Do not apply syntax highlighting to console output
                             delete tokenProps.style;
-                            const { key: _, ...restOf } = getTokenProps({
-                              token,
-                              key,
-                            });
-                            return <span key={key} {...restOf} />;
+                            return <span key={key} {...tokenProps} />;
                           })}
                         </span>
                       );

diff --git a/src/theme/NavbarItem/DocNavbarItem.tsx b/src/theme/NavbarItem/DocNavbarItem.tsx
diff --git a/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx b/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
diff --git a/src/theme/NavbarItem/DocsVersionNavbarItem.tsx b/src/theme/NavbarItem/DocsVersionNavbarItem.tsx
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   // This file is not used in compilation. It is here just for a nice editor experience.
-  "extends": "@tsconfig/docusaurus/tsconfig.json",
+  "extends": "@docusaurus/tsconfig",
   "compilerOptions": {
     "jsx": "react",
     "baseUrl": ".",