@flozy/editor 11.2.3 → 11.2.4

package/dist/Editor/Elements/Attachments/Attachments.js

@@ -1,33 +1,226 @@
-import React from "react";
-import { Box, Card, CardMedia, CardContent, Typography } from "@mui/material";
+import React, { useEffect, useRef, useState } from "react";
+import Box from '@mui/material/Box';
+import Card from '@mui/material/Card';
+import CardMedia from '@mui/material/CardMedia';
+import CardContent from '@mui/material/CardContent';
+import Typography from '@mui/material/Typography';
+import CircularProgress from '@mui/material/CircularProgress';
+import IconButton from '@mui/material/IconButton';
 import PictureAsPdfIcon from "@mui/icons-material/PictureAsPdf";
 import TextSnippetIcon from "@mui/icons-material/TextSnippet";
+import HighlightOffRoundedIcon from "@mui/icons-material/HighlightOffRounded";
+import { Transforms } from "slate";
+import { ReactEditor, useSlateStatic } from "slate-react";
 import { formatDate } from "../../utils/helper";
 import Icon from "../../common/Icon";
 import { getEmbedURL } from "../../helper";
 import Video from "../Embed/Video";
+import { formatFileSize } from "../../service/fileupload";
+import { useEditorContext } from "../../hooks/useMouseMove";
+import useAttachmentStyle from "./AttachmentStyles";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const Attachments = props => {
   const {
     attributes,
     element,
-    children
+    children,
+    customProps
   } = props;
   const {
     url,
     type,
-    date
+    date,
+    fileName,
+    isUploading,
+    file,
+    fileSize,
+    uniqueId
   } = element;
+  const {
+    resumeUploadState,
+    services,
+    uploadFile,
+    uploadTerminator
+  } = customProps || {};
   const {
     isEmbed
   } = getEmbedURL(element, true);
   const getLastName = url?.split("/").pop();
-  const fileName = `${decodeURIComponent(getLastName)}`;
+  const fileName2 = `${decodeURIComponent(getLastName)}`;
+  const editor = useSlateStatic();
+  const {
+    theme
+  } = useEditorContext();
+  const classes = useAttachmentStyle(theme);
+  const path = ReactEditor.findPath(editor, element);
+  const [redirectURL, setRedirectURL] = useState(isUploading ? null : url);
+  const [uploadStatus, setUploadStatus] = useState({
+    isUploading: !!isUploading,
+    uploadPercentage: 0,
+    fileName: fileName || fileName2,
+    fileSize: fileSize
+  });
+  const xhrRef = useRef(null);
+  const trackingProcessedRef = useRef(false);
+  const cancelUpload = () => {
+    Transforms.removeNodes(editor, {
+      at: path
+    });
+    uploadTerminator(uniqueId, setUploadStatus);
+  };
+  const onSave = async (url, source = null, isUploadCompletion = false) => {
+    // Track document upload only if source is not "recent" and we haven't processed tracking yet
+    const isFromRecentUploads = source === "recent";
+    if (url && typeof url === "string" && !isFromRecentUploads && !isUploadCompletion && !trackingProcessedRef.current) {
+      // Mark tracking as processed
+      trackingProcessedRef.current = true;
+      try {
+        const fileExtension = url.split('.').pop()?.toLowerCase();
+        const mimeType = getMimeTypeFromExtension(fileExtension);
+        const trackingData = {
+          file_url: url,
+          name: fileName || fileName2 || 'Untitled Document',
+          mime_type: mimeType,
+          resource_type: "flozy_editor",
+          resource_id: customProps?.page_id,
+          agency_id: customProps?.agency_id,
+          uploaded_by: customProps?.user_id,
+          category: "document",
+          status: 1,
+          created_on: new Date().toISOString()
+        };
+
+        // Try main app service first, fallback to direct implementation
+        if (customProps.services && typeof customProps.services === 'function') {
+          try {
+            const result = await customProps.services('trackEditorUploads', {
+              fileData: trackingData,
+              category: 'document'
+            });
+
+            // Check if the service call was successful
+            if (result && !result.error) {
+              console.log("Document upload tracked successfully via main app service:", url);
+            } else {
+              console.warn('Main app service returned error, falling back to direct tracking:', result);
+              const {
+                trackFileUpload
+              } = await import("../../service/fileTracking");
+              await trackFileUpload(trackingData, customProps, 'document');
+              console.log("Document upload tracked successfully via fallback:", url);
+            }
+          } catch (error) {
+            console.warn('Main app service failed, falling back to direct tracking:', error);
+            const {
+              trackFileUpload
+            } = await import("../../service/fileTracking");
+            await trackFileUpload(trackingData, customProps, 'document');
+            console.log("Document upload tracked successfully via fallback:", url);
+          }
+        } else {
+          const {
+            trackFileUpload
+          } = await import("../../service/fileTracking");
+          await trackFileUpload(trackingData, customProps, 'document');
+          console.log("Document upload tracked successfully:", url);
+        }
+      } catch (error) {
+        console.error("Failed to track document upload:", error);
+      }
+    } else {}
+
+    // Data insertion logic - ALWAYS execute regardless of tracking
+    setRedirectURL(url);
+    Transforms.setNodes(editor, {
+      url: url,
+      isUploading: false,
+      source: source
+    }, {
+      at: path
+    });
+    setUploadStatus({
+      isUploading: false,
+      uploadPercentage: 0,
+      fileName: null,
+      fileSize: null
+    });
+  };
+
+  // Helper function to get MIME type from file extension
+  const getMimeTypeFromExtension = extension => {
+    const mimeTypes = {
+      'pdf': 'application/pdf',
+      'doc': 'application/msword',
+      'docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+      'xls': 'application/vnd.ms-excel',
+      'xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      'ppt': 'application/vnd.ms-powerpoint',
+      'pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+      'txt': 'text/plain',
+      'csv': 'text/csv',
+      'rtf': 'application/rtf',
+      'pages': 'application/vnd.apple.pages',
+      'numbers': 'application/vnd.apple.numbers',
+      'key': 'application/vnd.apple.keynote'
+    };
+    return mimeTypes[extension] || 'application/octet-stream';
+  };
+  const handleFileUpload = async () => {
+    if (!file) return;
+    try {
+      // Reset tracking flag for new upload
+      trackingProcessedRef.current = false;
+      const id = !uniqueId ? crypto?.randomUUID() : uniqueId;
+      const result = await services("uploadFile", file);
+      const uploadUrl = result?.data?.[0];
+      const fileEntry = {
+        file: file,
+        xhrRef,
+        presidnedURL: uploadUrl,
+        status: "uploading"
+      };
+      uploadFile(id, fileEntry, setUploadStatus, onSave, "document");
+      Transforms.setNodes(editor, {
+        uniqueId: id,
+        isUploading: true
+      }, {
+        at: path
+      });
+    } catch (error) {
+      console.error("Upload failed:", error);
+      setUploadStatus(prev => ({
+        ...prev,
+        isUploading: false,
+        uploadPercentage: 0
+      }));
+    }
+  };
+  const noUploadTracks = () => {
+    setUploadStatus({
+      isUploading: false,
+      uploadPercentage: 0,
+      fileName: null,
+      fileSize: null
+    });
+    setRedirectURL(null);
+    Transforms.removeNodes(editor, {
+      at: path
+    });
+  };
+  useEffect(() => {
+    if (uniqueId && isUploading) {
+      resumeUploadState(uniqueId, setUploadStatus, onSave, noUploadTracks, "document");
+    } else if (file && isUploading) {
+      handleFileUpload();
+    }
+  }, []);
   return !isEmbed ? /*#__PURE__*/_jsxs(Box, {
     component: "div",
     className: "attachment-wrpr-ev2",
     ...attributes,
+    sx: classes?.attachmentRoot,
     contentEditable: false,
     style: {
       display: "block"
@@ -41,7 +234,8 @@ const Attachments = props => {
         padding: "8px",
         boxShadow: "none",
         border: "1px solid #eae9e9",
-        backgroundColor: "#F7F7F7"
+        backgroundColor: "#F7F7F7",
+        position: "relative"
       },
       children: [/*#__PURE__*/_jsx(CardMedia, {
         sx: {
@@ -67,7 +261,7 @@ const Attachments = props => {
         })
       }), /*#__PURE__*/_jsxs(CardContent, {
         component: "a",
-        href: url,
+        href: redirectURL,
         target: "_blank",
         style: {
           display: "flex",
@@ -76,7 +270,9 @@ const Attachments = props => {
           padding: "8px",
           textDecoration: "none",
           flexDirection: "column",
-          color: "#0F172A"
+          color: "#0F172A",
+          flexGrow: uploadStatus?.isUploading && 1,
+          width: "80%"
         },
         children: [/*#__PURE__*/_jsx(Typography, {
           style: {
@@ -85,16 +281,48 @@ const Attachments = props => {
             fontSize: "14px"
           },
           component: "div",
-          children: fileName
-        }), /*#__PURE__*/_jsx(Typography, {
+          className: "truncateText",
+          children: fileName2 || fileName
+        }), /*#__PURE__*/_jsxs(Typography, {
           style: {
             fontWeight: "normal",
             color: "#64748b",
             fontSize: "11px"
           },
           component: "div",
-          children: formatDate(date)
+          className: "uploadinDetails",
+          children: [uploadStatus?.isUploading && /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx(Typography, {
+              sx: {
+                fontSize: 12,
+                color: "#64748b"
+              },
+              children: `${formatFileSize(fileSize)}`
+            }), /*#__PURE__*/_jsx(CircularProgress, {
+              variant: "determinate",
+              value: uploadStatus?.uploadPercentage ?? 0,
+              size: 20,
+              thickness: 5
+            }), /*#__PURE__*/_jsx(Typography, {
+              sx: {
+                fontSize: 12,
+                color: "#64748b"
+              },
+              children: `${uploadStatus?.uploadPercentage?.toFixed(0) ?? 0}%`
+            })]
+          }), !uploadStatus?.isUploading && formatDate(date)]
         })]
+      }), uploadStatus?.isUploading && /*#__PURE__*/_jsx(IconButton, {
+        onClick: cancelUpload,
+        sx: {
+          position: "absolute",
+          right: 4,
+          top: 4
+        },
+        "aria-label": "Cancel upload",
+        size: "small",
+        className: "cancelBtn",
+        children: /*#__PURE__*/_jsx(HighlightOffRoundedIcon, {})
       })]
     }), /*#__PURE__*/_jsx("span", {
       contentEditable: false,

package/dist/Editor/Elements/Attachments/AttachmentsButton.js

@@ -4,6 +4,7 @@ import ToolbarIcon from "../../common/ToolbarIcon";
 import Icon from "../../common/Icon";
 import ImageSelector from "../../common/ImageSelector/ImageSelector";
 import { insertAttachments } from "../../utils/attachments";
+import { insertUploadStatusNodeForAttachment } from "../../service/fileupload";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -20,10 +21,16 @@ const AttachmentsButton = props => {
   const handleClick = () => {
     SetOpen(true);
   };
-  const onSelectImage = url => {
-    insertAttachments(editor, {
-      url
-    });
+  const onSelectImage = async url => {
+    // Check if this is a recent upload (has source "recent") or manual URL entry (isUpload === false)
+    if (!url?.isUpload && url?.embedURL) {
+      await insertAttachments(editor, {
+        url: url?.embedURL,
+        source: url?.source // Pass the source information (will be "recent" for recent uploads)
+      }, customProps);
+    } else {
+      insertUploadStatusNodeForAttachment(editor, url?.file);
+    }
     handleClose();
   };
   const handleClose = () => {

package/dist/Editor/Elements/Button/EditorButton.js

@@ -9,6 +9,8 @@ import { WorkflowIcon } from "../../common/iconslist";
 import { getTRBLBreakPoints, getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
 import { handleLinkType, windowVar } from "../../utils/helper";
 import LinkSettings from "../../common/LinkSettings";
+import { useEditorTheme } from "../../hooks/useEditorTheme";
+import { getTheme } from "../../theme";
 import Icon from "../../common/Icon";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import useCommonStyle from "../../commonStyle";
@@ -35,16 +37,17 @@ const EditorButton = props => {
   } = customProps;
   const editor = useSlateStatic();
   const path = ReactEditor.findPath(editor, element);
-
-  // Helper function to detect if a color value is a gradient
-  const isGradientColor = color => {
-    return color && typeof color === "string" && color.includes("gradient");
-  };
   const [edit, setEdit] = useState(false);
   const [openNav, setOpenNav] = useState(false);
   const [openMoreOptions, setOpenMoreOptions] = useState(false);
   const [, setIconLoaded] = useState(false);
   const classes = useCommonStyle(appTheme);
+  const {
+    theme: selectedTheme
+  } = useEditorTheme();
+  const {
+    buttonTheme
+  } = getTheme(selectedTheme);
   const {
     label,
     bgColor,
@@ -58,8 +61,8 @@ const EditorButton = props => {
     fontFamily,
     textColorHover,
     bgColorHover,
+    // buttonIcon,
     borderColorHover,
-    buttonIcon,
     iconPosition = "start",
     borderStyle,
     borderWidth,
@@ -80,10 +83,8 @@ const EditorButton = props => {
   };
   const isTrigger = linkType === "nextTrigger" || linkType === "prevTrigger";
   const refURl = isTrigger ? buttonLink?.url : url;
+  const buttonIcon = element?.buttonIcon || buttonTheme?.buttonIcon;
   const BtnIcon = buttonIcon ? buttonIcon : null;
-
-  // Check if borderColor is a gradient
-  const isBorderGradient = isGradientColor(borderColor);
   windowVar.lastButtonProps = element;
   const handleTrigger = async () => {
     if (!readOnly) {
@@ -209,32 +210,6 @@ const EditorButton = props => {
       ...getTRBLBreakPoints(bannerSpacing)
     }
   }, theme);
-  const btnSp2 = groupByBreakpoint({
-    borderRadius: {
-      ...getBreakPointsValue(borderRadius || {}, null, "overrideBorderRadius", true)
-    }
-  }, theme);
-  const buttonBoxSx = {
-    position: "relative",
-    display: "inline-block",
-    ...btnSp2,
-    ...(isBorderGradient ? {
-      padding: borderWidth !== undefined ? borderWidth : borderColor ? "1px" : "0px",
-      background: borderColor,
-      backgroundClip: "padding-box, border-box",
-      boxSizing: "border-box",
-      "&:hover": {
-        background: borderColorHover || borderColor
-      }
-    } : {
-      borderWidth: borderWidth !== undefined ? borderWidth : borderColor ? "1px" : "0px",
-      borderStyle: borderStyle || "solid",
-      borderColor: borderColor || "transparent",
-      "&:hover": {
-        borderColor: borderColorHover || borderColor || "transparent"
-      }
-    })
-  };
   const pSp = groupByBreakpoint({
     display: {
       xs: xsHidden ? "none" : "inline-block",
@@ -293,19 +268,20 @@ const EditorButton = props => {
         },
         position: "relative"
       },
-      children: /*#__PURE__*/_jsxs(Box, {
-        component: "span",
-        sx: buttonBoxSx,
+      children: /*#__PURE__*/_jsxs("span", {
+        style: {
+          position: "relative",
+          display: "inline-block"
+        },
         children: [/*#__PURE__*/_jsxs(Box, {
+          className: `btn textAlign-${tAlign} button theme-element`,
           ref: buttonRef,
-          className: `btn textAlign-${tAlign}`,
           sx: {
             textDecoration: "none",
-            background: bgColor || "rgb(30, 75, 122)",
+            borderBlockStyle: "solid",
+            borderWidth: borderWidth !== undefined ? borderWidth : borderColor || borderColorHover ? "1px" : "0px",
             ...btnSp,
-            color: `${textColor || "#FFFFFF"}`,
-            fontSize: textSize || "inherit",
-            fontFamily: fontFamily || "PoppinsRegular",
+            borderStyle: borderStyle || "solid",
             display: "inline-flex",
             alignItems: "center",
             position: "relative",
@@ -316,15 +292,27 @@ const EditorButton = props => {
             "&:hover": {
               color: `${textColorHover || textColor || "#FFFFFF"}`,
               background: bgColorHover || bgColor || "rgb(30, 75, 122)",
+              borderColor: borderColorHover || borderColor || "transparent",
               "& .element-toolbar": {
                 display: "flex"
               }
+            },
+            color: textColor ? `${textColor} !important` : "#FFFFFF",
+            fontSize: textSize ? `${textSize}px !important` : "inherit",
+            fontFamily: fontFamily ? `${fontFamily}  !important` : "PoppinsRegular",
+            background: `${bgColor} !important`,
+            borderColor: `${borderColor} !important`,
+            borderRadius: {
+              ...getBreakPointsValue(borderRadius || buttonTheme?.borderRadius || {}, null, "overrideBorderRadius", true)
+            },
+            padding: {
+              ...getTRBLBreakPoints(bannerSpacing || buttonTheme?.bannerSpacing || {})
             }
           },
           ...buttonProps,
           children: [BtnIcon && iconPosition === "start" && /*#__PURE__*/_jsx(MUIIcon, {
             ...muiIconProps
-          }), label || translation("My Button 12"), BtnIcon && iconPosition === "end" && /*#__PURE__*/_jsx(MUIIcon, {
+          }), label || translation("My Button"), BtnIcon && iconPosition === "end" && /*#__PURE__*/_jsx(MUIIcon, {
             ...muiIconProps
           })]
         }), !readOnly && buttonRef?.current && /*#__PURE__*/_jsx(Popper, {

package/dist/Editor/Elements/Color Picker/ColorButtons.js

@@ -1,11 +1,15 @@
 import React, { useState } from "react";
-import { Box, IconButton, Popover } from "@mui/material";
+import { Box, IconButton, Popover, Typography, useTheme } from "@mui/material";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
 import Button from "../../common/Button";
 import { colors } from "./defaultColors";
 import ColorPicker from "./colorPicker.svg";
+import { useSlateStatic } from "slate-react";
+import { Transforms } from "slate";
+import { useEditorContext } from "../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 let c = [];
 const ColorChunks = (recentColors = []) => [...recentColors, ...colors].reduce((a, b, i) => {
   if (i % 7 === 0) {
@@ -32,8 +36,8 @@ const SingleColorButton = ({
       width: "100%",
       display: "flex",
       alignItems: "center",
-      padding: padding || "8px 0px",
-      justifyContent: "center"
+      padding: padding || "8px 0px"
+      // justifyContent: "center",
     },
     children: [crs.map(m => /*#__PURE__*/_jsx(Button, {
       onClick: handleSelect(m),
@@ -110,12 +114,18 @@ const ColorButtons = props => {
     openColorTool,
     onClose,
     onColorPickerClick,
+    disableEditTheme,
     defaultColors = []
   } = props;
   const [row1, ...restRows] = ColorChunks([]);
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   const firstRow = defaultColors?.length ? defaultColors : row1;
+  const theme = useTheme();
+  const editor = useSlateStatic();
+  const {
+    setOpenTheme
+  } = useEditorContext();
   const handleMore = e => {
     setAnchorEl(e.currentTarget);
   };
@@ -128,6 +138,7 @@ const ColorButtons = props => {
   const handleSelect = color => () => {
     onSelect(color);
   };
+  const colorVars = theme?.vars?.colors || {};
   return /*#__PURE__*/_jsxs(Box, {
     component: "span",
     sx: classes.colorButtons,
@@ -144,7 +155,7 @@ const ColorButtons = props => {
           activeColor: activeColor
         }, `si_btn_row1_${m}_${i}`);
       })
-    }), /*#__PURE__*/_jsxs(Popover, {
+    }), /*#__PURE__*/_jsx(Popover, {
       open: open || openColorTool,
       anchorEl: anchorEl || openColorTool,
       onClose: handleClose,
@@ -158,9 +169,40 @@ const ColorButtons = props => {
       },
       sx: classes.colorPopper,
       className: "colorPopper",
-      children: [/*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         sx: classes.colorButtonsInner,
-        children: restRows.map((m, i) => {
+        children: [Object.values(colorVars)?.length ? /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsxs(Box, {
+            component: "div",
+            className: "singleColorTitleWrapper",
+            children: [/*#__PURE__*/_jsx(Typography, {
+              variant: "subtitle2",
+              children: "Theme colours"
+            }), disableEditTheme ? null : /*#__PURE__*/_jsx("div", {
+              className: "editBtn",
+              onClick: () => {
+                Transforms.deselect(editor, {
+                  at: editor.selection
+                });
+                handleClose();
+                setOpenTheme("editThemeColor");
+              },
+              children: "Edit"
+            })]
+          }), /*#__PURE__*/_jsx(SingleColorButton, {
+            crs: Object.values(colorVars),
+            handleSelect: handleSelect,
+            classes: classes,
+            activeColor: activeColor
+          })]
+        }) : null, /*#__PURE__*/_jsx(Box, {
+          component: "div",
+          className: "singleColorTitleWrapper",
+          children: /*#__PURE__*/_jsx(Typography, {
+            variant: "subtitle2",
+            children: "Custom colour"
+          })
+        }), restRows.map((m, i) => {
           return /*#__PURE__*/_jsx(SingleColorButton, {
             id: `p2_${id}`,
             crs: m,
@@ -169,14 +211,19 @@ const ColorButtons = props => {
             classes: classes,
             activeColor: activeColor
           }, `si_btn_${m}_${i}`);
-        })
-      }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
-        onClick: onColorPickerClick,
-        children: /*#__PURE__*/_jsx("img", {
-          src: ColorPicker,
-          alt: "color wheel"
-        })
-      }) : null]
+        }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
+          onClick: onColorPickerClick,
+          style: {
+            alignSelf: "start",
+            margin: "6px",
+            padding: "0px"
+          },
+          children: /*#__PURE__*/_jsx("img", {
+            src: ColorPicker,
+            alt: "color wheel"
+          })
+        }) : null]
+      })
     })]
   });
 };

package/dist/Editor/Elements/Color Picker/ColorPicker.css

@@ -60,4 +60,28 @@
   padding: 0 15px !important;
   width: 60px !important;
   flex-shrink: 0;
-}
+}
+
+
+.singleColorTitleWrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px;
+  width: 100%;
+  border-bottom: 1px solid #DCE4EC;
+}
+
+.singleColorTitleWrapper .MuiTypography-root {
+  font-weight: 600;
+}
+
+.singleColorTitleWrapper .editBtn {
+  text-transform: none;
+  color: #2563EB;
+  text-decoration: underline;
+  padding: 0px;
+  min-width: unset;
+  cursor: pointer;
+  font-size: 14px;
+}