@rjsf/core 6.1.1 → 6.2.3

package/dist/index.esm.js

@@ -9,8 +9,6 @@ import {
   getUiOptions as getUiOptions21,
   isObject as isObject6,
   mergeObjects,
-  NAME_KEY,
-  RJSF_ADDITIONAL_PROPERTIES_FLAG,
   shouldRender as shouldRender2,
   SUBMIT_BTN_OPTIONS_KEY,
   toErrorList,
@@ -21,7 +19,9 @@ import {
   DEFAULT_ID_SEPARATOR as DEFAULT_ID_SEPARATOR2,
   DEFAULT_ID_PREFIX as DEFAULT_ID_PREFIX2,
   ERRORS_KEY as ERRORS_KEY3,
-  ID_KEY as ID_KEY5
+  ID_KEY as ID_KEY5,
+  getUsedFormData,
+  getFieldNames
 } from "@rjsf/utils";
 import _cloneDeep from "lodash/cloneDeep";
 import _get from "lodash/get";
@@ -1613,6 +1613,7 @@ function LayoutMultiSchemaField(props) {
   return /* @__PURE__ */ jsx6(
     FieldTemplate2,
     {
+      fieldPathId,
       id,
       schema,
       label: (title || schema.title) ?? "",
@@ -2473,6 +2474,7 @@ function SchemaFieldRender(props) {
     rawHelp: typeof help === "string" ? help : void 0,
     errors: errorsComponent,
     rawErrors: hideError ? void 0 : __errors,
+    fieldPathId,
     id,
     label,
     hidden,
@@ -2912,6 +2914,7 @@ function BaseInputTemplate(props) {
     // remove this from ...rest
     ...rest
   } = props;
+  const { ClearButton: ClearButton2 } = registry.templates.ButtonTemplates;
   if (!id) {
     console.log("No id for", props);
     throw new Error(`no id for props ${JSON.stringify(props)}`);
@@ -2938,6 +2941,14 @@ function BaseInputTemplate(props) {
     ({ target }) => onFocus(id, target && target.value),
     [onFocus, id]
   );
+  const _onClear = useCallback7(
+    (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      onChange(options.emptyValue ?? "");
+    },
+    [onChange, options.emptyValue]
+  );
   return /* @__PURE__ */ jsxs6(Fragment3, { children: [
     /* @__PURE__ */ jsx18(
       "input",
@@ -2957,6 +2968,7 @@ function BaseInputTemplate(props) {
         "aria-describedby": ariaDescribedByIds(id, !!schema.examples)
       }
     ),
+    options.allowClearTextInputs && !readonly && !disabled && inputValue && /* @__PURE__ */ jsx18(ClearButton2, { registry, onClick: _onClear }),
     Array.isArray(schema.examples) && /* @__PURE__ */ jsx18("datalist", { id: examplesId(id), children: schema.examples.concat(schema.default && !schema.examples.includes(schema.default) ? [schema.default] : []).map((example) => {
       return /* @__PURE__ */ jsx18("option", { value: example }, example);
     }) }, `datalist_${id}`)
@@ -3008,6 +3020,30 @@ function RemoveButton(props) {
   } = props;
   return /* @__PURE__ */ jsx20(IconButton, { title: translateString(TranslatableString7.RemoveButton), ...props, iconType: "danger", icon: "remove" });
 }
+function ClearButton({
+  id,
+  className,
+  onClick,
+  disabled,
+  registry,
+  ...props
+}) {
+  const { translateString } = registry;
+  return /* @__PURE__ */ jsx20(
+    IconButton,
+    {
+      id,
+      iconType: "default",
+      icon: "remove",
+      className: "btn-clear col-xs-12",
+      title: translateString(TranslatableString7.ClearButton),
+      onClick,
+      disabled,
+      registry,
+      ...props
+    }
+  );
+}
 
 // src/components/templates/ButtonTemplates/AddButton.tsx
 import { jsx as jsx21 } from "react/jsx-runtime";
@@ -3048,7 +3084,8 @@ function buttonTemplates() {
     CopyButton,
     MoveDownButton,
     MoveUpButton,
-    RemoveButton
+    RemoveButton,
+    ClearButton
   };
 }
 var ButtonTemplates_default = buttonTemplates;
@@ -3265,6 +3302,10 @@ function ObjectFieldTemplate(props) {
     registry,
     options
   );
+  const isPureUnionSchema = (schema.oneOf || schema.anyOf) && !schema.properties && properties.length === 0;
+  if (isPureUnionSchema) {
+    return null;
+  }
   const showOptionalDataControlInTitle = !readonly && !disabled;
   const {
     ButtonTemplates: { AddButton: AddButton2 }
@@ -4135,10 +4176,6 @@ function TextareaWidget({
     }
   );
 }
-TextareaWidget.defaultProps = {
-  autofocus: false,
-  options: {}
-};
 var TextareaWidget_default = TextareaWidget;
 
 // src/components/widgets/TextWidget.tsx
@@ -4239,6 +4276,10 @@ var Form = class extends Component3 {
   /** The list of pending changes
    */
   pendingChanges = [];
+  /** Flag to track when we're processing a user-initiated field change.
+   * This prevents componentDidUpdate from reverting oneOf/anyOf option switches.
+   */
+  _isProcessingUserChange = false;
   /** Constructs the `Form` from the `props`. Will setup the initial state from the props. It will also call the
    * `onChange` handler if the initially provided `formData` is modified to add missing default values as part of the
    * state construction.
@@ -4315,7 +4356,13 @@ var Form = class extends Component3 {
   componentDidUpdate(_, prevState, snapshot) {
     if (snapshot.shouldUpdate) {
       const { nextState } = snapshot;
-      if (!deepEquals2(nextState.formData, this.props.formData) && !deepEquals2(nextState.formData, prevState.formData) && this.props.onChange) {
+      const nextStateDiffersFromProps = !deepEquals2(nextState.formData, this.props.formData);
+      const wasProcessingUserChange = this._isProcessingUserChange;
+      this._isProcessingUserChange = false;
+      if (wasProcessingUserChange && nextStateDiffersFromProps) {
+        return;
+      }
+      if (nextStateDiffersFromProps && !deepEquals2(nextState.formData, prevState.formData) && this.props.onChange) {
         this.props.onChange(toIChangeEvent(nextState));
       }
       this.setState(nextState);
@@ -4551,60 +4598,30 @@ var Form = class extends Component3 {
    *
    * @param formData - The data for the `Form`
    * @param fields - The fields to keep while filtering
+   * @deprecated - To be removed as an exported `Form` function in a future release; there isn't a planned replacement
    */
   getUsedFormData = (formData, fields2) => {
-    if (fields2.length === 0 && typeof formData !== "object") {
-      return formData;
-    }
-    const data = _pick(formData, fields2);
-    if (Array.isArray(formData)) {
-      return Object.keys(data).map((key) => data[key]);
-    }
-    return data;
+    return getUsedFormData(formData, fields2);
   };
   /** Returns the list of field names from inspecting the `pathSchema` as well as using the `formData`
    *
    * @param pathSchema - The `PathSchema` object for the form
    * @param [formData] - The form data to use while checking for empty objects/arrays
+   * @deprecated - To be removed as an exported `Form` function in a future release; there isn't a planned replacement
    */
   getFieldNames = (pathSchema, formData) => {
-    const formValueHasData = (value, isLeaf) => typeof value !== "object" || _isEmpty(value) || isLeaf && !_isEmpty(value);
-    const getAllPaths = (_obj, acc = [], paths = [[]]) => {
-      const objKeys = Object.keys(_obj);
-      objKeys.forEach((key) => {
-        const data = _obj[key];
-        if (typeof data === "object") {
-          const newPaths = paths.map((path) => [...path, key]);
-          if (data[RJSF_ADDITIONAL_PROPERTIES_FLAG] && data[NAME_KEY] !== "") {
-            acc.push(data[NAME_KEY]);
-          } else {
-            getAllPaths(data, acc, newPaths);
-          }
-        } else if (key === NAME_KEY && data !== "") {
-          paths.forEach((path) => {
-            const formValue = _get(formData, path);
-            const isLeaf = objKeys.length === 1;
-            if (formValueHasData(formValue, isLeaf) || Array.isArray(formValue) && formValue.every((val) => formValueHasData(val, isLeaf))) {
-              acc.push(path);
-            }
-          });
-        }
-      });
-      return acc;
-    };
-    return getAllPaths(pathSchema);
+    return getFieldNames(pathSchema, formData);
   };
   /** Returns the `formData` after filtering to remove any extra data not in a form field
    *
    * @param formData - The data for the `Form`
    * @returns The `formData` after omitting extra data
+   * @deprecated - To be removed as an exported `Form` function in a future release, use `SchemaUtils.omitExtraData`
+   *               instead.
    */
   omitExtraData = (formData) => {
     const { schema, schemaUtils } = this.state;
-    const retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
-    const pathSchema = schemaUtils.toPathSchema(retrievedSchema, "", formData);
-    const fieldNames = this.getFieldNames(pathSchema, formData);
-    return this.getUsedFormData(formData, fieldNames);
+    return schemaUtils.omitExtraData(schema, formData);
   };
   /** Allows a user to set a value for the provided `fieldPath`, which must be either a dotted path to the field OR a
    * `FieldPathList`. To set the root element, used either `''` or `[]` for the path. Passing undefined will clear the
@@ -4646,6 +4663,7 @@ var Form = class extends Component3 {
     if (this.pendingChanges.length === 0) {
       return;
     }
+    this._isProcessingUserChange = true;
     const { newValue, path, id } = this.pendingChanges[0];
     const { newErrorSchema } = this.pendingChanges[0];
     const { extraErrors, omitExtraData, liveOmit, noValidate, liveValidate, onChange } = this.props;
@@ -4655,13 +4673,16 @@ var Form = class extends Component3 {
     const isRootPath = !path || path.length === 0 || path.length === 1 && path[0] === rootPathId;
     let retrievedSchema = this.state.retrievedSchema;
     let formData = isRootPath ? newValue : _cloneDeep(oldFormData);
+    const hasOnlyUndefinedValues = isObject6(formData) && Object.keys(formData).length > 0 && Object.values(formData).every((v) => v === void 0);
+    const wasPreviouslyNull = oldFormData === null || oldFormData === void 0;
+    const inputForDefaults = hasOnlyUndefinedValues && wasPreviouslyNull ? void 0 : formData;
     if (isObject6(formData) || Array.isArray(formData)) {
       if (newValue === ADDITIONAL_PROPERTY_KEY_REMOVE) {
         _unset(formData, path);
       } else if (!isRootPath) {
         _set(formData, path, newValue);
       }
-      const newState = this.getStateFromProps(this.props, formData, void 0, void 0, void 0, true);
+      const newState = this.getStateFromProps(this.props, inputForDefaults, void 0, void 0, void 0, true);
       formData = newState.formData;
       retrievedSchema = newState.retrievedSchema;
     }