chore merge

Author: DasProffi

web/components/properties/PropertyDetailView.tsx

@@ -126,6 +126,9 @@ export const PropertyDetailView = ({
                   updateLocal({ subjectType: value as PropertySubjectType })
                   persist({ subjectType: value as PropertySubjectType })
                 }}
+                contentPanelProps={{
+                  containerClassName: 'z-100'
+                }}
               >
                 {propertySubjectTypeList.map(v => (
                   <SelectOption key={v} value={v}>
@@ -145,6 +148,9 @@ export const PropertyDetailView = ({
                   updateLocal({ fieldType: value as PropertyFieldType })
                   persist({ fieldType: value as PropertyFieldType })
                 }}
+                contentPanelProps={{
+                  containerClassName: 'z-100'
+                }}
               >
                 {propertyFieldTypeList.map(v => (
                   <SelectOption key={v} value={v}>
@@ -227,7 +233,10 @@ export const PropertyDetailView = ({
                         selectData: formData.selectData ? {
                           ...formData.selectData,
                           options: [...formData.selectData.options, option]
-                        } : undefined
+                        } : {
+                          options: [option],
+                          isAllowingFreetext: false,
+                        }
                       }
                       updateLocal(update)
                       persist(update)
@@ -251,7 +260,10 @@ export const PropertyDetailView = ({
                         selectData: formData.selectData ? {
                           ...formData.selectData,
                           options: [...formData.selectData.options, newOption]
-                        } : undefined
+                        } : {
+                          options: [newOption],
+                          isAllowingFreetext: false,
+                        }
                       }
                       updateLocal(update)
                       persist(update)

web/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import './build/dev/types/routes.d.ts'
+import "./build/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.