Skip to content

Commit 7b7a937

Browse files
author
winjo
committed
fix: 优化 change 查找路径问题
1 parent c57bba0 commit 7b7a937

5 files changed

Lines changed: 20 additions & 14 deletions

File tree

packages/acr/src/modules/change-file.quick-open.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import { QuickOpenGroupItem, QuickOpenModel } from '@ali/ide-quick-open';
1616
import { basename } from '@ali/ide-core-common/lib/path';
1717
import { OpenChangeFilesService } from './open-change-files';
1818

19-
import { IPullRequestChangeDiff, IAntcodeService } from './antcode-service/base';
19+
import { IAntcodeService } from './antcode-service/base';
20+
import type { IPullRequestChangeDiff } from './antcode-service/base';
2021

2122
@Injectable({ multiple: true })
2223
export class ChangeFileQuickOpenItem extends QuickOpenGroupItem {

packages/acr/src/modules/comments/components/Commenting/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ export const Commenting: React.FC<{
1919
const inputRef = React.useRef<HTMLTextAreaElement | null>(null);
2020

2121
const path = React.useMemo(() => {
22-
return thread.uri.path.toString();
22+
const p = thread.uri.path.toString();
23+
return p.startsWith('/') ? p.slice(1) : p;
2324
}, [thread]);
2425

2526
const AntCodeCommenting = React.useMemo(() => {

packages/acr/src/portal.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
ComponentProps,
1010
ReactElement,
1111
RefObject,
12+
useLayoutEffect,
1213
} from 'react';
1314
import ReactDOM from 'react-dom';
1415

@@ -177,16 +178,16 @@ export const createPortals = () => {
177178
});
178179

179180
// 父组件渲染时直接驱动子组件渲染,保持 react 组件间行为一致,需要 memo 在原组件上进行即可
180-
// FIXME: React >= 16.13 Cannot update a component from inside the function body of a different component
181-
// 目前 antcode react 版本为 16.8 暂时这么写,避免组件渲染不同步问题,待框架层从根源解决后移除
182-
emitter.fire({
183-
portalId,
184-
payload: {
185-
effect,
186-
component,
187-
componentProps: componentProps as any,
188-
containerRef,
189-
},
181+
useLayoutEffect(() => {
182+
emitter.fire({
183+
portalId,
184+
payload: {
185+
effect,
186+
component,
187+
componentProps: componentProps as any,
188+
containerRef,
189+
},
190+
});
190191
});
191192

192193
useEffect(

packages/acr/tsconfig.build.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"rootDir": "./src",
5-
"outDir": "./lib"
5+
"outDir": "./lib",
6+
// antcode 中类型有不少不一致,先和之前一样,不输出类型
7+
"declaration": false,
8+
"declarationMap": false,
69
},
710
"include": [
811
"./src"

packages/integrations/src/antcode-cr/mock-props/requests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const getFileContent = (projectId: number) => (filepath: string, ref: str
2626

2727
// antcode 测试环境目前尚不支持该接口
2828
export const getLanguages = (projectId: number) => (): Promise<string[]> => {
29-
return request(`api/v4/projects/${projectId}/languages`, {
29+
return request(`/antcode/api/v4/projects/${projectId}/languages`, {
3030
params: {
3131
order_by: 'count',
3232
agg_by: 'file_extension',

0 commit comments

Comments
 (0)