Switch to ace editor and improve build process for it

This commit is contained in:
Dane Everitt 2019-05-14 18:36:48 -07:00
parent 487128d00f
commit 6606eb1b1b
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 122 additions and 52 deletions

View file

@ -6,7 +6,20 @@
<Icon name="x" aria-label="Close modal" role="button"/>
</div>
<MessageBox class="alert error mb-8" title="Error" :message="error" v-if="error"/>
<div id="editor" class="h-full"></div>
<div id="editor"></div>
<div class="flex mt-4 bg-white rounded p-2">
<div class="flex-1">
<select v-on:change="updateFileLanguage">
<option v-for="item in supportedTypes" :value="item.type">{{ item.name }}</option>
</select>
</div>
<button class="btn btn-secondary btn-sm" v-on:click="isVisible = false">
Cancel
</button>
<button class="ml-2 btn btn-primary btn-sm">
Save
</button>
</div>
</div>
</div>
</transition>
@ -18,19 +31,47 @@
import MessageBox from "@/components/MessageBox.vue";
import {ApplicationState} from '@/store/types';
import {mapState} from "vuex";
// @ts-ignore
import CodeFlask from "codeflask";
import * as Ace from 'brace';
interface Data {
error: string | null,
editor: Ace.Editor | null,
isVisible: boolean,
isLoading: boolean,
supportedTypes: {type: string, name: string}[],
}
export default Vue.extend({
name: 'NewFileModal',
components: {Icon, MessageBox},
data: function (): { error: string | null, isVisible: boolean, isLoading: boolean } {
data: function (): Data {
return {
error: null,
editor: null,
isVisible: false,
isLoading: false,
supportedTypes: [
{type: 'dockerfile', name: 'Docker'},
{type: 'golang', name: 'Go'},
{type: 'html', name: 'HTML'},
{type: 'java', name: 'Java'},
{type: 'javascript', name: 'Javascript'},
{type: 'json', name: 'JSON'},
{type: 'kotlin', name: 'Kotlin'},
{type: 'lua', name: 'Lua'},
{type: 'markdown', name: 'Markdown'},
{type: 'plain_text', name: 'Text'},
{type: 'php', name: 'PHP'},
{type: 'properties', name: 'Properties'},
{type: 'python', name: 'Python'},
{type: 'ruby', name: 'Ruby'},
{type: 'sh', name: 'Shell'},
{type: 'sql', name: 'SQL'},
{type: 'xml', name: 'XML'},
{type: 'yaml', name: 'YAML'},
],
};
},
@ -43,13 +84,11 @@
this.isVisible = true;
this.$nextTick(() => {
const flask = new CodeFlask('#editor', {
language: 'js',
lineNumbers: true,
});
flask.updateCode('');
})
this.editor = Ace.edit('editor');
this.loadDependencies()
.then(() => this.loadLanguages())
.then(() => this.configureEditor());
});
});
},
@ -57,12 +96,67 @@
submit: function () {
},
updateFileLanguage: function (e: MouseEvent) {
if (!this.editor) {
return;
}
this.editor.getSession().setMode(`ace/mode/${(<HTMLSelectElement>e.target).value}`);
},
loadLanguages: function (): Promise<any[]> {
return Promise.all(
this.supportedTypes.map(o => import(
/* webpackChunkName: "ace_editor" */
/* webpackMode: "lazy-once" */
/* webpackInclude: /(dockerfile|golang|html|java|javascript|json|kotlin|lua|markdown|plain_text|php|properties|python|ruby|sh|sql|xml|yaml).js$/ */
`brace/mode/${o.type}`
))
);
},
loadDependencies: function (): Promise<any[]> {
return Promise.all([
// @ts-ignore
import(/* webpackChunkName: "ace_editor" */ 'brace/ext/whitespace'),
// @ts-ignore
import(/* webpackChunkName: "ace_editor" */ 'brace/ext/modelist'),
// @ts-ignore
import(/* webpackChunkName: "ace_editor" */ 'brace/theme/chrome'),
]);
},
configureEditor: function () {
if (!this.editor) {
return;
}
// const modelist = Ace.acequire('brace/ext/whitespace');
const whitespace = Ace.acequire('ace/ext/whitespace');
this.editor.setTheme('ace/theme/chrome');
this.editor.setOptions({
fontFamily: '"SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace',
});
this.editor.getSession().setUseWrapMode(true);
this.editor.setShowPrintMargin(true);
whitespace.commands.forEach((c: Ace.EditorCommand) => {
this.editor!.commands.addCommand(c);
});
whitespace.detectIndentation(this.editor.session);
}
}
})
</script>
<style>
#editor > .codeflask {
@apply .rounded;
#editor {
@apply .h-full .relative;
}
.ace_editor {
@apply .rounded .p-1;
}
</style>