CB-3733 removes closeOnMouseWheelClick prop

dbeaver · Jul 26, 2024 · 8112d75 · 8112d75
1 parent 2565c6f
commit 8112d75
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 64 deletions.
diff --git a/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx b/webapp/packages/core-ui/src/SideBarPanel/SideBarPanel.tsx
@@ -47,7 +47,7 @@ export const SideBarPanel = observer<SideBarPanelProps>(function SideBarPanel({
     <SContext registry={sideBarPanelRegistry}>
       <TabsState container={container} lazy>
         <div className={s(style, { box: true })}>
-          <TabList className={s(style, { tabList: true })} closeOnMouseWheelClick underline />
+          <TabList className={s(style, { tabList: true })} underline />
           <div className={s(style, { contentBox: true })}>
             <TabPanelList />
           </div>

diff --git a/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx b/webapp/packages/core-ui/src/Tabs/Tab/Tab.tsx
@@ -28,7 +28,7 @@ export const Tab = observer<TabProps>(function Tab(props) {
   const canClose = getComputed(() => !!onClose || (tab.closable && tab.state.closable));
 
   function onMouseUpHandler(event: React.MouseEvent<HTMLDivElement>) {
-    if (event.button === 1 && props.closeOnMouseWheelClick && canClose) {
+    if (event.button === 1 && canClose) {
       tab.handleClose(event);
     }
   }

diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx b/webapp/packages/core-ui/src/Tabs/Tab/TabDefault.tsx
@@ -24,7 +24,6 @@ interface Props<T = Record<string, any>> {
   component?: React.FC<TabProps & T>;
   className?: string;
   disabled?: boolean;
-  closeOnMouseWheelClick?: boolean;
   onOpen?: (tab: ITabData<any>) => void;
   onClose?: (tab: ITabData<any>) => void;
 }
@@ -34,7 +33,6 @@ export function TabDefault<T = Record<string, any>>({
   icon,
   name,
   component,
-  closeOnMouseWheelClick,
   className,
   disabled,
   onOpen,
@@ -50,7 +48,6 @@ export function TabDefault<T = Record<string, any>>({
     return (
       <TabContext.Provider value={tabContext}>
         <TabComponent
-          closeOnMouseWheelClick={closeOnMouseWheelClick}
           tabId={tabId}
           className={className}
           {...(rest as unknown as T)}
@@ -64,15 +61,7 @@ export function TabDefault<T = Record<string, any>>({
   }
 
   return (
-    <Tab
-      closeOnMouseWheelClick={closeOnMouseWheelClick}
-      tabId={tabId}
-      className={className}
-      selected={selected}
-      disabled={disabled}
-      onOpen={onOpen}
-      onClose={onClose}
-    >
+    <Tab tabId={tabId} className={className} selected={selected} disabled={disabled} onOpen={onOpen} onClose={onClose}>
       {icon && <TabIcon icon={icon} />}
       {name && (
         <TabTitle>

diff --git a/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts b/webapp/packages/core-ui/src/Tabs/Tab/TabProps.ts
@@ -18,7 +18,6 @@ export type TabProps = PropsWithChildren<{
   selected?: boolean;
   disabled?: boolean;
   className?: string;
-  closeOnMouseWheelClick?: boolean;
   onOpen?: (tab: ITabData<any>) => void;
   onClose?: (tab: ITabData<any>) => void;
   onClick?: (tabId: string) => void;

diff --git a/webapp/packages/core-ui/src/Tabs/TabList.tsx b/webapp/packages/core-ui/src/Tabs/TabList.tsx
@@ -27,7 +27,6 @@ export interface TabListProps extends Omit<TabListOptions, keyof TabStateReturn>
   rotated?: boolean;
   underline?: boolean;
   big?: boolean;
-  closeOnMouseWheelClick?: boolean;
   className?: string;
 }
 
@@ -38,7 +37,6 @@ export const TabList = observer<React.PropsWithChildren<TabListProps>>(function
   rotated,
   underline,
   big,
-  closeOnMouseWheelClick,
   childrenFirst,
   ...props
 }) {
@@ -74,7 +72,6 @@ export const TabList = observer<React.PropsWithChildren<TabListProps>>(function
                 (tabInfo, key) => (
                   <TabDefault
                     key={key}
-                    closeOnMouseWheelClick={closeOnMouseWheelClick}
                     tabId={key}
                     name={tabInfo.name}
                     icon={tabInfo.icon}

diff --git a/...ackages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx b/...ackages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/NavigationTabsBar.tsx
@@ -92,7 +92,7 @@ export const NavigationTabsBar = observer<Props>(function NavigationTabsBar({ cl
           tabs={
             <SContext registry={tabsRegistry}>
               {navigation.tabIdList.map(tabId => (
-                <TabHandlerTab key={tabId} tabId={tabId} closeOnMouseWheelClick onSelect={handleSelect} onClose={handleClose} />
+                <TabHandlerTab key={tabId} tabId={tabId} onSelect={handleSelect} onClose={handleClose} />
               ))}
             </SContext>
           }

diff --git a/...ckages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerTab.tsx b/...ckages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/Tabs/TabHandlerTab.tsx
@@ -12,16 +12,15 @@ import { useTabHandler } from './useTabHandler';
 
 interface IProps {
   tabId: string;
-  closeOnMouseWheelClick?: boolean;
   onSelect: (tabId: string) => void;
   onClose?: (tabId: string) => void;
 }
 
-export const TabHandlerTab = observer<IProps>(function TabHandlerTab({ tabId, onSelect, onClose, closeOnMouseWheelClick }) {
+export const TabHandlerTab = observer<IProps>(function TabHandlerTab({ tabId, onSelect, onClose }) {
   const tab = useTab(tabId);
   const handler = useTabHandler(tab.handlerId);
 
   const TabHandlerTab = handler.getTabComponent();
 
-  return <TabHandlerTab closeOnMouseWheelClick={closeOnMouseWheelClick} tab={tab} handler={handler} onSelect={onSelect} onClose={onClose} />;
+  return <TabHandlerTab tab={tab} handler={handler} onSelect={onSelect} onClose={onClose} />;
 });
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabHandler.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/TabHandler.ts
@@ -12,7 +12,6 @@ import type { ITab } from './ITab';
 export interface TabHandlerTabProps<T = any> {
   tab: ITab<T>;
   handler: TabHandler<T>;
-  closeOnMouseWheelClick?: boolean;
   onSelect: (tabId: string) => void;
   onClose?: (tabId: string) => void;
 }

diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTab.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerTab.tsx
@@ -16,12 +16,7 @@ import { useNode } from '@cloudbeaver/plugin-navigation-tree';
 
 import type { IObjectViewerTabState } from './IObjectViewerTabState';
 
-export const ObjectViewerTab: TabHandlerTabComponent<IObjectViewerTabState> = observer(function ObjectViewerTab({
-  tab,
-  onSelect,
-  onClose,
-  closeOnMouseWheelClick,
-}) {
+export const ObjectViewerTab: TabHandlerTabComponent<IObjectViewerTabState> = observer(function ObjectViewerTab({ tab, onSelect, onClose }) {
   const viewContext = useContext(CaptureViewContext);
   const tabMenuContext = useDataContext(viewContext);
   const { node } = useNode(tab.handlerState.objectId);
@@ -30,14 +25,7 @@ export const ObjectViewerTab: TabHandlerTabComponent<IObjectViewerTabState> = ob
   const title = node?.name || tab.handlerState.tabTitle;
 
   return (
-    <Tab
-      closeOnMouseWheelClick={closeOnMouseWheelClick}
-      tabId={tab.id}
-      title={title}
-      menuContext={tabMenuContext}
-      onOpen={handleSelect}
-      onClose={handleClose}
-    >
+    <Tab tabId={tab.id} title={title} menuContext={tabMenuContext} onOpen={handleSelect} onClose={handleClose}>
       <TabIcon icon={node?.icon || tab.handlerState.tabIcon} />
       <TabTitle>{title}</TabTitle>
     </Tab>

diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTab.tsx b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTab.tsx
@@ -26,12 +26,7 @@ import {
 import { DATA_CONTEXT_SQL_EDITOR_TAB } from './DATA_CONTEXT_SQL_EDITOR_TAB';
 import sqlEditorTabStyles from './SqlEditorTab.module.css';
 
-export const SqlEditorTab: TabHandlerTabComponent<ISqlEditorTabState> = observer(function SqlEditorTab({
-  tab,
-  onSelect,
-  onClose,
-  closeOnMouseWheelClick,
-}) {
+export const SqlEditorTab: TabHandlerTabComponent<ISqlEditorTabState> = observer(function SqlEditorTab({ tab, onSelect, onClose }) {
   const viewContext = useContext(CaptureViewContext);
   const tabMenuContext = useDataContext(viewContext);
   const handlerState = tab.handlerState;
@@ -65,14 +60,7 @@ export const SqlEditorTab: TabHandlerTabComponent<ISqlEditorTabState> = observer
   const handleClose = onClose ? ({ tabId }: ITabData<any>) => onClose(tabId) : undefined;
 
   return (
-    <Tab
-      closeOnMouseWheelClick={closeOnMouseWheelClick}
-      tabId={tab.id}
-      title={name}
-      menuContext={tabMenuContext}
-      onOpen={handleSelect}
-      onClose={handleClose}
-    >
+    <Tab tabId={tab.id} title={name} menuContext={tabMenuContext} onOpen={handleSelect} onClose={handleClose}>
       <TabIcon icon={icon} />
       <TabTitle>{name}</TabTitle>
       {isReadonly && isScript && (

diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTab.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTab.tsx
@@ -18,11 +18,10 @@ import { DATA_CONTEXT_SQL_EDITOR_RESULT_ID } from './DATA_CONTEXT_SQL_EDITOR_RES
 interface Props {
   result: ISqlEditorResultTab;
   className?: string;
-  closeOnMouseWheelClick?: boolean;
   onClose?: (tab: ITabData) => Promise<void>;
 }
 
-export const SqlResultTab = observer<Props>(function SqlResultTab({ result, className, onClose, closeOnMouseWheelClick }) {
+export const SqlResultTab = observer<Props>(function SqlResultTab({ result, className, onClose }) {
   const viewContext = useContext(CaptureViewContext);
   const tabMenuContext = useDataContext(viewContext);
 
@@ -31,15 +30,7 @@ export const SqlResultTab = observer<Props>(function SqlResultTab({ result, clas
   });
 
   return (
-    <Tab
-      key={result.id}
-      closeOnMouseWheelClick={closeOnMouseWheelClick}
-      tabId={result.id}
-      title={result.name}
-      menuContext={tabMenuContext}
-      className={className}
-      onClose={onClose}
-    >
+    <Tab key={result.id} tabId={result.id} title={result.name} menuContext={tabMenuContext} className={className} onClose={onClose}>
       <TabIcon icon={result.icon} />
       <TabTitle>{result.name}</TabTitle>
     </Tab>

diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabs.tsx
@@ -101,7 +101,7 @@ export const SqlResultTabs = observer<Props>(function SqlDataResult({ state, onT
         <SContext registry={registry}>
           <TabList className={s(style, { tabListNotExecutable: !executable })} aria-label="SQL Results">
             {orderedTabs.map(result => (
-              <SqlResultTab key={result.id} result={result} closeOnMouseWheelClick />
+              <SqlResultTab key={result.id} result={result} />
             ))}
           </TabList>
         </SContext>

diff --git a/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx b/webapp/packages/plugin-tools-panel/src/ToolsPanel/ToolsPanel.tsx
@@ -62,7 +62,7 @@ export const ToolsPanel = observer(function ToolsPanel() {
   return (
     <TabsState currentTabId={state.selectedTabId} container={toolsPanelService.tabsContainer} lazy onChange={handleTabChange}>
       <div className={s(style, { box: true })}>
-        <TabList className={s(style, { tabList: true })} closeOnMouseWheelClick underline />
+        <TabList className={s(style, { tabList: true })} underline />
         <div className={s(style, { contentBox: true })}>
           <TabPanelList />
         </div>