| @@ -1,6 +1,6 @@ | ||
| 1 | -import React, { Fragment, useEffect } from 'react'; | |
| 2 | -import { portalId, refreshToken } from '../../constants/leadinConfig'; | |
| 1 | +import { Fragment, useEffect } from 'react'; | |
| 2 | +import { portalId } from '../../constants/leadinConfig'; | |
| 3 | 3 | import UISpacer from '../UIComponents/UISpacer'; |
| 4 | 4 | import PreviewForm from './PreviewForm'; |
| 5 | 5 | import FormSelect from './FormSelect'; |
| 6 | 6 | import { IFormBlockProps } from '../../gutenberg/FormBlock/registerFormBlock'; |
| @@ -5,18 +5,18 @@ | ||
| 5 | 5 | import FormSelect from './FormSelect'; |
| 6 | 6 | import { IFormBlockProps } from '../../gutenberg/FormBlock/registerFormBlock'; |
| 7 | 7 | import { |
| 8 | 8 | usePostBackgroundMessage, |
| 9 | - BackgroudAppContext, | |
| 10 | 9 | useBackgroundAppContext, |
| 11 | 10 | } from '../../iframe/useBackgroundApp'; |
| 12 | 11 | import { ProxyMessages } from '../../iframe/integratedMessages'; |
| 13 | 12 | import LoadingBlock from '../Common/LoadingBlock'; |
| 14 | -import { getOrCreateBackgroundApp } from '../../utils/backgroundAppUtils'; | |
| 13 | +import EmbedderContainer from '../Common/EmbedderContainer'; | |
| 15 | 14 | |
| 16 | 15 | interface IFormEditProps extends IFormBlockProps { |
| 17 | 16 | preview: boolean; |
| 18 | 17 | origin: 'gutenberg' | 'elementor'; |
| 18 | + fullSiteEditor?: boolean; | |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | function FormEdit({ |
| 22 | 22 | attributes, |
| @@ -23,20 +23,26 @@ | ||
| 23 | 23 | isSelected, |
| 24 | 24 | setAttributes, |
| 25 | 25 | preview = true, |
| 26 | 26 | origin = 'gutenberg', |
| 27 | + fullSiteEditor, | |
| 27 | 28 | }: IFormEditProps) { |
| 28 | - const { formId, formName } = attributes; | |
| 29 | + const { formId, formName, embedVersion } = attributes; | |
| 29 | 30 | const formSelected = portalId && formId; |
| 30 | 31 | |
| 31 | 32 | const isBackgroundAppReady = useBackgroundAppContext(); |
| 32 | 33 | const monitorFormPreviewRender = usePostBackgroundMessage(); |
| 33 | 34 | |
| 34 | - const handleChange = (selectedForm: { value: string; label: string }) => { | |
| 35 | + const handleChange = (selectedForm: { | |
| 36 | + value: string; | |
| 37 | + label: string; | |
| 38 | + embedVersion?: string; | |
| 39 | + }) => { | |
| 35 | 40 | setAttributes({ |
| 36 | 41 | portalId, |
| 37 | 42 | formId: selectedForm.value, |
| 38 | 43 | formName: selectedForm.label, |
| 44 | + embedVersion: selectedForm.embedVersion, | |
| 39 | 45 | }); |
| 40 | 46 | }; |
| 41 | 47 | |
| 42 | 48 | useEffect(() => { |
| @@ -57,14 +63,22 @@ | ||
| 57 | 63 | formId={formId} |
| 58 | 64 | formName={formName} |
| 59 | 65 | handleChange={handleChange} |
| 60 | 66 | origin={origin} |
| 67 | + embedVersion={embedVersion} | |
| 61 | 68 | /> |
| 62 | 69 | )} |
| 63 | 70 | {formSelected && ( |
| 64 | 71 | <Fragment> |
| 65 | 72 | {isSelected && <UISpacer />} |
| 66 | - {preview && <PreviewForm portalId={portalId} formId={formId} />} | |
| 73 | + {preview && ( | |
| 74 | + <PreviewForm | |
| 75 | + portalId={portalId} | |
| 76 | + formId={formId} | |
| 77 | + fullSiteEditor={fullSiteEditor} | |
| 78 | + embedVersion={embedVersion} | |
| 79 | + /> | |
| 80 | + )} | |
| 67 | 81 | </Fragment> |
| 68 | 82 | )} |
| 69 | 83 | </Fragment> |
| 70 | 84 | ); |
| @@ -71,11 +85,9 @@ | ||
| 71 | 85 | } |
| 72 | 86 | |
| 73 | 87 | export default function FormEditContainer(props: IFormEditProps) { |
| 74 | 88 | return ( |
| 75 | - <BackgroudAppContext.Provider | |
| 76 | - value={refreshToken && getOrCreateBackgroundApp(refreshToken)} | |
| 77 | - > | |
| 89 | + <EmbedderContainer> | |
| 78 | 90 | <FormEdit {...props} /> |
| 79 | - </BackgroudAppContext.Provider> | |
| 91 | + </EmbedderContainer> | |
| 80 | 92 | ); |
| 81 | 93 | } |