@perspective-dev/viewer 4.2.0 → 4.4.0

package/src/rust/{model → tasks}/resize_observer.rs

@@ -16,13 +16,13 @@ use wasm_bindgen::prelude::*;
 use web_sys::*;
 use yew::prelude::*;
 
-use crate::PerspectiveProperties;
 use crate::components::viewer::{PerspectiveViewer, PerspectiveViewerMsg};
 use crate::js::*;
-use crate::model::*;
+use crate::presentation::Presentation;
 use crate::renderer::*;
 use crate::root::Root;
-use crate::session::Session;
+use crate::session::{Session, TableLoadState};
+use crate::tasks::*;
 use crate::utils::*;
 
 pub struct ResizeObserverHandle {
@@ -36,6 +36,7 @@ impl ResizeObserverHandle {
         elem: &HtmlElement,
         renderer: &Renderer,
         session: &Session,
+        presentation: &Presentation,
         root: &Root<PerspectiveViewer>,
     ) -> Self {
         let on_resize = root
@@ -48,6 +49,7 @@ impl ResizeObserverHandle {
             elem: elem.clone(),
             renderer: renderer.clone(),
             session: session.clone(),
+            presentation: presentation.clone(),
             width: elem.offset_width(),
             height: elem.offset_height(),
             on_resize,
@@ -70,16 +72,43 @@ impl Drop for ResizeObserverHandle {
     }
 }
 
-#[derive(PerspectiveProperties!)]
+#[derive(Clone)]
 struct ResizeObserverState {
     elem: HtmlElement,
     renderer: Renderer,
     session: Session,
+    presentation: Presentation,
     width: i32,
     height: i32,
     on_resize: Callback<()>,
 }
 
+impl HasRenderer for ResizeObserverState {
+    fn renderer(&self) -> &Renderer {
+        &self.renderer
+    }
+}
+
+impl HasSession for ResizeObserverState {
+    fn session(&self) -> &Session {
+        &self.session
+    }
+}
+
+impl HasPresentation for ResizeObserverState {
+    fn presentation(&self) -> &'_ crate::presentation::Presentation {
+        &self.presentation
+    }
+}
+
+impl StateProvider for ResizeObserverState {
+    type State = ResizeObserverState;
+
+    fn clone_state(&self) -> Self::State {
+        self.clone()
+    }
+}
+
 impl ResizeObserverState {
     fn on_resize(&mut self, entries: &js_sys::Array) {
         let is_visible = self
@@ -97,17 +126,21 @@ impl ResizeObserverState {
             if resized && is_visible {
                 let state = self.clone_state();
                 clone!(self.on_resize);
-                ApiFuture::spawn(async move {
+                ApiFuture::spawn_throttled(async move {
                     let needs_render = state
                         .renderer()
                         .clone()
                         .with_lock(async {
                             Ok(!state.renderer().is_plugin_activated()?
-                                && state.session().has_table())
+                                && matches!(
+                                    state.session().has_table(),
+                                    Some(TableLoadState::Loaded)
+                                ))
                         })
                         .await?;
 
                     if needs_render {
+                        state.presentation.reset_attached();
                         state.update_and_render(Default::default())?.await?;
                     } else {
                         state.renderer().resize().await?;

package/src/rust/{model → tasks}/send_plugin_config.rs

@@ -13,7 +13,7 @@
 use perspective_js::utils::*;
 
 use crate::config::ColumnConfigValueUpdate;
-use crate::model::*;
+use crate::tasks::*;
 
 pub trait SendPluginConfig {
     /// Update te urrent plugin with a [`ColumnonfigValueUpdate`]

package/src/rust/tasks/structural.rs

@@ -0,0 +1,53 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+//! Structural typing traits that allow task methods to be automatically defined
+//! for any struct that holds the necessary state handles.
+
+use crate::custom_events::*;
+use crate::dragdrop::*;
+use crate::presentation::*;
+use crate::renderer::*;
+use crate::session::*;
+
+pub trait HasCustomEvents {
+    fn custom_events(&self) -> &'_ CustomEvents;
+}
+
+pub trait HasDragDrop {
+    fn dragdrop(&self) -> &'_ DragDrop;
+}
+
+pub trait HasPresentation {
+    fn presentation(&self) -> &'_ Presentation;
+}
+
+pub trait HasRenderer {
+    fn renderer(&self) -> &'_ Renderer;
+}
+
+pub trait HasSession {
+    fn session(&self) -> &'_ Session;
+}
+
+impl HasSession for Session {
+    fn session(&self) -> &'_ Session {
+        self
+    }
+}
+
+pub trait StateProvider {
+    type State: Clone + 'static;
+
+    /// Clones just the state object fields into a new dedicated state struct.
+    fn clone_state(&self) -> Self::State;
+}

package/src/rust/utils/mod.rs

@@ -21,7 +21,9 @@ mod custom_element;
 mod datetime;
 mod debounce;
 mod hooks;
+mod modal_position;
 mod number_format;
+mod ptr_eq_rc;
 mod pubsub;
 mod weak_scope;
 
@@ -33,8 +35,10 @@ pub use custom_element::*;
 pub use datetime::*;
 pub use debounce::*;
 pub use hooks::*;
+pub use modal_position::*;
 pub use number_format::*;
 pub use perspective_client::clone;
+pub use ptr_eq_rc::*;
 pub use pubsub::*;
 pub use weak_scope::*;
 

package/src/rust/utils/modal_position.rs

@@ -0,0 +1,110 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use perspective_js::utils::global;
+use web_sys::*;
+
+/// Anchor point enum, `ModalCornerTargetCorner`
+#[derive(Clone, Copy, Debug, Default)]
+pub enum ModalAnchor {
+    BottomRightTopLeft,
+    BottomRightBottomLeft,
+    BottomRightTopRight,
+    BottomLeftTopLeft,
+    TopRightTopLeft,
+    TopRightBottomRight,
+
+    #[default]
+    TopLeftBottomLeft,
+}
+
+impl ModalAnchor {
+    pub const fn is_rev_vert(&self) -> bool {
+        matches!(
+            self,
+            Self::BottomLeftTopLeft
+                | Self::BottomRightBottomLeft
+                | Self::BottomRightTopLeft
+                | Self::BottomRightTopRight
+        )
+    }
+}
+
+/// Given the bounds of the target element as previously computed, as well as
+/// the browser's viewport and the bounds of the already-connected modal element
+/// itself, determine the best anchor point to keep the element on-screen.
+pub fn calc_relative_position(
+    elem: &HtmlElement,
+    _top: f64,
+    left: f64,
+    height: f64,
+    width: f64,
+) -> ModalAnchor {
+    let window = global::window();
+    let rect = elem.get_bounding_client_rect();
+    let inner_width = window.inner_width().unwrap().as_f64().unwrap();
+    let inner_height = window.inner_height().unwrap().as_f64().unwrap();
+    let rect_top = rect.top();
+    let rect_height = rect.height();
+    let rect_width = rect.width();
+    let rect_left = rect.left();
+
+    let elem_over_y = inner_height < rect_top + rect_height;
+    let elem_over_x = inner_width < rect_left + rect_width;
+    let target_over_x = inner_width < rect_left + width;
+    let target_over_y = inner_height < rect_top + height;
+
+    // modal/target
+    match (elem_over_y, elem_over_x, target_over_x, target_over_y) {
+        (true, _, true, true) => ModalAnchor::BottomRightTopLeft,
+        (true, _, true, false) => ModalAnchor::BottomRightBottomLeft,
+        (true, true, false, _) => {
+            if left + width - rect_width > 0.0 {
+                ModalAnchor::BottomRightTopRight
+            } else {
+                ModalAnchor::BottomLeftTopLeft
+            }
+        },
+        (true, false, false, _) => ModalAnchor::BottomLeftTopLeft,
+        (false, true, true, _) => ModalAnchor::TopRightTopLeft,
+        (false, true, false, _) => {
+            if left + width - rect_width > 0.0 {
+                ModalAnchor::TopRightBottomRight
+            } else {
+                ModalAnchor::TopLeftBottomLeft
+            }
+        },
+        _ => ModalAnchor::TopLeftBottomLeft,
+    }
+}
+
+/// Calculate the (top, left) position for a modal element given an anchor
+/// point, target element bounding rect, and the modal element's own bounding
+/// rect.
+pub fn calc_anchor_position(anchor: ModalAnchor, target: &DomRect, modal: &DomRect) -> (f64, f64) {
+    let height = target.height();
+    let width = target.width();
+    let top = target.top();
+    let left = target.left();
+    let rect_height = modal.height();
+    let rect_width = modal.width();
+
+    match anchor {
+        ModalAnchor::BottomRightTopLeft => (top - rect_height, left - rect_width + 1.0),
+        ModalAnchor::BottomRightBottomLeft => (top - rect_height + height, left - rect_width + 1.0),
+        ModalAnchor::BottomRightTopRight => (top - rect_height + 1.0, left + width - rect_width),
+        ModalAnchor::BottomLeftTopLeft => (top - rect_height + 1.0, left),
+        ModalAnchor::TopRightTopLeft => (top, left - rect_width + 1.0),
+        ModalAnchor::TopRightBottomRight => (top + height - 1.0, left + width - rect_width),
+        ModalAnchor::TopLeftBottomLeft => (top + height - 1.0, left),
+    }
+}

package/src/rust/utils/ptr_eq_rc.rs

@@ -0,0 +1,74 @@
+// ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+// ┃ ██████ ██████ ██████       █      █      █      █      █ █▄  ▀███ █       ┃
+// ┃ ▄▄▄▄▄█ █▄▄▄▄▄ ▄▄▄▄▄█  ▀▀▀▀▀█▀▀▀▀▀ █ ▀▀▀▀▀█ ████████▌▐███ ███▄  ▀█ █ ▀▀▀▀▀ ┃
+// ┃ █▀▀▀▀▀ █▀▀▀▀▀ █▀██▀▀ ▄▄▄▄▄ █ ▄▄▄▄▄█ ▄▄▄▄▄█ ████████▌▐███ █████▄   █ ▄▄▄▄▄ ┃
+// ┃ █      ██████ █  ▀█▄       █ ██████      █      ███▌▐███ ███████▄ █       ┃
+// ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┫
+// ┃ Copyright (c) 2017, the Perspective Authors.                              ┃
+// ┃ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ ┃
+// ┃ This file is part of the Perspective library, distributed under the terms ┃
+// ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
+// ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+
+use std::ops::Deref;
+use std::rc::Rc;
+
+use yew::html::{ImplicitClone, IntoPropValue};
+
+/// A thin wrapper around `Rc<T>` whose `PartialEq` uses pointer identity
+/// (`Rc::ptr_eq`) instead of deep structural comparison.  This makes it
+/// suitable for Yew `Properties` fields that hold large, cheaply-shared
+/// snapshots (e.g. `ViewConfig`, `SessionMetadata`, `Vec<String>`).
+pub struct PtrEqRc<T>(Rc<T>);
+
+impl<T> PtrEqRc<T> {
+    pub fn new(val: T) -> Self {
+        Self(Rc::new(val))
+    }
+}
+
+impl<T> Clone for PtrEqRc<T> {
+    fn clone(&self) -> Self {
+        Self(Rc::clone(&self.0))
+    }
+}
+
+impl<T> PartialEq for PtrEqRc<T> {
+    fn eq(&self, other: &Self) -> bool {
+        Rc::ptr_eq(&self.0, &other.0)
+    }
+}
+
+impl<T> Deref for PtrEqRc<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &self.0
+    }
+}
+
+impl<T> From<T> for PtrEqRc<T> {
+    fn from(rc: T) -> Self {
+        Self(Rc::new(rc))
+    }
+}
+
+impl<T: Default> Default for PtrEqRc<T> {
+    fn default() -> Self {
+        Self(Rc::default())
+    }
+}
+
+impl<T: std::fmt::Debug> std::fmt::Debug for PtrEqRc<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T> ImplicitClone for PtrEqRc<T> {}
+
+impl<T> IntoPropValue<PtrEqRc<T>> for Rc<T> {
+    fn into_prop_value(self) -> PtrEqRc<T> {
+        PtrEqRc(self)
+    }
+}

package/src/rust/utils/pubsub.rs

@@ -84,7 +84,9 @@ impl<T: Clone> PubSubInternal<T> {
 /// publishers, without leaking callbacks as listeners are dropped.
 ///
 /// Unlike `mpsc` etc., `PubSub` has no internal queue and is completely
-/// synchronous.
+/// synchronous. Explicitly does not implement clone, as this is intended as
+/// RAII, even though the internal data structures are `Clone` because they
+/// need to be sent to listeners.
 #[derive(Derivative)]
 #[derivative(Default(bound = ""))]
 pub struct PubSub<T: Clone>(Rc<PubSubInternal<T>>);
@@ -116,6 +118,14 @@ impl<T: Clone + 'static> PubSub<T> {
         Callback::from(move |val: T| internal.emit(val))
     }
 
+    /// Subscribe a `Callback<()>` that fires whenever this PubSub emits,
+    /// discarding the emitted value.  Useful when the subscriber only
+    /// needs a "something changed" notification.
+    pub fn add_notify_listener(&self, cb: &Callback<()>) -> Subscription {
+        let cb = cb.clone();
+        self.add_listener(move |_: T| cb.emit(()))
+    }
+
     /// Convert [`PubSub::emit`] to a `Box<dyn Fn(T)>`.
     #[must_use]
     pub fn as_boxfn(&self) -> Box<dyn Fn(T) + 'static> {

package/src/svg/close-icon.svg

@@ -1,4 +1,4 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="20" height="20" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
     <line y1="-0.5" x2="13.4536" y2="-0.5" transform="matrix(0.668965 0.743294 -0.668965 0.743294 6 6)"
         stroke="#042121" />
     <line y1="-0.5" x2="13.4536" y2="-0.5" transform="matrix(-0.668965 0.743294 0.668965 0.743294 16 6)"

package/src/svg/expression.svg

@@ -1,4 +1,4 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="14" height="14" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
     <defs></defs>
     <path d="M 15.915 8.555 L 10.213 14.257" stroke-width="1.00491" stroke-linecap="round" style="stroke: #042121">
     </path>

package/src/svg/mega-menu-icons-candlestick.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve"  width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-datagrid.svg

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-heatmap.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve"  width="40" height="35"> 
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-map-scatter.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve"  width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-ohlc.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve"  width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-sunburst.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-treemap.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-x-bar.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-x-y-line.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-x-y-scatter.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-y-area.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-y-bar.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-y-line.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/mega-menu-icons-y-scatter.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve">
+	 viewBox="0 0 80 70" style="enable-background:new 0 0 80 70;" xml:space="preserve" width="40" height="35">
 <style type="text/css">
 	.st0{fill:#042121;}
 </style>

package/src/svg/radio-hover.svg

@@ -1,4 +1,4 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="14" height="14" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
     <circle cx="5.5" cy="5.5" r="2.5" fill="#3F4343"/>
     <rect x="0.5" y="0.5" width="10" height="10" rx="5" stroke="#3F4343"/>
 </svg>

package/src/svg/radio-off.svg

@@ -1,3 +1,3 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="14" height="14" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
     <circle cx="5.5" cy="5.5" r="3" stroke="#3F4343" />
 </svg>

package/src/svg/radio-on.svg

@@ -1,4 +1,4 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="14" height="14" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
     <circle cx="5.5" cy="5.5" r="3.5" fill="#3F4343"/>
     <rect x="0.5" y="0.5" width="10" height="10" rx="5" stroke="#3F4343"/>
 </svg>