@opensumi/ide-core-browser 3.1.2-next-1718957810.0 → 3.1.2

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

@@ -50,10 +50,10 @@ export interface AIActionItem {
 }
 
 export interface AIActionProps {
-  operationList?: AIActionItem[];
+  operationList: AIActionItem[];
   moreOperation?: MenuNode[];
   showClose?: boolean;
-  onClickItem?: (id: string) => void;
+  onClickItem: (id: string) => void;
   onClose?: () => void;
   loading?: boolean;
   customOperationRender?: React.ReactNode;
@@ -109,15 +109,15 @@ export const AIAction = (props: AIActionProps) => {
 
     const defaultOperationList = (
       <React.Fragment>
-        {operationList?.map(({ name, title, id }, i) =>
+        {operationList.map(({ name, title, id }, i) =>
           title ? (
             <EnhancePopover id={id} title={title} key={`popover_${i}`}>
-              <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem?.(id)}>
+              <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem(id)}>
                 <span key={i}>{name}</span>
               </EnhanceIcon>
             </EnhancePopover>
           ) : (
-            <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem?.(id)} key={i}>
+            <EnhanceIcon wrapperClassName={styles.operate_item} onClick={() => onClickItem(id)} key={i}>
               <span>{name}</span>
             </EnhanceIcon>
           ),

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

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

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

@@ -38,7 +38,6 @@ export const InteractiveInput = React.forwardRef(
       width,
       sendBtnClassName,
       popoverPosition,
-      autoFocus,
     } = props;
 
     const internalRef = useRef<HTMLTextAreaElement>(null);
@@ -49,12 +48,6 @@ 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,8 +3,6 @@ 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');
@@ -25,6 +23,7 @@ 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();
   }
@@ -51,30 +50,20 @@ export class SplitPanelService extends Disposable implements ISplitPanelService
   getFirstResizablePanel(index: number, direction: boolean, isPrev?: boolean): HTMLElement | undefined {
     if (isPrev) {
       if (direction) {
-        for (let i = index; i >= 0; i--) {
-          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
-            // 跳过无法调整的面板
-            return this.panels[i];
-          }
-        }
+        return this.panels[index];
       } else {
         for (let i = index; i >= 0; i--) {
-          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
+          if (this.panels[i].clientHeight > SplitPanelService.MIN_SIZE) {
             return this.panels[i];
           }
         }
       }
     } else {
       if (!direction) {
-        for (let i = index + 1; i < this.panels.length; i++) {
-          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
-            // 跳过无法调整的面板
-            return this.panels[i];
-          }
-        }
+        return this.panels[index + 1];
       } else {
         for (let i = index + 1; i < this.panels.length; i++) {
-          if (!this.panels[i].classList.contains(RESIZE_LOCK)) {
+          if (this.panels[i].clientHeight > SplitPanelService.MIN_SIZE) {
             return this.panels[i];
           }
         }

package/src/contextkey/ai-native.ts

@@ -2,5 +2,3 @@ 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);

package/src/logger/browser-logger.ts

@@ -3,15 +3,19 @@ import { ILogServiceClient, ILoggerManagerClient, LogLevel, SupportLogNamespace
 
 export { ILogger } from '@opensumi/ide-core-common';
 
-class LoggerWrapper implements ILogServiceClient {
-  protected logger: ILogServiceClient;
+@Injectable()
+export class Logger implements ILogServiceClient {
+  @Autowired(ILoggerManagerClient)
+  private LoggerManager: ILoggerManagerClient;
 
-  setup(logger: ILogServiceClient) {
-    this.logger = logger;
+  private logger: ILogServiceClient;
+
+  constructor() {
+    this.logger = this.LoggerManager.getLogger(SupportLogNamespace.Browser);
   }
 
   public getLevel() {
-    return this.logger.getLevel();
+    return this.getLevel();
   }
 
   public setLevel(level: LogLevel) {
@@ -45,19 +49,3 @@ class LoggerWrapper 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);
-  }
-}

package/src/react-providers/slot.tsx

@@ -198,16 +198,18 @@ export function SlotRenderer({ slot, isTabbar, id, ...props }: SlotProps) {
   const componentRegistry = useInjectable<ComponentRegistry>(ComponentRegistry);
   const appConfig = React.useContext(ConfigContext);
   const clientApp = useInjectable<IClientApp>(IClientApp);
-  const componentKeys = appConfig.layoutConfig[slot]?.modules ?? [];
   if (isTabbar) {
     slotRendererRegistry.addTabbar(slot);
   }
-  if (!componentKeys || !componentKeys.length) {
-    logger.warn(`No ${slot} view declared by location.`);
-  }
+
   const [componentInfos, setInfos] = React.useState<ComponentRegistryInfo[]>([]);
-  const updateComponentInfos = React.useCallback(() => {
+
+  const prepareComponentInfos = () => {
+    const componentKeys = appConfig.layoutConfig[slot]?.modules ?? [];
     const infos: ComponentRegistryInfo[] = [];
+    if (!componentKeys || !componentKeys.length) {
+      logger.warn(`No ${slot} view declared by location.`);
+    }
     componentKeys.forEach((token) => {
       const info = componentRegistry.getComponentRegistryInfo(token);
       if (!info) {
@@ -217,11 +219,11 @@ export function SlotRenderer({ slot, isTabbar, id, ...props }: SlotProps) {
       }
     });
     setInfos(infos);
-  }, []);
+  };
 
   React.useEffect(() => {
     // 对于嵌套在模块视图的SlotRenderer，渲染时应用已启动
-    clientApp.appInitialized.promise.then(updateComponentInfos);
+    clientApp.appInitialized.promise.then(prepareComponentInfos);
   }, []);
 
   const Renderer = slotRendererRegistry.getSlotRenderer(slot);