From decf320a74b4cbef34d40f617a54778ecd4b4525 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 18 Jan 2024 22:10:41 -0500
Subject: [PATCH] Rename `overflow_hidden_{x,y}` to `overflow_{x,y}_hidden`
 (#4146)

This PR renames the `overflow_hidden_x` and `overflow_hidden_y` methods
to `overflow_x_hidden` and `overflow_y_hidden`, respectively.

This provides consistency with our `overflow_x_scroll` /
`overflow_y_scroll` methods, as well as better matches Tailwind's
naming.

Release Notes:

- N/A
---
 crates/gpui/src/styled.rs           | 10 ++++++++--
 crates/story/src/story.rs           |  2 +-
 crates/ui/src/components/tab_bar.rs |  2 +-
 crates/workspace/src/status_bar.rs  |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/styled.rs b/crates/gpui/src/styled.rs
index 0eba1771f5..508dca9583 100644
--- a/crates/gpui/src/styled.rs
+++ b/crates/gpui/src/styled.rs
@@ -66,18 +66,24 @@ pub trait Styled: Sized {
         self
     }
 
+    /// Sets the behavior of content that overflows the container to be hidden.
+    /// [Docs](https://tailwindcss.com/docs/overflow#hiding-content-that-overflows)
     fn overflow_hidden(mut self) -> Self {
         self.style().overflow.x = Some(Overflow::Hidden);
         self.style().overflow.y = Some(Overflow::Hidden);
         self
     }
 
-    fn overflow_hidden_x(mut self) -> Self {
+    /// Sets the behavior of content that overflows the container on the X axis to be hidden.
+    /// [Docs](https://tailwindcss.com/docs/overflow#hiding-content-that-overflows)
+    fn overflow_x_hidden(mut self) -> Self {
         self.style().overflow.x = Some(Overflow::Hidden);
         self
     }
 
-    fn overflow_hidden_y(mut self) -> Self {
+    /// Sets the behavior of content that overflows the container on the Y axis to be hidden.
+    /// [Docs](https://tailwindcss.com/docs/overflow#hiding-content-that-overflows)
+    fn overflow_y_hidden(mut self) -> Self {
         self.style().overflow.y = Some(Overflow::Hidden);
         self
     }
diff --git a/crates/story/src/story.rs b/crates/story/src/story.rs
index f5448831cb..47bdab7f23 100644
--- a/crates/story/src/story.rs
+++ b/crates/story/src/story.rs
@@ -104,7 +104,7 @@ impl RenderOnce for StoryContainer {
                     .h_px()
                     .flex_1()
                     .id("story_body")
-                    .overflow_hidden_x()
+                    .overflow_x_hidden()
                     .overflow_y_scroll()
                     .flex()
                     .flex_col()
diff --git a/crates/ui/src/components/tab_bar.rs b/crates/ui/src/components/tab_bar.rs
index adee8389e4..4b61d90bcd 100644
--- a/crates/ui/src/components/tab_bar.rs
+++ b/crates/ui/src/components/tab_bar.rs
@@ -117,7 +117,7 @@ impl RenderOnce for TabBar {
                     .relative()
                     .flex_1()
                     .h_full()
-                    .overflow_hidden_x()
+                    .overflow_x_hidden()
                     .child(
                         div()
                             .absolute()
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index f6fe91a574..f575feef7e 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -51,7 +51,7 @@ impl StatusBar {
     fn render_left_tools(&self, _: &mut ViewContext<Self>) -> impl IntoElement {
         h_flex()
             .gap_2()
-            .overflow_hidden_x()
+            .overflow_x_hidden()
             .children(self.left_items.iter().map(|item| item.to_any()))
     }