Skip to content

Commit a836e4b

Browse files
committed
more component fixes
1 parent f474c67 commit a836e4b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/components/AutoCreateForm.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@ const AutoCreateForm = forwardRef<AutoCreateFormRef, AutoCreateFormProps & AutoC
138138
openModal
139139
}), [openModal])
140140

141-
const panelClass = useMemo(() => panelClassProp || form.panelClass(formStyle), [panelClassProp, formStyle])
141+
const panelClass = useMemo(() => {
142+
const defaultClass = form.panelClass(formStyle)
143+
return panelClassProp ? `${defaultClass} ${panelClassProp}` : defaultClass
144+
}, [panelClassProp, formStyle])
142145
const formClass = useMemo(() => formClassProp || form.formClass(formStyle), [formClassProp, formStyle])
143146
const headingClass = useMemo(() => headingClassProp || form.headingClass(formStyle), [headingClassProp, formStyle])
144147
const subHeadingClass = useMemo(() => subHeadingClassProp || form.subHeadingClass(formStyle), [subHeadingClassProp, formStyle])

src/components/AutoEditForm.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ const AutoEditForm = forwardRef<AutoEditFormRef, AutoEditFormProps & AutoEditFor
143143
openModal
144144
}), [openModal])
145145

146-
const panelClass = useMemo(() => panelClassProp || form.panelClass(formStyle), [panelClassProp, formStyle])
146+
const panelClass = useMemo(() => {
147+
const defaultClass = form.panelClass(formStyle)
148+
return panelClassProp ? `${defaultClass} ${panelClassProp}` : defaultClass
149+
}, [panelClassProp, formStyle])
147150
const formClass = useMemo(() => formClassProp || form.formClass(formStyle), [formClassProp, formStyle])
148151
const headingClass = useMemo(() => headingClassProp || form.headingClass(formStyle), [headingClassProp, formStyle])
149152
const subHeadingClass = useMemo(() => subHeadingClassProp || form.subHeadingClass(formStyle), [subHeadingClassProp, formStyle])

src/components/AutoForm.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,10 @@ const AutoForm = forwardRef<AutoFormRef, AutoFormProps & AutoFormSlots>((props,
109109

110110
const [api, setApi] = useState(new ApiResult())
111111

112-
const panelClass = useMemo(() => panelClassProp || form.panelClass(formStyle), [panelClassProp, formStyle])
112+
const panelClass = useMemo(() => {
113+
const defaultClass = form.panelClass(formStyle)
114+
return panelClassProp ? `${defaultClass} ${panelClassProp}` : defaultClass
115+
}, [panelClassProp, formStyle])
113116
const formClass = useMemo(() => formClassProp || form.formClass(formStyle), [formClassProp, formStyle])
114117
const headingClass = useMemo(() => headingClassProp || form.headingClass(formStyle), [headingClassProp, formStyle])
115118
const subHeadingClass = useMemo(() => subHeadingClassProp || form.subHeadingClass(formStyle), [subHeadingClassProp, formStyle])

0 commit comments

Comments
 (0)