"Twust"
diff --git a/examples/leptos-demo/src/main.rs b/examples/leptos-demo/src/main.rs
index bf35e89..2a952e5 100644
--- a/examples/leptos-demo/src/main.rs
+++ b/examples/leptos-demo/src/main.rs
@@ -3,13 +3,15 @@ mod app;
use app::*;
use leptos::*;
+use leptos_router::components::Router;
+
pub fn main() {
- _ = console_log::init_with_level(log::Level::Debug);
console_error_panic_hook::set_once();
-
- // logging::log!("csr mode - mounting to body");
-
- mount_to_body(|| {
- view! {
}
- });
+ leptos::mount::mount_to_body(|| {
+ view! {
+
+
+
+ }
+ })
}
diff --git a/tailwind/src/lib.rs b/tailwind/src/lib.rs
index 3b6191b..e8a078e 100644
--- a/tailwind/src/lib.rs
+++ b/tailwind/src/lib.rs
@@ -117,6 +117,11 @@ fn _invalid_group_usage_3() {}
fn _happy_paths() {
fn main() {
+ let _classnames = tw!("group-data-[selected=Right]:w-[30px]");
+ let _classnames = tw!("group-aria-[main-page=false]/main:hidden");
+ let _classnames = tw!("group-data-[main-page=false]/main:hidden");
+ let _classnames = tw!("*:overflow-scroll");
+
let _classnames = tw!("bg-taxvhiti bg-tahiti-500 bg-tahiti bg-midnight bg-red-50");
let _classnames = tw!("bg-taxvhiti bg-tahiti-500 bg-tahiti bg-midnight bg-purple bg-red-50 bg-tahiti-800 border-s-tahiti-800");
let _classnames = tw!("md:text-red-50 text-slate-50 text-purple text-tahiti-500");
diff --git a/twust-macro/src/config/classes.rs b/twust-macro/src/config/classes.rs
index 01effdf..1556eca 100644
--- a/twust-macro/src/config/classes.rs
+++ b/twust-macro/src/config/classes.rs
@@ -516,6 +516,24 @@ define_tailwind_field!({
variants: []
});
+// 3. Placeholder
+// Placeholder Color
+// Placeholder Opacity
+define_tailwind_color_field!({
+ name: PlaceholderColor,
+ prefix: "placeholder-color",
+ field_name: placeholder_color,
+ variants: []
+});
+
+define_tailwind_field!({
+ name: PlaceholderOpacity,
+ prefix: "placeholder-opacity",
+ inherited: placeholder_opacity,
+ field_name: placeholder_opacity,
+ variants: []
+});
+
// 3. Spacing
// Padding
// Margin
diff --git a/twust-macro/src/config/macros.rs b/twust-macro/src/config/macros.rs
index 52e06bf..4b59675 100644
--- a/twust-macro/src/config/macros.rs
+++ b/twust-macro/src/config/macros.rs
@@ -54,7 +54,7 @@ macro_rules! define_tailwind_color_field {
fn get_default(&self, config: &TailwindConfig) -> Vec<&str> {
if let Some(ref core_plugins) = config.core_plugins {
if let Some(enabled) = core_plugins.$default_field {
- if enabled == false {
+ if !enabled {
return vec![];
}
}
@@ -65,7 +65,7 @@ macro_rules! define_tailwind_color_field {
fn get_override(&self, config: &TailwindConfig) -> Vec
{
if let Some(ref core_plugins) = config.core_plugins {
if let Some(enabled) = core_plugins.$default_field {
- if enabled == false {
+ if !enabled {
return vec![];
}
}
@@ -80,7 +80,7 @@ macro_rules! define_tailwind_color_field {
fn get_extend(&self, config: &TailwindConfig) -> Vec {
if let Some(ref core_plugins) = config.core_plugins {
if let Some(enabled) = core_plugins.$default_field {
- if enabled == false {
+ if !enabled {
return vec![];
}
}
@@ -117,7 +117,7 @@ macro_rules! define_tailwind_field {
fn get_default(&self, config: &TailwindConfig) -> Vec<&str> {
if let Some(ref core_plugins) = config.core_plugins {
if let Some(enabled) = core_plugins.$field_name {
- if enabled == false {
+ if !enabled {
return vec![];
}
}
@@ -129,7 +129,7 @@ macro_rules! define_tailwind_field {
fn get_override(&self, config: &TailwindConfig) -> Vec {
if let Some(ref core_plugins) = config.core_plugins {
if let Some(enabled) = core_plugins.$field_name {
- if enabled == false {
+ if !enabled {
return vec![];
}
}
@@ -144,7 +144,7 @@ macro_rules! define_tailwind_field {
fn get_extend(&self, config: &TailwindConfig) -> Vec {
if let Some(ref core_plugins) = config.core_plugins {
if let Some(enabled) = core_plugins.$field_name {
- if enabled == false {
+ if !enabled {
return vec![];
}
}
diff --git a/twust-macro/src/config/mod.rs b/twust-macro/src/config/mod.rs
index 847b89b..5b3c9a4 100644
--- a/twust-macro/src/config/mod.rs
+++ b/twust-macro/src/config/mod.rs
@@ -71,7 +71,7 @@ pub(crate) fn read_tailwind_config() -> Result {
return Err(std::io::Error::new(
std::io::ErrorKind::NotFound,
format!(
- "tailwind.config.json was not found in the top-level directory - \n{config_path:?}. Ensure it exists."
+ "tailwind.config.json was not found in the top-level directory - \n{config_path:?}. Make sure it exists."
),
));
}
@@ -86,7 +86,7 @@ pub fn get_classes(config: &TailwindConfig) -> Vec {
// by the user.
let mut classes = Vec::new();
- let utilities: [Box; 175] = [
+ let utilities: [Box; 177] = [
Box::new(AspectRatio),
Box::new(Container),
Box::new(Columns),
@@ -143,6 +143,8 @@ pub fn get_classes(config: &TailwindConfig) -> Vec {
Box::new(PlaceContent),
Box::new(PlaceItems),
Box::new(PlaceSelf),
+ Box::new(PlaceholderColor),
+ Box::new(PlaceholderOpacity),
Box::new(Padding),
Box::new(Margin),
Box::new(SpaceBetween),
diff --git a/twust-macro/src/lib.rs b/twust-macro/src/lib.rs
index 561d969..cd9cb5d 100644
--- a/twust-macro/src/lib.rs
+++ b/twust-macro/src/lib.rs
@@ -70,14 +70,14 @@ fn get_classes_straight() -> HashSet {
}
fn is_valid_classname(class_name: &str) -> bool {
- get_classes_straight().contains(&class_name.to_string())
+ get_classes_straight().contains(class_name)
}
fn is_valid_modifier(modifier: &str) -> bool {
let modifiers: HashSet = HashSet::from_iter(get_modifiers(
&read_tailwind_config().expect("Problem getting modifiers"),
));
- modifiers.contains(&modifier.to_string())
+ modifiers.contains(modifier)
}
fn parse_predefined_tw_classname(input: &str) -> IResult<&str, ()> {
@@ -616,13 +616,16 @@ fn supports_arbitrary(input: &str) -> IResult<&str, ()> {
// aria-[sort=ascending]:bg-[url('/img/down-arrow.svg')]
// aria-[sort=descending]:bg-[url('/img/up-arrow.svg')]
-fn aria_arbitrary(input: &str) -> IResult<&str, ()> {
+// group-data-[selected=Right]:w-[30px]
+// group-aria-[main-page=false]/main:hidden / group-data-[main-page=false]/main:hidden
+fn aria_or_data_arbitrary(input: &str) -> IResult<&str, ()> {
let (input, _) = opt(tag("group-"))(input)?;
- let (input, _) = tag("aria-[")(input)?;
+ let (input, _) = alt((tag("aria-["), tag("data-[")))(input)?;
let (input, _) = take_while1(is_ident_char)(input)?;
let (input, _) = tag("=")(input)?;
let (input, _) = take_while1(is_ident_char)(input)?;
let (input, _) = tag("]")(input)?;
+ let (input, _) = opt(tuple((tag("/"), take_while1(is_ident_char))))(input)?;
Ok((input, ()))
}
@@ -645,6 +648,12 @@ fn min_max_arbitrary_modifier(input: &str) -> IResult<&str, ()> {
Ok((input, ()))
}
+// *:overflow-scroll
+fn wildcard_modifier(input: &str) -> IResult<&str, ()> {
+ let (input, _) = tag("*")(input)?;
+ Ok((input, ()))
+}
+
fn modifier(input: &str) -> IResult<&str, ()> {
alt((
group_modifier_selector,
@@ -656,9 +665,10 @@ fn modifier(input: &str) -> IResult<&str, ()> {
arbitrary_at_media_rule_modifier,
predefined_modifier,
supports_arbitrary,
- aria_arbitrary,
+ aria_or_data_arbitrary,
data_arbitrary,
min_max_arbitrary_modifier,
+ wildcard_modifier,
))(input)
}
@@ -723,6 +733,11 @@ fn parse_top(input: &str) -> IResult<&str, Vec<&str>> {
all_consuming(parse_class_names)(input)
}
+#[test]
+fn test_group_attr_arbitrary2() {
+ assert_eq!(parse_top("group-data-[selected=Right]"), Ok(("", vec![])));
+}
+
#[proc_macro]
pub fn tw(raw_input: TokenStream) -> TokenStream {
let r_input = raw_input.clone();
diff --git a/twust-macro/src/tailwind/default_classnames.rs b/twust-macro/src/tailwind/default_classnames.rs
index 193e5ae..52fdafb 100644
--- a/twust-macro/src/tailwind/default_classnames.rs
+++ b/twust-macro/src/tailwind/default_classnames.rs
@@ -7,6 +7,7 @@
// placescreen_readers-shown
// placeholder-slate-400
+#[allow(dead_code)]
#[derive(Debug, Clone, Copy)]
pub struct TailWindCssDefaultClassNames {
pub aspect_ratio: [&'static str; 3],
diff --git a/twust-macro/src/tailwind/modifiers.rs b/twust-macro/src/tailwind/modifiers.rs
index 724cd53..0777fa1 100644
--- a/twust-macro/src/tailwind/modifiers.rs
+++ b/twust-macro/src/tailwind/modifiers.rs
@@ -82,7 +82,8 @@ use crate::config::{add_classes_for_field, modifiers};
use super::tailwind_config::TailwindConfig;
-const MODIFIERS: [&str; 49] = [
+const MODIFIERS: [&str; 50] = [
+ "*",
"hover",
"focus",
"focus-within",
@@ -160,7 +161,7 @@ pub fn get_modifiers(config: &TailwindConfig) -> Vec {
// "max-[…]",
]
.into_iter()
- .map(|x| x.to_string())
+ .map(Into::into)
.collect::>();
if let Some(ref screens) = config.theme.overrides.screens {