@servicetitan/dte-unlayer 0.151.0 → 0.153.0

package/src/unlayer.tsx

@@ -1,5 +1,7 @@
 import { emitDisplayCondition } from './display-conditions/displayConditionController';
 import { editorCoreScript, editorCoreStyles, editorCoreTools } from './editor-core';
+import { logUnlayerError } from './log';
+import { scheduleUnlayerMergeTags, toUnlayerMergeTags } from './merge-tags';
 import { constGenericsEditor } from './shared/const';
 import { unlayerSupportedFonts } from './shared/fonts';
 import {
@@ -275,82 +277,92 @@ export const createUnlayerEditor = (
         },
     };
 
-    const result = (window as any).unlayer.createEditor({
-        displayMode: 'web',
-        devices: ['desktop'],
-        features: {
-            preview: true,
-            userUploads: false,
-            stockImages: false,
-            textEditor: {
-                tables: true,
-            },
-        },
-        mergeTags: mergeTags?.reduce(
-            (out, tag) => {
-                out[tag.id] = { name: tag.name, value: tag.propertyPath };
+    let result: Unlayer;
+
+    try {
+        const unlayerApi = (window as any).unlayer;
+
+        if (!unlayerApi?.createEditor) {
+            throw new Error(
+                'Unlayer embed is not available. window.unlayer.createEditor is missing.',
+            );
+        }
 
-                return out;
+        result = unlayerApi.createEditor({
+            displayMode: 'web',
+            devices: ['desktop'],
+            features: {
+                preview: true,
+                userUploads: false,
+                stockImages: false,
+                textEditor: {
+                    tables: true,
+                },
             },
-            {} as Record<string, { name: string; value: string }>,
-        ),
-        projectId: 5713,
-        version: latest ? undefined : versions.unlayer,
-        appearance: {
-            theme: 'classic_light',
-        },
-        tools: {
-            'carousel': { enabled: false },
-            'button': { enabled: false },
-            'html': {
-                enabled: enableHTMLEditing,
-                properties: {
-                    html: {
-                        editor: {
-                            widgetParams: {
-                                codeMirrorOptions: {
-                                    readOnly: enableHTMLEditingReadonly,
+            mergeTags: toUnlayerMergeTags(mergeTags, { groups: false }),
+            projectId: 5713,
+            version: latest ? undefined : versions.unlayer,
+            appearance: {
+                theme: 'classic_light',
+            },
+            tools: {
+                'carousel': { enabled: false },
+                'button': { enabled: false },
+                'html': {
+                    enabled: enableHTMLEditing,
+                    properties: {
+                        html: {
+                            editor: {
+                                widgetParams: {
+                                    codeMirrorOptions: {
+                                        readOnly: enableHTMLEditingReadonly,
+                                    },
                                 },
                             },
                         },
                     },
                 },
+                'table': {
+                    enabled: true,
+                },
+                'menu': { enabled: false },
+                'form': { enabled: false },
+                ...(noCoreTools
+                    ? {
+                          columns: { enabled: false },
+                          text: { enabled: false },
+                          heading: { enabled: false },
+                          divider: { enabled: false },
+                          image: { enabled: false },
+                      }
+                    : {}),
+                ...unitsConfig,
+                'custom#e-sign': eSignComponentRecipients,
             },
-            'table': {
-                enabled: true,
+            editor: {
+                autoSelectOnDrop: true,
             },
-            'menu': { enabled: false },
-            'form': { enabled: false },
-            ...(noCoreTools
-                ? {
-                      columns: { enabled: false },
-                      text: { enabled: false },
-                      heading: { enabled: false },
-                      divider: { enabled: false },
-                      image: { enabled: false },
-                  }
-                : {}),
-            ...unitsConfig,
-            'custom#e-sign': eSignComponentRecipients,
-        },
-        editor: {
-            autoSelectOnDrop: true,
-        },
-        customJS: customScripts,
-        customCSS: customStyles,
-        id,
-        fonts: {
-            showDefaultFonts: false,
-            customFonts: unlayerSupportedFonts,
-        },
-        tabs: {
-            content: {},
-            body: {},
-            blocks: { enabled: false },
-        },
-    });
+            customJS: customScripts,
+            customCSS: customStyles,
+            id,
+            fonts: {
+                showDefaultFonts: false,
+                customFonts: unlayerSupportedFonts,
+            },
+            tabs: {
+                content: {},
+                body: {},
+                blocks: { enabled: false },
+            },
+        });
+    } catch (error: unknown) {
+        logUnlayerError('unlayer.createEditor failed', error);
+        throw error;
+    } finally {
+        document.getElementById = currentFind;
+    }
 
-    document.getElementById = currentFind;
+    scheduleUnlayerMergeTags(result, mergeTags);
 
     if (displayConditions) {
         result.registerCallback(