Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency on chrono #224

Merged
merged 2 commits into from
Sep 6, 2021
Merged

Remove dependency on chrono #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e122d50
Remove dependency on chrono
lukechu10 Sep 6, 2021
1e07617
Merge branch 'master' into remove-chrono
lukechu10 Sep 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/sycamore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ version = "0.5.2"

[dependencies]
ahash = "0.7.4"
chrono = { version = "0.4.19", features = ["wasmbind"] }
html-escape = { version = "0.2.9", optional = true }
indexmap = { version = "1.7.0", features = ["std"] }
js-sys = "0.3.53"
Expand Down
20 changes: 9 additions & 11 deletions packages/sycamore/src/motion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::cell::RefCell;
use std::rc::Rc;

use chrono::{prelude::*, Duration};
use js_sys::Date;

use crate::reactive::Signal;
use crate::utils::{loop_raf, Task};
Expand Down Expand Up @@ -67,7 +67,7 @@ pub struct Tweened<T: Lerp + Clone + 'static>(Rc<RefCell<TweenedInner<T>>>);
struct TweenedInner<T: Lerp + Clone + 'static> {
signal: Signal<T>,
current_task: Option<Task>,
transition_duration: Duration,
transition_duration_ms: f32,
easing_fn: Rc<dyn Fn(f32) -> f32>,
}

Expand All @@ -81,8 +81,7 @@ impl<T: Lerp + Clone + 'static> Tweened<T> {
Self(Rc::new(RefCell::new(TweenedInner {
signal: Signal::new(initial),
current_task: None,
transition_duration: Duration::from_std(transition_duration)
.expect("transition_duration is greater than the maximum value"),
transition_duration_ms: transition_duration.as_millis() as f32,
easing_fn: Rc::new(easing_fn),
})))
}
Expand All @@ -99,18 +98,17 @@ impl<T: Lerp + Clone + 'static> Tweened<T> {
let start = self.signal().get_untracked().as_ref().clone();
let easing_fn = Rc::clone(&self.0.borrow().easing_fn);

let start_time = Utc::now();
let start_time = Date::now();
let signal = self.0.borrow().signal.clone();
let transition_duration = self.0.borrow().transition_duration;
let transition_duration_ms = self.0.borrow().transition_duration_ms;

let task = Task::new(move || {
let now = Utc::now();
let now = Date::now();

let since_start = now - start_time;
let scalar = since_start.num_milliseconds() as f32
/ transition_duration.num_milliseconds() as f32;
let scalar = since_start as f32 / transition_duration_ms;

if now < start_time + transition_duration {
if now < start_time + transition_duration_ms as f64 {
signal.set(start.lerp(&new_value, easing_fn(scalar)));
true
} else {
Expand Down Expand Up @@ -155,7 +153,7 @@ impl<T: Lerp + Clone + 'static> Clone for TweenedInner<T> {
Self {
signal: self.signal.clone(),
current_task: self.current_task.clone(),
transition_duration: self.transition_duration,
transition_duration_ms: self.transition_duration_ms,
easing_fn: Rc::clone(&self.easing_fn),
}
}
Expand Down