@opensumi/ide-core-browser 3.1.3-next-1719223783.0 → 3.1.3

package/src/components/actions/index.tsx

@@ -3,7 +3,8 @@ import React, { useMemo, useState } from 'react';
 
 import { Button, CheckBox, Icon } from '@opensumi/ide-components';
 import { ClickParam, Menu } from '@opensumi/ide-components/lib/menu';
-import { isBoolean, strings } from '@opensumi/ide-core-common';
+import { CommandRegistry, IDisposable, isBoolean, strings } from '@opensumi/ide-core-common';
+import { GitCommands } from '@opensumi/ide-core-common/lib/commands/git';
 
 import {
   AbstractMenuService,
@@ -232,6 +233,7 @@ const InlineActionWidget: React.FC<
 > = React.memo(({ iconService, type = 'icon', data, context = [], className, afterClick, ...restProps }) => {
   const styles_iconAction = useDesignStyles(styles.iconAction, 'iconAction');
   const styles_btnAction = useDesignStyles(styles.btnAction, 'btnAction');
+  const commandRegistry = useInjectable<CommandRegistry>(CommandRegistry);
 
   const [loading, setLoading] = useState(false);
   const handleClick = React.useCallback(
@@ -258,6 +260,38 @@ const InlineActionWidget: React.FC<
     [data, context],
   );
 
+  React.useEffect(() => {
+    let dispose: IDisposable | undefined;
+    switch (data.id) {
+      case GitCommands.Stage:
+        {
+          const firstArg = context[0];
+          if (!firstArg) {
+            break;
+          }
+          if (!firstArg.sourceUri) {
+            break;
+          }
+          dispose = commandRegistry.registerHandler(`${data.id}-${firstArg.sourceUri.toString()}`, {
+            execute: async () => {
+              if (typeof data.execute === 'function') {
+                await data.execute([...context]);
+              }
+            },
+          });
+        }
+        break;
+      default:
+        break;
+    }
+
+    return () => {
+      if (dispose) {
+        dispose.dispose();
+      }
+    };
+  }, [data.id]);
+
   const [title, label] = React.useMemo(() => {
     let title = data.tooltip || data.label;
     const label = data.label;

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.module.less

@@ -6,6 +6,16 @@
   position: relative;
   background-color: transparent;
 
+  :global {
+    .kt-input-addon-after {
+      align-items: flex-end;
+      margin: 4px 4px 0 0;
+    }
+    .kt-input-disabled {
+      background-color: var(--kt-input-disableBackground) !important;
+    }
+  }
+
   &.active {
     border-color: var(--design-inputOption-activeForeground) !important;
   }
@@ -42,13 +52,3 @@
     }
   }
 }
-
-:global {
-  .kt-input-addon-after {
-    align-items: flex-end;
-    margin: 4px 4px 0 0;
-  }
-  .kt-input-disabled {
-    background-color: var(--kt-input-disableBackground) !important;
-  }
-}

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/components/layout/split-panel.tsx

@@ -5,7 +5,7 @@ import { IEventBus } from '@opensumi/ide-core-common';
 
 import { ResizeEvent } from '../../layout';
 import { useInjectable } from '../../react-hooks';
-import { IResizeHandleDelegate, RESIZE_LOCK, ResizeFlexMode } from '../resize/resize';
+import { IResizeHandleDelegate, ResizeFlexMode } from '../resize/resize';
 
 import { Layout } from './layout';
 import { SplitPanelManager } from './split-panel.service';
@@ -64,7 +64,6 @@ export interface SplitPanelProps extends SplitChildProps {
   className?: string;
   style?: React.CSSProperties;
   direction?: Layout.direction;
-  headerSize?: number;
   id: string;
   // setAbsoluteSize 时保证相邻节点总宽度不变
   resizeKeep?: boolean;
@@ -96,7 +95,6 @@ export const SplitPanel: React.FC<SplitPanelProps> = (props) => {
   const {
     id,
     className,
-    headerSize,
     resizeHandleClassName,
     style,
     children = [],
@@ -300,7 +298,6 @@ export const SplitPanel: React.FC<SplitPanelProps> = (props) => {
                     splitPanelService.panels.push(ele);
                   }
                 }}
-                className={getElementSize(element, totalFlexNum) === `${headerSize}px` ? RESIZE_LOCK : ''}
                 id={getProp(element, 'id') /* @deprecated: query by data-view-id */}
                 style={{
                   // 手风琴场景，固定尺寸和 flex 尺寸混合布局；需要在 Resize Flex 模式下禁用

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);
-  }
-}