Skip to content

Commit e74cc8e

Browse files
authored
fix: ui bugs (#1631)
1 parent d6b275d commit e74cc8e

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

apps/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"build": "next build",
88
"clean": "git clean -xdf .next .turbo node_modules coverage .swc .cache",
9-
"dev": "next dev",
9+
"dev": "next dev --turbopack",
1010
"format": "prettier --check . --ignore-path ../../.gitignore --ignore-path .prettierignore",
1111
"format:fix": "prettier --write --list-different \"./src/**/*.{js,cjs,mjs,ts,tsx,md,json}\"",
1212
"generate-api-type": "openapi-typescript http://0.0.0.0:4000/admin-docs-json --output src/shared/types/api.type.ts --default-non-nullable=false --empty-objects-unknown",

apps/web/src/shared/ui/inputs/select-input.ui.tsx

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
import type { IconNameType, Size } from '@ufb/react';
1717
import {
18-
Button,
19-
Icon,
2018
Select,
2119
SelectCaption,
2220
SelectContent,
@@ -40,7 +38,6 @@ interface Props {
4038
type?: 'single' | 'multiple';
4139
error?: string;
4240
size?: Size;
43-
clearable?: boolean;
4441
}
4542

4643
const SelectInput: React.FC<Props> = (props) => {
@@ -57,7 +54,6 @@ const SelectInput: React.FC<Props> = (props) => {
5754
type = 'single',
5855
error,
5956
size,
60-
clearable = false,
6157
} = props;
6258

6359
return (
@@ -77,18 +73,6 @@ const SelectInput: React.FC<Props> = (props) => {
7773
)}
7874
<SelectTrigger>
7975
<SelectValue placeholder={placeholder} />
80-
{clearable && (!!value || (!!values && values.length > 0)) && (
81-
<Button variant="ghost" onClick={(e) => e.stopPropagation()}>
82-
<Icon
83-
name="RiCloseCircleFill"
84-
className="z-20"
85-
onClick={() => {
86-
onChange?.(undefined);
87-
onValuesChange?.([]);
88-
}}
89-
/>
90-
</Button>
91-
)}
9276
</SelectTrigger>
9377
<SelectContent>
9478
<SelectGroup>

apps/web/src/widgets/channel-settings/ui/channel-info-setting.ui.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ interface IProps {
4343
const ChannelInfoSetting: React.FC<IProps> = ({ channelId, projectId }) => {
4444
const { t } = useTranslation();
4545

46+
const router = useRouter();
4647
const perms = usePermissions(projectId);
4748
const overlay = useOverlay();
48-
const router = useRouter();
4949
const { refetch: refetchChannels } = useAllChannels(projectId);
50+
5051
const methods = useForm<ChannelInfo>({
5152
resolver: zodResolver(channelInfoSchema),
5253
});
@@ -86,7 +87,6 @@ const ChannelInfoSetting: React.FC<IProps> = ({ channelId, projectId }) => {
8687
});
8788

8889
useEffect(() => {
89-
if (!data) return;
9090
methods.reset(data);
9191
}, [data]);
9292

apps/web/src/widgets/layout/ui/project-select-box.ui.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const ProjectSelectBox: React.FC<IProps> = ({ projectId }) => {
8585

8686
return (
8787
<Tooltip open={!projectId}>
88-
<TooltipTrigger asChild>
88+
<TooltipTrigger>
8989
<Select
9090
type="single"
9191
value={projectId ? String(projectId) : ''}

packages/ufb-react/src/components/select.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ const Select = ({
9393
);
9494

9595
const handleSingleValueChange = (value: string) => {
96+
if (value === '') return;
9697
setSingleValue(value);
9798
onValueChange?.(value);
9899
};
@@ -105,7 +106,7 @@ const Select = ({
105106
React.useEffect(() => {
106107
if (singleValue === value) return;
107108
setSingleValue(value);
108-
}, [value, singleValue]);
109+
}, [value]);
109110

110111
React.useEffect(() => {
111112
if (
@@ -114,7 +115,8 @@ const Select = ({
114115
)
115116
return;
116117
setMultipleValues(values);
117-
}, [values, multipleValues]);
118+
}, [values]);
119+
118120
return (
119121
<SelectContext.Provider
120122
value={{

0 commit comments

Comments
 (0)