Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitcbe3004

Browse files
authored
chore: improve announcement banner color picker (#16158)
1 parent60c4d87 commitcbe3004

File tree

2 files changed

+68
-27
lines changed

2 files changed

+68
-27
lines changed

‎site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerDialog.tsx‎

Lines changed: 67 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import { type Interpolation, type Theme, useTheme } from "@emotion/react";
22
importDialogActionsfrom"@mui/material/DialogActions";
33
importTextFieldfrom"@mui/material/TextField";
44
importtype{BannerConfig}from"api/typesGenerated";
5+
import{Button}from"components/Button/Button";
56
import{Dialog,DialogActionButtons}from"components/Dialogs/Dialog";
67
import{Stack}from"components/Stack/Stack";
78
import{useFormik}from"formik";
89
import{AnnouncementBannerView}from"modules/dashboard/AnnouncementBanners/AnnouncementBannerView";
9-
importtype{FC}from"react";
10-
import{BlockPicker}from"react-color";
10+
import{typeFC,useState}from"react";
11+
import{SliderPicker,TwitterPicker}from"react-color";
1112
import{getFormHelpers}from"utils/formUtils";
1213

1314
interfaceAnnouncementBannerDialogProps{
@@ -29,12 +30,14 @@ export const AnnouncementBannerDialog: FC<AnnouncementBannerDialogProps> = ({
2930
}>({
3031
initialValues:{
3132
message:banner.message??"",
32-
background_color:banner.background_color??"#004852",
33+
background_color:banner.background_color??"#ABB8C3",
3334
},
3435
onSubmit:(banner)=>onUpdate(banner),
3536
});
3637
constbannerFieldHelpers=getFormHelpers(bannerForm);
3738

39+
const[showHuePicker,setShowHuePicker]=useState(false);
40+
3841
return(
3942
<Dialogcss={styles.dialogWrapper}openonClose={onCancel}>
4043
{/* Banner preview */}
@@ -64,29 +67,67 @@ export const AnnouncementBannerDialog: FC<AnnouncementBannerDialogProps> = ({
6467
</div>
6568
<div>
6669
<h4css={styles.settingName}>Background color</h4>
67-
<BlockPicker
68-
color={bannerForm.values.background_color}
69-
onChange={async(color)=>{
70-
awaitbannerForm.setFieldValue("background_color",color.hex);
71-
}}
72-
triangle="hide"
73-
colors={["#004852","#D65D0F","#4CD473","#D94A5D","#5A00CF"]}
74-
styles={{
75-
default:{
76-
input:{
77-
color:"white",
78-
backgroundColor:theme.palette.background.default,
79-
},
80-
body:{
81-
backgroundColor:"black",
82-
color:"white",
83-
},
84-
card:{
85-
backgroundColor:"black",
86-
},
87-
},
88-
}}
89-
/>
70+
<Stackspacing={2}>
71+
{showHuePicker ?(
72+
<SliderPicker
73+
color={bannerForm.values.background_color}
74+
onChange={async(color)=>{
75+
awaitbannerForm.setFieldValue(
76+
"background_color",
77+
color.hex,
78+
);
79+
}}
80+
/>
81+
) :(
82+
<TwitterPicker
83+
color={bannerForm.values.background_color}
84+
onChange={async(color)=>{
85+
awaitbannerForm.setFieldValue(
86+
"background_color",
87+
color.hex,
88+
);
89+
}}
90+
triangle="hide"
91+
colors={[
92+
"#8b5cf6",
93+
"#d94a5d",
94+
"#f78da7",
95+
"#d65d0f",
96+
"#ff6900",
97+
"#fcb900",
98+
"#0693e3",
99+
100+
"#8ed1fc",
101+
"#4cd473",
102+
"#abb8c3",
103+
]}
104+
styles={{
105+
default:{
106+
input:{
107+
color:"white",
108+
backgroundColor:theme.palette.background.default,
109+
},
110+
body:{
111+
backgroundColor:"transparent",
112+
color:"white",
113+
padding:0,
114+
},
115+
card:{
116+
backgroundColor:"transparent",
117+
},
118+
},
119+
}}
120+
/>
121+
)}
122+
<div>
123+
<Button
124+
variant="outline"
125+
onClick={()=>setShowHuePicker((it)=>!it)}
126+
>
127+
Show{showHuePicker ?"palette" :"slider"}
128+
</Button>
129+
</div>
130+
</Stack>
90131
</div>
91132
</Stack>
92133
</div>

‎site/src/pages/DeploymentSettingsPage/AppearanceSettingsPage/AnnouncementBannerSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const AnnouncementBannerSettings: FC<
3333
constaddBanner=()=>{
3434
setBanners([
3535
...banners,
36-
{enabled:true,message:"",background_color:"#004852"},
36+
{enabled:true,message:"",background_color:"#ABB8C3"},
3737
]);
3838
setEditingBannerId(banners.length);
3939
};

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp