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

fix: Deleting all code in the JS Console editor fills in the default code #2558

Merged
merged 4 commits into from
May 15, 2024
Merged

fix: Deleting all code in the JS Console editor fills in the default code #2558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5737bca
fix: use default value props instead placeholder in the code editor
devbymak May 13, 2024
d756a0a
chore: add default value for dashboard playground
devbymak May 13, 2024
282e210
chore: use default value for code editor example
devbymak May 13, 2024
6af2d06
Merge branch 'alpha' into bug/2557
mtrezza May 15, 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
2 changes: 1 addition & 1 deletion src/components/CodeEditor/CodeEditor.example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ export const component = CodeEditor;
export const demos = [
{
name: 'Simple code editor (only JS support)',
render: () => <CodeEditor placeHolder={'//I am editable, try change me!'} id="example1" />,
render: () => <CodeEditor defaultValue={'//I am editable, try change me!'} id="example1" />,
},
];
12 changes: 7 additions & 5 deletions src/components/CodeEditor/CodeEditor.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ export default class CodeEditor extends React.Component {
constructor(props) {
super(props);

this.state = { code: '' };
this.state = {
code: this.props.defaultValue || '',
};
}

get value() {
return this.state.code || this.props.placeHolder;
return this.state.code;
}

set value(code) {
this.setState({ code });
}

render() {
const { placeHolder, fontSize = 18 } = this.props;
const { fontSize = 18 } = this.props;
const { code } = this.state;

return (
Expand All @@ -43,7 +45,7 @@ export default class CodeEditor extends React.Component {
showGutter={true}
highlightActiveLine={true}
width="100%"
value={code || placeHolder}
value={code}
enableBasicAutocompletion={true}
enableLiveAutocompletion={true}
enableSnippets={false}
Expand All @@ -56,5 +58,5 @@ export default class CodeEditor extends React.Component {

CodeEditor.propTypes = {
fontSize: PropTypes.number.describe('Font size of the editor'),
placeHolder: PropTypes.string.describe('Code place holder'),
defaultValue: PropTypes.string.describe('Default Code'),
};
10 changes: 6 additions & 4 deletions src/dashboard/Data/Playground/Playground.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ import { CurrentApp } from 'context/currentApp';

import styles from './Playground.scss';

const DEFAULT_CODE_EDITOR_VALUE = `const myObj = new Parse.Object('MyClass');
myObj.set('myField', 'Hello World!')
await myObj.save();
console.log(myObj);`;

export default class Playground extends Component {
static contextType = CurrentApp;
constructor() {
Expand Down Expand Up @@ -141,10 +146,7 @@ export default class Playground extends Component {
<Toolbar section={this.section} subsection={this.subsection} />
<div style={{ minHeight: '25vh' }}>
<CodeEditor
placeHolder={`const myObj = new Parse.Object('MyClass');
myObj.set('myField', 'Hello World!')
await myObj.save();
console.log(myObj);`}
defaultValue={DEFAULT_CODE_EDITOR_VALUE}
ref={editor => (this.editor = editor)}
/>
<div className={styles['console-ctn']}>
Expand Down
Loading