@capillarytech/creatives-library 9.0.15 → 9.0.17

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -345,7 +345,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
 
   render() {
     const {
-      hidePopover = false, intl = {}, moduleFilterEnabled, label, modalProps, channel, fetchingSchemaError = false,
+      hidePopover = false, intl = {}, moduleFilterEnabled, label, modalProps, channel, fetchingSchemaError = false, getPopupContainer,
     } = this.props;
     const {formatMessage} = intl;
     const {
@@ -436,6 +436,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             content={contentSection}
             trigger="click"
             placement={this.props.popoverPlacement || (channel === EMAIL.toUpperCase() ? "leftTop" : "rightTop")}
+            getPopupContainer={getPopupContainer}
             classNames={{
               container: 'tag-list-popover-container'
             }}

package/v2Components/HtmlEditor/components/CodeEditorPane/index.js

@@ -67,6 +67,7 @@ const CodeEditorPaneComponent = ({
   onTagContextChange,
   // Validation props
   onErrorClick,
+  isFullscreenMode = false,
 }) => {
   const context = useEditorContext();
   const {
@@ -292,6 +293,16 @@ const CodeEditorPaneComponent = ({
               eventContextTags={eventContextTags}
               waitEventContextTags={waitEventContextTags}
               popoverPlacement="rightTop"
+              // In fullscreen the editor lives inside a high z-index CapModal;
+              // mount the label popover inside that modal so it isn't rendered
+              // behind it (body-mounted popovers sit below the modal's z-index).
+              getPopupContainer={
+                isFullscreenMode
+                  ? triggerNode =>
+                      triggerNode.closest('.ant-modal-content') ||
+                      document.body
+                  : undefined
+              }
             />
           </CapRow>
         </div>

package/v2Containers/Email/index.js

@@ -194,7 +194,10 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     // const formData = _.cloneDeep(this.state.formData);
     if (this.props.params.id || (this.props.location.query.module === "library" && this.props.templateData && !_.isEmpty(this.props.templateData))) {
       this.setState({isEdit: true}, () => {
-        if (this.props.params.id) {
+        // Embedded campaign content is authoritative via the inline templateData
+        // prop; fetching by id would pull reusable-template data and drop the
+        // inline BEE json_content. Only fetch for real reusable-template edits.
+        if (this.props.params.id && this.props.location.query.type !== 'embedded') {
           this.props.actions.getTemplateDetails(this.props.params.id, 'email');
         }
       });
@@ -459,7 +462,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         }
       }
 
-      if (this.state.isEdit && !this.state.editDataSet && !_.isEmpty(nextProps.Email.templateDetails) && !_.isEmpty(this.state.schema)) {
+      if (this.state.isEdit && !this.state.editDataSet && !_.isEmpty(nextProps.Email.templateDetails) && !_.isEmpty(this.state.schema) && nextProps.location.query.type !== 'embedded') {
         this.setState({editDataSet: true}, () => {
           this.setEditData(nextProps.Email.templateDetails);
           // Update template name in parent if available
@@ -470,7 +473,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           }
         });
       }
-      if (this.state.isEdit && nextProps.location.query.module === "library" && !_.isEmpty(nextProps.templateData) && !this.props.params.id && !nextProps.isGetFormData && _.isEmpty(_.get(this, `state.formData['template-subject']`))) {
+      if (this.state.isEdit && nextProps.location.query.module === "library" && !_.isEmpty(nextProps.templateData) && (!nextProps.params.id || nextProps.location.query.type === "embedded") && !nextProps.isGetFormData && _.isEmpty(_.get(this, `state.formData['template-subject']`))) {
         this.startTemplateCreation(nextProps.templateData);
       }
       if (nextProps.location.query.module === 'library' && nextProps.isGetFormData && (this.props.isGetFormData !== nextProps.isGetFormData)) {

package/v2Containers/TagList/index.js

@@ -477,6 +477,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           disableTooltipMsg={tooltipMsg}
           fetchingSchemaError={this?.state?.tagsError}
           popoverPlacement={this.props.popoverPlacement}
+          getPopupContainer={this.props.getPopupContainer}
         />
       </div>
     );