Merge branch 'bose/2616' into staging

equinor · Nov 1, 2024 · 93c0c8c · 93c0c8c
2 parents d3b071f + 53afc5d
commit 93c0c8c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/sanityv3/schemas/objects/card.tsx b/sanityv3/schemas/objects/card.tsx
@@ -1,11 +1,11 @@
 /* eslint-disable react/display-name */
-import { forwardRef } from 'react'
 import { configureBlockContent } from '../editors'
 import type { PortableTextBlock } from 'sanity'
 import { Stack, Text, Card } from '@sanity/ui'
 import blocksToText from '../../helpers/blocksToText'
 
-const CardField = forwardRef((props: any) => {
+const CardField = (props: any) => {
+  const { renderDefault } = props
   return (
     <Stack>
       <Card padding={3} borderLeft>
@@ -14,10 +14,10 @@ const CardField = forwardRef((props: any) => {
           content will be rendered.
         </Text>
       </Card>
-      <>{props.renderDefault(props)}</>
+      <>{renderDefault(props)}</>
     </Stack>
   )
-})
+}
 
 const blockConfig = {
   h2: false,

diff --git a/sanityv3/tsconfig.json b/sanityv3/tsconfig.json
@@ -1,5 +1,10 @@
 {
   "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "paths": {
+      "react": ["./node_modules/@types/react"]
+    }
+  },
   "include": ["**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]
 }