opensource/AppFlowy-Web
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy-Web.git synced 2025-11-29 19:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace old token (#3)

Browse Source 
* chore: replace old token

* chore: modified sorts

* chore: replace some icons
This commit is contained in:
Kilu.He
2025-06-18 16:26:36 +08:00
committed by GitHub
parent 748f790771
commit fbac42686b
40 changed files with 363 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/application/database-yjs/selector.ts
View File

@@ -591,6 +591,7 @@ export function useRowsByGroup(groupId: string) {
const [groupResult, setGroupResult] = useState<Map<string, Row[]>>(new Map());
const view = useDatabaseView();
const layoutSetting = view?.get(YjsDatabaseKey.layout_settings)?.get('1');
const filters = view?.get(YjsDatabaseKey.filters);
useEffect(() => {
if (!fieldId || !rowOrders || !rows) return;
@@ -606,6 +607,7 @@ export function useRowsByGroup(groupId: string) {
return;
}
const fieldType = Number(field.get(YjsDatabaseKey.type)) as FieldType;
if (![FieldType.SingleSelect, FieldType.MultiSelect, FieldType.Checkbox].includes(fieldType)) {
@@ -613,8 +615,10 @@ export function useRowsByGroup(groupId: string) {
setGroupResult(newResult);
return;
}
const filter = filters?.toArray().find((filter) => filter.get(YjsDatabaseKey.field_id) === fieldId);
const groupResult = groupByField(rowOrders, rows, field);
const groupResult = groupByField(rowOrders, rows, field, filter);
if (!groupResult) {
setGroupResult(newResult);
@@ -627,10 +631,12 @@ export function useRowsByGroup(groupId: string) {
onConditionsChange();
fields.observeDeep(onConditionsChange);
filters?.observeDeep(onConditionsChange);
return () => {
fields.unobserveDeep(onConditionsChange);
filters?.unobserveDeep(onConditionsChange);
};
}, [fieldId, fields, rowOrders, rows]);
}, [fieldId, fields, rowOrders, rows, filters]);
useEffect(() => {
const observeEvent = () => {
@@ -680,7 +686,6 @@ export function useRowOrdersSelector() {
if (sorts?.length) {
rowOrders = sortBy(originalRowOrders, sorts, fields, rows);
}
if (filters?.length) {