@blocklet/discuss-kit-ux 1.6.160 → 1.6.162

package/dist/components/button-group/button-group.d.ts

@@ -6,11 +6,11 @@ interface ButtonItem {
 interface Props {
     data: ButtonItem[];
     theme: string;
-    selected: string[];
     urlName: string;
     defaultButton: ButtonItem;
     onSelectTab: (selectTab: string[]) => void;
     type: string;
+    urlParams: boolean;
 }
-export default function ButtonGroup({ data, theme, selected, urlName, defaultButton, onSelectTab, type, ...rest }: Props): import("react/jsx-runtime").JSX.Element;
+export default function ButtonGroup({ data, theme, urlName, defaultButton, urlParams, onSelectTab, type, ...rest }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/{editor-DQIO9RKL.mjs → editor-zkz1ucq8.mjs}

@@ -4,7 +4,7 @@ import { OnContentChangePlugin } from "@blocklet/editor/lib/ext/OnContentChangeP
 import { CtrlsShortcutPlugin } from "@blocklet/editor/lib/ext/ShortcutPlugin";
 import { SafeAreaPlugin } from "@blocklet/editor/lib/ext/SafeAreaPlugin";
 import { lazy } from "react";
-import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-bzFgbBTK.mjs";
+import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-G56xwIdk.mjs";
 import "@blocklet/labels";
 import "@mui/material/styles";
 import "@mui/material/Box";

package/dist/{index-bzFgbBTK.mjs → index-G56xwIdk.mjs}

@@ -30,7 +30,7 @@ import DidAvatar from "@arcblock/did-connect/lib/Avatar";
 import useMediaQuery$1 from "@mui/material/useMediaQuery";
 import DID from "@arcblock/ux/lib/DID";
 import Tooltip, { tooltipClasses } from "@mui/material/Tooltip";
-import { useNavigate, Link, useLocation, useSearchParams, unstable_useBlocker } from "react-router-dom";
+import { useNavigate, Link, useLocation, useSearchParams, unstable_useBlocker, useParams } from "react-router-dom";
 import UxRelativeTime from "@arcblock/ux/lib/RelativeTime";
 import Chip from "@mui/material/Chip";
 import Stack from "@mui/material/Stack";
@@ -4563,7 +4563,7 @@ function Pagination({ page, size = 20, total, onChange, routerMode = true, ...re
     }
   );
 }
-const Editor = lazy(() => import("./editor-DQIO9RKL.mjs"));
+const Editor = lazy(() => import("./editor-zkz1ucq8.mjs"));
 function LazyEditor(props) {
   const fallback = /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(Skeleton, {}),
@@ -10425,25 +10425,31 @@ function PointUpProvider({ children }) {
 function ButtonGroup({
   data,
   theme = "dark",
-  selected,
   urlName,
   defaultButton,
+  urlParams = true,
   onSelectTab,
   type,
   ...rest
 }) {
   const downSm = useMediaQuery$1((mainTheme) => mainTheme.breakpoints.down("sm"));
+  const navigate = useNavigate();
   const [searchParams, setSearchParams] = useSearchParams();
+  const { boardId } = useParams();
   const selectedString = searchParams.get(urlName);
-  const dataWithDefault = defaultButton ? [defaultButton, ...data] : data;
-  const selectedArray = selectedString !== null && selectedString !== "" ? selectedString.split(",") : dataWithDefault.map((item) => item.id);
-  const [selectTab, setSelectTab] = useState(selectedArray);
+  const dataWithDefault = defaultButton && (data == null ? void 0 : data.length) > 0 ? [defaultButton, ...data] : data;
+  const selectedArray = selectedString !== null && selectedString !== "" ? selectedString.split(",") : dataWithDefault == null ? void 0 : dataWithDefault.map((item) => item.id);
+  const [selectTab, setSelectTab] = useState(urlParams ? selectedArray : [boardId]);
   const [selectAll, setSelectAll] = useState(false);
   const updateUrl = (url, newSelectTab) => {
-    setSearchParams({
-      ...searchParams,
-      [url]: newSelectTab.join(",")
-    });
+    if (urlParams) {
+      setSearchParams({
+        ...searchParams,
+        [url]: newSelectTab.join(",")
+      });
+    } else {
+      navigate(`/${type}/boards/${newSelectTab.join(",")}`);
+    }
   };
   const handleClick = (item) => {
     setSelectTab([item.id]);
@@ -10454,26 +10460,42 @@ function ButtonGroup({
       const newSelectAll = !prevSelectAll;
       const newSelectTab = newSelectAll ? dataWithDefault == null ? void 0 : dataWithDefault.map((item) => item.id) : [];
       setSelectTab(newSelectTab);
-      updateUrl(urlName, newSelectTab);
+      updateUrl(urlName, [""]);
       return newSelectAll;
     });
   };
   useEffect(() => {
     if (JSON.stringify(selectedArray) !== JSON.stringify(selectTab)) {
-      setSelectTab((selectedArray == null ? void 0 : selectedArray.length) > 0 ? selectedArray : []);
+      if (urlParams) {
+        setSelectTab(selectedArray || []);
+      } else if (boardId) {
+        if ((data == null ? void 0 : data.find((item) => item.id === boardId)) || boardId === "default") {
+          setSelectTab([boardId]);
+        } else {
+          navigate(`/${type}/`);
+        }
+      } else {
+        setSelectTab(dataWithDefault == null ? void 0 : dataWithDefault.map((item) => item.id));
+      }
     }
-  }, [data]);
+  }, [data, boardId]);
   useEffect(() => {
-    if (selectedString === null || selectedString === "") {
-      setSelectAll(true);
-    } else if ((selectTab == null ? void 0 : selectTab.length) === (dataWithDefault == null ? void 0 : dataWithDefault.length)) {
-      setSelectAll(true);
-    } else {
+    if (urlParams) {
+      if (selectedString === null || selectedString === "") {
+        setSelectAll(true);
+      } else if ((selectTab == null ? void 0 : selectTab.length) === (dataWithDefault == null ? void 0 : dataWithDefault.length)) {
+        setSelectAll(true);
+      } else {
+        setSelectAll(false);
+      }
+    } else if (boardId) {
       setSelectAll(false);
+    } else {
+      setSelectAll(true);
     }
     if (onSelectTab)
       onSelectTab(selectTab);
-  }, [selectTab, selectedArray]);
+  }, [selectTab, selectedArray, boardId]);
   return /* @__PURE__ */ jsxs(Box$1, { className: Group, children: [
     /* @__PURE__ */ jsxs(
       Box$1,
@@ -10486,7 +10508,8 @@ function ButtonGroup({
           borderTopRightRadius: downSm ? 0 : "99999px",
           borderBottomRightRadius: downSm ? 0 : "99999px",
           overflow: "scroll",
-          whiteSpace: "nowrap"
+          whiteSpace: "nowrap",
+          mr: 2
         },
         children: [
           /* @__PURE__ */ jsx(
@@ -10503,7 +10526,7 @@ function ButtonGroup({
             }
           ),
           dataWithDefault == null ? void 0 : dataWithDefault.map((item, index) => {
-            const isActive = !selectAll && (selectTab == null ? void 0 : selectTab.includes(item.id));
+            const isActive = urlParams ? !selectAll && (selectTab == null ? void 0 : selectTab.includes(item.id)) : boardId === item.id;
             return /* @__PURE__ */ jsx(
               Button$1,
               {
@@ -10534,7 +10557,7 @@ function ButtonGroup({
         component: Link,
         color: "inherit",
         size: "small",
-        to: `/discussions/boards?type=${type}`,
+        to: `/boards?type=${type}`,
         sx: { color: "grey.500" },
         children: /* @__PURE__ */ jsx(BorderColorOutlined, { sx: { fontSize: 16 } })
       }

package/dist/index.es.js

@@ -1,5 +1,5 @@
 export * from "@blocklet/labels";
-import { N, j, Q, A, h, a8, B, y, F, z, H, ak, U, T, W, Y, o, C, q, v, x, a0, a1, ac, a3, K, L, D, ab, aa, E, G, c, b, a9, M, P, aj, n, m, a7, R, S, a4, k, Z, $, ad, ag, af, ah, al, J, am, l, p, r, t, d, a5, O, e, X, w, a2, a6, u, ai, an, _, ae, f } from "./index-bzFgbBTK.mjs";
+import { N, j, Q, A, h, a8, B, y, F, z, H, ak, U, T, W, Y, o, C, q, v, x, a0, a1, ac, a3, K, L, D, ab, aa, E, G, c, b, a9, M, P, aj, n, m, a7, R, S, a4, k, Z, $, ad, ag, af, ah, al, J, am, l, p, r, t, d, a5, O, e, X, w, a2, a6, u, ai, an, _, ae, f } from "./index-G56xwIdk.mjs";
 import "react/jsx-runtime";
 import "react";
 import "@mui/material/Box";

package/dist/index.umd.js

@@ -10362,25 +10362,31 @@ var __publicField = (obj, key, value) => {
   function ButtonGroup({
     data,
     theme = "dark",
-    selected,
     urlName,
     defaultButton,
+    urlParams = true,
     onSelectTab,
     type,
     ...rest
   }) {
     const downSm = useMediaQuery((mainTheme) => mainTheme.breakpoints.down("sm"));
+    const navigate = reactRouterDom.useNavigate();
     const [searchParams, setSearchParams] = reactRouterDom.useSearchParams();
+    const { boardId } = reactRouterDom.useParams();
     const selectedString = searchParams.get(urlName);
-    const dataWithDefault = defaultButton ? [defaultButton, ...data] : data;
-    const selectedArray = selectedString !== null && selectedString !== "" ? selectedString.split(",") : dataWithDefault.map((item) => item.id);
-    const [selectTab, setSelectTab] = react.useState(selectedArray);
+    const dataWithDefault = defaultButton && (data == null ? void 0 : data.length) > 0 ? [defaultButton, ...data] : data;
+    const selectedArray = selectedString !== null && selectedString !== "" ? selectedString.split(",") : dataWithDefault == null ? void 0 : dataWithDefault.map((item) => item.id);
+    const [selectTab, setSelectTab] = react.useState(urlParams ? selectedArray : [boardId]);
     const [selectAll, setSelectAll] = react.useState(false);
     const updateUrl = (url, newSelectTab) => {
-      setSearchParams({
-        ...searchParams,
-        [url]: newSelectTab.join(",")
-      });
+      if (urlParams) {
+        setSearchParams({
+          ...searchParams,
+          [url]: newSelectTab.join(",")
+        });
+      } else {
+        navigate(`/${type}/boards/${newSelectTab.join(",")}`);
+      }
     };
     const handleClick = (item) => {
       setSelectTab([item.id]);
@@ -10391,26 +10397,42 @@ var __publicField = (obj, key, value) => {
         const newSelectAll = !prevSelectAll;
         const newSelectTab = newSelectAll ? dataWithDefault == null ? void 0 : dataWithDefault.map((item) => item.id) : [];
         setSelectTab(newSelectTab);
-        updateUrl(urlName, newSelectTab);
+        updateUrl(urlName, [""]);
         return newSelectAll;
       });
     };
     react.useEffect(() => {
       if (JSON.stringify(selectedArray) !== JSON.stringify(selectTab)) {
-        setSelectTab((selectedArray == null ? void 0 : selectedArray.length) > 0 ? selectedArray : []);
+        if (urlParams) {
+          setSelectTab(selectedArray || []);
+        } else if (boardId) {
+          if ((data == null ? void 0 : data.find((item) => item.id === boardId)) || boardId === "default") {
+            setSelectTab([boardId]);
+          } else {
+            navigate(`/${type}/`);
+          }
+        } else {
+          setSelectTab(dataWithDefault == null ? void 0 : dataWithDefault.map((item) => item.id));
+        }
       }
-    }, [data]);
+    }, [data, boardId]);
     react.useEffect(() => {
-      if (selectedString === null || selectedString === "") {
-        setSelectAll(true);
-      } else if ((selectTab == null ? void 0 : selectTab.length) === (dataWithDefault == null ? void 0 : dataWithDefault.length)) {
-        setSelectAll(true);
-      } else {
+      if (urlParams) {
+        if (selectedString === null || selectedString === "") {
+          setSelectAll(true);
+        } else if ((selectTab == null ? void 0 : selectTab.length) === (dataWithDefault == null ? void 0 : dataWithDefault.length)) {
+          setSelectAll(true);
+        } else {
+          setSelectAll(false);
+        }
+      } else if (boardId) {
         setSelectAll(false);
+      } else {
+        setSelectAll(true);
       }
       if (onSelectTab)
         onSelectTab(selectTab);
-    }, [selectTab, selectedArray]);
+    }, [selectTab, selectedArray, boardId]);
     return /* @__PURE__ */ jsxRuntime.jsxs(material.Box, { className: Group, children: [
       /* @__PURE__ */ jsxRuntime.jsxs(
         material.Box,
@@ -10423,7 +10445,8 @@ var __publicField = (obj, key, value) => {
             borderTopRightRadius: downSm ? 0 : "99999px",
             borderBottomRightRadius: downSm ? 0 : "99999px",
             overflow: "scroll",
-            whiteSpace: "nowrap"
+            whiteSpace: "nowrap",
+            mr: 2
           },
           children: [
             /* @__PURE__ */ jsxRuntime.jsx(
@@ -10440,7 +10463,7 @@ var __publicField = (obj, key, value) => {
               }
             ),
             dataWithDefault == null ? void 0 : dataWithDefault.map((item, index) => {
-              const isActive = !selectAll && (selectTab == null ? void 0 : selectTab.includes(item.id));
+              const isActive = urlParams ? !selectAll && (selectTab == null ? void 0 : selectTab.includes(item.id)) : boardId === item.id;
               return /* @__PURE__ */ jsxRuntime.jsx(
                 material.Button,
                 {
@@ -10471,7 +10494,7 @@ var __publicField = (obj, key, value) => {
           component: reactRouterDom.Link,
           color: "inherit",
           size: "small",
-          to: `/discussions/boards?type=${type}`,
+          to: `/boards?type=${type}`,
           sx: { color: "grey.500" },
           children: /* @__PURE__ */ jsxRuntime.jsx(iconsMaterial.BorderColorOutlined, { sx: { fontSize: 16 } })
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "1.6.160",
+  "version": "1.6.162",
   "files": [
     "dist"
   ],
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@arcblock/ws": "^1.18.110",
-    "@blocklet/editor": "1.6.160",
-    "@blocklet/labels": "1.6.160",
+    "@blocklet/editor": "1.6.162",
+    "@blocklet/labels": "1.6.162",
     "@blocklet/uploader": "^0.0.73",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -45,6 +45,7 @@
     "lexical": "0.13.1",
     "lottie-react": "^2.4.0",
     "mitt": "^3.0.0",
+    "react-flip-toolkit": "^7.1.0",
     "react-helmet": "^6.1.0",
     "react-select": "^5.6.0",
     "unstated-next": "^1.1.0",
@@ -83,7 +84,6 @@
     "babel-loader": "^8.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-flip-toolkit": "^7.1.0",
     "rollup-plugin-node-externals": "^5.1.3",
     "typescript": "^4.6.4",
     "unplugin-icons": "^0.14.14",
@@ -94,5 +94,5 @@
   "resolutions": {
     "react": "^18.2.0"
   },
-  "gitHead": "e7de80eaeedb0621b5fa05110313615e93436d08"
+  "gitHead": "45ef63a2305bb38d8f278dc8e23667d71db5d187"
 }