Skip to content

Fix errors such as "org.jetbrains.dokka.model.DClass ScrollState cannot be merged with org.jetbrains.dokka.model.DObject ScrollState" in dokkaGeneratePublicationHtml #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShreckYe merged 5 commits into from
Mar 22, 2026
Merged

Fix errors such as "org.jetbrains.dokka.model.DClass ScrollState cannot be merged with org.jetbrains.dokka.model.DObject ScrollState" in dokkaGeneratePublicationHtml #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ce698b
Initial plan
Copilot Mar 21, 2026
3c287b5
Fix Dokka DClass/DObject merge error for ScrollState and LazyItemScope
Copilot Mar 21, 2026
d802de5
Add some comments and simplify
ShreckYe Mar 21, 2026
dba83da
Complete PR: update workflow to deploy Dokka API docs to GitHub Pages…
Copilot Mar 21, 2026
5b0ad22
Revert "Complete PR: update workflow to deploy Dokka API docs to GitH…
ShreckYe Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/Scroll.js.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ val imitateComposeUiLayoutHorizontalScrollPlatformModifier =

@Composable
actual fun rememberScrollState(initial: Int): ScrollState =
ScrollState
ScrollState()


// used to be `actual object`, but but Dokka fails with it
@Stable
actual object ScrollState
actual class ScrollState

actual fun Modifier.verticalScroll(state: ScrollState): Modifier =
platformModify { verticalScroll() }
Expand Down
4 changes: 2 additions & 2 deletions common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyDsl.js.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ actual class LazyListScope {
contentType: Any?,
content: @Composable LazyItemScope.() -> Unit,
) =
addComposable { LazyItemScope.content() }
addComposable { LazyItemScope().content() }

actual fun items(
count: Int,
Expand All @@ -39,7 +39,7 @@ actual class LazyListScope {
) =
addComposable {
repeat(count) { index ->
LazyItemScope.itemContent(index)
LazyItemScope().itemContent(index)
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion common/src/jsMain/kotlin/com/huanshankeji/compose/foundation/lazy/LazyItemScope.js.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import com.huanshankeji.compose.ui.Modifier
@LazyScopeMarker
@JvmDefaultWithCompatibility
*/
actual object LazyItemScope {
// used to be `actual object`, with which Dokka fails
actual class LazyItemScope {
// I am not sure whether these implementations work perfectly.

actual fun Modifier.fillParentMaxSize(
Expand Down
Loading