chore(web): fix type errors in align system

reearth · Nov 22, 2023 · 91a8215 · 91a8215
1 parent 0214045
commit 91a8215
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/web/src/classic/components/molecules/Visualizer/WidgetAlignSystem/hooks.ts b/web/src/classic/components/molecules/Visualizer/WidgetAlignSystem/hooks.ts
@@ -21,7 +21,7 @@ export type WidgetArea = {
   align?: Alignment;
   padding?: WidgetAreaPadding;
   widgets?: Widget[];
-  gap?: number | null;
+  gap?: number;
   centered?: boolean;
   background?: string;
 };

diff --git a/web/src/classic/components/organisms/EarthEditor/CanvasArea/convert.ts b/web/src/classic/components/organisms/EarthEditor/CanvasArea/convert.ts
@@ -377,10 +377,10 @@ export const convertWidgets = (
         left: padding?.left ?? 6,
         right: padding?.right ?? 6,
       },
+      gap: area?.gap ?? 6,
       widgets: areaWidgets,
       background: area?.background as string | undefined,
       centered: area?.centered,
-      gap: area?.gap,
     };
   };
 

diff --git a/web/src/classic/components/organisms/Published/core/hooks.ts b/web/src/classic/components/organisms/Published/core/hooks.ts
@@ -140,10 +140,10 @@ export default (alias?: string) => {
           left: padding?.left ?? 6,
           right: padding?.right ?? 6,
         },
+        gap: area?.gap ?? 6,
         widgets: areaWidgets || [],
         background: area?.background as string | undefined,
         centered: area?.centered,
-        gap: area?.gap,
       };
     };
 

diff --git a/web/src/classic/components/organisms/Published/hooks.ts b/web/src/classic/components/organisms/Published/hooks.ts
@@ -125,10 +125,10 @@ export default (alias?: string) => {
           left: padding?.left ?? 6,
           right: padding?.right ?? 6,
         },
+        gap: area?.gap ?? 6,
         widgets: areaWidgets,
         background: area?.background as string | undefined,
         centered: area?.centered,
-        gap: area?.gap,
       };
     };
 

diff --git a/web/src/classic/core/Crust/Widgets/WidgetAlignSystem/types.ts b/web/src/classic/core/Crust/Widgets/WidgetAlignSystem/types.ts
@@ -18,7 +18,7 @@ export type WidgetArea = {
   align?: Alignment;
   padding?: WidgetAreaPadding;
   widgets?: InternalWidget[];
-  gap?: number | null;
+  gap?: number;
   centered?: boolean;
   background?: string;
 };