fix(core/form/inputs): clean up rebase leftovers (next branch)

sanity-io · May 30, 2023 · 3923b6c · 3923b6c
1 parent 121e906
commit 3923b6c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/packages/sanity/src/core/form/inputs/PortableText/PortableTextInput.tsx b/packages/sanity/src/core/form/inputs/PortableText/PortableTextInput.tsx
@@ -1,4 +1,4 @@
-import {PortableTextBlock} from '@sanity/types'
+import {Path, PortableTextBlock} from '@sanity/types'
 import {
   EditorChange,
   Patch as EditorPatch,

diff --git a/packages/sanity/src/core/form/inputs/PortableText/object/Annotation.tsx b/packages/sanity/src/core/form/inputs/PortableText/object/Annotation.tsx
@@ -1,7 +1,8 @@
 import {PortableTextEditor, usePortableTextEditor} from '@sanity/portable-text-editor'
 import {ObjectSchemaType, Path, PortableTextObject} from '@sanity/types'
 import {Tooltip} from '@sanity/ui'
-import React, {ComponentType, useCallback, useMemo} from 'react'
+import React, {ComponentType, useCallback, useMemo, useState} from 'react'
+import {isEqual} from '@sanity/util/paths'
 import {pathToString} from '../../../../field'
 import {BlockAnnotationProps, RenderCustomMarkers} from '../../../types'
 import {DefaultMarkers} from '../_legacyDefaultParts/Markers'
@@ -111,7 +112,7 @@ export function Annotation(props: AnnotationProps) {
   const isOpen = Boolean(memberItem?.member.open)
   const input = memberItem?.input
   const nodePath = memberItem?.node.path || EMPTY_ARRAY
-  const referenceElement = memberItem?.elementRef?.current
+  const referenceElement = spanElm
 
   const componentProps = useMemo(
     (): BlockAnnotationProps => ({
@@ -154,7 +155,6 @@ export function Annotation(props: AnnotationProps) {
       referenceElement,
       schemaType,
       selected,
-      spanElm,
       text,
       validation,
       value,

diff --git a/packages/sanity/src/core/form/inputs/PortableText/object/BlockObject.tsx b/packages/sanity/src/core/form/inputs/PortableText/object/BlockObject.tsx
@@ -6,7 +6,16 @@ import {
 } from '@sanity/portable-text-editor'
 import {ObjectSchemaType, Path, PortableTextBlock, isImage} from '@sanity/types'
 import {Tooltip, Flex, ResponsivePaddingProps, Box} from '@sanity/ui'
-import React, {ComponentType, PropsWithChildren, useCallback, useMemo, useState} from 'react'
+import React, {
+  ComponentType,
+  PropsWithChildren,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import {isEqual} from '@sanity/util/paths'
 import {PatchArg} from '../../../patch'
 import {BlockProps, RenderCustomMarkers, RenderPreviewCallback} from '../../../types'
 import {RenderBlockActionsCallback} from '../types'

diff --git a/packages/sanity/src/core/form/inputs/PortableText/object/InlineObject.tsx b/packages/sanity/src/core/form/inputs/PortableText/object/InlineObject.tsx
@@ -123,7 +123,7 @@ export const InlineObject = (props: InlineObjectProps) => {
       markers,
       memberItem?.member,
       nodePath,
-      onItemClose,
+      onClose,
       onOpen,
       onPathFocus,
       onRemove,