Merge remote-tracking branch 'origin/dev' into dev

Sienci-Labs · Aug 22, 2023 · 0bc79e6 · 0bc79e6
2 parents e80188f + eba8ef2
commit 0bc79e6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/app/components/TabbedWidget/Tabs.jsx b/src/app/components/TabbedWidget/Tabs.jsx
@@ -31,7 +31,7 @@ import WidgetStyles from '../Widget/index.styl';
 import styles from './index.styl';
 
 
-const Tabs = ({ className, tabs, activeTabIndex, onClick, ...props }) => {
+const Tabs = ({ className, tabs, activeTabIndex, onClick, sx, ...props }) => {
     return (
         <MuiTabs
             value={activeTabIndex}
@@ -43,9 +43,8 @@ const Tabs = ({ className, tabs, activeTabIndex, onClick, ...props }) => {
                 [`& .${tabsClasses.scrollButtons}`]: {
                     '&.Mui-disabled': { opacity: 0.3 },
                 },
-                [`& .${tabsClasses.flexContainer}`]: {
-                    justifyContent: 'space-between'
-                },
+                minHeight: '32px',
+                ...sx,
             }}
             {...props}
             className={classNames(
@@ -55,7 +54,14 @@ const Tabs = ({ className, tabs, activeTabIndex, onClick, ...props }) => {
             )}
         >
             {
-                tabs.map((tab) => (<Tab key={`tab-${tab.widgetId}`} label={tab.label} />))
+                tabs.map((tab) => (
+                    <Tab
+                        key={`tab-${tab.widgetId}`}
+                        label={tab.label}
+                        disabled={tab.disabled}
+                        sx={{ minWidth: '75px', minHeight: '16px', padding: '8px', flexGrow: '1' }}
+                    />
+                ))
             }
         </MuiTabs>
     );

diff --git a/src/app/widgets/SecondaryFunctionality/index.jsx b/src/app/widgets/SecondaryFunctionality/index.jsx
@@ -23,17 +23,18 @@
 
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
+import { tabsClasses } from '@mui/material/Tabs';
 
 import store from 'app/store';
 import TabbedWidget from 'app/components/TabbedWidget';
 import controller from 'app/lib/controller';
 import CoolantWidget from 'app/widgets/Coolant';
+
 import WidgetConfig from '../WidgetConfig';
 import ProbeWidget from '../Probe';
 import RotaryWidget from '../Rotary';
 import MacroWidget from '../Macro';
 import ConsoleWidget from '../Console';
-
 import SpindleWidget from '../Spindle';
 
 import { MODAL_NONE, } from './constants';
@@ -205,7 +206,16 @@ class SecondaryFunctionality extends PureComponent {
         return (
             <TabbedWidget fullscreen={isFullscreen}>
                 <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
-                    <TabbedWidget.Tabs tabs={filteredTabs} activeTabIndex={activeTab} onClick={actions.handleTabSelect} />
+                    <TabbedWidget.Tabs
+                        tabs={filteredTabs}
+                        activeTabIndex={activeTab}
+                        onClick={actions.handleTabSelect}
+                        sx={{
+                            [`& .${tabsClasses.flexContainer}`]: {
+                                justifyContent: 'space-between'
+                            },
+                        }}
+                    />
                     <TabbedWidget.Content>
                         {
                             filteredTabs.map((tab, index) => {