IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed following: - Dropdown selected menu color - CodeMirror render on properties tab - Placeholders on select control - Codemirror borders

Browse Source
This commit is contained in:
Aditya Toshniwal
2021-08-24 11:51:47 +05:30
committed by Akshay Joshi
parent c35c72c551
commit 27e446a0b0
9 changed files with 68 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/static/js/SchemaView/FormView.jsx
View File

@@ -31,7 +31,7 @@ const useStyles = makeStyles((theme)=>({
height: '100%'
},
controlRow: {
paddingBottom: theme.spacing(1),
marginBottom: theme.spacing(1),
},
nestedTabPanel: {
backgroundColor: theme.otherVars.headerBg,
@@ -62,7 +62,6 @@ function SQLTab({active, getSQLValue}) {
options={{
readOnly: true,
}}
isAsync={true}
readonly={true}
/>;
}
@@ -314,7 +313,7 @@ export default function FormView({
sqlTabActive = (Object.keys(tabs).length === tabValue);
/* Re-render and fetch the SQL tab when it is active */
tabs[sqlTabName] = [
useMemo(()=><SQLTab key="sqltab" active={sqlTabActive} getSQLValue={getSQLValue} />, [sqlTabActive]),
useMemo(()=><SQLTab key="sqltab" active={sqlTabActive} getSQLValue={getSQLValue} />, [sqlTabActive, value]),
];
tabsClassname[sqlTabName] = classes.fullSpace;
fullTabs.push(sqlTabName);

4
web/pgadmin/static/js/SchemaView/MappedControl.jsx
View File

@@ -30,8 +30,8 @@ function MappedFormControlBase({type, value, id, onChange, className, visible, i
onChange && onChange(value);
}, []);
const onSqlChange = useCallback((e, cm) => {
onChange && onChange(cm.getValue());
const onSqlChange = useCallback((value) => {
onChange && onChange(value);
}, []);
const onIntChange = useCallback((e) => {

11
web/pgadmin/static/js/SchemaView/index.jsx
View File

@@ -711,7 +711,7 @@ const usePropsStyles = makeStyles((theme)=>({
flexDirection: 'column'
},
controlRow: {
paddingBottom: theme.spacing(1),
marginBottom: theme.spacing(1),
},
form: {
padding: theme.spacing(1),
@@ -726,6 +726,9 @@ const usePropsStyles = makeStyles((theme)=>({
buttonMargin: {
marginRight: '0.5rem',
},
noPadding: {
padding: 0,
}
}));
/* If its the properties tab */
@@ -757,7 +760,7 @@ function SchemaPropertiesView({
group = group || defaultTab;
if(field.isFullTab) {
tabsClassname[group] = classes.fullSpace;
tabsClassname[group] = classes.noPadding;
fullTabs.push(group);
}
@@ -814,7 +817,7 @@ function SchemaPropertiesView({
readonly={readonly}
disabled={disabled}
visible={visible}
className={classes.controlRow}
className={field.isFullTab ? null : classes.controlRow}
noLabel={field.isFullTab}
/>
);
@@ -846,7 +849,7 @@ function SchemaPropertiesView({
>
{tabName}
</AccordionSummary>
<AccordionDetails>
<AccordionDetails className={tabsClassname[tabName]}>
<Box style={{width: '100%'}}>
{finalTabs[tabName]}
</Box>