Merge branch 'main' into release

Redeploy to GitHub Pages with the Dokka task fixed.

Author: ShreckYe

CHANGELOG.md

@@ -1,4 +1,105 @@
-# Change log
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.6.0] - 2026-03-31
+
+### Added
+
+#### Common
+
+- Add `ExperimentalApi` and `LikelyInconsistentApi` opt-in annotations.
+- Add `VerticalScrollColumn`, `HorizontalScrollRow`, `VerticalScrollBox`, and `HorizontalScrollBox` scrolling layout composables in the `layout.ext` package as replacements for the scroll modifiers (#95).
+- Initially add common text styling types (`SpanStyle`, `FontStyle`, `FontWeight`, `TextDecoration`, `TextAlign`, `TextOverflow`, `TextUnit`) and styled text composable overloads with `AnnotatedString` support (`buildAnnotatedString`, `withStyle`) (#124).
+- Use `ResizeObserver` to react to size changes on JS DOM in `BoxWithConstraints` (#51).
+
+#### Material 3
+
+- Add unified wrapper components for remaining Material 3 components based on [Compose HTML Material](https://github.com/huanshankeji/compose-html-material) [PR #21](https://github.com/huanshankeji/compose-html-material/pull/21) and [PR #32](https://github.com/huanshankeji/compose-html-material/pull/32) (which depends on [maicol07/material-web-additions](https://github.com/maicol07/material-web-additions)) (#70, #72):
+  - badge: `Badge` (deprecated) in `ext`
+  - chip: `AssistChip`, `FilterChip`, `InputChip`, `SuggestionChip` (and elevated variants) in `ext`
+  - dialog: `AlertDialog` and `SimpleDialog`
+  - divider: `HorizontalDivider`
+  - navigation drawer: `ModalNavigationDrawer` (deprecated, may be replaced with navigation rails in the future)
+  - radio button: `RadioButton`, and `RadioButtonRow` and `radioGroup` in `ext`, like the existing ones for Material 2
+  - segmented button: `SingleChoiceSegmentedButtonRow`, `MultiChoiceSegmentedButtonRow`, and scoped `SegmentedButton` in `ext`
+  - select: `FilledSelect`, `OutlinedSelect`, and `SelectOption` in `ext`
+  - slider: `Slider` and `RangeSlider`
+  - tab: `PrimaryTabRow`, `SecondaryTabRow`, and `PrimaryTab`, `SecondaryTab` in `ext`
+- Add the snackbar composables `SnackbarHost`, `SnackbarHostState`, and related types (`SnackbarVisuals`, `SnackbarData`, `SnackbarResult`, `SnackbarDuration`), similar to those for Material 2 (#91, #98).
+- Add the top app bar composables `TopAppBar`, `CenterAlignedTopAppBar`, `MediumTopAppBar`, `LargeTopAppBar` in `ext` (#91, #94).
+- Add the `Scaffold` composable with `FabPosition` enum (#103, #105).
+
+#### Material Icons
+
+- Support all common material icons with core and extended icon modules (#123).
+
+#### Navigation
+
+- Save the ViewModel states on JS DOM, especially during navigation (#55).
+
+#### ViewModel
+
+- Copy and adapt more ViewModel code from Compose Multiplatform, supporting `LocalViewModelStoreOwner` on JS DOM (#55).
+
+### Changed
+
+- Bump dependencies to the latest.
+  - Kotlin 2.3.20
+  - Compose Multiplatform 1.10.3
+  - Kobweb 0.24.0
+  - Compose HTML Material 0.5.0
+  - AGP 8.12.3
+  - Gradle 9.4.1
+  - JVM toolchain 17
+  - Android SDK 36
+- No longer publish the Material 2 module for release due to its decreasing popularity and the underlying KMDC library's incompatible Kotlin and Compose versions (kept for reference purposes).
+- Remove the Maven repository for Kobweb since it's published to Maven Central now.
+- Remove the `iosX64` targets.
+- Support ES2015 compilation target for JS DOM by replacing `require()` with ES module imports.
+- Use `Arrangement.spacedBy` from Kobweb (commit 53ff09f4d2aacfa7ec82c6afb6cfb352e8cc5e3a).
+
+### Deprecated
+
+- Deprecate the `Modifier.verticalScroll` and `Modifier.horizontalScroll` modifiers for external use. Use `VerticalScrollBox`/`VerticalScrollColumn` and `HorizontalScrollBox`/`HorizontalScrollRow` instead (#95).
+- Deprecate `ModalNavigationDrawer` upon review (may be replaced with navigation rails in the future).
+
+### Fixed
+
+- Fix `BoxWithConstraints` to react to size changes on JS DOM using `ResizeObserver` and fix its display issues (#51).
+- Fix `Column` component hiding content on JS DOM by moving max constraints from `imitateComposeUiLayout` to scroll modifiers (#95).
+- Fix typos in deprecation messages, comments, and CHANGELOG dates (#122).
+
+### Internal
+
+#### Added
+
+##### Documentation and Tooling
+
+- Add API documentation generated by Dokka hosted on [GitHub Pages](https://huanshankeji.github.io/compose-multiplatform-html-unified/) (#43).
+- Split GitHub Pages site into landing page, API docs, and side-by-side demo (#116).
+- Add `.github/copilot-instructions.md` for repository onboarding (#62, #65).
+- Add `AGENTS.md` and `copilot-setup-steps.yml`.
+- Add manual `api-dump` workflow on macOS (#128).
+
+#### Changed
+
+- Enable Gradle Configuration Cache (commit f0017ee475477c566d8a04d9280d8cd8d3052ee7).
+- Bump Dokka to 2.1.0 (#43).
+- Enable `kotlin.native.enableKlibsCrossCompilation` (commit 624955ddec49db603af36d52930d4a1417729059).
+- Refactor CI to use extracted actions (#57).
+- Port Maven publishing migration (#113).
+- Code clean-up: nullable composable patterns, null equality, trailing commas (#93).
+- Onboard with GitHub Copilot (#62, #65).
+
+#### Fixed
+
+- Fix the issue that `withAndroidTarget` was put in the wrong `group` in `applyDefaultHierarchyTemplate` (f13a85a).
 
 ## v0.5.0 / 2024-12-05
 
@@ -77,3 +178,6 @@ Support Material 3. See the Updated README.md for more details.
 ## v0.2.0 / 2024-04-17
 
 The project now depends on Kobweb Silk on Kotlin/JS (Compose HTML) and there is a universal multiplatform interface for `Modifier`, scopes, etc. akin to those in `androidx.compose`. Obsolete code including `ModifierOrAttrsScope` is moved to a legacy module.
+
+[Unreleased]: https://github.com/huanshankeji/compose-multiplatform-html-unified/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/huanshankeji/compose-multiplatform-html-unified/compare/v0.5.0...v0.6.0

README.md

@@ -115,7 +115,7 @@ com.huanshankeji:compose-multiplatform-html-unified-material3:$version
 - Icon: `Icon`
 - Icon button: `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`,
   `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
-- Navigation drawer: `ModalNavigationDrawer` (deprecated)
+- Navigation drawer: `ModalNavigationDrawer` (deprecated, may be replaced with navigation rails in the future)
 - Progress indicator: `LinearProgressIndicator`, `CircularProgressIndicator`
 - Radio button: `RadioButton`
 - Segmented button: `SingleChoiceSegmentedButtonRow`, `MultiChoiceSegmentedButtonRow`

build.gradle.kts

@@ -27,7 +27,7 @@ apiValidation {
 }
 
 dependencies {
-    subprojects.filter { it.name != demoProjectName }.forEach {
+    subprojects.filter { it.name != demoProjectName && it.buildFile.exists() }.forEach {
         dokka(it)
     }
 }

buildSrc/build.gradle.kts

@@ -16,6 +16,6 @@ dependencies {
     implementation("org.jetbrains.compose:compose-gradle-plugin:1.10.3")
     implementation("com.huanshankeji.team:gradle-plugins:0.11.0") // don't use a snapshot version in a main branch
     // https://developer.android.com/build/releases/gradle-plugin, https://mvnrepository.com/artifact/com.android.tools.build/gradle
-    implementation("com.android.tools.build:gradle:8.12.3")
+    implementation("com.android.tools.build:gradle:8.13.2")
     implementation("com.huanshankeji:common-gradle-dependencies:0.10.0-20251024") // don't use a snapshot version in a main branch
 }