@flozy/editor 10.8.9 → 10.9.0

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

@@ -1,13 +1,14 @@
 import React, { useState } from "react";
 import { ReactEditor } from "slate-react";
-import ColorPickerTool from "react-gcolor-picker";
-import { IconButton, Tooltip, Box, Popover } from "@mui/material";
+import { IconButton, Tooltip, Box, Popover, useTheme } from "@mui/material";
 import { addMarkData, activeMark } from "../../utils/SlateUtilityFunctions";
 import ColorButtons from "./ColorButtons";
 import ColorPickerStyles from "./Styles";
 import colorWheel from "./colorWheel.png";
 import "./ColorPicker.css";
 import { useEditorContext } from "../../hooks/useMouseMove";
+import CustomColorPicker from "../../common/CustomColorPicker";
+import { getSelectedElementColor } from "../../utils/helper";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -25,7 +26,8 @@ const ColorPicker = props => {
     classes,
     forMiniTool,
     openColorTool,
-    closeColorTool
+    closeColorTool,
+    type
   } = props;
   const {
     theme
@@ -34,6 +36,7 @@ const ColorPicker = props => {
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
   const pickerStyles = ColorPickerStyles(theme);
+  const muiTheme = useTheme();
   const onOpen = e => {
     e.preventDefault();
     setAnchorEl(e.currentTarget);
@@ -58,7 +61,7 @@ const ColorPicker = props => {
     setAnchorEl(null);
     setSelection(null);
   };
-  const activeColor = activeMark(editor, format) || DEFAULT_COLOR[format];
+  const activeColor = type === "textColor" ? getSelectedElementColor(editor, format, muiTheme) : activeMark(editor, format) || DEFAULT_COLOR[format];
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [forMiniTool ? null : /*#__PURE__*/_jsx(Tooltip, {
       title: title,
@@ -96,10 +99,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

@@ -20,24 +20,26 @@ const ColorPickerStyles = theme => ({
       background: `${theme?.palette?.editor?.miniToolBarBackground}`,
       border: `1px solid ${theme?.palette?.editor?.miniToolBarBorder} !important`,
       borderRadius: "7px !important",
-      padding: "0px 5px",
-      '@media only screen and (max-width: 600px)': {
+      padding: "0px 10px",
+      "@media only screen and (max-width: 600px)": {
         marginTop: "-40px"
       }
     }
   },
   colorButtonSingle: {
+    border: "1.5px solid #DCE4EC !important",
     "&.active": {
-      "&:before": {
-        content: '" "',
-        position: "absolute",
-        top: "-4px",
-        left: "-4px",
-        width: "calc(100% + 8px)",
-        height: "calc(100% + 8px)",
-        border: "2px solid #2563EB",
-        borderRadius: "50%"
-      }
+      // "&:before": {
+      //   content: '" "',
+      //   position: "absolute",
+      //   top: "-4px",
+      //   left: "-4px",
+      //   width: "calc(100% + 8px)",
+      //   height: "calc(100% + 8px)",
+      //   border: "2px solid #2563EB",
+      //   borderRadius: "50%",
+      // },
+      outline: "2px solid #2563EB"
     }
   },
   colorButtonsInner: {
@@ -59,7 +61,7 @@ const ColorPickerStyles = theme => ({
       width: "24px",
       height: "24px",
       margin: "0px 4px",
-      border: "unset"
+      border: "1.5px solid #DCE4EC"
     }
   },
   colorPickerIcon: {

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

@@ -6,6 +6,7 @@ import { useEditorContext } from "../../../../../hooks/useMouseMove";
 import useCompStyles from "./styles";
 import { CloseIcon } from "../../../../../common/iconslist";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const AvatarIcon = props => {
   const {
     option,
@@ -41,7 +42,8 @@ export default function Select(props) {
     placeholder = "",
     disabled = false,
     optionAvatar = false,
-    className = ""
+    className = "",
+    wrapColumn = false
   } = props;
   const value = Array.isArray(pValue) ? pValue : [];
   const options = selectOptions?.length ? selectOptions.filter(s => s.value) : [];
@@ -57,7 +59,8 @@ export default function Select(props) {
       newValue?.forEach(m => {
         if (multiple) {
           fv.push({
-            value: m.inputValue || m.value
+            value: m.inputValue || m.value,
+            ...m
           });
         } else {
           fv[0] = {
@@ -100,51 +103,51 @@ export default function Select(props) {
       }
       // Regular option
       return option.value || "";
-    },
-    renderTags: (value, getTagProps) => {
-      return /*#__PURE__*/_jsx(Box, {
-        className: `tv-ms-tag-wrpr ${className}`,
-        sx: {
-          "& svg": {
-            marginRight: "5px",
-            "& path": {
-              stroke: "#000"
-            }
-          }
-        },
-        children: value?.map((option, index) => {
-          const {
-            key,
-            ...tagProps
-          } = getTagProps({
-            index
-          }) || {};
-          return option?.value ? /*#__PURE__*/_jsx(Chip, {
-            variant: "outlined",
-            label: option?.label || option?.value,
-            ...tagProps,
-            sx: {
-              background: option?.color || appTheme?.palette?.editor?.tv_border1,
-              border: "none",
-              "& .MuiChip-label": {
-                paddingLeft: "12px !important",
-                paddingRight: disabled ? "12px !important" : ""
-              }
-            },
-            avatar: /*#__PURE__*/_jsx(AvatarIcon, {
-              option: option,
-              avatar: optionAvatar
-            }),
-            deleteIcon: /*#__PURE__*/_jsx(CloseIcon, {
-              style: {
-                cursor: "pointer",
-                display: disabled ? "none" : ""
-              }
-            })
-          }, key) : null;
-        })
-      });
-    },
+    }
+    // renderTags={(value, getTagProps) => {
+    //   return (
+    //     <Box
+    //       className={`tv-ms-tag-wrpr ${className}`}
+    //       sx={{
+    //         "& svg": { marginRight: "5px", "& path": { stroke: "#000" } },
+    //         flexWrap: wrapColumn ? "wrap" : "nowrap",
+    //         overflowX: wrapColumn ? "hidden" : "auto",
+    //       }}
+    //     >
+    //       {value?.map((option, index) => {
+    //         const { key, ...tagProps } = getTagProps({ index }) || {};
+    //         return option?.value ? (
+    //           <Chip
+    //             variant="outlined"
+    //             label={option?.label || option?.value}
+    //             key={key}
+    //             {...tagProps}
+    //             sx={{
+    //               background:
+    //                 option?.color || appTheme?.palette?.editor?.tv_border1,
+    //               border: "none",
+    //               "& .MuiChip-label": {
+    //                 paddingLeft: "12px !important",
+    //                 paddingRight: disabled ? "12px !important" : "",
+    //               },
+    //             }}
+    //             avatar={<AvatarIcon option={option} avatar={optionAvatar} />}
+    //             deleteIcon={
+    //               <CloseIcon
+    //                 style={{
+    //                   cursor: "pointer",
+    //                   display: disabled ? "none" : "",
+    //                 }}
+    //               />
+    //             }
+    //           />
+    //         ) : null;
+    //       })}
+    //     </Box>
+    //   );
+    // }}
+    ,
+    renderTags: () => null,
     renderOption: (props, option) => {
       const {
         key,
@@ -161,20 +164,96 @@ export default function Select(props) {
           avatar: /*#__PURE__*/_jsx(AvatarIcon, {
             option: option,
             avatar: optionAvatar
-          }),
-          deleteIcon: /*#__PURE__*/_jsx(CloseIcon, {})
+          })
+          // deleteIcon={<CloseIcon />}
         })
       }, key);
     },
     freeSolo: true,
     size: "small",
-    fullWidth: true,
+    fullWidth: true
+    // renderInput={(params) => {
+    //   return (
+    //     <TextField
+    //       fullWidth
+    //       size="small"
+    //       {...params}
+    //       placeholder={placeholder}
+    //     />
+    //   );
+    // }}
+    ,
     renderInput: params => {
-      return /*#__PURE__*/_jsx(TextField, {
-        fullWidth: true,
-        size: "small",
-        ...params,
-        placeholder: placeholder
+      const {
+        InputProps,
+        ...rest
+      } = params;
+      return /*#__PURE__*/_jsxs(Box, {
+        className: `tv-ms-tag-wrpr ${className}`,
+        sx: {
+          display: "flex",
+          flexWrap: wrapColumn ? "wrap" : "nowrap",
+          alignItems: "center",
+          minHeight: "40px",
+          padding: "2px",
+          gap: "4px",
+          overflowX: 'auto',
+          "& .MuiChip-root": {
+            margin: "2px"
+          }
+        },
+        children: [value?.map((option, index) => /*#__PURE__*/_jsx(Chip, {
+          variant: "outlined",
+          label: option?.label || option?.value,
+          sx: {
+            background: option?.color || appTheme?.palette?.editor?.tv_border1,
+            maxWidth: '150px',
+            border: "none",
+            "& .MuiChip-label": {
+              // paddingLeft: "12px !important",
+              // paddingRight: disabled ? "12px !important" : "",
+              maxWidth: '100px'
+            },
+            "& .MuiChip-deleteIcon": {
+              '& path': {
+                stroke: '#0F172A'
+              }
+            }
+          },
+          avatar: /*#__PURE__*/_jsx(AvatarIcon, {
+            option: option,
+            avatar: optionAvatar
+          }),
+          onDelete: !disabled ? () => {
+            const newValue = [...value];
+            newValue.splice(index, 1);
+            onChange(newValue);
+          } : undefined,
+          deleteIcon: /*#__PURE__*/_jsx(CloseIcon, {
+            style: {
+              cursor: "pointer",
+              display: disabled ? "none" : ""
+            }
+          }),
+          ...InputProps?.startAdornment?.[index]?.props
+        }, index)), /*#__PURE__*/_jsx(TextField, {
+          ...rest,
+          InputProps: {
+            ...InputProps,
+            disableUnderline: true,
+            sx: {
+              minWidth: 120,
+              flexGrow: 1,
+              input: {
+                padding: "4px 8px"
+              }
+            }
+          },
+          size: "small",
+          placeholder: placeholder,
+          disabled: disabled,
+          variant: "standard"
+        })]
       });
     },
     slotProps: {

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

@@ -40,7 +40,8 @@ const SelectV1 = props => {
     wrapColumn = false,
     onChange,
     onUpdate,
-    translation
+    translation,
+    disabled
   } = props;
   const [anchorEl, setAnchorEl] = useState(null);
   const [anchorElOption, setAnchorElOption] = useState(null);
@@ -217,15 +218,13 @@ const SelectV1 = props => {
         overflowX: wrapColumn ? "hidden" : "auto",
         gap: 0.5,
         padding: "8px",
-        cursor: "pointer"
+        cursor: disabled ? "auto" : "pointer"
       },
-      onClick: handleOpenPopover,
+      onClick: disabled ? undefined : handleOpenPopover,
       children: resolvedSelectedOptions?.map((option, index) => /*#__PURE__*/_jsx(Chip, {
         label: option?.value,
-        onDelete: event => {
-          handleDeleteChip(event, option);
-        },
-        deleteIcon: /*#__PURE__*/_jsx(CloseIcon, {}),
+        onDelete: !disabled ? event => handleDeleteChip(event, option) : undefined,
+        deleteIcon: !disabled ? /*#__PURE__*/_jsx(CloseIcon, {}) : undefined,
         variant: "filled",
         sx: {
           backgroundColor: option?.color,
@@ -237,7 +236,7 @@ const SelectV1 = props => {
             }
           },
           "&:hover": {
-            opacity: 0.8
+            opacity: disabled ? 1 : 0.8
           }
         }
       }, index))

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

@@ -7,8 +7,12 @@ const PersonType = props => {
     rowIndex,
     property,
     value,
-    readOnly
+    readOnly,
+    settings
   } = props;
+  const {
+    wrapColumn
+  } = settings;
   const {
     onChange,
     users
@@ -22,9 +26,10 @@ const PersonType = props => {
     value: value || [],
     onChange: handleChange,
     options: users || [],
-    multiple: false,
+    multiple: true,
     disabled: readOnly,
-    optionAvatar: true
+    optionAvatar: true,
+    wrapColumn: wrapColumn
   });
 };
 export default PersonType;

package/dist/Editor/Elements/DataView/Layouts/Options/EditProperty.js

@@ -7,7 +7,7 @@ import Icon from "../../../../common/Icon";
 import CloseIcon from "@mui/icons-material/Close";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const NEED_WRAPS = ["text", "multi-select"];
+const NEED_WRAPS = ["text", "multi-select", "person"];
 const EditProperty = props => {
   const {
     classes,

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

@@ -101,7 +101,7 @@ const useTableStyles = (theme, appTheme) => ({
           position: "relative",
           "& .tv-ms-tag-wrpr": {
             display: "flex",
-            flexWrap: "nowrap",
+            // flexWrap: "nowrap",
             overflow: "auto",
             minWidth: "58px",
             "& .MuiChip-deleteIcon": {

package/dist/Editor/Elements/Embed/Embed.js

@@ -1,5 +1,4 @@
-import React, { useState } from "react";
-import { Transforms } from "slate";
+import React, { useRef, useState } from "react";
 import { ReactEditor } from "slate-react";
 import Icon from "../../common/Icon";
 import { isBlockActive } from "../../utils/SlateUtilityFunctions";
@@ -22,55 +21,45 @@ const Embed = ({
   customProps,
   icoBtnType
 }) => {
-  const [open, setOpen] = useState(false);
-  const [formData, setFormData] = useState({
-    url: "",
-    alt: "",
-    images: []
-  });
+  const [openSetttings, setUploadPopupOpen] = useState(false);
   const [selection, setSelection] = useState();
   const {
     translation
   } = customProps;
-  const handleFormSubmit = fd => {
-    if (fd?.url || fd?.images.length > 0) {
-      selection && Transforms.select(editor, selection);
-      selection && ReactEditor.focus(editor);
-      insertEmbed(editor, {
-        ...fd
-      }, format);
-      setFormData({
-        url: "",
-        alt: ""
-      });
-    }
-    handleClose();
-  };
+  const [uploadStatus, setUploadStatus] = useState({
+    isUploading: false,
+    uploadPercentage: 0,
+    fileName: null,
+    fileSize: null
+  });
+  const xhrRef = useRef(null);
   const onToggle = e => {
     e.preventDefault();
     setSelection(editor.selection);
     selection && ReactEditor.focus(editor);
-    setOpen(true);
+    setUploadPopupOpen(true);
   };
   const handleClose = () => {
-    setOpen(false);
+    setUploadPopupOpen(false);
   };
-  const onSelectImage = img => {
-    const fd = {
-      ...formData,
-      url: img
-    };
-    setFormData(fd);
-    let extProps = {};
-    if (format === "video") {
-      extProps = {
-        aspectRatio: "16 / 9"
-      };
+  const onSelectImage = async img => {
+    if (img?.isUpload === false) {
+      insertEmbed(editor, {
+        url: img.embedURL,
+        isUploading: false,
+        isUpload: false
+      }, format);
+    } else {
+      insertEmbed(editor, {
+        url: "",
+        file: img.file,
+        isUploading: true,
+        isUpload: true,
+        fileName: img.file?.name,
+        fileSize: img.file?.size,
+        mimeType: img.file?.type
+      }, format);
     }
-    handleFormSubmit({
-      ...fd,
-      ...extProps
-    });
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(ToolbarIcon, {
@@ -82,13 +71,17 @@ const Embed = ({
       }),
       icoBtnType: icoBtnType
     }), /*#__PURE__*/_jsx(ImageSelector, {
-      open: open,
+      open: openSetttings,
       onClose: handleClose,
       customProps: customProps,
       onSelectImage: onSelectImage,
-      title: EMBED_LABEL[lbT || format]
+      title: EMBED_LABEL[lbT || format],
+      setUploadStatus: setUploadStatus,
+      uploadStatus: uploadStatus,
+      xhrRef: xhrRef,
+      setUploadPopupOpen: setUploadPopupOpen,
+      fromEmbed: true
     })]
   });
 };
-export default Embed;
-// export default styled(commonStyle)(Embed);
+export default Embed;