@blocklet/editor 2.0.83 → 2.0.85

package/lib/ext/PostLinkEmbedPlugin/PostLinkNode.js

@@ -1,38 +1,48 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DecoratorNode } from 'lexical';
 import { Suspense } from 'react';
-import { joinURL } from 'ufo';
+import { joinURL, withFragment } from 'ufo';
 import Box from '@mui/material/Box';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { exhaustiveGuard, safeParseJSON } from '../utils';
+import { exhaustiveGuard, safeParseJSON, discussKitMountPoint } from '../utils';
 function PostLinkComponent(postInfo) {
     const { locale } = useLocaleContext();
     // PostLinkNode 新/旧版本对于 link 的处理:
     // - 旧版本: 存储 post link, 渲染 link 时直接使用 post link
     // - 新版本: 连同 id, type, boardId 等信息一并存储, 渲染 link 时动态拼接 post link (与 embed 时的 post link 解耦)
     let { link } = postInfo;
-    const prefix = window.blocklet?.prefix || '/';
     // pageGroup 模式下 path 需要特殊处理
     const { pageGroup } = window.blocklet;
     // 存在 type, 说明是新版本, 拼接 post link
     if (postInfo.type && !postInfo.external) {
         switch (postInfo.type) {
             case 'post':
-                link = pageGroup === 'discussion' ? joinURL(prefix, postInfo.id) : joinURL(prefix, '/discussions', postInfo.id);
+                link =
+                    pageGroup === 'discussion'
+                        ? joinURL(discussKitMountPoint, postInfo.id)
+                        : joinURL(discussKitMountPoint, '/discussions', postInfo.id);
                 break;
             case 'blog':
                 link =
-                    pageGroup === 'blog' ? joinURL(prefix, locale, postInfo.id) : joinURL(prefix, '/blog', locale, postInfo.id);
+                    pageGroup === 'blog'
+                        ? joinURL(discussKitMountPoint, locale, postInfo.id)
+                        : joinURL(discussKitMountPoint, '/blog', locale, postInfo.id);
                 break;
             case 'doc':
                 link =
                     pageGroup === 'doc'
-                        ? joinURL(prefix, postInfo.boardId, locale, postInfo.id)
-                        : joinURL(prefix, '/docs', postInfo.boardId, locale, postInfo.id);
+                        ? joinURL(discussKitMountPoint, postInfo.boardId, locale, postInfo.id)
+                        : joinURL(discussKitMountPoint, '/docs', postInfo.boardId, locale, postInfo.id);
                 break;
             default:
                 exhaustiveGuard(postInfo.type);
         }
+        try {
+            link = withFragment(link, new URL(postInfo.link).hash.slice(1));
+        }
+        catch {
+            // ignore
+        }
     }
     return (_jsxs(Box, { sx: {
             display: 'flex',

package/lib/ext/utils.d.ts

@@ -4,6 +4,7 @@ export declare function joinUrl(...paths: string[]): string;
 export declare function isValidUrl(url: string): boolean;
 export declare const safeParseJSON: (json: string, defaultValue?: any) => any;
 export declare const getBlockletMountPointInfo: (name: string) => any;
+export declare const discussKitMountPoint: any;
 export declare const blockletExists: (name: string) => boolean;
 export declare const fetchOpenGraphInfo: (openGraphEndpoint: string, url: string) => Promise<{
     url: any;

package/lib/ext/utils.js

@@ -28,6 +28,7 @@ export const safeParseJSON = (json, defaultValue = null) => {
 export const getBlockletMountPointInfo = (name) => {
     return window.blocklet?.componentMountPoints?.find((x) => x.name === name);
 };
+export const discussKitMountPoint = window.blocklet?.componentMountPoints?.find((x) => x.did === 'z8ia1WEiBZ7hxURf6LwH21Wpg99vophFwSJdu')?.mountPoint || '/';
 export const blockletExists = (name) => {
     return !!getBlockletMountPointInfo(name);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/editor",
-  "version": "2.0.83",
+  "version": "2.0.85",
   "main": "lib/index.js",
   "scripts": {
     "dev": "npm run storybook",
@@ -40,7 +40,7 @@
     "@arcblock/ux": "^2.10.6",
     "@blocklet/embed": "^0.1.11",
     "@blocklet/pages-kit": "^0.2.377",
-    "@blocklet/pdf": "2.0.83",
+    "@blocklet/pdf": "2.0.85",
     "@excalidraw/excalidraw": "^0.14.2",
     "@iconify/iconify": "^3.0.1",
     "@iconify/icons-tabler": "^1.2.95",
@@ -113,5 +113,5 @@
     "react": "*",
     "react-dom": "*"
   },
-  "gitHead": "ffe6740390580b8e886bb350a92c30c0b86fa62a"
+  "gitHead": "a59a345501aeab25f6c71c1aeacfb94fd2e55de5"
 }