merge v3

Sitefinity · Dec 20, 2023 · c54a2f4 · c54a2f4
1 parent 459362e
commit c54a2f4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/nextjs-framework/editor/widget-framework/attributes.ts b/src/nextjs-framework/editor/widget-framework/attributes.ts
@@ -63,7 +63,7 @@ export const generateAnchorAttrsFromLink = (linkModel?: LinkModel | null, classL
     return attributes;
 };
 
-export const getCustomAttributes = (attributes: { [key: string]: Array<{ Key: string, Value: string }> } | null, part: string): Dictionary => {
+export const getCustomAttributes = (attributes: { [key: string]: Array<{ Key: string, Value: string }> } | null | undefined, part: string): Dictionary => {
     if (!attributes || !attributes[part]){
         return {};
     }

diff --git a/src/nextjs-framework/editor/widget-framework/widget-metadata.ts b/src/nextjs-framework/editor/widget-framework/widget-metadata.ts
@@ -2,7 +2,7 @@ import { EditorMetadata } from './widget-editor-metadata';
 
 export interface WidgetMetadata {
     componentType: any;
-    designerMetadata: any;
+    designerMetadata?: any;
     editorMetadata?: EditorMetadata;
     entity?: any;
     ssr?: boolean;

diff --git a/src/nextjs-framework/widgets/classification/classification-entity.ts b/src/nextjs-framework/widgets/classification/classification-entity.ts
@@ -100,5 +100,5 @@ export class ClassificationEntity {
     SortExpression: string | null = null;
 
     @Attributes('Classification')
-    Attributes?: any[];
+    Attributes?: { [key: string]: Array<{ Key: string, Value: string}> };
 }
diff --git a/src/nextjs-framework/widgets/image/image.tsx b/src/nextjs-framework/widgets/image/image.tsx
@@ -53,7 +53,7 @@ export async function Image(props: WidgetContext<ImageEntity>) {
             imageViewModel.SelectedImageUrl = imageItem.Thumnail.Url;
 
             if (selectedThumbnail) {
-                imageViewModel.SelectedImageUrl = selectedThumbnail.Url;
+                imageViewModel.SelectedImageUrl = selectedThumbnail.Url as string;
                 imageViewModel.Width = selectedThumbnail.Width;
                 imageViewModel.Height = selectedThumbnail.Height;
             }