@flozy/editor 10.7.0 → 10.7.2

package/dist/Editor/utils/accordion.js

@@ -1,6 +1,6 @@
 import { Editor, Element, Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
-import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType, getSelectedText } from "./helper";
+import { ALLOWED_TEXT_NODES, getNode, getNodeText, getNodeWithType } from "./helper";
 import { isMobileWindow } from "../helper";
 import { removeAccordion } from "./events";
 import { ReactEditor } from "slate-react";
@@ -10,48 +10,76 @@ const focusAccordion = (editor, upPath) => {
     offset: 0
   });
 };
-export const insertAccordion = (editor, path) => {
-  try {
-    const selectedText = getSelectedText(editor);
-    const accordion = {
-      type: "accordion",
+const getAccordionNode = summaryNode => {
+  return {
+    type: "accordion",
+    children: [{
+      type: "accordion-summary",
+      children: summaryNode
+    }, {
+      type: "accordion-details",
       children: [{
-        type: "accordion-summary",
+        type: "paragraph",
         children: [{
-          type: "paragraph",
-          children: [{
-            text: selectedText || ""
-          }]
+          text: ""
         }]
-      }, {
-        type: "accordion-details",
+      }]
+    }]
+  };
+};
+export const insertAccordion = (editor, path) => {
+  try {
+    const {
+      selection
+    } = editor;
+    let accordionPath;
+    if (path) {
+      const summaryNode = {
+        type: "paragraph",
         children: [{
-          type: "paragraph",
-          children: [{
-            text: ""
-          }]
+          text: ""
         }]
-      }]
-    };
-    const props = path ? {
-      at: path,
-      select: true
-    } : {
-      select: true
-    };
-    Transforms.insertNodes(editor, accordion, props);
-    const curPath = [...editor?.selection?.anchor?.path];
-    const upPath = [...curPath];
-    // get title index
-    const summaryIndex = upPath.length - 3;
-    upPath[summaryIndex] = upPath[summaryIndex] === 0 ? 0 : upPath[summaryIndex] - 1;
+      };
+      const accordion = getAccordionNode([summaryNode]);
+      Transforms.insertNodes(editor, accordion, {
+        at: path
+      });
+      accordionPath = path;
+    } else if (selection) {
+      const selectedNodes = Array.from(Editor.nodes(editor, {
+        match: n => Element.isElement(n),
+        mode: "lowest" // use 'lowest' to get individual blocks
+      }));
 
-    // select accordion title by default
+      for (const [node, path] of selectedNodes) {
+        let currNode = node;
+        // const isListItem = node.type === "list-item";
+        // if (isListItem) {
+        //   currNode = {
+        //     type: "paragraph",
+        //     children: node.children,
+        //   };
+        // }
+
+        let accordion = getAccordionNode([currNode]);
+        Transforms.removeNodes(editor, {
+          at: path
+        });
+        Transforms.insertNodes(editor, accordion, {
+          at: path
+        });
+        accordionPath = path;
+      }
+      const lastNode = selectedNodes[selectedNodes.length - 1];
+      const lastNodePath = lastNode[1];
+      accordionPath = lastNodePath;
+    }
+    const focusPath = [...accordionPath, 0, 0, 0];
     if (isMobileWindow()) {
       // timeout to resolve focus issue in mobile
-      setTimeout(() => focusAccordion(editor, upPath), 0);
+      setTimeout(() => focusAccordion(editor, focusPath), 0);
     } else {
-      focusAccordion(editor, upPath);
+      focusAccordion(editor, focusPath);
     }
     insertNewLine(editor);
   } catch (err) {

package/dist/Editor/utils/button.js

@@ -1,6 +1,5 @@
 import { Path, Transforms } from "slate";
 import insertNewLine from "./insertNewLine";
-import { windowVar } from "./helper";
 import { getCurrentElementText } from "../plugins/withHTML";
 export const insertButton = editor => {
   const button = {
@@ -11,22 +10,7 @@ export const insertButton = editor => {
     buttonLink: {
       linkType: "webAddress"
     },
-    iconPosition: "start",
-    bgColor: "#2563EB",
-    textColor: "#FFF",
-    borderRadius: {
-      topLeft: 30,
-      topRight: 30,
-      bottomLeft: 30,
-      bottomRight: 30
-    },
-    bannerSpacing: {
-      left: 16,
-      top: 8,
-      right: 16,
-      bottom: 8
-    },
-    ...(windowVar.lastButtonProps || {})
+    iconPosition: "start"
   };
   const hasText = getCurrentElementText(editor);
   const insertPath = hasText ? Path.next(Path.parent(editor?.selection.focus.path)) : editor?.selection.focus.path;

package/dist/Editor/utils/draftToSlate.js

@@ -82,7 +82,8 @@ const splitInlineStyleRanges = (text, inlineStyleRanges, data) => {
 };
 export const draftToSlate = props => {
   const {
-    data
+    data,
+    needLayout
   } = props;
   if (data?.blocks && data?.blocks?.length > 0) {
     const converted = data?.blocks?.reduce((a, b) => {
@@ -104,7 +105,7 @@ export const draftToSlate = props => {
     return data;
   } else {
     return [{
-      type: "paragraph",
+      type: needLayout ? "title" : "paragraph",
       children: [{
         text: ""
       }]

package/dist/Editor/utils/font.js

@@ -7,43 +7,43 @@ export const sizeMap = {
 export const fontFamilyMap = {
   PoppinsRegular: "PoppinsRegular",
   PoppinsBold: "PoppinsBold",
-  sans: "Helvetica,Arial, sans serif",
-  serif: "Georgia, Times New Roaman,serif",
-  monospace: "Monaco, Courier New,monospace",
-  roboto: "'Roboto', sans-serif",
-  qwitcher: "'Qwitcher Grypen', cursive",
-  garamond: "'EB Garamond', serif",
-  anton: "'Anton', sans-serif",
-  dmserif: "'DM Serif Text', serif",
-  inter: "'Inter', sans-serif",
-  libre: "'Libre Baskerville', serif",
-  montserrat: "'Montserrat', sans-serif",
-  opensans: "'Open Sans', sans-serif",
-  publicsans: "'Public Sans', sans-serif",
-  raleway: "'Raleway', sans-serif",
-  spacemono: "'Space Mono', sans-serif",
-  bulgarian: "'Bulgarian Garamond', monospace",
-  impact: "'Impact', serif",
-  redacted: "'Redacted Script', cursive",
-  greatVibes: "'Great Vibes', cursive",
-  zeyada: "'Zeyada', cursive",
-  allura: "'Allura', cursive",
-  pinyon: "'Pinyon Script', cursive",
-  muellerhoff: "'Herr Von Muellerhoff', cursive",
-  dawning: "'Dawning of a New Day', cursive",
+  sans: 'Helvetica, Arial, "sans serif"',
+  serif: 'Georgia, "Times New Roaman", serif',
+  monospace: 'Monaco, "Courier New", monospace',
+  roboto: "Roboto, sans-serif",
+  qwitcher: '"Qwitcher Grypen", cursive',
+  garamond: '"EB Garamond", serif',
+  anton: "Anton, sans-serif",
+  dmserif: '"DM Serif Text", serif',
+  inter: "Inter, sans-serif",
+  libre: '"Libre Baskerville", serif',
+  montserrat: "Montserrat, sans-serif",
+  opensans: '"Open Sans", sans-serif',
+  publicsans: '"Public Sans", sans-serif',
+  raleway: "Raleway, sans-serif",
+  spacemono: '"Space Mono", sans-serif',
+  bulgarian: '"Bulgarian Garamond", monospace',
+  impact: "Impact, serif",
+  redacted: '"Redacted Script", cursive',
+  greatVibes: '"Great Vibes", cursive',
+  zeyada: "Zeyada, cursive",
+  allura: "Allura, cursive",
+  pinyon: '"Pinyon Script", cursive',
+  muellerhoff: '"Herr Von Muellerhoff", cursive',
+  dawning: '"Dawning of a New Day", cursive',
   // New Font Added for Type Signature
-  comingsoon: "'Coming Soon', cursive",
-  dancingScript: "'Dancing Script', cursive",
-  engagement: "'Engagement', cursive",
-  gaegu: "'Gaegu', cursive",
-  ingridDarling: "'Ingrid Darling', cursive",
-  kitaOne: "'Kite One', sans - serif",
-  laBelleAurore: "'La Belle Aurore', cursive",
-  lobster: "'Lobster', cursive",
-  meaCulpa: "'Mea Culpa', cursive",
-  meddon: "'Meddon', cursive",
-  merriWeather: "'Merriweather', serif",
-  theGirlNextDoor: "'The Girl Next Door', cursive"
+  comingsoon: '"Coming Soon", cursive',
+  dancingScript: '"Dancing Script", cursive',
+  engagement: "Engagement, cursive",
+  gaegu: "Gaegu, cursive",
+  ingridDarling: '"Ingrid Darling", cursive',
+  kitaOne: "Times",
+  laBelleAurore: '"La Belle Aurore", cursive',
+  lobster: "Lobster, cursive",
+  meaCulpa: '"Mea Culpa", cursive',
+  meddon: "Meddon, cursive",
+  merriWeather: "Merriweather, serif",
+  theGirlNextDoor: '"The Girl Next Door", cursive'
 };
 export const fontOptions = Object.keys(fontFamilyMap).map(m => {
   return {
@@ -62,7 +62,10 @@ export const signedTextFonts = Object.keys(fontFamilyMap).slice(-12).map(m => {
 export const headingMap = {
   headingOne: "32px",
   headingTwo: "24px",
-  headingThree: "19px"
+  headingThree: "19px",
+  headingFour: "16px",
+  headingFive: "13px",
+  headingSix: "11px"
 };
 export const fontWeightOptions = [{
   text: "Bold",

package/dist/Editor/utils/helper.js

@@ -2,6 +2,7 @@ import { Editor, Node, Transforms, Element, Path, Range, Text } from "slate";
 import { ReactEditor } from "slate-react";
 import insertNewLine from "./insertNewLine";
 import { getDevice } from "../helper/theme";
+import { activeMark, getSelectedElementStyle } from "./SlateUtilityFunctions";
 import { getCurrentElementText } from "../plugins/withHTML";
 export const windowVar = {};
 let ST_TIMEOUT = null;
@@ -217,9 +218,13 @@ export const handleInsertLastElement = (event, editor) => {
 };
 export const isListItem = editor => {
   const format = ["list-item", "check-list-item", "accordion-summary", "headingOne", "headingTwo", "headingThree"];
-  const [node] = Editor.nodes(editor, {
+  const [node1, node2] = Editor.nodes(editor, {
     match: n => !Editor.isEditor(n) && Element.isElement(n) && format.indexOf(n.type) > -1
   });
+  let node = node1;
+  if (node2 && node2[0] && node2[0].type === "accordion-summary") {
+    node = node2;
+  }
   return node;
 };
 export const getNode = (editor, path) => {
@@ -492,6 +497,34 @@ export const decodeString = str => {
     console.log(err);
   }
 };
+export const getContrastColor = color => {
+  let r, g, b;
+
+  // Check if the color is in hex format
+  if (color.startsWith("#")) {
+    r = parseInt(color.substring(1, 3), 16);
+    g = parseInt(color.substring(3, 5), 16);
+    b = parseInt(color.substring(5, 7), 16);
+  }
+  // Check if the color is in RGB/RGBA format
+  else if (color.startsWith("rgb")) {
+    const rgbValues = color.replace(/^rgba?\(|\s+|\)$/g, "") // Remove the rgb/rgba and spaces
+    .split(","); // Split the values into an array
+
+    r = parseInt(rgbValues[0]);
+    g = parseInt(rgbValues[1]);
+    b = parseInt(rgbValues[2]);
+  } else {
+    // If the format is not recognized, default to black text
+    return "#000000";
+  }
+
+  // Calculate relative luminance
+  const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
+
+  // Return black for light colors, white for dark colors
+  return luminance > 0.5 ? "#000000" : "#FFFFFF";
+};
 export const onDeleteKey = (event, {
   editor
 }) => {
@@ -709,6 +742,10 @@ export const isRestrictedNode = (event, editor) => {
     return isNodeRestricted;
   }
 };
+export function capitalizeFirstLetter(str) {
+  if (!str) return str;
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
 export const insertLineBreakAtEndOfPath = (editor, path) => {
   try {
     const [node, nodePath] = Editor.node(editor, path); // Get the node at the specified path
@@ -727,6 +764,13 @@ export const insertLineBreakAtEndOfPath = (editor, path) => {
     console.log(err);
   }
 };
+export function isHavingSelection(editor) {
+  try {
+    return editor?.selection && !Range.isCollapsed(editor.selection);
+  } catch (err) {
+    console.log(err);
+  }
+}
 const omitNodes = ["site-settings", "page-settings"];
 export function getInitialValue(value = [], readOnly) {
   if (readOnly === "readonly" && value?.length) {
@@ -757,20 +801,17 @@ export function getInitialValue(value = [], readOnly) {
   }
   return value;
 }
-export function capitalizeFirstLetter(str) {
-  if (!str) return str;
-  return str.charAt(0).toUpperCase() + str.slice(1);
-}
-export function isHavingSelection(editor) {
-  try {
-    return editor?.selection && !Range.isCollapsed(editor.selection);
-  } catch (err) {
-    console.log(err);
-  }
-}
 export function getSelectedCls(defaultCls = "", selected, selectedClsName = "selected") {
   return `${defaultCls} ${selected ? selectedClsName : ""}`;
 }
+export function handleNegativeInteger(val) {
+  return val < 0 ? 0 : val;
+}
+export const containsSurrogatePair = text => {
+  // Match surrogate pairs (high and low surrogate)
+  const surrogatePairRegex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
+  return surrogatePairRegex.test(text);
+};
 export const getNodeWithType = (editor, nodeType = "", otherOptions) => {
   try {
     const options = {
@@ -784,11 +825,6 @@ export const getNodeWithType = (editor, nodeType = "", otherOptions) => {
     return [];
   }
 };
-export const containsSurrogatePair = text => {
-  // Match surrogate pairs (high and low surrogate)
-  const surrogatePairRegex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
-  return surrogatePairRegex.test(text);
-};
 export const getSlateDom = (editor, range) => {
   try {
     const slateDom = ReactEditor.toDOMRange(editor, range);
@@ -829,7 +865,8 @@ export const clearWindowSelection = () => {
 
 export const viewSlateSelection = () => {
   // if ai is opened, remove the window selection class and open then slate selection, To resolve: focussing on the ai input removes window selection automatically
-  clearWindowSelection();
+  // clearWindowSelection();
+
   const selectionBg = "rgba(35, 131, 226, 0.35)";
   const root = document.documentElement;
   root.style.setProperty("--slate-highlight-bg", selectionBg);
@@ -838,9 +875,6 @@ export const hideSlateSelection = () => {
   const root = document.documentElement;
   root.style.setProperty("--slate-highlight-bg", "none");
 };
-export function handleNegativeInteger(val) {
-  return val < 0 ? 0 : val;
-}
 export const insertSlashNode = (editor, insertNode) => {
   try {
     // Delete the currently selected text
@@ -889,6 +923,48 @@ export const getCurrentNodeText = editor => {
     console.log("Error:", error);
   }
 };
+function convertColorToRgb(color) {
+  if (color?.startsWith("#")) {
+    // HEX to RGB
+    let hex = color.replace("#", "");
+    let r, g, b;
+    if (hex.length === 3) {
+      hex = hex.split("").map(x => x + x).join("");
+    }
+    if (hex.length === 6) {
+      [r, g, b] = [hex.substring(0, 2), hex.substring(2, 4), hex.substring(4, 6)].map(val => parseInt(val, 16));
+      return `rgb(${r}, ${g}, ${b})`;
+    }
+  } else {
+    return color;
+  }
+}
+export const getSelectedColor = (selectedColor, theme, hideThemeColors) => {
+  const colorVars = hideThemeColors ? null : theme?.vars?.colors;
+  let selectedValue = selectedColor;
+  if (colorVars) {
+    const convertedColor = convertColorToRgb(selectedColor);
+    Object.entries(theme.colors).forEach(([key, value]) => {
+      const convertedThemeColor = convertColorToRgb(value);
+      if (convertedThemeColor === convertedColor) {
+        selectedValue = colorVars[key];
+      }
+    });
+  }
+  return selectedValue;
+};
+const themeTextFormats = ["headingOne", "headingTwo", "headingThree", "headingFour", "headingFive", "headingSix", "paragraphOne", "paragraphTwo", "paragraphThree"];
+export const getSelectedElementColor = (editor, format, theme) => {
+  const [isThemeText] = Editor.nodes(editor, {
+    at: editor.selection,
+    match: n => themeTextFormats.includes(n?.type)
+  });
+  if (!isThemeText) {
+    return activeMark(editor, "color") || "#000000";
+  }
+  const color = getSelectedElementStyle(format, editor, format);
+  return getSelectedColor(color, theme);
+};
 export const isHavingColor = color => {
   if (!color) {
     return false;

package/dist/Editor/utils/insertAppHeader.js

@@ -8,27 +8,31 @@ export const appHeaderNode = ({
     appLogo: "none",
     menus: menus || [{
       type: "menu",
-      url: "home",
+      url: "",
+      placeholder: "home",
       target: "",
       text: "Home",
       linkType: "page"
     }, {
       type: "menu",
-      url: "wireframe2",
+      url: "",
+      placeholder: "wireframe2",
       target: "",
       text: "Wireframe",
       linkType: "page"
     }, {
       type: "menu",
-      url: "https://www.google.com",
+      url: "",
       target: "",
+      placeholder: "Work",
       text: "Work",
       linkType: "webAddress"
     }, {
       type: "menu",
-      url: "https://www.google.com",
+      url: "",
       target: "",
       text: "Contact",
+      placeholder: "Contact",
       linkType: "webAddress"
     }],
     menuStyle: "stacked",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "10.7.0",
+  "version": "10.7.2",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"
@@ -38,7 +38,6 @@
     "react-icons": "^4.10.1",
     "react-katex": "^3.0.1",
     "react-rnd": "^10.4.11",
-    "react-scripts": "5.0.1",
     "react-signature-canvas": "^1.0.6",
     "react-slick": "^0.29.0",
     "sanitize-html": "^2.13.0",
@@ -69,7 +68,7 @@
     "storybook": "storybook dev -p 6006",
     "build-storybook": "NODE_OPTIONS='--max_old_space_size=4096' storybook build",
     "publish:npm": "rm -rf dist && mkdir dist &&  babel src/components -d dist --copy-files",
-    "publish:local": "rm -rf /Users/agmac03/flozy/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agmac03/flozy/client/node_modules/@flozy/editor/dist --copy-files",
+    "publish:local": "rm -rf /Users/agenciflow08/Documents/flozyapp/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agenciflow08/Documents/flozyapp/client/node_modules/@flozy/editor/dist --copy-files",
     "publish:flozy": "./publish-flozy.sh",
     "publish:flozy2": "./publish-flozy2.sh",
     "publish:permission": "chmod +x publish-flozy.sh && chmod +x publish-flozy2.sh"
@@ -122,7 +121,8 @@
     "prop-types": "^15.8.1",
     "source-map-explorer": "^2.5.3",
     "storybook": "^7.4.0",
-    "webpack": "^5.88.2"
+    "webpack": "^5.88.2",
+    "react-scripts": "5.0.1"
   },
   "overrides": {
     "react-refresh": "0.11.0"