Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(sqllab): invalid css scope for ace editor autocomplete #28156

Merged
merged 2 commits into from
Apr 26, 2024
Merged

fix(sqllab): invalid css scope for ace editor autocomplete #28156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2c5c42
fix(sqllab): invalid css scope for ace editor autocomplete
justinpark Apr 19, 2024
35908ba
update max-width for ace tooltip
justinpark Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 39 additions & 23 deletions superset-frontend/src/SqlLab/components/AceEditorWrapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
import React, { useState, useEffect, useRef } from 'react';
import type { IAceEditor } from 'react-ace/lib/types';
import { useDispatch } from 'react-redux';
import { css, styled, usePrevious } from '@superset-ui/core';
import { css, styled, usePrevious, useTheme } from '@superset-ui/core';
import { Global } from '@emotion/react';

import { SQL_EDITOR_LEFTBAR_WIDTH } from 'src/SqlLab/constants';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needn't tackle it in this PR, but I would think layout constants like these should be global (or in the theme) since they likely could/should apply to other views in the app.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

src/SqlLab/constants.ts looks like a good place for this constant.

import { queryEditorSetSelectedText } from 'src/SqlLab/actions/sqlLab';
import { FullSQLEditor as AceEditor } from 'src/components/AsyncAceEditor';
import type { KeyboardShortcut } from 'src/SqlLab/components/KeyboardShortcutButton';
Expand Down Expand Up @@ -54,16 +56,6 @@ const StyledAceEditor = styled(AceEditor)`
font-feature-settings:
'liga' off,
'calt' off;

&.ace_autocomplete {
// Use !important because Ace Editor applies extra CSS at the last second
// when opening the autocomplete.
width: ${theme.gridUnit * 130}px !important;
}

.ace_scroller {
background-color: ${theme.colors.grayscale.light4};
}
}
`}
`;
Expand Down Expand Up @@ -182,20 +174,44 @@ const AceEditorWrapper = ({
},
!autocomplete,
);
const theme = useTheme();

return (
<StyledAceEditor
keywords={keywords}
onLoad={onEditorLoad}
onBlur={onBlurSql}
height={height}
onChange={onChangeText}
width="100%"
editorProps={{ $blockScrolling: true }}
enableLiveAutocompletion={autocomplete}
value={sql}
annotations={annotations}
/>
<>
<Global
styles={css`
.ace_text-layer {
width: 100% !important;
}

.ace_autocomplete {
// Use !important because Ace Editor applies extra CSS at the last second
// when opening the autocomplete.
width: ${theme.gridUnit * 130}px !important;
}

.ace_tooltip {
max-width: ${SQL_EDITOR_LEFTBAR_WIDTH}px;
}

.ace_scroller {
background-color: ${theme.colors.grayscale.light4};
}
`}
/>
<StyledAceEditor
keywords={keywords}
onLoad={onEditorLoad}
onBlur={onBlurSql}
height={height}
onChange={onChangeText}
width="100%"
editorProps={{ $blockScrolling: true }}
enableLiveAutocompletion={autocomplete}
value={sql}
annotations={annotations}
/>
</>
);
};

Expand Down
Loading