mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 16:23:44 +00:00
PM-19361 Notification bar dropdown folder component displays "No Folder" twice (#13924)
* PM-19361 - Remove default folder option - Edit iFrame height * revert testing change
This commit is contained in:
@@ -60,23 +60,18 @@ export function NotificationButtonRow({
|
|||||||
)
|
)
|
||||||
: ([] as Option[]);
|
: ([] as Option[]);
|
||||||
|
|
||||||
const noFolderOption: Option = {
|
|
||||||
default: true,
|
|
||||||
icon: Folder,
|
|
||||||
text: "No folder", // @TODO localize
|
|
||||||
value: "0",
|
|
||||||
};
|
|
||||||
const folderOptions: Option[] = folders?.length
|
const folderOptions: Option[] = folders?.length
|
||||||
? folders.reduce(
|
? folders.reduce<Option[]>(
|
||||||
(options, { id, name }: FolderView) => [
|
(options, { id, name }: FolderView) => [
|
||||||
...options,
|
...options,
|
||||||
{
|
{
|
||||||
icon: Folder,
|
icon: Folder,
|
||||||
text: name,
|
text: name,
|
||||||
value: id,
|
value: id === null ? "0" : id,
|
||||||
|
default: id === null,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
[noFolderOption],
|
[],
|
||||||
)
|
)
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
|
|||||||
@@ -880,7 +880,7 @@ async function loadNotificationBar() {
|
|||||||
|
|
||||||
const baseStyle = useComponentBar
|
const baseStyle = useComponentBar
|
||||||
? isNotificationFresh
|
? isNotificationFresh
|
||||||
? "height: calc(276px + 25px); width: 450px; right: 0; transform:translateX(100%); opacity:0;"
|
? "height: calc(276px + 50px); width: 450px; right: 0; transform:translateX(100%); opacity:0;"
|
||||||
: "height: calc(276px + 25px); width: 450px; right: 0; transform:translateX(0%); opacity:1;"
|
: "height: calc(276px + 25px); width: 450px; right: 0; transform:translateX(0%); opacity:1;"
|
||||||
: "height: 42px; width: 100%;";
|
: "height: 42px; width: 100%;";
|
||||||
|
|
||||||
@@ -910,7 +910,7 @@ async function loadNotificationBar() {
|
|||||||
function getFrameStyle(useComponentBar: boolean): string {
|
function getFrameStyle(useComponentBar: boolean): string {
|
||||||
return (
|
return (
|
||||||
(useComponentBar
|
(useComponentBar
|
||||||
? "height: calc(276px + 25px); width: 450px; right: 0;"
|
? "height: calc(276px + 50px); width: 450px; right: 0;"
|
||||||
: "height: 42px; width: 100%; left: 0;") +
|
: "height: 42px; width: 100%; left: 0;") +
|
||||||
" top: 0; padding: 0; position: fixed;" +
|
" top: 0; padding: 0; position: fixed;" +
|
||||||
" z-index: 2147483647; visibility: visible;"
|
" z-index: 2147483647; visibility: visible;"
|
||||||
|
|||||||
Reference in New Issue
Block a user