Modify props name update yewprint's dependencies (#87)

* props struct have now the name of its component

* Add the class props to the tag

* Update dependencies
This commit is contained in:
Yohan Boogaert 2021-02-27 13:56:49 +01:00 committed by GitHub
parent d89ce3c652
commit 1f94b2821d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 88 additions and 88 deletions

119
Cargo.lock generated
View file

@ -2,9 +2,9 @@
# It is not intended for manual editing.
[[package]]
name = "adler"
version = "0.2.3"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "anyhow"
@ -38,9 +38,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bincode"
version = "1.3.1"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772"
dependencies = [
"byteorder",
"serde",
@ -60,15 +60,15 @@ checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9"
[[package]]
name = "bumpalo"
version = "3.4.0"
version = "3.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
[[package]]
name = "byteorder"
version = "1.4.2"
version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]]
name = "bytes"
@ -78,9 +78,9 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
[[package]]
name = "cc"
version = "1.0.66"
version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
[[package]]
name = "cfg-if"
@ -131,9 +131,9 @@ dependencies = [
[[package]]
name = "flate2"
version = "1.0.19"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
dependencies = [
"cfg-if 1.0.0",
"crc32fast",
@ -203,12 +203,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.8.2"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
dependencies = [
"autocfg",
]
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "heck"
@ -241,9 +238,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "1.5.2"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e47a3566dd4fd4eec714ae6ceabdee0caec795be835c223d92c2d40f1e8cf1c"
checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
dependencies = [
"autocfg",
"hashbrown",
@ -257,9 +254,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "js-sys"
version = "0.3.46"
version = "0.3.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
dependencies = [
"wasm-bindgen",
]
@ -278,22 +275,22 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lexical-core"
version = "0.7.4"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374"
dependencies = [
"arrayvec",
"bitflags",
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"ryu",
"static_assertions",
]
[[package]]
name = "libc"
version = "0.2.82"
version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
[[package]]
name = "line-wrap"
@ -312,11 +309,11 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[package]]
name = "log"
version = "0.4.13"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [
"cfg-if 0.1.10",
"cfg-if 1.0.0",
]
[[package]]
@ -327,9 +324,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "miniz_oxide"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg",
@ -395,9 +392,9 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
[[package]]
name = "plist"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dc57ccf442c7414b790e8e7b72fb4d776a66c7680129360946d9aaa6f5311e9"
checksum = "679104537029ed2287c216bfb942bbf723f48ee98f0aef15611634173a74ef21"
dependencies = [
"base64",
"chrono",
@ -418,9 +415,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.8"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
@ -463,18 +460,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.120"
version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "166b2349061381baf54a58e4b13c89369feb0ef2eaa57198899e2312aac30aab"
checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.120"
version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ca2a8cb5805ce9e3b95435e3765b7b553cecc762d938d409434338386cb5775"
checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
dependencies = [
"proc-macro2",
"quote",
@ -483,9 +480,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.61"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
checksum = "43535db9747a4ba938c0ce0a98cc631a46ebf943c9e1d604e091df6007620bf6"
dependencies = [
"itoa",
"ryu",
@ -512,9 +509,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "syn"
version = "1.0.58"
version = "1.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
dependencies = [
"proc-macro2",
"quote",
@ -545,18 +542,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.23"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.23"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
dependencies = [
"proc-macro2",
"quote",
@ -594,9 +591,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen"
version = "0.2.69"
version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
dependencies = [
"cfg-if 1.0.0",
"serde",
@ -606,9 +603,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.69"
version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
dependencies = [
"bumpalo",
"lazy_static",
@ -621,9 +618,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.19"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35"
checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@ -633,9 +630,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.69"
version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -643,9 +640,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.69"
version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
dependencies = [
"proc-macro2",
"quote",
@ -656,15 +653,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.69"
version = "0.2.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
[[package]]
name = "web-sys"
version = "0.3.46"
version = "0.3.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b"
dependencies = [
"js-sys",
"wasm-bindgen",

View file

@ -3,7 +3,7 @@ use yewprint::{Button, Collapse, IconName, Intent};
pub struct ExampleContainer {
collapsed: bool,
props: Props,
props: ExampleContainerProps,
link: ComponentLink<Self>,
}
@ -12,7 +12,7 @@ pub enum Msg {
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct ExampleContainerProps {
pub source: yew::virtual_dom::VNode,
pub children: html::Children,
#[prop_or_default]
@ -21,7 +21,7 @@ pub struct Props {
impl Component for ExampleContainer {
type Message = Msg;
type Properties = Props;
type Properties = ExampleContainerProps;
fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
ExampleContainer {

View file

@ -3,11 +3,11 @@ use boolinator::Boolinator;
use yew::prelude::*;
pub struct Button {
props: Props,
props: ButtonProps,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct ButtonProps {
#[prop_or_default]
pub fill: bool,
#[prop_or_default]
@ -30,7 +30,7 @@ pub struct Props {
impl Component for Button {
type Message = ();
type Properties = Props;
type Properties = ButtonProps;
fn create(props: Self::Properties, _link: ComponentLink<Self>) -> Self {
Button { props }

View file

@ -3,11 +3,11 @@ use crate::{Icon, IconName, Intent};
use yew::prelude::*;
pub struct Callout {
props: Props,
props: CalloutProps,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct CalloutProps {
#[prop_or_default]
pub class: Classes,
#[prop_or(false)]
@ -23,7 +23,7 @@ pub struct Props {
impl Component for Callout {
type Message = ();
type Properties = Props;
type Properties = CalloutProps;
fn create(props: Self::Properties, _link: ComponentLink<Self>) -> Self {
Self { props }

View file

@ -13,12 +13,12 @@ pub struct Collapse {
contents_ref: NodeRef,
callback_delayed_state_change: Callback<()>,
handle_delayed_state_change: Option<Box<dyn Task>>,
props: Props,
props: CollapseProps,
link: ComponentLink<Self>,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct CollapseProps {
#[prop_or_default]
pub is_open: bool,
#[prop_or_default]
@ -48,7 +48,7 @@ enum Height {
impl Component for Collapse {
type Message = ();
type Properties = Props;
type Properties = CollapseProps;
fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
Collapse {

View file

@ -5,12 +5,12 @@ use std::hash::{Hash, Hasher};
use yew::prelude::*;
pub struct HtmlSelect<T: Clone + PartialEq + Hash + 'static> {
props: Props<T>,
props: HtmlSelectProps<T>,
link: ComponentLink<Self>,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props<T: Clone + PartialEq + 'static> {
pub struct HtmlSelectProps<T: Clone + PartialEq + 'static> {
#[prop_or_default]
pub fill: bool,
#[prop_or_default]
@ -32,7 +32,7 @@ pub struct Props<T: Clone + PartialEq + 'static> {
impl<T: Clone + PartialEq + Hash + 'static> Component for HtmlSelect<T> {
type Message = ChangeData;
type Properties = Props<T>;
type Properties = HtmlSelectProps<T>;
fn create(props: Self::Properties, link: ComponentLink<Self>) -> Self {
Self { props, link }

View file

@ -3,11 +3,11 @@ use boolinator::Boolinator;
use yew::prelude::*;
pub struct ProgressBar {
props: Props,
props: ProgressBarProps,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct ProgressBarProps {
#[prop_or_default]
pub animate: bool,
#[prop_or_default]
@ -20,7 +20,7 @@ pub struct Props {
impl Component for ProgressBar {
type Message = ();
type Properties = Props;
type Properties = ProgressBarProps;
fn create(props: Self::Properties, _link: ComponentLink<Self>) -> Self {
Self { props }

View file

@ -3,11 +3,11 @@ use boolinator::Boolinator;
use yew::prelude::*;
pub struct Tag {
props: Props,
props: TagProps,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct TagProps {
#[prop_or_default]
pub children: html::Children,
#[prop_or_default]
@ -37,11 +37,13 @@ pub struct Props {
pub round: bool,
#[prop_or_default]
pub title: Option<String>,
#[prop_or_default]
pub class: Classes,
}
impl Component for Tag {
type Message = ();
type Properties = Props;
type Properties = TagProps;
fn create(props: Self::Properties, _link: ComponentLink<Self>) -> Self {
Tag { props }
@ -90,6 +92,7 @@ impl Component for Tag {
self.props.large.as_some("bp3-large"),
self.props.minimal.as_some("bp3-minimal"),
self.props.round.as_some("bp3-round"),
self.props.class.clone(),
)
onclick={self.props.onclick.clone()}
>

View file

@ -2,11 +2,11 @@ use boolinator::Boolinator;
use yew::prelude::*;
pub struct Text {
props: Props,
props: TextProps,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props {
pub struct TextProps {
#[prop_or_default]
pub ellipsize: bool,
#[prop_or_default]
@ -22,7 +22,7 @@ pub struct Props {
impl Component for Text {
type Message = ();
type Properties = Props;
type Properties = TextProps;
fn create(props: Self::Properties, _link: ComponentLink<Self>) -> Self {
Text { props }

View file

@ -43,12 +43,12 @@ impl<T> From<id_tree::Tree<NodeData<T>>> for TreeData<T> {
}
pub struct Tree<T: Clone> {
props: Props<T>,
props: TreeProps<T>,
previous_expanded_state: RefCell<HashMap<u64, bool>>,
}
#[derive(Clone, PartialEq, Properties)]
pub struct Props<T: Clone> {
pub struct TreeProps<T: Clone> {
#[prop_or_default]
pub is_expanded: bool,
pub tree: TreeData<T>,
@ -109,7 +109,7 @@ impl<T: Clone> Clone for NodeData<T> {
impl<T: Clone + PartialEq + 'static> Component for Tree<T> {
type Message = ();
type Properties = Props<T>;
type Properties = TreeProps<T>;
fn create(props: Self::Properties, _link: ComponentLink<Self>) -> Self {
Tree {