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