fix: show field loader when using field overrides

measuredco · May 30, 2024 · 8ccfa4c · 8ccfa4c
1 parent 151a267
commit 8ccfa4c
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/packages/core/components/Puck/components/Fields/index.tsx b/packages/core/components/Puck/components/Fields/index.tsx
@@ -25,22 +25,12 @@ const defaultPageFields: Record<string, Field> = {
 
 const DefaultFields = ({
   children,
-  isLoading,
 }: {
   children: ReactNode;
   isLoading: boolean;
   itemSelector?: ItemSelector | null;
 }) => {
-  return (
-    <div className={getClassName({ isLoading })}>
-      {children}
-      {isLoading && (
-        <div className={getClassName("loadingOverlay")}>
-          <Loader size="32" />
-        </div>
-      )}
-    </div>
-  );
+  return <>{children}</>;
 };
 
 type ComponentOrRootData = Omit<Partial<ComponentData<any>>, "type">;
@@ -286,6 +276,11 @@ export const Fields = () => {
           }
         })}
       </Wrapper>
+      {isLoading && (
+        <div className={getClassName("loadingOverlay")}>
+          <Loader size={32} />
+        </div>
+      )}
     </form>
   );
 };