From 8812c69344cb454b65476f827ec89afe197c6dfd Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 17:09:26 +0200
Subject: [PATCH 1/7] panel state

---
 Cargo.lock                                    |   1 +
 .../latest_at/to_archetype/panel_blueprint.rs |   8 +-
 crates/re_time_panel/Cargo.toml               |   1 +
 crates/re_time_panel/src/lib.rs               |   7 +-
 .../re_types/definitions/rerun/blueprint.fbs  |   2 +-
 .../blueprint/archetypes/panel_blueprint.fbs  |   3 +-
 .../{panel_expanded.fbs => panel_state.fbs}   |   9 +-
 .../re_types/definitions/rerun/datatypes.fbs  |   1 +
 .../rerun/datatypes/panel_state.fbs           |  21 +++
 .../src/blueprint/components/.gitattributes   |   2 +-
 .../re_types/src/blueprint/components/mod.rs  |   4 +-
 .../{panel_expanded.rs => panel_state.rs}     |  73 ++++----
 crates/re_types/src/datatypes/.gitattributes  |   1 +
 crates/re_types/src/datatypes/mod.rs          |   3 +
 crates/re_types/src/datatypes/panel_state.rs  | 162 ++++++++++++++++++
 .../re_types/src/datatypes/panel_state_ext.rs |  18 ++
 .../blueprint/archetypes/panel_blueprint.rs   |  44 +++--
 crates/re_viewer/src/app_blueprint.rs         |  97 +++++++----
 crates/re_viewer/src/app_state.rs             |   9 +-
 .../src/blueprint/validation_gen/mod.rs       |   4 +-
 crates/re_viewer/src/ui/top_panel.rs          |   9 +-
 docs/content/reference/types/datatypes.md     |   1 +
 .../reference/types/datatypes/.gitattributes  |   1 +
 .../reference/types/datatypes/panel_state.md  |  19 ++
 .../blueprint/archetypes/panel_blueprint.cpp  |   4 +-
 .../blueprint/archetypes/panel_blueprint.hpp  |  10 +-
 rerun_cpp/src/rerun/blueprint/components.hpp  |   2 +-
 .../rerun/blueprint/components/.gitattributes |   2 +-
 .../blueprint/components/panel_expanded.hpp   |  61 -------
 .../blueprint/components/panel_state.hpp      |  60 +++++++
 rerun_cpp/src/rerun/datatypes.hpp             |   1 +
 rerun_cpp/src/rerun/datatypes/.gitattributes  |   2 +
 rerun_cpp/src/rerun/datatypes/panel_state.cpp |  62 +++++++
 rerun_cpp/src/rerun/datatypes/panel_state.hpp |  55 ++++++
 .../blueprint/archetypes/panel_blueprint.py   |  24 +--
 .../rerun/blueprint/components/.gitattributes |   2 +-
 .../rerun/blueprint/components/__init__.py    |   8 +-
 .../blueprint/components/panel_expanded.py    |  28 ---
 .../rerun/blueprint/components/panel_state.py |  28 +++
 .../rerun_sdk/rerun/datatypes/.gitattributes  |   1 +
 .../rerun_sdk/rerun/datatypes/__init__.py     |   6 +
 .../rerun_sdk/rerun/datatypes/panel_state.py  |  95 ++++++++++
 42 files changed, 702 insertions(+), 249 deletions(-)
 rename crates/re_types/definitions/rerun/blueprint/components/{panel_expanded.fbs => panel_state.fbs} (61%)
 create mode 100644 crates/re_types/definitions/rerun/datatypes/panel_state.fbs
 rename crates/re_types/src/blueprint/components/{panel_expanded.rs => panel_state.rs} (62%)
 create mode 100644 crates/re_types/src/datatypes/panel_state.rs
 create mode 100644 crates/re_types/src/datatypes/panel_state_ext.rs
 create mode 100644 docs/content/reference/types/datatypes/panel_state.md
 delete mode 100644 rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp
 create mode 100644 rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
 create mode 100644 rerun_cpp/src/rerun/datatypes/panel_state.cpp
 create mode 100644 rerun_cpp/src/rerun/datatypes/panel_state.hpp
 delete mode 100644 rerun_py/rerun_sdk/rerun/blueprint/components/panel_expanded.py
 create mode 100644 rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
 create mode 100644 rerun_py/rerun_sdk/rerun/datatypes/panel_state.py

diff --git a/Cargo.lock b/Cargo.lock
index bfc1f2560526..62e7b04b302c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4836,6 +4836,7 @@ dependencies = [
  "re_format",
  "re_log_types",
  "re_tracing",
+ "re_types",
  "re_ui",
  "re_viewer_context",
  "re_viewport",
diff --git a/crates/re_query/src/latest_at/to_archetype/panel_blueprint.rs b/crates/re_query/src/latest_at/to_archetype/panel_blueprint.rs
index acf76c2788dd..7e9a0fea77af 100644
--- a/crates/re_query/src/latest_at/to_archetype/panel_blueprint.rs
+++ b/crates/re_query/src/latest_at/to_archetype/panel_blueprint.rs
@@ -26,9 +26,9 @@ impl crate::ToArchetype<re_types_blueprint::blueprint::archetypes::PanelBlueprin
 
         // --- Recommended/Optional ---
 
-        use re_types::blueprint::components::PanelExpanded;
-        let expanded = if let Some(expanded) = self.get(<PanelExpanded>::name()) {
-            match expanded.to_dense::<PanelExpanded>(resolver) {
+        use re_types::blueprint::components::PanelState;
+        let state = if let Some(state) = self.get(<PanelState>::name()) {
+            match state.to_dense::<PanelState>(resolver) {
                 PromiseResult::Pending => return PromiseResult::Pending,
                 PromiseResult::Error(promise_err) => return PromiseResult::Error(promise_err),
                 PromiseResult::Ready(query_res) => match query_res {
@@ -42,7 +42,7 @@ impl crate::ToArchetype<re_types_blueprint::blueprint::archetypes::PanelBlueprin
 
         // ---
 
-        let arch = re_types_blueprint::blueprint::archetypes::PanelBlueprint { expanded };
+        let arch = re_types_blueprint::blueprint::archetypes::PanelBlueprint { state };
 
         PromiseResult::Ready(Ok(arch))
     }
diff --git a/crates/re_time_panel/Cargo.toml b/crates/re_time_panel/Cargo.toml
index 3115f8891c21..60f1d71c33af 100644
--- a/crates/re_time_panel/Cargo.toml
+++ b/crates/re_time_panel/Cargo.toml
@@ -25,6 +25,7 @@ re_entity_db.workspace = true
 re_format.workspace = true
 re_log_types.workspace = true
 re_tracing.workspace = true
+re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 re_viewport.workspace = true       # TODO(#5421): remove this dependency in favor of re_viewport_blueprint when it exists
diff --git a/crates/re_time_panel/src/lib.rs b/crates/re_time_panel/src/lib.rs
index 77617d3e6e68..f0ef5b81628e 100644
--- a/crates/re_time_panel/src/lib.rs
+++ b/crates/re_time_panel/src/lib.rs
@@ -23,6 +23,7 @@ use re_log_types::{
     external::re_types_core::ComponentName, ComponentPath, EntityPath, EntityPathPart,
     ResolvedTimeRange, TimeInt, TimeReal,
 };
+use re_types::datatypes::PanelState;
 use re_ui::list_item;
 use re_viewer_context::{
     CollapseScope, HoverHighlight, Item, RecordingConfig, TimeControl, TimeView, UiLayout,
@@ -143,7 +144,7 @@ impl TimePanel {
         entity_db: &re_entity_db::EntityDb,
         rec_cfg: &RecordingConfig,
         ui: &mut egui::Ui,
-        time_panel_expanded: bool,
+        state: PanelState,
     ) {
         // Naturally, many parts of the time panel need the time control.
         // Copy it once, read/edit, and then write back at the end if there was a change.
@@ -158,7 +159,7 @@ impl TimePanel {
         let margin = ctx.re_ui.bottom_panel_margin();
         let mut panel_frame = ctx.re_ui.bottom_panel_frame();
 
-        if time_panel_expanded {
+        if state.is_expanded() {
             // Since we use scroll bars we want to fill the whole vertical space downwards:
             panel_frame.inner_margin.bottom = 0.0;
 
@@ -188,7 +189,7 @@ impl TimePanel {
 
         egui::TopBottomPanel::show_animated_between_inside(
             ui,
-            time_panel_expanded,
+            state.is_expanded(),
             collapsed,
             expanded,
             |ui: &mut egui::Ui, expansion: f32| {
diff --git a/crates/re_types/definitions/rerun/blueprint.fbs b/crates/re_types/definitions/rerun/blueprint.fbs
index eba82a3a46a9..15e62816cb97 100644
--- a/crates/re_types/definitions/rerun/blueprint.fbs
+++ b/crates/re_types/definitions/rerun/blueprint.fbs
@@ -10,7 +10,7 @@ include "./blueprint/components/grid_columns.fbs";
 include "./blueprint/components/included_content.fbs";
 include "./blueprint/components/included_space_view.fbs";
 include "./blueprint/components/lock_range_during_zoom.fbs";
-include "./blueprint/components/panel_expanded.fbs";
+include "./blueprint/components/panel_state.fbs";
 include "./blueprint/components/query_expression.fbs";
 include "./blueprint/components/root_container.fbs";
 include "./blueprint/components/row_share.fbs";
diff --git a/crates/re_types/definitions/rerun/blueprint/archetypes/panel_blueprint.fbs b/crates/re_types/definitions/rerun/blueprint/archetypes/panel_blueprint.fbs
index 6c0a43b71cbc..5efcd3a8d574 100644
--- a/crates/re_types/definitions/rerun/blueprint/archetypes/panel_blueprint.fbs
+++ b/crates/re_types/definitions/rerun/blueprint/archetypes/panel_blueprint.fbs
@@ -14,8 +14,7 @@ table PanelBlueprint (
     // --- Required ---
 
     // --- Optional ---
-    /// Whether or not the panel is expanded.
-    expanded: rerun.blueprint.components.PanelExpanded ("attr.rerun.component_optional", nullable, order: 1000);
+    state: rerun.blueprint.components.PanelState ("attr.rerun.component_optional", nullable, order: 1000);
 
     // TODO(jleibs): Add a float to track how expanded the panel is.
 }
diff --git a/crates/re_types/definitions/rerun/blueprint/components/panel_expanded.fbs b/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
similarity index 61%
rename from crates/re_types/definitions/rerun/blueprint/components/panel_expanded.fbs
rename to crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
index a6479b76c512..1796fd1ed5a5 100644
--- a/crates/re_types/definitions/rerun/blueprint/components/panel_expanded.fbs
+++ b/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
@@ -9,12 +9,13 @@ namespace rerun.blueprint.components;
 
 // ---
 
-/// Whether an application panel is expanded or not.
-struct PanelExpanded (
+/// Panel state
+struct PanelState (
   "attr.rerun.scope": "blueprint",
-  "attr.rust.derive": "Copy, Default, PartialEq, Eq, PartialOrd, Ord",
+  "attr.rust.derive": "Copy, PartialEq, Eq",
   "attr.rust.repr": "transparent",
   "attr.rust.tuple_struct"
 ) {
-  expanded: rerun.datatypes.Bool (order: 100);
+  /// Panel state
+  state: rerun.datatypes.PanelState (order: 100);
 }
diff --git a/crates/re_types/definitions/rerun/datatypes.fbs b/crates/re_types/definitions/rerun/datatypes.fbs
index 79c8d6cc5a28..16ebe13a516f 100644
--- a/crates/re_types/definitions/rerun/datatypes.fbs
+++ b/crates/re_types/definitions/rerun/datatypes.fbs
@@ -11,6 +11,7 @@ include "./datatypes/keypoint_pair.fbs";
 include "./datatypes/mat3x3.fbs";
 include "./datatypes/mat4x4.fbs";
 include "./datatypes/material.fbs";
+include "./datatypes/panel_state.fbs";
 include "./datatypes/quaternion.fbs";
 include "./datatypes/range1d.fbs";
 include "./datatypes/range2d.fbs";
diff --git a/crates/re_types/definitions/rerun/datatypes/panel_state.fbs b/crates/re_types/definitions/rerun/datatypes/panel_state.fbs
new file mode 100644
index 000000000000..58cbd85fb77d
--- /dev/null
+++ b/crates/re_types/definitions/rerun/datatypes/panel_state.fbs
@@ -0,0 +1,21 @@
+include "arrow/attributes.fbs";
+include "rust/attributes.fbs";
+include "fbs/attributes.fbs";
+
+namespace rerun.datatypes;
+
+// ---
+
+/// State of a app blueprint panel.
+enum PanelState: byte (
+  "attr.rust.derive": "Copy, PartialEq, Eq"
+) {
+  /// Completely hidden
+  Hidden,
+
+  /// Visible, but as small as possible on its shorter axis
+  Collapsed,
+
+  /// Fully expanded
+  Expanded,
+}
diff --git a/crates/re_types/src/blueprint/components/.gitattributes b/crates/re_types/src/blueprint/components/.gitattributes
index e3243dff3cb0..e1a76cba51a7 100644
--- a/crates/re_types/src/blueprint/components/.gitattributes
+++ b/crates/re_types/src/blueprint/components/.gitattributes
@@ -8,7 +8,7 @@ corner2d.rs linguist-generated=true
 included_content.rs linguist-generated=true
 lock_range_during_zoom.rs linguist-generated=true
 mod.rs linguist-generated=true
-panel_expanded.rs linguist-generated=true
+panel_state.rs linguist-generated=true
 query_expression.rs linguist-generated=true
 row_share.rs linguist-generated=true
 space_view_class.rs linguist-generated=true
diff --git a/crates/re_types/src/blueprint/components/mod.rs b/crates/re_types/src/blueprint/components/mod.rs
index 0d49749ea1d9..75111e9753f1 100644
--- a/crates/re_types/src/blueprint/components/mod.rs
+++ b/crates/re_types/src/blueprint/components/mod.rs
@@ -7,7 +7,7 @@ mod corner2d;
 mod corner2d_ext;
 mod included_content;
 mod lock_range_during_zoom;
-mod panel_expanded;
+mod panel_state;
 mod query_expression;
 mod row_share;
 mod space_view_class;
@@ -26,7 +26,7 @@ pub use self::column_share::ColumnShare;
 pub use self::corner2d::Corner2D;
 pub use self::included_content::IncludedContent;
 pub use self::lock_range_during_zoom::LockRangeDuringZoom;
-pub use self::panel_expanded::PanelExpanded;
+pub use self::panel_state::PanelState;
 pub use self::query_expression::QueryExpression;
 pub use self::row_share::RowShare;
 pub use self::space_view_class::SpaceViewClass;
diff --git a/crates/re_types/src/blueprint/components/panel_expanded.rs b/crates/re_types/src/blueprint/components/panel_state.rs
similarity index 62%
rename from crates/re_types/src/blueprint/components/panel_expanded.rs
rename to crates/re_types/src/blueprint/components/panel_state.rs
index 3f208bf8e00c..171539864d45 100644
--- a/crates/re_types/src/blueprint/components/panel_expanded.rs
+++ b/crates/re_types/src/blueprint/components/panel_state.rs
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/rust/api.rs
-// Based on "crates/re_types/definitions/rerun/blueprint/components/panel_expanded.fbs".
+// Based on "crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs".
 
 #![allow(trivial_numeric_casts)]
 #![allow(unused_imports)]
@@ -22,12 +22,15 @@ use ::re_types_core::SerializationResult;
 use ::re_types_core::{ComponentBatch, MaybeOwnedComponentBatch};
 use ::re_types_core::{DeserializationError, DeserializationResult};
 
-/// **Component**: Whether an application panel is expanded or not.
-#[derive(Clone, Debug, Copy, Default, PartialEq, Eq, PartialOrd, Ord)]
+/// **Component**: Panel state
+#[derive(Clone, Debug, Copy, PartialEq, Eq)]
 #[repr(transparent)]
-pub struct PanelExpanded(pub crate::datatypes::Bool);
+pub struct PanelState(
+    /// Panel state
+    pub crate::datatypes::PanelState,
+);
 
-impl ::re_types_core::SizeBytes for PanelExpanded {
+impl ::re_types_core::SizeBytes for PanelState {
     #[inline]
     fn heap_size_bytes(&self) -> u64 {
         self.0.heap_size_bytes()
@@ -35,47 +38,56 @@ impl ::re_types_core::SizeBytes for PanelExpanded {
 
     #[inline]
     fn is_pod() -> bool {
-        <crate::datatypes::Bool>::is_pod()
+        <crate::datatypes::PanelState>::is_pod()
     }
 }
 
-impl<T: Into<crate::datatypes::Bool>> From<T> for PanelExpanded {
+impl<T: Into<crate::datatypes::PanelState>> From<T> for PanelState {
     fn from(v: T) -> Self {
         Self(v.into())
     }
 }
 
-impl std::borrow::Borrow<crate::datatypes::Bool> for PanelExpanded {
+impl std::borrow::Borrow<crate::datatypes::PanelState> for PanelState {
     #[inline]
-    fn borrow(&self) -> &crate::datatypes::Bool {
+    fn borrow(&self) -> &crate::datatypes::PanelState {
         &self.0
     }
 }
 
-impl std::ops::Deref for PanelExpanded {
-    type Target = crate::datatypes::Bool;
+impl std::ops::Deref for PanelState {
+    type Target = crate::datatypes::PanelState;
 
     #[inline]
-    fn deref(&self) -> &crate::datatypes::Bool {
+    fn deref(&self) -> &crate::datatypes::PanelState {
         &self.0
     }
 }
 
-::re_types_core::macros::impl_into_cow!(PanelExpanded);
+::re_types_core::macros::impl_into_cow!(PanelState);
 
-impl ::re_types_core::Loggable for PanelExpanded {
+impl ::re_types_core::Loggable for PanelState {
     type Name = ::re_types_core::ComponentName;
 
     #[inline]
     fn name() -> Self::Name {
-        "rerun.blueprint.components.PanelExpanded".into()
+        "rerun.blueprint.components.PanelState".into()
     }
 
     #[allow(clippy::wildcard_imports)]
     #[inline]
     fn arrow_datatype() -> arrow2::datatypes::DataType {
         use arrow2::datatypes::*;
-        DataType::Boolean
+        DataType::Union(
+            std::sync::Arc::new(vec![
+                Field::new("_null_markers", DataType::Null, true),
+                Field::new("Hidden", DataType::Null, true),
+                Field::new("Collapsed", DataType::Null, true),
+                Field::new("Expanded", DataType::Null, true),
+            ]),
+            Some(std::sync::Arc::new(vec![0i32, 1i32, 2i32, 3i32])),
+            UnionMode::Sparse,
+        )
     }
 
     #[allow(clippy::wildcard_imports)]
@@ -100,15 +112,10 @@ impl ::re_types_core::Loggable for PanelExpanded {
                 let any_nones = somes.iter().any(|some| !*some);
                 any_nones.then(|| somes.into())
             };
-            BooleanArray::new(
-                Self::arrow_datatype(),
-                data0
-                    .into_iter()
-                    .map(|datum| datum.map(|datum| datum.0).unwrap_or_default())
-                    .collect(),
-                data0_bitmap,
-            )
-            .boxed()
+            {
+                _ = data0_bitmap;
+                crate::datatypes::PanelState::to_arrow_opt(data0)?
+            }
         })
     }
 
@@ -121,21 +128,13 @@ impl ::re_types_core::Loggable for PanelExpanded {
     {
         use ::re_types_core::{Loggable as _, ResultExt as _};
         use arrow2::{array::*, buffer::*, datatypes::*};
-        Ok(arrow_data
-            .as_any()
-            .downcast_ref::<BooleanArray>()
-            .ok_or_else(|| {
-                let expected = Self::arrow_datatype();
-                let actual = arrow_data.data_type().clone();
-                DeserializationError::datatype_mismatch(expected, actual)
-            })
-            .with_context("rerun.blueprint.components.PanelExpanded#expanded")?
+        Ok(crate::datatypes::PanelState::from_arrow_opt(arrow_data)
+            .with_context("rerun.blueprint.components.PanelState#state")?
             .into_iter()
-            .map(|res_or_opt| res_or_opt.map(|v| crate::datatypes::Bool(v)))
             .map(|v| v.ok_or_else(DeserializationError::missing_data))
             .map(|res| res.map(|v| Some(Self(v))))
             .collect::<DeserializationResult<Vec<Option<_>>>>()
-            .with_context("rerun.blueprint.components.PanelExpanded#expanded")
-            .with_context("rerun.blueprint.components.PanelExpanded")?)
+            .with_context("rerun.blueprint.components.PanelState#state")
+            .with_context("rerun.blueprint.components.PanelState")?)
     }
 }
diff --git a/crates/re_types/src/datatypes/.gitattributes b/crates/re_types/src/datatypes/.gitattributes
index 3d947de0473c..efada633883e 100644
--- a/crates/re_types/src/datatypes/.gitattributes
+++ b/crates/re_types/src/datatypes/.gitattributes
@@ -13,6 +13,7 @@ mat3x3.rs linguist-generated=true
 mat4x4.rs linguist-generated=true
 material.rs linguist-generated=true
 mod.rs linguist-generated=true
+panel_state.rs linguist-generated=true
 quaternion.rs linguist-generated=true
 range1d.rs linguist-generated=true
 range2d.rs linguist-generated=true
diff --git a/crates/re_types/src/datatypes/mod.rs b/crates/re_types/src/datatypes/mod.rs
index d2f880d5d8f1..002a8ee730ff 100644
--- a/crates/re_types/src/datatypes/mod.rs
+++ b/crates/re_types/src/datatypes/mod.rs
@@ -21,6 +21,8 @@ mod mat4x4;
 mod mat4x4_ext;
 mod material;
 mod material_ext;
+mod panel_state;
+mod panel_state_ext;
 mod quaternion;
 mod quaternion_ext;
 mod range1d;
@@ -73,6 +75,7 @@ pub use self::keypoint_pair::KeypointPair;
 pub use self::mat3x3::Mat3x3;
 pub use self::mat4x4::Mat4x4;
 pub use self::material::Material;
+pub use self::panel_state::PanelState;
 pub use self::quaternion::Quaternion;
 pub use self::range1d::Range1D;
 pub use self::range2d::Range2D;
diff --git a/crates/re_types/src/datatypes/panel_state.rs b/crates/re_types/src/datatypes/panel_state.rs
new file mode 100644
index 000000000000..d2f5c89ab960
--- /dev/null
+++ b/crates/re_types/src/datatypes/panel_state.rs
@@ -0,0 +1,162 @@
+// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/rust/api.rs
+// Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
+
+#![allow(trivial_numeric_casts)]
+#![allow(unused_imports)]
+#![allow(unused_parens)]
+#![allow(clippy::clone_on_copy)]
+#![allow(clippy::cloned_instead_of_copied)]
+#![allow(clippy::iter_on_single_items)]
+#![allow(clippy::map_flatten)]
+#![allow(clippy::match_wildcard_for_single_variants)]
+#![allow(clippy::needless_question_mark)]
+#![allow(clippy::new_without_default)]
+#![allow(clippy::redundant_closure)]
+#![allow(clippy::too_many_arguments)]
+#![allow(clippy::too_many_lines)]
+#![allow(clippy::unnecessary_cast)]
+
+use ::re_types_core::external::arrow2;
+use ::re_types_core::ComponentName;
+use ::re_types_core::SerializationResult;
+use ::re_types_core::{ComponentBatch, MaybeOwnedComponentBatch};
+use ::re_types_core::{DeserializationError, DeserializationResult};
+
+/// **Datatype**: State of a app blueprint panel.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum PanelState {
+    /// Completely hidden
+    Hidden = 1,
+
+    /// Visible, but as small as possible on its shorter axis
+    Collapsed = 2,
+
+    /// Fully expanded
+    Expanded = 3,
+}
+
+impl PanelState {
+    /// All the different enum variants.
+    pub const ALL: [Self; 3] = [Self::Hidden, Self::Collapsed, Self::Expanded];
+}
+
+impl ::re_types_core::SizeBytes for PanelState {
+    #[inline]
+    fn heap_size_bytes(&self) -> u64 {
+        0
+    }
+
+    #[inline]
+    fn is_pod() -> bool {
+        true
+    }
+}
+
+impl std::fmt::Display for PanelState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Hidden => write!(f, "Hidden"),
+            Self::Collapsed => write!(f, "Collapsed"),
+            Self::Expanded => write!(f, "Expanded"),
+        }
+    }
+}
+
+::re_types_core::macros::impl_into_cow!(PanelState);
+
+impl ::re_types_core::Loggable for PanelState {
+    type Name = ::re_types_core::DatatypeName;
+
+    #[inline]
+    fn name() -> Self::Name {
+        "rerun.datatypes.PanelState".into()
+    }
+
+    #[allow(clippy::wildcard_imports)]
+    #[inline]
+    fn arrow_datatype() -> arrow2::datatypes::DataType {
+        use arrow2::datatypes::*;
+        DataType::Union(
+            std::sync::Arc::new(vec![
+                Field::new("_null_markers", DataType::Null, true),
+                Field::new("Hidden", DataType::Null, true),
+                Field::new("Collapsed", DataType::Null, true),
+                Field::new("Expanded", DataType::Null, true),
+            ]),
+            Some(std::sync::Arc::new(vec![0i32, 1i32, 2i32, 3i32])),
+            UnionMode::Sparse,
+        )
+    }
+
+    #[allow(clippy::wildcard_imports)]
+    fn to_arrow_opt<'a>(
+        data: impl IntoIterator<Item = Option<impl Into<::std::borrow::Cow<'a, Self>>>>,
+    ) -> SerializationResult<Box<dyn arrow2::array::Array>>
+    where
+        Self: Clone + 'a,
+    {
+        use ::re_types_core::{Loggable as _, ResultExt as _};
+        use arrow2::{array::*, datatypes::*};
+        Ok({
+            // Sparse Arrow union
+            let data: Vec<_> = data
+                .into_iter()
+                .map(|datum| {
+                    let datum: Option<::std::borrow::Cow<'a, Self>> = datum.map(Into::into);
+                    datum
+                })
+                .collect();
+            let num_variants = 3usize;
+            let types = data
+                .iter()
+                .map(|a| match a.as_deref() {
+                    None => 0,
+                    Some(value) => *value as i8,
+                })
+                .collect();
+            let fields: Vec<_> =
+                std::iter::repeat(NullArray::new(DataType::Null, data.len()).boxed())
+                    .take(1 + num_variants)
+                    .collect();
+            UnionArray::new(Self::arrow_datatype(), types, fields, None).boxed()
+        })
+    }
+
+    #[allow(clippy::wildcard_imports)]
+    fn from_arrow_opt(
+        arrow_data: &dyn arrow2::array::Array,
+    ) -> DeserializationResult<Vec<Option<Self>>>
+    where
+        Self: Sized,
+    {
+        use ::re_types_core::{Loggable as _, ResultExt as _};
+        use arrow2::{array::*, buffer::*, datatypes::*};
+        Ok({
+            let arrow_data = arrow_data
+                .as_any()
+                .downcast_ref::<arrow2::array::UnionArray>()
+                .ok_or_else(|| {
+                    let expected = Self::arrow_datatype();
+                    let actual = arrow_data.data_type().clone();
+                    DeserializationError::datatype_mismatch(expected, actual)
+                })
+                .with_context("rerun.datatypes.PanelState")?;
+            let arrow_data_types = arrow_data.types();
+            arrow_data_types
+                .iter()
+                .map(|typ| match typ {
+                    0 => Ok(None),
+                    1 => Ok(Some(Self::Hidden)),
+                    2 => Ok(Some(Self::Collapsed)),
+                    3 => Ok(Some(Self::Expanded)),
+                    _ => Err(DeserializationError::missing_union_arm(
+                        Self::arrow_datatype(),
+                        "<invalid>",
+                        *typ as _,
+                    )),
+                })
+                .collect::<DeserializationResult<Vec<_>>>()
+                .with_context("rerun.datatypes.PanelState")?
+        })
+    }
+}
diff --git a/crates/re_types/src/datatypes/panel_state_ext.rs b/crates/re_types/src/datatypes/panel_state_ext.rs
new file mode 100644
index 000000000000..b465b50673e4
--- /dev/null
+++ b/crates/re_types/src/datatypes/panel_state_ext.rs
@@ -0,0 +1,18 @@
+use super::PanelState;
+
+impl PanelState {
+    /// Returns `true` if self is [`PanelState::Expanded`]
+    #[inline]
+    pub fn is_expanded(&self) -> bool {
+        self == &Self::Expanded
+    }
+
+    /// Sets the panel to [`Self::Hidden`] if it is collapsed or expanded, and [`Self::Expanded`] if it is hidden.
+    #[inline]
+    pub fn toggle(self) -> Self {
+        match self {
+            Self::Collapsed | Self::Hidden => Self::Expanded,
+            Self::Expanded => Self::Collapsed,
+        }
+    }
+}
diff --git a/crates/re_types_blueprint/src/blueprint/archetypes/panel_blueprint.rs b/crates/re_types_blueprint/src/blueprint/archetypes/panel_blueprint.rs
index 32b8ecccab84..45871049dc8e 100644
--- a/crates/re_types_blueprint/src/blueprint/archetypes/panel_blueprint.rs
+++ b/crates/re_types_blueprint/src/blueprint/archetypes/panel_blueprint.rs
@@ -25,19 +25,18 @@ use ::re_types_core::{DeserializationError, DeserializationResult};
 /// **Archetype**: Shared state for the 3 collapsible panels.
 #[derive(Clone, Debug, Default)]
 pub struct PanelBlueprint {
-    /// Whether or not the panel is expanded.
-    pub expanded: Option<crate::blueprint::components::PanelExpanded>,
+    pub state: Option<crate::blueprint::components::PanelState>,
 }
 
 impl ::re_types_core::SizeBytes for PanelBlueprint {
     #[inline]
     fn heap_size_bytes(&self) -> u64 {
-        self.expanded.heap_size_bytes()
+        self.state.heap_size_bytes()
     }
 
     #[inline]
     fn is_pod() -> bool {
-        <Option<crate::blueprint::components::PanelExpanded>>::is_pod()
+        <Option<crate::blueprint::components::PanelState>>::is_pod()
     }
 }
 
@@ -48,13 +47,13 @@ static RECOMMENDED_COMPONENTS: once_cell::sync::Lazy<[ComponentName; 1usize]> =
     once_cell::sync::Lazy::new(|| ["rerun.blueprint.components.PanelBlueprintIndicator".into()]);
 
 static OPTIONAL_COMPONENTS: once_cell::sync::Lazy<[ComponentName; 1usize]> =
-    once_cell::sync::Lazy::new(|| ["rerun.blueprint.components.PanelExpanded".into()]);
+    once_cell::sync::Lazy::new(|| ["rerun.blueprint.components.PanelState".into()]);
 
 static ALL_COMPONENTS: once_cell::sync::Lazy<[ComponentName; 2usize]> =
     once_cell::sync::Lazy::new(|| {
         [
             "rerun.blueprint.components.PanelBlueprintIndicator".into(),
-            "rerun.blueprint.components.PanelExpanded".into(),
+            "rerun.blueprint.components.PanelState".into(),
         ]
     });
 
@@ -110,17 +109,17 @@ impl ::re_types_core::Archetype for PanelBlueprint {
             .into_iter()
             .map(|(name, array)| (name.full_name(), array))
             .collect();
-        let expanded =
-            if let Some(array) = arrays_by_name.get("rerun.blueprint.components.PanelExpanded") {
-                <crate::blueprint::components::PanelExpanded>::from_arrow_opt(&**array)
-                    .with_context("rerun.blueprint.archetypes.PanelBlueprint#expanded")?
-                    .into_iter()
-                    .next()
-                    .flatten()
-            } else {
-                None
-            };
-        Ok(Self { expanded })
+        let state = if let Some(array) = arrays_by_name.get("rerun.blueprint.components.PanelState")
+        {
+            <crate::blueprint::components::PanelState>::from_arrow_opt(&**array)
+                .with_context("rerun.blueprint.archetypes.PanelBlueprint#state")?
+                .into_iter()
+                .next()
+                .flatten()
+        } else {
+            None
+        };
+        Ok(Self { state })
     }
 }
 
@@ -130,7 +129,7 @@ impl ::re_types_core::AsComponents for PanelBlueprint {
         use ::re_types_core::Archetype as _;
         [
             Some(Self::indicator()),
-            self.expanded
+            self.state
                 .as_ref()
                 .map(|comp| (comp as &dyn ComponentBatch).into()),
         ]
@@ -144,16 +143,15 @@ impl PanelBlueprint {
     /// Create a new `PanelBlueprint`.
     #[inline]
     pub fn new() -> Self {
-        Self { expanded: None }
+        Self { state: None }
     }
 
-    /// Whether or not the panel is expanded.
     #[inline]
-    pub fn with_expanded(
+    pub fn with_state(
         mut self,
-        expanded: impl Into<crate::blueprint::components::PanelExpanded>,
+        state: impl Into<crate::blueprint::components::PanelState>,
     ) -> Self {
-        self.expanded = Some(expanded.into());
+        self.state = Some(state.into());
         self
     }
 }
diff --git a/crates/re_viewer/src/app_blueprint.rs b/crates/re_viewer/src/app_blueprint.rs
index 2b8fbc75cf18..5ec9648d0494 100644
--- a/crates/re_viewer/src/app_blueprint.rs
+++ b/crates/re_viewer/src/app_blueprint.rs
@@ -1,7 +1,8 @@
 use re_data_store::LatestAtQuery;
 use re_entity_db::EntityDb;
 use re_log_types::{DataRow, EntityPath, RowId, TimePoint};
-use re_types::blueprint::components::PanelExpanded;
+use re_types::blueprint::components;
+use re_types::datatypes;
 use re_viewer_context::{CommandSender, StoreContext, SystemCommand, SystemCommandSender};
 
 pub const BLUEPRINT_PANEL_PATH: &str = "blueprint_panel";
@@ -12,9 +13,9 @@ pub const TIME_PANEL_PATH: &str = "time_panel";
 pub struct AppBlueprint<'a> {
     store_ctx: Option<&'a StoreContext<'a>>,
     is_narrow_screen: bool,
-    pub blueprint_panel_expanded: bool,
-    pub selection_panel_expanded: bool,
-    pub time_panel_expanded: bool,
+    pub blueprint_panel_state: datatypes::PanelState,
+    pub selection_panel_state: datatypes::PanelState,
+    pub time_panel_state: datatypes::PanelState,
 }
 
 impl<'a> AppBlueprint<'a> {
@@ -28,24 +29,36 @@ impl<'a> AppBlueprint<'a> {
         let mut ret = Self {
             store_ctx,
             is_narrow_screen: screen_size.x < 600.0,
-            blueprint_panel_expanded: screen_size.x > 750.0,
-            selection_panel_expanded: screen_size.x > 1000.0,
-            time_panel_expanded: screen_size.y > 600.0,
+            blueprint_panel_state: if screen_size.x > 750.0 {
+                datatypes::PanelState::Expanded
+            } else {
+                datatypes::PanelState::Collapsed
+            },
+            selection_panel_state: if screen_size.x > 1000.0 {
+                datatypes::PanelState::Expanded
+            } else {
+                datatypes::PanelState::Collapsed
+            },
+            time_panel_state: if screen_size.y > 600.0 {
+                datatypes::PanelState::Expanded
+            } else {
+                datatypes::PanelState::Collapsed
+            },
         };
 
         if let Some(blueprint_db) = blueprint_db {
             if let Some(expanded) =
                 load_panel_state(&BLUEPRINT_PANEL_PATH.into(), blueprint_db, query)
             {
-                ret.blueprint_panel_expanded = expanded;
+                ret.blueprint_panel_state = expanded;
             }
             if let Some(expanded) =
                 load_panel_state(&SELECTION_PANEL_PATH.into(), blueprint_db, query)
             {
-                ret.selection_panel_expanded = expanded;
+                ret.selection_panel_state = expanded;
             }
             if let Some(expanded) = load_panel_state(&TIME_PANEL_PATH.into(), blueprint_db, query) {
-                ret.time_panel_expanded = expanded;
+                ret.time_panel_state = expanded;
             }
         }
 
@@ -53,45 +66,53 @@ impl<'a> AppBlueprint<'a> {
     }
 
     pub fn toggle_blueprint_panel(&self, command_sender: &CommandSender) {
-        let blueprint_panel_expanded = !self.blueprint_panel_expanded;
-        self.send_panel_expanded(
-            BLUEPRINT_PANEL_PATH,
-            blueprint_panel_expanded,
-            command_sender,
-        );
-        if self.is_narrow_screen && self.blueprint_panel_expanded {
-            self.send_panel_expanded(SELECTION_PANEL_PATH, false, command_sender);
+        let new_state = self.blueprint_panel_state.toggle();
+        self.send_panel_state(BLUEPRINT_PANEL_PATH, new_state, command_sender);
+
+        // Toggle the opposite side if this panel is visible to save on screen real estate
+        if self.is_narrow_screen && new_state.is_expanded() {
+            self.send_panel_state(
+                SELECTION_PANEL_PATH,
+                datatypes::PanelState::Hidden,
+                command_sender,
+            );
         }
     }
 
     pub fn toggle_selection_panel(&self, command_sender: &CommandSender) {
-        let selection_panel_expanded = !self.selection_panel_expanded;
-        self.send_panel_expanded(
-            SELECTION_PANEL_PATH,
-            selection_panel_expanded,
-            command_sender,
-        );
-        if self.is_narrow_screen && self.blueprint_panel_expanded {
-            self.send_panel_expanded(BLUEPRINT_PANEL_PATH, false, command_sender);
+        let new_state = self.selection_panel_state.toggle();
+        self.send_panel_state(SELECTION_PANEL_PATH, new_state, command_sender);
+
+        // Toggle the opposite side if this panel is visible to save on screen real estate
+        if self.is_narrow_screen && new_state.is_expanded() {
+            self.send_panel_state(
+                BLUEPRINT_PANEL_PATH,
+                datatypes::PanelState::Hidden,
+                command_sender,
+            );
         }
     }
 
     pub fn toggle_time_panel(&self, command_sender: &CommandSender) {
-        self.send_panel_expanded(TIME_PANEL_PATH, !self.time_panel_expanded, command_sender);
+        self.send_panel_state(
+            TIME_PANEL_PATH,
+            self.time_panel_state.toggle(),
+            command_sender,
+        );
     }
 }
 
 pub fn setup_welcome_screen_blueprint(welcome_screen_blueprint: &mut EntityDb) {
-    for (panel_name, is_expanded) in [
-        (BLUEPRINT_PANEL_PATH, true),
-        (SELECTION_PANEL_PATH, false),
-        (TIME_PANEL_PATH, false),
+    for (panel_name, default_value) in [
+        (BLUEPRINT_PANEL_PATH, datatypes::PanelState::Expanded),
+        (SELECTION_PANEL_PATH, datatypes::PanelState::Hidden),
+        (TIME_PANEL_PATH, datatypes::PanelState::Hidden),
     ] {
         let entity_path = EntityPath::from(panel_name);
         // TODO(jleibs): Seq instead of timeless?
         let timepoint = TimePoint::default();
 
-        let component = PanelExpanded(is_expanded.into());
+        let component = components::PanelState(default_value);
 
         let row =
             DataRow::from_cells1_sized(RowId::new(), entity_path, timepoint, [component]).unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
@@ -103,10 +124,10 @@ pub fn setup_welcome_screen_blueprint(welcome_screen_blueprint: &mut EntityDb) {
 // ----------------------------------------------------------------------------
 
 impl<'a> AppBlueprint<'a> {
-    fn send_panel_expanded(
+    fn send_panel_state(
         &self,
         panel_name: &str,
-        is_expanded: bool,
+        value: datatypes::PanelState,
         command_sender: &CommandSender,
     ) {
         if let Some(store_ctx) = self.store_ctx {
@@ -114,7 +135,7 @@ impl<'a> AppBlueprint<'a> {
 
             let timepoint = store_ctx.blueprint_timepoint_for_writes();
 
-            let component = PanelExpanded(is_expanded.into());
+            let component = components::PanelState::from(value);
 
             let row = DataRow::from_cells1_sized(RowId::new(), entity_path, timepoint, [component])
                 .unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
@@ -131,10 +152,10 @@ fn load_panel_state(
     path: &EntityPath,
     blueprint_db: &re_entity_db::EntityDb,
     query: &LatestAtQuery,
-) -> Option<bool> {
+) -> Option<datatypes::PanelState> {
     re_tracing::profile_function!();
     // TODO(#5607): what should happen if the promise is still pending?
     blueprint_db
-        .latest_at_component_quiet::<PanelExpanded>(path, query)
-        .map(|p| p.0 .0)
+        .latest_at_component_quiet::<components::PanelState>(path, query)
+        .map(|p| p.0)
 }
diff --git a/crates/re_viewer/src/app_state.rs b/crates/re_viewer/src/app_state.rs
index d43f6fdbf086..8f1bfd2f2628 100644
--- a/crates/re_viewer/src/app_state.rs
+++ b/crates/re_viewer/src/app_state.rs
@@ -5,6 +5,7 @@ use re_entity_db::EntityDb;
 use re_log_types::{LogMsg, ResolvedTimeRangeF, StoreId};
 use re_smart_channel::ReceiveSet;
 use re_space_view::{determine_visualizable_entities, DataQuery as _, PropertyResolver as _};
+use re_types::datatypes::PanelState;
 use re_viewer_context::{
     blueprint_timeline, AppOptions, ApplicationSelectionState, Caches, CommandSender,
     ComponentUiRegistry, PlayState, RecordingConfig, SpaceViewClassRegistry, StoreContext,
@@ -320,7 +321,7 @@ impl AppState {
                 ctx.store_context.blueprint,
                 blueprint_cfg,
                 ui,
-                true,
+                PanelState::Expanded,
             );
         }
 
@@ -334,7 +335,7 @@ impl AppState {
             ctx.recording(),
             ctx.rec_cfg,
             ui,
-            app_blueprint.time_panel_expanded,
+            app_blueprint.time_panel_state,
         );
 
         //
@@ -345,7 +346,7 @@ impl AppState {
             &ctx,
             ui,
             &mut viewport,
-            app_blueprint.selection_panel_expanded,
+            app_blueprint.selection_panel_state.is_expanded(),
         );
 
         //
@@ -373,7 +374,7 @@ impl AppState {
 
         left_panel.show_animated_inside(
             ui,
-            app_blueprint.blueprint_panel_expanded,
+            app_blueprint.blueprint_panel_state.is_expanded(),
             |ui: &mut egui::Ui| {
                 //TODO(#6256): workaround for https://github.com/emilk/egui/issues/4475
                 let max_rect = ui.max_rect();
diff --git a/crates/re_viewer/src/blueprint/validation_gen/mod.rs b/crates/re_viewer/src/blueprint/validation_gen/mod.rs
index 4474c87f9608..4e9fec40c0c4 100644
--- a/crates/re_viewer/src/blueprint/validation_gen/mod.rs
+++ b/crates/re_viewer/src/blueprint/validation_gen/mod.rs
@@ -8,7 +8,7 @@ pub use re_types::blueprint::components::ColumnShare;
 pub use re_types::blueprint::components::Corner2D;
 pub use re_types::blueprint::components::IncludedContent;
 pub use re_types::blueprint::components::LockRangeDuringZoom;
-pub use re_types::blueprint::components::PanelExpanded;
+pub use re_types::blueprint::components::PanelState;
 pub use re_types::blueprint::components::QueryExpression;
 pub use re_types::blueprint::components::RowShare;
 pub use re_types::blueprint::components::SpaceViewClass;
@@ -41,7 +41,7 @@ pub fn is_valid_blueprint(blueprint: &EntityDb) -> bool {
         && validate_component::<IncludedContent>(blueprint)
         && validate_component::<IncludedSpaceView>(blueprint)
         && validate_component::<LockRangeDuringZoom>(blueprint)
-        && validate_component::<PanelExpanded>(blueprint)
+        && validate_component::<PanelState>(blueprint)
         && validate_component::<QueryExpression>(blueprint)
         && validate_component::<RootContainer>(blueprint)
         && validate_component::<RowShare>(blueprint)
diff --git a/crates/re_viewer/src/ui/top_panel.rs b/crates/re_viewer/src/ui/top_panel.rs
index 5744b7cec654..8fb884379f5a 100644
--- a/crates/re_viewer/src/ui/top_panel.rs
+++ b/crates/re_viewer/src/ui/top_panel.rs
@@ -228,13 +228,12 @@ fn connection_status_ui(ui: &mut egui::Ui, rx: &ReceiveSet<re_log_types::LogMsg>
 
 /// Lay out the panel button right-to-left
 fn panel_buttons_r2l(app: &App, app_blueprint: &AppBlueprint<'_>, ui: &mut egui::Ui) {
-    let mut selection_panel_expanded = app_blueprint.selection_panel_expanded;
     if app
         .re_ui()
         .medium_icon_toggle_button(
             ui,
             &re_ui::icons::RIGHT_PANEL_TOGGLE,
-            &mut selection_panel_expanded,
+            &mut (app_blueprint.selection_panel_state.is_expanded()),
         )
         .on_hover_text(format!(
             "Toggle Selection View{}",
@@ -245,13 +244,12 @@ fn panel_buttons_r2l(app: &App, app_blueprint: &AppBlueprint<'_>, ui: &mut egui:
         app_blueprint.toggle_selection_panel(&app.command_sender);
     }
 
-    let mut time_panel_expanded = app_blueprint.time_panel_expanded;
     if app
         .re_ui()
         .medium_icon_toggle_button(
             ui,
             &re_ui::icons::BOTTOM_PANEL_TOGGLE,
-            &mut time_panel_expanded,
+            &mut app_blueprint.time_panel_state.is_expanded(),
         )
         .on_hover_text(format!(
             "Toggle Timeline View{}",
@@ -262,13 +260,12 @@ fn panel_buttons_r2l(app: &App, app_blueprint: &AppBlueprint<'_>, ui: &mut egui:
         app_blueprint.toggle_time_panel(&app.command_sender);
     }
 
-    let mut blueprint_panel_expanded = app_blueprint.blueprint_panel_expanded;
     if app
         .re_ui()
         .medium_icon_toggle_button(
             ui,
             &re_ui::icons::LEFT_PANEL_TOGGLE,
-            &mut blueprint_panel_expanded,
+            &mut app_blueprint.blueprint_panel_state.is_expanded(),
         )
         .on_hover_text(format!(
             "Toggle blueprint view{}",
diff --git a/docs/content/reference/types/datatypes.md b/docs/content/reference/types/datatypes.md
index 44da8f00e832..4fcdf01f0370 100644
--- a/docs/content/reference/types/datatypes.md
+++ b/docs/content/reference/types/datatypes.md
@@ -20,6 +20,7 @@ Data types are the lowest layer of the data model hierarchy. They are re-usable
 * [`Mat3x3`](datatypes/mat3x3.md): A 3x3 Matrix.
 * [`Mat4x4`](datatypes/mat4x4.md): A 4x4 Matrix.
 * [`Material`](datatypes/material.md): Material properties of a mesh.
+* [`PanelState`](datatypes/panel_state.md): State of a app blueprint panel.
 * [`Quaternion`](datatypes/quaternion.md): A Quaternion represented by 4 real numbers.
 * [`Range1D`](datatypes/range1d.md): A 1D range, specifying a lower and upper bound.
 * [`Range2D`](datatypes/range2d.md): An Axis-Aligned Bounding Box in 2D space, implemented as the minimum and maximum corners.
diff --git a/docs/content/reference/types/datatypes/.gitattributes b/docs/content/reference/types/datatypes/.gitattributes
index 856d359c9a41..411d02319d30 100644
--- a/docs/content/reference/types/datatypes/.gitattributes
+++ b/docs/content/reference/types/datatypes/.gitattributes
@@ -14,6 +14,7 @@ keypoint_pair.md linguist-generated=true
 mat3x3.md linguist-generated=true
 mat4x4.md linguist-generated=true
 material.md linguist-generated=true
+panel_state.md linguist-generated=true
 quaternion.md linguist-generated=true
 range1d.md linguist-generated=true
 range2d.md linguist-generated=true
diff --git a/docs/content/reference/types/datatypes/panel_state.md b/docs/content/reference/types/datatypes/panel_state.md
new file mode 100644
index 000000000000..ef92f343f832
--- /dev/null
+++ b/docs/content/reference/types/datatypes/panel_state.md
@@ -0,0 +1,19 @@
+---
+title: "PanelState"
+---
+<!-- DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/docs/mod.rs -->
+
+State of a app blueprint panel.
+
+## Variants
+
+* Hidden
+* Collapsed
+* Expanded
+
+## API reference links
+ * 🌊 [C++ API docs for `PanelState`](https://ref.rerun.io/docs/cpp/stable/namespacererun_1_1datatypes.html)
+ * 🐍 [Python API docs for `PanelState`](https://ref.rerun.io/docs/python/stable/common/datatypes#rerun.datatypes.PanelState)
+ * 🦀 [Rust API docs for `PanelState`](https://docs.rs/rerun/latest/rerun/datatypes/enum.PanelState.html)
+
+
diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.cpp b/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.cpp
index a42069149ffb..36cbece20e30 100644
--- a/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.cpp
+++ b/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.cpp
@@ -16,8 +16,8 @@ namespace rerun {
         std::vector<DataCell> cells;
         cells.reserve(2);
 
-        if (archetype.expanded.has_value()) {
-            auto result = DataCell::from_loggable(archetype.expanded.value());
+        if (archetype.state.has_value()) {
+            auto result = DataCell::from_loggable(archetype.state.value());
             RR_RETURN_NOT_OK(result.error);
             cells.push_back(std::move(result.value));
         }
diff --git a/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp b/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp
index 5b0c9717af32..fe73f195bab1 100644
--- a/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp
+++ b/rerun_cpp/src/rerun/blueprint/archetypes/panel_blueprint.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../../blueprint/components/panel_expanded.hpp"
+#include "../../blueprint/components/panel_state.hpp"
 #include "../../collection.hpp"
 #include "../../compiler_utils.hpp"
 #include "../../data_cell.hpp"
@@ -18,8 +18,7 @@
 namespace rerun::blueprint::archetypes {
     /// **Archetype**: Shared state for the 3 collapsible panels.
     struct PanelBlueprint {
-        /// Whether or not the panel is expanded.
-        std::optional<rerun::blueprint::components::PanelExpanded> expanded;
+        std::optional<rerun::blueprint::components::PanelState> state;
 
       public:
         static constexpr const char IndicatorComponentName[] =
@@ -32,9 +31,8 @@ namespace rerun::blueprint::archetypes {
         PanelBlueprint() = default;
         PanelBlueprint(PanelBlueprint&& other) = default;
 
-        /// Whether or not the panel is expanded.
-        PanelBlueprint with_expanded(rerun::blueprint::components::PanelExpanded _expanded) && {
-            expanded = std::move(_expanded);
+        PanelBlueprint with_state(rerun::blueprint::components::PanelState _state) && {
+            state = std::move(_state);
             // See: https://github.com/rerun-io/rerun/issues/4027
             RR_WITH_MAYBE_UNINITIALIZED_DISABLED(return std::move(*this);)
         }
diff --git a/rerun_cpp/src/rerun/blueprint/components.hpp b/rerun_cpp/src/rerun/blueprint/components.hpp
index 2853643b21fa..577118b8d830 100644
--- a/rerun_cpp/src/rerun/blueprint/components.hpp
+++ b/rerun_cpp/src/rerun/blueprint/components.hpp
@@ -14,7 +14,7 @@
 #include "blueprint/components/included_content.hpp"
 #include "blueprint/components/included_space_view.hpp"
 #include "blueprint/components/lock_range_during_zoom.hpp"
-#include "blueprint/components/panel_expanded.hpp"
+#include "blueprint/components/panel_state.hpp"
 #include "blueprint/components/query_expression.hpp"
 #include "blueprint/components/root_container.hpp"
 #include "blueprint/components/row_share.hpp"
diff --git a/rerun_cpp/src/rerun/blueprint/components/.gitattributes b/rerun_cpp/src/rerun/blueprint/components/.gitattributes
index 50269a81697e..3f9fc082787a 100644
--- a/rerun_cpp/src/rerun/blueprint/components/.gitattributes
+++ b/rerun_cpp/src/rerun/blueprint/components/.gitattributes
@@ -21,7 +21,7 @@ grid_columns.hpp linguist-generated=true
 included_content.hpp linguist-generated=true
 included_space_view.hpp linguist-generated=true
 lock_range_during_zoom.hpp linguist-generated=true
-panel_expanded.hpp linguist-generated=true
+panel_state.hpp linguist-generated=true
 query_expression.hpp linguist-generated=true
 root_container.hpp linguist-generated=true
 row_share.cpp linguist-generated=true
diff --git a/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp b/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp
deleted file mode 100644
index f3c9b4387f3f..000000000000
--- a/rerun_cpp/src/rerun/blueprint/components/panel_expanded.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/cpp/mod.rs
-// Based on "crates/re_types/definitions/rerun/blueprint/components/panel_expanded.fbs".
-
-#pragma once
-
-#include "../../datatypes/bool.hpp"
-#include "../../result.hpp"
-
-#include <cstdint>
-#include <memory>
-
-namespace rerun::blueprint::components {
-    /// **Component**: Whether an application panel is expanded or not.
-    struct PanelExpanded {
-        rerun::datatypes::Bool expanded;
-
-      public:
-        PanelExpanded() = default;
-
-        PanelExpanded(rerun::datatypes::Bool expanded_) : expanded(expanded_) {}
-
-        PanelExpanded& operator=(rerun::datatypes::Bool expanded_) {
-            expanded = expanded_;
-            return *this;
-        }
-
-        PanelExpanded(bool value_) : expanded(value_) {}
-
-        PanelExpanded& operator=(bool value_) {
-            expanded = value_;
-            return *this;
-        }
-
-        /// Cast to the underlying Bool datatype
-        operator rerun::datatypes::Bool() const {
-            return expanded;
-        }
-    };
-} // namespace rerun::blueprint::components
-
-namespace rerun {
-    static_assert(sizeof(rerun::datatypes::Bool) == sizeof(blueprint::components::PanelExpanded));
-
-    /// \private
-    template <>
-    struct Loggable<blueprint::components::PanelExpanded> {
-        static constexpr const char Name[] = "rerun.blueprint.components.PanelExpanded";
-
-        /// Returns the arrow data type this type corresponds to.
-        static const std::shared_ptr<arrow::DataType>& arrow_datatype() {
-            return Loggable<rerun::datatypes::Bool>::arrow_datatype();
-        }
-
-        /// Serializes an array of `rerun::blueprint:: components::PanelExpanded` into an arrow array.
-        static Result<std::shared_ptr<arrow::Array>> to_arrow(
-            const blueprint::components::PanelExpanded* instances, size_t num_instances
-        ) {
-            return Loggable<rerun::datatypes::Bool>::to_arrow(&instances->expanded, num_instances);
-        }
-    };
-} // namespace rerun
diff --git a/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp b/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
new file mode 100644
index 000000000000..38a745981b78
--- /dev/null
+++ b/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
@@ -0,0 +1,60 @@
+// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/cpp/mod.rs
+// Based on "crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs".
+
+#pragma once
+
+#include "../../datatypes/panel_state.hpp"
+#include "../../result.hpp"
+
+#include <cstdint>
+#include <memory>
+
+namespace rerun::blueprint::components {
+    /// **Component**: Panel state
+    struct PanelState {
+        /// Panel state
+        rerun::datatypes::PanelState state;
+
+      public:
+        PanelState() = default;
+
+        PanelState(rerun::datatypes::PanelState state_) : state(state_) {}
+
+        PanelState& operator=(rerun::datatypes::PanelState state_) {
+            state = state_;
+            return *this;
+        }
+
+        /// Cast to the underlying PanelState datatype
+        operator rerun::datatypes::PanelState() const {
+            return state;
+        }
+    };
+} // namespace rerun::blueprint::components
+
+namespace rerun {
+    static_assert(
+        sizeof(rerun::datatypes::PanelState) == sizeof(blueprint::components::PanelState)
+    );
+
+    /// \private
+    template <>
+    struct Loggable<blueprint::components::PanelState> {
+        static constexpr const char Name[] = "rerun.blueprint.components.PanelState";
+
+        /// Returns the arrow data type this type corresponds to.
+        static const std::shared_ptr<arrow::DataType>& arrow_datatype() {
+            return Loggable<rerun::datatypes::PanelState>::arrow_datatype();
+        }
+
+        /// Serializes an array of `rerun::blueprint:: components::PanelState` into an arrow array.
+        static Result<std::shared_ptr<arrow::Array>> to_arrow(
+            const blueprint::components::PanelState* instances, size_t num_instances
+        ) {
+            return Loggable<rerun::datatypes::PanelState>::to_arrow(
+                &instances->state,
+                num_instances
+            );
+        }
+    };
+} // namespace rerun
diff --git a/rerun_cpp/src/rerun/datatypes.hpp b/rerun_cpp/src/rerun/datatypes.hpp
index 40ccb9f0e759..66a9328eec80 100644
--- a/rerun_cpp/src/rerun/datatypes.hpp
+++ b/rerun_cpp/src/rerun/datatypes.hpp
@@ -15,6 +15,7 @@
 #include "datatypes/mat3x3.hpp"
 #include "datatypes/mat4x4.hpp"
 #include "datatypes/material.hpp"
+#include "datatypes/panel_state.hpp"
 #include "datatypes/quaternion.hpp"
 #include "datatypes/range1d.hpp"
 #include "datatypes/range2d.hpp"
diff --git a/rerun_cpp/src/rerun/datatypes/.gitattributes b/rerun_cpp/src/rerun/datatypes/.gitattributes
index ca81f2410d02..6d7829d1a6de 100644
--- a/rerun_cpp/src/rerun/datatypes/.gitattributes
+++ b/rerun_cpp/src/rerun/datatypes/.gitattributes
@@ -27,6 +27,8 @@ mat4x4.cpp linguist-generated=true
 mat4x4.hpp linguist-generated=true
 material.cpp linguist-generated=true
 material.hpp linguist-generated=true
+panel_state.cpp linguist-generated=true
+panel_state.hpp linguist-generated=true
 quaternion.cpp linguist-generated=true
 quaternion.hpp linguist-generated=true
 range1d.cpp linguist-generated=true
diff --git a/rerun_cpp/src/rerun/datatypes/panel_state.cpp b/rerun_cpp/src/rerun/datatypes/panel_state.cpp
new file mode 100644
index 000000000000..1d105f33becd
--- /dev/null
+++ b/rerun_cpp/src/rerun/datatypes/panel_state.cpp
@@ -0,0 +1,62 @@
+// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/cpp/mod.rs
+// Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
+
+#include "panel_state.hpp"
+
+#include <arrow/builder.h>
+#include <arrow/type_fwd.h>
+
+namespace rerun {
+    const std::shared_ptr<arrow::DataType>& Loggable<datatypes::PanelState>::arrow_datatype() {
+        static const auto datatype = arrow::sparse_union({
+            arrow::field("_null_markers", arrow::null(), true, nullptr),
+            arrow::field("Hidden", arrow::null(), true),
+            arrow::field("Collapsed", arrow::null(), true),
+            arrow::field("Expanded", arrow::null(), true),
+        });
+        return datatype;
+    }
+
+    Result<std::shared_ptr<arrow::Array>> Loggable<datatypes::PanelState>::to_arrow(
+        const datatypes::PanelState* instances, size_t num_instances
+    ) {
+        // TODO(andreas): Allow configuring the memory pool.
+        arrow::MemoryPool* pool = arrow::default_memory_pool();
+        auto datatype = arrow_datatype();
+
+        ARROW_ASSIGN_OR_RAISE(auto builder, arrow::MakeBuilder(datatype, pool))
+        if (instances && num_instances > 0) {
+            RR_RETURN_NOT_OK(Loggable<datatypes::PanelState>::fill_arrow_array_builder(
+                static_cast<arrow::SparseUnionBuilder*>(builder.get()),
+                instances,
+                num_instances
+            ));
+        }
+        std::shared_ptr<arrow::Array> array;
+        ARROW_RETURN_NOT_OK(builder->Finish(&array));
+        return array;
+    }
+
+    rerun::Error Loggable<datatypes::PanelState>::fill_arrow_array_builder(
+        arrow::SparseUnionBuilder* builder, const datatypes::PanelState* elements,
+        size_t num_elements
+    ) {
+        if (builder == nullptr) {
+            return rerun::Error(ErrorCode::UnexpectedNullArgument, "Passed array builder is null.");
+        }
+        if (elements == nullptr) {
+            return rerun::Error(
+                ErrorCode::UnexpectedNullArgument,
+                "Cannot serialize null pointer to arrow array."
+            );
+        }
+
+        ARROW_RETURN_NOT_OK(builder->Reserve(static_cast<int64_t>(num_elements)));
+        for (size_t elem_idx = 0; elem_idx < num_elements; elem_idx += 1) {
+            const auto variant = elements[elem_idx];
+            ARROW_RETURN_NOT_OK(builder->Append(static_cast<int8_t>(variant)));
+        }
+
+        return Error::ok();
+    }
+} // namespace rerun
diff --git a/rerun_cpp/src/rerun/datatypes/panel_state.hpp b/rerun_cpp/src/rerun/datatypes/panel_state.hpp
new file mode 100644
index 000000000000..81226adacd88
--- /dev/null
+++ b/rerun_cpp/src/rerun/datatypes/panel_state.hpp
@@ -0,0 +1,55 @@
+// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/cpp/mod.rs
+// Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
+
+#pragma once
+
+#include "../result.hpp"
+
+#include <cstdint>
+#include <memory>
+
+namespace arrow {
+    class Array;
+    class DataType;
+    class SparseUnionBuilder;
+} // namespace arrow
+
+namespace rerun::datatypes {
+    /// **Datatype**: State of a app blueprint panel.
+    enum class PanelState : uint8_t {
+
+        /// Completely hidden
+        Hidden = 1,
+
+        /// Visible, but as small as possible on its shorter axis
+        Collapsed = 2,
+
+        /// Fully expanded
+        Expanded = 3,
+    };
+} // namespace rerun::datatypes
+
+namespace rerun {
+    template <typename T>
+    struct Loggable;
+
+    /// \private
+    template <>
+    struct Loggable<datatypes::PanelState> {
+        static constexpr const char Name[] = "rerun.datatypes.PanelState";
+
+        /// Returns the arrow data type this type corresponds to.
+        static const std::shared_ptr<arrow::DataType>& arrow_datatype();
+
+        /// Serializes an array of `rerun::datatypes::PanelState` into an arrow array.
+        static Result<std::shared_ptr<arrow::Array>> to_arrow(
+            const datatypes::PanelState* instances, size_t num_instances
+        );
+
+        /// Fills an arrow array builder with an array of this type.
+        static rerun::Error fill_arrow_array_builder(
+            arrow::SparseUnionBuilder* builder, const datatypes::PanelState* elements,
+            size_t num_elements
+        );
+    };
+} // namespace rerun
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py b/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py
index 946cc72a78e7..37c79865661b 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py
@@ -21,27 +21,19 @@
 class PanelBlueprint(Archetype):
     """**Archetype**: Shared state for the 3 collapsible panels."""
 
-    def __init__(self: Any, *, expanded: datatypes.BoolLike | None = None):
-        """
-        Create a new instance of the PanelBlueprint archetype.
-
-        Parameters
-        ----------
-        expanded:
-            Whether or not the panel is expanded.
-
-        """
+    def __init__(self: Any, *, state: datatypes.PanelStateLike | None = None):
+        """Create a new instance of the PanelBlueprint archetype."""
 
         # You can define your own __init__ function as a member of PanelBlueprintExt in panel_blueprint_ext.py
         with catch_and_log_exceptions(context=self.__class__.__name__):
-            self.__attrs_init__(expanded=expanded)
+            self.__attrs_init__(state=state)
             return
         self.__attrs_clear__()
 
     def __attrs_clear__(self) -> None:
         """Convenience method for calling `__attrs_init__` with all `None`s."""
         self.__attrs_init__(
-            expanded=None,  # type: ignore[arg-type]
+            state=None,  # type: ignore[arg-type]
         )
 
     @classmethod
@@ -51,14 +43,10 @@ def _clear(cls) -> PanelBlueprint:
         inst.__attrs_clear__()
         return inst
 
-    expanded: blueprint_components.PanelExpandedBatch | None = field(
+    state: blueprint_components.PanelStateBatch | None = field(
         metadata={"component": "optional"},
         default=None,
-        converter=blueprint_components.PanelExpandedBatch._optional,  # type: ignore[misc]
+        converter=blueprint_components.PanelStateBatch._optional,  # type: ignore[misc]
     )
-    # Whether or not the panel is expanded.
-    #
-    # (Docstring intentionally commented out to hide this field from the docs)
-
     __str__ = Archetype.__str__
     __repr__ = Archetype.__repr__  # type: ignore[assignment]
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/.gitattributes b/rerun_py/rerun_sdk/rerun/blueprint/components/.gitattributes
index decf79627807..e0d6a940b940 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/components/.gitattributes
+++ b/rerun_py/rerun_sdk/rerun/blueprint/components/.gitattributes
@@ -14,7 +14,7 @@ grid_columns.py linguist-generated=true
 included_content.py linguist-generated=true
 included_space_view.py linguist-generated=true
 lock_range_during_zoom.py linguist-generated=true
-panel_expanded.py linguist-generated=true
+panel_state.py linguist-generated=true
 query_expression.py linguist-generated=true
 root_container.py linguist-generated=true
 row_share.py linguist-generated=true
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py b/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py
index 48556e4455b9..8c895f6b897f 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py
@@ -38,7 +38,7 @@
 from .included_content import IncludedContent, IncludedContentBatch, IncludedContentType
 from .included_space_view import IncludedSpaceView, IncludedSpaceViewBatch, IncludedSpaceViewType
 from .lock_range_during_zoom import LockRangeDuringZoom, LockRangeDuringZoomBatch, LockRangeDuringZoomType
-from .panel_expanded import PanelExpanded, PanelExpandedBatch, PanelExpandedType
+from .panel_state import PanelState, PanelStateBatch, PanelStateType
 from .query_expression import QueryExpression, QueryExpressionBatch, QueryExpressionType
 from .root_container import RootContainer, RootContainerBatch, RootContainerType
 from .row_share import RowShare, RowShareArrayLike, RowShareBatch, RowShareLike, RowShareType
@@ -107,9 +107,9 @@
     "LockRangeDuringZoom",
     "LockRangeDuringZoomBatch",
     "LockRangeDuringZoomType",
-    "PanelExpanded",
-    "PanelExpandedBatch",
-    "PanelExpandedType",
+    "PanelState",
+    "PanelStateBatch",
+    "PanelStateType",
     "QueryExpression",
     "QueryExpressionBatch",
     "QueryExpressionType",
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_expanded.py b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_expanded.py
deleted file mode 100644
index 0f4a1abf5bf6..000000000000
--- a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_expanded.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/python/mod.rs
-# Based on "crates/re_types/definitions/rerun/blueprint/components/panel_expanded.fbs".
-
-# You can extend this class by creating a "PanelExpandedExt" class in "panel_expanded_ext.py".
-
-from __future__ import annotations
-
-from ... import datatypes
-from ..._baseclasses import ComponentBatchMixin
-
-__all__ = ["PanelExpanded", "PanelExpandedBatch", "PanelExpandedType"]
-
-
-class PanelExpanded(datatypes.Bool):
-    """**Component**: Whether an application panel is expanded or not."""
-
-    # You can define your own __init__ function as a member of PanelExpandedExt in panel_expanded_ext.py
-
-    # Note: there are no fields here because PanelExpanded delegates to datatypes.Bool
-    pass
-
-
-class PanelExpandedType(datatypes.BoolType):
-    _TYPE_NAME: str = "rerun.blueprint.components.PanelExpanded"
-
-
-class PanelExpandedBatch(datatypes.BoolBatch, ComponentBatchMixin):
-    _ARROW_TYPE = PanelExpandedType()
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
new file mode 100644
index 000000000000..1061e27ff617
--- /dev/null
+++ b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
@@ -0,0 +1,28 @@
+# DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/python/mod.rs
+# Based on "crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs".
+
+# You can extend this class by creating a "PanelStateExt" class in "panel_state_ext.py".
+
+from __future__ import annotations
+
+from ... import datatypes
+from ..._baseclasses import ComponentBatchMixin
+
+__all__ = ["PanelState", "PanelStateBatch", "PanelStateType"]
+
+
+class PanelState(datatypes.PanelState):
+    """**Component**: Panel state."""
+
+    # You can define your own __init__ function as a member of PanelStateExt in panel_state_ext.py
+
+    # Note: there are no fields here because PanelState delegates to datatypes.PanelState
+    pass
+
+
+class PanelStateType(datatypes.PanelStateType):
+    _TYPE_NAME: str = "rerun.blueprint.components.PanelState"
+
+
+class PanelStateBatch(datatypes.PanelStateBatch, ComponentBatchMixin):
+    _ARROW_TYPE = PanelStateType()
diff --git a/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes b/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes
index 44872e9184b6..b86106381743 100644
--- a/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes
+++ b/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes
@@ -15,6 +15,7 @@ keypoint_pair.py linguist-generated=true
 mat3x3.py linguist-generated=true
 mat4x4.py linguist-generated=true
 material.py linguist-generated=true
+panel_state.py linguist-generated=true
 quaternion.py linguist-generated=true
 range1d.py linguist-generated=true
 range2d.py linguist-generated=true
diff --git a/rerun_py/rerun_sdk/rerun/datatypes/__init__.py b/rerun_py/rerun_sdk/rerun/datatypes/__init__.py
index e3c00f9d8604..f4425c89faf9 100644
--- a/rerun_py/rerun_sdk/rerun/datatypes/__init__.py
+++ b/rerun_py/rerun_sdk/rerun/datatypes/__init__.py
@@ -33,6 +33,7 @@
 from .mat3x3 import Mat3x3, Mat3x3ArrayLike, Mat3x3Batch, Mat3x3Like, Mat3x3Type
 from .mat4x4 import Mat4x4, Mat4x4ArrayLike, Mat4x4Batch, Mat4x4Like, Mat4x4Type
 from .material import Material, MaterialArrayLike, MaterialBatch, MaterialLike, MaterialType
+from .panel_state import PanelState, PanelStateArrayLike, PanelStateBatch, PanelStateLike, PanelStateType
 from .quaternion import Quaternion, QuaternionArrayLike, QuaternionBatch, QuaternionLike, QuaternionType
 from .range1d import Range1D, Range1DArrayLike, Range1DBatch, Range1DLike, Range1DType
 from .range2d import Range2D, Range2DArrayLike, Range2DBatch, Range2DLike, Range2DType
@@ -163,6 +164,11 @@
     "MaterialBatch",
     "MaterialLike",
     "MaterialType",
+    "PanelState",
+    "PanelStateArrayLike",
+    "PanelStateBatch",
+    "PanelStateLike",
+    "PanelStateType",
     "Quaternion",
     "QuaternionArrayLike",
     "QuaternionBatch",
diff --git a/rerun_py/rerun_sdk/rerun/datatypes/panel_state.py b/rerun_py/rerun_sdk/rerun/datatypes/panel_state.py
new file mode 100644
index 000000000000..6992521d825e
--- /dev/null
+++ b/rerun_py/rerun_sdk/rerun/datatypes/panel_state.py
@@ -0,0 +1,95 @@
+# DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/python/mod.rs
+# Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
+
+# You can extend this class by creating a "PanelStateExt" class in "panel_state_ext.py".
+
+from __future__ import annotations
+
+from typing import Sequence, Union
+
+import pyarrow as pa
+
+from .._baseclasses import BaseBatch, BaseExtensionType
+
+__all__ = ["PanelState", "PanelStateArrayLike", "PanelStateBatch", "PanelStateLike", "PanelStateType"]
+
+
+from enum import Enum
+
+
+class PanelState(Enum):
+    """**Datatype**: State of a app blueprint panel."""
+
+    Hidden = 1
+    """Completely hidden"""
+
+    Collapsed = 2
+    """Visible, but as small as possible on its shorter axis"""
+
+    Expanded = 3
+    """Fully expanded"""
+
+
+PanelStateLike = Union[PanelState, str]
+PanelStateArrayLike = Union[PanelStateLike, Sequence[PanelStateLike]]
+
+
+class PanelStateType(BaseExtensionType):
+    _TYPE_NAME: str = "rerun.datatypes.PanelState"
+
+    def __init__(self) -> None:
+        pa.ExtensionType.__init__(
+            self,
+            pa.sparse_union([
+                pa.field("_null_markers", pa.null(), nullable=True, metadata={}),
+                pa.field("Hidden", pa.null(), nullable=True, metadata={}),
+                pa.field("Collapsed", pa.null(), nullable=True, metadata={}),
+                pa.field("Expanded", pa.null(), nullable=True, metadata={}),
+            ]),
+            self._TYPE_NAME,
+        )
+
+
+class PanelStateBatch(BaseBatch[PanelStateArrayLike]):
+    _ARROW_TYPE = PanelStateType()
+
+    @staticmethod
+    def _native_to_pa_array(data: PanelStateArrayLike, data_type: pa.DataType) -> pa.Array:
+        if isinstance(data, (PanelState, int, str)):
+            data = [data]
+
+        types: list[int] = []
+
+        for value in data:
+            if value is None:
+                types.append(0)
+            elif isinstance(value, PanelState):
+                types.append(value.value)  # Actual enum value
+            elif isinstance(value, int):
+                types.append(value)  # By number
+            elif isinstance(value, str):
+                if hasattr(PanelState, value):
+                    types.append(PanelState[value].value)  # fast path
+                elif value.lower() == "hidden":
+                    types.append(PanelState.Hidden.value)
+                elif value.lower() == "collapsed":
+                    types.append(PanelState.Collapsed.value)
+                elif value.lower() == "expanded":
+                    types.append(PanelState.Expanded.value)
+                else:
+                    raise ValueError(f"Unknown PanelState kind: {value}")
+            else:
+                raise ValueError(f"Unknown PanelState kind: {value}")
+
+        buffers = [
+            None,
+            pa.array(types, type=pa.int8()).buffers()[1],
+        ]
+        children = (1 + 3) * [pa.nulls(len(data))]
+
+        return pa.UnionArray.from_buffers(
+            type=data_type,
+            length=len(data),
+            buffers=buffers,
+            children=children,
+        )

From 44b6110e149e4b10770a5d734ca5a7c08d4cff0d Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 17:13:20 +0200
Subject: [PATCH 2/7] top panel state

---
 crates/re_viewer/src/app.rs           | 19 +++++++++++--------
 crates/re_viewer/src/app_blueprint.rs | 21 +++++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/crates/re_viewer/src/app.rs b/crates/re_viewer/src/app.rs
index 680a53eed624..08bedba9c3ee 100644
--- a/crates/re_viewer/src/app.rs
+++ b/crates/re_viewer/src/app.rs
@@ -4,6 +4,7 @@ use re_entity_db::entity_db::EntityDb;
 use re_log_types::{ApplicationId, FileSource, LogMsg, StoreKind};
 use re_renderer::WgpuResourcePoolStatistics;
 use re_smart_channel::{ReceiveSet, SmartChannelSource};
+use re_types::datatypes::PanelState;
 use re_ui::{toasts, UICommand, UICommandSender};
 use re_viewer_context::{
     command_channel,
@@ -883,14 +884,16 @@ impl App {
 
                 crate::ui::mobile_warning_ui(&self.re_ui, ui);
 
-                crate::ui::top_panel(
-                    frame,
-                    self,
-                    app_blueprint,
-                    store_context,
-                    gpu_resource_stats,
-                    ui,
-                );
+                if app_blueprint.top_panel_state != PanelState::Hidden {
+                    crate::ui::top_panel(
+                        frame,
+                        self,
+                        app_blueprint,
+                        store_context,
+                        gpu_resource_stats,
+                        ui,
+                    );
+                }
 
                 self.memory_panel_ui(ui, gpu_resource_stats, store_stats);
 
diff --git a/crates/re_viewer/src/app_blueprint.rs b/crates/re_viewer/src/app_blueprint.rs
index 5ec9648d0494..efbafd6bda0e 100644
--- a/crates/re_viewer/src/app_blueprint.rs
+++ b/crates/re_viewer/src/app_blueprint.rs
@@ -5,6 +5,7 @@ use re_types::blueprint::components;
 use re_types::datatypes;
 use re_viewer_context::{CommandSender, StoreContext, SystemCommand, SystemCommandSender};
 
+pub const TOP_PANEL_PATH: &str = "top_panel";
 pub const BLUEPRINT_PANEL_PATH: &str = "blueprint_panel";
 pub const SELECTION_PANEL_PATH: &str = "selection_panel";
 pub const TIME_PANEL_PATH: &str = "time_panel";
@@ -13,6 +14,7 @@ pub const TIME_PANEL_PATH: &str = "time_panel";
 pub struct AppBlueprint<'a> {
     store_ctx: Option<&'a StoreContext<'a>>,
     is_narrow_screen: bool,
+    pub top_panel_state: datatypes::PanelState,
     pub blueprint_panel_state: datatypes::PanelState,
     pub selection_panel_state: datatypes::PanelState,
     pub time_panel_state: datatypes::PanelState,
@@ -29,6 +31,7 @@ impl<'a> AppBlueprint<'a> {
         let mut ret = Self {
             store_ctx,
             is_narrow_screen: screen_size.x < 600.0,
+            top_panel_state: datatypes::PanelState::Expanded,
             blueprint_panel_state: if screen_size.x > 750.0 {
                 datatypes::PanelState::Expanded
             } else {
@@ -47,18 +50,19 @@ impl<'a> AppBlueprint<'a> {
         };
 
         if let Some(blueprint_db) = blueprint_db {
-            if let Some(expanded) =
-                load_panel_state(&BLUEPRINT_PANEL_PATH.into(), blueprint_db, query)
+            if let Some(state) = load_panel_state(&TOP_PANEL_PATH.into(), blueprint_db, query) {
+                ret.top_panel_state = state;
+            }
+            if let Some(state) = load_panel_state(&BLUEPRINT_PANEL_PATH.into(), blueprint_db, query)
             {
-                ret.blueprint_panel_state = expanded;
+                ret.blueprint_panel_state = state;
             }
-            if let Some(expanded) =
-                load_panel_state(&SELECTION_PANEL_PATH.into(), blueprint_db, query)
+            if let Some(state) = load_panel_state(&SELECTION_PANEL_PATH.into(), blueprint_db, query)
             {
-                ret.selection_panel_state = expanded;
+                ret.selection_panel_state = state;
             }
-            if let Some(expanded) = load_panel_state(&TIME_PANEL_PATH.into(), blueprint_db, query) {
-                ret.time_panel_state = expanded;
+            if let Some(state) = load_panel_state(&TIME_PANEL_PATH.into(), blueprint_db, query) {
+                ret.time_panel_state = state;
             }
         }
 
@@ -104,6 +108,7 @@ impl<'a> AppBlueprint<'a> {
 
 pub fn setup_welcome_screen_blueprint(welcome_screen_blueprint: &mut EntityDb) {
     for (panel_name, default_value) in [
+        (TOP_PANEL_PATH, datatypes::PanelState::Expanded),
         (BLUEPRINT_PANEL_PATH, datatypes::PanelState::Expanded),
         (SELECTION_PANEL_PATH, datatypes::PanelState::Hidden),
         (TIME_PANEL_PATH, datatypes::PanelState::Hidden),

From 6f79a35f7edc4b0392252a30ef5759ae9acc0f38 Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 18:10:43 +0200
Subject: [PATCH 3/7] python api

---
 .vscode/settings.json                         |   3 +-
 crates/re_time_panel/src/lib.rs               |   2 +-
 .../blueprint/components/panel_state.fbs      |  12 +-
 .../re_types/definitions/rerun/datatypes.fbs  |   1 -
 .../rerun/datatypes/panel_state.fbs           |  21 ---
 .../re_types/src/blueprint/components/mod.rs  |   1 +
 .../src/blueprint/components/panel_state.rs   | 116 ++++++++-----
 .../components}/panel_state_ext.rs            |   0
 crates/re_types/src/datatypes/.gitattributes  |   1 -
 crates/re_types/src/datatypes/mod.rs          |   3 -
 crates/re_types/src/datatypes/panel_state.rs  | 162 ------------------
 crates/re_viewer/src/app.rs                   |   2 +-
 crates/re_viewer/src/app_blueprint.rs         |  65 +++----
 crates/re_viewer/src/app_state.rs             |   2 +-
 .../through-code-tutorial.md                  |  30 ++--
 .../howto/configure-viewer-through-code.md    |   8 +-
 docs/content/reference/types/datatypes.md     |   1 -
 .../reference/types/datatypes/.gitattributes  |   1 -
 .../reference/types/datatypes/panel_state.md  |  19 --
 examples/python/blueprint/blueprint.py        |   6 +-
 .../blueprint_stocks/blueprint_stocks.py      |   4 +-
 .../depth_guided_stable_diffusion/__main__.py |   4 +-
 examples/python/plots/plots.py                |   4 +-
 .../rerun/blueprint/components/.gitattributes |   1 +
 .../components}/panel_state.cpp               |  15 +-
 .../blueprint/components/panel_state.hpp      |  51 +++---
 rerun_cpp/src/rerun/datatypes.hpp             |   1 -
 rerun_cpp/src/rerun/datatypes/.gitattributes  |   2 -
 rerun_cpp/src/rerun/datatypes/panel_state.hpp |  55 ------
 rerun_py/rerun_sdk/rerun/blueprint/api.py     |  73 ++++++--
 .../blueprint/archetypes/panel_blueprint.py   |   3 +-
 .../rerun/blueprint/components/__init__.py    |   4 +-
 .../rerun/blueprint/components/panel_state.py |  85 ++++++++-
 .../rerun_sdk/rerun/datatypes/.gitattributes  |   1 -
 .../rerun_sdk/rerun/datatypes/__init__.py     |   6 -
 .../rerun_sdk/rerun/datatypes/panel_state.py  |  95 ----------
 tests/python/blueprint/main.py                |   2 +-
 tests/python/blueprint/save_blueprint.py      |   6 +-
 tests/python/blueprint/spawn_blueprint.py     |   6 +-
 39 files changed, 313 insertions(+), 561 deletions(-)
 delete mode 100644 crates/re_types/definitions/rerun/datatypes/panel_state.fbs
 rename crates/re_types/src/{datatypes => blueprint/components}/panel_state_ext.rs (100%)
 delete mode 100644 crates/re_types/src/datatypes/panel_state.rs
 delete mode 100644 docs/content/reference/types/datatypes/panel_state.md
 rename rerun_cpp/src/rerun/{datatypes => blueprint/components}/panel_state.cpp (74%)
 delete mode 100644 rerun_cpp/src/rerun/datatypes/panel_state.hpp
 delete mode 100644 rerun_py/rerun_sdk/rerun/datatypes/panel_state.py

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 72885b57a97c..070dc0ea2e8f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -66,5 +66,6 @@
     },
     "[yaml]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "python.analysis.typeCheckingMode": "basic"
 }
diff --git a/crates/re_time_panel/src/lib.rs b/crates/re_time_panel/src/lib.rs
index f0ef5b81628e..9b8177aadc7d 100644
--- a/crates/re_time_panel/src/lib.rs
+++ b/crates/re_time_panel/src/lib.rs
@@ -23,7 +23,7 @@ use re_log_types::{
     external::re_types_core::ComponentName, ComponentPath, EntityPath, EntityPathPart,
     ResolvedTimeRange, TimeInt, TimeReal,
 };
-use re_types::datatypes::PanelState;
+use re_types::blueprint::components::PanelState;
 use re_ui::list_item;
 use re_viewer_context::{
     CollapseScope, HoverHighlight, Item, RecordingConfig, TimeControl, TimeView, UiLayout,
diff --git a/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs b/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
index 1796fd1ed5a5..f71871f38a85 100644
--- a/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
+++ b/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
@@ -10,12 +10,18 @@ namespace rerun.blueprint.components;
 // ---
 
 /// Panel state
-struct PanelState (
+enum PanelState: byte (
   "attr.rerun.scope": "blueprint",
   "attr.rust.derive": "Copy, PartialEq, Eq",
   "attr.rust.repr": "transparent",
   "attr.rust.tuple_struct"
 ) {
-  /// Panel state
-  state: rerun.datatypes.PanelState (order: 100);
+  /// Completely hidden
+  Hidden,
+
+  /// Visible, but as small as possible on its shorter axis
+  Collapsed,
+
+  /// Fully expanded
+  Expanded,
 }
diff --git a/crates/re_types/definitions/rerun/datatypes.fbs b/crates/re_types/definitions/rerun/datatypes.fbs
index 16ebe13a516f..79c8d6cc5a28 100644
--- a/crates/re_types/definitions/rerun/datatypes.fbs
+++ b/crates/re_types/definitions/rerun/datatypes.fbs
@@ -11,7 +11,6 @@ include "./datatypes/keypoint_pair.fbs";
 include "./datatypes/mat3x3.fbs";
 include "./datatypes/mat4x4.fbs";
 include "./datatypes/material.fbs";
-include "./datatypes/panel_state.fbs";
 include "./datatypes/quaternion.fbs";
 include "./datatypes/range1d.fbs";
 include "./datatypes/range2d.fbs";
diff --git a/crates/re_types/definitions/rerun/datatypes/panel_state.fbs b/crates/re_types/definitions/rerun/datatypes/panel_state.fbs
deleted file mode 100644
index 58cbd85fb77d..000000000000
--- a/crates/re_types/definitions/rerun/datatypes/panel_state.fbs
+++ /dev/null
@@ -1,21 +0,0 @@
-include "arrow/attributes.fbs";
-include "rust/attributes.fbs";
-include "fbs/attributes.fbs";
-
-namespace rerun.datatypes;
-
-// ---
-
-/// State of a app blueprint panel.
-enum PanelState: byte (
-  "attr.rust.derive": "Copy, PartialEq, Eq"
-) {
-  /// Completely hidden
-  Hidden,
-
-  /// Visible, but as small as possible on its shorter axis
-  Collapsed,
-
-  /// Fully expanded
-  Expanded,
-}
diff --git a/crates/re_types/src/blueprint/components/mod.rs b/crates/re_types/src/blueprint/components/mod.rs
index 75111e9753f1..0885b38ce280 100644
--- a/crates/re_types/src/blueprint/components/mod.rs
+++ b/crates/re_types/src/blueprint/components/mod.rs
@@ -8,6 +8,7 @@ mod corner2d_ext;
 mod included_content;
 mod lock_range_during_zoom;
 mod panel_state;
+mod panel_state_ext;
 mod query_expression;
 mod row_share;
 mod space_view_class;
diff --git a/crates/re_types/src/blueprint/components/panel_state.rs b/crates/re_types/src/blueprint/components/panel_state.rs
index 171539864d45..787c1d20b805 100644
--- a/crates/re_types/src/blueprint/components/panel_state.rs
+++ b/crates/re_types/src/blueprint/components/panel_state.rs
@@ -23,44 +23,42 @@ use ::re_types_core::{ComponentBatch, MaybeOwnedComponentBatch};
 use ::re_types_core::{DeserializationError, DeserializationResult};
 
 /// **Component**: Panel state
-#[derive(Clone, Debug, Copy, PartialEq, Eq)]
-#[repr(transparent)]
-pub struct PanelState(
-    /// Panel state
-    pub crate::datatypes::PanelState,
-);
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum PanelState {
+    /// Completely hidden
+    Hidden = 1,
+
+    /// Visible, but as small as possible on its shorter axis
+    Collapsed = 2,
+
+    /// Fully expanded
+    Expanded = 3,
+}
+
+impl PanelState {
+    /// All the different enum variants.
+    pub const ALL: [Self; 3] = [Self::Hidden, Self::Collapsed, Self::Expanded];
+}
 
 impl ::re_types_core::SizeBytes for PanelState {
     #[inline]
     fn heap_size_bytes(&self) -> u64 {
-        self.0.heap_size_bytes()
+        0
     }
 
     #[inline]
     fn is_pod() -> bool {
-        <crate::datatypes::PanelState>::is_pod()
+        true
     }
 }
 
-impl<T: Into<crate::datatypes::PanelState>> From<T> for PanelState {
-    fn from(v: T) -> Self {
-        Self(v.into())
-    }
-}
-
-impl std::borrow::Borrow<crate::datatypes::PanelState> for PanelState {
-    #[inline]
-    fn borrow(&self) -> &crate::datatypes::PanelState {
-        &self.0
-    }
-}
-
-impl std::ops::Deref for PanelState {
-    type Target = crate::datatypes::PanelState;
-
-    #[inline]
-    fn deref(&self) -> &crate::datatypes::PanelState {
-        &self.0
+impl std::fmt::Display for PanelState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Hidden => write!(f, "Hidden"),
+            Self::Collapsed => write!(f, "Collapsed"),
+            Self::Expanded => write!(f, "Expanded"),
+        }
     }
 }
 
@@ -100,22 +98,27 @@ impl ::re_types_core::Loggable for PanelState {
         use ::re_types_core::{Loggable as _, ResultExt as _};
         use arrow2::{array::*, datatypes::*};
         Ok({
-            let (somes, data0): (Vec<_>, Vec<_>) = data
+            // Sparse Arrow union
+            let data: Vec<_> = data
                 .into_iter()
                 .map(|datum| {
                     let datum: Option<::std::borrow::Cow<'a, Self>> = datum.map(Into::into);
-                    let datum = datum.map(|datum| datum.into_owned().0);
-                    (datum.is_some(), datum)
+                    datum
+                })
+                .collect();
+            let num_variants = 3usize;
+            let types = data
+                .iter()
+                .map(|a| match a.as_deref() {
+                    None => 0,
+                    Some(value) => *value as i8,
                 })
-                .unzip();
-            let data0_bitmap: Option<arrow2::bitmap::Bitmap> = {
-                let any_nones = somes.iter().any(|some| !*some);
-                any_nones.then(|| somes.into())
-            };
-            {
-                _ = data0_bitmap;
-                crate::datatypes::PanelState::to_arrow_opt(data0)?
-            }
+                .collect();
+            let fields: Vec<_> =
+                std::iter::repeat(NullArray::new(DataType::Null, data.len()).boxed())
+                    .take(1 + num_variants)
+                    .collect();
+            UnionArray::new(Self::arrow_datatype(), types, fields, None).boxed()
         })
     }
 
@@ -128,13 +131,32 @@ impl ::re_types_core::Loggable for PanelState {
     {
         use ::re_types_core::{Loggable as _, ResultExt as _};
         use arrow2::{array::*, buffer::*, datatypes::*};
-        Ok(crate::datatypes::PanelState::from_arrow_opt(arrow_data)
-            .with_context("rerun.blueprint.components.PanelState#state")?
-            .into_iter()
-            .map(|v| v.ok_or_else(DeserializationError::missing_data))
-            .map(|res| res.map(|v| Some(Self(v))))
-            .collect::<DeserializationResult<Vec<Option<_>>>>()
-            .with_context("rerun.blueprint.components.PanelState#state")
-            .with_context("rerun.blueprint.components.PanelState")?)
+        Ok({
+            let arrow_data = arrow_data
+                .as_any()
+                .downcast_ref::<arrow2::array::UnionArray>()
+                .ok_or_else(|| {
+                    let expected = Self::arrow_datatype();
+                    let actual = arrow_data.data_type().clone();
+                    DeserializationError::datatype_mismatch(expected, actual)
+                })
+                .with_context("rerun.blueprint.components.PanelState")?;
+            let arrow_data_types = arrow_data.types();
+            arrow_data_types
+                .iter()
+                .map(|typ| match typ {
+                    0 => Ok(None),
+                    1 => Ok(Some(Self::Hidden)),
+                    2 => Ok(Some(Self::Collapsed)),
+                    3 => Ok(Some(Self::Expanded)),
+                    _ => Err(DeserializationError::missing_union_arm(
+                        Self::arrow_datatype(),
+                        "<invalid>",
+                        *typ as _,
+                    )),
+                })
+                .collect::<DeserializationResult<Vec<_>>>()
+                .with_context("rerun.blueprint.components.PanelState")?
+        })
     }
 }
diff --git a/crates/re_types/src/datatypes/panel_state_ext.rs b/crates/re_types/src/blueprint/components/panel_state_ext.rs
similarity index 100%
rename from crates/re_types/src/datatypes/panel_state_ext.rs
rename to crates/re_types/src/blueprint/components/panel_state_ext.rs
diff --git a/crates/re_types/src/datatypes/.gitattributes b/crates/re_types/src/datatypes/.gitattributes
index efada633883e..3d947de0473c 100644
--- a/crates/re_types/src/datatypes/.gitattributes
+++ b/crates/re_types/src/datatypes/.gitattributes
@@ -13,7 +13,6 @@ mat3x3.rs linguist-generated=true
 mat4x4.rs linguist-generated=true
 material.rs linguist-generated=true
 mod.rs linguist-generated=true
-panel_state.rs linguist-generated=true
 quaternion.rs linguist-generated=true
 range1d.rs linguist-generated=true
 range2d.rs linguist-generated=true
diff --git a/crates/re_types/src/datatypes/mod.rs b/crates/re_types/src/datatypes/mod.rs
index 002a8ee730ff..d2f880d5d8f1 100644
--- a/crates/re_types/src/datatypes/mod.rs
+++ b/crates/re_types/src/datatypes/mod.rs
@@ -21,8 +21,6 @@ mod mat4x4;
 mod mat4x4_ext;
 mod material;
 mod material_ext;
-mod panel_state;
-mod panel_state_ext;
 mod quaternion;
 mod quaternion_ext;
 mod range1d;
@@ -75,7 +73,6 @@ pub use self::keypoint_pair::KeypointPair;
 pub use self::mat3x3::Mat3x3;
 pub use self::mat4x4::Mat4x4;
 pub use self::material::Material;
-pub use self::panel_state::PanelState;
 pub use self::quaternion::Quaternion;
 pub use self::range1d::Range1D;
 pub use self::range2d::Range2D;
diff --git a/crates/re_types/src/datatypes/panel_state.rs b/crates/re_types/src/datatypes/panel_state.rs
deleted file mode 100644
index d2f5c89ab960..000000000000
--- a/crates/re_types/src/datatypes/panel_state.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/rust/api.rs
-// Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
-
-#![allow(trivial_numeric_casts)]
-#![allow(unused_imports)]
-#![allow(unused_parens)]
-#![allow(clippy::clone_on_copy)]
-#![allow(clippy::cloned_instead_of_copied)]
-#![allow(clippy::iter_on_single_items)]
-#![allow(clippy::map_flatten)]
-#![allow(clippy::match_wildcard_for_single_variants)]
-#![allow(clippy::needless_question_mark)]
-#![allow(clippy::new_without_default)]
-#![allow(clippy::redundant_closure)]
-#![allow(clippy::too_many_arguments)]
-#![allow(clippy::too_many_lines)]
-#![allow(clippy::unnecessary_cast)]
-
-use ::re_types_core::external::arrow2;
-use ::re_types_core::ComponentName;
-use ::re_types_core::SerializationResult;
-use ::re_types_core::{ComponentBatch, MaybeOwnedComponentBatch};
-use ::re_types_core::{DeserializationError, DeserializationResult};
-
-/// **Datatype**: State of a app blueprint panel.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum PanelState {
-    /// Completely hidden
-    Hidden = 1,
-
-    /// Visible, but as small as possible on its shorter axis
-    Collapsed = 2,
-
-    /// Fully expanded
-    Expanded = 3,
-}
-
-impl PanelState {
-    /// All the different enum variants.
-    pub const ALL: [Self; 3] = [Self::Hidden, Self::Collapsed, Self::Expanded];
-}
-
-impl ::re_types_core::SizeBytes for PanelState {
-    #[inline]
-    fn heap_size_bytes(&self) -> u64 {
-        0
-    }
-
-    #[inline]
-    fn is_pod() -> bool {
-        true
-    }
-}
-
-impl std::fmt::Display for PanelState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Hidden => write!(f, "Hidden"),
-            Self::Collapsed => write!(f, "Collapsed"),
-            Self::Expanded => write!(f, "Expanded"),
-        }
-    }
-}
-
-::re_types_core::macros::impl_into_cow!(PanelState);
-
-impl ::re_types_core::Loggable for PanelState {
-    type Name = ::re_types_core::DatatypeName;
-
-    #[inline]
-    fn name() -> Self::Name {
-        "rerun.datatypes.PanelState".into()
-    }
-
-    #[allow(clippy::wildcard_imports)]
-    #[inline]
-    fn arrow_datatype() -> arrow2::datatypes::DataType {
-        use arrow2::datatypes::*;
-        DataType::Union(
-            std::sync::Arc::new(vec![
-                Field::new("_null_markers", DataType::Null, true),
-                Field::new("Hidden", DataType::Null, true),
-                Field::new("Collapsed", DataType::Null, true),
-                Field::new("Expanded", DataType::Null, true),
-            ]),
-            Some(std::sync::Arc::new(vec![0i32, 1i32, 2i32, 3i32])),
-            UnionMode::Sparse,
-        )
-    }
-
-    #[allow(clippy::wildcard_imports)]
-    fn to_arrow_opt<'a>(
-        data: impl IntoIterator<Item = Option<impl Into<::std::borrow::Cow<'a, Self>>>>,
-    ) -> SerializationResult<Box<dyn arrow2::array::Array>>
-    where
-        Self: Clone + 'a,
-    {
-        use ::re_types_core::{Loggable as _, ResultExt as _};
-        use arrow2::{array::*, datatypes::*};
-        Ok({
-            // Sparse Arrow union
-            let data: Vec<_> = data
-                .into_iter()
-                .map(|datum| {
-                    let datum: Option<::std::borrow::Cow<'a, Self>> = datum.map(Into::into);
-                    datum
-                })
-                .collect();
-            let num_variants = 3usize;
-            let types = data
-                .iter()
-                .map(|a| match a.as_deref() {
-                    None => 0,
-                    Some(value) => *value as i8,
-                })
-                .collect();
-            let fields: Vec<_> =
-                std::iter::repeat(NullArray::new(DataType::Null, data.len()).boxed())
-                    .take(1 + num_variants)
-                    .collect();
-            UnionArray::new(Self::arrow_datatype(), types, fields, None).boxed()
-        })
-    }
-
-    #[allow(clippy::wildcard_imports)]
-    fn from_arrow_opt(
-        arrow_data: &dyn arrow2::array::Array,
-    ) -> DeserializationResult<Vec<Option<Self>>>
-    where
-        Self: Sized,
-    {
-        use ::re_types_core::{Loggable as _, ResultExt as _};
-        use arrow2::{array::*, buffer::*, datatypes::*};
-        Ok({
-            let arrow_data = arrow_data
-                .as_any()
-                .downcast_ref::<arrow2::array::UnionArray>()
-                .ok_or_else(|| {
-                    let expected = Self::arrow_datatype();
-                    let actual = arrow_data.data_type().clone();
-                    DeserializationError::datatype_mismatch(expected, actual)
-                })
-                .with_context("rerun.datatypes.PanelState")?;
-            let arrow_data_types = arrow_data.types();
-            arrow_data_types
-                .iter()
-                .map(|typ| match typ {
-                    0 => Ok(None),
-                    1 => Ok(Some(Self::Hidden)),
-                    2 => Ok(Some(Self::Collapsed)),
-                    3 => Ok(Some(Self::Expanded)),
-                    _ => Err(DeserializationError::missing_union_arm(
-                        Self::arrow_datatype(),
-                        "<invalid>",
-                        *typ as _,
-                    )),
-                })
-                .collect::<DeserializationResult<Vec<_>>>()
-                .with_context("rerun.datatypes.PanelState")?
-        })
-    }
-}
diff --git a/crates/re_viewer/src/app.rs b/crates/re_viewer/src/app.rs
index 08bedba9c3ee..4a4720d969b6 100644
--- a/crates/re_viewer/src/app.rs
+++ b/crates/re_viewer/src/app.rs
@@ -4,7 +4,7 @@ use re_entity_db::entity_db::EntityDb;
 use re_log_types::{ApplicationId, FileSource, LogMsg, StoreKind};
 use re_renderer::WgpuResourcePoolStatistics;
 use re_smart_channel::{ReceiveSet, SmartChannelSource};
-use re_types::datatypes::PanelState;
+use re_types::blueprint::components::PanelState;
 use re_ui::{toasts, UICommand, UICommandSender};
 use re_viewer_context::{
     command_channel,
diff --git a/crates/re_viewer/src/app_blueprint.rs b/crates/re_viewer/src/app_blueprint.rs
index efbafd6bda0e..622f99a7efc2 100644
--- a/crates/re_viewer/src/app_blueprint.rs
+++ b/crates/re_viewer/src/app_blueprint.rs
@@ -1,8 +1,7 @@
 use re_data_store::LatestAtQuery;
 use re_entity_db::EntityDb;
 use re_log_types::{DataRow, EntityPath, RowId, TimePoint};
-use re_types::blueprint::components;
-use re_types::datatypes;
+use re_types::blueprint::components::PanelState;
 use re_viewer_context::{CommandSender, StoreContext, SystemCommand, SystemCommandSender};
 
 pub const TOP_PANEL_PATH: &str = "top_panel";
@@ -14,10 +13,10 @@ pub const TIME_PANEL_PATH: &str = "time_panel";
 pub struct AppBlueprint<'a> {
     store_ctx: Option<&'a StoreContext<'a>>,
     is_narrow_screen: bool,
-    pub top_panel_state: datatypes::PanelState,
-    pub blueprint_panel_state: datatypes::PanelState,
-    pub selection_panel_state: datatypes::PanelState,
-    pub time_panel_state: datatypes::PanelState,
+    pub top_panel_state: PanelState,
+    pub blueprint_panel_state: PanelState,
+    pub selection_panel_state: PanelState,
+    pub time_panel_state: PanelState,
 }
 
 impl<'a> AppBlueprint<'a> {
@@ -31,21 +30,21 @@ impl<'a> AppBlueprint<'a> {
         let mut ret = Self {
             store_ctx,
             is_narrow_screen: screen_size.x < 600.0,
-            top_panel_state: datatypes::PanelState::Expanded,
+            top_panel_state: PanelState::Expanded,
             blueprint_panel_state: if screen_size.x > 750.0 {
-                datatypes::PanelState::Expanded
+                PanelState::Expanded
             } else {
-                datatypes::PanelState::Collapsed
+                PanelState::Collapsed
             },
             selection_panel_state: if screen_size.x > 1000.0 {
-                datatypes::PanelState::Expanded
+                PanelState::Expanded
             } else {
-                datatypes::PanelState::Collapsed
+                PanelState::Collapsed
             },
             time_panel_state: if screen_size.y > 600.0 {
-                datatypes::PanelState::Expanded
+                PanelState::Expanded
             } else {
-                datatypes::PanelState::Collapsed
+                PanelState::Collapsed
             },
         };
 
@@ -75,11 +74,7 @@ impl<'a> AppBlueprint<'a> {
 
         // Toggle the opposite side if this panel is visible to save on screen real estate
         if self.is_narrow_screen && new_state.is_expanded() {
-            self.send_panel_state(
-                SELECTION_PANEL_PATH,
-                datatypes::PanelState::Hidden,
-                command_sender,
-            );
+            self.send_panel_state(SELECTION_PANEL_PATH, PanelState::Hidden, command_sender);
         }
     }
 
@@ -89,11 +84,7 @@ impl<'a> AppBlueprint<'a> {
 
         // Toggle the opposite side if this panel is visible to save on screen real estate
         if self.is_narrow_screen && new_state.is_expanded() {
-            self.send_panel_state(
-                BLUEPRINT_PANEL_PATH,
-                datatypes::PanelState::Hidden,
-                command_sender,
-            );
+            self.send_panel_state(BLUEPRINT_PANEL_PATH, PanelState::Hidden, command_sender);
         }
     }
 
@@ -107,20 +98,18 @@ impl<'a> AppBlueprint<'a> {
 }
 
 pub fn setup_welcome_screen_blueprint(welcome_screen_blueprint: &mut EntityDb) {
-    for (panel_name, default_value) in [
-        (TOP_PANEL_PATH, datatypes::PanelState::Expanded),
-        (BLUEPRINT_PANEL_PATH, datatypes::PanelState::Expanded),
-        (SELECTION_PANEL_PATH, datatypes::PanelState::Hidden),
-        (TIME_PANEL_PATH, datatypes::PanelState::Hidden),
+    for (panel_name, value) in [
+        (TOP_PANEL_PATH, PanelState::Expanded),
+        (BLUEPRINT_PANEL_PATH, PanelState::Expanded),
+        (SELECTION_PANEL_PATH, PanelState::Hidden),
+        (TIME_PANEL_PATH, PanelState::Hidden),
     ] {
         let entity_path = EntityPath::from(panel_name);
         // TODO(jleibs): Seq instead of timeless?
         let timepoint = TimePoint::default();
 
-        let component = components::PanelState(default_value);
-
         let row =
-            DataRow::from_cells1_sized(RowId::new(), entity_path, timepoint, [component]).unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
+            DataRow::from_cells1_sized(RowId::new(), entity_path, timepoint, [value]).unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
 
         welcome_screen_blueprint.add_data_row(row).unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
     }
@@ -132,7 +121,7 @@ impl<'a> AppBlueprint<'a> {
     fn send_panel_state(
         &self,
         panel_name: &str,
-        value: datatypes::PanelState,
+        value: PanelState,
         command_sender: &CommandSender,
     ) {
         if let Some(store_ctx) = self.store_ctx {
@@ -140,10 +129,8 @@ impl<'a> AppBlueprint<'a> {
 
             let timepoint = store_ctx.blueprint_timepoint_for_writes();
 
-            let component = components::PanelState::from(value);
-
-            let row = DataRow::from_cells1_sized(RowId::new(), entity_path, timepoint, [component])
-                .unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
+            let row =
+                DataRow::from_cells1_sized(RowId::new(), entity_path, timepoint, [value]).unwrap(); // Can only fail if we have the wrong number of instances for the component, and we don't
 
             command_sender.send_system(SystemCommand::UpdateBlueprint(
                 store_ctx.blueprint.store_id().clone(),
@@ -157,10 +144,10 @@ fn load_panel_state(
     path: &EntityPath,
     blueprint_db: &re_entity_db::EntityDb,
     query: &LatestAtQuery,
-) -> Option<datatypes::PanelState> {
+) -> Option<PanelState> {
     re_tracing::profile_function!();
     // TODO(#5607): what should happen if the promise is still pending?
     blueprint_db
-        .latest_at_component_quiet::<components::PanelState>(path, query)
-        .map(|p| p.0)
+        .latest_at_component_quiet::<PanelState>(path, query)
+        .map(|p| p.value)
 }
diff --git a/crates/re_viewer/src/app_state.rs b/crates/re_viewer/src/app_state.rs
index 8f1bfd2f2628..4546100cebdc 100644
--- a/crates/re_viewer/src/app_state.rs
+++ b/crates/re_viewer/src/app_state.rs
@@ -5,7 +5,7 @@ use re_entity_db::EntityDb;
 use re_log_types::{LogMsg, ResolvedTimeRangeF, StoreId};
 use re_smart_channel::ReceiveSet;
 use re_space_view::{determine_visualizable_entities, DataQuery as _, PropertyResolver as _};
-use re_types::datatypes::PanelState;
+use re_types::blueprint::components::PanelState;
 use re_viewer_context::{
     blueprint_timeline, AppOptions, ApplicationSelectionState, Caches, CommandSender,
     ComponentUiRegistry, PlayState, RecordingConfig, SpaceViewClassRegistry, StoreContext,
diff --git a/docs/content/getting-started/configure-the-viewer/through-code-tutorial.md b/docs/content/getting-started/configure-the-viewer/through-code-tutorial.md
index be972848a8cb..c1fa3719dad5 100644
--- a/docs/content/getting-started/configure-the-viewer/through-code-tutorial.md
+++ b/docs/content/getting-started/configure-the-viewer/through-code-tutorial.md
@@ -229,9 +229,9 @@ Let's modify the code again to include additional blueprint specifications for t
     # Create a single chart for all the AAPL data, and collapse the selection and time panels:
     blueprint = rrb.Blueprint(
         rrb.TimeSeriesView(name="AAPL", origin="/stocks/AAPL"),
-        rrb.BlueprintPanel(expanded=True),
-        rrb.SelectionPanel(expanded=False),
-        rrb.TimePanel(expanded=False),
+        rrb.BlueprintPanel(state="expanded"),
+        rrb.SelectionPanel(state="collapsed"),
+        rrb.TimePanel(state="collapsed"),
     )
     rr.send_blueprint(blueprint)
 ```
@@ -263,9 +263,9 @@ Let's modify the code to include the info card as well. We will use the `Vertica
             rrb.TimeSeriesView(name="Chart", origin="/stocks/AAPL"),
             row_shares=[1, 4],
         ),
-        rrb.BlueprintPanel(expanded=True),
-        rrb.SelectionPanel(expanded=False),
-        rrb.TimePanel(expanded=False),
+        rrb.BlueprintPanel(state="expanded"),
+        rrb.SelectionPanel(state="collapsed"),
+        rrb.TimePanel(state="collapsed"),
     )
     rr.send_blueprint(blueprint)
 ```
@@ -298,9 +298,9 @@ the same chart. Using `origin` alone there is no way we could have expressed thi
                 "+ /stocks/MSFT/2024-03-19",
             ],
         ),
-        rrb.BlueprintPanel(expanded=True),
-        rrb.SelectionPanel(expanded=False),
-        rrb.TimePanel(expanded=False),
+        rrb.BlueprintPanel(state="expanded"),
+        rrb.SelectionPanel(state="collapsed"),
+        rrb.TimePanel(state="collapsed"),
     )
     rr.send_blueprint(blueprint)
 ```
@@ -337,9 +337,9 @@ Going back to our single stock example, we can filter out the peaks data by excl
                 "- $origin/peaks/**",
             ],
         ),
-        rrb.BlueprintPanel(expanded=True),
-        rrb.SelectionPanel(expanded=False),
-        rrb.TimePanel(expanded=False),
+        rrb.BlueprintPanel(state="expanded"),
+        rrb.SelectionPanel(state="collapsed"),
+        rrb.TimePanel(state="collapsed"),
     )
     rr.send_blueprint(blueprint)
 ```
@@ -385,9 +385,9 @@ Setting this up by hand would be extremely tedious.
                 for symbol in symbols
             ]
         ),
-        rrb.BlueprintPanel(expanded=True),
-        rrb.SelectionPanel(expanded=False),
-        rrb.TimePanel(expanded=False),
+        rrb.BlueprintPanel(state="expanded"),
+        rrb.SelectionPanel(state="collapsed"),
+        rrb.TimePanel(state="collapsed"),
     )
     rr.send_blueprint(blueprint)
 ```
diff --git a/docs/content/howto/configure-viewer-through-code.md b/docs/content/howto/configure-viewer-through-code.md
index 624937df54f4..c46acdb7c0fe 100644
--- a/docs/content/howto/configure-viewer-through-code.md
+++ b/docs/content/howto/configure-viewer-through-code.md
@@ -235,7 +235,7 @@ The `Blueprint` controls the default panel-state of the 3 panels: the `Blueprint
 
 ```python
 rrb.Blueprint(
-    rrb.TimePanel(expanded=False)
+    rrb.TimePanel(state="collapsed")
 )
 ```
 
@@ -243,9 +243,9 @@ As an convenience, you can also use the blueprint argument: `collapse_panels=Tru
 
 ```python
 rrb.Blueprint(
-    rrb.TimePanel(expanded=False),
-    rrb.SelectionPanel(expanded=False),
-    rrb.BlueprintPanel(expanded=False),
+    rrb.TimePanel(state="collapsed"),
+    rrb.SelectionPanel(state="collapsed"),
+    rrb.BlueprintPanel(state="collapsed"),
 )
 ```
 
diff --git a/docs/content/reference/types/datatypes.md b/docs/content/reference/types/datatypes.md
index 4fcdf01f0370..44da8f00e832 100644
--- a/docs/content/reference/types/datatypes.md
+++ b/docs/content/reference/types/datatypes.md
@@ -20,7 +20,6 @@ Data types are the lowest layer of the data model hierarchy. They are re-usable
 * [`Mat3x3`](datatypes/mat3x3.md): A 3x3 Matrix.
 * [`Mat4x4`](datatypes/mat4x4.md): A 4x4 Matrix.
 * [`Material`](datatypes/material.md): Material properties of a mesh.
-* [`PanelState`](datatypes/panel_state.md): State of a app blueprint panel.
 * [`Quaternion`](datatypes/quaternion.md): A Quaternion represented by 4 real numbers.
 * [`Range1D`](datatypes/range1d.md): A 1D range, specifying a lower and upper bound.
 * [`Range2D`](datatypes/range2d.md): An Axis-Aligned Bounding Box in 2D space, implemented as the minimum and maximum corners.
diff --git a/docs/content/reference/types/datatypes/.gitattributes b/docs/content/reference/types/datatypes/.gitattributes
index 411d02319d30..856d359c9a41 100644
--- a/docs/content/reference/types/datatypes/.gitattributes
+++ b/docs/content/reference/types/datatypes/.gitattributes
@@ -14,7 +14,6 @@ keypoint_pair.md linguist-generated=true
 mat3x3.md linguist-generated=true
 mat4x4.md linguist-generated=true
 material.md linguist-generated=true
-panel_state.md linguist-generated=true
 quaternion.md linguist-generated=true
 range1d.md linguist-generated=true
 range2d.md linguist-generated=true
diff --git a/docs/content/reference/types/datatypes/panel_state.md b/docs/content/reference/types/datatypes/panel_state.md
deleted file mode 100644
index ef92f343f832..000000000000
--- a/docs/content/reference/types/datatypes/panel_state.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: "PanelState"
----
-<!-- DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/docs/mod.rs -->
-
-State of a app blueprint panel.
-
-## Variants
-
-* Hidden
-* Collapsed
-* Expanded
-
-## API reference links
- * 🌊 [C++ API docs for `PanelState`](https://ref.rerun.io/docs/cpp/stable/namespacererun_1_1datatypes.html)
- * 🐍 [Python API docs for `PanelState`](https://ref.rerun.io/docs/python/stable/common/datatypes#rerun.datatypes.PanelState)
- * 🦀 [Rust API docs for `PanelState`](https://docs.rs/rerun/latest/rerun/datatypes/enum.PanelState.html)
-
-
diff --git a/examples/python/blueprint/blueprint.py b/examples/python/blueprint/blueprint.py
index e9e3f7fc8c1c..5bd056ba79d3 100755
--- a/examples/python/blueprint/blueprint.py
+++ b/examples/python/blueprint/blueprint.py
@@ -31,9 +31,9 @@ def main() -> None:
                 Spatial2DView(name="Rect 0", origin="/", contents=["image", "rect/0"]),
                 Spatial2DView(name="Rect 1", origin="/", contents=["image", "rect/1"]),
             ),
-            BlueprintPanel(expanded=False),
-            SelectionPanel(expanded=False),
-            TimePanel(expanded=False),
+            BlueprintPanel(state="collapsed"),
+            SelectionPanel(state="collapsed"),
+            TimePanel(state="collapsed"),
             auto_space_views=args.auto_space_views,
         )
 
diff --git a/examples/python/blueprint_stocks/blueprint_stocks.py b/examples/python/blueprint_stocks/blueprint_stocks.py
index e250829f1aba..f2ea2a6daa59 100755
--- a/examples/python/blueprint_stocks/blueprint_stocks.py
+++ b/examples/python/blueprint_stocks/blueprint_stocks.py
@@ -86,8 +86,8 @@ def hide_panels(viewport: rrb.ContainerLike) -> rrb.BlueprintLike:
     """Wrap a viewport in a blueprint that hides the time and selection panels."""
     return rrb.Blueprint(
         viewport,
-        rrb.TimePanel(expanded=False),
-        rrb.SelectionPanel(expanded=False),
+        rrb.TimePanel(state="collapsed"),
+        rrb.SelectionPanel(state="collapsed"),
     )
 
 
diff --git a/examples/python/depth_guided_stable_diffusion/depth_guided_stable_diffusion/__main__.py b/examples/python/depth_guided_stable_diffusion/depth_guided_stable_diffusion/__main__.py
index b8fb26cd467f..a1b99321ed15 100755
--- a/examples/python/depth_guided_stable_diffusion/depth_guided_stable_diffusion/__main__.py
+++ b/examples/python/depth_guided_stable_diffusion/depth_guided_stable_diffusion/__main__.py
@@ -172,8 +172,8 @@ def main() -> None:
                     name="Output & Iteration",
                 ),
             ),
-            rrb.SelectionPanel(expanded=False),
-            rrb.TimePanel(expanded=False),
+            rrb.SelectionPanel(state="collapsed"),
+            rrb.TimePanel(state="collapsed"),
         ),
     )
 
diff --git a/examples/python/plots/plots.py b/examples/python/plots/plots.py
index 44ebb72d2f24..b7f31bc1f23b 100755
--- a/examples/python/plots/plots.py
+++ b/examples/python/plots/plots.py
@@ -119,8 +119,8 @@ def main() -> None:
             rrb.TextDocumentView(name="Description", origin="/description"),
             column_shares=[3, 1],
         ),
-        rrb.SelectionPanel(expanded=False),
-        rrb.TimePanel(expanded=False),
+        rrb.SelectionPanel(state="collapsed"),
+        rrb.TimePanel(state="collapsed"),
     )
 
     rr.script_setup(args, "rerun_example_plot", default_blueprint=blueprint)
diff --git a/rerun_cpp/src/rerun/blueprint/components/.gitattributes b/rerun_cpp/src/rerun/blueprint/components/.gitattributes
index 3f9fc082787a..f0d60f96bab5 100644
--- a/rerun_cpp/src/rerun/blueprint/components/.gitattributes
+++ b/rerun_cpp/src/rerun/blueprint/components/.gitattributes
@@ -21,6 +21,7 @@ grid_columns.hpp linguist-generated=true
 included_content.hpp linguist-generated=true
 included_space_view.hpp linguist-generated=true
 lock_range_during_zoom.hpp linguist-generated=true
+panel_state.cpp linguist-generated=true
 panel_state.hpp linguist-generated=true
 query_expression.hpp linguist-generated=true
 root_container.hpp linguist-generated=true
diff --git a/rerun_cpp/src/rerun/datatypes/panel_state.cpp b/rerun_cpp/src/rerun/blueprint/components/panel_state.cpp
similarity index 74%
rename from rerun_cpp/src/rerun/datatypes/panel_state.cpp
rename to rerun_cpp/src/rerun/blueprint/components/panel_state.cpp
index 1d105f33becd..6351ba383a7c 100644
--- a/rerun_cpp/src/rerun/datatypes/panel_state.cpp
+++ b/rerun_cpp/src/rerun/blueprint/components/panel_state.cpp
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/cpp/mod.rs
-// Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
+// Based on "crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs".
 
 #include "panel_state.hpp"
 
@@ -7,7 +7,8 @@
 #include <arrow/type_fwd.h>
 
 namespace rerun {
-    const std::shared_ptr<arrow::DataType>& Loggable<datatypes::PanelState>::arrow_datatype() {
+    const std::shared_ptr<arrow::DataType>&
+        Loggable<blueprint::components::PanelState>::arrow_datatype() {
         static const auto datatype = arrow::sparse_union({
             arrow::field("_null_markers", arrow::null(), true, nullptr),
             arrow::field("Hidden", arrow::null(), true),
@@ -17,8 +18,8 @@ namespace rerun {
         return datatype;
     }
 
-    Result<std::shared_ptr<arrow::Array>> Loggable<datatypes::PanelState>::to_arrow(
-        const datatypes::PanelState* instances, size_t num_instances
+    Result<std::shared_ptr<arrow::Array>> Loggable<blueprint::components::PanelState>::to_arrow(
+        const blueprint::components::PanelState* instances, size_t num_instances
     ) {
         // TODO(andreas): Allow configuring the memory pool.
         arrow::MemoryPool* pool = arrow::default_memory_pool();
@@ -26,7 +27,7 @@ namespace rerun {
 
         ARROW_ASSIGN_OR_RAISE(auto builder, arrow::MakeBuilder(datatype, pool))
         if (instances && num_instances > 0) {
-            RR_RETURN_NOT_OK(Loggable<datatypes::PanelState>::fill_arrow_array_builder(
+            RR_RETURN_NOT_OK(Loggable<blueprint::components::PanelState>::fill_arrow_array_builder(
                 static_cast<arrow::SparseUnionBuilder*>(builder.get()),
                 instances,
                 num_instances
@@ -37,8 +38,8 @@ namespace rerun {
         return array;
     }
 
-    rerun::Error Loggable<datatypes::PanelState>::fill_arrow_array_builder(
-        arrow::SparseUnionBuilder* builder, const datatypes::PanelState* elements,
+    rerun::Error Loggable<blueprint::components::PanelState>::fill_arrow_array_builder(
+        arrow::SparseUnionBuilder* builder, const blueprint::components::PanelState* elements,
         size_t num_elements
     ) {
         if (builder == nullptr) {
diff --git a/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp b/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
index 38a745981b78..850a2f033d18 100644
--- a/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
+++ b/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
@@ -3,39 +3,35 @@
 
 #pragma once
 
-#include "../../datatypes/panel_state.hpp"
 #include "../../result.hpp"
 
 #include <cstdint>
 #include <memory>
 
+namespace arrow {
+    class Array;
+    class DataType;
+    class SparseUnionBuilder;
+} // namespace arrow
+
 namespace rerun::blueprint::components {
     /// **Component**: Panel state
-    struct PanelState {
-        /// Panel state
-        rerun::datatypes::PanelState state;
-
-      public:
-        PanelState() = default;
+    enum class PanelState : uint8_t {
 
-        PanelState(rerun::datatypes::PanelState state_) : state(state_) {}
+        /// Completely hidden
+        Hidden = 1,
 
-        PanelState& operator=(rerun::datatypes::PanelState state_) {
-            state = state_;
-            return *this;
-        }
+        /// Visible, but as small as possible on its shorter axis
+        Collapsed = 2,
 
-        /// Cast to the underlying PanelState datatype
-        operator rerun::datatypes::PanelState() const {
-            return state;
-        }
+        /// Fully expanded
+        Expanded = 3,
     };
 } // namespace rerun::blueprint::components
 
 namespace rerun {
-    static_assert(
-        sizeof(rerun::datatypes::PanelState) == sizeof(blueprint::components::PanelState)
-    );
+    template <typename T>
+    struct Loggable;
 
     /// \private
     template <>
@@ -43,18 +39,17 @@ namespace rerun {
         static constexpr const char Name[] = "rerun.blueprint.components.PanelState";
 
         /// Returns the arrow data type this type corresponds to.
-        static const std::shared_ptr<arrow::DataType>& arrow_datatype() {
-            return Loggable<rerun::datatypes::PanelState>::arrow_datatype();
-        }
+        static const std::shared_ptr<arrow::DataType>& arrow_datatype();
 
         /// Serializes an array of `rerun::blueprint:: components::PanelState` into an arrow array.
         static Result<std::shared_ptr<arrow::Array>> to_arrow(
             const blueprint::components::PanelState* instances, size_t num_instances
-        ) {
-            return Loggable<rerun::datatypes::PanelState>::to_arrow(
-                &instances->state,
-                num_instances
-            );
-        }
+        );
+
+        /// Fills an arrow array builder with an array of this type.
+        static rerun::Error fill_arrow_array_builder(
+            arrow::SparseUnionBuilder* builder, const blueprint::components::PanelState* elements,
+            size_t num_elements
+        );
     };
 } // namespace rerun
diff --git a/rerun_cpp/src/rerun/datatypes.hpp b/rerun_cpp/src/rerun/datatypes.hpp
index 66a9328eec80..40ccb9f0e759 100644
--- a/rerun_cpp/src/rerun/datatypes.hpp
+++ b/rerun_cpp/src/rerun/datatypes.hpp
@@ -15,7 +15,6 @@
 #include "datatypes/mat3x3.hpp"
 #include "datatypes/mat4x4.hpp"
 #include "datatypes/material.hpp"
-#include "datatypes/panel_state.hpp"
 #include "datatypes/quaternion.hpp"
 #include "datatypes/range1d.hpp"
 #include "datatypes/range2d.hpp"
diff --git a/rerun_cpp/src/rerun/datatypes/.gitattributes b/rerun_cpp/src/rerun/datatypes/.gitattributes
index 6d7829d1a6de..ca81f2410d02 100644
--- a/rerun_cpp/src/rerun/datatypes/.gitattributes
+++ b/rerun_cpp/src/rerun/datatypes/.gitattributes
@@ -27,8 +27,6 @@ mat4x4.cpp linguist-generated=true
 mat4x4.hpp linguist-generated=true
 material.cpp linguist-generated=true
 material.hpp linguist-generated=true
-panel_state.cpp linguist-generated=true
-panel_state.hpp linguist-generated=true
 quaternion.cpp linguist-generated=true
 quaternion.hpp linguist-generated=true
 range1d.cpp linguist-generated=true
diff --git a/rerun_cpp/src/rerun/datatypes/panel_state.hpp b/rerun_cpp/src/rerun/datatypes/panel_state.hpp
deleted file mode 100644
index 81226adacd88..000000000000
--- a/rerun_cpp/src/rerun/datatypes/panel_state.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/cpp/mod.rs
-// Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
-
-#pragma once
-
-#include "../result.hpp"
-
-#include <cstdint>
-#include <memory>
-
-namespace arrow {
-    class Array;
-    class DataType;
-    class SparseUnionBuilder;
-} // namespace arrow
-
-namespace rerun::datatypes {
-    /// **Datatype**: State of a app blueprint panel.
-    enum class PanelState : uint8_t {
-
-        /// Completely hidden
-        Hidden = 1,
-
-        /// Visible, but as small as possible on its shorter axis
-        Collapsed = 2,
-
-        /// Fully expanded
-        Expanded = 3,
-    };
-} // namespace rerun::datatypes
-
-namespace rerun {
-    template <typename T>
-    struct Loggable;
-
-    /// \private
-    template <>
-    struct Loggable<datatypes::PanelState> {
-        static constexpr const char Name[] = "rerun.datatypes.PanelState";
-
-        /// Returns the arrow data type this type corresponds to.
-        static const std::shared_ptr<arrow::DataType>& arrow_datatype();
-
-        /// Serializes an array of `rerun::datatypes::PanelState` into an arrow array.
-        static Result<std::shared_ptr<arrow::Array>> to_arrow(
-            const datatypes::PanelState* instances, size_t num_instances
-        );
-
-        /// Fills an arrow array builder with an array of this type.
-        static rerun::Error fill_arrow_array_builder(
-            arrow::SparseUnionBuilder* builder, const datatypes::PanelState* elements,
-            size_t num_elements
-        );
-    };
-} // namespace rerun
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/api.py b/rerun_py/rerun_sdk/rerun/blueprint/api.py
index b645e1f6a2b7..552ab7383365 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/api.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/api.py
@@ -12,7 +12,7 @@
 from ..notebook import as_html
 from ..recording_stream import RecordingStream
 from .archetypes import ContainerBlueprint, PanelBlueprint, SpaceViewBlueprint, SpaceViewContents, ViewportBlueprint
-from .components import ColumnShareArrayLike, RowShareArrayLike, VisibleLike
+from .components import ColumnShareArrayLike, RowShareArrayLike, VisibleLike, PanelState, PanelStateLike
 from .components.container_kind import ContainerKindLike
 
 SpaceViewContentsLike = Union[Utf8ArrayLike, SpaceViewContents]
@@ -242,12 +242,25 @@ def _repr_html_(self) -> Any:
         return as_html(blueprint=self)
 
 
+def _to_state(expanded: bool | None, state: PanelStateLike | None) -> PanelStateLike | None:
+    """Handle the case where `expanded` is used over `state`."""
+
+    if expanded is not None and state is not None:
+        raise ValueError("Cannot set both 'expanded' and 'state'")
+    if state is not None:
+        return state
+    if expanded is not None:
+        return PanelState.Expanded if expanded else PanelState.Collapsed
+    return None
+
+
 class Panel:
     """
     Base class for the panel types.
 
     Consider using one of the subclasses instead of this class directly:
 
+    - [TopPanel][rerun.blueprint.TopPanel]
     - [BlueprintPanel][rerun.blueprint.BlueprintPanel]
     - [SelectionPanel][rerun.blueprint.SelectionPanel]
     - [TimePanel][rerun.blueprint.TimePanel]
@@ -255,7 +268,7 @@ class Panel:
     These are ergonomic helpers on top of [rerun.blueprint.archetypes.PanelBlueprint][].
     """
 
-    def __init__(self, *, blueprint_path: str, expanded: bool | None = None):
+    def __init__(self, *, blueprint_path: str, expanded: bool | None = None, state: PanelStateLike | None = None):
         """
         Construct a new panel.
 
@@ -264,11 +277,13 @@ def __init__(self, *, blueprint_path: str, expanded: bool | None = None):
         blueprint_path:
             The blueprint path of the panel.
         expanded:
-            Whether the panel is expanded or not.
+            Deprecated. Use `state` instead.
+        state:
+            Whether the panel is expanded, collapsed, or hidden.
 
         """
         self._blueprint_path = blueprint_path
-        self.expanded = expanded
+        self.state = _to_state(expanded, state)
 
     def blueprint_path(self) -> str:
         """
@@ -282,58 +297,82 @@ def blueprint_path(self) -> str:
     def _log_to_stream(self, stream: RecordingStream) -> None:
         """Internal method to convert to an archetype and log to the stream."""
         arch = PanelBlueprint(
-            expanded=self.expanded,
+            state=self.state,
         )
 
         stream.log(self.blueprint_path(), arch)  # type: ignore[attr-defined]
 
 
+class TopPanel(Panel):
+    """The state of the top panel."""
+
+    def __init__(self, *, expanded: bool | None = None, state: PanelStateLike | None = None):
+        """
+        Construct a new top panel.
+
+        Parameters
+        ----------
+        expanded:
+            Deprecated. Use `state` instead.
+        state:
+            Whether the panel is expanded, collapsed, or hidden.
+
+        """
+        super().__init__(blueprint_path="top_panel", expanded=expanded, state=state)
+
+
 class BlueprintPanel(Panel):
     """The state of the blueprint panel."""
 
-    def __init__(self, *, expanded: bool | None = None):
+    def __init__(self, *, expanded: bool | None = None, state: PanelStateLike | None = None):
         """
         Construct a new blueprint panel.
 
         Parameters
         ----------
         expanded:
-            Whether the panel is expanded or not.
+            Deprecated. Use `state` instead.
+        state:
+            Whether the panel is expanded, collapsed, or hidden.
 
         """
-        super().__init__(blueprint_path="blueprint_panel", expanded=expanded)
+        super().__init__(blueprint_path="blueprint_panel", expanded=expanded, state=state)
 
 
 class SelectionPanel(Panel):
     """The state of the selection panel."""
 
-    def __init__(self, *, expanded: bool | None = None):
+    def __init__(self, *, expanded: bool | None = None, state: PanelStateLike | None = None):
         """
         Construct a new selection panel.
 
         Parameters
         ----------
         expanded:
-            Whether the panel is expanded or not.
+            Deprecated. Use `state` instead.
+        state:
+            Whether the panel is expanded, collapsed, or hidden.
 
         """
-        super().__init__(blueprint_path="selection_panel", expanded=expanded)
+        super().__init__(blueprint_path="selection_panel", expanded=expanded, state=state)
 
 
 class TimePanel(Panel):
     """The state of the time panel."""
 
-    def __init__(self, *, expanded: bool | None = None):
+    def __init__(self, *, expanded: bool | None = None, state: PanelStateLike | None = None):
         """
         Construct a new time panel.
 
         Parameters
         ----------
         expanded:
-            Whether the panel is expanded or not.
+            Deprecated. Use `state` instead.
+        state:
+            Whether the panel is expanded, collapsed, or hidden.
 
         """
-        super().__init__(blueprint_path="time_panel", expanded=expanded)
+        super().__init__(blueprint_path="time_panel", expanded=expanded, state=state)
 
 
 ContainerLike = Union[Container, SpaceView]
@@ -456,17 +495,17 @@ def _log_to_stream(self, stream: RecordingStream) -> None:
         if hasattr(self, "blueprint_panel"):
             self.blueprint_panel._log_to_stream(stream)
         elif self.collapse_panels:
-            BlueprintPanel(expanded=False)._log_to_stream(stream)
+            BlueprintPanel(state="collapsed")._log_to_stream(stream)
 
         if hasattr(self, "selection_panel"):
             self.selection_panel._log_to_stream(stream)
         elif self.collapse_panels:
-            SelectionPanel(expanded=False)._log_to_stream(stream)
+            SelectionPanel(state="collapsed")._log_to_stream(stream)
 
         if hasattr(self, "time_panel"):
             self.time_panel._log_to_stream(stream)
         elif self.collapse_panels:
-            TimePanel(expanded=False)._log_to_stream(stream)
+            TimePanel(state="collapsed")._log_to_stream(stream)
 
     def _repr_html_(self) -> Any:
         """IPython interface to conversion to html."""
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py b/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py
index 37c79865661b..d64cae4055fa 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/archetypes/panel_blueprint.py
@@ -9,7 +9,6 @@
 
 from attrs import define, field
 
-from ... import datatypes
 from ..._baseclasses import Archetype
 from ...blueprint import components as blueprint_components
 from ...error_utils import catch_and_log_exceptions
@@ -21,7 +20,7 @@
 class PanelBlueprint(Archetype):
     """**Archetype**: Shared state for the 3 collapsible panels."""
 
-    def __init__(self: Any, *, state: datatypes.PanelStateLike | None = None):
+    def __init__(self: Any, *, state: blueprint_components.PanelStateLike | None = None):
         """Create a new instance of the PanelBlueprint archetype."""
 
         # You can define your own __init__ function as a member of PanelBlueprintExt in panel_blueprint_ext.py
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py b/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py
index 8c895f6b897f..cca68bfa447e 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/components/__init__.py
@@ -38,7 +38,7 @@
 from .included_content import IncludedContent, IncludedContentBatch, IncludedContentType
 from .included_space_view import IncludedSpaceView, IncludedSpaceViewBatch, IncludedSpaceViewType
 from .lock_range_during_zoom import LockRangeDuringZoom, LockRangeDuringZoomBatch, LockRangeDuringZoomType
-from .panel_state import PanelState, PanelStateBatch, PanelStateType
+from .panel_state import PanelState, PanelStateArrayLike, PanelStateBatch, PanelStateLike, PanelStateType
 from .query_expression import QueryExpression, QueryExpressionBatch, QueryExpressionType
 from .root_container import RootContainer, RootContainerBatch, RootContainerType
 from .row_share import RowShare, RowShareArrayLike, RowShareBatch, RowShareLike, RowShareType
@@ -108,7 +108,9 @@
     "LockRangeDuringZoomBatch",
     "LockRangeDuringZoomType",
     "PanelState",
+    "PanelStateArrayLike",
     "PanelStateBatch",
+    "PanelStateLike",
     "PanelStateType",
     "QueryExpression",
     "QueryExpressionBatch",
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
index 1061e27ff617..f696c59f6c68 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
@@ -5,24 +5,91 @@
 
 from __future__ import annotations
 
-from ... import datatypes
-from ..._baseclasses import ComponentBatchMixin
+from typing import Sequence, Union
 
-__all__ = ["PanelState", "PanelStateBatch", "PanelStateType"]
+import pyarrow as pa
 
+from ..._baseclasses import BaseBatch, BaseExtensionType, ComponentBatchMixin
 
-class PanelState(datatypes.PanelState):
+__all__ = ["PanelState", "PanelStateArrayLike", "PanelStateBatch", "PanelStateLike", "PanelStateType"]
+
+
+from enum import Enum
+
+
+class PanelState(Enum):
     """**Component**: Panel state."""
 
-    # You can define your own __init__ function as a member of PanelStateExt in panel_state_ext.py
+    Hidden = 1
+    """Completely hidden"""
+
+    Collapsed = 2
+    """Visible, but as small as possible on its shorter axis"""
+
+    Expanded = 3
+    """Fully expanded"""
+
 
-    # Note: there are no fields here because PanelState delegates to datatypes.PanelState
-    pass
+PanelStateLike = Union[PanelState, str]
+PanelStateArrayLike = Union[PanelStateLike, Sequence[PanelStateLike]]
 
 
-class PanelStateType(datatypes.PanelStateType):
+class PanelStateType(BaseExtensionType):
     _TYPE_NAME: str = "rerun.blueprint.components.PanelState"
 
+    def __init__(self) -> None:
+        pa.ExtensionType.__init__(
+            self,
+            pa.sparse_union([
+                pa.field("_null_markers", pa.null(), nullable=True, metadata={}),
+                pa.field("Hidden", pa.null(), nullable=True, metadata={}),
+                pa.field("Collapsed", pa.null(), nullable=True, metadata={}),
+                pa.field("Expanded", pa.null(), nullable=True, metadata={}),
+            ]),
+            self._TYPE_NAME,
+        )
 
-class PanelStateBatch(datatypes.PanelStateBatch, ComponentBatchMixin):
+
+class PanelStateBatch(BaseBatch[PanelStateArrayLike], ComponentBatchMixin):
     _ARROW_TYPE = PanelStateType()
+
+    @staticmethod
+    def _native_to_pa_array(data: PanelStateArrayLike, data_type: pa.DataType) -> pa.Array:
+        if isinstance(data, (PanelState, int, str)):
+            data = [data]
+
+        types: list[int] = []
+
+        for value in data:
+            if value is None:
+                types.append(0)
+            elif isinstance(value, PanelState):
+                types.append(value.value)  # Actual enum value
+            elif isinstance(value, int):
+                types.append(value)  # By number
+            elif isinstance(value, str):
+                if hasattr(PanelState, value):
+                    types.append(PanelState[value].value)  # fast path
+                elif value.lower() == "hidden":
+                    types.append(PanelState.Hidden.value)
+                elif value.lower() == "collapsed":
+                    types.append(PanelState.Collapsed.value)
+                elif value.lower() == "expanded":
+                    types.append(PanelState.Expanded.value)
+                else:
+                    raise ValueError(f"Unknown PanelState kind: {value}")
+            else:
+                raise ValueError(f"Unknown PanelState kind: {value}")
+
+        buffers = [
+            None,
+            pa.array(types, type=pa.int8()).buffers()[1],
+        ]
+        children = (1 + 3) * [pa.nulls(len(data))]
+
+        return pa.UnionArray.from_buffers(
+            type=data_type,
+            length=len(data),
+            buffers=buffers,
+            children=children,
+        )
diff --git a/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes b/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes
index b86106381743..44872e9184b6 100644
--- a/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes
+++ b/rerun_py/rerun_sdk/rerun/datatypes/.gitattributes
@@ -15,7 +15,6 @@ keypoint_pair.py linguist-generated=true
 mat3x3.py linguist-generated=true
 mat4x4.py linguist-generated=true
 material.py linguist-generated=true
-panel_state.py linguist-generated=true
 quaternion.py linguist-generated=true
 range1d.py linguist-generated=true
 range2d.py linguist-generated=true
diff --git a/rerun_py/rerun_sdk/rerun/datatypes/__init__.py b/rerun_py/rerun_sdk/rerun/datatypes/__init__.py
index f4425c89faf9..e3c00f9d8604 100644
--- a/rerun_py/rerun_sdk/rerun/datatypes/__init__.py
+++ b/rerun_py/rerun_sdk/rerun/datatypes/__init__.py
@@ -33,7 +33,6 @@
 from .mat3x3 import Mat3x3, Mat3x3ArrayLike, Mat3x3Batch, Mat3x3Like, Mat3x3Type
 from .mat4x4 import Mat4x4, Mat4x4ArrayLike, Mat4x4Batch, Mat4x4Like, Mat4x4Type
 from .material import Material, MaterialArrayLike, MaterialBatch, MaterialLike, MaterialType
-from .panel_state import PanelState, PanelStateArrayLike, PanelStateBatch, PanelStateLike, PanelStateType
 from .quaternion import Quaternion, QuaternionArrayLike, QuaternionBatch, QuaternionLike, QuaternionType
 from .range1d import Range1D, Range1DArrayLike, Range1DBatch, Range1DLike, Range1DType
 from .range2d import Range2D, Range2DArrayLike, Range2DBatch, Range2DLike, Range2DType
@@ -164,11 +163,6 @@
     "MaterialBatch",
     "MaterialLike",
     "MaterialType",
-    "PanelState",
-    "PanelStateArrayLike",
-    "PanelStateBatch",
-    "PanelStateLike",
-    "PanelStateType",
     "Quaternion",
     "QuaternionArrayLike",
     "QuaternionBatch",
diff --git a/rerun_py/rerun_sdk/rerun/datatypes/panel_state.py b/rerun_py/rerun_sdk/rerun/datatypes/panel_state.py
deleted file mode 100644
index 6992521d825e..000000000000
--- a/rerun_py/rerun_sdk/rerun/datatypes/panel_state.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# DO NOT EDIT! This file was auto-generated by crates/re_types_builder/src/codegen/python/mod.rs
-# Based on "crates/re_types/definitions/rerun/datatypes/panel_state.fbs".
-
-# You can extend this class by creating a "PanelStateExt" class in "panel_state_ext.py".
-
-from __future__ import annotations
-
-from typing import Sequence, Union
-
-import pyarrow as pa
-
-from .._baseclasses import BaseBatch, BaseExtensionType
-
-__all__ = ["PanelState", "PanelStateArrayLike", "PanelStateBatch", "PanelStateLike", "PanelStateType"]
-
-
-from enum import Enum
-
-
-class PanelState(Enum):
-    """**Datatype**: State of a app blueprint panel."""
-
-    Hidden = 1
-    """Completely hidden"""
-
-    Collapsed = 2
-    """Visible, but as small as possible on its shorter axis"""
-
-    Expanded = 3
-    """Fully expanded"""
-
-
-PanelStateLike = Union[PanelState, str]
-PanelStateArrayLike = Union[PanelStateLike, Sequence[PanelStateLike]]
-
-
-class PanelStateType(BaseExtensionType):
-    _TYPE_NAME: str = "rerun.datatypes.PanelState"
-
-    def __init__(self) -> None:
-        pa.ExtensionType.__init__(
-            self,
-            pa.sparse_union([
-                pa.field("_null_markers", pa.null(), nullable=True, metadata={}),
-                pa.field("Hidden", pa.null(), nullable=True, metadata={}),
-                pa.field("Collapsed", pa.null(), nullable=True, metadata={}),
-                pa.field("Expanded", pa.null(), nullable=True, metadata={}),
-            ]),
-            self._TYPE_NAME,
-        )
-
-
-class PanelStateBatch(BaseBatch[PanelStateArrayLike]):
-    _ARROW_TYPE = PanelStateType()
-
-    @staticmethod
-    def _native_to_pa_array(data: PanelStateArrayLike, data_type: pa.DataType) -> pa.Array:
-        if isinstance(data, (PanelState, int, str)):
-            data = [data]
-
-        types: list[int] = []
-
-        for value in data:
-            if value is None:
-                types.append(0)
-            elif isinstance(value, PanelState):
-                types.append(value.value)  # Actual enum value
-            elif isinstance(value, int):
-                types.append(value)  # By number
-            elif isinstance(value, str):
-                if hasattr(PanelState, value):
-                    types.append(PanelState[value].value)  # fast path
-                elif value.lower() == "hidden":
-                    types.append(PanelState.Hidden.value)
-                elif value.lower() == "collapsed":
-                    types.append(PanelState.Collapsed.value)
-                elif value.lower() == "expanded":
-                    types.append(PanelState.Expanded.value)
-                else:
-                    raise ValueError(f"Unknown PanelState kind: {value}")
-            else:
-                raise ValueError(f"Unknown PanelState kind: {value}")
-
-        buffers = [
-            None,
-            pa.array(types, type=pa.int8()).buffers()[1],
-        ]
-        children = (1 + 3) * [pa.nulls(len(data))]
-
-        return pa.UnionArray.from_buffers(
-            type=data_type,
-            length=len(data),
-            buffers=buffers,
-            children=children,
-        )
diff --git a/tests/python/blueprint/main.py b/tests/python/blueprint/main.py
index 5a750108932c..cf18f533f209 100644
--- a/tests/python/blueprint/main.py
+++ b/tests/python/blueprint/main.py
@@ -34,7 +34,7 @@
             ),
             row_shares=[2, 1],
         ),
-        TimePanel(expanded=False),
+        TimePanel(state="collapsed"),
     )
 
     rr.init(
diff --git a/tests/python/blueprint/save_blueprint.py b/tests/python/blueprint/save_blueprint.py
index 495ee982305c..db22c0170bd7 100644
--- a/tests/python/blueprint/save_blueprint.py
+++ b/tests/python/blueprint/save_blueprint.py
@@ -4,9 +4,9 @@
 
 blueprint = rrb.Blueprint(
     rrb.Spatial3DView(origin="/test1"),
-    rrb.TimePanel(expanded=False),
-    rrb.SelectionPanel(expanded=False),
-    rrb.BlueprintPanel(expanded=False),
+    rrb.TimePanel(state="collapsed"),
+    rrb.SelectionPanel(state="collapsed"),
+    rrb.BlueprintPanel(state="collapsed"),
 )
 
 blueprint.save("rerun_example_blueprint_test.rbl")
diff --git a/tests/python/blueprint/spawn_blueprint.py b/tests/python/blueprint/spawn_blueprint.py
index 8c08a60d1910..303259dc5b0c 100644
--- a/tests/python/blueprint/spawn_blueprint.py
+++ b/tests/python/blueprint/spawn_blueprint.py
@@ -4,9 +4,9 @@
 
 blueprint = rrb.Blueprint(
     rrb.Spatial3DView(origin="/test1"),
-    rrb.TimePanel(expanded=False),
-    rrb.SelectionPanel(expanded=False),
-    rrb.BlueprintPanel(expanded=False),
+    rrb.TimePanel(state="collapsed"),
+    rrb.SelectionPanel(state="collapsed"),
+    rrb.BlueprintPanel(state="collapsed"),
 )
 
 blueprint.spawn("rerun_example_blueprint_test")

From 45f6681860586d97f6c2de2b0bb769388792e596 Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 18:16:37 +0200
Subject: [PATCH 4/7] remove settings.json change

---
 .vscode/settings.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 070dc0ea2e8f..72885b57a97c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -66,6 +66,5 @@
     },
     "[yaml]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "python.analysis.typeCheckingMode": "basic"
+    }
 }

From b1ca182a3117d75579c2f7604578cadcd7aa229a Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 18:18:33 +0200
Subject: [PATCH 5/7] import order

---
 rerun_py/rerun_sdk/rerun/blueprint/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rerun_py/rerun_sdk/rerun/blueprint/api.py b/rerun_py/rerun_sdk/rerun/blueprint/api.py
index 552ab7383365..fc934e7423a3 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/api.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/api.py
@@ -12,7 +12,7 @@
 from ..notebook import as_html
 from ..recording_stream import RecordingStream
 from .archetypes import ContainerBlueprint, PanelBlueprint, SpaceViewBlueprint, SpaceViewContents, ViewportBlueprint
-from .components import ColumnShareArrayLike, RowShareArrayLike, VisibleLike, PanelState, PanelStateLike
+from .components import ColumnShareArrayLike, PanelState, PanelStateLike, RowShareArrayLike, VisibleLike
 from .components.container_kind import ContainerKindLike
 
 SpaceViewContentsLike = Union[Utf8ArrayLike, SpaceViewContents]

From 25977ee6e9bd684d287d83c9617a8bb39761b822 Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 18:19:31 +0200
Subject: [PATCH 6/7] update comments

---
 .../rerun/blueprint/components/panel_state.fbs            | 8 ++++----
 crates/re_types/src/blueprint/components/panel_state.rs   | 8 ++++----
 rerun_cpp/src/rerun/blueprint/components/panel_state.hpp  | 8 ++++----
 .../rerun_sdk/rerun/blueprint/components/panel_state.py   | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs b/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
index f71871f38a85..0ef94755bf47 100644
--- a/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
+++ b/crates/re_types/definitions/rerun/blueprint/components/panel_state.fbs
@@ -9,19 +9,19 @@ namespace rerun.blueprint.components;
 
 // ---
 
-/// Panel state
+/// Tri-state for panel controls.
 enum PanelState: byte (
   "attr.rerun.scope": "blueprint",
   "attr.rust.derive": "Copy, PartialEq, Eq",
   "attr.rust.repr": "transparent",
   "attr.rust.tuple_struct"
 ) {
-  /// Completely hidden
+  /// Completely hidden.
   Hidden,
 
-  /// Visible, but as small as possible on its shorter axis
+  /// Visible, but as small as possible on its shorter axis.
   Collapsed,
 
-  /// Fully expanded
+  /// Fully expanded.
   Expanded,
 }
diff --git a/crates/re_types/src/blueprint/components/panel_state.rs b/crates/re_types/src/blueprint/components/panel_state.rs
index 787c1d20b805..388913993be9 100644
--- a/crates/re_types/src/blueprint/components/panel_state.rs
+++ b/crates/re_types/src/blueprint/components/panel_state.rs
@@ -22,16 +22,16 @@ use ::re_types_core::SerializationResult;
 use ::re_types_core::{ComponentBatch, MaybeOwnedComponentBatch};
 use ::re_types_core::{DeserializationError, DeserializationResult};
 
-/// **Component**: Panel state
+/// **Component**: Tri-state for panel controls.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum PanelState {
-    /// Completely hidden
+    /// Completely hidden.
     Hidden = 1,
 
-    /// Visible, but as small as possible on its shorter axis
+    /// Visible, but as small as possible on its shorter axis.
     Collapsed = 2,
 
-    /// Fully expanded
+    /// Fully expanded.
     Expanded = 3,
 }
 
diff --git a/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp b/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
index 850a2f033d18..62dcbe8a192c 100644
--- a/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
+++ b/rerun_cpp/src/rerun/blueprint/components/panel_state.hpp
@@ -15,16 +15,16 @@ namespace arrow {
 } // namespace arrow
 
 namespace rerun::blueprint::components {
-    /// **Component**: Panel state
+    /// **Component**: Tri-state for panel controls.
     enum class PanelState : uint8_t {
 
-        /// Completely hidden
+        /// Completely hidden.
         Hidden = 1,
 
-        /// Visible, but as small as possible on its shorter axis
+        /// Visible, but as small as possible on its shorter axis.
         Collapsed = 2,
 
-        /// Fully expanded
+        /// Fully expanded.
         Expanded = 3,
     };
 } // namespace rerun::blueprint::components
diff --git a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
index f696c59f6c68..69445a8fb683 100644
--- a/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
+++ b/rerun_py/rerun_sdk/rerun/blueprint/components/panel_state.py
@@ -18,16 +18,16 @@
 
 
 class PanelState(Enum):
-    """**Component**: Panel state."""
+    """**Component**: Tri-state for panel controls."""
 
     Hidden = 1
-    """Completely hidden"""
+    """Completely hidden."""
 
     Collapsed = 2
-    """Visible, but as small as possible on its shorter axis"""
+    """Visible, but as small as possible on its shorter axis."""
 
     Expanded = 3
-    """Fully expanded"""
+    """Fully expanded."""
 
 
 PanelStateLike = Union[PanelState, str]

From 99f7e2025b188083ae3e28d35f5c489afe0cd802 Mon Sep 17 00:00:00 2001
From: jprochazk <1665677+jprochazk@users.noreply.github.com>
Date: Wed, 22 May 2024 18:54:28 +0200
Subject: [PATCH 7/7] fix weird parenthesis

---
 crates/re_viewer/src/ui/top_panel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/re_viewer/src/ui/top_panel.rs b/crates/re_viewer/src/ui/top_panel.rs
index 8fb884379f5a..06e7a7a591cd 100644
--- a/crates/re_viewer/src/ui/top_panel.rs
+++ b/crates/re_viewer/src/ui/top_panel.rs
@@ -233,7 +233,7 @@ fn panel_buttons_r2l(app: &App, app_blueprint: &AppBlueprint<'_>, ui: &mut egui:
         .medium_icon_toggle_button(
             ui,
             &re_ui::icons::RIGHT_PANEL_TOGGLE,
-            &mut (app_blueprint.selection_panel_state.is_expanded()),
+            &mut app_blueprint.selection_panel_state.is_expanded(),
         )
         .on_hover_text(format!(
             "Toggle Selection View{}",