@flozy/editor 5.4.0 → 5.4.1

package/dist/Editor/ChatEditor.js

@@ -1,8 +1,9 @@
 import React, { useCallback, useMemo, useRef, useState, useEffect, useImperativeHandle, forwardRef } from "react";
 import { Editable, Slate, ReactEditor } from 'slate-react';
 import { createEditor, Transforms, Editor } from 'slate';
+import { useDebounce } from "use-debounce";
 import withCommon from "./hooks/withCommon";
-import { getBlock, getMarked, serializeMentions } from "./utils/chatEditor/SlateUtilityFunctions";
+import { getBlock, getMarked } from "./utils/chatEditor/SlateUtilityFunctions";
 import MiniTextFormat from "./Toolbar/PopupTool/MiniTextFormat";
 import { commands, mentionsEvent } from "./utils/events";
 import { insertEmoji } from "./utils/emoji";
@@ -14,7 +15,6 @@ import Shorthands from "./common/Shorthands";
 import usePopupStyle from "./Toolbar/PopupTool/PopupToolStyle";
 import { EditorProvider } from "./hooks/useMouseMove";
 import decorators from "./utils/Decorators";
-import { useDebouncedCallback } from "use-debounce";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
@@ -42,18 +42,8 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
   });
   const [isInteracted, setIsInteracted] = useState(false);
   const [value, setValue] = useState(convertedContent);
-  const debouncedValue = useRef(value);
-  const debounced = useDebouncedCallback(
-  // function
-  value => {
-    const {
-      value: strVal,
-      ...restVal
-    } = getOnSaveData(value);
-    onSave(strVal, restVal);
-  },
-  // delay in ms
-  500);
+  const [loadedValue] = useState(value);
+  const [deboundedValue] = useDebounce(value, 500);
   const editor = useMemo(() => {
     return withCommon(createEditor(), {
       needLayout,
@@ -73,7 +63,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
       const {
         value: strVal,
         ...restVal
-      } = getOnSaveData(debouncedValue?.current);
+      } = getOnSaveData(value);
       onsubmit(false, {
         strVal,
         restVal
@@ -109,8 +99,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
         const newValue = draftToSlate({
           data: content
         });
-        debounced(newValue);
-
+        setValue(newValue);
         // setTimeout(() => {
         if (editor.children.length === 0) {
           Transforms.insertNodes(editor, newValue);
@@ -123,14 +112,27 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
       }
     }
   }));
+
+  // useEffect(() => {
+  //     setIsExternalUpdate(true);
+  //     setValue(draftToSlate({ data: content }));
+  // }, [content]);
+
+  useEffect(() => {
+    if (JSON.stringify(loadedValue) !== JSON.stringify(deboundedValue) && isInteracted && onSave) {
+      const {
+        value: strVal,
+        ...restVal
+      } = getOnSaveData(deboundedValue);
+      onSave(strVal, restVal);
+    }
+  }, [deboundedValue]);
   const getOnSaveData = val => {
     const text = serializeToText(val);
-    const mentions = serializeMentions(val);
     const title = val?.find(f => f.type === "title");
     return {
       value: JSON.stringify(val),
       text: text,
-      mentions: mentions,
       title: serializeToText(title?.children) || "Untitled"
     };
   };
@@ -178,8 +180,15 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     });
   };
   const handleEditorChange = newValue => {
-    debounced(newValue);
-    debouncedValue.current = newValue;
+    const value_txt = serializeToText(value);
+    if (!value_txt) {
+      const {
+        value: strVal,
+        ...restVal
+      } = getOnSaveData(newValue);
+      onSave(strVal, restVal);
+    }
+    setValue(newValue);
     if (!isInteracted) {
       setIsInteracted(true);
     }
@@ -219,7 +228,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
         editor
       });
     } else if (event.key === "Enter" && !isMobile) {
-      const isEmpty = debouncedValue?.current.length === 1 && debouncedValue?.current[0].type === 'paragraph' && debouncedValue?.current[0].children.length === 1 && debouncedValue?.current[0].children[0].text === '';
+      const isEmpty = value.length === 1 && value[0].type === 'paragraph' && value[0].children.length === 1 && value[0].children[0].text === '';
       if (isEmpty) {
         event.preventDefault();
         return;
@@ -228,7 +237,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
         const {
           value: strVal,
           ...restVal
-        } = getOnSaveData(debouncedValue?.current);
+        } = getOnSaveData(value);
         onsubmit(false, {
           strVal,
           restVal
@@ -242,7 +251,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     const {
       value: strVal,
       ...restVal
-    } = getOnSaveData(debouncedValue?.current);
+    } = getOnSaveData(value);
     onBlur({
       strVal,
       restVal
@@ -263,7 +272,7 @@ const ChatEditor = /*#__PURE__*/forwardRef((props, ref) => {
     editor: editor,
     children: /*#__PURE__*/_jsxs(Slate, {
       editor: editor,
-      initialValue: debouncedValue?.current,
+      initialValue: value,
       onChange: handleEditorChange,
       children: [toolBar && /*#__PURE__*/_jsx(MiniTextFormat, {
         classes: classes,

package/dist/Editor/CommonEditor.js

@@ -26,8 +26,8 @@ import editorStyles from "./Styles/EditorStyles";
 import DragAndDrop from "./common/DnD";
 import Section from "./common/Section";
 import decorators from "./utils/Decorators";
-import { getBreakpointLineSpacing, getTRBLBreakPoints } from "./helper/theme";
-import { getInitialValue, handleInsertLastElement, isFreeGrid, isFreeGridFragment, isPageSettings, outsideEditorClickLabel } from "./utils/helper";
+import { getTRBLBreakPoints } from "./helper/theme";
+import { handleInsertLastElement, isFreeGrid, isFreeGridFragment, isPageSettings, outsideEditorClickLabel } from "./utils/helper";
 import useWindowResize from "./hooks/useWindowResize";
 import PopoverAIInput from "./Elements/AI/PopoverAIInput";
 import RnDCopy from "./common/RnD/RnDCopy";
@@ -72,12 +72,6 @@ const Leaf = ({
     children: children
   });
 };
-const updateTopBanner = (content = [], setTopBanner) => {
-  setTopBanner(() => {
-    const firstNode = content ? content[0] : {};
-    return firstNode?.type === "topbanner" ? firstNode : null;
-  });
-};
 const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     id,
@@ -109,7 +103,6 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   });
   const [isTextSelected, setIsTextSelected] = useState(false);
   const [breakpoint, setBreakpoint] = useState("");
-  const [topBanner, setTopBanner] = useState();
   const debouncedValue = useRef(value);
   const [size] = useWindowResize();
   const {
@@ -124,9 +117,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
   } = otherProps || {};
   const editor = useMemo(() => {
     if (collaborativeEditor) return collaborativeEditor;
-    const editor = createEditor();
-    editor.needLayout = needLayout;
-    return withCommon(editor, {
+    return withCommon(createEditor(), {
       needLayout
     });
   }, [collaborativeEditor]);
@@ -139,8 +130,7 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     pageColor,
     color: pageTextColor,
     pageWidth,
-    maxWidth: pageMaxWidth,
-    lineHeight
+    maxWidth: pageMaxWidth
   } = pageSt?.pageProps || {
     bannerSpacing: {
       left: 0,
@@ -159,7 +149,6 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     setValue(draftToSlate({
       data: content
     }));
-    updateTopBanner(content, setTopBanner);
     if (!isMobile && !ReactEditor.isFocused(editor)) {
       ReactEditor.focus(editor);
     }
@@ -308,13 +297,10 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     hideTools: updatedHideTools || []
   }) : [];
   const handleEditorChange = newValue => {
-    if (!readOnly) {
-      if (JSON.stringify(newValue) !== JSON.stringify(debouncedValue?.current)) {
-        updateTopBanner(newValue, setTopBanner);
-        debounced(newValue);
-        if (!isInteracted) {
-          setIsInteracted(true);
-        }
+    if (JSON.stringify(newValue) !== JSON.stringify(debouncedValue?.current)) {
+      debounced(newValue);
+      if (!isInteracted) {
+        setIsInteracted(true);
       }
     }
   };
@@ -333,7 +319,6 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     onDrawerOpen: onDrawerOpen,
     ICON_API: "https://assets.agenciflow.com"
   };
-  const lineH = getBreakpointLineSpacing(lineHeight, breakpoint);
   const renderElement = useCallback(props => {
     return /*#__PURE__*/_jsx(Element, {
       ...props,
@@ -425,7 +410,10 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
     editorWrapper?.current?.classList.remove("hideScroll");
     handleScrollStop();
   };
-  const hasTopBanner = () => topBanner;
+  const hasTopBanner = () => {
+    const tb = editor.children[0];
+    return tb?.type === "topbanner" ? tb : null;
+  };
   const renderTopBanner = () => {
     const tb = hasTopBanner();
     return tb ? /*#__PURE__*/_jsx(TopBanner, {
@@ -507,12 +495,12 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
         ,
         children: /*#__PURE__*/_jsxs(Slate, {
           editor: editor,
-          initialValue: getInitialValue(debouncedValue?.current, readOnly),
+          initialValue: debouncedValue?.current,
           onChange: handleEditorChange,
           children: [/*#__PURE__*/_jsx(DragAndDrop, {
             children: /*#__PURE__*/_jsxs(Overlay, {
               children: [/*#__PURE__*/_jsx(Box, {
-                className: `pc-${editorClass || ""} ${hasTopBanner() ? "has-topbanner" : ""} ${!pageColor ? "no-color" : ""} scrollable-content scrollSmooth ${readOnly ? "readOnlyContainer" : ""}`,
+                className: `pc-${editorClass || ""} ${hasTopBanner() ? "has-topbanner" : ""} ${!pageColor ? "no-color" : ""} scrollable-content scrollSmooth`,
                 sx: classes.slateWrapper,
                 id: "slate-wrapper-scroll-container",
                 ref: editorWrapper,
@@ -536,7 +524,6 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
                         padding: {
                           ...getTRBLBreakPoints(bannerSpacing)
                         },
-                        lineHeight: lineH,
                         width: !pageWidth || pageWidth === "fixed" ? fixedWidth : fullWidth,
                         height: viewport.h ? `${viewport.h}px` : `100%`,
                         alignSelf: "center",
@@ -594,9 +581,8 @@ const CommonEditor = /*#__PURE__*/forwardRef((props, ref) => {
                 setIsTextSelected: setIsTextSelected,
                 customProps: customProps,
                 editorWrapper: editorWrapper
-              }) : null, !readOnly ? /*#__PURE__*/_jsx(SwitchViewport, {
+              }) : null, !readOnly && showViewport ? /*#__PURE__*/_jsx(SwitchViewport, {
                 breakpoint: breakpoint,
-                show: showViewport,
                 onChange: b => onSwitchBreakpoint(b)
               }) : null]
             })

package/dist/Editor/Editor.css

@@ -31,7 +31,7 @@ blockquote {
   border-left: 3px solid transparent;
   margin-left: 0;
   margin-right: 0;
-  /* padding-left: 10px; */
+  padding-left: 10px;
   margin: 0px;
 }
 
@@ -42,7 +42,7 @@ blockquote {
 }
 
 .editor-wrapper table {
-  border-collapse: collapse;
+  border-collapse: separate;
 }
 
 .editor-wrapper .editor-wrapperbutton {
@@ -149,7 +149,7 @@ blockquote {
 .grid-item-toolbar button,
 .element-toolbar button,
 .element-toolbar a {
-  border-radius: 50%;
+  border-radius: 10px;
   border: 1px solid rgba(37, 99, 235, 0.32);
   background: #fff;
   box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.16);
@@ -225,13 +225,9 @@ blockquote {
   background-color: #0052cc;
   padding: 8px 12px;
   color: #ffffff;
-  font-weight: 600;
-  font-size: 14px;
+  font-weight: bold;
   opacity: 1;
   border-radius: 32px;
-  text-transform: math-auto;
-  height: 36px;
-  padding: 0px 12px;
 }
 
 .signature-btn-container button:hover {
@@ -355,17 +351,13 @@ blockquote {
   height: 100%;
   width: 100%;
   border: 1px solid #2563EB;
-  border-radius: 7px;
+  border-radius: 12px;
 }
 
 .activeBrush svg {
   stroke: #2563eb;
 }
 
-.brushIcon:hover {
-  background: unset;
-}
-
 .react-datepicker__input-container {
   display: flex !important;
   align-items: center;
@@ -391,7 +383,7 @@ blockquote {
 
 .dialog-actions-si .MuiButtonBase-root {
   opacity: 1;
-  padding: 0px 5px 0px 2px !important
+  padding: 6px 5px 0px 3px !important
 }
 
 .signature-tab {
@@ -405,9 +397,9 @@ blockquote {
 .signature-tab2 {
   /* display: flex; */
   align-items: center;
-  border-width: 1px;
+  border-width: 0px, 0px, 0px, 0px;
   border-style: solid;
-  border-color: #2563EB66;
+  border-color: #2563EB;
   justify-content: center;
   flex-direction: column;
   width: 100%;
@@ -499,19 +491,11 @@ blockquote {
   text-transform: none;
 }
 
-.MuiButton-root.primaryBtn:disabled {
+.MuiButton-root.primaryBtn.disabled,
+.MuiButton-root.secondaryBtn.disabled {
   background: #eee !important;
-  box-shadow: none !important;
   color: #ccc !important;
   border: 1px solid #ccc !important;
-  cursor: not-allowed;
-}
-
-.MuiButton-root.primaryBtn.disabled,
-.MuiButton-root.secondaryBtn.disabled {
-  background: #eee;
-  color: #ccc;
-  border: 1px solid #ccc;
 }
 
 .MuiButton-root.secondaryBtn {
@@ -532,7 +516,7 @@ blockquote {
 }
 
 .deleteBtn {
-  background: #d32f2f ;
+  background: #ffffff;
   border: 1px solid #d32f2f !important;
   box-shadow: 0px 8px 24px rgba(30, 64, 175, 0.08);
   border-radius: 8px !important;
@@ -542,7 +526,6 @@ blockquote {
   margin-right: 15px !important;
   color: #d32f2f;
   width: auto !important;
-  text-transform: capitalize !important;
 }
 
 @media (max-width: 480px) {
@@ -640,7 +623,7 @@ blockquote {
 }
 
 .MuiIconButton-root.btnActive {
-  color: #2563EB !important;
+  background-color: #ccc;
 }
 
 .embed .element-toolbar {
@@ -680,8 +663,7 @@ blockquote {
 }
 
 .resize-br.img-resizer {
-  bottom: 10px;
-  right: 5px;
+  bottom: 8px;
 }
 
 .visible-on-hover {
@@ -876,7 +858,7 @@ blockquote {
 
 .dialogComp .MuiInputBase-input {
   border-radius: 8px;
-  /* box-shadow: 0px 4px 18px 0px rgba(0, 0, 0, 0.05); */
+  box-shadow: 0px 4px 18px 0px rgba(0, 0, 0, 0.05);
   font-size: 12px;
   font-weight: 500;
 }
@@ -1041,11 +1023,11 @@ blockquote {
   width: 200px;
   cursor: pointer;
   color: #464646;
-  /* background-color: #fff; */
+  background-color: #fff;
   padding: 4px 6px;
   border-radius: 12px;
   span {
-    text-transform: math-auto;
+    text-transform: capitalize;
   }
   @media only screen and (max-width: 599px) {
   background-color: unset;
@@ -1067,7 +1049,7 @@ blockquote {
 }
 
 .textFontArrows .MuiIconButton-root {
-  padding: 0px;
+  padding: 2px;
 }
 
 .tools-drawer .MuiTypography-root {
@@ -1091,10 +1073,6 @@ blockquote {
   font-size: 14px;
 }
 
-.listItemMargin {
-  margin: 0px;
-}
-
 .content-editable.empty {
   position: relative;
 }
@@ -1248,10 +1226,8 @@ blockquote {
   position: absolute;
 }
 
-.dividerComponent:hover .divider-settings,
-.dividerComponent:hover .element-selector {
+.dividerComponent:hover .divider-settings {
   display: block;
-  pointer-events: auto;
 }
 
 @media (max-width: 899px) {
@@ -1262,61 +1238,3 @@ blockquote {
     max-width: 100% !important;
   }
 }
-
-.settingsHeader {
-  font-size: 14px !important;
-  font-weight: 500 !important;
-}
-.hideScroll {
-  overflow-anchor: none;
-}
-
-.hideScroll::-webkit-scrollbar-track {
-  background: none !important;
-}
-
-.hideScroll::-webkit-scrollbar-thumb {
-  background: none !important;
-}
-
-.hideScroll::-webkit-scrollbar-thumb:hover {
-  background: none !important;
-}
-
-.custom-scroll::-webkit-scrollbar {
-  height: .6rem; 
-}
-
-.custom-scroll::-webkit-scrollbar-thumb {
-  background: #888;
-  border-radius: 5px;
-  cursor: pointer; 
-}
-
-.custom-scroll::-webkit-scrollbar-track {
-  background: #f1f1f1; 
-}
-
-.custom-scroll:hover::-webkit-scrollbar-thumb {
-  background: #A7AEC1; 
-}
-
-::selection {
-  color: inherit;
-  background: rgba(35, 131, 226, 0.35) !important;
-}
-
-::-moz-selection {
-  background: rgba(35, 131, 226, 0.35) !important;
-  color: inherit;
-}
-
-::-webkit-selection {
-  background: rgba(35, 131, 226, 0.35) !important;
-  color: inherit;
-}
-
-.gradientFillBtn {
-  background: linear-gradient(112.61deg, #2C63ED 19.3%, #8360FD 88.14%) !important;
-  text-transform: math-auto !important;
-}

package/dist/Editor/Elements/AI/AIInput.js

@@ -71,6 +71,7 @@ function AIInput({
   }, [openAI]);
   const isSendBtnDisabled = !inputValue || loading;
   const props = getProps(openAI, generatedText) || {};
+  const fromToolBar = openAI === "fromToolBar";
   const handleSendBtnClick = () => {
     if (isSendBtnDisabled) {
       return;

package/dist/Editor/Elements/AI/CustomSelect.js

@@ -8,15 +8,12 @@ function CustomSelect({
   classes,
   options,
   onSend,
-  show,
-  btnProps = {}
+  show
 }) {
-  const isMobile = window.matchMedia("(max-width: 899px)")?.matches || false;
   if (show) {
     return /*#__PURE__*/_jsx(Box, {
       component: "div",
-      sx: !isMobile && classes.customSelectContainer,
-      className: "customSelectContainer",
+      sx: classes.customSelectContainer,
       children: options?.map((groupOption, index) => {
         const {
           options,
@@ -31,8 +28,7 @@ function CustomSelect({
             return /*#__PURE__*/_jsx(DisplayOption, {
               option: option,
               classes: classes,
-              onSend: onSend,
-              btnProps: btnProps
+              onSend: onSend
             }, i);
           })]
         }, index);
@@ -46,18 +42,15 @@ export default CustomSelect;
 function DisplayOption({
   option,
   classes,
-  onSend,
-  btnProps = {}
+  onSend
 }) {
   const {
-    Icon,
-    Component
+    Icon
   } = option;
   const [open, setOpen] = useState(false);
   const optionRef = useRef();
-  const showChild = option.options?.length || Component;
   const openOptions = e => {
-    if (showChild && !open) {
+    if (option.options?.length && !open) {
       setOpen(e.currentTarget);
       return;
     }
@@ -73,7 +66,7 @@ function DisplayOption({
         e.stopPropagation();
 
         // is having child options
-        if (showChild) {
+        if (option.options?.length) {
           openOptions(e);
           return;
         }
@@ -82,19 +75,18 @@ function DisplayOption({
       },
       id: "infinity-select-popover",
       className: open ? "active" : "",
-      ...btnProps,
       children: [/*#__PURE__*/_jsxs("div", {
         className: "option-label",
         id: "infinity-select-popover",
         children: [Icon && /*#__PURE__*/_jsx(Icon, {}), option.label]
-      }), showChild ? /*#__PURE__*/_jsx(IconButton, {
+      }), option.options?.length && /*#__PURE__*/_jsx(IconButton, {
         children: /*#__PURE__*/_jsx(FaChevronRight, {
           color: "#94A3B8",
           size: 12
         })
-      }) : null]
+      })]
     }), /*#__PURE__*/_jsx(Popper, {
-      open: open && showChild,
+      open: open && option.options,
       anchorEl: open,
       sx: {
         zIndex: 9001,
@@ -104,7 +96,7 @@ function DisplayOption({
         setOpen(null);
       },
       placement: "right-start",
-      children: Component ? /*#__PURE__*/_jsx(Component, {}) : /*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsx(Box, {
         children: /*#__PURE__*/_jsx(CustomSelect, {
           options: option.options,
           onSend: onSend,