From 359448eb69144bb6dee53e6878235837817b7fd6 Mon Sep 17 00:00:00 2001
From: Julien <32807437+julien-me@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:13:39 +0800
Subject: [PATCH] Chore: Regression: Revert changes made to the note list'
 height (#7823)

---
 .../gui/NoteListControls/NoteListControls.tsx          |  3 ++-
 .../gui/NoteListWrapper/NoteListWrapper.tsx            | 10 +++++++---
 packages/lib/theme.ts                                  |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
index edf319ca57..ef53e2e612 100644
--- a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
+++ b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx
@@ -17,12 +17,13 @@ interface Props {
 	sortOrderField: string;
 	sortOrderReverse: boolean;
 	notesParentType: string;
+	height: number;
 }
 
 const StyledRoot = styled.div`
 	box-sizing: border-box;
+	height: ${(props: any) => props.height}px;
 	display: flex;
-	height: auto;
 	flex-direction: column;
 	padding: ${(props: any) => props.theme.mainPadding}px;
 	background-color: ${(props: any) => props.theme.backgroundColor3};
diff --git a/packages/app-desktop/gui/NoteListWrapper/NoteListWrapper.tsx b/packages/app-desktop/gui/NoteListWrapper/NoteListWrapper.tsx
index 0167c1b89d..a0f4a6ca3d 100644
--- a/packages/app-desktop/gui/NoteListWrapper/NoteListWrapper.tsx
+++ b/packages/app-desktop/gui/NoteListWrapper/NoteListWrapper.tsx
@@ -1,3 +1,4 @@
+import { themeStyle } from '@joplin/lib/theme';
 import * as React from 'react';
 import { useMemo } from 'react';
 import NoteList from '../NoteList/NoteList';
@@ -20,16 +21,19 @@ const StyledRoot = styled.div`
 `;
 
 export default function NoteListWrapper(props: Props) {
+	const theme = themeStyle(props.themeId);
+	const controlHeight = theme.topRowHeight;
+
 	const noteListSize = useMemo(() => {
 		return {
 			width: props.size.width,
-			height: props.size.height,
+			height: props.size.height - controlHeight,
 		};
-	}, [props.size]);
+	}, [props.size, controlHeight]);
 
 	return (
 		<StyledRoot>
-			<NoteListControls />
+			<NoteListControls height={controlHeight}/>
 			<NoteList resizableLayoutEventEmitter={props.resizableLayoutEventEmitter} size={noteListSize} visible={props.visible}/>
 		</StyledRoot>
 	);
diff --git a/packages/lib/theme.ts b/packages/lib/theme.ts
index d8dfb24a6b..6953397b73 100644
--- a/packages/lib/theme.ts
+++ b/packages/lib/theme.ts
@@ -60,7 +60,7 @@ const globalStyle: any = {
 	toolbarPadding: 6,
 	appearance: 'light',
 	mainPadding: 12,
-	topRowHeight: 50,
+	topRowHeight: 81,
 	editorPaddingLeft: 8,
 };