antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-02 02:43:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Migrate to Mantine v8 and Design Changes (#961)

Browse source 
* mantine v8 migration

* various design changes and improvements
This commit is contained in:
Jeff 2025-06-24 00:04:36 -07:00 • committed by GitHub
parent bea55d48a8
commit c1330d92b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
473 changed files with 12469 additions and 11607 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/renderer/components/select-with-invalid-data/index.tsx
View file

@ -1,7 +1,8 @@
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { MultiSelect, MultiSelectProps, Select, SelectProps } from '/@/renderer/components/select';
import { MultiSelect, MultiSelectProps } from '/@/shared/components/multi-select/multi-select';
import { Select, SelectProps } from '/@/shared/components/select/select';
export const SelectWithInvalidData = ({ data, defaultValue, ...props }: SelectProps) => {
const { t } = useTranslation();
@ -9,12 +10,14 @@ export const SelectWithInvalidData = ({ data, defaultValue, ...props }: SelectPr
const [fullData, hasError] = useMemo(() => {
if (typeof defaultValue === 'string') {
const missingField =
data.find((item) =>
typeof item === 'string' ? item === defaultValue : item.value === defaultValue,
data?.find((item) =>
typeof item === 'string'
? item === defaultValue
: (item as any).value === defaultValue,
) === undefined;
if (missingField) {
return [data.concat(defaultValue), true];
return [data?.concat(defaultValue), true];
}
}
@ -40,11 +43,11 @@ export const MultiSelectWithInvalidData = ({ data, defaultValue, ...props }: Mul
const [fullData, missing] = useMemo(() => {
if (defaultValue?.length) {
const validValues = new Set<string>();
for (const item of data) {
for (const item of data || []) {
if (typeof item === 'string') {
validValues.add(item);
} else {
validValues.add(item.value);
validValues.add((item as any).value);
}
}
@ -57,7 +60,7 @@ export const MultiSelectWithInvalidData = ({ data, defaultValue, ...props }: Mul
}
if (missingFields.length > 0) {
return [data.concat(missingFields), missingFields];
return [data?.concat(missingFields), missingFields];
}
}