Fix some type definitions

plone · May 13, 2024 · db0e008 · db0e008
1 parent 369418b
commit db0e008
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/packages/types/src/blocks/index.d.ts b/packages/types/src/blocks/index.d.ts
@@ -9,6 +9,7 @@ import type { Location, History } from 'history';
 
 export interface BlocksFormData {
   '@type': AvailableBlocks;
+  variation?: string;
 }
 
 export interface BlockViewProps {

diff --git a/packages/volto/src/helpers/Blocks/Blocks.js b/packages/volto/src/helpers/Blocks/Blocks.js
@@ -414,7 +414,7 @@ export function emptyBlocksForm() {
  * (could be empty, if not type given) and the number of blocks
  * @function blocksFormGenerator
  * @param {number} number How many blocks to generate of the type (could be "empty", if no type provided)
- * @param {number} type The type of the blocks
+ * @param {string} type The type of the blocks
  * @return {Object} blocks/blocks_layout pair filled with the generated blocks
  */
 export function blocksFormGenerator(number, type) {
@@ -483,26 +483,26 @@ export function applySchemaDefaults({ data = {}, schema, intl }) {
             [currentField]: schema.properties[currentField].default,
           }
         : intl &&
-            schema.properties[currentField].schema &&
-            !(schema.properties[currentField].widget === 'object_list') // TODO: this should be renamed as itemSchema
-          ? {
-              ...accumulator,
-              [currentField]: {
-                ...applySchemaDefaults({
-                  data: { ...data[currentField], ...accumulator[currentField] },
-                  schema:
-                    typeof schema.properties[currentField].schema === 'function'
-                      ? schema.properties[currentField].schema({
-                          data: accumulator[currentField],
-                          formData: accumulator[currentField],
-                          intl,
-                        })
-                      : schema.properties[currentField].schema,
-                  intl,
-                }),
-              },
-            }
-          : accumulator;
+          schema.properties[currentField].schema &&
+          !(schema.properties[currentField].widget === 'object_list') // TODO: this should be renamed as itemSchema
+        ? {
+            ...accumulator,
+            [currentField]: {
+              ...applySchemaDefaults({
+                data: { ...data[currentField], ...accumulator[currentField] },
+                schema:
+                  typeof schema.properties[currentField].schema === 'function'
+                    ? schema.properties[currentField].schema({
+                        data: accumulator[currentField],
+                        formData: accumulator[currentField],
+                        intl,
+                      })
+                    : schema.properties[currentField].schema,
+                intl,
+              }),
+            },
+          }
+        : accumulator;
     }, {}),
     data,
   );