wip: app redesign

recipes.json

@@ -55,7 +55,11 @@
         ]
     },
     "build web": {
-        "cmd": "wasm-pack build --target web",
+        "cmd": "wasm-pack build --target web --dev",
+        "cwd": "./violet-demo/"
+    },
+    "build web profile": {
+        "cmd": "wasm-pack build --target web --profiling",
         "cwd": "./violet-demo/"
     },
     "host": {

violet-core/src/layout/cache.rs

@@ -69,7 +69,7 @@ impl LayoutCache {
     pub(crate) fn insert_query_row(&mut self, value: CachedValue<Row>) {
         self.query_row = Some(value);
         if let Some(f) = self.on_invalidated.as_ref() {
-            // f(LayoutUpdate::SizeQueryUpdate)
+            f(LayoutUpdate::SizeQueryUpdate)
         }
     }
 

violet-core/src/layout/mod.rs

@@ -12,7 +12,7 @@ use crate::{
         self, anchor, aspect_ratio, children, layout, max_size, maximize, min_size, offset,
         padding, size, size_resolver,
     },
-    layout::cache::{validate_cached_layout, validate_cached_query, CachedValue, LAYOUT_TOLERANCE},
+    layout::cache::{validate_cached_layout, validate_cached_query, CachedValue},
     Edges, Rect,
 };
 
@@ -223,67 +223,6 @@ impl SizingHints {
     }
 }
 
-fn validate_sizing(entity: &EntityRef, sizing: &Sizing, limits: LayoutLimits) {
-    const TOLERANCE: f32 = 0.2;
-    if sizing.min.size().x > limits.max_size.x + TOLERANCE
-        || sizing.min.size().y > limits.max_size.y + TOLERANCE
-    {
-        tracing::error!(
-            %entity,
-            min_size = %sizing.min.size(),
-            max_size = %limits.max_size,
-            "Minimum size exceeds size limit",
-        );
-    }
-
-    if sizing.preferred.size().x > limits.max_size.x + TOLERANCE
-        || sizing.preferred.size().y > limits.max_size.y + TOLERANCE
-    {
-        tracing::error!(
-            %entity,
-            preferred_size = %sizing.preferred.size(),
-            ?limits,
-            "Preferred size exceeds size limit",
-        );
-    }
-
-    if sizing.min.size().x + TOLERANCE < limits.min_size.x
-        || sizing.min.size().y + TOLERANCE < limits.min_size.y
-    {
-        tracing::error!(
-            %entity,
-            min_size = %sizing.min.size(),
-            ?limits,
-            "Minimum size is less than size limit",
-        );
-    }
-}
-
-fn validate_block(entity: &EntityRef, block: &Block, limits: LayoutLimits) {
-    const TOLERANCE: f32 = 0.2;
-    if block.rect.size().x > limits.max_size.x + TOLERANCE
-        || block.rect.size().y > limits.max_size.y + TOLERANCE
-    {
-        tracing::error!(
-            %entity,
-            rect_size = %block.rect.size(),
-            max_size = %limits.max_size,
-            "Widget size exceeds size limit",
-        );
-    }
-
-    if block.rect.size().x + TOLERANCE < limits.min_size.x
-        || block.rect.size().y + TOLERANCE < limits.min_size.y
-    {
-        tracing::error!(
-            %entity,
-            rect_size = %block.rect.size(),
-            min_size = %limits.min_size,
-            "Widget size is less than size limit",
-        );
-    }
-}
-
 pub(crate) fn query_size(world: &World, entity: &EntityRef, args: QueryArgs) -> Sizing {
     puffin::profile_function!(format!("{entity} {args:?}"));
     // assert!(limits.min_size.x <= limits.max_size.x);

violet-core/src/layout/stack.rs

@@ -8,9 +8,7 @@ use crate::{
     Edges, Rect,
 };
 
-use super::{
-    apply_layout, resolve_pos, Alignment, Block, Direction, LayoutLimits, QueryArgs, Sizing,
-};
+use super::{apply_layout, resolve_pos, Alignment, Block, LayoutLimits, QueryArgs, Sizing};
 
 #[derive(Debug)]
 pub struct StackableBounds {
@@ -203,7 +201,7 @@ impl StackLayout {
                 },
             );
 
-            maximize = maximize + sizing.maximize;
+            maximize += sizing.maximize;
 
             hints = hints.combine(sizing.hints);
 

violet-core/src/state/dedup.rs

@@ -1,9 +1,6 @@
-use std::{future::ready, sync::Arc};
+use std::future::ready;
 
-use futures::{FutureExt, StreamExt};
-use futures_signals::signal::{Mutable, SignalExt};
-use parking_lot::Mutex;
-use tracing::info;
+use futures::StreamExt;
 
 use super::{State, StateSink, StateStream, StateStreamRef};
 

violet-core/src/systems.rs

@@ -11,12 +11,10 @@ use flax::{
     entity_ids,
     events::{EventData, EventSubscriber},
     filter::Or,
-    sink::Sink,
     BoxedSystem, CommandBuffer, Dfs, DfsBorrow, Entity, Fetch, FetchExt, FetchItem, Query,
     QueryBorrow, System, World,
 };
 use glam::Vec2;
-use tracing::info;
 
 use crate::{
     components::{

violet-core/src/time/mod.rs

@@ -11,7 +11,6 @@ use std::{
 };
 
 use futures::{
-    channel::oneshot,
     task::{ArcWake, AtomicWaker},
     Future,
 };
@@ -226,14 +225,17 @@ impl Timers {
 #[cfg(target_arch = "wasm32")]
 struct TickFuture {
     inner: Arc<Inner>,
-    timeout: Option<(oneshot::Receiver<()>, gloo_timers::callback::Timeout)>,
+    timeout: Option<(
+        futures::channel::oneshot::Receiver<()>,
+        gloo_timers::callback::Timeout,
+    )>,
 }
 
 #[cfg(target_arch = "wasm32")]
 impl TickFuture {
     fn new(inner: Arc<Inner>, timeout: Option<Duration>) -> Self {
         let timeout = if let Some(timeout) = timeout {
-            let (tx, rx) = oneshot::channel();
+            let (tx, rx) = futures::channel::oneshot::channel();
 
             let timeout = gloo_timers::callback::Timeout::new(
                 timeout.as_millis().try_into().unwrap(),

violet-core/src/types.rs

@@ -218,7 +218,7 @@ impl Rect {
     }
 
     #[must_use]
-    pub(crate) fn clamp_size(&self, min: Vec2, max: Vec2) -> Self {
+    pub fn clamp_size(&self, min: Vec2, max: Vec2) -> Self {
         let size = self.size().clamp(min, max);
         Self {
             min: self.min,

violet-core/src/widget/basic.rs

@@ -4,14 +4,9 @@ use palette::Srgba;
 
 use crate::{
     assets::AssetKey,
-    components::{
-        self, aspect_ratio, color, draw_shape, font_size, min_size, size, text, text_wrap,
-    },
+    components::{self, color, draw_shape, font_size, text, text_wrap},
     shape,
-    style::{
-        colors::REDWOOD_DEFAULT, spacing_large, spacing_small, SizeExt, StyleExt, ValueOrRef,
-        WidgetSize,
-    },
+    style::{colors::REDWOOD_DEFAULT, spacing_small, SizeExt, StyleExt, ValueOrRef, WidgetSize},
     text::{TextSegment, Wrap},
     unit::Unit,
     Scope, Widget,

violet-core/src/widget/interactive/slider.rs

@@ -5,7 +5,6 @@ use futures::{stream::BoxStream, StreamExt};
 use futures_signals::signal::Mutable;
 use glam::Vec2;
 use palette::Srgba;
-use web_time::Duration;
 use winit::event::ElementState;
 
 use crate::{
@@ -14,10 +13,9 @@ use crate::{
     layout::Alignment,
     state::{State, StateDuplex, StateStream},
     style::{interactive_active, interactive_inactive, spacing_small, SizeExt, StyleExt},
-    time::sleep,
     to_owned,
     unit::Unit,
-    utils::{throttle, zip_latest},
+    utils::zip_latest,
     widget::{row, ContainerStyle, Positioned, Rectangle, Stack, StreamWidget, Text},
     Scope, StreamEffect, Widget,
 };

violet-demo/Cargo.toml

@@ -29,3 +29,6 @@ wasm-bindgen-futures = "0.4"
 itertools.workspace = true
 tracing-tree.workspace = true
 puffin.workspace = true
+
+[package.metadata.wasm-pack.profile.profiling]
+wasm-opt = false