@flozy/editor 5.8.0 → 5.8.2

package/dist/Editor/Elements/Table/Table.js

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from "react";
 import { Editor, Transforms } from "slate";
 import { ReactEditor, useSelected, useSlateStatic } from "slate-react";
 import { Box, IconButton, Tooltip, Table as TableComp, TableBody, useTheme, Popper, ClickAwayListener } from "@mui/material";
-import { TableUtil } from "../../utils/table";
+import { TableUtil, getTableColumns, getTableRows } from "../../utils/table";
 import TablePopup from "./TablePopup";
 import { useEditorContext, useEditorSelection } from "../../hooks/useMouseMove";
 import TableStyles from "./Styles";
@@ -206,7 +206,7 @@ const Table = props => {
     }
   }, theme);
   const addRow = () => {
-    const lastRow = element?.rows - 1;
+    const lastRow = getTableRows(element) - 1;
     const firstCol = 0;
     const lastRowPath = [...path, lastRow, firstCol];
     const position = Editor.start(editor, lastRowPath);
@@ -221,7 +221,7 @@ const Table = props => {
     Transforms.deselect(editor);
   };
   const addCol = () => {
-    const lastCol = element?.columns - 1;
+    const lastCol = getTableColumns(element) - 1;
     const firstRow = 0;
     const lastColumnPath = [...path, firstRow, lastCol];
     const position = Editor.start(editor, lastColumnPath);

package/dist/Editor/Elements/Table/TableCell.js

@@ -50,6 +50,7 @@ const TableCell = props => {
   const {
     readOnly
   } = customProps;
+  const isMobile = window.matchMedia("(max-width: 899px)")?.matches || false;
   const {
     bgColor,
     borderColor,
@@ -247,20 +248,24 @@ const TableCell = props => {
       isDragging: false
     });
   };
-  const tbProps = tableResizing || resizing || over || readOnly ? {
-    ...commonTdProps,
-    contentEditable: false
+  const eventProps = isMobile ? {
+    // mobile events for selection
+    onTouchStart: onMouseDownInCell,
+    onTouchMove: handleTouchMove,
+    onTouchEnd: handleTouchEnd
   } : {
-    ...commonTdProps,
     onMouseEnter: () => onMouseEnter(path),
     onMouseLeave,
     onMouseDown: onMouseDownInCell,
     onMouseUp,
-    onClick,
-    // mobile events for selection
-    onTouchStart: onMouseDownInCell,
-    onTouchMove: handleTouchMove,
-    onTouchEnd: handleTouchEnd
+    onClick
+  };
+  const tbProps = tableResizing || resizing || over || readOnly ? {
+    ...commonTdProps,
+    contentEditable: false
+  } : {
+    ...commonTdProps,
+    ...eventProps
   };
   const dndProps = {
     id: cellId,

package/dist/Editor/Elements/Variables/Style.js

@@ -39,7 +39,8 @@ const VariableStyles = theme => ({
     },
     "& .MuiPaper-root": {
       borderRadius: '8px',
-      backgroundColor: `${theme?.palette?.editor?.miniToolBarBackground} !important`
+      backgroundColor: `${theme?.palette?.editor?.miniToolBarBackground} !important`,
+      marginTop: '5px'
     },
     "& .MuiList-root": {
       padding: '0px'

package/dist/Editor/Elements/Variables/VariableButton.js

@@ -34,7 +34,8 @@ const VariableButton = props => {
       PaperProps: {
         style: {
           maxHeight: 300,
-          overflowY: "auto"
+          overflowY: "auto",
+          transformOrigin: 'top left'
         },
         sx: {
           "&::-webkit-scrollbar-track": {
@@ -44,6 +45,14 @@ const VariableButton = props => {
             borderRadius: "16px"
           }
         }
+      },
+      anchorOrigin: {
+        vertical: 'bottom',
+        horizontal: 'right'
+      },
+      transformOrigin: {
+        vertical: 'top',
+        horizontal: 'right'
       }
     },
     children: [/*#__PURE__*/_jsx(MenuItem, {

package/dist/Editor/MiniEditor.js

@@ -11,6 +11,7 @@ import withCommon from "./hooks/withCommon";
 import { serializeToText } from "./utils/serializeToText";
 import "./Editor.css";
 import { EditorProvider } from "./hooks/useMouseMove";
+import { ensureWrappedVariables } from "./helper/ensureWrappedVariables";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const MiniEditor = props => {
@@ -36,7 +37,8 @@ const MiniEditor = props => {
     needLayout: false
   }));
   const [isInteracted, setIsInteracted] = useState(false);
-  const [value, setValue] = useState(content);
+  const updatedContent = ensureWrappedVariables(content);
+  const [value, setValue] = useState(ensureWrappedVariables(updatedContent));
   const [deboundedValue] = useDebounce(value, 500);
   const isReadOnly = readOnly === "readonly";
   const customProps = {
@@ -149,7 +151,7 @@ const MiniEditor = props => {
     theme: theme,
     children: /*#__PURE__*/_jsxs(Slate, {
       editor: editor,
-      initialValue: content,
+      initialValue: updatedContent,
       onChange: onChange,
       children: [/*#__PURE__*/_jsx(BasicToolbar, {
         ...props,

package/dist/Editor/common/Section/index.js

@@ -13,6 +13,35 @@ import { SectionSettingIcon } from "../iconListV2";
 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 = ({
+  fromPopper,
+  readOnly,
+  showTool,
+  onSettings
+}) => {
+  return !readOnly && !showTool ? /*#__PURE__*/_jsx(Box, {
+    component: "div",
+    className: `element-toolbar no-border-button hr section-tw sectionIcon`,
+    contentEditable: false,
+    style: fromPopper ? {
+      position: "unset",
+      marginLeft: "28px",
+      paddingTop: "4px",
+      marginRight: "10px",
+      height: "100%"
+    } : {
+      left: "-28px",
+      top: "1px"
+    },
+    children: /*#__PURE__*/_jsx(Tooltip, {
+      title: "Section Settings",
+      children: /*#__PURE__*/_jsx(IconButton, {
+        onClick: onSettings,
+        children: /*#__PURE__*/_jsx(SectionSettingIcon, {})
+      })
+    })
+  }) : null;
+};
 const list_types = ["orderedList", "unorderedList"];
 const Section = props => {
   const themeReact = useTheme();
@@ -57,32 +86,6 @@ const Section = props => {
   const onSettings = () => {
     setOpenSettings(true);
   };
-  const Toolbar = ({
-    fromPopper
-  }) => {
-    return !readOnly && !showTool ? /*#__PURE__*/_jsx(Box, {
-      component: "div",
-      className: `element-toolbar no-border-button hr section-tw sectionIcon`,
-      contentEditable: false,
-      style: fromPopper ? {
-        position: "unset",
-        marginLeft: "28px",
-        paddingTop: "4px",
-        marginRight: "10px",
-        height: "100%"
-      } : {
-        left: "-28px",
-        top: "1px"
-      },
-      children: /*#__PURE__*/_jsx(Tooltip, {
-        title: "Section Settings",
-        children: /*#__PURE__*/_jsx(IconButton, {
-          onClick: onSettings,
-          children: /*#__PURE__*/_jsx(SectionSettingIcon, {})
-        })
-      })
-    }) : null;
-  };
   const onSave = data => {
     const updateData = {
       ...data
@@ -167,19 +170,26 @@ const Section = props => {
             bgcolor: "background.paper",
             height: "30px",
             position: "relative",
-            background: theme?.palette?.type === 'dark' ? theme?.palette?.editor?.miniToolBarBackground : '#F6F6F6'
+            background: theme?.palette?.type === "dark" ? theme?.palette?.editor?.miniToolBarBackground : "#F6F6F6"
           },
           children: [!readOnly && !showTool ? /*#__PURE__*/_jsx(DragHandle, {
             ...props,
             fromPopper: true
           }) : null, /*#__PURE__*/_jsx(Toolbar, {
-            fromPopper: true
+            fromPopper: true,
+            readOnly: readOnly,
+            showTool: showTool,
+            onSettings: onSettings
           })]
         })
       }) : /*#__PURE__*/_jsxs(_Fragment, {
         children: [!readOnly && !showTool ? /*#__PURE__*/_jsx(DragHandle, {
           ...props
-        }) : null, /*#__PURE__*/_jsx(Toolbar, {})]
+        }) : null, /*#__PURE__*/_jsx(Toolbar, {
+          readOnly: readOnly,
+          showTool: showTool,
+          onSettings: onSettings
+        })]
       }), children]
     }), openSetttings ? /*#__PURE__*/_jsx(SectionPopup, {
       element: {

package/dist/Editor/helper/ensureWrappedVariables.js

@@ -0,0 +1,28 @@
+export const ensureWrappedVariables = content => {
+  return content.map(node => {
+    if (node.children) {
+      return {
+        ...node,
+        children: node.children.reduce((result, child, index, arr) => {
+          if (child.type === "variables") {
+            if (index === 0 || !arr[index - 1].text || arr[index - 1].text.trim() === "") {
+              result.push({
+                text: ""
+              });
+            }
+            result.push(child);
+            if (index === arr.length - 1 || !arr[index + 1]?.text || arr[index + 1]?.text.trim() === "") {
+              result.push({
+                text: ""
+              });
+            }
+          } else {
+            result.push(child);
+          }
+          return result;
+        }, [])
+      };
+    }
+    return node;
+  });
+};

package/dist/Editor/plugins/withHTML.js

@@ -1,7 +1,8 @@
 import { Transforms, Editor, Element, Node, Path } from "slate";
 import deserialize from "../helper/deserialize";
 import { decodeAndParseBase64 } from "../utils/helper";
-import convertMDToHTML from "../helper/markdown";
+// 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"];
@@ -275,15 +276,14 @@ const withHtml = editor => {
       Transforms.insertFragment(editor, formattedFragment);
       return;
     } else {
-      const html = convertMDToHTML(data.getData("text/plain"));
-      let parsed = new DOMParser().parseFromString(html, "text/html");
-      parsed = parseCopiedHTML(html);
-      const fragment = deserialize(parsed.body);
-      Transforms.insertFragment(editor, fragment);
-      // insertData(data);
+      // const html = convertMDToHTML(data.getData("text/plain"));
+      // let parsed = new DOMParser().parseFromString(html, "text/html");
+      // parsed = parseCopiedHTML(html);
+      // const fragment = deserialize(parsed.body);
+      // Transforms.insertFragment(editor, fragment);
+      insertData(data);
     }
   };
-
   return editor;
 };
 export default withHtml;

package/dist/Editor/utils/customHooks/useTableResize.js

@@ -43,7 +43,8 @@ const useTableResize = ({
       minWidth
     } = minMaxProps || {};
     setSize(currentSize => {
-      const calcWidth = currentSize?.width + e.movementX;
+      const width = currentSize?.width || parentDOM?.clientWidth;
+      const calcWidth = width + e.movementX;
       return {
         width: minWidth && calcWidth < minWidth ? minWidth : calcWidth,
         height: currentSize.height + e.movementY,

package/dist/Editor/utils/table.js

@@ -753,4 +753,25 @@ export const clearCellText = (editor, currentCellPath) => {
   } catch (err) {
     console.log(err);
   }
+};
+export const getTableColumns = element => {
+  const {
+    columns,
+    children
+  } = element || {};
+  if (columns) {
+    return columns;
+  }
+  const firstRow = children?.length ? children[0] : {};
+  return firstRow?.children?.length || 0;
+};
+export const getTableRows = element => {
+  const {
+    rows,
+    children
+  } = element || {};
+  if (rows) {
+    return rows;
+  }
+  return children?.length || 0;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"
@@ -69,7 +69,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/agmac30/Documents/CODE_BASE/flozy/client/node_modules/@flozy/editor/dist && babel src/components -d /Users/agmac30/Documents/CODE_BASE/flozy/client/node_modules/@flozy/editor/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"
   },
   "eslintConfig": {
     "extends": [