Merge branch 'master' of github.com:Budibase/budibase into issue#9

packages/bootstrap-components/src/Form.svelte

@@ -1,5 +1,5 @@
 <script>
-export let containerClass = "";
+
 export let formControls = [];
 
 export let _bb;
@@ -24,7 +24,7 @@ $ : {
                 _bb.insertComponent(
                     _bb.props.formControls[el].control,
                     htmlElements[el],
-                    labelElements[el]);
+                    htmlElements[el].childNodes.find(n => n.tagName === "LABEL"));
             } else {
                 _bb.appendComponent(
                     _bb.props.formControls[el].control,
@@ -38,9 +38,9 @@ $ : {
 </script>
 
 <form>
-    {#each formControls as child, index}
+    {#each formControls as child, idx}
-    <div class="form-group" bind:this={htmlElements[index]}>
+    <div class="form-group" bind:this={htmlElements[idx]}>
-        <label bind:this={labelElements[index]}>{labels[index]}</label>
+        <label>{labels[idx]}</label>
     </div>
     {/each}
 </form>

packages/builder/src/common/Modal.svelte

@@ -11,7 +11,7 @@ let listenerAdded = false;
 $: {
     if(ukModal && !listenerAdded) {
         listenerAdded = true;
-        ukModal.addEventListener("hide", onClosed);
+        ukModal.addEventListener("hidden", onClosed);
     }
 
     if(ukModal) {

packages/builder/src/database/RecordView.svelte

@@ -39,6 +39,7 @@ store.subscribe($store => {
         editingField = true;
     }
 
+
     onFinishedFieldEdit = (field) => {
         if(field) {
             store.saveField(field);
@@ -139,7 +140,7 @@ const nameChanged = ev => {
     {/if}
 
     {#if editingField}
-    <Modal bind:isOpen={editingField}>
+    <Modal bind:isOpen={editingField} onClosed={() => onFinishedFieldEdit(false) }>
         <FieldView field={fieldToEdit} 
                    onFinished={onFinishedFieldEdit}
                    allFields={record.fields}