@flozy/editor 10.6.5 → 10.6.6

package/dist/Editor/hooks/useEditorTheme.js

@@ -0,0 +1,153 @@
+import { useSlate } from "slate-react";
+import { defaultTheme } from "../theme";
+import { getPageSettings, updatePageSettings } from "../utils/pageSettings";
+import { HEADING_THEME_FIELDS, PARAGRAPH_THEME_FIELDS } from "../helper/theme";
+import { useEditorContext } from "./useMouseMove";
+const MAP_FIELDS = {
+  HEADING: HEADING_THEME_FIELDS,
+  PARAGRAPH: PARAGRAPH_THEME_FIELDS
+};
+const MAP_FONT_FIELD_KEYS = {
+  HEADING: "headingFontFamily",
+  PARAGRAPH: "paragraphFontFamily"
+};
+function getUpdatePayload(prevTheme = {}, update, actionData) {
+  const {
+    action,
+    fieldName
+  } = actionData || {};
+  const {
+    theme: prev
+  } = prevTheme;
+  let theme = {};
+  let themeProps = {};
+  switch (action) {
+    case "THEME_CHANGE":
+      theme = update;
+      break;
+    case "CSS_VAR_CHANGE":
+      const prevCssVars = prev?.cssVars || {};
+      const prevValue = prevCssVars[fieldName] || {};
+      themeProps = {
+        ...(prev || {}),
+        cssVars: {
+          ...prevCssVars,
+          [fieldName]: {
+            ...prevValue,
+            ...update
+          }
+        }
+      };
+      theme = {
+        ...prevTheme,
+        theme: themeProps
+      };
+      break;
+    case "ELEMENT_PROPS_CHANGE":
+      const prevEleProps = prev?.elementProps || {};
+      const prevEleValue = prevEleProps[fieldName] || {};
+      themeProps = {
+        ...(prev || {}),
+        elementProps: {
+          ...prevEleProps,
+          [fieldName]: {
+            ...prevEleValue,
+            ...update
+          }
+        }
+      };
+      theme = {
+        ...prevTheme,
+        theme: themeProps
+      };
+      break;
+    case "OTHER_PROPS_CHANGE":
+      themeProps = {
+        ...(prev || {}),
+        otherProps: {
+          ...(prev.otherProps || {}),
+          ...update
+        }
+      };
+      theme = {
+        ...prevTheme,
+        theme: themeProps
+      };
+      break;
+    case "FONT_CHANGE":
+      const {
+        elementProps = {},
+        otherProps = {}
+      } = prev;
+      const {
+        fieldType
+      } = actionData || {};
+      const fields = MAP_FIELDS[fieldType];
+      const fontFieldsUpdate = {};
+      fields?.forEach(field => {
+        const prevFieldData = elementProps[field];
+        fontFieldsUpdate[field] = {
+          ...prevFieldData,
+          ...update
+        };
+      });
+      const FONT_KEY_FOR_FIELD = MAP_FONT_FIELD_KEYS[fieldType];
+      themeProps = {
+        ...(prev || {}),
+        elementProps: {
+          ...elementProps,
+          ...fontFieldsUpdate
+        },
+        otherProps: {
+          ...otherProps,
+          [FONT_KEY_FOR_FIELD]: update?.fontFamily
+        }
+      };
+      theme = {
+        ...prevTheme,
+        theme: themeProps
+      };
+      break;
+    default:
+      theme = {
+        ...prevTheme,
+        ...(update || {})
+      };
+      break;
+  }
+  return theme;
+}
+const updateTheme = (editor, pageSt, update, actionData, triggerRender) => {
+  const {
+    pageProps
+  } = pageSt || {};
+  const {
+    theme
+  } = pageProps || {};
+  const updatedTheme = getUpdatePayload(theme, update, actionData);
+  updatePageSettings(editor, {
+    ...(pageProps || {}),
+    theme: updatedTheme
+  });
+  triggerRender();
+};
+export const useEditorTheme = () => {
+  const editor = useSlate();
+  const {
+    triggerRender
+  } = useEditorContext();
+  const {
+    element: pageSt
+  } = getPageSettings(editor) || {};
+  const {
+    pageProps
+  } = pageSt || {};
+  const {
+    theme
+  } = pageProps || {};
+  return {
+    selectedTheme: theme?.theme || defaultTheme?.theme,
+    updateTheme: (update, actionData) => updateTheme(editor, pageSt, update, actionData, triggerRender),
+    theme
+  };
+};

package/dist/Editor/hooks/useMouseMove.js

@@ -21,7 +21,10 @@ export const useEditorSelection = editor => {
 export const EditorProvider = ({
   editor,
   theme,
-  children
+  children,
+  openTheme = false,
+  setOpenTheme = () => {},
+  triggerRender
 }) => {
   const [previous, setPrevious] = useState("");
   const [drop, setDrop] = useState(0);
@@ -98,8 +101,11 @@ export const EditorProvider = ({
     setOpenAI,
     updateDragging,
     fontFamilies,
-    setFontFamilies
-  }), [path, editor?.selection, selectedPath, selectedElement, contextMenu, openAI, popupType, drop]);
+    setFontFamilies,
+    openTheme,
+    setOpenTheme,
+    triggerRender
+  }), [path, editor?.selection, selectedPath, selectedElement, contextMenu, openAI, popupType, drop, openTheme]);
   return /*#__PURE__*/_jsx(EditorContext.Provider, {
     value: otherValues,
     children: children

package/dist/Editor/hooks/useTable.js

@@ -190,16 +190,17 @@ export const TableProvider = ({
   //   selectFirstCell(tablePath, editor, updateTableSelection);
   // }, []);
 
+  const onClickAway = () => {
+    setTableSelection(getDefaultTableSelection());
+    setHoverPath(null);
+  };
   return /*#__PURE__*/_jsx(TableContext.Provider, {
     value: values,
     children: /*#__PURE__*/_jsxs(DndContext, {
       sensors: sensors,
       onDragEnd: data => handleDragEnd(data, editor, resetAll),
       children: [/*#__PURE__*/_jsx(ClickAwayListener, {
-        onClickAway: () => {
-          setTableSelection(getDefaultTableSelection());
-          setHoverPath(null);
-        },
+        onClickAway: onClickAway,
         children: /*#__PURE__*/_jsx("div", {
           children: children
         })

package/dist/Editor/hooks/useThemeValues.js

@@ -0,0 +1,63 @@
+import { useEffect, useState } from "react";
+import { getElementProperty } from "../helper/theme";
+import { ReactEditor } from "slate-react";
+import { Node } from "slate";
+import { useEditorTheme } from "./useEditorTheme";
+function useThemeValues() {
+  return {};
+}
+export default useThemeValues;
+export function useButtonStyle(value, key, element) {
+  const [buttonStyle, setButtonStyle] = useState(value);
+  const {
+    selectedTheme
+  } = useEditorTheme();
+  const themeBtnProps = selectedTheme?.elementProps?.button || {};
+  useEffect(() => {
+    const color = getColorValue(value, key, element, themeBtnProps);
+    setButtonStyle({
+      color
+    });
+  }, [value, key, element]);
+  return {
+    buttonStyle
+  };
+}
+const DEFAULT_MAP_THEMES = {
+  textColor: "color",
+  bgColor: "backgroundColor"
+};
+const hoverMap = (theme, format) => {
+  const hover = theme?.hover || {};
+  const key = DEFAULT_MAP_THEMES[format];
+  return hover[key];
+};
+const MAP_THEME_KEYS = {
+  ...DEFAULT_MAP_THEMES,
+  textColorHover: hoverMap,
+  bgColorHover: hoverMap
+};
+const getColorValue = (val, key, elementProps, themeBtnProps) => {
+  const themeKey = MAP_THEME_KEYS[key];
+  if (elementProps?.type === "button" && !val && themeKey) {
+    if (typeof themeKey === "string") {
+      return themeBtnProps[themeKey];
+    } else {
+      return themeKey(themeBtnProps, key);
+    }
+  }
+  return val;
+};
+export function getButtonElementStyle(editor, element, stylePropertyName) {
+  try {
+    const path = ReactEditor.findPath(editor, element);
+    if (path?.length) {
+      const currentEle = Node.get(editor, path);
+      const dom = ReactEditor.toDOMNode(editor, currentEle);
+      const editorBtn = dom?.querySelector(".button.theme-element");
+      return getElementProperty(editorBtn, stylePropertyName);
+    }
+  } catch (err) {
+    // console.log(err);
+  }
+}

package/dist/Editor/plugins/withCustomDeleteBackward.js

@@ -1,5 +1,6 @@
 import { Editor, Node, Path, Point, Range, Transforms } from "slate";
 import { containsSurrogatePair, getNextNode } from "../utils/helper";
+import { onDeleteBackwardAccordion } from "../utils/accordion";
 const BACKWARD_BLOCKS = ["list-item", "signature"];
 const isNodeTextEmpty = node => {
   const nodeText = Node.string(node);
@@ -32,7 +33,7 @@ const withCustomDeleteBackward = editor => {
         }
         if (selection && Range.isCollapsed(selection)) {
           const [currentNode, path] = Editor.node(editor, selection);
-          if (currentNode && typeof currentNode.text === 'string') {
+          if (currentNode && typeof currentNode.text === "string") {
             const text = currentNode.text;
             if (containsSurrogatePair(text)) {
               // Check if the cursor is at the end of a surrogate pair
@@ -60,6 +61,10 @@ const withCustomDeleteBackward = editor => {
               }
             }
           }
+          const preventDefaultAccordion = onDeleteBackwardAccordion(editor);
+          if (preventDefaultAccordion) {
+            return;
+          }
         }
 
         // Check if current node is a list item and is the last one, signature node

package/dist/Editor/plugins/withEmbeds.js

@@ -1,5 +1,5 @@
 import { Transforms, Path, Node } from "slate";
-const AvoidCopying = ["headingOne", "headingTwo", "headingThree", "blockquote"];
+const AvoidCopying = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree", "blockquote"];
 const BlockTypes = ["grid"];
 const withEmbeds = editor => {
   const {

package/dist/Editor/plugins/withHTML.js

@@ -4,7 +4,7 @@ import { decodeAndParseBase64 } from "../utils/helper";
 import convertMDToHTML from "../helper/markdown";
 const avoidDefaultInsert = ["table", "grid"];
 const NON_TEXT_TAGS = ["ol", "ul", "img", "table", "video", "a", "button", "GOOGLE-SHEETS-HTML-ORIGIN"];
-const ALLOWED_TEXT_NODES = ["paragraph", "title", "headingOne", "headingTwo", "headingThree"];
+const ALLOWED_TEXT_NODES = ["paragraph", "title", "headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix"];
 const parseCopiedHTML = html => {
   const parsed = new DOMParser().parseFromString(html, "text/html");
 
@@ -18,7 +18,8 @@ const parseCopiedHTML = html => {
   });
 
   // to handle google docs list
-  parsed.querySelectorAll("li p, li div").forEach(element => {
+  // 'col' tag added to resolve formatting issues with table data copied from Microsoft Excel
+  parsed.querySelectorAll("li p, li div, col").forEach(element => {
     const parent = element.parentNode;
     // Move all child nodes of <p> or <div> to its parent <li>
     while (element.firstChild) {
@@ -30,6 +31,8 @@ const parseCopiedHTML = html => {
 
   // claude.ai, copy list inbetween, some li tags are not wrapped with ul or ol
   parsed.querySelectorAll("li").forEach(li => {
+    li.innerHTML = li.innerHTML.replace(/^\n+|\n+$/g, ""); // Removes leading and trailing newlines
+
     // Check if the parent of <li> is not a <ul> or <ol>
     if (!li.parentElement || li.parentElement.tagName !== "UL" && li.parentElement.tagName !== "OL") {
       // Create a <ul> element
@@ -55,7 +58,7 @@ const loopChildren = (children = [], defaultInsert) => {
   }
   return defaultInsert;
 };
-const getCurrentElement = editor => {
+export const getCurrentElement = editor => {
   try {
     if (editor.selection) {
       return Node.parent(editor, editor?.selection?.anchor?.path);
@@ -134,7 +137,7 @@ const formatFragment = {
   },
   "check-list-item": fragment => {
     return fragment.map(a => {
-      a.type = "check-list-item";
+      // a.type = "check-list-item";
       return a;
     });
   }
@@ -274,7 +277,13 @@ const withHtml = editor => {
       // }
 
       if (isTitlePath && isNonText) {
-        insertAtNextNode(editor, formattedFragment);
+        const firstNodePasted = formattedFragment[0];
+        const isAllowedTextNode = ALLOWED_TEXT_NODES.includes(firstNodePasted?.type || "");
+        if (isAllowedTextNode) {
+          Transforms.insertFragment(editor, formattedFragment);
+        } else {
+          insertAtNextNode(editor, formattedFragment);
+        }
         return;
       }
       const currentText = getCurrentElementText(editor);

package/dist/Editor/plugins/withTable.js

@@ -1,6 +1,6 @@
 import { Editor, Range, Point, Element, Transforms, Node } from "slate";
 import { TableUtil, createTableCell } from "../utils/table";
-const NON_DELETABLE_BLOCKS = ["table-cell", "carousel-item"];
+const NON_DELETABLE_BLOCKS = ["table-cell", "carousel-item", "page-settings"];
 const withTable = editor => {
   const {
     deleteBackward,

package/dist/Editor/theme/ThemeList.js

@@ -1,181 +1,58 @@
-import { MenuItem, Select, useTheme } from "@mui/material";
-import { fontOptions } from "../utils/font";
-import { toolbarGroups } from "../Toolbar/toolbarGroups";
+import { Box, MenuItem, Select } from "@mui/material";
+import { defaultTheme } from ".";
+import { useEditorTheme } from "../hooks/useEditorTheme";
+import { useEffect, useState } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const themes = [{
-  label: "Theme 1",
-  colors: ["#c90c1f", "#ff5d05"]
-}, {
-  label: "Theme 2",
-  colors: ["#4c0be3", "#43f7ee"]
-}, {
-  label: "Theme 3",
-  colors: ["#22f20f", "#fff705"]
-}];
-const allTools = toolbarGroups.flat();
-function ThemeList(props) {
+function ThemeList({
+  editor,
+  services = () => {}
+}) {
+  const [themes, setThemes] = useState([]);
+  const [loading, setLoading] = useState(false);
+  console.log("loading", loading);
+  const getThemesList = async () => {
+    setLoading(true);
+    try {
+      const result = await services("getThemes", {});
+      setThemes(result?.data || []);
+    } catch (err) {
+      console.log(err);
+    }
+    setLoading(false);
+  };
   const {
-    selectedTheme,
-    setSelectedTheme
-  } = props;
-  const fontWeight = allTools.find(f => f.format === "fontWeight");
-  const fontStyles = [{
-    text: "Bold",
-    value: "bold",
-    styleField: "fontWeight"
-  }, {
-    text: "Italic",
-    value: "italic",
-    styleField: "fontStyle"
-  }
-  // {
-  //   text: "Underline",
-  //   value: "underline",
-  //   styleField: "textDecoration",
-  // },
-  // {
-  //   text: "Line through",
-  //   value: "line-through",
-  //   styleField: "textDecoration",
-  // },
-  ];
-
-  const theme = useTheme();
-  const colorVars = theme?.vars?.colors || {};
-  const handleTypographyTheme = (key, value, elementType) => {
-    setSelectedTheme(prev => {
-      const newValue = {
-        ...prev,
-        typography: {
-          ...(prev.typography || {}),
-          [elementType]: {
-            ...(prev?.typography?.[elementType] || {}),
-            [key]: value
-          }
-        }
-      };
-      if (!value) {
-        delete newValue?.typography?.[elementType]?.[key];
-      }
-      return newValue;
-    });
+    updateTheme
+  } = useEditorTheme();
+  useEffect(() => {
+    getThemesList();
+  }, []);
+  const handleThemeChange = e => {
+    const {
+      value
+    } = e.target;
+    const selectedTheme = themes.find(t => t.id === value) || defaultTheme;
+    updateTheme(selectedTheme, "THEME_CHANGE");
   };
-  return /*#__PURE__*/_jsxs("div", {
-    children: [themes.map((theme, i) => {
-      return /*#__PURE__*/_jsxs("button", {
-        style: {
-          margin: "10px"
-        },
-        onClick: () => setSelectedTheme(prev => ({
-          ...prev,
-          colors: theme.colors
-        })),
-        children: [theme.label, /*#__PURE__*/_jsx("div", {
-          children: theme.colors.map((c, j) => {
-            return /*#__PURE__*/_jsx("div", {
-              style: {
-                width: "20px",
-                height: "20px",
-                background: c,
-                margin: "10px"
-              }
-            }, j);
-          })
-        })]
-      }, i);
-    }), /*#__PURE__*/_jsxs("div", {
-      children: ["Heading 1 Font Family", /*#__PURE__*/_jsx(Select
-      // value={""}
-      , {
-        label: "Font Family",
-        onChange: e => {
-          handleTypographyTheme("fontFamily", e.target.value, "h1");
-        },
-        children: fontOptions.map((font, i) => {
-          const {
-            text,
-            value
-          } = font;
-          return /*#__PURE__*/_jsx(MenuItem, {
-            value: value,
-            children: text
-          }, i);
-        })
-      }), "Font Weight", /*#__PURE__*/_jsx(Select
-      // value={""}
-      , {
-        label: "Font Weight",
-        onChange: e => {
-          handleTypographyTheme("fontWeight", e.target.value, "h1");
-        },
-        children: fontWeight.options.map((option, i) => {
-          const {
-            text,
-            value
-          } = option;
-          return /*#__PURE__*/_jsx(MenuItem, {
-            value: value,
-            children: text
-          }, i);
-        })
-      }), /*#__PURE__*/_jsx("input", {
-        type: "number",
-        placeholder: "font size",
-        onChange: e => {
-          handleTypographyTheme("fontSize", e.target.value, "h1");
-        }
-      }), /*#__PURE__*/_jsxs("div", {
-        children: ["Text", /*#__PURE__*/_jsx("br", {}), "Theme color", Object.values(colorVars).map((colorVar, i) => {
-          return /*#__PURE__*/_jsx("button", {
-            style: {
-              width: "20px",
-              height: "20px",
-              background: colorVar,
-              margin: "10px",
-              outline: "none"
-            },
-            onClick: () => handleTypographyTheme("color", colorVar, "h1")
-          }, i);
-        }), "normal color", /*#__PURE__*/_jsx("button", {
-          style: {
-            width: "20px",
-            height: "20px",
-            background: "#ff00e1",
-            margin: "10px",
-            outline: "none"
-          },
-          onClick: () => handleTypographyTheme("color", "#ff00e1", "h1")
-        })]
-      }), /*#__PURE__*/_jsxs("div", {
-        children: ["Font styles", fontStyles.map((option, i) => {
-          const styles = selectedTheme?.typography?.h1 || {};
-          const {
-            text,
-            value,
-            styleField
-          } = option;
-          return /*#__PURE__*/_jsxs("button", {
-            onClick: () => {
-              handleTypographyTheme(styleField, styles[styleField] === value ? null : value, "h1");
-            },
-            children: [text, " ", styles[styleField] === value]
-          }, i);
-        })]
-      }), /*#__PURE__*/_jsx("input", {
-        type: "number",
-        placeholder: "Margin text Spacing",
-        onChange: e => {
-          handleTypographyTheme("letterSpacing", e.target.value, "h1");
-        }
-      }), /*#__PURE__*/_jsx("input", {
-        type: "number",
-        placeholder: "Line spacing",
-        onChange: e => {
-          handleTypographyTheme("lineHeight", e.target.value, "h1");
-        }
+  return /*#__PURE__*/_jsx(Box, {
+    sx: {
+      padding: "10px",
+      background: "#efefef",
+      borderRadius: "6px"
+    },
+    children: /*#__PURE__*/_jsxs(Select, {
+      onChange: handleThemeChange,
+      defaultValue: 0,
+      children: [/*#__PURE__*/_jsx(MenuItem, {
+        value: 0,
+        children: "Default Theme"
+      }), themes.map((theme, i) => {
+        return /*#__PURE__*/_jsx(MenuItem, {
+          value: theme?.id,
+          children: theme?.name
+        }, i);
       })]
-    })]
+    })
   });
 }
 export default ThemeList;