review

Author: quentin-sommer

packages/core/src/components/fields/MultiSchemaField.tsx

@@ -123,7 +123,7 @@ class AnyOfField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends For
     const oldOption = selectedOption >= 0 ? retrievedOptions[selectedOption] : undefined;
 
     let newFormData = schemaUtils.sanitizeDataForNewSchema(newOption, oldOption, formData);
-    if (newFormData && newOption) {
+    if (newOption) {
       // Call getDefaultFormState to make sure defaults are populated on change. Pass "excludeObjectChildren"
       // so that only the root objects themselves are created without adding undefined children properties
       newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, 'excludeObjectChildren') as T;

packages/utils/src/schema/sanitizeDataForNewSchema.ts

@@ -44,8 +44,6 @@ const NO_VALUE = Symbol('no Value');
  *         - For each element in the `data` recursively sanitize the data, stopping at `maxItems` if specified
  *       - Otherwise, just return the `data` removing any values after `maxItems` if it is set
  *   - If the type of the old and new schema `items` are booleans of the same value, return `data` as is
- * - If the new schema contains a default value then:
- *   - return the default value. We expect this to be a scalar value
  * - Otherwise return `undefined`
  *
  * @param validator - An implementation of the `ValidatorType` interface that will be used when necessary
@@ -54,8 +52,7 @@ const NO_VALUE = Symbol('no Value');
  * @param [oldSchema] - The old schema from which the data originated
  * @param [data={}] - The form data associated with the schema, defaulting to an empty object when undefined
  * @returns - The new form data, with all the fields uniquely associated with the old schema set
- *      to `undefined`. Will return `undefined` if the new schema is not an object containing properties
- *      and doesn't provide a default value
+ *   to `undefined`. Will return `undefined` if the new schema is not an object containing properties.
  */
 export default function sanitizeDataForNewSchema<
   T = any,
@@ -196,12 +193,5 @@ export default function sanitizeDataForNewSchema<
     }
     // Also probably want to deal with `prefixItems` as tuples with the latest 2020 draft
   }
-  // Schema contains a single scalar value
-  else {
-    const newDefaultValue = get(newSchema, 'default');
-    if (newDefaultValue !== undefined) {
-      newFormData = newDefaultValue;
-    }
-  }
   return newFormData as T;
 }

packages/utils/test/schema/sanitizeDataForNewSchemaTest.ts

@@ -483,16 +483,5 @@ export default function sanitizeDataForNewSchemaTest(testValidator: TestValidato
       };
       expect(schemaUtils.sanitizeDataForNewSchema(newSchema, oldSchema, ['qwerty', 'asdfg'])).toEqual({});
     });
-
-    it('returns default value when new schema is a scalar schema', () => {
-      const oldSchema: RJSFSchema = {
-        type: 'string',
-      };
-      const newSchema: RJSFSchema = {
-        type: 'boolean',
-        default: true,
-      };
-      expect(schemaUtils.sanitizeDataForNewSchema(newSchema, oldSchema, 'oldValue')).toEqual(true);
-    });
   });
 }