From a494d2cbbe14d03f2a07fc8a745334781c5dd7a0 Mon Sep 17 00:00:00 2001
From: Oliver Geneser <hello@geneser.xyz>
Date: Wed, 3 Jun 2026 10:45:43 +0200
Subject: [PATCH] fix: replace stale remote select options when additions are
 disabled

---
 src/lib/forms/SelectField.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lib/forms/SelectField.js b/src/lib/forms/SelectField.js
index 3d05bf84..11307488 100644
--- a/src/lib/forms/SelectField.js
+++ b/src/lib/forms/SelectField.js
@@ -22,13 +22,18 @@ export class SelectField extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    const { options } = this.props;
+    const { options, allowAdditions } = this.props;
     if (prevProps.options !== options) {
-      // When props.options change, merge with existing state options
-      // This preserves user-added options while incorporating new prop options
       this.setState((prevState) => {
-        const merged = mergeOptions(prevState.options || [], options || []);
-        return { options: merged };
+        if (allowAdditions) {
+          return {
+            options: mergeOptions(options || [], prevState.options || []),
+          };
+        }
+
+        return {
+          options: options || [],
+        };
       });
     }
   }