@opensumi/ide-core-browser 3.1.4 → 3.1.5-next-1719913150.0

package/src/components/ai-native/enhanceIcon/index.tsx

@@ -1,6 +1,8 @@
 import cls from 'classnames';
 import React, { useCallback } from 'react';
 
+import { CommandService } from '@opensumi/ide-core-common';
+
 import { Icon } from '../../../components';
 import { MenuNode } from '../../../menu/next/base';
 import { IBrowserCtxMenu } from '../../../menu/next/renderer/ctxmenu/browser';
@@ -40,6 +42,7 @@ export const EnhanceIcon = React.forwardRef<HTMLDivElement | null, IEnhanceIconP
 );
 
 interface IEnhanceIconWithCtxMenuProps extends IEnhanceIconProps {
+  id?: string;
   menuNodes: MenuNode[];
   skew?: { x: number; y: number };
 }
@@ -48,7 +51,8 @@ interface IEnhanceIconWithCtxMenuProps extends IEnhanceIconProps {
  * 包含下拉菜单的 icon 组件，可以自定义下拉菜单位置
  */
 export const EnhanceIconWithCtxMenu = (props: IEnhanceIconWithCtxMenuProps) => {
-  const { children, menuNodes, skew, ...restProps } = props;
+  const { children, menuNodes, skew, id: commandId, ...restProps } = props;
+  const commandService = useInjectable<CommandService>(CommandService);
 
   const ctxMenuRenderer = useInjectable<IBrowserCtxMenu>(IBrowserCtxMenu);
   const [anchor, setAnchor] = React.useState<{ x: number; y: number } | undefined>(undefined);
@@ -89,14 +93,17 @@ export const EnhanceIconWithCtxMenu = (props: IEnhanceIconWithCtxMenuProps) => {
     if (!anchor) {
       return;
     }
-
-    handleRefRect((_anchor) => {
-      ctxMenuRenderer.show({
-        anchor: _anchor,
-        menuNodes,
+    if (menuNodes) {
+      handleRefRect((_anchor) => {
+        ctxMenuRenderer.show({
+          anchor: _anchor,
+          menuNodes,
+        });
       });
-    });
-  }, [iconRef.current, menuNodes, anchor]);
+    } else if (commandId) {
+      commandService.executeCommand(commandId);
+    }
+  }, [iconRef.current, menuNodes, anchor, commandId]);
 
   return (
     <EnhanceIcon ref={iconRef} onClick={handleClick} {...restProps}>

package/src/components/ai-native/interactive-input/index.tsx

@@ -38,6 +38,7 @@ export const InteractiveInput = React.forwardRef(
       width,
       sendBtnClassName,
       popoverPosition,
+      autoFocus,
     } = props;
 
     const internalRef = useRef<HTMLTextAreaElement>(null);
@@ -48,6 +49,12 @@ export const InteractiveInput = React.forwardRef(
 
     useImperativeHandle(ref, () => internalRef.current as HTMLTextAreaElement);
 
+    useEffect(() => {
+      if (internalRef && internalRef.current && autoFocus) {
+        internalRef.current.focus();
+      }
+    }, [internalRef]);
+
     useEffect(() => {
       const value = props.value;
       if (isUndefined(value)) {

package/src/components/layout/split-panel.service.ts

@@ -3,6 +3,8 @@ import React from 'react';
 import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { Deferred, Disposable, IDisposable } from '@opensumi/ide-core-common';
 
+import { RESIZE_LOCK } from '../resize/resize';
+
 import { SplitPanelProps } from './split-panel';
 
 export const ISplitPanelService = Symbol('ISplitPanelService');
@@ -23,7 +25,6 @@ export interface ISplitPanelService extends IDisposable {
 
 @Injectable({ multiple: true })
 export class SplitPanelService extends Disposable implements ISplitPanelService {
-  private static MIN_SIZE = 120;
   constructor(protected readonly panelId: string) {
     super();
   }
@@ -50,20 +51,30 @@ export class SplitPanelService extends Disposable implements ISplitPanelService
   getFirstResizablePanel(index: number, direction: boolean, isPrev?: boolean): HTMLElement | undefined {
     if (isPrev) {
       if (direction) {
-        return this.panels[index];
+        for (let i = index; i >= 0; i--) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
+            // 跳过无法调整的面板
+            return this.panels[i];
+          }
+        }
       } else {
         for (let i = index; i >= 0; i--) {
-          if (this.panels[i].clientHeight > SplitPanelService.MIN_SIZE) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
             return this.panels[i];
           }
         }
       }
     } else {
       if (!direction) {
-        return this.panels[index + 1];
+        for (let i = index + 1; i < this.panels.length; i++) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
+            // 跳过无法调整的面板
+            return this.panels[i];
+          }
+        }
       } else {
         for (let i = index + 1; i < this.panels.length; i++) {
-          if (this.panels[i].clientHeight > SplitPanelService.MIN_SIZE) {
+          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
             return this.panels[i];
           }
         }

package/src/contextkey/ai-native.ts

@@ -2,3 +2,6 @@ import { RawContextKey } from '../raw-context-key';
 
 export const InlineChatIsVisible = new RawContextKey('ai.native.inlineChatIsVisible', false);
 export const InlineCompletionIsTrigger = new RawContextKey('ai.native.inlineCompletionIsTrigger', false);
+export const InlineHintWidgetIsVisible = new RawContextKey('ai.native.inlineHintWidgetIsVisible', false);
+export const InlineInputWidgetIsVisible = new RawContextKey('ai.native.inlineInputWidgetIsVisible', false);
+export const InlineDiffPartialEditsIsVisible = new RawContextKey('ai.native.inlineDiffPartialEditsIsVisible', false);

package/src/logger/browser-logger.ts

@@ -3,19 +3,15 @@ import { ILogServiceClient, ILoggerManagerClient, LogLevel, SupportLogNamespace
 
 export { ILogger } from '@opensumi/ide-core-common';
 
-@Injectable()
-export class Logger implements ILogServiceClient {
-  @Autowired(ILoggerManagerClient)
-  private LoggerManager: ILoggerManagerClient;
+class LoggerWrapper implements ILogServiceClient {
+  protected logger: ILogServiceClient;
 
-  private logger: ILogServiceClient;
-
-  constructor() {
-    this.logger = this.LoggerManager.getLogger(SupportLogNamespace.Browser);
+  setup(logger: ILogServiceClient) {
+    this.logger = logger;
   }
 
   public getLevel() {
-    return this.getLevel();
+    return this.logger.getLevel();
   }
 
   public setLevel(level: LogLevel) {
@@ -49,3 +45,19 @@ export class Logger implements ILogServiceClient {
     return this.logger.dispose();
   }
 }
+
+@Injectable()
+export class Logger extends LoggerWrapper implements ILogServiceClient {
+  @Autowired(ILoggerManagerClient)
+  protected loggerManager: ILoggerManagerClient;
+
+  constructor() {
+    super();
+    this.logger = this.loggerManager.getBrowserLogger(SupportLogNamespace.Browser);
+  }
+
+  public reportToServer() {
+    this.logger.dispose();
+    this.logger = this.loggerManager.getLogger(SupportLogNamespace.Browser);
+  }
+}