From 197fc6fa38d3fb170f94755ba66416e7e27f55f3 Mon Sep 17 00:00:00 2001 From: Rivka Ungar Date: Sun, 6 Oct 2024 10:54:32 +0300 Subject: [PATCH] fix: keep current drop shadow with stroke on dark theme (#2451) --- .../DialogContentContainer/DialogContentContainer.module.scss | 2 +- packages/core/src/components/Dropdown/Dropdown.styles.js | 4 +++- .../__tests__/__snapshots__/Dropdown.snapshot.test.js.snap | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/core/src/components/DialogContentContainer/DialogContentContainer.module.scss b/packages/core/src/components/DialogContentContainer/DialogContentContainer.module.scss index 7c8de85604..b5a7fa727d 100644 --- a/packages/core/src/components/DialogContentContainer/DialogContentContainer.module.scss +++ b/packages/core/src/components/DialogContentContainer/DialogContentContainer.module.scss @@ -15,7 +15,7 @@ } .typePopover { - box-shadow: var(--experimental-dialog-border-in-dark-themes, var(--box-shadow-medium)); + box-shadow: var(--experimental-dialog-border-in-dark-themes, 0 0 0 0 transparent), var(--box-shadow-medium); border-radius: var(--border-radius-medium); background-color: var(--secondary-background-color); } diff --git a/packages/core/src/components/Dropdown/Dropdown.styles.js b/packages/core/src/components/Dropdown/Dropdown.styles.js index f7a573de97..cf6532c969 100644 --- a/packages/core/src/components/Dropdown/Dropdown.styles.js +++ b/packages/core/src/components/Dropdown/Dropdown.styles.js @@ -320,7 +320,9 @@ const menu = ...getFont(), color: getCSSVar("primary-text-color"), backgroundColor: getCSSVar("dialog-background-color"), - boxShadow: getCSSVar("experimental-dropdown-border-in-dark-themes", getCSSVar("box-shadow-small")) + boxShadow: `${getCSSVar("experimental-dropdown-border-in-dark-themes", "0 0 0 0 transparent")}, ${getCSSVar( + "box-shadow-small" + )}` }; if (!insideOverflowContainer && !insideOverflowWithTransformContainer) return baseStyle; diff --git a/packages/core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.snapshot.test.js.snap b/packages/core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.snapshot.test.js.snap index c89c69d1b8..36316e93b2 100644 --- a/packages/core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.snapshot.test.js.snap +++ b/packages/core/src/components/Dropdown/__tests__/__snapshots__/Dropdown.snapshot.test.js.snap @@ -79,7 +79,7 @@ exports[`Dropdown renders correctly snapshot driver should open menu on click if