@blocklet/discuss-kit-ux 1.6.236 → 1.6.238

package/dist/components/back.d.ts

@@ -6,6 +6,5 @@ interface BackProps {
     iconOnly?: boolean;
     sx?: SxProps;
 }
-export declare const PreviousLocationRecorder: () => null;
 export declare function Back({ url, fallbackUrl, iconOnly, sx, ...rest }: BackProps & ButtonProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/{editor-uebxw0_k.mjs → editor-DKVcG8pE.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-jd2U4xWv.mjs";
+import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-BriEoNhQ.mjs";
 const BlockletEditor = lazy(() => import("@blocklet/editor"));
 const Root = styled(Box)`
   .be-editable,

package/dist/{index-jd2U4xWv.mjs → index-BriEoNhQ.mjs}

@@ -213,7 +213,8 @@ const themeOverrides = {
 };
 function InternalThemeProvider({ children }) {
   const theme = useTheme();
-  const merged = create$1(theme, {
+  const merged = create$1({
+    ...theme,
     typography,
     ...themeOverrides
   });
@@ -4587,28 +4588,15 @@ function Participants({ users, sx, ...rest }) {
     }
   ) }) });
 }
-const KEY_PREVIOUS_LOCATION = "__previous_location__";
-const getPreviousLocation = () => {
-  return sessionStorage.getItem(KEY_PREVIOUS_LOCATION);
-};
-const PreviousLocationRecorder = () => {
-  const location = useLocation();
-  const locationRef = useRef();
-  useEffect(() => {
-    if (locationRef.current) {
-      sessionStorage.setItem(KEY_PREVIOUS_LOCATION, locationRef.current);
-    }
-    locationRef.current = window.location.href;
-  }, [location]);
-  return null;
-};
 function Back({ url, fallbackUrl, iconOnly, sx, ...rest }) {
   const navigate = useNavigate();
+  const location = useLocation();
   const mergedSx = [{}, ...Array.isArray(sx) ? sx : [sx]];
   const handleClick = () => {
+    var _a2;
     if (url) {
       navigate(url, { replace: true });
-    } else if (getPreviousLocation()) {
+    } else if ((_a2 = location.state) == null ? void 0 : _a2.from) {
       navigate(-1);
     } else {
       navigate(fallbackUrl || "/");
@@ -5549,7 +5537,7 @@ function Pagination({
     }
   );
 }
-const Editor = lazy(() => import("./editor-uebxw0_k.mjs"));
+const Editor = lazy(() => import("./editor-DKVcG8pE.mjs"));
 function LazyEditor(props) {
   const fallback = /* @__PURE__ */ jsxs(Box, { sx: { px: 3 }, children: [
     /* @__PURE__ */ jsx(Skeleton, {}),
@@ -11770,24 +11758,23 @@ export {
   useApiErrorHandler as a9,
   useDefaultApiErrorHandler as aa,
   DefaultApiErrorHandler as ab,
-  PreviousLocationRecorder as ac,
-  Back as ad,
-  LazyEditor as ae,
-  EditorPreview as af,
-  DirtyPromptContainer as ag,
-  ConfirmNavigation as ah,
-  UploaderContext as ai,
-  useUploader as aj,
-  UploaderTrigger as ak,
-  UploaderProvider as al,
-  composeImageUrl as am,
-  usePointUpContext as an,
-  PointUpProvider as ao,
-  ButtonGroup as ap,
-  SegmentedControl as aq,
-  create as ar,
-  getWsClient as as,
-  useSubscription as at,
+  Back as ac,
+  LazyEditor as ad,
+  EditorPreview as ae,
+  DirtyPromptContainer as af,
+  ConfirmNavigation as ag,
+  UploaderContext as ah,
+  useUploader as ai,
+  UploaderTrigger as aj,
+  UploaderProvider as ak,
+  composeImageUrl as al,
+  usePointUpContext as am,
+  PointUpProvider as an,
+  ButtonGroup as ao,
+  SegmentedControl as ap,
+  create as aq,
+  getWsClient as ar,
+  useSubscription as as,
   Input as b,
   useChanged as c,
   useSessionContext as d,

package/dist/index.es.js

@@ -1,5 +1,5 @@
 export * from "@blocklet/labels";
-import { Q, m, U, A, k, ad, B, E, J, H, K, ap, X, W, _, Y, Z, a0, v, C, w, x, z, a4, a5, ah, a7, N, O, ab, D, ag, af, F, G, b, j, ae, M, P, ao, q, o, ac, R, S, a8, aq, n, a1, a3, ai, al, ak, am, ar, L, as, l, p, r, h, t, f, a9, T, c, $, y, a6, aa, u, an, d, at, a2, aj, e } from "./index-jd2U4xWv.mjs";
+import { Q, m, U, A, k, ac, B, E, J, H, K, ao, X, W, _, Y, Z, a0, v, C, w, x, z, a4, a5, ag, a7, N, O, ab, D, af, ae, F, G, b, j, ad, M, P, an, q, o, R, S, a8, ap, n, a1, a3, ah, ak, aj, al, aq, L, ar, l, p, r, h, t, f, a9, T, c, $, y, a6, aa, u, am, d, as, a2, ai, e } from "./index-BriEoNhQ.mjs";
 import "react/jsx-runtime";
 import "react";
 import "@mui/material/Box";
@@ -14,13 +14,13 @@ export {
   U as AuthzProvider,
   A as Avatar,
   k as Avatars,
-  ad as Back,
+  ac as Back,
   B as Badge,
   E as BinaryThumb,
   J as BlogCard,
   H as BlogList,
   K as BlogPermaLink,
-  ap as ButtonGroup,
+  ao as ButtonGroup,
   X as Chat,
   W as ChatClient,
   _ as ChatHeaderAddon,
@@ -34,39 +34,38 @@ export {
   z as CommentsProvider,
   a4 as Confirm,
   a5 as ConfirmContext,
-  ah as ConfirmNavigation,
+  ag as ConfirmNavigation,
   a7 as ConfirmProvider,
   N as CoverImage,
   O as CoverImageUpload,
   ab as DefaultApiErrorHandler,
   D as DefaultEditorConfigProvider,
-  ag as DirtyPromptContainer,
-  af as EditorPreview,
+  af as DirtyPromptContainer,
+  ae as EditorPreview,
   F as EmptyStatus,
   G as GithubReaction,
   b as Input,
   j as InternalThemeProvider,
-  ae as LazyEditor,
+  ad as LazyEditor,
   M as Menu,
   P as Pagination,
-  ao as PointUpProvider,
+  an as PointUpProvider,
   q as Post,
   o as PostContent,
-  ac as PreviousLocationRecorder,
   R as RelativeTime,
   S as ScrollableEditorWrapper,
   a8 as SecureLabelPicker,
-  aq as SegmentedControl,
+  ap as SegmentedControl,
   n as SystemUser,
   a1 as UnreadNotificationContext,
   a3 as UnreadNotificationProvider,
-  ai as UploaderContext,
-  al as UploaderProvider,
-  ak as UploaderTrigger,
-  am as composeImageUrl,
-  ar as create,
+  ah as UploaderContext,
+  ak as UploaderProvider,
+  aj as UploaderTrigger,
+  al as composeImageUrl,
+  aq as create,
   L as getBlogLink,
-  as as getWsClient,
+  ar as getWsClient,
   l as lexicalUtils,
   p as preferences,
   r as routes,
@@ -81,10 +80,10 @@ export {
   a6 as useConfirm,
   aa as useDefaultApiErrorHandler,
   u as useNow,
-  an as usePointUpContext,
+  am as usePointUpContext,
   d as useSessionContext,
-  at as useSubscription,
+  as as useSubscription,
   a2 as useUnreadNotification,
-  aj as useUploader,
+  ai as useUploader,
   e as utils
 };

package/dist/index.umd.js

@@ -145,7 +145,8 @@ var __publicField = (obj, key, value) => {
   };
   function InternalThemeProvider({ children }) {
     const theme = styles.useTheme();
-    const merged = Theme.create(theme, {
+    const merged = Theme.create({
+      ...theme,
       typography,
       ...themeOverrides
     });
@@ -4519,28 +4520,15 @@ var __publicField = (obj, key, value) => {
       }
     ) }) });
   }
-  const KEY_PREVIOUS_LOCATION = "__previous_location__";
-  const getPreviousLocation = () => {
-    return sessionStorage.getItem(KEY_PREVIOUS_LOCATION);
-  };
-  const PreviousLocationRecorder = () => {
-    const location = reactRouterDom.useLocation();
-    const locationRef = react.useRef();
-    react.useEffect(() => {
-      if (locationRef.current) {
-        sessionStorage.setItem(KEY_PREVIOUS_LOCATION, locationRef.current);
-      }
-      locationRef.current = window.location.href;
-    }, [location]);
-    return null;
-  };
   function Back({ url, fallbackUrl, iconOnly, sx, ...rest }) {
     const navigate = reactRouterDom.useNavigate();
+    const location = reactRouterDom.useLocation();
     const mergedSx = [{}, ...Array.isArray(sx) ? sx : [sx]];
     const handleClick = () => {
+      var _a2;
       if (url) {
         navigate(url, { replace: true });
-      } else if (getPreviousLocation()) {
+      } else if ((_a2 = location.state) == null ? void 0 : _a2.from) {
         navigate(-1);
       } else {
         navigate(fallbackUrl || "/");
@@ -11734,7 +11722,6 @@ var __publicField = (obj, key, value) => {
   exports2.PointUpProvider = PointUpProvider;
   exports2.Post = PostComponent;
   exports2.PostContent = PostContent;
-  exports2.PreviousLocationRecorder = PreviousLocationRecorder;
   exports2.RelativeTime = RelativeTime;
   exports2.ScrollableEditorWrapper = ScrollableEditorWrapper;
   exports2.SecureLabelPicker = SecureLabelPicker;

package/dist/preferences.d.ts

@@ -33,7 +33,7 @@ declare const preferences: {
     blogTemplate: "standard" | "corp";
     primaryColor: string;
     secondaryColor: string;
-    subscriptionPublicType: "slice" | "blur";
+    subscriptionPublicType: "blur" | "slice";
     enableAssignmentDiscussion: boolean;
     enableAssignmentBlog: boolean;
     enableAssignmentDoc: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "1.6.236",
+  "version": "1.6.238",
   "files": [
     "dist"
   ],
@@ -30,8 +30,8 @@
   "dependencies": {
     "@arcblock/bridge": "^2.9.77",
     "@arcblock/ws": "^1.18.116",
-    "@blocklet/editor": "1.6.236",
-    "@blocklet/labels": "1.6.236",
+    "@blocklet/editor": "1.6.238",
+    "@blocklet/labels": "1.6.238",
     "@blocklet/uploader": "^0.1.2",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -95,5 +95,5 @@
   "resolutions": {
     "react": "^18.2.0"
   },
-  "gitHead": "f3efd9c52ddb748b932ce475cc17e444c03a8a57"
+  "gitHead": "c88462b241f45a2d94470c0314b11a265f9ad369"
 }