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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.292-alpha.13",
+  "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) => {
@@ -305,13 +305,10 @@ const HTMLEditor = forwardRef(({
     apiValidationErrors, // Pass API validation errors to merge with client-side validation
   }, formatSanitizerMessage, formatValidatorMessage);
 
-  // Expose validation and content state via ref (InApp: also expose getDeviceContent for Test and Preview)
+  // Expose validation and content state via ref
   useImperativeHandle(ref, () => ({
     getValidation: () => validation,
     getContent: () => currentContent,
-    getDeviceContent: variant === HTML_EDITOR_VARIANTS.INAPP && typeof getDeviceContent === 'function'
-      ? getDeviceContent
-      : undefined,
     isContentEmpty: () => !currentContent || currentContent.trim() === '',
     getIssueCounts: () => {
       if (!validation || typeof validation.getAllIssues !== 'function') {
@@ -327,7 +324,7 @@ const HTMLEditor = forwardRef(({
         : countIssuesBySeverity(validation.getAllIssues()),
     })
     ,
-  }), [validation, currentContent, apiValidationErrors, variant, getDeviceContent]);
+  }), [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);
@@ -835,5 +832,5 @@ HTMLEditor.defaultProps = {
   apiValidationErrors: null, // API validation errors from validateLiquidTemplateContent
 };
 
-// Export with injectIntl - forwardRef so parent (e.g. InApp) can use ref for getDeviceContent (Test and Preview)
-export default injectIntl(HTMLEditor, { forwardRef: true });
+// Export with injectIntl - HTMLEditor now uses forwardRef internally
+export default injectIntl(HTMLEditor);

package/v2Components/HtmlEditor/index.lazy.js

@@ -40,14 +40,14 @@ const LazyHTMLEditor = React.lazy(() =>
  *
  * This component wraps the HTMLEditor with React.lazy() and Suspense
  * to enable code splitting and reduce initial bundle size.
- * Forwards ref so parent (e.g. InApp) can call getDeviceContent for Test and Preview.
  */
-const HTMLEditorLazy = React.forwardRef((props, ref) => (
-  <Suspense fallback={<HTMLEditorFallback />}>
-    <LazyHTMLEditor {...props} ref={ref} />
-  </Suspense>
-));
-HTMLEditorLazy.displayName = 'HTMLEditorLazy';
+const HTMLEditorLazy = (props) => {
+  return (
+    <Suspense fallback={<HTMLEditorFallback />}>
+      <LazyHTMLEditor {...props} />
+    </Suspense>
+  );
+};
 
 // Forward all prop types from the original component
 HTMLEditorLazy.propTypes = {

package/v2Containers/InApp/index.js

@@ -61,7 +61,7 @@ import { validateInAppContent } from "../../utils/commonUtils";
 import { hasLiquidSupportFeature } from "../../utils/common";
 import formBuilderMessages from "../../v2Components/FormBuilder/messages";
 import HTMLEditor from "../../v2Components/HtmlEditor";
-import { HTML_EDITOR_VARIANTS, DEVICE_TYPES as HTML_DEVICE_TYPES } from "../../v2Components/HtmlEditor/constants";
+import { HTML_EDITOR_VARIANTS } from "../../v2Components/HtmlEditor/constants";
 import { INAPP_EDITOR_TYPES } from "../InAppWrapper/constants";
 import InappAdvanced from "../InappAdvance/index";
 import { ErrorInfoNote } from "../../v2Components/ErrorInfoNote";
@@ -145,7 +145,6 @@ export const InApp = (props) => {
   // Refs to store latest content before layout changes
   const htmlContentAndroidRef = useRef(htmlContentAndroid);
   const htmlContentIosRef = useRef(htmlContentIos);
-  const htmlEditorRef = useRef(null);
   const [accountId, setAccountId] = useState("");
   const [accessToken, setAccessToken] = useState("");
   const [accountName, setAccountName] = useState("");
@@ -178,19 +177,9 @@ export const InApp = (props) => {
   // Transformation to payload structure happens in prepareTestMessagePayload
   // Reference: Based on getPreviewSection() function (lines 490-530) which prepares content for TemplatePreview
   const getTemplateContent = useCallback(() => {
-    // For HTML template: prefer editor ref (source of truth) so library mode preview gets latest content
-    let androidMsg = templateMessageAndroid;
-    let iosMsg = templateMessageIos;
-    if (isHTMLTemplate) {
-      const getDeviceContentFromEditor = htmlEditorRef.current?.getDeviceContent;
-      if (typeof getDeviceContentFromEditor === 'function') {
-        androidMsg = getDeviceContentFromEditor(HTML_DEVICE_TYPES.ANDROID) ?? '';
-        iosMsg = getDeviceContentFromEditor(HTML_DEVICE_TYPES.IOS) ?? '';
-      } else {
-        androidMsg = htmlContentAndroidRef.current ?? htmlContentAndroid ?? '';
-        iosMsg = htmlContentIosRef.current ?? htmlContentIos ?? '';
-      }
-    }
+    // 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 = {};
@@ -518,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(() => {
@@ -1334,7 +1352,6 @@ export const InApp = (props) => {
           )}
           {shouldUseHTMLEditor ? (
             <HTMLEditor
-              ref={htmlEditorRef}
               key={`inapp-html-editor-v${htmlEditorContentVersion}`}
               variant={HTML_EDITOR_VARIANTS.INAPP}
               layoutType={templateLayoutType}