Skip to content

Commit 7f48cf1

Browse files
committed
fix(CodeEditor): only include pf-v6-c-code-editor__upload when dragging is active over an empty state
1 parent cc41e87 commit 7f48cf1

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

eslint.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export default [
1616
'**/css',
1717
'packages/react-core/src/helpers/Popper/thirdparty',
1818
'packages/react-docs/patternfly-docs/generated',
19+
'packages/react-docs/coverage',
1920
'.history/*',
2021
'packages/react-docs/static',
2122
'**/.cache'

packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,14 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
678678
>
679679
{editorHeader}
680680
<div className={css(styles.codeEditorMain, isDragActive && styles.modifiers.dragHover)}>
681-
<div className={css(styles.codeEditorUpload)}>
682-
<input {...getInputProps()} /* hidden, necessary for react-dropzone */ hidden />
683-
{(showEmptyState || providedEmptyState) && !value ? emptyState : editor}
684-
</div>
681+
{(showEmptyState || providedEmptyState) && !value ? (
682+
<div className={css(styles.codeEditorUpload)}>
683+
<input {...getInputProps()} /* hidden, necessary for react-dropzone */ hidden />
684+
{emptyState}
685+
</div>
686+
) : (
687+
editor
688+
)}
685689
</div>
686690
</div>
687691
) : (

packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ test('Matches snapshot with control buttons enabled', () => {
1515
expect(asFragment()).toMatchSnapshot();
1616
});
1717

18-
test(`Renders with default classes ${styles.codeEditor}, ${styles.codeEditorMain}, ${styles.codeEditorCode}`, () => {
18+
test(`Renders with default classes ${styles.codeEditor}, ${styles.codeEditorCode}`, () => {
1919
render(<CodeEditor />);
2020
expect(screen.getByTestId('mock-editor').parentElement).toHaveClass(styles.codeEditorCode);
21-
expect(screen.getByTestId('mock-editor').parentElement?.parentElement).toHaveClass(styles.codeEditorMain);
2221
expect(screen.getByTestId('mock-editor').parentElement?.parentElement?.parentElement).toHaveClass(styles.codeEditor);
2322
});
2423

@@ -34,9 +33,9 @@ test(`Renders with ${styles.modifiers.readOnly} when isReadOnly = true`, () => {
3433
);
3534
});
3635

37-
test(`Renders with ${styles.codeEditorUpload} when isUploadEnabled = true`, () => {
36+
test(`Renders with ${styles.codeEditorMain} when isUploadEnabled = true`, () => {
3837
render(<CodeEditor isUploadEnabled code="test" />);
39-
expect(screen.getByTestId('mock-editor').parentElement?.parentElement).toHaveClass(styles.codeEditorUpload);
38+
expect(screen.getByTestId('mock-editor').parentElement?.parentElement).toHaveClass(styles.codeEditorMain);
4039
});
4140

4241
test(`Renders with empty state when code = undefined`, () => {

packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -116,23 +116,13 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
116116
class="pf-v6-c-code-editor__main"
117117
>
118118
<div
119-
class="pf-v6-c-code-editor__upload"
119+
class="pf-v6-c-code-editor__code"
120+
dir="ltr"
121+
tabindex="0"
120122
>
121-
<input
122-
hidden=""
123-
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); clip-path: inset(50%); height: 1px; margin: 0px -1px -1px 0px; overflow: hidden; padding: 0px; position: absolute; width: 1px; white-space: nowrap;"
124-
tabindex="-1"
125-
type="file"
126-
/>
127123
<div
128-
class="pf-v6-c-code-editor__code"
129-
dir="ltr"
130-
tabindex="0"
131-
>
132-
<div
133-
data-testid="mock-editor"
134-
/>
135-
</div>
124+
data-testid="mock-editor"
125+
/>
136126
</div>
137127
</div>
138128
</div>

0 commit comments

Comments
 (0)