From c8c056eb92a7728b66a98843c254654776439a81 Mon Sep 17 00:00:00 2001 From: James Dinh Date: Wed, 21 Aug 2024 08:47:43 -0700 Subject: [PATCH 1/2] fix divider issues on g2a and g2b --- lib/libs/webforms/G2A/v202401.ts | 12 +++++++++--- lib/libs/webforms/G2B/v202401.ts | 10 +++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/libs/webforms/G2A/v202401.ts b/lib/libs/webforms/G2A/v202401.ts index 709334d0b9..3e2b3947ef 100644 --- a/lib/libs/webforms/G2A/v202401.ts +++ b/lib/libs/webforms/G2A/v202401.ts @@ -52,6 +52,7 @@ export const v202401: FormSchema = { ...DefaultFieldGroupProps, appendText: "Add service or item", removeText: "Remove", + fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, }, fields: [ { @@ -158,6 +159,7 @@ export const v202401: FormSchema = { ...DefaultFieldGroupProps, appendText: "Add service or item", removeText: "Remove", + fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, }, fields: [ { @@ -181,7 +183,9 @@ export const v202401: FormSchema = { "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", props: { appendText: "Add range", - fieldArrayClassName: "flex-col", + divider: true, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName, }, fields: [ { @@ -361,7 +365,8 @@ export const v202401: FormSchema = { rhf: "FieldArray", props: { appendText: "Add charge", - fieldArrayClassName: "flex-col", + fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + divider: true, }, dependency: { conditions: [ @@ -513,7 +518,8 @@ export const v202401: FormSchema = { rules: { required: "* Required" }, props: { appendText: "Add charge", - fieldArrayClassName: "flex-col", + fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + divider: true, }, dependency: { conditions: [ diff --git a/lib/libs/webforms/G2B/v202401.ts b/lib/libs/webforms/G2B/v202401.ts index ff67322570..5abd8e01a7 100644 --- a/lib/libs/webforms/G2B/v202401.ts +++ b/lib/libs/webforms/G2B/v202401.ts @@ -204,7 +204,9 @@ export const v202401: FormSchema = { "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", props: { appendText: "Add range", - fieldArrayClassName: "flex-col", + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName, + divider: true, }, fields: [ { @@ -385,7 +387,8 @@ export const v202401: FormSchema = { rhf: "FieldArray", props: { appendText: "Add charge", - fieldArrayClassName: "flex-col", + fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + divider: true, }, dependency: { conditions: [ @@ -538,7 +541,8 @@ export const v202401: FormSchema = { rules: { required: "* Required" }, props: { appendText: "Add charge", - fieldArrayClassName: "flex-col", + fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + divider: true, }, dependency: { conditions: [ From 5af2d211ffa177c05813003e0d0e34df3ce25f82 Mon Sep 17 00:00:00 2001 From: James Dinh Date: Thu, 22 Aug 2024 11:52:32 -0700 Subject: [PATCH 2/2] add logic for form breaks --- lib/libs/webforms/G2A/v202401.ts | 28 ++++++++++++++++------------ lib/libs/webforms/G2B/v202401.ts | 20 +++++++++++--------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/lib/libs/webforms/G2A/v202401.ts b/lib/libs/webforms/G2A/v202401.ts index 3e2b3947ef..8021cc79ea 100644 --- a/lib/libs/webforms/G2A/v202401.ts +++ b/lib/libs/webforms/G2A/v202401.ts @@ -52,7 +52,8 @@ export const v202401: FormSchema = { ...DefaultFieldGroupProps, appendText: "Add service or item", removeText: "Remove", - fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName + "space-y-6", }, fields: [ { @@ -159,7 +160,8 @@ export const v202401: FormSchema = { ...DefaultFieldGroupProps, appendText: "Add service or item", removeText: "Remove", - fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName + "space-y-6", }, fields: [ { @@ -179,13 +181,13 @@ export const v202401: FormSchema = { { rhf: "FieldArray", name: "inc-range-cost-share-amount", - formItemClassName: - "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", props: { appendText: "Add range", - divider: true, fieldArrayClassName: - DefaultFieldGroupProps.fieldArrayClassName, + DefaultFieldGroupProps.fieldArrayClassName + + "space-y-6 " + + "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4", + divider: true, }, fields: [ { @@ -365,7 +367,10 @@ export const v202401: FormSchema = { rhf: "FieldArray", props: { appendText: "Add charge", - fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName + + "space-y-6 " + + "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4", divider: true, }, dependency: { @@ -378,8 +383,6 @@ export const v202401: FormSchema = { ], effect: { type: "show" }, }, - formItemClassName: - "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", fields: [ { rhf: "WrappedGroup", @@ -518,7 +521,10 @@ export const v202401: FormSchema = { rules: { required: "* Required" }, props: { appendText: "Add charge", - fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName + + "space-y-6 " + + "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4", divider: true, }, dependency: { @@ -531,8 +537,6 @@ export const v202401: FormSchema = { ], effect: { type: "show" }, }, - formItemClassName: - "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", fields: [ { rhf: "WrappedGroup", diff --git a/lib/libs/webforms/G2B/v202401.ts b/lib/libs/webforms/G2B/v202401.ts index 5abd8e01a7..d457985542 100644 --- a/lib/libs/webforms/G2B/v202401.ts +++ b/lib/libs/webforms/G2B/v202401.ts @@ -200,12 +200,12 @@ export const v202401: FormSchema = { { rhf: "FieldArray", name: "inc-range-cost-share-amount", - formItemClassName: - "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", props: { appendText: "Add range", fieldArrayClassName: - DefaultFieldGroupProps.fieldArrayClassName, + DefaultFieldGroupProps.fieldArrayClassName + + "space-y-6 " + + "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4", divider: true, }, fields: [ @@ -387,7 +387,10 @@ export const v202401: FormSchema = { rhf: "FieldArray", props: { appendText: "Add charge", - fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName + + "space-y-6 " + + "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4", divider: true, }, dependency: { @@ -400,8 +403,6 @@ export const v202401: FormSchema = { ], effect: { type: "show" }, }, - formItemClassName: - "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", fields: [ { rhf: "WrappedGroup", @@ -541,7 +542,10 @@ export const v202401: FormSchema = { rules: { required: "* Required" }, props: { appendText: "Add charge", - fieldArrayClassName: DefaultFieldGroupProps.fieldArrayClassName, + fieldArrayClassName: + DefaultFieldGroupProps.fieldArrayClassName + + "space-y-6 " + + "ml-[0.6rem] px-4 border-l-4 border-l-primary mb-4", divider: true, }, dependency: { @@ -554,8 +558,6 @@ export const v202401: FormSchema = { ], effect: { type: "show" }, }, - formItemClassName: - "ml-[0.6rem] px-4 border-l-4 border-l-primary mt-2", fields: [ { rhf: "WrappedGroup",