@claspo/document-connector 16.8.1 → 16.9.0

package/BaseDocumentConnector.d.ts

@@ -21,5 +21,4 @@ export default class BaseDocumentConnector extends DefaultEventEmitter {
     getSubmitState(): string;
     hasDirtyFormData(): boolean;
     waitForCurrentSubmission(): Promise<boolean>;
-    submitOnClose(): Promise<boolean>;
 }

package/BaseDocumentConnector.js

@@ -1 +1 @@
-import CssVarsOperations from"@claspo/common/element/CssVarsOperations";import ThemeCssVars from"@claspo/common/element/ThemeCssVars";import{EditorToWidgetEventType}from"@claspo/renderer/document-model/DocumentModelService";import DefaultEventEmitter from"@claspo/common/DefaultEventEmitter";import DocumentUtils from"@claspo/common/document/DocumentUtils";import ActionCategory from"@claspo/renderer/action/actions/ActionCategory";import SysActionTypes from"@claspo/renderer/action/SysActionTypes";import DocumentConnectorEventType from"./DocumentConnectorEventType";export default class BaseDocumentConnector extends DefaultEventEmitter{constructor(e){super(),this.propsRequestListener=e=>{e.stopPropagation();let t=e.detail.id,o=e.detail.widgetId;if(o&&this.params.formVariantId&&this.params.formVariantId!==o)return;let i=DocumentUtils.getNodeById(this.entryModule.compositionRoot.services.documentModel.getViews(),t);i&&(e.detail.props=this.entryModule.componentFactory.constructProps(i,this.entryModule.viewRenderer.viewResourceManager))},this.params=e,this.entryModule=null,this.controllers=[],this.container=null}disconnect(){var e;null===(e=this.container)||void 0===e||e.removeEventListener("cl-props-request",this.propsRequestListener)}addPropsRequestEventListener(e){this.container=e,e.addEventListener("cl-props-request",this.propsRequestListener)}setEntryModule(e){this.entryModule=e}navigate(e){this.entryModule&&this.entryModule.viewRouter&&this.entryModule.viewRouter.navigate(e)}performAction(e,t){const o=this.entryModule.performAction(e,t);return this.controllers.forEach(o=>{switch(e){case EditorToWidgetEventType.COLOR_SCHEMA_UPDATE:CssVarsOperations.override(t,o.getConnectedElement());break;case EditorToWidgetEventType.THEME_UPDATE:ThemeCssVars.override(t.schema,o.getConnectedElement())}}),o}setEnvironment(e){this.entryModule.performAction(EditorToWidgetEventType.ENVIRONMENT_UPDATE,e)}getComponentManifests(){return this.componentResolver.getComponentManifests()}getSubmitState(){var e,t,o,i,r;return(null===(r=null===(i=null===(o=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services)||void 0===o?void 0:o.submitState)||void 0===i?void 0:i.getState)||void 0===r?void 0:r.call(i))||"idle"}hasDirtyFormData(){var e,t,o,i,r;return!!(null===(r=null===(i=null===(o=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services)||void 0===o?void 0:o.submitState)||void 0===i?void 0:i.hasDirtyFormData)||void 0===r?void 0:r.call(i))}waitForCurrentSubmission(){var e,t,o,i,r;const n=null===(r=null===(i=null===(o=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services)||void 0===o?void 0:o.submitState)||void 0===i?void 0:i.waitForCurrentSubmission)||void 0===r?void 0:r.call(i);return Promise.resolve(n)}async submitOnClose(){var e,t,o,i;const r=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services;if(!r)return!1;const n=await Promise.resolve(null===(i=null===(o=r.submitState)||void 0===o?void 0:o.prepareAutoSubmitFormValue)||void 0===i?void 0:i.call(o));if(!n||!Object.values(n).length)return!1;const s=r.actionRegister.getRegisteredActions().find(e=>e.category===ActionCategory.SUBMIT),l=s||r.actionFactory.get({type:SysActionTypes.REQUEST});return this.emit(DocumentConnectorEventType.WIDGET_CLOSE_TRY_TO_SUBMIT,{autoSubmitForm:n,actualForm:r.form.getControlsMap()}),l.execute(void 0,void 0,!0,{skipValidation:!0,skipNavigation:!0,excludeFormContext:!0,formValue:n})}}
+import CssVarsOperations from"@claspo/common/element/CssVarsOperations";import ThemeCssVars from"@claspo/common/element/ThemeCssVars";import{EditorToWidgetEventType}from"@claspo/renderer/document-model/DocumentModelService";import DefaultEventEmitter from"@claspo/common/DefaultEventEmitter";import DocumentUtils from"@claspo/common/document/DocumentUtils";export default class BaseDocumentConnector extends DefaultEventEmitter{constructor(e){super(),this.propsRequestListener=e=>{e.stopPropagation();let t=e.detail.id,o=e.detail.widgetId;if(o&&this.params.formVariantId&&this.params.formVariantId!==o)return;let i=DocumentUtils.getNodeById(this.entryModule.compositionRoot.services.documentModel.getViews(),t);i&&(e.detail.props=this.entryModule.componentFactory.constructProps(i,this.entryModule.viewRenderer.viewResourceManager))},this.params=e,this.entryModule=null,this.controllers=[],this.container=null}disconnect(){var e;null===(e=this.container)||void 0===e||e.removeEventListener("cl-props-request",this.propsRequestListener)}addPropsRequestEventListener(e){this.container=e,e.addEventListener("cl-props-request",this.propsRequestListener)}setEntryModule(e){this.entryModule=e}navigate(e){this.entryModule&&this.entryModule.viewRouter&&this.entryModule.viewRouter.navigate(e)}performAction(e,t){const o=this.entryModule.performAction(e,t);return this.controllers.forEach(o=>{switch(e){case EditorToWidgetEventType.COLOR_SCHEMA_UPDATE:CssVarsOperations.override(t,o.getConnectedElement());break;case EditorToWidgetEventType.THEME_UPDATE:ThemeCssVars.override(t.schema,o.getConnectedElement())}}),o}setEnvironment(e){this.entryModule.performAction(EditorToWidgetEventType.ENVIRONMENT_UPDATE,e)}getComponentManifests(){return this.componentResolver.getComponentManifests()}getSubmitState(){var e,t,o,i,r;return(null===(r=null===(i=null===(o=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services)||void 0===o?void 0:o.submitState)||void 0===i?void 0:i.getState)||void 0===r?void 0:r.call(i))||"idle"}hasDirtyFormData(){var e,t,o,i,r;return!!(null===(r=null===(i=null===(o=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services)||void 0===o?void 0:o.submitState)||void 0===i?void 0:i.hasDirtyFormData)||void 0===r?void 0:r.call(i))}waitForCurrentSubmission(){var e,t,o,i,r;const n=null===(r=null===(i=null===(o=null===(t=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===t?void 0:t.services)||void 0===o?void 0:o.submitState)||void 0===i?void 0:i.waitForCurrentSubmission)||void 0===r?void 0:r.call(i);return Promise.resolve(n)}}

package/DocumentConnectorEventType.d.ts

@@ -7,6 +7,7 @@ declare enum DocumentConnectorEventType {
     CONTACT_DATA_SUBMIT = "CONTACT_DATA_SUBMIT",
     WIDGET_CONTENT_CLICKED = "WIDGET_CONTENT_CLICKED",
     THEME_UPDATE = "THEME_UPDATE",
-    WIDGET_CLOSE_TRY_TO_SUBMIT = "WIDGET_CLOSE_TRY_TO_SUBMIT"
+    WIDGET_CLOSE_TRY_TO_SUBMIT = "WIDGET_CLOSE_TRY_TO_SUBMIT",
+    LEAD_PROGRESS = "LEAD_PROGRESS"
 }
 export default DocumentConnectorEventType;

package/DocumentConnectorEventType.js

@@ -1 +1 @@
-var DocumentConnectorEventType;!function(E){E.CONTACT_ID_WAS_RECEIVED="CONTACT_ID_WAS_RECEIVED",E.CLOSE_WIDGET="CLOSE_WIDGET",E.SHOW_WIDGET="SHOW_WIDGET",E.CLOSE_ICON_CLICKED="CLOSE_ICON_CLICKED",E.BRANDING_ELEMENT_CLICKED="BRANDING_ELEMENT_CLICKED",E.CONTACT_DATA_SUBMIT="CONTACT_DATA_SUBMIT",E.WIDGET_CONTENT_CLICKED="WIDGET_CONTENT_CLICKED",E.THEME_UPDATE="THEME_UPDATE",E.WIDGET_CLOSE_TRY_TO_SUBMIT="WIDGET_CLOSE_TRY_TO_SUBMIT"}(DocumentConnectorEventType||(DocumentConnectorEventType={}));export default DocumentConnectorEventType;
+var DocumentConnectorEventType;!function(E){E.CONTACT_ID_WAS_RECEIVED="CONTACT_ID_WAS_RECEIVED",E.CLOSE_WIDGET="CLOSE_WIDGET",E.SHOW_WIDGET="SHOW_WIDGET",E.CLOSE_ICON_CLICKED="CLOSE_ICON_CLICKED",E.BRANDING_ELEMENT_CLICKED="BRANDING_ELEMENT_CLICKED",E.CONTACT_DATA_SUBMIT="CONTACT_DATA_SUBMIT",E.WIDGET_CONTENT_CLICKED="WIDGET_CONTENT_CLICKED",E.THEME_UPDATE="THEME_UPDATE",E.WIDGET_CLOSE_TRY_TO_SUBMIT="WIDGET_CLOSE_TRY_TO_SUBMIT",E.LEAD_PROGRESS="LEAD_PROGRESS"}(DocumentConnectorEventType||(DocumentConnectorEventType={}));export default DocumentConnectorEventType;

package/StaticDocumentConnector.d.ts

@@ -9,7 +9,6 @@ export default class StaticDocumentConnector extends BaseDocumentConnector {
     componentRegister: WcRegister;
     componentResolver: WcResolver;
     googleFontsLoader: GoogleFontsLoader | null;
-    closeSubmitPromise: Promise<boolean> | null;
     customFontsLoader: CustomFontsLoader | null;
     constructor(params: WidgetInitConfigI);
     emit(eventName: string, value: any, params?: any): void;

package/StaticDocumentConnector.js

@@ -1 +1 @@
-import BaseDocumentConnector from"./BaseDocumentConnector";import DocumentConnectorEventType from"./DocumentConnectorEventType";import{getZIndexByLayoutType}from"./layouts/getZindex";import LayoutFactory from"./layouts/LayoutFactory";import StaticEntryModule from"@claspo/renderer/StaticEntryModule";import WcResolver from"@claspo/renderer/wc-renderer/WcResolver";import{RenderMode}from"@claspo/common/RenderMode";import{WcRegister}from"@claspo/renderer/wc-renderer/WcRegister";import GoogleFontsLoader from"./layouts/GoogleFontsLoader";import CustomFontsLoader from"./layouts/CustomFontsLoader";import ThemeCssVars from"@claspo/common/element/ThemeCssVars";const DIRTY_SUBMIT_STATE="dirty",SUBMITTING_SUBMIT_STATE="submitting";export default class StaticDocumentConnector extends BaseDocumentConnector{constructor(e){super(e),this.componentResolver=null,this.googleFontsLoader=null,this.closeSubmitPromise=null,this.customFontsLoader=null;const{documentModel:t,translations:o,trackingService:s,layoutType:n,bundledComponentClasses:r}=e;this.componentRegister=new WcRegister(r,e.productKeyPrefix),this.componentResolver=new WcResolver(RenderMode.STATIC,this.componentRegister,e.productKeyPrefix);const i=new StaticEntryModule(t,this.componentResolver,this.componentRegister,e,o,s,n);this.setEntryModule(i)}emit(e,t,o=null){e!==DocumentConnectorEventType.CLOSE_WIDGET?super.emit(e,t,o):this.handleCloseWidget(t)}async connect(e){this.googleFontsLoader=new GoogleFontsLoader({widgetId:this.params.widgetId,siteId:this.params.siteId}),this.customFontsLoader=new CustomFontsLoader;const t=e.getRootNode(),o=CustomFontsLoader.getUsedCustomFonts(this.params.documentModel),s=[this.customFontsLoader.load(o,t)];if(!this.params.disableGoogleFonts){const e=GoogleFontsLoader.getUsedGoogleFonts(this.params.documentModel);s.push(this.googleFontsLoader.load(e,t))}return await Promise.all(s),this._initializeRenderer(e,t)}disconnect(){var e,t;super.disconnect(),this.controllers[0]&&this.controllers[0].disconnect(()=>{this.entryModule&&this.entryModule.viewRouter&&this.entryModule.compositionRoot&&this.entryModule.destroy()}),this.controllers=[],null===(e=this.googleFontsLoader)||void 0===e||e.cleanup(),null===(t=this.customFontsLoader)||void 0===t||t.cleanup()}destroy(){this.disconnect()}on(e,t){return super.on(e,t)}async _initializeRenderer(e,t){var o,s,n,r;await this.componentResolver.loadComponentsIfNecessary(this.params.documentModel,this.params.staticResourcesUrl);const i=this.entryModule.init(t);i.style.display="flex";const{layoutFactoryClass:a=LayoutFactory,layoutType:l,documentModel:d}=this.params,c=Object.assign(Object.assign({},this.params),{zIndex:null!==(s=null===(o=null==d?void 0:d.shared)||void 0===o?void 0:o.zIndex)&&void 0!==s?s:getZIndexByLayoutType(l)}),m=a.create(Object.assign(Object.assign({},c),{layoutType:this.params.layoutType,widgetType:this.params.widgetType,viewIndex:0,renderMode:this.entryModule.renderMode}),this,this.entryModule.viewRouter,this.entryModule.compositionRoot.services.documentModel,this.entryModule.compositionRoot.services.resizeListener);return this.controllers.push(m),super.addPropsRequestEventListener(i),this.params.formVariantId?i.classList.add("cl-widget-"+this.params.formVariantId):i.classList.add("cl-widget"),this.entryModule.listenAction("*",(e,t)=>{this.emit(t,e)}),m.connect(i,e,this.entryModule),(null===(r=null===(n=d.shared)||void 0===n?void 0:n.theme)||void 0===r?void 0:r.schema)&&ThemeCssVars.override(d.shared.theme.schema,m.getConnectedElement()),m.getConnectedElement()}handleCloseWidget(e){this.trySubmitOnClose();try{super.emit(DocumentConnectorEventType.CLOSE_WIDGET,e)}finally{"function"==typeof e&&e()}}trySubmitOnClose(){const e=this.params.submitOnClose||{enabled:!1,skipValidation:!0},t=this.getSubmitState();e.enabled&&!this.closeSubmitPromise&&"submitting"!==t&&"dirty"===t&&this.hasDirtyFormData()&&(this.closeSubmitPromise=Promise.resolve(this.submitOnClose()).catch(e=>(console.error(e),!1)).finally(()=>{this.closeSubmitPromise=null}))}}
+import BaseDocumentConnector from"./BaseDocumentConnector";import DocumentConnectorEventType from"./DocumentConnectorEventType";import{getZIndexByLayoutType}from"./layouts/getZindex";import LayoutFactory from"./layouts/LayoutFactory";import StaticEntryModule from"@claspo/renderer/StaticEntryModule";import WcResolver from"@claspo/renderer/wc-renderer/WcResolver";import{RenderMode}from"@claspo/common/RenderMode";import{WcRegister}from"@claspo/renderer/wc-renderer/WcRegister";import{FinishTrigger}from"@claspo/renderer/lead-capture/FinishCoordinator";import GoogleFontsLoader from"./layouts/GoogleFontsLoader";import CustomFontsLoader from"./layouts/CustomFontsLoader";import ThemeCssVars from"@claspo/common/element/ThemeCssVars";export default class StaticDocumentConnector extends BaseDocumentConnector{constructor(e){super(e),this.componentResolver=null,this.googleFontsLoader=null,this.customFontsLoader=null;const{documentModel:o,translations:t,trackingService:s,layoutType:n,bundledComponentClasses:r}=e;this.componentRegister=new WcRegister(r,e.productKeyPrefix),this.componentResolver=new WcResolver(RenderMode.STATIC,this.componentRegister,e.productKeyPrefix);const i=new StaticEntryModule(o,this.componentResolver,this.componentRegister,e,t,s,n);this.setEntryModule(i)}emit(e,o,t=null){e!==DocumentConnectorEventType.CLOSE_WIDGET?super.emit(e,o,t):this.handleCloseWidget(o)}async connect(e){this.googleFontsLoader=new GoogleFontsLoader({widgetId:this.params.widgetId,siteId:this.params.siteId}),this.customFontsLoader=new CustomFontsLoader;const o=e.getRootNode(),t=CustomFontsLoader.getUsedCustomFonts(this.params.documentModel),s=[this.customFontsLoader.load(t,o)];if(!this.params.disableGoogleFonts){const e=GoogleFontsLoader.getUsedGoogleFonts(this.params.documentModel);s.push(this.googleFontsLoader.load(e,o))}return await Promise.all(s),this._initializeRenderer(e,o)}disconnect(){var e,o;super.disconnect(),this.controllers[0]&&this.controllers[0].disconnect(()=>{this.entryModule&&this.entryModule.viewRouter&&this.entryModule.compositionRoot&&this.entryModule.destroy()}),this.controllers=[],null===(e=this.googleFontsLoader)||void 0===e||e.cleanup(),null===(o=this.customFontsLoader)||void 0===o||o.cleanup()}destroy(){this.disconnect()}on(e,o){return super.on(e,o)}async _initializeRenderer(e,o){var t,s,n,r;await this.componentResolver.loadComponentsIfNecessary(this.params.documentModel,this.params.staticResourcesUrl);const i=this.entryModule.init(o);i.style.display="flex";const{layoutFactoryClass:a=LayoutFactory,layoutType:d,documentModel:l}=this.params,c=Object.assign(Object.assign({},this.params),{zIndex:null!==(s=null===(t=null==l?void 0:l.shared)||void 0===t?void 0:t.zIndex)&&void 0!==s?s:getZIndexByLayoutType(d)}),m=a.create(Object.assign(Object.assign({},c),{layoutType:this.params.layoutType,widgetType:this.params.widgetType,viewIndex:0,renderMode:this.entryModule.renderMode}),this,this.entryModule.viewRouter,this.entryModule.compositionRoot.services.documentModel,this.entryModule.compositionRoot.services.resizeListener);return this.controllers.push(m),super.addPropsRequestEventListener(i),this.params.formVariantId?i.classList.add("cl-widget-"+this.params.formVariantId):i.classList.add("cl-widget"),this.entryModule.listenAction("*",(e,o)=>{this.emit(o,e)}),m.connect(i,e,this.entryModule),(null===(r=null===(n=l.shared)||void 0===n?void 0:n.theme)||void 0===r?void 0:r.schema)&&ThemeCssVars.override(l.shared.theme.schema,m.getConnectedElement()),m.getConnectedElement()}handleCloseWidget(e){this.trySubmitOnClose();try{super.emit(DocumentConnectorEventType.CLOSE_WIDGET,e)}finally{"function"==typeof e&&e()}}trySubmitOnClose(){var e,o,t;if(!(this.params.submitOnClose||{enabled:!1,skipValidation:!0}).enabled)return;const s=null===(o=null===(e=this.entryModule)||void 0===e?void 0:e.compositionRoot)||void 0===o?void 0:o.services;null===(t=null==s?void 0:s.finishCoordinator)||void 0===t||t.attemptCommit(FinishTrigger.CLOSE,{beforeExecute:e=>{var o,t;this.emit(DocumentConnectorEventType.WIDGET_CLOSE_TRY_TO_SUBMIT,{autoSubmitForm:e,actualForm:null===(t=null===(o=s.form)||void 0===o?void 0:o.getControlsMap)||void 0===t?void 0:t.call(o)})}})}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claspo/document-connector",
-  "version": "16.8.1",
+  "version": "16.9.0",
   "scripts": {
     "test": "jest --no-cache --coverage",
     "build": "rm -rf out && tsc --project tsconfig.json && npm run minify",
@@ -14,8 +14,8 @@
     "node": ">=18.16.0"
   },
   "dependencies": {
-    "@claspo/common": "7.3.2",
-    "@claspo/renderer": "18.7.11"
+    "@claspo/common": "7.4.0",
+    "@claspo/renderer": "18.8.0"
   },
   "devDependencies": {
     "@babel/core": "^7.28.5",