@flozy/editor 11.2.3 → 11.2.4

package/dist/Editor/common/StyleBuilder/fieldTypes/backgroundImage.js

@@ -4,6 +4,7 @@ import ImageSelector from "../../ImageSelector/ImageSelector";
 import UploadStyles from "../../ImageSelector/UploadStyles";
 import Icon from "../../Icon";
 import { useEditorContext } from "../../../hooks/useMouseMove";
+import { GetPageBgImage } from "../../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const BackgroundImage = props => {
@@ -11,8 +12,11 @@ const BackgroundImage = props => {
     value,
     data,
     customProps,
-    onChange
+    onChange,
+    elementProps,
+    title
   } = props;
+  const previewImg = GetPageBgImage(value);
   const {
     translation
   } = customProps;
@@ -25,6 +29,7 @@ const BackgroundImage = props => {
     theme
   } = useEditorContext();
   const classes = UploadStyles(theme);
+  const disableProgress = title === "Page Settings" || elementProps?.type === "freegridBox" || elementProps?.type === "freegrid";
   const onRemoveBG = () => {
     setBase64(null);
     onChange({
@@ -44,6 +49,9 @@ const BackgroundImage = props => {
     });
     handleClose();
   };
+  const getTitle = () => {
+    return elementProps?.type === "image" ? "Image" : elementProps?.type === "video" ? "Video" : null;
+  };
   return /*#__PURE__*/_jsxs(Grid, {
     item: true,
     xs: 12,
@@ -63,7 +71,7 @@ const BackgroundImage = props => {
         item: true,
         xs: 12,
         style: {
-          backgroundImage: base64 ? `url(${base64})` : "none"
+          backgroundImage: base64 ? `url(${previewImg})` : "none"
           // height: "200px",
         },
 
@@ -100,7 +108,9 @@ const BackgroundImage = props => {
       open: open,
       onClose: handleClose,
       customProps: customProps,
-      onSelectImage: onSelectImage
+      onSelectImage: onSelectImage,
+      title: getTitle(),
+      disableProgress: disableProgress
     })]
   });
 };

package/dist/Editor/common/StyleBuilder/fieldTypes/bannerSpacing.js

@@ -3,13 +3,13 @@ import { Checkbox, FormControlLabel, Grid, Slider, Typography, Box, IconButton }
 import { squreStyle } from "./radiusStyle";
 import { getBreakPointsValue } from "../../../helper/theme";
 import useWindowResize from "../../../hooks/useWindowResize";
+import { useEditorTheme } from "../../../hooks/useEditorTheme";
 import { CheckedBoxCheckIcon } from "../../iconListV2";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const BANNER_SPACING_KEYS = ["top", "left", "right", "bottom"];
 const BannerSpacing = props => {
   const {
-    value: val,
     data,
     onChange,
     elementProps,
@@ -23,7 +23,17 @@ const BannerSpacing = props => {
     key
   } = data;
   const lockKeyVal = `lock${key}`;
-  let lockSpacing = elementProps[lockKeyVal];
+  const {
+    selectedTheme
+  } = useEditorTheme();
+  const {
+    bannerSpacing,
+    lockbannerSpacing
+  } = selectedTheme?.elementProps[elementProps?.type] || {};
+  const isUserValue = Object.keys(props?.value || {})?.length;
+  const isUserLockedSpacing = typeof elementProps[lockKeyVal] === "boolean";
+  const val = isUserValue ? props?.value : bannerSpacing;
+  let lockSpacing = isUserLockedSpacing ? elementProps[lockKeyVal] : lockbannerSpacing;
   if (lockSpacing === undefined) {
     lockSpacing = true;
   }

package/dist/Editor/common/StyleBuilder/fieldTypes/borderRadius.js

@@ -3,13 +3,13 @@ import { Grid, Typography, Slider, FormControlLabel, Checkbox, Box, IconButton }
 import { radiusStyle } from "./radiusStyle";
 import useWindowResize from "../../../hooks/useWindowResize";
 import { getBreakPointsValue, getCustomizationValue } from "../../../helper/theme";
+import { useEditorTheme } from "../../../hooks/useEditorTheme";
 import { CheckedBoxCheckIcon } from "../../iconListV2";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const BORDER_RADIUS_KEYS = ["topLeft", "topRight", "bottomLeft", "bottomRight"];
 const BorderRadius = props => {
   const {
-    value: val,
     data,
     onChange,
     elementProps,
@@ -19,16 +19,24 @@ const BorderRadius = props => {
   const {
     translation
   } = customProps;
-  let {
-    lockRadius
-  } = elementProps;
-  if (lockRadius === undefined) {
-    lockRadius = true;
-  }
   const {
     key
   } = data;
   const [size] = useWindowResize();
+  const {
+    selectedTheme
+  } = useEditorTheme();
+  const {
+    borderRadius,
+    lockRadius: themeLockRadius
+  } = selectedTheme?.elementProps[elementProps?.type] || {};
+  const isUserValue = Object.keys(props?.value || {})?.length;
+  const isUserLockedRadius = typeof elementProps?.lockRadius === "boolean";
+  const val = isUserValue ? props?.value : borderRadius;
+  let lockRadius = isUserLockedRadius ? elementProps?.lockRadius : themeLockRadius;
+  if (lockRadius === undefined) {
+    lockRadius = true;
+  }
   const value = getBreakPointsValue(val, size?.device);
   const handleChange = e => {
     let changeAll = {};

package/dist/Editor/common/StyleBuilder/fieldTypes/color.js

@@ -1,14 +1,23 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { Grid, TextField, InputAdornment, Typography, Tooltip } from "@mui/material";
 import ColorPickerButton from "../../ColorPickerButton";
+import { getVariableValue } from "../../../helper/theme";
+import { useButtonStyle } from "../../../hooks/useThemeValues";
+
+// const MAP_STYLE_PROPS = {
+//   bgColor: "background-color",
+//   textColor: "color",
+// };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const Color = props => {
   const {
-    value,
+    value: val,
     data,
     onChange,
     classes,
+    elementProps,
+    handleClose,
     customProps
   } = props;
   const {
@@ -20,7 +29,22 @@ const Color = props => {
     translation
   } = customProps;
   const [recentColors, setRecentColors] = useState({});
-  const getLable = label === 'Text' ? translation("selectTextColor") : label === 'Background' ? translation("selectBgColor") : translation(label);
+  const {
+    buttonStyle
+  } = useButtonStyle(val, key, elementProps);
+  const newValue = buttonStyle?.color;
+  const {
+    value,
+    inputValue
+  } = useMemo(() => {
+    const isVariable = newValue && newValue.startsWith("var");
+    const inputValue = isVariable ? getVariableValue(newValue) : newValue;
+    return {
+      value: newValue,
+      inputValue: inputValue
+    };
+  }, [buttonStyle?.color]);
+  const getLable = label === "Text" ? translation("selectTextColor") : label === "Background" ? translation("selectBgColor") : translation(label);
   useEffect(() => {
     const storedColors = JSON.parse(localStorage.getItem("recentColors"));
     if (storedColors) {
@@ -58,11 +82,11 @@ const Color = props => {
         fontSize: "14px",
         fontWeight: 500,
         marginBottom: "5px",
-        display: 'flex',
-        alignItems: 'center',
-        '& svg': {
-          width: '20px',
-          height: '20px'
+        display: "flex",
+        alignItems: "center",
+        "& svg": {
+          width: "20px",
+          height: "20px"
         }
       },
       children: [translation(label), data?.infoIcon ? /*#__PURE__*/_jsx(Tooltip, {
@@ -70,14 +94,14 @@ const Color = props => {
         title: translation("noteText"),
         children: /*#__PURE__*/_jsx("span", {
           style: {
-            display: 'inline-block'
+            display: "inline-block"
           },
           children: data?.infoIcon
         })
       }) : null]
     }), /*#__PURE__*/_jsx(TextField, {
       fullWidth: true,
-      value: value,
+      value: inputValue,
       placeholder: getLable || `${label} ${translation("color code")}`,
       InputLabelProps: {
         shrink: true
@@ -90,6 +114,8 @@ const Color = props => {
             value: value,
             onSave: onSave,
             recentColors: recentColors[key],
+            handleClose: handleClose,
+            disableEditTheme: customProps?.disableEditTheme,
             hideGradient: hideGradient
           })
         })

package/dist/Editor/common/StyleBuilder/fieldTypes/fontSize.js

@@ -1,14 +1,17 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { TextField, IconButton, Grid, Typography } from "@mui/material";
 import { sizeMap } from "../../../utils/font.js";
 import { TextMinusIcon, TextPlusIcon } from "../../../common/iconslist.js";
+import { getElementStyle } from "../../../helper/theme.js";
+import { useSlateStatic } from "slate-react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const FontSize = props => {
   const {
-    value,
+    value: val,
     data,
     onChange,
+    elementProps,
     customProps
   } = props;
   const {
@@ -18,6 +21,10 @@ const FontSize = props => {
     key,
     width
   } = data;
+  const editor = useSlateStatic();
+  const value = useMemo(() => {
+    return val || getElementStyle(editor, elementProps, "font-size");
+  }, [editor, val]);
   const handleChange = e => {
     let inc = parseInt(e.target.value) || 16;
     inc = inc > 200 ? 200 : inc;
@@ -28,7 +35,9 @@ const FontSize = props => {
   const getSizeVal = () => {
     try {
       const size = `${value}`?.indexOf("px") >= 0 ? value : sizeMap[value] || value;
-      return parseInt(size || 16);
+      const defaultSize = 16;
+      const val = parseInt(size || defaultSize);
+      return isNaN(val) ? defaultSize : val;
     } catch (err) {
       return "";
     }
@@ -77,7 +86,7 @@ const FontSize = props => {
         size: "small",
         inputProps: {
           style: {
-            // textAlign: "center", 
+            // textAlign: "center",
             padding: "11px"
           }
         },

package/dist/Editor/common/StyleBuilder/fieldTypes/menusArray.js

@@ -129,6 +129,7 @@ const MenusArray = props => {
         className: "menu-item-app-header",
         children: [/*#__PURE__*/_jsx(TextField, {
           name: "text",
+          placeholder: m?.placeholder || "text",
           type: "text",
           value: m.text,
           onChange: handleChange(i),
@@ -140,6 +141,7 @@ const MenusArray = props => {
         }), /*#__PURE__*/_jsx(TextField, {
           name: "url",
           type: "text",
+          placeholder: m?.placeholder || "url",
           value: m.url,
           onChange: handleChange(i),
           size: "small",

package/dist/Editor/common/StyleBuilder/fieldTypes/text.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Grid, TextField, Typography } from "@mui/material";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -20,6 +20,17 @@ const Text = props => {
   } = data;
   const [value, setValue] = useState(pro_value);
   const [error, setError] = useState(false);
+  useEffect(() => {
+    if (["sectionBackgroundImage", "pageBgImage"].includes(key)) {
+      let bgUrl = "";
+      if (typeof props?.value === "string" && props?.value !== "none") {
+        bgUrl = props.value;
+      } else if (props?.value?.embedURL) {
+        bgUrl = props.value.embedURL;
+      }
+      setValue(bgUrl);
+    }
+  }, [props?.value]);
   const handleChange = e => {
     const newValue = e.target.value;
     setValue(newValue);
@@ -35,6 +46,7 @@ const Text = props => {
   return /*#__PURE__*/_jsxs(Grid, {
     item: true,
     xs: width || 12,
+    className: "text-field-wrapper",
     children: [/*#__PURE__*/_jsx(Typography, {
       variant: "body1",
       color: "primary",
@@ -54,10 +66,10 @@ const Text = props => {
       fullWidth: true,
       required: required,
       error: error,
-      helperText: error ? translation("This field is required") : '',
+      helperText: error ? translation("This field is required") : "",
       sx: {
-        '& .MuiFormHelperText-root': {
-          color: '#d32f2f !important'
+        "& .MuiFormHelperText-root": {
+          color: "#d32f2f !important"
         }
       }
     })]

package/dist/Editor/common/StyleBuilder/fieldTypes/textOptions.js

@@ -1,13 +1,13 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { FormControl, Grid, ListItemIcon, ListSubheader, MenuItem, Select, Typography } from "@mui/material";
-import { getBreakPointsValue } from "../../../helper/theme";
+import { getBreakPointsValue, getElementStyle } from "../../../helper/theme";
 import useWindowResize from "../../../hooks/useWindowResize";
 import { useEditorContext } from "../../../hooks/useMouseMove";
 import FontFamilyAutocomplete from "../../../Toolbar/FormatTools/FontFamilyAutocomplete";
 import { useSlate } from "slate-react";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
 
-// hideMetaDataOptions -- pass true to hide metadata option in select field 
+// hideMetaDataOptions -- pass true to hide metadata option in select field
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -31,14 +31,22 @@ const TextOptions = props => {
     renderOption,
     width,
     webFont = false,
-    hideMetaDataOptions = false
+    hideMetaDataOptions = false,
+    themeEnabled
   } = data;
   const {
     fontFamilies
   } = useEditorContext();
-  const editor = useSlate();
   const [size] = useWindowResize();
-  const value = isBreakpoint ? getBreakPointsValue(val, size?.device) : val;
+  const editor = useSlate();
+  const value = useMemo(() => {
+    const userValue = isBreakpoint ? getBreakPointsValue(val, size?.device) : val;
+    if (themeEnabled) {
+      // editor takes a little amount of time to update the new style in element, in that case userValue will be returned
+      return getElementStyle(editor, elementProps, key) || userValue;
+    }
+    return userValue;
+  }, [editor, isBreakpoint, val, size?.device]);
   const metaDataMappingOptions = metaMappings?.boards || [];
   const updatedOption = !hideMetaDataOptions && elementProps?.metadatamapping ? [...options, ...metaDataMappingOptions] : webFont ? fontFamilies?.options : options;
   const handleChange = (e, d) => {
@@ -117,7 +125,7 @@ const TextOptions = props => {
           editor: editor,
           format: key,
           options: fontFamilies.options,
-          width: '100%',
+          width: "100%",
           onChange: onChange,
           val: value,
           webFont: true

package/dist/Editor/common/StyleBuilder/formStyle.js

@@ -124,19 +124,25 @@ export const formStyle = [{
       key: "alignment",
       type: "alignment"
     }]
-  }, {
-    tab: "Background",
-    value: "backgroundImage",
-    fields: [{
-      label: "URL",
-      key: "backgroundImage",
-      type: "text"
-    }, {
-      label: "Background Image",
-      key: "backgroundImage",
-      type: "backgroundImage"
-    }]
-  }, {
+  },
+  // Commented out because the background functionality for forms has not been implemented yet
+  // {
+  //   tab: "Background",
+  //   value: "backgroundImage",
+  //   fields: [
+  //     {
+  //       label: "URL",
+  //       key: "backgroundImage",
+  //       type: "text",
+  //     },
+  //     {
+  //       label: "Background Image",
+  //       key: "backgroundImage",
+  //       type: "backgroundImage",
+  //     },
+  //   ],
+  // },
+  {
     tab: "Add to Boards",
     value: "metadatamapping",
     fields: [{

package/dist/Editor/common/StyleBuilder/index.js

@@ -17,7 +17,8 @@ export const StyleContent = props => {
     element: propsElement,
     customProps,
     handleClose,
-    customElement
+    customElement,
+    title
   } = props;
   const element = customElement ? customElement : propsElement;
   const {
@@ -35,19 +36,11 @@ export const StyleContent = props => {
     fields: []
   };
   const filteredFields = (hideTools || [])?.length > 0 ? fields.filter(f => (hideTools || []).indexOf(f.key) === -1) : fields;
-
-  // Apply conditional field visibility
-  const conditionallyFilteredFields = filteredFields.filter(field => {
-    if (field.condition && typeof field.condition === 'function') {
-      return field.condition(element);
-    }
-    return true;
-  });
   return /*#__PURE__*/_jsx(Grid, {
     container: true,
     spacing: 2,
     className: "sidebar-wrpr-eds",
-    children: [...conditionallyFilteredFields].map((m, i) => {
+    children: [...filteredFields].map((m, i) => {
       const FieldComponent = FieldMap[m.type];
       return FieldComponent ? /*#__PURE__*/_jsx(FieldComponent, {
         data: m,
@@ -57,7 +50,8 @@ export const StyleContent = props => {
         customProps: customProps,
         handleClose: handleClose,
         classes: classes,
-        translation: translation
+        translation: translation,
+        title: title
       }, `ei_stt_tab_${value}_${m.key}_${i}`) : null;
     })
   }, value);
@@ -218,19 +212,15 @@ const StyleBuilder = props => {
                   sx: {
                     padding: "5px"
                   },
-                  children: m?.fields.filter(f => (hideTools || []).indexOf(f.value) === -1).filter(field => {
-                    if (field.condition && typeof field.condition === 'function') {
-                      return field.condition(elementProps);
-                    }
-                    return true;
-                  }).map((field, index) => {
+                  children: m?.fields.filter(f => (hideTools || []).indexOf(f.value) === -1).map((field, index) => {
                     return /*#__PURE__*/_jsx(StyleContent, {
                       renderTabs: [field],
                       value: field.value,
                       element: elementProps,
                       onChange: onElementPropsChange,
                       customProps: customProps,
-                      handleClose: handleClose
+                      handleClose: handleClose,
+                      title: title
                     }, `tab_${field.value}_${index}`);
                   })
                 })]
@@ -243,7 +233,8 @@ const StyleBuilder = props => {
               element: elementProps,
               onChange: onElementPropsChange,
               customProps: customProps,
-              handleClose: handleClose
+              handleClose: handleClose,
+              title: title
             }, `tab_${m.value}_$${i}`);
           }
         })