Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-30 16:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #401 from rMazeiks/arbitrary_value_serialize_fix

Browse source 
Fix: AttributeValue bug; tests; CI
This commit is contained in:
Jon Kelley 2022-05-07 10:02:16 -04:00 committed by GitHub
commit 87413c28c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/main.yml vendored
View file

@ -38,7 +38,7 @@ jobs:
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- run: sudo apt-get update - run: sudo apt-get update
- run: sudo apt install libwebkit2gtk-4.0-dev libappindicator3-dev libgtk-3-dev - run: sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev
- uses: actions-rs/cargo@v1 - uses: actions-rs/cargo@v1
with: with:
command: check command: check
@ -56,7 +56,7 @@ jobs:
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- run: sudo apt-get update - run: sudo apt-get update
- run: sudo apt install libwebkit2gtk-4.0-dev libappindicator3-dev libgtk-3-dev - run: sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev
- uses: davidB/rust-cargo-make@v1 - uses: davidB/rust-cargo-make@v1
- uses: browser-actions/setup-firefox@latest - uses: browser-actions/setup-firefox@latest
- uses: jetli/wasm-pack-action@v0.3.0 - uses: jetli/wasm-pack-action@v0.3.0
@ -96,7 +96,7 @@ jobs:
override: true override: true
- uses: Swatinem/rust-cache@v1 - uses: Swatinem/rust-cache@v1
- run: sudo apt-get update - run: sudo apt-get update
- run: sudo apt install libwebkit2gtk-4.0-dev libappindicator3-dev libgtk-3-dev - run: sudo apt install libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev
- run: rustup component add clippy - run: rustup component add clippy
- uses: actions-rs/cargo@v1 - uses: actions-rs/cargo@v1
with: with:
@ -117,7 +117,7 @@ jobs:
# run: | # run: |
# apt-get update &&\ # apt-get update &&\
# apt-get install build-essential &&\ # apt-get install build-essential &&\
# apt install libwebkit2gtk-4.0-dev libappindicator3-dev libgtk-3-dev -y &&\ # apt install libwebkit2gtk-4.0-dev libgtk-3-dev libayatana-appindicator3-dev -y &&\
# cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml # cargo +nightly tarpaulin --verbose --all-features --workspace --timeout 120 --out Xml
# - name: Upload to codecov.io # - name: Upload to codecov.io
# uses: codecov/codecov-action@v2 # uses: codecov/codecov-action@v2

7
packages/core/src/arbitrary_value.rs
View file

@ -1,8 +1,11 @@
use std::fmt::Formatter; use std::fmt::Formatter;
/// Possible values for an attribute
// trying to keep values at 3 bytes // trying to keep values at 3 bytes
#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
#[cfg_attr(feature = "serialize", serde(untagged))]
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
#[allow(missing_docs)]
pub enum AttributeValue<'a> { pub enum AttributeValue<'a> {
Text(&'a str), Text(&'a str),
Float32(f32), Float32(f32),
@ -25,6 +28,8 @@ pub enum AttributeValue<'a> {
Any(ArbitraryAttributeValue<'a>), Any(ArbitraryAttributeValue<'a>),
} }
// todo
#[allow(missing_docs)]
impl<'a> AttributeValue<'a> { impl<'a> AttributeValue<'a> {
pub fn is_truthy(&self) -> bool { pub fn is_truthy(&self) -> bool {
match self { match self {
@ -112,6 +117,8 @@ impl<'de, 'a> serde::Deserialize<'de> for ArbitraryAttributeValue<'a> {
} }
} }
// todo
#[allow(missing_docs)]
impl<'a> AttributeValue<'a> { impl<'a> AttributeValue<'a> {
pub fn as_text(&self) -> Option<&'a str> { pub fn as_text(&self) -> Option<&'a str> {
match self { match self {

8
packages/core/src/lib.rs
View file

@ -73,10 +73,10 @@ pub(crate) mod innerlude {
} }
pub use crate::innerlude::{ pub use crate::innerlude::{
AnyEvent, Attribute, Component, DioxusElement, DomEdit, Element, ElementId, ElementIdIterator, AnyEvent, Attribute, AttributeValue, Component, DioxusElement, DomEdit, Element, ElementId,
EventHandler, EventPriority, IntoVNode, LazyNodes, Listener, Mutations, NodeFactory, ElementIdIterator, EventHandler, EventPriority, IntoVNode, LazyNodes, Listener, Mutations,
Properties, SchedulerMsg, Scope, ScopeId, ScopeState, TaskId, UiEvent, UserEvent, VComponent, NodeFactory, Properties, SchedulerMsg, Scope, ScopeId, ScopeState, TaskId, UiEvent, UserEvent,
VElement, VFragment, VNode, VPlaceholder, VText, VirtualDom, VComponent, VElement, VFragment, VNode, VPlaceholder, VText, VirtualDom,
}; };
/// The purpose of this module is to alleviate imports of many common types /// The purpose of this module is to alleviate imports of many common types

5
packages/native-core-macro/tests/update_state.rs
View file

@ -1,4 +1,5 @@
use anymap::AnyMap; use anymap::AnyMap;
use dioxus_core::AttributeValue;
use dioxus_core::VNode; use dioxus_core::VNode;
use dioxus_core::*; use dioxus_core::*;
use dioxus_core_macro::*; use dioxus_core_macro::*;
@ -347,7 +348,7 @@ fn state_reduce_parent_called_minimally_on_update() {
edits: vec![DomEdit::SetAttribute { edits: vec![DomEdit::SetAttribute {
root: 1, root: 1,
field: "width", field: "width",
value: "99%", value: AttributeValue::Text("99%"),
ns: Some("style"), ns: Some("style"),
}], }],
dirty_scopes: fxhash::FxHashSet::default(), dirty_scopes: fxhash::FxHashSet::default(),
@ -416,7 +417,7 @@ fn state_reduce_child_called_minimally_on_update() {
edits: vec![DomEdit::SetAttribute { edits: vec![DomEdit::SetAttribute {
root: 4, root: 4,
field: "width", field: "width",
value: "99%", value: AttributeValue::Text("99%"),
ns: Some("style"), ns: Some("style"),
}], }],
dirty_scopes: fxhash::FxHashSet::default(), dirty_scopes: fxhash::FxHashSet::default(),