Fix PR comments

Feature: CMS-47083

Author: GiangNT95

packages/optimizely-cms-sdk/src/infer.ts

@@ -190,8 +190,12 @@ type InferFromDisplayTemplate<T extends DisplayTemplate> =
   T extends { settings: infer S }
     ? {
         [K in keyof S]:
-          S[K] extends { choices: Record<string, any> }
-            ? keyof S[K]['choices']
+          S[K] extends { choices: Record<string, any>; editor: infer E }
+            ? E extends 'select'
+              ? keyof S[K]['choices']
+              : E extends 'checkbox'
+                ? Array<keyof S[K]['choices']>
+                : never
             : never;
       }
     : {};

packages/optimizely-cms-sdk/src/model/__test__/parseDisplaySettings.test.ts

@@ -25,12 +25,12 @@ describe('parseDisplaySettings', () => {
   it('should return an empty object for null input', () => {
     const input = null;
     const result = parseDisplaySettings(input ?? undefined);
-    expect(result).toEqual({});
+    expect(result).toBeUndefined();
   });
 
   it('should return an empty object for undefined input', () => {
     const input = undefined;
     const result = parseDisplaySettings(input);
-    expect(result).toEqual({});
+    expect(result).toBeUndefined();
   });
 });

packages/optimizely-cms-sdk/src/model/displayTemplates.ts

@@ -82,7 +82,7 @@ export type DisplayTemplate<T = DisplayTemplateVariant> = T & {
 
 export const parseDisplaySettings = <T extends DisplayTemplate>(
   settings: DisplaySettingsType[] | null | undefined
-): Infer<DisplayTemplate> => {
+): Partial<Infer<T>> | undefined => {
   const result = {} as Infer<T>;
   settings?.forEach(s => {
     result[s.key as keyof Infer<T>] = s.value as Infer<T>[keyof Infer<T>];

packages/optimizely-cms-sdk/src/react/server.tsx

@@ -10,9 +10,10 @@ import {
   ExperienceComponentNode,
   DisplaySettingsType,
   ExperienceCompositionNode,
+  Infer,
 } from '../infer.js';
 import { isComponentNode } from '../util/baseTypeUtil.js';
-import { parseDisplaySettings } from '../model/displayTemplates.js';
+import { DisplayTemplate, parseDisplaySettings } from '../model/displayTemplates.js';
 import { getDisplayTemplateTag } from '../model/displayTemplateRegistry.js';
 import { isDev } from '../util/environment.js';
 
@@ -70,7 +71,7 @@ export function initReactComponentRegistry(options: InitOptions) {
 }
 
 /** Props for the {@linkcode OptimizelyComponent} component */
-type OptimizelyComponentProps = {
+type OptimizelyComponentProps<T extends DisplayTemplate = DisplayTemplate>  = {
   /** Data read from the CMS */
   opti: {
     /** Content type name */
@@ -87,7 +88,7 @@ type OptimizelyComponentProps = {
     __composition?: ExperienceCompositionNode;
   };
 
-  displaySettings?: Record<string, string>;
+  displaySettings?: Partial<Infer<T>>;
 };
 
 export async function OptimizelyComponent({
@@ -127,16 +128,16 @@ export async function OptimizelyComponent({
   );
 }
 
-export type StructureContainerProps = {
+export type StructureContainerProps<T extends DisplayTemplate = DisplayTemplate> = {
   node: ExperienceStructureNode;
   children: React.ReactNode;
   index?: number;
-  displaySettings?: Record<string, string>;
+  displaySettings?: Partial<Infer<T>>;
 };
-export type ComponentContainerProps = {
+export type ComponentContainerProps<T extends DisplayTemplate = DisplayTemplate>  = {
   node: ExperienceComponentNode;
   children: React.ReactNode;
-  displaySettings?: Record<string, string>;
+  displaySettings?: Partial<Infer<T>>;
 };
 export type StructureContainer = (
   props: StructureContainerProps