Skip to content

Re-work CodeBox UI component #3387

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

Open
williamjallen wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −53
Open

Re-work CodeBox UI component #3387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion resources/js/vue/components/BuildNotesPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
:id="note.node.id"
:key="note.node.id"
:ref="r => noteRefs.push(r)"
class="tw-border tw-border-base-300 tw-bg-base-100 tw-rounded-box tw-scroll-mt-28"
class="tw-border tw-border-base-300 tw-bg-base-100 tw-rounded-box tw-scroll-mt-28 tw-overflow-hidden"
data-test="notes-content-item"
>
<h3 class="tw-p-4 tw-text-xl tw-font-bold tw-break-words">
Expand Down
52 changes: 5 additions & 47 deletions resources/js/vue/components/shared/CodeBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<template>
<div
ref="editor"
class="code-box"
:class="{ 'tw-border': bordered }"
/>
class="tw-font-mono tw-bg-gray-100 tw-p-2 tw-whitespace-pre-wrap tw-break-all tw-overflow-hidden"
:class="{ 'tw-border': bordered, 'tw-rounded': bordered }"
>
{{ text }}
</div>
</template>

<script>
import { EditorView, lineNumbers, drawSelection } from '@codemirror/view';
import { EditorState } from '@codemirror/state';

export default {
name: 'CodeBox',
props: {
Expand All @@ -23,45 +21,5 @@ export default {
default: true,
},
},
data() {
return {
editor: null,
};
},
watch: {
text(newText) {
if (this.editor) {
this.editor.dispatch({
changes: { from: 0, to: this.editor.state.doc.length, insert: newText },
});
}
},
},
mounted() {
const state = EditorState.create({
doc: this.text,
extensions: [
lineNumbers(),
drawSelection(),
EditorState.readOnly.of(true),
EditorView.theme({
'.cm-scroller': {
overflow: 'auto',
},
}),
EditorView.lineWrapping,
],
});

this.editor = new EditorView({
state,
parent: this.$refs.editor,
});
},
beforeUnmount() {
if (this.editor) {
this.editor.destroy();
}
},
};
</script>
9 changes: 4 additions & 5 deletions tests/cypress/component/code-box.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ describe('CodeBox', () => {
},
});

cy.get('.cm-editor').should('be.visible');
cy.get('.cm-content').should('contain.text', 'Hello, World!');
cy.contains('Hello, World!').should('exist');
});

it('updates the content when the text prop changes', () => {
Expand All @@ -23,11 +22,11 @@ describe('CodeBox', () => {
text: initialCode,
},
}).then(({ wrapper }) => {
cy.get('.cm-content').should('contain.text', 'const a = 1;');
cy.contains('const a = 1;').should('exist');
wrapper.setProps({ text: updatedCode });
// Wait for the DOM to update before asserting the new content.
cy.get('.cm-content').should('not.contain.text', 'const a = 1;').then(() => {
cy.get('.cm-content').should('contain.text', 'const b = 2;');
cy.contains('const a = 1;').should('not.exist').then(() => {
cy.contains('const b = 2;').should('exist');
});
});
});
Expand Down