Merge branch 'main' into bose/2547

equinor · Oct 25, 2024 · c778387 · c778387
2 parents 03e8bdb + 76108b1
commit c778387
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/sanityv3/migrations/issue-2533/index.ts b/sanityv3/migrations/issue-2533/index.ts
@@ -0,0 +1,21 @@
+import { at, defineMigration, unset, insertBefore } from 'sanity/migrate'
+
+export default defineMigration({
+  title: 'Issue 2533',
+  documentTypes: ['page', 'magazine'],
+
+  migrate: {
+    array(node, path, _context) {
+      if (path[0] === 'content')
+        return node
+          .filter((it) => (it._type === 'textBlock' || it._type === 'accordion') && it.anchor != null)
+          .filter((e) => !!e)
+          .map((item) => {
+            return [
+              insertBefore([{ _type: 'anchorLink', anchorReference: item.anchor }], { _key: item._key }),
+              at([{ _key: item._key }, 'anchor'], unset()),
+            ]
+          })
+    },
+  },
+})
diff --git a/sanityv3/schemas/objects/accordion.tsx b/sanityv3/schemas/objects/accordion.tsx
@@ -5,7 +5,6 @@ import { AccordionComponent } from '../../icons'
 import CompactBlockEditor from '../components/CompactBlockEditor'
 import { configureTitleBlockContent } from '../editors'
 import { configureBlockContent } from '../editors/blockContentType'
-import { validateComponentAnchor } from '../validations/validateAnchorReference'
 import type { ColorSelectorValue } from '../components/ColorSelector'
 
 export type Accordion = {
@@ -80,18 +79,6 @@ export default {
         hotspot: true,
       },
     },
-    {
-      name: 'anchor',
-      type: 'anchorReferenceField',
-      title: 'Anchor reference',
-      validation: (Rule: Rule) => [
-        Rule.max(0).warning('Clear this field and use anchor link component instead.'),
-        // @ts-ignore
-        Rule.custom((value: string, context: any) => validateComponentAnchor(value, context)),
-      ],
-      fieldset: 'anchor',
-      readOnly: ({ value }: { value?: string }) => !value,
-    },
     {
       title: 'Accordion items',
       name: 'accordion',

diff --git a/web/components/src/Backgrounds/ImageBackgroundContainer.tsx b/web/components/src/Backgrounds/ImageBackgroundContainer.tsx
@@ -28,6 +28,7 @@ export const ImageBackgroundContainer = forwardRef<HTMLDivElement, ImageBackgrou
       overrideGradient = false,
       dontSplit = false,
       aspectRatio,
+      ...rest
     },
     ref,
   ) {
@@ -87,6 +88,7 @@ export const ImageBackgroundContainer = forwardRef<HTMLDivElement, ImageBackgrou
             '--color-on-background': `var(--inverted-text)`,
           } as CSSProperties
         }
+        {...rest}
       >
         {/** Scrim */}
         <div
@@ -103,7 +105,7 @@ export const ImageBackgroundContainer = forwardRef<HTMLDivElement, ImageBackgrou
         </div>
       </div>
     ) : isMobile && !dontSplit ? (
-      <div ref={ref}>
+      <div ref={ref} {...rest}>
         <div
           className={twMerge(`aspect-video`, backgroundClassNames)}
           style={{
@@ -119,6 +121,7 @@ export const ImageBackgroundContainer = forwardRef<HTMLDivElement, ImageBackgrou
         style={{
           backgroundImage: `url(${src})`,
         }}
+        {...rest}
       >
         {/** Scrim */}
         <div

diff --git a/web/lib/queries/common/pageContentFields.ts b/web/lib/queries/common/pageContentFields.ts
@@ -163,7 +163,6 @@ _type == "keyNumbers" =>{
         ${markDefs},
       }
     },
-    anchor,
     "designOptions": {
       ${background},
     }

diff --git a/web/pageComponents/topicPages/Accordion/AccordionBlock.tsx b/web/pageComponents/topicPages/Accordion/AccordionBlock.tsx
@@ -41,7 +41,7 @@ const AccordionBlock = ({ data, anchor, className }: AccordionBlockProps) => {
 
   return (
     <>
-      <StyledTextBlockWrapper {...designOptions} id={anchor || data.anchor} renderFragmentWhenPossible>
+      <StyledTextBlockWrapper {...designOptions} id={anchor} renderFragmentWhenPossible>
         <div
           className={twMerge(
             `flex flex-col gap-6 max-w-viewport mx-auto pb-page-content px-layout-lg [&_svg]:inline [&_svg]:align-baseline`,

diff --git a/web/types/types.ts b/web/types/types.ts
@@ -214,7 +214,6 @@ export type AccordionData = {
   title: PortableTextBlock[]
   ingress: PortableTextBlock[]
   accordion: AccordionListData[]
-  anchor?: string
   designOptions: DesignOptions
   enableStructuredMarkup?: boolean
 }