Make back button dismiss open modal
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2020-11-20 12:35:42 -06:00
parent 8dde908b97
commit d954777b89
9 changed files with 82 additions and 7 deletions

View File

@@ -122,7 +122,7 @@
</ion-content>
<ion-footer>
<ion-buttons>
<ion-buttons style="padding: 10px;">
<ion-button (click)="onAddColumnClick()" fill="outline">Add Column</ion-button>
<ion-button (click)="dismissModal(true)" color="success" fill="outline">Save</ion-button>
</ion-buttons>

View File

@@ -146,12 +146,22 @@ export class DatabaseComponent extends EditorNodeContract implements OnInit {
const modal = await this.modals.create({
component: ColumnsComponent,
componentProps: {columnSets: this.columnDefs},
cssClass: 'modal-med',
});
modal.onDidDismiss().then(result => {
this.setColumns(result.data);
if ( result?.data ) {
this.setColumns(result.data);
}
});
const modalState = {
modal : true,
desc : 'Manage Columns'
};
history.pushState(modalState, null);
await modal.present();
}

View File

@@ -50,6 +50,14 @@ export class ParagraphEditorComponent implements ICellEditorAngularComp, AfterVi
this.value = String(value.data);
this.finishEdit();
});
const modalState = {
modal : true,
desc : 'Paragraph editor'
};
history.pushState(modalState, null);
modal.present();
});
});

View File

@@ -15,7 +15,6 @@ export class ParagraphModalComponent {
) {}
dismissModal() {
console.log(this.value);
this.modals.dismiss(this.value);
}
}

View File

@@ -50,6 +50,14 @@ export class WysiwygEditorComponent implements ICellEditorAngularComp, AfterView
this.value = String(value.data);
this.finishEdit();
});
const modalState = {
modal : true,
desc : 'WYSIWYG editor'
};
history.pushState(modalState, null);
modal.present();
});
});

View File

@@ -125,6 +125,13 @@ export class FormInputComponent extends EditorNodeContract implements OnInit {
}
});
const modalState = {
modal : true,
desc : 'Form input editor'
};
history.pushState(modalState, null);
await modal.present();
}
}