@flozy/editor 10.8.9 → 10.9.1

package/dist/Editor/Elements/Embed/Image.js

@@ -1,10 +1,17 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useSlateStatic, ReactEditor } from "slate-react";
 import { Node, Transforms, Editor } from "slate";
 import AspectRatioIcon from "@mui/icons-material/AspectRatio";
+import IconButton from "@mui/material/IconButton";
+import Tooltip from "@mui/material/Tooltip";
+import Box from "@mui/material/Box";
+import useTheme from "@mui/material/styles/useTheme";
+import useMediaQuery from "@mui/material/useMediaQuery";
+import Grid from "@mui/material/Grid";
+import CircularProgress from "@mui/material/CircularProgress";
+import HighlightOffRoundedIcon from "@mui/icons-material/HighlightOffRounded";
 import useResize from "../../utils/customHooks/useResize";
 import EmbedPopup from "./EmbedPopup";
-import { IconButton, Tooltip, Box, useTheme, useMediaQuery } from "@mui/material";
 import { LinkIcon } from "../../common/iconslist";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import { getTRBLBreakPoints, getBreakPointsValue, groupByBreakpoint } from "../../helper/theme";
@@ -16,8 +23,11 @@ import { handleLinkType } from "../../utils/helper";
 import { wrapThemeBreakpoints } from "../FreeGrid/breakpointConstants";
 import useCommonStyle from "../../commonStyle";
 import SettingsIcon from "../../assets/svg/SettingsIcon";
+import ImageSelector from "../../common/ImageSelector/ImageSelector";
+import { buildUpdateData } from "../../service/fileupload";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 const ToolBar = ({
   isEmpty,
   onSettings,
@@ -67,27 +77,105 @@ const ImageContent = props => {
     objectFit,
     webAddress,
     readOnly,
-    setOpenSettings,
     handleImageClick,
     onTouchEnd,
     path,
     theme,
     classes,
-    translation
+    translation,
+    setUploadPopupOpen,
+    uploadStatus,
+    setUploadStatus,
+    uniqueId,
+    uploadTerminator,
+    editor
   } = props;
-  return !url ? !readOnly ? /*#__PURE__*/_jsxs(Box, {
+  const cancelUpload = e => {
+    e.stopPropagation();
+    uploadTerminator(uniqueId, setUploadStatus);
+    Transforms.setNodes(editor, {
+      isUpload: false,
+      isUploading: false,
+      file: null
+    }, {
+      at: path
+    });
+  };
+  return !url ? !readOnly ? /*#__PURE__*/_jsx(Box, {
     component: "button",
     className: "element-empty-btn",
     contentEditable: false,
     onClick: () => {
-      setOpenSettings(true);
+      if (!uploadStatus?.isUploading) setUploadPopupOpen(true);
     },
     sx: {
       ...classes.emptyThumbBtn
     },
-    children: [/*#__PURE__*/_jsx(Icon, {
-      icon: "image"
-    }), translation("Add Image")]
+    children: uploadStatus?.isUploading ? /*#__PURE__*/_jsxs(Grid, {
+      container: true,
+      direction: "row",
+      sx: {
+        justifyContent: "space-between",
+        alignItems: "center"
+      },
+      children: [/*#__PURE__*/_jsx(Grid, {
+        children: /*#__PURE__*/_jsxs(Grid, {
+          container: true,
+          direction: "row",
+          sx: {
+            justifyContent: "space-between",
+            alignItems: "center",
+            gap: 1
+          },
+          children: [/*#__PURE__*/_jsx(Grid, {
+            children: /*#__PURE__*/_jsx(Icon, {
+              icon: "image"
+            })
+          }), /*#__PURE__*/_jsx(Grid, {
+            children: /*#__PURE__*/_jsxs(Box, {
+              display: "flex",
+              flexDirection: "column",
+              alignItems: "flex-start",
+              justifyContent: "space-between",
+              children: [/*#__PURE__*/_jsx(Box, {
+                className: "truncateText",
+                children: uploadStatus?.fileName
+              }), /*#__PURE__*/_jsxs(Box, {
+                display: "flex",
+                alignItems: "center",
+                gap: 1,
+                marginTop: 1,
+                children: [/*#__PURE__*/_jsx(Box, {
+                  children: uploadStatus?.fileSize
+                }), /*#__PURE__*/_jsx(CircularProgress, {
+                  variant: "determinate",
+                  value: uploadStatus?.uploadPercentage ?? 0,
+                  className: "circularProgress-cls",
+                  size: 15,
+                  thickness: 8
+                }), /*#__PURE__*/_jsx(Box, {
+                  children: `${uploadStatus?.uploadPercentage?.toFixed(0) ?? 0}%`
+                })]
+              })]
+            })
+          })]
+        })
+      }), /*#__PURE__*/_jsx(Grid, {
+        children: /*#__PURE__*/_jsx(HighlightOffRoundedIcon, {
+          className: "uploadCancel",
+          sx: {
+            cursor: "pointer"
+          },
+          onClick: e => {
+            cancelUpload(e);
+          }
+        })
+      })]
+    }) : /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Icon, {
+        icon: "image"
+      }), translation("Add Image")]
+    })
   }) : /*#__PURE__*/_jsxs(Box, {
     sx: {
       color: "#64748B !important",
@@ -143,11 +231,20 @@ const Image = props => {
     webAddress,
     isNewTab,
     linkType,
-    framePos
+    framePos,
+    file,
+    isUploading,
+    uniqueId,
+    fromFreeGrid
   } = element;
   const {
     readOnly,
-    translation
+    translation,
+    services,
+    uploadFile,
+    resumeUploadState,
+    uploadTerminator,
+    isUploadInProgress = () => false
   } = customProps;
   const {
     vertical,
@@ -162,6 +259,12 @@ const Image = props => {
   const path = ReactEditor.findPath(editor, element);
   const [openNav, setOpenNav] = useState(false);
   const isEmpty = !url && !readOnly;
+  const [openUploadPopup, setUploadPopupOpen] = useState(false);
+  const [uploadStatus, setUploadStatus] = useState({
+    isUploading: false,
+    uploadPercentage: 0
+  });
+  const xhrRef = useRef(null);
   const getSize = () => {
     if (element?.size === undefined) {
       return {
@@ -217,32 +320,120 @@ const Image = props => {
       console.log(err);
     }
   };
+  const noUploadTracks = () => {
+    setUploadStatus({
+      isUploading: false,
+      uploadPercentage: 0,
+      fileName: null,
+      fileSize: null
+    });
+    Transforms.setNodes(editor, {
+      isUploading: false
+    }, {
+      at: path
+    });
+  };
+  useEffect(() => {
+    const isUploading = isUploadInProgress(uniqueId);
+    if (fromFreeGrid) {
+      if (isUploading) {
+        resumeUploadState(uniqueId, setUploadStatus, onSave, noUploadTracks, "image");
+      } else {
+        if (!isUploading) {
+          handleImageUpload({
+            file: file
+          });
+        }
+      }
+    }
+  }, [uniqueId, isUploading, file]);
   useEffect(() => {
     if (editor && ele && ele[1] !== undefined) {
       const dom = ReactEditor.toDOMNode(editor, element);
       setParentDOM(dom);
       onLoad(getSize());
     }
+    if (uniqueId && isUploading) {
+      resumeUploadState(uniqueId, setUploadStatus, onSave, noUploadTracks, "image");
+    } else if (file && isUploading) {
+      handleImageUpload({
+        file: file
+      });
+    }
   }, []);
   const onSettings = () => {
     setOpenSettings(true);
   };
   const onSave = data => {
     try {
-      const updateData = {
-        ...data
-      };
-      delete updateData.children;
-      Transforms.setNodes(editor, {
-        ...updateData
-      }, {
-        at: path
-      });
-      onClose();
+      if (!data?.url?.file) {
+        const updateData = buildUpdateData(data, url);
+        delete updateData.children;
+        Transforms.select(editor, path);
+        ReactEditor.focus(editor);
+        Transforms.setNodes(editor, {
+          ...updateData,
+          isUpload: false,
+          isUploading: false,
+          file: null
+        }, {
+          at: path
+        });
+        onClose();
+      } else {
+        handleImageUpload({
+          file: data?.url?.file,
+          isUpload: true,
+          setUploadStatus,
+          services: services
+        });
+        onClose();
+        onSave("");
+      }
     } catch (err) {
       console.log(err);
     }
   };
+  const handleImageUpload = async uploadProp => {
+    try {
+      if (uploadProp?.isUpload === false) {
+        onSave(uploadProp?.embedURL);
+      } else {
+        const isAlreadyUploading = isUploadInProgress(uniqueId);
+        let result = {};
+        if (uploadProp?.file && !isAlreadyUploading) {
+          result = await services("uploadFile", uploadProp?.file);
+        }
+        const uploadUrl = result?.data?.[0];
+        if (uploadUrl) {
+          const id = !uniqueId ? crypto?.randomUUID() : uniqueId;
+          const fileEntry = {
+            ...uploadProp,
+            xhrRef,
+            presidnedURL: uploadUrl,
+            status: "uploading"
+          };
+          uploadFile(id, fileEntry, setUploadStatus, onSave, "image");
+          if (!fromFreeGrid) {
+            Transforms.setNodes(editor, {
+              uniqueId: id,
+              isUploading: true
+            }, {
+              at: path
+            });
+          } else {
+            Transforms.setNodes(editor, {
+              isUploading: true
+            }, {
+              at: path
+            });
+          }
+        }
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  };
   const onClose = () => {
     setOpenSettings(false);
   };
@@ -324,7 +515,16 @@ const Image = props => {
         path: path,
         theme: theme,
         classes: classes,
-        translation: translation
+        translation: translation,
+        setUploadPopupOpen: setUploadPopupOpen,
+        openUploadPopup: openUploadPopup,
+        uploadStatus: uploadStatus,
+        setUploadStatus: setUploadStatus,
+        xhrRef: xhrRef,
+        onClose: onClose,
+        uniqueId: uniqueId,
+        uploadTerminator: uploadTerminator,
+        editor: editor
       }), url && frames[frame] ? /*#__PURE__*/_jsx(Box, {
         component: "div",
         className: "image-frame",
@@ -372,7 +572,20 @@ const Image = props => {
       navValue: webAddress,
       openInNewTab: isNewTab,
       customProps: customProps
-    }) : null]
+    }) : null, openUploadPopup && /*#__PURE__*/_jsx(ImageSelector, {
+      open: true,
+      title: "Image",
+      onClose: () => setUploadPopupOpen(false),
+      customProps: customProps,
+      onSelectImage: img => {
+        handleImageUpload(img);
+        setUploadPopupOpen(false);
+      },
+      openUploadPopup: openUploadPopup,
+      setUploadPopupOpen: setUploadPopupOpen,
+      setUploadStatus: setUploadStatus,
+      xhrRef: xhrRef
+    })]
   });
 };
 export default Image;

package/dist/Editor/Elements/Embed/Video.js

@@ -1,9 +1,15 @@
 import React, { useState, useEffect, useRef } from "react";
 import { useSlateStatic, ReactEditor } from "slate-react";
 import { Node, Transforms } from "slate";
-import { IconButton, Tooltip, Box, useTheme } from "@mui/material";
+import IconButton from '@mui/material/IconButton';
+import Tooltip from '@mui/material/Tooltip';
+import Box from '@mui/material/Box';
+import useTheme from '@mui/material/styles/useTheme';
+import Grid from '@mui/material/Grid';
+import CircularProgress from '@mui/material/CircularProgress';
 import DeleteIcon from "@mui/icons-material/Delete";
 import AspectRatioIcon from "@mui/icons-material/AspectRatio";
+import HighlightOffRoundedIcon from "@mui/icons-material/HighlightOffRounded";
 import Icon from "../../common/Icon";
 import useResize from "../../utils/customHooks/useResize";
 import EmbedPopup from "./EmbedPopup";
@@ -13,8 +19,10 @@ import { getEmbedURL } from "../../helper";
 import { getBreakPointsValue, getTRBLBreakPoints, groupByBreakpoint } from "../../helper/theme";
 import { useEditorContext } from "../../hooks/useMouseMove";
 import useCommonStyle from "../../commonStyle";
+import ImageSelector from "../../common/ImageSelector/ImageSelector";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 const TYPE_LABELS = {
   calendly: "Embed Calendly or Other",
   video: "Embed Video or Other",
@@ -78,18 +86,97 @@ const VideoPlaceholder = props => {
     onSettings,
     classes,
     type,
-    translation
+    translation,
+    uploadStatus,
+    setUploadStatus,
+    uploadTerminator,
+    uniqueId,
+    editor,
+    path
   } = props;
-  return !url ? !readOnly ? /*#__PURE__*/_jsxs(Box, {
+  const cancelUpload = e => {
+    e.stopPropagation();
+    uploadTerminator(uniqueId, setUploadStatus);
+    Transforms.setNodes(editor, {
+      isUpload: false,
+      isUploading: false,
+      file: null
+    }, {
+      at: path
+    });
+  };
+  return !url ? !readOnly ? /*#__PURE__*/_jsx(Box, {
     component: "button",
     className: "element-empty-btn",
-    onClick: onSettings,
+    onClick: !uploadStatus?.isUploading ? onSettings : () => {},
     sx: {
       ...classes.emptyThumbBtn
     },
-    children: [/*#__PURE__*/_jsx(Icon, {
-      icon: "video"
-    }), TYPE_LABELS[type] || translation("Embed Video or Other")]
+    children: uploadStatus?.isUploading ? /*#__PURE__*/_jsxs(Grid, {
+      container: true,
+      direction: "row",
+      sx: {
+        justifyContent: "space-between",
+        alignItems: "center"
+      },
+      children: [/*#__PURE__*/_jsx(Grid, {
+        children: /*#__PURE__*/_jsxs(Grid, {
+          container: true,
+          direction: "row",
+          sx: {
+            justifyContent: "space-between",
+            alignItems: "center",
+            gap: 1
+          },
+          children: [/*#__PURE__*/_jsx(Grid, {
+            children: /*#__PURE__*/_jsx(Icon, {
+              icon: "image"
+            })
+          }), /*#__PURE__*/_jsx(Grid, {
+            children: /*#__PURE__*/_jsxs(Box, {
+              display: "flex",
+              flexDirection: "column",
+              alignItems: "flex-start",
+              justifyContent: "space-between",
+              children: [/*#__PURE__*/_jsx(Box, {
+                className: "truncateText",
+                children: uploadStatus?.fileName
+              }), /*#__PURE__*/_jsxs(Box, {
+                display: "flex",
+                alignItems: "center",
+                gap: 1,
+                marginTop: 1,
+                children: [/*#__PURE__*/_jsx(Box, {
+                  children: uploadStatus?.fileSize
+                }), /*#__PURE__*/_jsx(CircularProgress, {
+                  variant: "determinate",
+                  value: uploadStatus?.uploadPercentage ?? 0,
+                  className: "circularProgress-cls",
+                  size: 15,
+                  thickness: 8
+                }), /*#__PURE__*/_jsx(Box, {
+                  children: `${uploadStatus?.uploadPercentage?.toFixed(0) ?? 0}%`
+                })]
+              })]
+            })
+          })]
+        })
+      }), /*#__PURE__*/_jsx(Grid, {
+        children: /*#__PURE__*/_jsx(HighlightOffRoundedIcon, {
+          className: "uploadCancel",
+          sx: {
+            cursor: "pointer"
+          },
+          onClick: e => {
+            cancelUpload(e);
+          }
+        })
+      })]
+    }) : /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Icon, {
+        icon: "video"
+      }), TYPE_LABELS[type] || translation("Embed Video or Other")]
+    })
   }) : /*#__PURE__*/_jsxs(Box, {
     sx: {
       color: "#64748B !important",
@@ -120,14 +207,23 @@ const Video = ({
     xsHidden,
     width: oldWidth,
     bannerSpacing,
-    aspectRatio
+    aspectRatio,
+    file,
+    isUploading,
+    uniqueId,
+    fromFreeGrid
   } = element;
   const editor = useSlateStatic();
   const [openSetttings, setOpenSettings] = useState(false);
   const [parentDOM, setParentDOM] = useState(null);
   const {
     readOnly,
-    translation
+    translation,
+    services,
+    uploadFile,
+    resumeUploadState,
+    uploadTerminator,
+    isUploadInProgress = () => false
   } = customProps;
   const {
     vertical,
@@ -148,6 +244,63 @@ const Video = ({
       return element?.size || {};
     }
   };
+  const xhrRef = useRef(null);
+  const [openUploadPopup, setUploadPopupOpen] = useState(false);
+  const [uploadStatus, setUploadStatus] = useState({
+    isUploading: false,
+    uploadPercentage: 0
+  });
+  const onClickUpload = () => {
+    setUploadPopupOpen(true);
+  };
+  const onSelectVideo = async video => {
+    handleClose();
+    let finalURL = null;
+    try {
+      if (video?.isUpload === false) {
+        finalURL = video?.embedURL;
+      } else {
+        const id = !uniqueId ? crypto?.randomUUID() : uniqueId;
+        const result = await services("uploadFile", video?.file);
+        const uploadUrl = result?.data?.[0];
+        const fileEntry = {
+          ...video,
+          xhrRef,
+          presidnedURL: uploadUrl,
+          status: "uploading"
+        };
+        uploadFile(id, fileEntry, setUploadStatus, onSave, "video");
+        if (!fromFreeGrid) {
+          Transforms.setNodes(editor, {
+            uniqueId: id,
+            isUploading: true
+          }, {
+            at: path
+          });
+        } else {
+          Transforms.setNodes(editor, {
+            isUploading: true
+          }, {
+            at: path
+          });
+        }
+      }
+      if (finalURL) {
+        const updateObject = {
+          ...element,
+          url: finalURL
+        };
+        onSave(updateObject);
+      } else {
+        return;
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  };
+  const handleClose = () => {
+    setUploadPopupOpen(false);
+  };
   const [size, onMouseDown, resizing, onLoad] = useResize({
     parentDOM,
     size: getSize(),
@@ -161,12 +314,49 @@ const Video = ({
   });
   const arr = Array.from(Node.elements(editor));
   const ele = arr.find(([elem]) => element === elem);
+  const noUploadTracks = () => {
+    setUploadStatus({
+      isUploading: false,
+      uploadPercentage: 0,
+      fileName: null,
+      fileSize: null
+    });
+  };
+  useEffect(() => {
+    const isUploading = isUploadInProgress(uniqueId);
+    if (fromFreeGrid) {
+      if (isUploading) {
+        resumeUploadState(uniqueId, setUploadStatus, onSave, noUploadTracks, "image");
+      } else {
+        if (!isUploading && file) {
+          onSelectVideo({
+            file: file
+          });
+        }
+      }
+    }
+    return () => {
+      // Transforms.setNodes(editor, { isUploading: false }, { at: path });
+    };
+  }, [uniqueId, isUploading, file]);
   useEffect(() => {
     if (editor && ele && ele[1] !== undefined) {
       const dom = ReactEditor.toDOMNode(editor, Node.get(editor, ele[1]));
       setParentDOM(dom);
       onLoad(element?.size || {});
     }
+    if (!fromFreeGrid) {
+      if (uniqueId && isUploading) {
+        resumeUploadState(uniqueId, setUploadStatus, onSave, noUploadTracks, "video");
+      } else if (file && isUploading) {
+        onSelectVideo({
+          file: file
+        });
+      }
+    }
+    return () => {
+      // xhrRef?.current?.abort();
+    };
   }, []);
   const ToolBar = () => {
     return /*#__PURE__*/_jsxs("div", {
@@ -194,12 +384,35 @@ const Video = ({
   };
   const onSave = data => {
     try {
-      const updateData = {
-        ...data
-      };
+      let updateData = {};
+      if (typeof data === "string") {
+        updateData = {
+          url: data,
+          uniqueId: undefined,
+          isUploading: false
+        };
+      } else if (typeof data?.url !== "string") {
+        updateData = {
+          ...data,
+          url: ""
+        };
+        onSelectVideo({
+          file: data?.url?.file,
+          isUpload: true,
+          setUploadStatus,
+          services: customProps?.services
+        });
+      } else {
+        updateData = data;
+      }
       delete updateData.children;
+      Transforms.select(editor, path);
+      ReactEditor.focus(editor);
       Transforms.setNodes(editor, {
-        ...updateData
+        ...updateData,
+        isUpload: false,
+        isUploading: false,
+        file: null
       }, {
         at: path
       });
@@ -281,13 +494,19 @@ const Video = ({
       children: [!readOnly && url && /*#__PURE__*/_jsx(ToolBar, {}), /*#__PURE__*/_jsx(VideoPlaceholder, {
         ...element,
         embedURL: embedURL,
-        onSettings: onSettings,
+        onSettings: onClickUpload,
         videoSX: videoSX,
         url: url,
         readOnly: readOnly,
         resizing: resizing,
         classes: classes,
-        translation: translation
+        translation: translation,
+        uploadStatus: uploadStatus,
+        setUploadStatus: setUploadStatus,
+        uploadTerminator: uploadTerminator,
+        uniqueId: uniqueId,
+        editor: editor,
+        path: path
       }), !readOnly && url ? /*#__PURE__*/_jsx(IconButton, {
         onPointerDown: onMouseDown,
         style: {
@@ -295,6 +514,18 @@ const Video = ({
         },
         className: "resize-br visible-on-hover",
         children: /*#__PURE__*/_jsx(AspectRatioIcon, {})
+      }) : null, openUploadPopup ? /*#__PURE__*/_jsx(ImageSelector, {
+        open: true,
+        Add: true,
+        commentMore: true,
+        actions: true,
+        title: "Video",
+        onClose: handleClose,
+        customProps: customProps,
+        onSelectImage: onSelectVideo,
+        setUploadPopupOpen: setUploadPopupOpen,
+        setUploadStatus: setUploadStatus,
+        xhrRef: xhrRef
       }) : null]
     }), children]
   });

package/dist/Editor/Elements/Form/FormField.js

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Transforms, Node } from "slate";
+import { Transforms } from "slate";
 import { useSlateStatic, ReactEditor } from "slate-react";
 import { IconButton, Tooltip, Grid, useTheme } from "@mui/material";
 import FormElements from "./FormElements";