@capillarytech/creatives-library 8.0.292-alpha.14 → 8.0.292-alpha.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.292-alpha.14",
+  "version": "8.0.292-alpha.15",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Components/HtmlEditor/HTMLEditor.js

@@ -191,7 +191,7 @@ const HTMLEditor = forwardRef(({
       inAppContent.updateContent(newContent, true);
       inAppLastAppliedInitialRef.current = { android: newAndroid, ios: newIos };
     }
-  }, [initialContent, isEmailVariant, isInAppVariant, emailContent, inAppContent]);
+  }, [initialContent, isEmailVariant, isInAppVariant]);
   // Handle context change for tag API calls
   // If variant is INAPP, use SMS layout; otherwise use the channel (EMAIL)
   const handleContextChange = useCallback((contextData) => {
@@ -324,7 +324,7 @@ const HTMLEditor = forwardRef(({
         : countIssuesBySeverity(validation.getAllIssues()),
     })
     ,
-  }), [validation, currentContent, apiValidationErrors]);
+  }), [validation, currentContent, apiValidationErrors]); // Include apiValidationErrors so ref methods return updated counts
 
   // Use ref to store callback to avoid infinite loops (callback in deps would cause re-runs)
   const onValidationChangeRef = useRef(onValidationChange);
@@ -832,5 +832,5 @@ HTMLEditor.defaultProps = {
   apiValidationErrors: null, // API validation errors from validateLiquidTemplateContent
 };
 
-// Export with injectIntl - HTMLEditor uses forwardRef internally
+// Export with injectIntl - HTMLEditor now uses forwardRef internally
 export default injectIntl(HTMLEditor);

package/v2Containers/InApp/index.js

@@ -142,13 +142,9 @@ export const InApp = (props) => {
   const [isHTMLTemplate, setIsHTMLTemplate] = useState(false);
   // Version to force HTMLEditor remount on layout changes
   const [htmlEditorContentVersion, setHtmlEditorContentVersion] = useState(0);
-  // Refs to store latest content (kept in sync in handleHtmlContentChange so Test and Preview reads fresh content in library mode)
+  // Refs to store latest content before layout changes
   const htmlContentAndroidRef = useRef(htmlContentAndroid);
   const htmlContentIosRef = useRef(htmlContentIos);
-  useEffect(() => {
-    htmlContentAndroidRef.current = htmlContentAndroid;
-    htmlContentIosRef.current = htmlContentIos;
-  }, [htmlContentAndroid, htmlContentIos]);
   const [accountId, setAccountId] = useState("");
   const [accessToken, setAccessToken] = useState("");
   const [accountName, setAccountName] = useState("");
@@ -176,15 +172,14 @@ export const InApp = (props) => {
   // TestAndPreviewSlidebox state
   const [showTestAndPreviewSlidebox, setShowTestAndPreviewSlidebox] = useState(false);
 
-  // Get template content for TestAndPreviewSlidebox (same pattern as Mobile Push: read current content for preview)
-  // State is updated on every keystroke via onContentChange; refs are synced so we read fresh content in library mode too.
+  // Get template content for TestAndPreviewSlidebox
+  // Returns simple structure with preview fields only
+  // Transformation to payload structure happens in prepareTestMessagePayload
+  // Reference: Based on getPreviewSection() function (lines 490-530) which prepares content for TemplatePreview
   const getTemplateContent = useCallback(() => {
-    const androidMsg = isHTMLTemplate
-      ? (htmlContentAndroidRef.current ?? htmlContentAndroid ?? '')
-      : templateMessageAndroid;
-    const iosMsg = isHTMLTemplate
-      ? (htmlContentIosRef.current ?? htmlContentIos ?? '')
-      : templateMessageIos;
+    // For HTML template, use HTML editor content so preview stays in sync with typing
+    const androidMsg = isHTMLTemplate ? (htmlContentAndroid ?? '') : templateMessageAndroid;
+    const iosMsg = isHTMLTemplate ? (htmlContentIos ?? '') : templateMessageIos;
 
     // Prepare Android content
     const androidMediaPreview = {};
@@ -512,11 +507,40 @@ export const InApp = (props) => {
     }
   }, [editData.templateDetails || templateData]);
 
-  // Extract editor type from defaultData for stable reference
+  // Extract editor type: from defaultData (create flow) or derive from template content (edit flow)
   const editorType = useMemo(() => {
-    const type = defaultData?.['editor-type'];
-    return type;
-  }, [defaultData]);
+    const fromDefault = defaultData?.['editor-type'];
+    if (fromDefault) return fromDefault;
+
+    // Edit flow: derive from template content when editor-type wasn't passed from wrapper
+    const source = isFullMode ? editData?.templateDetails : templateData;
+    const versions = source?.versions;
+    const content = get(versions, 'base.content', {});
+    if (!content || isEmpty(content)) return undefined;
+
+    const androidContent = content?.ANDROID;
+    const iosContent = content?.IOS;
+    const androidTitle = (androidContent?.title ?? '').toString();
+    const iosTitle = (iosContent?.title ?? '').toString();
+    const androidType = androidContent?.type ?? '';
+    const iosType = iosContent?.type ?? '';
+    const androidStyle = get(androidContent, 'expandableDetails.style');
+    const iosStyle = get(iosContent, 'expandableDetails.style');
+    const isBEEeditorAndroid = get(androidContent, 'isBEEeditor');
+    const isBEEeditorIos = get(iosContent, 'isBEEeditor');
+    const isBeeFreeAndroid = !isEmpty(androidTitle) && androidTitle.toLowerCase() === 'bee free template';
+    const isBeeFreeIos = !isEmpty(iosTitle) && iosTitle.toLowerCase() === 'bee free template';
+    const isHTMLEditorAndroid = !isEmpty(androidTitle) && androidTitle.toLowerCase() === 'html editor template';
+    const isHTMLEditorIos = !isEmpty(iosTitle) && iosTitle.toLowerCase() === 'html editor template';
+
+    const androidIsHTML = isHTMLEditorAndroid
+      || ((androidType === INAPP_MEDIA_TYPES.HTML || androidStyle === BIG_HTML) && !isBEEeditorAndroid && !isBeeFreeAndroid);
+    const iosIsHTML = isHTMLEditorIos
+      || ((iosType === INAPP_MEDIA_TYPES.HTML || iosStyle === BIG_HTML) && !isBEEeditorIos && !isBeeFreeIos);
+
+    if (androidIsHTML || iosIsHTML) return INAPP_EDITOR_TYPES.HTML_EDITOR;
+    return INAPP_EDITOR_TYPES.DRAG_DROP_EDITOR;
+  }, [defaultData, isFullMode, editData?.templateDetails, templateData]);
 
   // Separate effect for handling editor type from wrapper in create mode
   useEffect(() => {
@@ -1013,12 +1037,11 @@ export const InApp = (props) => {
     );
   };
 
-  // Handle HTML content changes from HTMLEditor - update state and refs so Test and Preview has fresh content (full + library mode)
+  // Handle HTML content changes from HTMLEditor
   const handleHtmlContentChange = useCallback((deviceContent, changedDevice) => {
     // When "keep content same" is on, useInAppContent passes full deviceContent with both
     // android and ios set to the same value. We must update both states so preview shows
     // the synced content for each device. Otherwise only update the device that changed.
-    // Refs are updated synchronously so getTemplateContent() reads latest when opening the slidebox.
 
     // Clear validation errors when content changes (similar to Bee Editor)
     if (changedDevice) {
@@ -1041,36 +1064,33 @@ export const InApp = (props) => {
     const isSyncUpdate = hasAndroid && hasIos;
 
     if (isSyncUpdate) {
+      // Sync mode: update both so preview shows same content for Android and iOS
       if (hasAndroid) {
-        const v = deviceContent.android || '';
-        htmlContentAndroidRef.current = v;
-        setHtmlContentAndroid(v);
+        setHtmlContentAndroid(deviceContent.android || '');
       }
       if (hasIos) {
-        const v = deviceContent.ios || '';
-        htmlContentIosRef.current = v;
-        setHtmlContentIos(v);
+        setHtmlContentIos(deviceContent.ios || '');
       }
     } else if (changedDevice) {
+      // Only one device changed
       if (changedDevice.toUpperCase() === ANDROID && hasAndroid) {
-        const v = deviceContent.android || '';
-        htmlContentAndroidRef.current = v;
-        setHtmlContentAndroid(v);
+        setHtmlContentAndroid(deviceContent.android || '');
       } else if (changedDevice.toUpperCase() === IOS_CAPITAL && hasIos) {
-        const v = deviceContent.ios || '';
-        htmlContentIosRef.current = v;
-        setHtmlContentIos(v);
+        setHtmlContentIos(deviceContent.ios || '');
       }
     } else {
+      // Fallback: update both if changedDevice not provided
       if (hasAndroid) {
-        const newValue = deviceContent.android || '';
-        htmlContentAndroidRef.current = newValue;
-        setHtmlContentAndroid((prev) => (prev !== newValue ? newValue : prev));
+        setHtmlContentAndroid((prev) => {
+          const newValue = deviceContent.android || '';
+          return prev !== newValue ? newValue : prev;
+        });
       }
       if (hasIos) {
-        const newValue = deviceContent.ios || '';
-        htmlContentIosRef.current = newValue;
-        setHtmlContentIos((prev) => (prev !== newValue ? newValue : prev));
+        setHtmlContentIos((prev) => {
+          const newValue = deviceContent.ios || '';
+          return prev !== newValue ? newValue : prev;
+        });
       }
     }
   }, [ANDROID, IOS_CAPITAL, setErrorMessage]);