From 562af402d97264d24e4ed49ea56b823f6bf88389 Mon Sep 17 00:00:00 2001 From: HapeLee <63206378+HapeLee@users.noreply.github.com> Date: Fri, 29 May 2026 01:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E6=9E=B6=E7=AE=A1=E7=90=86=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt | 1 + .../io/legado/app/ui/widget/components/list/ListScaffold.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt index 0b28de08e..70e92034c 100644 --- a/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt +++ b/app/src/main/java/io/legado/app/ui/book/manage/BookshelfManageScreen.kt @@ -468,6 +468,7 @@ private fun BookshelfManageScreen( searchKey = "" } }, + onClearSelection = clearSelection, onSearchQueryChange = { searchKey = it }, searchPlaceholder = "筛选书名/作者/书源/分组", topBarActions = { diff --git a/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt b/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt index e2421ce43..800b8b81c 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt @@ -55,6 +55,7 @@ fun ListScaffold( topBarActions: @Composable RowScope.() -> Unit = {}, bottomContent: @Composable (ColumnScope.(GlassTopAppBarScrollBehavior) -> Unit)? = null, dropDownMenuContent: @Composable (ColumnScope.(dismiss: () -> Unit) -> Unit)? = null, + onClearSelection: (() -> Unit)? = null, selectionActions: SelectionActions? = null, onAddClick: (() -> Unit)? = null, floatingActionButton: @Composable () -> Unit = { @@ -99,7 +100,7 @@ fun ListScaffold( onSearchSubmit = onSearchSubmit, searchTrailingIcon = searchTrailingIcon, searchPlaceholder = searchPlaceholder, - onClearSelection = { selectionActions?.onClearSelection?.invoke() }, + onClearSelection = { onClearSelection?.invoke() ?: selectionActions?.onClearSelection?.invoke() }, topBarActions = topBarActions, dropDownMenuContent = dropDownMenuContent, bottomContent = bottomContent