diff --git a/src/assets/styles/app/_content.scss b/src/assets/styles/app/_content.scss
index 575b37871..ab82a8b59 100644
--- a/src/assets/styles/app/_content.scss
+++ b/src/assets/styles/app/_content.scss
@@ -158,6 +158,16 @@
                             text-decoration: underline;
                         }
                     }
+
+                    .liveEditorButton a,
+                    .liveEditorSplitButton a {
+                        padding: 0.75rem 0.5rem;
+                        font-weight: normal;
+
+                        &:hover {
+                            text-decoration: none;
+                        }
+                    }
                 }
             }
         }
diff --git a/src/views/liveeditor/LiveEditor.vue b/src/views/liveeditor/LiveEditor.vue
index 5f10d3b10..58b27e45c 100644
--- a/src/views/liveeditor/LiveEditor.vue
+++ b/src/views/liveeditor/LiveEditor.vue
@@ -1,6 +1,11 @@
 <template>
     <span v-if="showEditor">
-        <Button @click="postSandboxParameters()" label="Edit in CodeSandbox" class="liveEditorButton" />
+        <template v-if="!editComposition">
+        <Button @click="postSandboxParameters('core')" label="Edit in CodeSandbox" class="liveEditorButton" />
+        </template>
+        <template v-else>
+            <SplitButton :model="items" label="Edit in CodeSandbox" class="liveEditorSplitButton" />
+        </template>
     </span>
 </template>
 
@@ -10,9 +15,18 @@ export default {
     data() {
         return {
             sandbox_id: null,
-            showCodeHighlight: false
+            showCodeHighlight: false,
+            items: [
+                {label: "Core", command: () => { this.postSandboxParameters('core') }},
+                {label: "Composition API", command: () => { this.postSandboxParameters('api') }}
+            ],
+            editComposition: false
         }
     },
+    mounted() {
+        if(this.sources.api) this.editComposition = true;
+        else this.editComposition = false;
+    },
     props: {
         name: {
             type: String,
@@ -48,14 +62,14 @@ export default {
         }
     },
     methods: {
-        postSandboxParameters() {
+        postSandboxParameters(sourceType) {
             fetch('https://codesandbox.io/api/v1/sandboxes/define?json=1', {
                 method: "POST",
                 headers: {
                     'Content-Type': 'application/json',
                     'Accept': 'application/json'
                 },
-                body: JSON.stringify(this.getSandboxParameters())
+                body: JSON.stringify(this.getSandboxParameters(sourceType))
             })
             .then(response => response.json())
             .then(data => window.open(`https://codesandbox.io/s/${data.sandbox_id}`, '_blank'))
@@ -79,11 +93,16 @@ export default {
                                 'primeflex': dependencies['primeflex'],
                                 'primeicons': 'latest',
                                 '@babel/cli': dependencies['@babel/cli'],
-                                '@vue/cli-plugin-babel': dependencies['@vue/cli-plugin-babel'],
-                                '@vue/cli-service': dependencies['@vue/cli-service'],
-                                '@vue/compiler-sfc': dependencies['@vue/compiler-sfc'],
                                 'core-js': dependencies['core-js']
                             },
+                            devDependencies: {
+                                '@vue/cli-plugin-babel': dependencies['@vue/cli-plugin-babel'],
+                                '@vue/cli-plugin-eslint': dependencies['@vue/cli-plugin-eslint'],
+                                '@vue/cli-service': dependencies['@vue/cli-service'],
+                                '@vue/compiler-sfc': dependencies['@vue/compiler-sfc'],
+                                'eslint': dependencies['eslint'],
+                                'eslint-plugin-vue': dependencies['eslint-plugin-vue']
+                            }
                         }
                     },
                     'babel.config.js': {
@@ -114,22 +133,34 @@ export default {
             }
         },
 
-        getSandboxParameters() {
+        getSandboxParameters(sourceType) {
             let name = this.name;
             let extension = '.vue';
             let extDependencies = this.dependencies || {};
             let content = this.sources.template.content;
             let style = this.sources.template.style || '';
+            let api = this.sources.api ?  this.sources.api.content : '';
             let scriptText = 'script';
             let _files = {}, importElement = '', element = '', components = '', imports = '', directives = '';
 
-            _files[`src/components/${name}${extension}`] = {       
+            if(sourceType === 'core') {
+                _files[`src/components/${name}${extension}`] = {       
                 content: `${content}
 </${scriptText}>
 
 ${style}`   
+                }
             }
 
+            else if(sourceType === 'api') {
+                _files[`src/components/${name}${extension}`] = {       
+                content: `${api}
+</${scriptText}>
+`   
+                }
+            }
+            
+
             let mittComponents = ['ToastDemo', 'OrganizationChartDemo', 'ConfirmDialogDemo', 'ConfirmPopupDemo', 'TerminalDemo', 'SplitButtonDemo', 'DeferredContentDemo', 'OverlayPanelDemo', 'FileUploadDemo'];
 
             mittComponents.forEach(cmp => {
@@ -530,4 +561,13 @@ ${services[this.service]}
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+.liveEditorSplitButton {
+    color: red;
+    a:hover {
+        text-decoration: none;
+    }
+}
+</style>
\ No newline at end of file