@flozy/editor 10.2.1 → 10.2.2

package/dist/Editor/common/RnD/ElementSettings/Settings/TextSettings.js

@@ -9,6 +9,7 @@ const TextSettings = props => {
     editor,
     path,
     theme,
+    onClose,
     customProps
   } = props;
   const item_path = path.split("|").map(m => parseInt(m));
@@ -27,7 +28,8 @@ const TextSettings = props => {
   return /*#__PURE__*/_jsx(TextFormat, {
     classes: classes,
     editor: editor,
-    customProps: customProps
+    customProps: customProps,
+    closeMainPopup: onClose
   });
 };
 export default TextSettings;

package/dist/Editor/common/RnD/ElementSettings/Settings/VideoSettings.js

@@ -8,7 +8,8 @@ const VideoSettings = props => {
   const {
     editor,
     path,
-    customProps
+    customProps,
+    onClose
   } = props;
   const item_path = path?.split("|").map(m => parseInt(m));
   const element_path = [...item_path, 0];
@@ -28,7 +29,7 @@ const VideoSettings = props => {
     });
   };
   const handleClose = () => {
-    console.log("close");
+    onClose();
   };
   return /*#__PURE__*/_jsx(Box, {
     component: "div",

package/dist/Editor/common/RnD/ElementSettings/styles.js

@@ -1,8 +1,9 @@
 const useElementSettingsStyle = theme => ({
   root: {
     zIndex: 1200,
-    background: theme?.palette?.editor?.background,
-    borderRadius: "10px",
+    background: theme?.palette?.editor?.miniToolBarBackground,
+    border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder}`,
+    borderRadius: "20px",
     overflow: "hidden",
     boxShadow: "0px 0px 12px 4px #00000014",
     padding: "10px 16px",
@@ -58,28 +59,34 @@ const useElementSettingsStyle = theme => ({
       maxHeight: "500px",
       overflowX: "hidden",
       overflowY: "auto",
-      background: theme?.palette?.editor?.background,
-      paddingLeft: "4px",
+      background: theme?.palette?.editor?.miniToolBarBackground,
+      paddingLeft: "2px",
+      paddingRight: "6px",
+      overflow: "hidden",
+      "&:hover": {
+        overflowY: "auto",
+        "&::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb": {
+          background: `${theme?.palette?.editor?.brainPopupScroll} !important`
+        },
+        "&::-webkit-scrollbar-track, ::-webkit-scrollbar-track": {
+          visibility: "hidden"
+        }
+      },
       "& .MuiTypography-root, .MuiInputBase-root, input": {
         color: theme?.palette?.editor?.textColor
       },
-      "& .MuiInputBase-root, input": {
-        border: `1px solid ${theme?.palette?.editor?.borderColor}`
-      },
       "& .borderInput": {
         background: theme?.palette?.editor?.background,
         color: theme?.palette?.editor?.textColor
       },
-      "& .MuiCheckbox-root": {
-        "& svg": {
-          fill: theme?.palette?.editor?.textColor
-        }
-      },
       "& .fillPath": {
         fill: theme?.palette?.editor?.textColor
       },
       "& .MuiIconButton-root": {
         color: theme?.palette?.editor?.textColor
+      },
+      "& .MuiFormHelperText-root": {
+        color: theme?.palette?.editor?.textColor
       }
     },
     "& .item-wrapper": {
@@ -104,6 +111,134 @@ const useElementSettingsStyle = theme => ({
           }
         }
       }
+    },
+    "& .settingsPopUp": {
+      background: theme?.palette?.editor?.miniToolBarBackground,
+      "& .text-formatter-popup": {
+        paddingRight: "10px",
+        overflow: "hidden",
+        "&:hover": {
+          overflow: "auto",
+          "&::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb": {
+            background: `${theme?.palette?.editor?.brainPopupScroll} !important`
+          },
+          "&::-webkit-scrollbar-track, ::-webkit-scrollbar-track": {
+            visibility: "hidden"
+          }
+        },
+        "& .more-btn-cbs": {
+          color: `${theme?.palette?.editor?.closeButtonSvgStroke}`,
+          border: `1px solid ${theme?.palette?.editor?.closeButtonSvgStroke}`,
+          paddingTop: "10px",
+          "& svg": {
+            width: "20px",
+            height: "24px"
+          }
+        },
+        "& .MuiInputBase-root": {
+          height: "36px"
+        }
+      },
+      "& .popUpHeader": {
+        fontSize: "16px",
+        fontFamily: "'Inter',sans-serif",
+        fontWeight: "700",
+        fontSize: "16px",
+        lineHeight: "25px",
+        "& button": {
+          background: theme?.palette?.editor?.closeButtonBackground,
+          borderRadius: "8px",
+          "& svg": {
+            fill: theme?.palette?.editor?.closeButtonSvgStroke
+          }
+        }
+      },
+      "& .MuiTypography-root": {
+        color: `${theme?.palette?.editor?.textColor} !important`
+      },
+      "& .MuiInputBase-root": {
+        background: theme?.palette?.editor?.inputFieldBgColor,
+        borderRadius: "8px",
+        fontSize: "12px",
+        height: "36px",
+        border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
+        "& fieldset": {
+          border: `1px solid transparent !important`,
+          background: "transparent",
+          borderRadius: "8px"
+          // fontSize: "12px",
+        },
+
+        "& input": {
+          // border: `1px solid transparent`,
+          // background: theme?.palette?.editor?.inputFieldBgColor,
+          borderRadius: "8px"
+          // fontSize: "12px",
+        }
+      },
+
+      "& .editor-dd": {
+        "& .MuiOutlinedInput-notchedOutline": {
+          border: `1px solid transparent !important`
+        }
+      },
+      "& .MuiAutocomplete-root": {
+        "& fieldset": {
+          border: `1px solid transparent !important`
+        }
+      },
+      "& .sliderInput": {
+        border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
+        background: theme?.palette?.editor?.inputFieldBgColor,
+        borderRadius: "10px",
+        paddingLeft: "10px",
+        width: "50px !important"
+      },
+      "& .selctedBtnIcon": {
+        border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
+        background: theme?.palette?.editor?.inputFieldBgColor,
+        borderRadius: "10px",
+        height: "36px",
+        "& svg": {
+          color: `${theme?.palette?.editor?.svgTextAlignStrokeColor} !important`
+        }
+      },
+      "& .muiIconsListParent": {
+        "& svg": {
+          color: `${theme?.palette?.editor?.svgTextAlignStrokeColor} !important`
+        },
+        "&::-webkit-scrollbar-thumb": {
+          background: `${theme?.palette?.editor?.brainPopupScroll} !important`
+        },
+        "&::-webkit-scrollbar-track": {
+          visibility: "hidden"
+        }
+      },
+      "& .menu-item-app-header": {
+        paddingBottom: "5px",
+        "& .text-field1": {
+          marginRight: "5px"
+        },
+        "& .settingsIcon, .deleteIcon": {
+          width: "20px",
+          height: "20px",
+          "& path": {
+            stroke: theme?.palette?.editor?.closeButtonSvgStroke
+          }
+        }
+      },
+      "& .MuiPaper-root": {
+        background: theme?.palette?.editor?.miniToolBarBackground
+      },
+      "& .iconRadioButton": {
+        "& svg": {
+          height: "24px",
+          width: "24px"
+        },
+        "& .MuiRadio-root": {
+          paddingLeft: "0px"
+        }
+      }
     }
   },
   dialog: {

package/dist/Editor/common/RnD/OptionsPopup/index.js

@@ -1,6 +1,6 @@
 import React from "react";
-import { Box, Paper, Popper, Typography, Tooltip, IconButton } from "@mui/material";
-import CloseIcon from "@mui/icons-material/Close";
+import { Box, Paper, Popper, Typography, Tooltip, IconButton, Grid } from "@mui/material";
+import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
 import useOptionsPopupStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -30,7 +30,7 @@ const OptionsPopup = props => {
       className: "papper-root",
       children: [/*#__PURE__*/_jsxs(Typography, {
         variant: "div",
-        className: "item-wrapper title",
+        className: "item-wrapper title sectionOptionTitle",
         children: [translation(title), /*#__PURE__*/_jsx(Box, {
           component: "div",
           children: /*#__PURE__*/_jsx(Tooltip, {
@@ -38,11 +38,14 @@ const OptionsPopup = props => {
             arrow: true,
             children: /*#__PURE__*/_jsx(IconButton, {
               onClick: handleClose,
-              children: /*#__PURE__*/_jsx(CloseIcon, {})
+              children: /*#__PURE__*/_jsx(CloseRoundedIcon, {})
             })
           })
         })]
-      }), children]
+      }), /*#__PURE__*/_jsx(Grid, {
+        className: "sectionOptionChild",
+        children: children
+      })]
     })
   }) : null;
 };

package/dist/Editor/common/RnD/OptionsPopup/style.js

@@ -3,31 +3,139 @@ const useOptionsPopupStyle = ({
 }) => ({
   root: {
     zIndex: 1200,
-    background: theme?.palette?.editor?.background,
-    borderRadius: "7px",
+    background: theme?.palette?.editor?.miniToolBarBackground,
+    border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder}`,
+    borderRadius: "20px",
     overflow: "hidden",
-    boxShadow: "1px 1px 3px rgba(0,0,0,0.3)",
+    boxShadow: "0px 0px 12px 4px #00000014",
     marginRight: "4px !important",
+    padding: "0px 5px",
+    fontFamily: "'Inter',sans-serif",
+    "& .MuiPaper-root": {
+      background: theme?.palette?.editor?.miniToolBarBackground
+    },
+    "& .sectionOptionTitle": {
+      fontSize: "16px",
+      fontFamily: "'Inter',sans-serif",
+      fontWeight: "700",
+      fontSize: "16px",
+      lineHeight: "25px",
+      background: theme?.palette?.editor?.miniToolBarBackground,
+      "& button": {
+        background: theme?.palette?.editor?.closeButtonBackground,
+        borderRadius: "8px",
+        "& svg": {
+          fill: theme?.palette?.editor?.closeButtonSvgStroke
+        }
+      }
+    },
+    "& .sectionOptionChild": {
+      background: theme?.palette?.editor?.miniToolBarBackground,
+      "& .MuiBox-root": {
+        maxHeight: "unset"
+      },
+      "& .MuiInputBase-root, fieldset": {
+        background: theme?.palette?.editor?.inputFieldBgColor,
+        borderRadius: "8px",
+        "& fieldset": {
+          border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
+          background: "transparent",
+          borderRadius: "8px"
+        },
+        "& input": {
+          border: `1px solid transparent`,
+          background: theme?.palette?.editor?.inputFieldBgColor,
+          borderRadius: "8px",
+          fontSize: "12px",
+          color: theme?.palette?.editor?.textColor
+        }
+      },
+      "& p": {
+        color: theme?.palette?.editor?.textColor
+      },
+      "& .sliderInput": {
+        border: `1px solid ${theme?.palette?.editor?.inputFieldBorder}`,
+        background: theme?.palette?.editor?.inputFieldBgColor,
+        borderRadius: "10px"
+      },
+      "& .style-settings-wrpr": {
+        overflow: "hidden",
+        "&:hover": {
+          overflowY: "auto",
+          "&::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb": {
+            background: `${theme?.palette?.editor?.brainPopupScroll} !important`
+          },
+          "&::-webkit-scrollbar-track, ::-webkit-scrollbar-track": {
+            visibility: "hidden"
+          }
+        }
+      },
+      "& svg": {
+        width: "17.5px",
+        height: "17.5px"
+      }
+    },
+    "& .MuiList-root": {
+      "& .MuiButtonBase-root": {
+        padding: "8px 12px",
+        "& .MuiTypography-root": {
+          color: `${theme?.palette?.editor?.textColor} !important`,
+          fontSize: "14px",
+          fontWeight: "500",
+          fontFamily: "'Inter',sans-serif"
+        },
+        "&:hover": {
+          background: `${theme?.palette?.editor?.menuOptionHoverBackground} !important`,
+          "& .MuiTypography-root": {
+            color: `${theme?.palette?.editor?.textColor} !important`
+          },
+          "& .MuiListItemIcon-root": {
+            "& .signatureElementIcon, & .newLineElementIcon": {
+              "& path": {
+                fill: `${theme?.palette?.editor?.textColor}`
+              }
+            },
+            "& .commonSvgStyle, & .commonSvgStyle2": {
+              "& path": {
+                stroke: `${theme?.palette?.editor?.textColor}`
+              }
+            },
+            "& .colorBoxElementIcon": {
+              "& path": {
+                stroke: `${theme?.palette?.editor?.textColor}`,
+                fill: "none"
+              }
+            },
+            "& .gridElementIcon": {
+              "& path": {
+                stroke: `${theme?.palette?.editor?.textColor}`,
+                fill: `${theme?.palette?.editor?.textColor}`
+              }
+            }
+          }
+        }
+      }
+    },
+    "& .sectionMoreOption": {
+      "& .MuiButtonBase-root": {
+        padding: "12px 12px",
+        color: `${theme?.palette?.editor?.textColor} !important`,
+        fontSize: "14px",
+        fontWeight: "500",
+        fontFamily: "'Inter',sans-serif"
+      }
+    },
     "& .papper-root": {
       width: "344px",
       boxShadow: "none",
-      border: `1px solid ${theme?.palette?.editor?.borderColor}`,
       borderRadius: "7px",
       background: theme?.palette?.editor?.background,
       "& .MuiTypography-root, .MuiInputBase-root, input": {
         color: theme?.palette?.editor?.textColor
       },
-      "& .MuiInputBase-root, input": {
-        border: `1px solid ${theme?.palette?.editor?.borderColor}`
-      },
       "& .borderInput": {
         background: theme?.palette?.editor?.background,
         color: theme?.palette?.editor?.textColor
-      },
-      "& .MuiCheckbox-root": {
-        "& svg": {
-          fill: theme?.palette?.editor?.textColor
-        }
       }
     },
     "& .item-list-wrpr": {
@@ -37,13 +145,7 @@ const useOptionsPopupStyle = ({
       "& .MuiListItemButton-root": {
         borderRadius: "7px",
         color: theme?.palette?.editor?.textColor,
-        "&:hover": {
-          color: theme?.palette?.editor?.activeColor,
-          background: "rgba(233, 243, 254, 1)",
-          "& .MuiTypography-root": {
-            color: theme?.palette?.editor?.activeColor
-          }
-        }
+        alignItems: "center"
       }
     },
     "& .item-wrapper": {

package/dist/Editor/common/RnD/SwitchViewport/SwitchViewport.js

@@ -10,23 +10,27 @@ const SwitchViewport = props => {
   const {
     breakpoint,
     onChange,
-    translation
+    translation,
+    show
   } = props;
   const classes = useSwitchViewport();
   const {
-    setActiveBreakPoint
+    setSelectedElement
   } = useEditorContext();
   useEffect(() => {
-    console.log(breakpoint);
+    // to reset selection on viewport changes - FS-6589
+    setSelectedElement({});
   }, [breakpoint]);
   return /*#__PURE__*/_jsxs(Box, {
     sx: classes.root,
+    style: {
+      display: show ? "block" : "none"
+    },
     children: [/*#__PURE__*/_jsx(Tooltip, {
       title: translation("Desktop View"),
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${!breakpoint || breakpoint === "lg" ? "active" : ""}`,
         onClick: () => {
-          setActiveBreakPoint("");
           onChange("");
         },
         children: /*#__PURE__*/_jsx(PersonalVideoIcon, {})
@@ -36,7 +40,6 @@ const SwitchViewport = props => {
       children: /*#__PURE__*/_jsx(IconButton, {
         className: `${breakpoint === "xs" ? "active" : ""}`,
         onClick: () => {
-          setActiveBreakPoint("xs");
           onChange("xs");
         },
         children: /*#__PURE__*/_jsx(PhoneIphoneIcon, {})

package/dist/Editor/common/RnD/Theme/MainThemeProvider.js

@@ -0,0 +1,17 @@
+import { Experimental_CssVarsProvider as CssVarsProvider, experimental_extendTheme as extendTheme } from "@mui/material/styles";
+import { jsx as _jsx } from "react/jsx-runtime";
+function MainThemeProvider({
+  children,
+  userSelectedTheme,
+  theme = {}
+}) {
+  const themeVars = extendTheme(userSelectedTheme?.theme?.cssVars || {});
+  return /*#__PURE__*/_jsx(CssVarsProvider, {
+    theme: {
+      ...themeVars,
+      ...theme
+    },
+    children: children
+  });
+}
+export default MainThemeProvider;

package/dist/Editor/common/RnD/Theme/ViewportStimulator.js

@@ -1,6 +1,7 @@
 import React from "react";
-import { useTheme, ThemeProvider, createTheme, useMediaQuery } from "@mui/material";
+import { useTheme, createTheme, useMediaQuery } from "@mui/material";
 import { isStimulator, STIMULATOR_MOCK } from "../../../hooks/useBreakpoints";
+import MainThemeProvider from "./MainThemeProvider";
 
 // Custom breakpoints functions
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -59,13 +60,15 @@ const extendedTheme = (prevTheme, isPrintMode) => createTheme({
   } : getBreakPoints(prevTheme)
 });
 const ViewportStimulator = ({
-  children
+  children,
+  selectedTheme
 }) => {
   const theme = useTheme();
   const isPrintMode = useMediaQuery("print");
   const viewportTheme = extendedTheme(theme, isPrintMode);
-  return /*#__PURE__*/_jsx(ThemeProvider, {
+  return /*#__PURE__*/_jsx(MainThemeProvider, {
     theme: viewportTheme,
+    userSelectedTheme: selectedTheme,
     children: children
   });
 };

package/dist/Editor/common/RnD/Utils/gridDropItem.js

@@ -2,6 +2,7 @@ import { Transforms, Node, Path, Editor } from "slate";
 import { ReactEditor } from "slate-react";
 import { getNode, handleNegativeInteger } from "../../../utils/helper";
 import { handleBoxAlignment } from "../VirtualElement/helper";
+import { convertToGridArea, findMaxYValue } from "../../../Elements/FreeGrid/helper";
 export const ROW_HEIGHT = 50;
 
 // const MARGIN_OF = {
@@ -22,18 +23,27 @@ export function updateRows() {}
 export function updateCols() {}
 const handleMoveNode = (editor, path, newPath, {
   isEmpty
-}, autoAlign) => {
+}, autoAlign, moveToNode) => {
   try {
     let replaceNode = Node.get(editor, path);
+    let heightDiff = 0;
     if (autoAlign) {
-      // reset node for auto alignment in mobile
+      const y = findMaxYValue(moveToNode?.children);
+      const {
+        gridArea,
+        marginTop
+      } = convertToGridArea(y);
       replaceNode = {
         ...replaceNode,
-        gridArea_xs: null,
-        xs_updatedOn: null,
-        marginTop_xs: null
+        gridArea_xs: gridArea,
+        marginTop_xs: marginTop + 12,
+        xs_updatedOn: new Date().getTime()
       };
+      const newHeight = y + replaceNode?.height_xs + 12;
+      const diffH = newHeight - moveToNode?.height_xs;
+      heightDiff = diffH >= 0 ? diffH : 0;
     }
+    let rPath;
     if (isEmpty) {
       const toPath = [...newPath, 0];
       Transforms.insertNodes(editor, [{
@@ -44,7 +54,7 @@ const handleMoveNode = (editor, path, newPath, {
       Transforms.removeNodes(editor, {
         at: path
       });
-      return toPath;
+      rPath = toPath;
     } else {
       Transforms.insertNodes(editor, [{
         ...replaceNode
@@ -54,8 +64,12 @@ const handleMoveNode = (editor, path, newPath, {
       Transforms.removeNodes(editor, {
         at: path
       });
-      return newPath;
+      rPath = newPath;
     }
+    return {
+      rPath,
+      heightDiff
+    };
   } catch (err) {
     console.log(err);
     console.log("Drop Node error");
@@ -210,7 +224,7 @@ export function onDropItem(props, parentClass) {
       at: moveTo,
       match: n => n.type === "freegrid"
     });
-    const [sectionNode, sectionPath] = sectionData || [];
+    const [, sectionPath] = sectionData || [];
     if (needMove && isInsidePath(from, moveTo)) {
       reRenderSectionPath = sectionPath;
     } else {
@@ -229,14 +243,6 @@ export function onDropItem(props, parentClass) {
       const isBoxHeader = currentNode?.childType === "appHeader" && moveTo?.length > 2;
       if (isBoxHeader) {
         // will handle on <BoxHeaderAutoAlignment />
-      } else if (moveTo?.length === 2 && autoAlign) {
-        // auto align in mobile
-        Transforms.setNodes(editor, {
-          xs_updatedOn: null,
-          xs_updatedOn: new Date().getTime()
-        }, {
-          at: moveTo
-        });
       } else if (autoAlign) {
         Transforms.setNodes(editor, {
           autoAlign: true,
@@ -245,12 +251,15 @@ export function onDropItem(props, parentClass) {
           at: moveTo
         });
       }
-      const rPath = handleMoveNode(editor, path, newPath, {
+      const {
+        rPath,
+        heightDiff
+      } = handleMoveNode(editor, path, newPath, {
         isEmpty
-      }, autoAlign);
+      }, autoAlign, toSectionNode) || {};
       reRenderChildNodes(editor, reRenderSectionPath || moveTo);
       if (autoAlign && !isBoxHeader) {
-        handleBoxAlignment(editor, sectionNode, sectionPath);
+        handleBoxAlignment(editor, sectionPath, heightDiff);
       }
       return {
         updated_at: rPath

package/dist/Editor/common/RnD/Utils/index.js

@@ -87,7 +87,9 @@ export function updatePositions(props, closestClass) {
         newPath = [...newPath, toSectionNode?.children?.length];
       }
       newPath = newPath.map(m => parseInt(m));
-      const rPath = handleMoveNode(editor, path, newPath, {
+      const {
+        rPath
+      } = handleMoveNode(editor, path, newPath, {
         isEmpty
       });
       // to update path index need to re-render items in parent sections