Merge pull request #976 from contentful/development

release@next
contentful · Feb 4, 2025 · ed279b2 · ed279b2
2 parents 0d21a1f + 5bea055
commit ed279b2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 34 deletions.
diff --git a/packages/templates/nextjs-marketing-demo/src/components/Footer/FooterNav.tsx b/packages/templates/nextjs-marketing-demo/src/components/Footer/FooterNav.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useState } from 'react';
+import React from 'react';
 import { usePathname } from 'next/navigation';
 import Link from 'next/link';
 import { Menu } from 'antd';
@@ -13,27 +13,20 @@ const items = [
   },
   {
     key: '/about',
-    label: <Link href="/about">About</Link>,
+    label: 'About',
   },
   {
     key: '/contact',
-    label: <Link href="/contact">Contact</Link>,
+    label: 'Contact',
   },
 ];
 
 const FooterNav: React.FC = () => {
   const pathname = usePathname();
-  const [current, setCurrent] = useState(pathname);
 
   return (
     <div className={styles.nav}>
-      <Menu
-        onClick={(e) => setCurrent(e.key)}
-        selectedKeys={[current]}
-        mode="horizontal"
-        className={styles.menu}
-        items={items}
-      />
+      <Menu selectedKeys={[pathname]} mode="horizontal" className={styles.menu} items={items} />
     </div>
   );
 };

diff --git a/packages/templates/nextjs-marketing-demo/src/components/Header/HeaderNav.tsx b/packages/templates/nextjs-marketing-demo/src/components/Header/HeaderNav.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useState } from 'react';
+import React from 'react';
 import { usePathname } from 'next/navigation';
 import Link from 'next/link';
 import { Button, Grid, Menu } from 'antd';
@@ -14,29 +14,27 @@ const items = [
   },
   {
     key: '/about',
-    label: <Link href="/about">About</Link>,
+    label: 'About',
   },
 ];
 
 const mobileItems = [
   ...items,
   {
     key: '/contact',
-    label: <Link href="/contact">Contact</Link>,
+    label: 'Contact',
   },
 ];
 
 const Nav: React.FC = () => {
   const pathname = usePathname();
-  const [current, setCurrent] = useState(pathname);
   const screens = Grid.useBreakpoint();
 
   if (screens.xs) {
     return (
       <div className={styles.nav}>
         <Menu
-          onClick={(e) => setCurrent(e.key)}
-          selectedKeys={[current]}
+          selectedKeys={[pathname]}
           mode="horizontal"
           className={styles.mobileMenu}
           items={mobileItems}
@@ -52,16 +50,8 @@ const Nav: React.FC = () => {
 
   return (
     <div className={styles.nav}>
-      <Menu
-        onClick={(e) => setCurrent(e.key)}
-        selectedKeys={[current]}
-        mode="horizontal"
-        className={styles.menu}
-        items={items}
-      />
-      <Link href="/contact">
-        <Button variant="outlined">Contact Us</Button>
-      </Link>
+      <Menu selectedKeys={[pathname]} mode="horizontal" className={styles.menu} items={items} />
+      <Button variant="outlined">Contact Us</Button>
     </div>
   );
 };

diff --git a/packages/validators/src/schemas/v2023_09_28/experience.ts b/packages/validators/src/schemas/v2023_09_28/experience.ts
@@ -86,17 +86,22 @@ const ComponentValueSchema = z
   })
   .strict();
 
+// TODO: finalize schema structure before release
+// https://contentful.atlassian.net/browse/LUMOS-523
+const EmptyObjectSchema = z.object({ type: z.undefined() });
+
 const ComponentPropertyValueSchema = z.discriminatedUnion('type', [
   DesignValueSchema,
   BoundValueSchema,
   UnboundValueSchema,
   HyperlinkValueSchema,
   ComponentValueSchema,
+  EmptyObjectSchema,
 ]);
 
 export type ComponentPropertyValue = z.infer<typeof ComponentPropertyValueSchema>;
 
-// TODO: finalized schema structure before release
+// TODO: finalize schema structure before release
 // https://contentful.atlassian.net/browse/LUMOS-523
 const VariableMappingSchema = z.object({
   patternPropertyDefinitionId: propertyKeySchema,
@@ -106,13 +111,16 @@ const VariableMappingSchema = z.object({
 
 const VariableMappingsSchema = z.record(propertyKeySchema, VariableMappingSchema);
 
-// TODO: finalized schema structure before release
+// TODO: finalize schema structure before release
 // https://contentful.atlassian.net/browse/LUMOS-523
 const PatternPropertyDefinitionSchema = z.object({
-  defaultValue: z.object({
-    path: z.string(),
-    type: z.literal('BoundValue'),
-  }),
+  defaultValue: z.union([
+    z.object({
+      path: z.string(),
+      type: z.literal('BoundValue'),
+    }),
+    z.null(),
+  ]),
   contentTypes: z.record(z.string(), z.any()),
 });
 
@@ -121,7 +129,7 @@ const PatternPropertyDefinitionsSchema = z.record(
   PatternPropertyDefinitionSchema,
 );
 
-// TODO: finalized schema structure before release
+// TODO: finalize schema structure before release
 // https://contentful.atlassian.net/browse/LUMOS-523
 const PatternPropertySchema = z.object({
   type: z.literal('BoundValue'),