From 5a04caa03e83896f1e18144d698d5c0cdf715b34 Mon Sep 17 00:00:00 2001 From: Shamil Frontend Date: Tue, 19 Jan 2021 10:58:59 +0300 Subject: [PATCH 1/6] done --- .../QMessageBox/src/QMessageBox.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/qComponents/QMessageBox/src/QMessageBox.vue b/src/qComponents/QMessageBox/src/QMessageBox.vue index 43fdb374..22c25add 100644 --- a/src/qComponents/QMessageBox/src/QMessageBox.vue +++ b/src/qComponents/QMessageBox/src/QMessageBox.vue @@ -22,7 +22,10 @@ @click="handleShadowClick" /> -
+
{{ title }}
@@ -175,6 +178,13 @@ export default { componentProps: { type: Object, default: () => ({}) + }, + /** + * Message Container width + */ + width: { + type: [String, Number], + default: '' } }, @@ -192,6 +202,12 @@ export default { computed: { isActionsSectionShown() { return Boolean(this.confirmButtonText) || Boolean(this.cancelButtonText); + }, + + containerStyle() { + return { + width: Number(this.width) ? `${Number(this.width)}px` : this.width + }; } }, From e5d76135fa2593f5d8d7f191c1d4d26edd2f4210 Mon Sep 17 00:00:00 2001 From: Shamil Frontend Date: Tue, 19 Jan 2021 11:04:16 +0300 Subject: [PATCH 2/6] refactoring --- src/qComponents/QMessageBox/src/QMessageBox.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qComponents/QMessageBox/src/QMessageBox.vue b/src/qComponents/QMessageBox/src/QMessageBox.vue index 22c25add..77f27753 100644 --- a/src/qComponents/QMessageBox/src/QMessageBox.vue +++ b/src/qComponents/QMessageBox/src/QMessageBox.vue @@ -23,7 +23,7 @@ />
@@ -180,7 +180,7 @@ export default { default: () => ({}) }, /** - * Message Container width + * width of Message container */ width: { type: [String, Number], @@ -204,7 +204,7 @@ export default { return Boolean(this.confirmButtonText) || Boolean(this.cancelButtonText); }, - containerStyle() { + containerStyles() { return { width: Number(this.width) ? `${Number(this.width)}px` : this.width }; From 6160db653803b91e672793a436dcd7aedf45c40d Mon Sep 17 00:00:00 2001 From: Shamil Frontend Date: Tue, 19 Jan 2021 12:11:46 +0300 Subject: [PATCH 3/6] refactoring --- src/qComponents/QMessageBox/src/QMessageBox.vue | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/qComponents/QMessageBox/src/QMessageBox.vue b/src/qComponents/QMessageBox/src/QMessageBox.vue index 77f27753..fd94b27c 100644 --- a/src/qComponents/QMessageBox/src/QMessageBox.vue +++ b/src/qComponents/QMessageBox/src/QMessageBox.vue @@ -179,12 +179,10 @@ export default { type: Object, default: () => ({}) }, - /** - * width of Message container - */ - width: { - type: [String, Number], - default: '' + + containerStyles: { + type: Object, + default: () => ({}) } }, @@ -202,12 +200,6 @@ export default { computed: { isActionsSectionShown() { return Boolean(this.confirmButtonText) || Boolean(this.cancelButtonText); - }, - - containerStyles() { - return { - width: Number(this.width) ? `${Number(this.width)}px` : this.width - }; } }, From 7c7bd5a08299ff599ecc3c125efe64155e6e3e66 Mon Sep 17 00:00:00 2001 From: Shamil Frontend Date: Tue, 19 Jan 2021 15:54:58 +0300 Subject: [PATCH 4/6] refactoring --- src/qComponents/QMessageBox/src/QMessageBox.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qComponents/QMessageBox/src/QMessageBox.vue b/src/qComponents/QMessageBox/src/QMessageBox.vue index fd94b27c..749d931d 100644 --- a/src/qComponents/QMessageBox/src/QMessageBox.vue +++ b/src/qComponents/QMessageBox/src/QMessageBox.vue @@ -7,6 +7,7 @@ v-if="isShown" ref="messageBox" class="q-message-box" + :class="rootClasses" :style="{ zIndex }" tabindex="-1" @keyup.esc="closeBox" @@ -179,10 +180,9 @@ export default { type: Object, default: () => ({}) }, - - containerStyles: { - type: Object, - default: () => ({}) + rootClasses: { + type: [String, Object, Array], + default: null } }, From a977a2335b83a4979d1520ffa9abbc96ffa76b48 Mon Sep 17 00:00:00 2001 From: Shamil Frontend Date: Tue, 19 Jan 2021 16:10:52 +0300 Subject: [PATCH 5/6] refactoring --- src/qComponents/QMessageBox/src/QMessageBox.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qComponents/QMessageBox/src/QMessageBox.vue b/src/qComponents/QMessageBox/src/QMessageBox.vue index 749d931d..aa9b6193 100644 --- a/src/qComponents/QMessageBox/src/QMessageBox.vue +++ b/src/qComponents/QMessageBox/src/QMessageBox.vue @@ -23,10 +23,7 @@ @click="handleShadowClick" /> -
+
{{ title }}
From 0fdb0dff1459dd7f8b694cc30214e714fd8b8f09 Mon Sep 17 00:00:00 2001 From: Shamil Frontend Date: Wed, 20 Jan 2021 12:07:51 +0300 Subject: [PATCH 6/6] fix by comment --- src/qComponents/QMessageBox/src/QMessageBox.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qComponents/QMessageBox/src/QMessageBox.vue b/src/qComponents/QMessageBox/src/QMessageBox.vue index aa9b6193..b6d8723f 100644 --- a/src/qComponents/QMessageBox/src/QMessageBox.vue +++ b/src/qComponents/QMessageBox/src/QMessageBox.vue @@ -7,7 +7,7 @@ v-if="isShown" ref="messageBox" class="q-message-box" - :class="rootClasses" + :class="wrapClass" :style="{ zIndex }" tabindex="-1" @keyup.esc="closeBox" @@ -177,7 +177,7 @@ export default { type: Object, default: () => ({}) }, - rootClasses: { + wrapClass: { type: [String, Object, Array], default: null }