From a950092348ada28bff30c6ea996c5a3299476da6 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Fri, 24 May 2024 15:47:11 -0400
Subject: [PATCH 1/6] fix #4197 for antd, chakra-ui, fluentui-rc, material-ui,
 mui, semantic-ui

---
 CHANGELOG.md                                  | 25 ++++++
 .../antd/src/widgets/SelectWidget/index.tsx   | 31 +++++---
 .../test/__snapshots__/Form.test.tsx.snap     |  4 +-
 .../src/SelectWidget/SelectWidget.tsx         | 17 +++--
 .../src/SelectWidget/SelectWidget.tsx         |  3 +
 .../src/SelectWidget/SelectWidget.tsx         |  1 +
 .../mui/src/SelectWidget/SelectWidget.tsx     |  1 +
 .../src/SelectWidget/SelectWidget.tsx         | 34 ++++++---
 .../test/__snapshots__/Form.test.tsx.snap     | 76 +++++++++++++++++--
 9 files changed, 160 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 428e9c6809..2412e77dde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,9 +18,34 @@ should change the heading of the (upcoming) version to include a major version b
 
 # 5.19.2
 
+## @rjsf/antd
+
+- SelectWidget now displays an empty option when appropriate, fixing [#4197](https://github.com/rjsf-team/react-jsonschema-form/issues/4197)
+
+## @rjsf/chakra-ui
+
+- SelectWidget now displays an empty option when appropriate, fixing [#4197](https://github.com/rjsf-team/react-jsonschema-form/issues/4197)
+
 ## @rjsf/core
 
 - Removed `.only` on tests that was accidentally added in `5.19.0`
+- Added support for `default` values in `additionalProperties` in [#4199](https://github.com/rjsf-team/react-jsonschema-form/issues/4199), fixing [#3195](https://github.com/rjsf-team/react-jsonschema-form/issues/3915)
+
+## @rjsf/fluentui-rc
+
+- SelectWidget now displays an empty option when appropriate, fixing [#4197](https://github.com/rjsf-team/react-jsonschema-form/issues/4197)
+
+## @rjsf/material-ui
+
+- SelectWidget now displays an empty option when appropriate, fixing [#4197](https://github.com/rjsf-team/react-jsonschema-form/issues/4197)
+
+## @rjsf/mui
+
+- SelectWidget now displays an empty option when appropriate, fixing [#4197](https://github.com/rjsf-team/react-jsonschema-form/issues/4197)
+
+## @rjsf/semantic-ui
+
+- SelectWidget now displays an empty option when appropriate, fixing [#4197](https://github.com/rjsf-team/react-jsonschema-form/issues/4197)
 
 # 5.19.1
 
diff --git a/packages/antd/src/widgets/SelectWidget/index.tsx b/packages/antd/src/widgets/SelectWidget/index.tsx
index 2f6937b773..cfb7e5c85a 100644
--- a/packages/antd/src/widgets/SelectWidget/index.tsx
+++ b/packages/antd/src/widgets/SelectWidget/index.tsx
@@ -10,6 +10,8 @@ import {
   WidgetProps,
 } from '@rjsf/utils';
 import isString from 'lodash/isString';
+import { DefaultOptionType } from 'antd/es/select';
+import { useMemo } from 'react';
 
 const SELECT_STYLE = {
   width: '100%',
@@ -37,6 +39,7 @@ export default function SelectWidget<
   placeholder,
   readonly,
   value,
+  schema,
 }: WidgetProps<T, S, F>) {
   const { readonlyAsDisabled = true } = formContext as GenericObjectType;
 
@@ -65,6 +68,23 @@ export default function SelectWidget<
   const extraProps = {
     name: id,
   };
+
+  const selectOptions: DefaultOptionType[] | undefined = useMemo(() => {
+    if (Array.isArray(enumOptions)) {
+      if (!multiple && schema.default === undefined) {
+        enumOptions.unshift({ value: '', label: placeholder || '' });
+      }
+
+      return enumOptions.map(({ value: optionValue, label: optionLabel }, index) => ({
+        disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
+        key: String(index),
+        value: String(index),
+        label: optionLabel,
+      }));
+    }
+    return undefined;
+  }, [enumDisabled, enumOptions, multiple, placeholder, schema.default]);
+
   return (
     <Select
       autoFocus={autofocus}
@@ -81,16 +101,7 @@ export default function SelectWidget<
       {...extraProps}
       filterOption={filterOption}
       aria-describedby={ariaDescribedByIds<T>(id)}
-      options={
-        Array.isArray(enumOptions)
-          ? enumOptions.map(({ value: optionValue, label: optionLabel }, index) => ({
-              disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
-              key: String(index),
-              value: String(index),
-              label: optionLabel,
-            }))
-          : undefined
-      }
+      options={selectOptions}
     />
   );
 }
diff --git a/packages/antd/test/__snapshots__/Form.test.tsx.snap b/packages/antd/test/__snapshots__/Form.test.tsx.snap
index b30d98564c..9de9e63044 100644
--- a/packages/antd/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/antd/test/__snapshots__/Form.test.tsx.snap
@@ -3639,9 +3639,9 @@ exports[`single fields select field single choice formData 1`] = `
                   </span>
                   <span
                     className="ant-select-selection-item"
-                    title="bar"
+                    title="foo"
                   >
-                    bar
+                    foo
                   </span>
                 </div>
                 <span
diff --git a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
index 87067d1222..26b30d9794 100644
--- a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
@@ -1,4 +1,4 @@
-import { FocusEvent } from 'react';
+import { FocusEvent, useMemo } from 'react';
 import { FormControl, FormLabel } from '@chakra-ui/react';
 import {
   ariaDescribedByIds,
@@ -34,6 +34,7 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
     onFocus,
     rawErrors = [],
     uiSchema,
+    schema,
   } = props;
   const { enumOptions, enumDisabled, emptyValue } = options;
   const chakraProps = getChakra({ uiSchema });
@@ -61,8 +62,12 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
     onFocus(id, enumOptionsValueForIndex<S>(target && target.value, enumOptions, emptyValue));
 
   const _valueLabelMap: any = {};
-  const displayEnumOptions: OptionsOrGroups<any, any> = Array.isArray(enumOptions)
-    ? enumOptions.map((option: EnumOptionsType<S>, index: number) => {
+  const displayEnumOptions: OptionsOrGroups<any, any> = useMemo(() => {
+    if (Array.isArray(enumOptions)) {
+      if (!multiple && schema.default === undefined) {
+        enumOptions.unshift({ value: '', label: placeholder || '' });
+      }
+      return enumOptions.map((option: EnumOptionsType<S>, index: number) => {
         const { value, label } = option;
         _valueLabelMap[index] = label || String(value);
         return {
@@ -70,8 +75,10 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
           value: String(index),
           isDisabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1,
         };
-      })
-    : [];
+      });
+    }
+    return [];
+  }, [_valueLabelMap, enumDisabled, enumOptions, multiple, placeholder, schema.default]);
 
   const isMultiple = typeof multiple !== 'undefined' && multiple !== false && Boolean(enumOptions);
   const selectedIndex = enumOptionsIndexForValue<S>(value, enumOptions, isMultiple);
diff --git a/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx b/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx
index 52f6b313a8..4dcf2790ad 100644
--- a/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx
+++ b/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx
@@ -38,6 +38,8 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
   onChange,
   onBlur,
   onFocus,
+  schema,
+  placeholder,
 }: WidgetProps<T, S, F>) {
   const { enumOptions, enumDisabled, emptyValue: optEmptyVal } = options;
 
@@ -81,6 +83,7 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
         selectedOptions={selectedIndexesAsArray}
         aria-describedby={ariaDescribedByIds<T>(id)}
       >
+        {!multiple && schema.default === undefined && <Option value=''>{placeholder || ''}</Option>}
         {Array.isArray(enumOptions) &&
           enumOptions.map(({ value, label }, i) => {
             const disabled = enumDisabled && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/material-ui/src/SelectWidget/SelectWidget.tsx b/packages/material-ui/src/SelectWidget/SelectWidget.tsx
index 8abdb1618d..6312697fe5 100644
--- a/packages/material-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/material-ui/src/SelectWidget/SelectWidget.tsx
@@ -86,6 +86,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
+      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder || ''}</MenuItem>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i: number) => {
           const disabled: boolean = Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/mui/src/SelectWidget/SelectWidget.tsx b/packages/mui/src/SelectWidget/SelectWidget.tsx
index 7b967edc0a..1eafb833b7 100644
--- a/packages/mui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/mui/src/SelectWidget/SelectWidget.tsx
@@ -89,6 +89,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
+      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder || ''}</MenuItem>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i: number) => {
           const disabled: boolean = Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx b/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
index a21d7f7ace..a7af7f9e0e 100644
--- a/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
@@ -12,7 +12,7 @@ import {
   UIOptionsType,
 } from '@rjsf/utils';
 import map from 'lodash/map';
-import { Form, DropdownProps } from 'semantic-ui-react';
+import { Form, DropdownProps, DropdownItemProps } from 'semantic-ui-react';
 import { getSemanticProps } from '../util';
 
 /**
@@ -22,16 +22,25 @@ import { getSemanticProps } from '../util';
  * @returns {*}
  */
 function createDefaultValueOptionsForDropDown<S extends StrictRJSFSchema = RJSFSchema>(
+  schema: S,
   enumOptions?: EnumOptionsType<S>[],
-  enumDisabled?: UIOptionsType['enumDisabled']
+  enumDisabled?: UIOptionsType['enumDisabled'],
+  multiple?: boolean,
+  placeholder?: string
 ) {
   const disabledOptions = enumDisabled || [];
-  const options = map(enumOptions, ({ label, value }, index) => ({
-    disabled: disabledOptions.indexOf(value) !== -1,
-    key: label,
-    text: label,
-    value: String(index),
-  }));
+  const options: DropdownItemProps[] = [];
+  if (!multiple && schema.default === undefined) {
+    options.push({ value: '', text: placeholder || '' });
+  }
+  options.push(
+    ...map(enumOptions, ({ label, value }, index) => ({
+      disabled: disabledOptions.indexOf(value) !== -1,
+      key: label,
+      text: label,
+      value: String(index),
+    }))
+  );
   return options;
 }
 
@@ -61,6 +70,7 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
     onBlur,
     onFocus,
     rawErrors = [],
+    schema,
   } = props;
   const semanticProps = getSemanticProps<T, S, F>({
     uiSchema,
@@ -76,7 +86,13 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
   });
   const { enumDisabled, enumOptions, emptyValue: optEmptyVal } = options;
   const emptyValue = multiple ? [] : '';
-  const dropdownOptions = createDefaultValueOptionsForDropDown<S>(enumOptions, enumDisabled);
+  const dropdownOptions = createDefaultValueOptionsForDropDown<S>(
+    schema,
+    enumOptions,
+    enumDisabled,
+    multiple,
+    placeholder
+  );
   const _onChange = (_: SyntheticEvent<HTMLElement>, { value }: DropdownProps) =>
     onChange(enumOptionsValueForIndex<S>(value as string[], enumOptions, optEmptyVal));
   // eslint-disable-next-line no-shadow
diff --git a/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap b/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap
index 8148c90382..8f199c68a8 100644
--- a/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/semantic-ui/test/__snapshots__/Form.test.tsx.snap
@@ -73,11 +73,27 @@ exports[`semantic-ui specific tests field with special semantic options 1`] = `
               <div
                 className="menu transition"
               >
+                <div
+                  aria-checked={true}
+                  aria-selected={true}
+                  className="active selected item"
+                  onClick={[Function]}
+                  role="option"
+                  style={
+                    {
+                      "pointerEvents": "all",
+                    }
+                  }
+                >
+                  <span
+                    className="text"
+                  />
+                </div>
                 <div
                   aria-checked={false}
                   aria-disabled={false}
-                  aria-selected={true}
-                  className="selected item"
+                  aria-selected={false}
+                  className="item"
                   onClick={[Function]}
                   role="option"
                   style={
@@ -1278,11 +1294,27 @@ exports[`single fields select field 1`] = `
           <div
             className="menu transition"
           >
+            <div
+              aria-checked={true}
+              aria-selected={true}
+              className="active selected item"
+              onClick={[Function]}
+              role="option"
+              style={
+                {
+                  "pointerEvents": "all",
+                }
+              }
+            >
+              <span
+                className="text"
+              />
+            </div>
             <div
               aria-checked={false}
               aria-disabled={false}
-              aria-selected={true}
-              className="selected item"
+              aria-selected={false}
+              className="item"
               onClick={[Function]}
               role="option"
               style={
@@ -2045,11 +2077,27 @@ exports[`single fields select field single choice enumDisabled 1`] = `
           <div
             className="menu transition"
           >
+            <div
+              aria-checked={true}
+              aria-selected={true}
+              className="active selected item"
+              onClick={[Function]}
+              role="option"
+              style={
+                {
+                  "pointerEvents": "all",
+                }
+              }
+            >
+              <span
+                className="text"
+              />
+            </div>
             <div
               aria-checked={false}
               aria-disabled={false}
-              aria-selected={true}
-              className="selected item"
+              aria-selected={false}
+              className="item"
               onClick={[Function]}
               role="option"
               style={
@@ -2243,6 +2291,22 @@ exports[`single fields select field single choice formData 1`] = `
           <div
             className="menu transition"
           >
+            <div
+              aria-checked={false}
+              aria-selected={false}
+              className="item"
+              onClick={[Function]}
+              role="option"
+              style={
+                {
+                  "pointerEvents": "all",
+                }
+              }
+            >
+              <span
+                className="text"
+              />
+            </div>
             <div
               aria-checked={false}
               aria-disabled={false}

From 89621ac4ad8fe88bbf90342c0887c95ae9d434f9 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Tue, 28 May 2024 09:43:15 -0400
Subject: [PATCH 2/6] code review changes

---
 packages/antd/src/widgets/SelectWidget/index.tsx         | 6 +++---
 packages/chakra-ui/src/SelectWidget/SelectWidget.tsx     | 5 +++--
 packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap | 2 +-
 packages/material-ui/src/SelectWidget/SelectWidget.tsx   | 2 +-
 packages/mui/src/SelectWidget/SelectWidget.tsx           | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/antd/src/widgets/SelectWidget/index.tsx b/packages/antd/src/widgets/SelectWidget/index.tsx
index cfb7e5c85a..bf9d637cb1 100644
--- a/packages/antd/src/widgets/SelectWidget/index.tsx
+++ b/packages/antd/src/widgets/SelectWidget/index.tsx
@@ -71,11 +71,11 @@ export default function SelectWidget<
 
   const selectOptions: DefaultOptionType[] | undefined = useMemo(() => {
     if (Array.isArray(enumOptions)) {
+      const options = [...enumOptions];
       if (!multiple && schema.default === undefined) {
-        enumOptions.unshift({ value: '', label: placeholder || '' });
+        options.unshift({ value: '', label: placeholder || '' });
       }
-
-      return enumOptions.map(({ value: optionValue, label: optionLabel }, index) => ({
+      return options.map(({ value: optionValue, label: optionLabel }, index) => ({
         disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
         key: String(index),
         value: String(index),
diff --git a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
index 26b30d9794..97c6f3041a 100644
--- a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
@@ -64,10 +64,11 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
   const _valueLabelMap: any = {};
   const displayEnumOptions: OptionsOrGroups<any, any> = useMemo(() => {
     if (Array.isArray(enumOptions)) {
+      const options = [...enumOptions];
       if (!multiple && schema.default === undefined) {
-        enumOptions.unshift({ value: '', label: placeholder || '' });
+        options.unshift({ value: '', label: placeholder || '' });
       }
-      return enumOptions.map((option: EnumOptionsType<S>, index: number) => {
+      return options.map((option: EnumOptionsType<S>, index: number) => {
         const { value, label } = option;
         _valueLabelMap[index] = label || String(value);
         return {
diff --git a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
index 1143159d73..51fb6da756 100644
--- a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
@@ -5230,7 +5230,7 @@ exports[`single fields select field single choice formData 1`] = `
               <div
                 className=" emotion-7"
               >
-                bar
+                foo
               </div>
               <div
                 className=" emotion-8"
diff --git a/packages/material-ui/src/SelectWidget/SelectWidget.tsx b/packages/material-ui/src/SelectWidget/SelectWidget.tsx
index 6312697fe5..b60540c6be 100644
--- a/packages/material-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/material-ui/src/SelectWidget/SelectWidget.tsx
@@ -86,7 +86,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
-      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder || ''}</MenuItem>}
+      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder}</MenuItem>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i: number) => {
           const disabled: boolean = Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/mui/src/SelectWidget/SelectWidget.tsx b/packages/mui/src/SelectWidget/SelectWidget.tsx
index 1eafb833b7..d088dc2b22 100644
--- a/packages/mui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/mui/src/SelectWidget/SelectWidget.tsx
@@ -89,7 +89,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
-      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder || ''}</MenuItem>}
+      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder}</MenuItem>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i: number) => {
           const disabled: boolean = Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1;

From 6c4b39b82d78f302b92844cd22a2eb48d290c92d Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Mon, 8 Jul 2024 07:30:04 -0400
Subject: [PATCH 3/6] Clarify by creating `showPlaceholderOption` variable in
 all changed themes

---
 packages/antd/src/widgets/SelectWidget/index.tsx    |  4 +++-
 .../bootstrap-4/src/SelectWidget/SelectWidget.tsx   |  3 ++-
 .../chakra-ui/src/SelectWidget/SelectWidget.tsx     |  3 ++-
 .../core/src/components/widgets/SelectWidget.tsx    |  9 +++++----
 .../fluentui-rc/src/SelectWidget/SelectWidget.tsx   |  3 ++-
 .../material-ui/src/SelectWidget/SelectWidget.tsx   |  3 ++-
 packages/mui/src/SelectWidget/SelectWidget.tsx      |  3 ++-
 .../semantic-ui/src/SelectWidget/SelectWidget.tsx   | 13 +++++++------
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packages/antd/src/widgets/SelectWidget/index.tsx b/packages/antd/src/widgets/SelectWidget/index.tsx
index bf9d637cb1..13e5fa8262 100644
--- a/packages/antd/src/widgets/SelectWidget/index.tsx
+++ b/packages/antd/src/widgets/SelectWidget/index.tsx
@@ -69,10 +69,12 @@ export default function SelectWidget<
     name: id,
   };
 
+  const showPlaceholderOption = !multiple && schema.default === undefined;
+
   const selectOptions: DefaultOptionType[] | undefined = useMemo(() => {
     if (Array.isArray(enumOptions)) {
       const options = [...enumOptions];
-      if (!multiple && schema.default === undefined) {
+      if (showPlaceholderOption) {
         options.unshift({ value: '', label: placeholder || '' });
       }
       return options.map(({ value: optionValue, label: optionLabel }, index) => ({
diff --git a/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx b/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
index 8a92cee3f5..b3e0aa320d 100644
--- a/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
+++ b/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
@@ -45,6 +45,7 @@ export default function SelectWidget<
     }
   }
   const selectedIndexes = enumOptionsIndexForValue<S>(value, enumOptions, multiple);
+  const showPlaceholderOption = !multiple && schema.default === undefined;
 
   return (
     <Form.Control
@@ -78,7 +79,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
-      {!multiple && schema.default === undefined && <option value=''>{placeholder}</option>}
+      {showPlaceholderOption && <option value=''>{placeholder}</option>}
       {(enumOptions as any).map(({ value, label }: any, i: number) => {
         const disabled: any = Array.isArray(enumDisabled) && (enumDisabled as any).indexOf(value) != -1;
         return (
diff --git a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
index 97c6f3041a..b9d168fdf6 100644
--- a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
@@ -61,11 +61,12 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
   const _onFocus = ({ target }: FocusEvent<HTMLInputElement>) =>
     onFocus(id, enumOptionsValueForIndex<S>(target && target.value, enumOptions, emptyValue));
 
+  const showPlaceholderOption = !multiple && schema.default === undefined;
   const _valueLabelMap: any = {};
   const displayEnumOptions: OptionsOrGroups<any, any> = useMemo(() => {
     if (Array.isArray(enumOptions)) {
       const options = [...enumOptions];
-      if (!multiple && schema.default === undefined) {
+      if (showPlaceholderOption) {
         options.unshift({ value: '', label: placeholder || '' });
       }
       return options.map((option: EnumOptionsType<S>, index: number) => {
diff --git a/packages/core/src/components/widgets/SelectWidget.tsx b/packages/core/src/components/widgets/SelectWidget.tsx
index 2faae6051b..1bebfa371a 100644
--- a/packages/core/src/components/widgets/SelectWidget.tsx
+++ b/packages/core/src/components/widgets/SelectWidget.tsx
@@ -47,7 +47,7 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
       const newValue = getValue(event, multiple);
       return onFocus(id, enumOptionsValueForIndex<S>(newValue, enumOptions, optEmptyVal));
     },
-    [onFocus, id, schema, multiple, options]
+    [onFocus, id, schema, multiple, enumOptions, optEmptyVal]
   );
 
   const handleBlur = useCallback(
@@ -55,7 +55,7 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
       const newValue = getValue(event, multiple);
       return onBlur(id, enumOptionsValueForIndex<S>(newValue, enumOptions, optEmptyVal));
     },
-    [onBlur, id, schema, multiple, options]
+    [onBlur, id, schema, multiple, enumOptions, optEmptyVal]
   );
 
   const handleChange = useCallback(
@@ -63,10 +63,11 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
       const newValue = getValue(event, multiple);
       return onChange(enumOptionsValueForIndex<S>(newValue, enumOptions, optEmptyVal));
     },
-    [onChange, schema, multiple, options]
+    [onChange, schema, multiple, enumOptions, optEmptyVal]
   );
 
   const selectedIndexes = enumOptionsIndexForValue<S>(value, enumOptions, multiple);
+  const showPlaceholderOption = !multiple && schema.default === undefined;
 
   return (
     <select
@@ -83,7 +84,7 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
       onChange={handleChange}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
-      {!multiple && schema.default === undefined && <option value=''>{placeholder}</option>}
+      {showPlaceholderOption && <option value=''>{placeholder}</option>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i) => {
           const disabled = enumDisabled && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx b/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx
index 4dcf2790ad..b0f88acd51 100644
--- a/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx
+++ b/packages/fluentui-rc/src/SelectWidget/SelectWidget.tsx
@@ -62,6 +62,7 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
     const newValue = getValue(data, multiple);
     return onChange(enumOptionsValueForIndex<S>(newValue, enumOptions, optEmptyVal));
   };
+  const showPlaceholderOption = !multiple && schema.default === undefined;
 
   return (
     <Field
@@ -83,7 +84,7 @@ function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extend
         selectedOptions={selectedIndexesAsArray}
         aria-describedby={ariaDescribedByIds<T>(id)}
       >
-        {!multiple && schema.default === undefined && <Option value=''>{placeholder || ''}</Option>}
+        {showPlaceholderOption && <Option value=''>{placeholder || ''}</Option>}
         {Array.isArray(enumOptions) &&
           enumOptions.map(({ value, label }, i) => {
             const disabled = enumDisabled && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/material-ui/src/SelectWidget/SelectWidget.tsx b/packages/material-ui/src/SelectWidget/SelectWidget.tsx
index b60540c6be..a053b374bb 100644
--- a/packages/material-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/material-ui/src/SelectWidget/SelectWidget.tsx
@@ -59,6 +59,7 @@ export default function SelectWidget<
   const _onFocus = ({ target }: FocusEvent<HTMLInputElement>) =>
     onFocus(id, enumOptionsValueForIndex<S>(target && target.value, enumOptions, optEmptyVal));
   const selectedIndexes = enumOptionsIndexForValue<S>(value, enumOptions, multiple);
+  const showPlaceholderOption = !multiple && schema.default === undefined;
 
   return (
     <TextField
@@ -86,7 +87,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
-      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder}</MenuItem>}
+      {showPlaceholderOption && <MenuItem value=''>{placeholder}</MenuItem>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i: number) => {
           const disabled: boolean = Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/mui/src/SelectWidget/SelectWidget.tsx b/packages/mui/src/SelectWidget/SelectWidget.tsx
index d088dc2b22..49fe9fe7a9 100644
--- a/packages/mui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/mui/src/SelectWidget/SelectWidget.tsx
@@ -61,6 +61,7 @@ export default function SelectWidget<
     onFocus(id, enumOptionsValueForIndex<S>(target && target.value, enumOptions, optEmptyVal));
   const selectedIndexes = enumOptionsIndexForValue<S>(value, enumOptions, multiple);
   const { InputLabelProps, SelectProps, autocomplete, ...textFieldRemainingProps } = textFieldProps;
+  const showPlaceholderOption = !multiple && schema.default === undefined;
 
   return (
     <TextField
@@ -89,7 +90,7 @@ export default function SelectWidget<
       }}
       aria-describedby={ariaDescribedByIds<T>(id)}
     >
-      {!multiple && schema.default === undefined && <MenuItem value=''>{placeholder}</MenuItem>}
+      {showPlaceholderOption && <MenuItem value=''>{placeholder}</MenuItem>}
       {Array.isArray(enumOptions) &&
         enumOptions.map(({ value, label }, i: number) => {
           const disabled: boolean = Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1;
diff --git a/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx b/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
index a7af7f9e0e..1a6d4b83a8 100644
--- a/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
@@ -17,20 +17,21 @@ import { getSemanticProps } from '../util';
 
 /**
  * Returns and creates an array format required for semantic drop down
- * @param {array} enumOptions- array of items for the dropdown
+ * @param {array} enumOptions - array of items for the dropdown
  * @param {array} enumDisabled - array of enum option values to disable
+ * @param {boolean} showPlaceholderOption - whether to show a placeholder option
+ * @param {string} placeholder - placeholder option label
  * @returns {*}
  */
 function createDefaultValueOptionsForDropDown<S extends StrictRJSFSchema = RJSFSchema>(
-  schema: S,
   enumOptions?: EnumOptionsType<S>[],
   enumDisabled?: UIOptionsType['enumDisabled'],
-  multiple?: boolean,
+  showPlaceholderOption?: boolean,
   placeholder?: string
 ) {
   const disabledOptions = enumDisabled || [];
   const options: DropdownItemProps[] = [];
-  if (!multiple && schema.default === undefined) {
+  if (showPlaceholderOption) {
     options.push({ value: '', text: placeholder || '' });
   }
   options.push(
@@ -86,11 +87,11 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
   });
   const { enumDisabled, enumOptions, emptyValue: optEmptyVal } = options;
   const emptyValue = multiple ? [] : '';
+  const showPlaceholderOption = !multiple && schema.default === undefined;
   const dropdownOptions = createDefaultValueOptionsForDropDown<S>(
-    schema,
     enumOptions,
     enumDisabled,
-    multiple,
+    showPlaceholderOption,
     placeholder
   );
   const _onChange = (_: SyntheticEvent<HTMLElement>, { value }: DropdownProps) =>

From 0bca1a4de5258cfdfe5d5d395592106b2f031300 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Mon, 8 Jul 2024 07:32:32 -0400
Subject: [PATCH 4/6] Fix CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2412e77dde..4aa03006de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,6 @@ should change the heading of the (upcoming) version to include a major version b
 ## @rjsf/core
 
 - Removed `.only` on tests that was accidentally added in `5.19.0`
-- Added support for `default` values in `additionalProperties` in [#4199](https://github.com/rjsf-team/react-jsonschema-form/issues/4199), fixing [#3195](https://github.com/rjsf-team/react-jsonschema-form/issues/3915)
 
 ## @rjsf/fluentui-rc
 
@@ -117,6 +116,7 @@ should change the heading of the (upcoming) version to include a major version b
 - Fix case where NumberField would not properly reset the field when using programmatic form reset (#4202)[https://github.com/rjsf-team/react-jsonschema-form/issues/4202]
 - Updated widgets to handle undefined `target` in `onFocus` and `onBlur` handlers
 - Fix field disable or readonly property can't cover globalOptions corresponding property (#4212)[https://github.com/rjsf-team/react-jsonschema-form/pull/4212]
+- Added support for `default` values in `additionalProperties` in [#4199](https://github.com/rjsf-team/react-jsonschema-form/issues/4199), fixing [#3195](https://github.com/rjsf-team/react-jsonschema-form/issues/3915)
 
 ## @rjsf/fluent-ui
 

From ab2120add03f0c07a1a879acc1d75aaeb47d9b19 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Mon, 8 Jul 2024 08:18:04 -0400
Subject: [PATCH 5/6] Fix cases where placeholder option was accidentally given
 an index

---
 .../antd/src/widgets/SelectWidget/index.tsx   | 13 ++++-----
 .../test/__snapshots__/Form.test.tsx.snap     |  4 +--
 .../src/SelectWidget/SelectWidget.tsx         | 27 ++++++++++---------
 .../test/__snapshots__/Form.test.tsx.snap     |  2 +-
 .../src/SelectWidget/SelectWidget.tsx         | 17 +++++-------
 5 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/packages/antd/src/widgets/SelectWidget/index.tsx b/packages/antd/src/widgets/SelectWidget/index.tsx
index 13e5fa8262..645e0ebb4e 100644
--- a/packages/antd/src/widgets/SelectWidget/index.tsx
+++ b/packages/antd/src/widgets/SelectWidget/index.tsx
@@ -73,19 +73,20 @@ export default function SelectWidget<
 
   const selectOptions: DefaultOptionType[] | undefined = useMemo(() => {
     if (Array.isArray(enumOptions)) {
-      const options = [...enumOptions];
-      if (showPlaceholderOption) {
-        options.unshift({ value: '', label: placeholder || '' });
-      }
-      return options.map(({ value: optionValue, label: optionLabel }, index) => ({
+      const options: DefaultOptionType[] = enumOptions.map(({ value: optionValue, label: optionLabel }, index) => ({
         disabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(optionValue) !== -1,
         key: String(index),
         value: String(index),
         label: optionLabel,
       }));
+
+      if (showPlaceholderOption) {
+        options.unshift({ value: '', label: placeholder || '' });
+      }
+      return options;
     }
     return undefined;
-  }, [enumDisabled, enumOptions, multiple, placeholder, schema.default]);
+  }, [enumDisabled, enumOptions, placeholder, showPlaceholderOption]);
 
   return (
     <Select
diff --git a/packages/antd/test/__snapshots__/Form.test.tsx.snap b/packages/antd/test/__snapshots__/Form.test.tsx.snap
index 9de9e63044..b30d98564c 100644
--- a/packages/antd/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/antd/test/__snapshots__/Form.test.tsx.snap
@@ -3639,9 +3639,9 @@ exports[`single fields select field single choice formData 1`] = `
                   </span>
                   <span
                     className="ant-select-selection-item"
-                    title="foo"
+                    title="bar"
                   >
-                    foo
+                    bar
                   </span>
                 </div>
                 <span
diff --git a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
index b9d168fdf6..347a677578 100644
--- a/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/chakra-ui/src/SelectWidget/SelectWidget.tsx
@@ -62,37 +62,40 @@ export default function SelectWidget<T = any, S extends StrictRJSFSchema = RJSFS
     onFocus(id, enumOptionsValueForIndex<S>(target && target.value, enumOptions, emptyValue));
 
   const showPlaceholderOption = !multiple && schema.default === undefined;
-  const _valueLabelMap: any = {};
-  const displayEnumOptions: OptionsOrGroups<any, any> = useMemo(() => {
+  const { valueLabelMap, displayEnumOptions } = useMemo((): {
+    valueLabelMap: Record<string | number, string>;
+    displayEnumOptions: OptionsOrGroups<any, any>;
+  } => {
+    const valueLabelMap: Record<string | number, string> = {};
+    let displayEnumOptions: OptionsOrGroups<any, any> = [];
     if (Array.isArray(enumOptions)) {
-      const options = [...enumOptions];
-      if (showPlaceholderOption) {
-        options.unshift({ value: '', label: placeholder || '' });
-      }
-      return options.map((option: EnumOptionsType<S>, index: number) => {
+      displayEnumOptions = enumOptions.map((option: EnumOptionsType<S>, index: number) => {
         const { value, label } = option;
-        _valueLabelMap[index] = label || String(value);
+        valueLabelMap[index] = label || String(value);
         return {
           label,
           value: String(index),
           isDisabled: Array.isArray(enumDisabled) && enumDisabled.indexOf(value) !== -1,
         };
       });
+      if (showPlaceholderOption) {
+        (displayEnumOptions as any[]).unshift({ value: '', label: placeholder || '' });
+      }
     }
-    return [];
-  }, [_valueLabelMap, enumDisabled, enumOptions, multiple, placeholder, schema.default]);
+    return { valueLabelMap: valueLabelMap, displayEnumOptions: displayEnumOptions };
+  }, [enumDisabled, enumOptions, placeholder, showPlaceholderOption]);
 
   const isMultiple = typeof multiple !== 'undefined' && multiple !== false && Boolean(enumOptions);
   const selectedIndex = enumOptionsIndexForValue<S>(value, enumOptions, isMultiple);
   const formValue: any = isMultiple
     ? ((selectedIndex as string[]) || []).map((i: string) => {
         return {
-          label: _valueLabelMap[i],
+          label: valueLabelMap[i],
           value: i,
         };
       })
     : {
-        label: _valueLabelMap[selectedIndex as string] || '',
+        label: valueLabelMap[selectedIndex as string] || '',
         selectedIndex,
       };
 
diff --git a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
index 51fb6da756..1143159d73 100644
--- a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
@@ -5230,7 +5230,7 @@ exports[`single fields select field single choice formData 1`] = `
               <div
                 className=" emotion-7"
               >
-                foo
+                bar
               </div>
               <div
                 className=" emotion-8"
diff --git a/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx b/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
index 1a6d4b83a8..3b8e1a886a 100644
--- a/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
+++ b/packages/semantic-ui/src/SelectWidget/SelectWidget.tsx
@@ -30,18 +30,15 @@ function createDefaultValueOptionsForDropDown<S extends StrictRJSFSchema = RJSFS
   placeholder?: string
 ) {
   const disabledOptions = enumDisabled || [];
-  const options: DropdownItemProps[] = [];
+  const options: DropdownItemProps[] = map(enumOptions, ({ label, value }, index) => ({
+    disabled: disabledOptions.indexOf(value) !== -1,
+    key: label,
+    text: label,
+    value: String(index),
+  }));
   if (showPlaceholderOption) {
-    options.push({ value: '', text: placeholder || '' });
+    options.unshift({ value: '', text: placeholder || '' });
   }
-  options.push(
-    ...map(enumOptions, ({ label, value }, index) => ({
-      disabled: disabledOptions.indexOf(value) !== -1,
-      key: label,
-      text: label,
-      value: String(index),
-    }))
-  );
   return options;
 }
 

From f06f22744fc5b0f42520b79d6f863968adc09a89 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Mon, 8 Jul 2024 14:04:16 -0400
Subject: [PATCH 6/6] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aa03006de..cc42d5852c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ should change the heading of the (upcoming) version to include a major version b
 
 -->
 
-# 5.19.2
+# 5.19.3
 
 ## @rjsf/antd