Skip to content

Commit cf57bc8

Browse files
committed
Merge branch 'material-3'
2 parents f921762 + 8306f71 commit cf57bc8

File tree

1 file changed

+47
-14
lines changed

1 file changed

+47
-14
lines changed

README.md

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This project is prototype and there is no documentation yet. Check out [the demo
1717

1818
### Components
1919

20-
#### Common (Foundation) components
20+
#### Foundation components
2121

2222
- `BasicText`
2323

@@ -30,35 +30,66 @@ This project is prototype and there is no documentation yet. Check out [the demo
3030
- `Box`
3131
- `Column` (via flexbox on web)
3232
- `Row` (via flexbox on web)
33+
- `Spacer`
3334

34-
#### Material components
35+
##### Lazy
36+
37+
- `LazyColumn`
38+
- `LazyRow`
39+
40+
#### Material 2 components
3541

3642
- `Button`
3743
- `Card`
44+
- `Checkbox`
45+
- `Divider` (not working properly on JS yet)
3846
- `Icon`
3947
- `IconButton`
40-
- `LazyColumn`/`ScrollableList` (visually inconsistent for now)
41-
- `Text`/`MaterialText`
42-
- `TextField`
43-
- `Checkbox`
44-
- `Divider` (visually inconsistent for now)
48+
- `Switch`
49+
- `Text`
4550

4651
##### `ext` components
4752

4853
- `Button`
4954
- `IconButton`
55+
- `RadioRow`, `RadioGroupRow`
56+
- `SwitchWithLabel`
57+
- `MaterialText`, `InlineText`
58+
- `TextField`, `OutlinedTextField`
5059
- `TopAppBarScaffold`
51-
- `InlineText`
52-
- `RadioRow`
53-
- `RadioGroupRow`
60+
61+
##### `lazy.ext` components
62+
63+
- `List`/`LazyColumnList` (visually inconsistent for now)
5464

5565
#### Material 3 components
5666

57-
- `Button`
67+
- `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton`
68+
- `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard`
69+
- `Checkbox`
70+
- `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`, `ExtendedFloatingActionButton`
71+
- `Icon`
72+
- `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`, `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
73+
- `Switch`
74+
- `Text`
75+
76+
##### `ext` components
77+
78+
- `Button` (`FilledButton`), `ElevatedButton`, `FilledTonalButton`, `OutlinedButton`, `TextButton`
79+
- `Card` (`FilledCard`), `ElevatedCard`, `OutlinedCard`
80+
- `FloatingActionButton`, `SmallFloatingActionButton`, `LargeFloatingActionButton`, `ExtendedFloatingActionButton`
81+
- `IconButton`, `IconToggleButton`, `FilledIconButton`, `FilledIconToggleButton`, `FilledTonalIconButton`, `FilledTonalIconToggleButton`, `OutlinedIconButton`, `OutlinedIconToggleButton`
82+
- `NavigationBar`, `NavigationBarItem`
83+
- `MaterialText`, `InlineText`
84+
- `TextField`, `OutlinedTextField`
85+
86+
##### `lazy.ext` components
87+
88+
- `List`/`LazyColumnList` (slightly visually inconsistent)
5889

59-
#### Components in the `ext` packages
90+
#### About `ext` components (components in the `ext` packages)
6091

61-
The components in the `ext` packages don't follow the `androidx.compose` APIs exactly, but rather provide wrappers are idiomatic and conventional on both kinds of targets, wrapping different APIs which can't be unified following the `androidx.compose` APIs.
92+
The components in the `ext` packages don't follow the `androidx.compose` APIs exactly, but rather provide wrappers are more idiomatic and conventional on both kinds of targets, wrapping different APIs which can't be unified following the `androidx.compose` APIs.
6293

6394
### Styles (obsolete in the legacy module, for removal)
6495

@@ -82,6 +113,8 @@ The functions in `StyleScope`:
82113
- `padding`
83114
- `background`
84115
- `border` (visually inconsistent)
116+
- `onClick`
117+
- `verticalScroll`, `horizontalScroll` (`ScrollState` not supported on JS yet)
85118

86119
#### `ext` modifiers
87120

@@ -108,7 +141,7 @@ repositories {
108141

109142
### Material Symbols & Icons on JS
110143

111-
See [the corresponding section in Compose HTML Material]() for Material Icons on JS.
144+
See [the corresponding section in Compose HTML Material](https://github.com/huanshankeji/compose-html-material?tab=readme-ov-file#material-symbols--icons) for Material Icons on JS.
112145

113146
## About Kobweb Silk
114147

0 commit comments

Comments
 (0)