dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correcting shacn to shadcn to uniformly use shadcn ui names (#210)

Browse source 
* Fixed some color naming with shadcn style
* Input story support scroll y
This commit is contained in:
ihavecoke 2024-09-03 23:31:34 +08:00 committed by GitHub
parent 0158083599
commit acabaf32c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/story/src/input_story.rs
View file

@ -1,20 +1,20 @@
use gpui::{ use gpui::{actions, div, px, AppContext, FocusHandle, InteractiveElement, IntoElement, KeyBinding, ParentElement as _, Render, SharedString, Styled, View, ViewContext, VisualContext, WindowContext};
actions, div, px, AppContext, FocusHandle, InteractiveElement, IntoElement, KeyBinding,
ParentElement as _, Render, SharedString, Styled, View, ViewContext, VisualContext,
WindowContext,
};
use crate::section;
use ui::{ use ui::{
button::Button, button::Button,
checkbox::Checkbox, checkbox::Checkbox,
h_flex, h_flex,
input::{InputEvent, OtpInput, TextInput}, input::{InputEvent, OtpInput, TextInput},
prelude::FluentBuilder as _, prelude::FluentBuilder as _,
v_flex, FocusableCycle, IconName, Sizable, scroll::ScrollbarAxis,
v_flex,
FocusableCycle,
IconName,
Sizable,
StyledExt,
}; };
use crate::section;
actions!(input_story, [Tab, TabPrev]); actions!(input_story, [Tab, TabPrev]);
const CONTEXT: &str = "InputStory"; const CONTEXT: &str = "InputStory";
@ -207,6 +207,8 @@ impl Render for InputStory {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement { fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
v_flex() v_flex()
.key_context(CONTEXT) .key_context(CONTEXT)
.id("input-story")
.scrollable(cx.entity_id(), ScrollbarAxis::Vertical)
.on_action(cx.listener(Self::tab)) .on_action(cx.listener(Self::tab))
.on_action(cx.listener(Self::tab_prev)) .on_action(cx.listener(Self::tab_prev))
.size_full() .size_full()

16
crates/ui/src/colors.rs
View file

@ -55,18 +55,18 @@ impl ColorExt for Hsla {
} }
} }
pub(crate) static DEFAULT_COLOR: once_cell::sync::Lazy<ShacnColors> = pub(crate) static DEFAULT_COLOR: once_cell::sync::Lazy<ShadcnColors> =
once_cell::sync::Lazy::new(|| { once_cell::sync::Lazy::new(|| {
serde_json::from_str(include_str!("../default-colors.json")) serde_json::from_str(include_str!("../default-colors.json"))
.expect("failed to parse default-json") .expect("failed to parse default-json")
}); });
type ColorScales = HashMap<usize, ShacnColor>; type ColorScales = HashMap<usize, ShadcnColor>;
mod color_scales { mod color_scales {
use std::collections::HashMap; use std::collections::HashMap;
use super::{ColorScales, ShacnColor}; use super::{ColorScales, ShadcnColor};
use serde::de::{Deserialize, Deserializer}; use serde::de::{Deserialize, Deserializer};
@ -75,7 +75,7 @@ mod color_scales {
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let mut map = HashMap::new(); let mut map = HashMap::new();
for color in Vec::<ShacnColor>::deserialize(deserializer)? { for color in Vec::<ShadcnColor>::deserialize(deserializer)? {
map.insert(color.scale, color); map.insert(color.scale, color);
} }
Ok(map) Ok(map)
@ -83,9 +83,9 @@ mod color_scales {
} }
#[derive(Debug, Clone, PartialEq, Eq, serde::Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, serde::Deserialize)]
pub(crate) struct ShacnColors { pub(crate) struct ShadcnColors {
pub(crate) black: ShacnColor, pub(crate) black: ShadcnColor,
pub(crate) white: ShacnColor, pub(crate) white: ShadcnColor,
#[serde(with = "color_scales")] #[serde(with = "color_scales")]
pub(crate) slate: ColorScales, pub(crate) slate: ColorScales,
#[serde(with = "color_scales")] #[serde(with = "color_scales")]
@ -133,7 +133,7 @@ pub(crate) struct ShacnColors {
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Deserialize)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Deserialize)]
pub(crate) struct ShacnColor { pub(crate) struct ShadcnColor {
#[serde(default)] #[serde(default)]
pub(crate) scale: usize, pub(crate) scale: usize,
#[serde(deserialize_with = "from_hsa_channel", alias = "hslChannel")] #[serde(deserialize_with = "from_hsa_channel", alias = "hslChannel")]