@flozy/editor 9.1.2 → 9.1.4

package/dist/Editor/Elements/Color Picker/ColorButtons.js

@@ -1,11 +1,15 @@
 import React, { useState } from "react";
-import { Box, IconButton, Popover } from "@mui/material";
+import { Box, IconButton, Popover, Typography, useTheme } from "@mui/material";
 import KeyboardArrowDownRoundedIcon from "@mui/icons-material/KeyboardArrowDownRounded";
 import Button from "../../common/Button";
 import { colors } from "./defaultColors";
 import ColorPicker from "./colorPicker.svg";
+import { useSlateStatic } from "slate-react";
+import { Transforms } from "slate";
+import { useEditorContext } from "../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 let c = [];
 const ColorChunks = (recentColors = []) => [...recentColors, ...colors].reduce((a, b, i) => {
   if (i % 7 === 0) {
@@ -110,12 +114,18 @@ const ColorButtons = props => {
     openColorTool,
     onClose,
     onColorPickerClick,
+    disableEditTheme,
     defaultColors = []
   } = props;
   const [row1, ...restRows] = ColorChunks([]);
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   const firstRow = defaultColors?.length ? defaultColors : row1;
+  const theme = useTheme();
+  const editor = useSlateStatic();
+  const {
+    setOpenTheme
+  } = useEditorContext();
   const handleMore = e => {
     setAnchorEl(e.currentTarget);
   };
@@ -128,6 +138,7 @@ const ColorButtons = props => {
   const handleSelect = color => () => {
     onSelect(color);
   };
+  const colorVars = theme?.vars?.colors || {};
   return /*#__PURE__*/_jsxs(Box, {
     component: "span",
     sx: classes.colorButtons,
@@ -144,7 +155,7 @@ const ColorButtons = props => {
           activeColor: activeColor
         }, `si_btn_row1_${m}_${i}`);
       })
-    }), /*#__PURE__*/_jsxs(Popover, {
+    }), /*#__PURE__*/_jsx(Popover, {
       open: open || openColorTool,
       anchorEl: anchorEl || openColorTool,
       onClose: handleClose,
@@ -158,9 +169,39 @@ const ColorButtons = props => {
       },
       sx: classes.colorPopper,
       className: "colorPopper",
-      children: [/*#__PURE__*/_jsx(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         sx: classes.colorButtonsInner,
-        children: restRows.map((m, i) => {
+        children: [Object.values(colorVars)?.length ? /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsxs(Box, {
+            component: "div",
+            className: "singleColorTitleWrapper",
+            children: [/*#__PURE__*/_jsx(Typography, {
+              variant: "subtitle2",
+              children: "Theme colours"
+            }), disableEditTheme ? null : /*#__PURE__*/_jsx("div", {
+              className: "editBtn",
+              onClick: () => {
+                Transforms.deselect(editor, {
+                  at: editor.selection
+                });
+                setOpenTheme("editThemeColor");
+              },
+              children: "Edit"
+            })]
+          }), /*#__PURE__*/_jsx(SingleColorButton, {
+            crs: Object.values(colorVars),
+            handleSelect: handleSelect,
+            classes: classes,
+            activeColor: activeColor
+          })]
+        }) : null, /*#__PURE__*/_jsx(Box, {
+          component: "div",
+          className: "singleColorTitleWrapper",
+          children: /*#__PURE__*/_jsx(Typography, {
+            variant: "subtitle2",
+            children: "Custom colour"
+          })
+        }), restRows.map((m, i) => {
           return /*#__PURE__*/_jsx(SingleColorButton, {
             id: `p2_${id}`,
             crs: m,
@@ -169,14 +210,18 @@ const ColorButtons = props => {
             classes: classes,
             activeColor: activeColor
           }, `si_btn_${m}_${i}`);
-        })
-      }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
-        onClick: onColorPickerClick,
-        children: /*#__PURE__*/_jsx("img", {
-          src: ColorPicker,
-          alt: "color wheel"
-        })
-      }) : null]
+        }), forMiniTool ? /*#__PURE__*/_jsx(IconButton, {
+          onClick: onColorPickerClick,
+          style: {
+            alignSelf: "start",
+            margin: "6px"
+          },
+          children: /*#__PURE__*/_jsx("img", {
+            src: ColorPicker,
+            alt: "color wheel"
+          })
+        }) : null]
+      })
     })]
   });
 };

package/dist/Editor/Elements/Color Picker/ColorPicker.css

@@ -60,4 +60,28 @@
   padding: 0 15px !important;
   width: 60px !important;
   flex-shrink: 0;
-}
+}
+
+
+.singleColorTitleWrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px;
+  width: 100%;
+  border-bottom: 1px solid #DCE4EC;
+}
+
+.singleColorTitleWrapper .MuiTypography-root {
+  font-weight: 600;
+}
+
+.singleColorTitleWrapper .editBtn {
+  text-transform: none;
+  color: #2563EB;
+  text-decoration: underline;
+  padding: 0px;
+  min-width: unset;
+  cursor: pointer;
+  font-size: 14px;
+}

package/dist/Editor/Elements/Color Picker/ColorPicker.js

@@ -1,7 +1,6 @@
 import React, { useState } from "react";
 import { ReactEditor } from "slate-react";
-import { Transforms } from "slate";
-import ColorPickerTool from "react-gcolor-picker";
+// import ColorPickerTool from "react-gcolor-picker";
 import { IconButton, Tooltip, Box, Popover } from "@mui/material";
 import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions";
 import ColorButtons from "./ColorButtons";
@@ -9,6 +8,7 @@ import ColorPickerStyles from "./Styles";
 import colorWheel from "./colorWheel.png";
 import "./ColorPicker.css";
 import { useEditorContext } from "../../hooks/useMouseMove";
+import CustomColorPicker from "../../common/CustomColorPicker";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -97,10 +97,10 @@ const ColorPicker = props => {
         horizontal: "top"
       },
       sx: classes.colorPickerPopup,
-      children: /*#__PURE__*/_jsx(ColorPickerTool, {
+      children: /*#__PURE__*/_jsx(CustomColorPicker, {
         gradient: true,
-        value: activeColor,
-        onChange: handleFormSubmit
+        onChange: handleFormSubmit,
+        color: activeColor
       })
     })]
   });

package/dist/Editor/Elements/Color Picker/Styles.js

@@ -21,7 +21,7 @@ const ColorPickerStyles = theme => ({
       border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder} !important`,
       borderRadius: "7px !important",
       padding: "0px 5px",
-      '@media only screen and (max-width: 600px)': {
+      "@media only screen and (max-width: 600px)": {
         marginTop: "-40px"
       }
     }

package/dist/Editor/Elements/DataView/Layouts/ColumnView.js

@@ -16,7 +16,10 @@ const ColumnView = props => {
     selected,
     readOnly
   } = props;
-  const DataType = DataTypes[property?.type] || DataTypes["text"];
+  const {
+    type
+  } = property;
+  const DataType = DataTypes[type] || DataTypes["text"];
   const anchorRef = useRef(null);
   const [anchorEl, setAnchorEl] = useState(null);
   const [popperRefresh, setPopperRefresh] = useState(new Date().getTime());

package/dist/Editor/Elements/DataView/Layouts/DataTypes/Components/Select.js

@@ -153,11 +153,9 @@ export default function Select(props) {
         ...optionProps,
         children: /*#__PURE__*/_jsx(Chip, {
           label: option.label || option.value || "",
+          classes: classes.chipText,
           sx: {
-            background: option.color || appTheme?.palette?.editor?.tv_border1,
-            "& .MuiChip-label": {
-              paddingLeft: "12px !important"
-            }
+            background: option.color || appTheme?.palette?.editor?.tv_border1
           },
           avatar: /*#__PURE__*/_jsx(AvatarIcon, {
             option: option,
@@ -172,6 +170,7 @@ export default function Select(props) {
     fullWidth: true,
     renderInput: params => {
       return /*#__PURE__*/_jsx(TextField, {
+        fullWidth: true,
         size: "small",
         ...params,
         placeholder: placeholder

package/dist/Editor/Elements/DataView/Layouts/DataTypes/Components/styles.js

@@ -3,7 +3,7 @@ const useCompStyles = (theme, appTheme) => ({
     border: `1px solid ${appTheme?.palette?.editor?.tv_border}`,
     background: appTheme?.palette?.editor?.tv_pop_bg,
     color: appTheme?.palette?.editor?.tv_text,
-    fontSize: '14px',
+    fontSize: "14px",
     borderRadius: "8px",
     [theme?.breakpoints?.between("xs", "md")]: {},
     "& ul": {
@@ -63,6 +63,11 @@ const useCompStyles = (theme, appTheme) => ({
         }
       }
     }
+  },
+  chipText: {
+    "& .MuiChip-label": {
+      paddingLeft: "12px !important"
+    }
   }
 });
 export default useCompStyles;

package/dist/Editor/Elements/DataView/Layouts/DataTypes/DateType.js

@@ -1,6 +1,9 @@
 import React from "react";
 import DatePicker from "react-datepicker";
+import { Grid } from "@mui/material";
 import { useDataView } from "../../Providers/DataViewProvider";
+import useCommonStyle from "../../../../commonStyle";
+import { useEditorContext } from "../../../../hooks/useMouseMove";
 import { jsx as _jsx } from "react/jsx-runtime";
 function isValidDate(dateString) {
   const date = new Date(dateString);
@@ -16,20 +19,27 @@ const DateType = props => {
   const {
     onChange
   } = useDataView();
+  const {
+    theme
+  } = useEditorContext();
+  const classes = useCommonStyle(theme);
   const handleChange = date => {
     onChange(rowIndex, {
       [property]: date
     });
   };
-  return /*#__PURE__*/_jsx(DatePicker, {
-    disabled: readOnly,
-    selected: isValidDate(value) ? new Date(value) : "",
-    onChange: handleChange,
-    onKeyDown: e => {
-      e.preventDefault();
-      console.log(e?.target.value);
-    },
-    placeholderText: "MM/DD/YYYY"
+  return /*#__PURE__*/_jsx(Grid, {
+    sx: classes.datePicker,
+    children: /*#__PURE__*/_jsx(DatePicker, {
+      disabled: readOnly,
+      selected: isValidDate(value) ? new Date(value) : "",
+      onChange: handleChange,
+      onKeyDown: e => {
+        e.preventDefault();
+        console.log(e?.target.value);
+      },
+      placeholderText: "MM/DD/YYYY"
+    })
   });
 };
 export default DateType;

package/dist/Editor/Elements/DataView/Layouts/TableStyles.js

@@ -10,12 +10,16 @@ const useTableStyles = (theme, appTheme) => ({
     borderSpacing: 0,
     borderRadius: "7px 7px 0px 0px",
     overflow: "hidden",
+    width: "auto !important",
+    minWidth: "100%",
     border: `1px solid ${appTheme?.palette?.editor?.tv_border}`,
+    tableLayout: "fixed",
     "& thead": {
       background: appTheme?.palette?.editor?.tv_header,
       height: "40px"
     },
     "& th": {
+      position: "relative",
       "& svg": {
         "& .fillStroke": {
           stroke: appTheme?.palette?.editor?.tv_stroke
@@ -27,6 +31,8 @@ const useTableStyles = (theme, appTheme) => ({
     },
     "& td": {
       height: "40px",
+      maxWidth: "0px !important",
+      minWidth: "0px !important",
       "& input": {
         color: appTheme?.palette?.editor?.tv_text_primary,
         background: "transparent",
@@ -39,6 +45,11 @@ const useTableStyles = (theme, appTheme) => ({
     "& th, tr, td": {
       border: `1px solid ${appTheme?.palette?.editor?.tv_border}`
     },
+    "& th, & td": {
+      overflowX: "clip",
+      textOverflow: "ellipsis",
+      whiteSpace: "nowrap"
+    },
     "& .tv-act-btn": {
       color: appTheme?.palette?.editor?.tv_text,
       textTransform: "none",
@@ -85,13 +96,18 @@ const useTableStyles = (theme, appTheme) => ({
           paddingTop: "3px",
           paddingBottom: "3px",
           paddingLeft: "3px",
-          maxWidth: "250px",
+          // maxWidth: "250px",
           overflow: "hidden",
           position: "relative",
           "& .tv-ms-tag-wrpr": {
             display: "flex",
             flexWrap: "nowrap",
-            overflow: "auto"
+            overflow: "auto",
+            minWidth: "58px",
+            "& .MuiChip-deleteIcon": {
+              minWidth: "22px",
+              minHeight: "22px"
+            }
           },
           "&.Mui-disabled": {
             "& input": {
@@ -129,6 +145,20 @@ const useTableStyles = (theme, appTheme) => ({
         opacity: 1
       }
     }
+  },
+  cellResizer: {
+    position: "absolute",
+    cursor: "col-resize",
+    right: "0px",
+    top: 0,
+    width: "3px",
+    borderRadius: "0px",
+    zIndex: 1,
+    background: "transparent",
+    height: "100%",
+    "&:hover, &.active": {
+      background: "#2563EB"
+    }
   }
 });
 export default useTableStyles;

package/dist/Editor/Elements/DataView/Layouts/TableView.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { Box, Button, useTheme } from "@mui/material";
 import { useDataView } from "../Providers/DataViewProvider";
 import PropertySettings from "./Options";
@@ -7,37 +7,127 @@ import useTableStyles from "./TableStyles";
 import { GridSettingsIcon, GridAddSectionIcon } from "../../../common/iconslist";
 import { useEditorContext } from "../../../hooks/useMouseMove";
 import Icon from "../../../common/Icon";
+import useTableResize from "../../../utils/customHooks/useTableResize";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+const Resizer = ({
+  classes,
+  onMouseDown,
+  height,
+  resizing
+}) => {
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: /*#__PURE__*/_jsx(Box, {
+      component: "div",
+      className: `cell-resizer ${resizing ? "active" : ""}`,
+      contentEditable: false,
+      onPointerDown: onMouseDown,
+      sx: classes.cellResizer,
+      style: {
+        height: `${height}px`
+      }
+    })
+  });
+};
 const SortIcon = props => {
   const {
     sortBy
   } = props;
   return sortBy ? sortBy === "asc" ? /*#__PURE__*/_jsx(Box, {
     sx: {
-      '& svg': {
-        '& path': {
+      "& svg": {
+        "& path": {
           stroke: "rgba(37, 99, 235, 1) !important"
         }
       }
     },
     children: /*#__PURE__*/_jsx(Icon, {
-      icon: 'chervUp'
+      icon: "chervUp"
     })
   }) : /*#__PURE__*/_jsx(Box, {
     sx: {
-      '& svg': {
-        '& path': {
+      "& svg": {
+        "& path": {
           stroke: "rgba(37, 99, 235, 1) !important"
         }
       }
     },
     children: /*#__PURE__*/_jsx(Icon, {
-      icon: 'chervDown'
+      icon: "chervDown"
     })
   }) : null;
 };
+const THead = props => {
+  const thRef = useRef(null);
+  const [headerTextWidth, setHeaderTextWidth] = useState(200);
+  const {
+    iconType,
+    isSort,
+    classes,
+    onEditProperty,
+    m,
+    tableRef,
+    handleResize
+  } = props;
+  // do not remove extra coma it will lead to swap of variable
+  const [size, onMouseDown, resizing,, isDone] = useTableResize({
+    parentDOM: thRef?.current,
+    size: m?.size,
+    minMaxProps: {
+      minWidth: 30
+    }
+  });
+  const finalWidth = size?.width < headerTextWidth ? headerTextWidth : size?.width || 200;
+  useEffect(() => {
+    if (thRef?.current) {
+      const tw = (thRef?.current?.querySelectorAll(".dht-text")[0]?.getBoundingClientRect()?.width || 0) + 16 + 30;
+      setHeaderTextWidth(tw);
+    }
+  }, [thRef?.current, m?.label]);
+  useEffect(() => {
+    if (isDone) {
+      handleResize({
+        ...m,
+        size: size
+      });
+    }
+  }, [isDone]);
+  return /*#__PURE__*/_jsxs("th", {
+    style: {
+      minWidth: finalWidth,
+      maxWidth: finalWidth,
+      width: finalWidth
+    },
+    ref: thRef,
+    children: [/*#__PURE__*/_jsx(Box, {
+      sx: {
+        maxWidth: "100%",
+        overflow: "hidden"
+      },
+      children: /*#__PURE__*/_jsx(Button, {
+        className: "tv-act-btn la",
+        startIcon: /*#__PURE__*/_jsx(Icon, {
+          icon: iconType
+        }),
+        endIcon: /*#__PURE__*/_jsx(SortIcon, {
+          sortBy: isSort
+        }),
+        fullWidth: true,
+        onClick: onEditProperty(m),
+        children: /*#__PURE__*/_jsx("span", {
+          className: "dht-text",
+          children: m.label
+        })
+      })
+    }), /*#__PURE__*/_jsx(Resizer, {
+      classes: classes,
+      onMouseDown: onMouseDown,
+      height: tableRef?.current?.getBoundingClientRect()?.height,
+      resizing: resizing
+    })]
+  });
+};
 const TableView = props => {
   const {
     theme: appTheme
@@ -48,6 +138,7 @@ const TableView = props => {
   } = props;
   const theme = useTheme();
   const classes = useTableStyles(theme, appTheme);
+  const tableRef = useRef(null);
   const {
     properties,
     onAddProperty,
@@ -164,6 +255,9 @@ const TableView = props => {
     setMode({});
     setAnchorEl(null);
   };
+  const handleResize = data => {
+    onUpdateProperty(data);
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(Box, {
       component: "div",
@@ -173,6 +267,7 @@ const TableView = props => {
       children: /*#__PURE__*/_jsxs(Box, {
         component: "table",
         sx: classes.table,
+        ref: tableRef,
         children: [/*#__PURE__*/_jsx("thead", {
           children: /*#__PURE__*/_jsxs("tr", {
             children: [shownProperties?.map((m, i) => {
@@ -180,26 +275,23 @@ const TableView = props => {
                 Icon: iconType
               } = PROPERTY_TYPES?.find(f => f.type === m.type) || {};
               const isSort = sortBy?.key === m.key ? sortBy?.operator : null;
-              return /*#__PURE__*/_jsx("th", {
-                style: {
-                  minWidth: "200px"
-                },
-                children: /*#__PURE__*/_jsx(Button, {
-                  className: "tv-act-btn la",
-                  startIcon: /*#__PURE__*/_jsx(Icon, {
-                    icon: iconType
-                  }),
-                  endIcon: /*#__PURE__*/_jsx(SortIcon, {
-                    sortBy: isSort
-                  }),
-                  fullWidth: true,
-                  onClick: onEditProperty(m),
-                  children: m.label
-                })
+              return /*#__PURE__*/_jsx(THead, {
+                iconType: iconType,
+                isSort: isSort,
+                onEditProperty: onEditProperty,
+                m: m,
+                classes: classes,
+                tableRef: tableRef,
+                handleResize: handleResize
               }, i);
             }), !readOnly ? /*#__PURE__*/_jsxs(_Fragment, {
               children: [/*#__PURE__*/_jsx("th", {
                 className: "tv-act-btn ico",
+                style: {
+                  maxWidth: "80px",
+                  minWidth: "80px",
+                  width: "auto"
+                },
                 children: /*#__PURE__*/_jsx(Button, {
                   onClick: onAddClick,
                   fullWidth: true,
@@ -207,6 +299,11 @@ const TableView = props => {
                 })
               }), /*#__PURE__*/_jsx("th", {
                 className: "tv-act-btn ico",
+                style: {
+                  maxWidth: "80px",
+                  minWidth: "80px",
+                  width: "auto"
+                },
                 children: /*#__PURE__*/_jsx(Button, {
                   onClick: onSettings,
                   fullWidth: true,
@@ -226,18 +323,18 @@ const TableView = props => {
         textTransform: "none",
         justifyContent: "start",
         color: appTheme?.palette?.editor?.activeColor,
-        '& svg': {
-          width: '18px',
-          height: '18px',
+        "& svg": {
+          width: "18px",
+          height: "18px",
           strokeWidth: 1.2,
-          '& path': {
+          "& path": {
             stroke: appTheme?.palette?.editor?.activeColor
           }
         },
-        fontFamily: 'inter'
+        fontFamily: "inter"
       },
       startIcon: /*#__PURE__*/_jsx(Icon, {
-        icon: 'addRounded'
+        icon: "addRounded"
       }),
       children: "Add new row"
     }) : null, open && !readOnly ? /*#__PURE__*/_jsx(PropertySettings, {

package/dist/Editor/Elements/DataView/Layouts/ViewData.js

@@ -58,17 +58,17 @@ const ViewData = props => {
       }
     },
     children: [rows?.map((row, i) => {
-      return /*#__PURE__*/_jsx(Box, {
+      return /*#__PURE__*/_jsxs(Box, {
         component: "tr",
         className: "tv-act-row",
-        children: /*#__PURE__*/_jsx(RenderRow, {
+        children: [/*#__PURE__*/_jsx(RenderRow, {
           rowIndex: row?.id,
           row: row,
           properties: properties,
           onSelect: onSelect,
           selected: selectedRows?.includes(row?.id),
           readOnly: readOnly
-        })
+        }), /*#__PURE__*/_jsx("td", {}), /*#__PURE__*/_jsx("td", {})]
       }, i);
     }), /*#__PURE__*/_jsx("tr", {
       style: {

package/dist/Editor/Elements/DataView/Providers/DataViewProvider.js

@@ -1,5 +1,5 @@
 import React, { createContext, useContext, useEffect, useState } from "react";
-import { Editor, Transforms, Node } from "slate";
+import { Transforms, Node } from "slate";
 import { PROPERTY_DEFAULTS } from "../Layouts/Options/Constants";
 import multiSortRows from "../Utils/multiSortRows";
 import globalSearch from "../Utils/globalSearch";