@flozy/editor 3.6.2 → 3.6.3

package/dist/Editor/Elements/AppHeader/AppHeader.js

@@ -146,19 +146,21 @@ function AppHeader(props) {
         src: appLogo
       }) : appTitle
     }), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsx(List, {
-      children: menus.map((item, i) => /*#__PURE__*/_jsx(ListItem, {
-        disablePadding: true,
-        children: /*#__PURE__*/_jsx(ListItemButton, {
-          component: "a",
-          href: item.url,
-          sx: {
-            textAlign: "center"
-          },
-          children: /*#__PURE__*/_jsx(ListItemText, {
-            primary: item.text
+      children: menus.map((item, i) => {
+        const buttonProps = handleLinkType(item.url, item.linkType, true, item.target === "_blank");
+        return /*#__PURE__*/_jsx(ListItem, {
+          disablePadding: true,
+          children: /*#__PURE__*/_jsx(ListItemButton, {
+            ...buttonProps,
+            sx: {
+              textAlign: "center"
+            },
+            children: /*#__PURE__*/_jsx(ListItemText, {
+              primary: item.text
+            })
           })
-        })
-      }, `${item.text}_${i}`))
+        }, `${item.text}_${i}`);
+      })
     })]
   });
   const container = window !== undefined ? () => window().document.body : undefined;

package/dist/Editor/common/LinkSettings/NavComponents.js

@@ -1,8 +1,24 @@
 import { Autocomplete, Checkbox, FormControlLabel, MenuItem, Select, TextField, Typography, createFilterOptions } from "@mui/material";
 import { useEffect, useMemo, useState } from "react";
+import { useSlate } from "slate-react";
 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 sectionTypes = ["grid"];
+const loopChildren = (children = [], sections) => {
+  if (!children?.length) {
+    return sections;
+  }
+  for (let child of children) {
+    if (sectionTypes.includes(child?.type)) {
+      if (child.id) {
+        sections.push(child.id);
+      }
+    }
+    sections = loopChildren(child.children, sections);
+  }
+  return sections;
+};
 const OpenInNewTab = props => {
   const {
     nav,
@@ -42,21 +58,35 @@ export const SelectPage = props => {
     services
   } = props;
   const [pages, setPages] = useState([]);
+  const editor = useSlate();
   const getPages = async () => {
     const result = await services("getPages", {});
-    const refactor = result?.data?.map(r => {
-      const {
-        title,
-        url_name,
-        ...rest
-      } = r;
-      return {
-        label: url_name,
-        value: url_name,
-        ...rest
+    if (result?.data?.length) {
+      const refactor = result?.data?.map(r => {
+        const {
+          title,
+          url_name,
+          ...rest
+        } = r;
+        return {
+          label: url_name,
+          value: url_name,
+          ...rest
+        };
+      });
+      setPages(refactor);
+    } else {
+      const currentPage = {
+        label: "Current Page",
+        value: "_currentPage",
+        is_current_page: 1,
+        sections: loopChildren(editor.children, [])
       };
-    });
-    setPages(refactor);
+      setPages([currentPage]);
+      if (!value) {
+        onChange(currentPage.value);
+      }
+    }
   };
   useEffect(() => {
     getPages();
@@ -76,12 +106,14 @@ export const SelectPage = props => {
     }
     return [];
   }, [value, pages]);
+  const isCurrentPage = page?.value === "_currentPage";
   return /*#__PURE__*/_jsxs("div", {
     children: [/*#__PURE__*/_jsx(FreeSoloCreateOption, {
       label: page?.label,
-      setValue: val => onChange(val?.value),
+      setValue: val => onChange(val?.value || ""),
       placeholder: "Select Page",
-      options: pages
+      options: pages,
+      disabled: isCurrentPage
     }), /*#__PURE__*/_jsx(FreeSoloCreateOption, {
       label: section?.label,
       setValue: val => {
@@ -96,7 +128,7 @@ export const SelectPage = props => {
         label: p,
         value: p
       }))
-    }), /*#__PURE__*/_jsx(OpenInNewTab, {
+    }), isCurrentPage ? null : /*#__PURE__*/_jsx(OpenInNewTab, {
       ...props
     })]
   });
@@ -149,7 +181,8 @@ export function FreeSoloCreateOption({
   label,
   setValue,
   options = [],
-  placeholder = ""
+  placeholder = "",
+  disabled = false
 }) {
   return /*#__PURE__*/_jsx(Autocomplete, {
     freeSolo: true,
@@ -164,7 +197,7 @@ export function FreeSoloCreateOption({
       children: option.label
     }),
     onChange: (event, newValue) => {
-      if (typeof newValue === 'string') {
+      if (typeof newValue === "string") {
         setValue({
           value: newValue
         });
@@ -189,7 +222,7 @@ export function FreeSoloCreateOption({
       } = params;
       // Suggest the creation of a new value
       const isExisting = options.some(option => inputValue === option.label);
-      if (inputValue !== '' && !isExisting) {
+      if (inputValue !== "" && !isExisting) {
         filtered.push({
           inputValue,
           label: `Add "${inputValue}"`
@@ -202,7 +235,7 @@ export function FreeSoloCreateOption({
     handleHomeEndKeys: true,
     getOptionLabel: option => {
       // Value selected with enter, right from the input
-      if (typeof option === 'string') {
+      if (typeof option === "string") {
         return option;
       }
       // Add "xxx" option created dynamically
@@ -214,6 +247,7 @@ export function FreeSoloCreateOption({
     },
     sx: {
       marginTop: "10px"
-    }
+    },
+    disabled: disabled
   });
 }

package/dist/Editor/utils/helper.js

@@ -208,7 +208,13 @@ export const hasVerticalScrollbar = (element = {}) => {
   return element.scrollHeight > element.clientHeight;
 };
 const isHomePage = page => {
-  return page === "home" || page === "iframe.html" || !page;
+  return page === "home" || page === "iframe.html" || page === "_currentPage" || !page;
+};
+const getScrollElement = () => {
+  const slateWrapper = document.getElementById("slate-wrapper-scroll-container");
+  const isSlateWrapperScroll = hasVerticalScrollbar(slateWrapper);
+  const scrollFrom = isSlateWrapperScroll ? slateWrapper : window;
+  return scrollFrom;
 };
 export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick = () => {}) => {
   const props = {};
@@ -239,16 +245,33 @@ export const handleLinkType = (url, linkType, readOnly, openInNewTab, onClick =
       }
       break;
     case "page":
-      props.component = "a";
-      const [page, section] = url?.split("#") || [];
+      const [page = "", section] = url?.split("#") || [];
       const sec = section ? `#${section}` : "";
-      const currentUserPage = getCurrentUserPage();
-      props.href = isCurrentPage(page) ? `./${currentUserPage}${sec}` : `./${url}`;
-      if (openInNewTab) {
-        if (isCurrentPage(page)) {
-          // temp fix, if user is presented in current page, open in new tab option is restricted, we will scroll to the element in current page
-        } else {
-          props.target = "_blank";
+      if (page === "_currentPage") {
+        props.component = "button";
+        props.onClick = () => {
+          const scrollFrom = getScrollElement();
+          if (sec) {
+            const element = document.getElementById(section);
+            if (element) {
+              const topPosition = element.getBoundingClientRect().top + scrollFrom.scrollTop;
+              scrollFrom.scrollTo({
+                top: topPosition,
+                behavior: "smooth"
+              });
+            }
+          }
+        };
+      } else {
+        props.component = "a";
+        const currentUserPage = getCurrentUserPage();
+        props.href = isCurrentPage(page) ? `./${currentUserPage}${sec}` : `./${url}`;
+        if (openInNewTab) {
+          if (isCurrentPage(page)) {
+            // temp fix, if user is presented in current page, open in new tab option is restricted, we will scroll to the element in current page
+          } else {
+            props.target = "_blank";
+          }
         }
       }
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flozy/editor",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "An Editor for flozy app brain",
   "files": [
     "dist"