From f5b785ec3f9a32f1e1ef14dfc50c4a65bc8ac478 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Wed, 13 Sep 2023 14:35:01 -0700 Subject: [PATCH 1/5] Possible soln 1: add a class w/ min height instead of calculated height --- ui/app/styles/components/confirm.scss | 4 ++++ ui/lib/core/addon/templates/components/confirm.hbs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/app/styles/components/confirm.scss b/ui/app/styles/components/confirm.scss index b0754acbaa58..07714b42f7ad 100644 --- a/ui/app/styles/components/confirm.scss +++ b/ui/app/styles/components/confirm.scss @@ -10,6 +10,10 @@ box-shadow: $box-shadow, $box-shadow-middle; } +.confirm-height { + min-height: 148px; +} + .confirm { transition: transform $speed; padding-top: 2px; diff --git a/ui/lib/core/addon/templates/components/confirm.hbs b/ui/lib/core/addon/templates/components/confirm.hbs index 395607621c13..c5c6927f9de1 100644 --- a/ui/lib/core/addon/templates/components/confirm.hbs +++ b/ui/lib/core/addon/templates/components/confirm.hbs @@ -5,7 +5,7 @@ {{! template-lint-disable no-inline-styles}} -
+
{{yield (hash From 5fa9b6859fefc39281aa790d4ffa666922455ab5 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Wed, 13 Sep 2023 14:38:19 -0700 Subject: [PATCH 2/5] Possible soln 2: apply style using native js --- ui/lib/core/addon/components/confirm.js | 5 +---- ui/lib/core/addon/templates/components/confirm.hbs | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ui/lib/core/addon/components/confirm.js b/ui/lib/core/addon/components/confirm.js index 306d3623e2c4..9d621f60f83b 100644 --- a/ui/lib/core/addon/components/confirm.js +++ b/ui/lib/core/addon/components/confirm.js @@ -32,9 +32,6 @@ export default Component.extend({ openTrigger: null, height: 0, focusTrigger: null, - style: computed('height', function () { - return `height: ${this.height}px`; - }), wormholeReference: null, wormholeId: computed('elementId', function () { return `confirm-${this.elementId}`; @@ -51,7 +48,7 @@ export default Component.extend({ const height = this.openTrigger ? this.element.querySelector('.confirm-overlay').clientHeight : this.element.querySelector('.confirm').clientHeight; - this.set('height', height); + this.element.querySelector('.confirm-wrapper').style = `height: ${height}px;`; }, actions: { onTrigger: function (itemId, e) { diff --git a/ui/lib/core/addon/templates/components/confirm.hbs b/ui/lib/core/addon/templates/components/confirm.hbs index c5c6927f9de1..bf6a32d698ac 100644 --- a/ui/lib/core/addon/templates/components/confirm.hbs +++ b/ui/lib/core/addon/templates/components/confirm.hbs @@ -3,9 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 ~}} -{{! template-lint-disable no-inline-styles}} - -
+
{{yield (hash From 12511b7fe64b40010c1bba2fe31c3f11b84a9ff5 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 14 Sep 2023 08:30:34 -0700 Subject: [PATCH 3/5] Remove confirm-height style --- ui/app/styles/components/confirm.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ui/app/styles/components/confirm.scss b/ui/app/styles/components/confirm.scss index 07714b42f7ad..b0754acbaa58 100644 --- a/ui/app/styles/components/confirm.scss +++ b/ui/app/styles/components/confirm.scss @@ -10,10 +10,6 @@ box-shadow: $box-shadow, $box-shadow-middle; } -.confirm-height { - min-height: 148px; -} - .confirm { transition: transform $speed; padding-top: 2px; From eaa32fa764af7f1e012be692deecac5fff9a9110 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 14 Sep 2023 10:35:19 -0700 Subject: [PATCH 4/5] Add changelog --- changelog/23066.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/23066.txt diff --git a/changelog/23066.txt b/changelog/23066.txt new file mode 100644 index 000000000000..bcfe838e331e --- /dev/null +++ b/changelog/23066.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: Fix issue confirm dropdown is being cut off +``` From 103395c9d56b9cfbf53766e52cf70f50b11b6a75 Mon Sep 17 00:00:00 2001 From: Kianna Quach Date: Thu, 14 Sep 2023 10:50:10 -0700 Subject: [PATCH 5/5] Fix changelog --- changelog/23066.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/23066.txt b/changelog/23066.txt index bcfe838e331e..f4636b97dbb0 100644 --- a/changelog/23066.txt +++ b/changelog/23066.txt @@ -1,3 +1,3 @@ ```release-note:bug -ui: Fix issue confirm dropdown is being cut off +ui: Fix the issue where confirm delete dropdown is being cut off ```