Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): restore lost activation state of sidebar menu items #6520

Merged
merged 1 commit into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useBlockSuitePageReferences } from '@affine/core/hooks/use-block-suite-page-references';
import { Workbench } from '@affine/core/modules/workbench';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
import type { DocCollection, DocMeta } from '@blocksuite/store';
import { useDraggable } from '@dnd-kit/core';
import * as Collapsible from '@radix-ui/react-collapsible';
import { PageRecordList, useLiveData, useService } from '@toeverything/infra';
import React, { useCallback, useMemo } from 'react';
import { useParams } from 'react-router-dom';

import {
type DNDIdentifier,
Expand Down Expand Up @@ -35,12 +35,13 @@ export const Page = ({
allPageMeta: Record<string, DocMeta>;
}) => {
const [collapsed, setCollapsed] = React.useState(true);
const params = useParams();
const workbench = useService(Workbench);
const location = useLiveData(workbench.location$);

const t = useAFFiNEI18N();

const pageId = page.id;
const active = params.pageId === pageId;
const active = location.pathname === '/' + pageId;
const pageRecord = useLiveData(useService(PageRecordList).record$(pageId));
const pageMode = useLiveData(pageRecord?.mode$);
const dragItemId = getDNDId('collection-list', 'doc', pageId, parentId);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useBlockSuitePageReferences } from '@affine/core/hooks/use-block-suite-page-references';
import { Workbench } from '@affine/core/modules/workbench';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
import type { DocCollection, DocMeta } from '@blocksuite/store';
import * as Collapsible from '@radix-ui/react-collapsible';
import { PageRecordList, useLiveData, useService } from '@toeverything/infra';
import { useMemo, useState } from 'react';
import { useParams } from 'react-router-dom';

import { MenuLinkItem } from '../../../app-sidebar';
import * as styles from '../favorite/styles.css';
Expand All @@ -24,8 +24,9 @@ export const ReferencePage = ({
parentIds,
}: ReferencePageProps) => {
const t = useAFFiNEI18N();
const params = useParams();
const active = params.pageId === pageId;
const workbench = useService(Workbench);
const location = useLiveData(workbench.location$);
const active = location.pathname === '/' + pageId;

const pageRecord = useLiveData(useService(PageRecordList).record$(pageId));
const pageMode = useLiveData(pageRecord?.mode$);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import {
parseDNDId,
} from '@affine/core/hooks/affine/use-global-dnd-helper';
import { useBlockSuitePageReferences } from '@affine/core/hooks/use-block-suite-page-references';
import { Workbench } from '@affine/core/modules/workbench';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { EdgelessIcon, PageIcon } from '@blocksuite/icons';
import { type AnimateLayoutChanges, useSortable } from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
import * as Collapsible from '@radix-ui/react-collapsible';
import { PageRecordList, useLiveData, useService } from '@toeverything/infra';
import { useMemo, useState } from 'react';
import { useParams } from 'react-router-dom';

import { MenuLinkItem } from '../../../app-sidebar';
import { DragMenuItemOverlay } from '../components/drag-menu-item-overlay';
Expand All @@ -33,8 +33,9 @@ export const FavouriteDocSidebarNavItem = ({
sortable?: boolean;
}) => {
const t = useAFFiNEI18N();
const params = useParams();
const linkActive = params.pageId === pageId;
const workbench = useService(Workbench);
const location = useLiveData(workbench.location$);
const linkActive = location.pathname === '/' + pageId;
const pageRecord = useLiveData(useService(PageRecordList).record$(pageId));
const pageMode = useLiveData(pageRecord?.mode$);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import {
useJournalInfoHelper,
useJournalRouteHelper,
} from '@affine/core/hooks/use-journal';
import { Workbench } from '@affine/core/modules/workbench';
import type { DocCollection } from '@affine/core/shared';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import { TodayIcon, TomorrowIcon, YesterdayIcon } from '@blocksuite/icons';
import { Doc, useServiceOptional } from '@toeverything/infra';
import { useParams } from 'react-router-dom';
import { useLiveData, useService } from '@toeverything/infra';

import { MenuItem } from '../app-sidebar';

Expand All @@ -18,17 +18,16 @@ export const AppSidebarJournalButton = ({
docCollection,
}: AppSidebarJournalButtonProps) => {
const t = useAFFiNEI18N();
const currentPage = useServiceOptional(Doc);
const workbench = useService(Workbench);
const location = useLiveData(workbench.location$);
const { openToday } = useJournalRouteHelper(docCollection);
const { journalDate, isJournal } = useJournalInfoHelper(
docCollection,
currentPage?.id
location.pathname.split('/')[1]
);
const params = useParams();
const isJournalActive = isJournal && !!params.pageId;

const Icon =
isJournalActive && journalDate
isJournal && journalDate
? journalDate.isBefore(new Date(), 'day')
? YesterdayIcon
: journalDate.isAfter(new Date(), 'day')
Expand All @@ -39,7 +38,7 @@ export const AppSidebarJournalButton = ({
return (
<MenuItem
data-testid="slider-bar-journals-button"
active={isJournalActive}
active={isJournal}
onClick={openToday}
icon={<Icon />}
>
Expand Down
Loading