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.

Sign up for GitHub

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

Jump to bottom

imprv: display page tree in page select modal with scrollbar #8514

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+43 −15
Open

imprv: display page tree in page select modal with scrollbar #8514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a25cd85
add SimpleBar to PageSelectModal
WNomunomu Feb 22, 2024
7396be2
adjust padding of components
WNomunomu Feb 22, 2024
8fabc0b
clean codes
WNomunomu Feb 22, 2024
adbc160
fix css property
WNomunomu Feb 27, 2024
5f7145c
Merge branch 'dev/7.0.x' into imprv/140448-140833-display-PageTree-in…
WNomunomu Feb 27, 2024
df88172
clean codes
WNomunomu Feb 27, 2024
6db2555
use simplebar instead of StickyStretchableScroller
WNomunomu May 8, 2024
4922da2
Merge branch 'master' into imprv/140448-140833-display-PageTree-in-Pa…
WNomunomu May 8, 2024
a72d05a
fix conflict
WNomunomu May 8, 2024
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
2 changes: 1 addition & 1 deletion apps/app/src/components/ItemsTree/ItemsTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ export const ItemsTree = (props: ItemsTreeProps): JSX.Element => {

if (initialItemNode != null) {
return (
<ul className={`grw-pagetree ${styles['grw-pagetree']} list-group py-4`} ref={rootElemRef}>
<ul className={`grw-pagetree ${styles['grw-pagetree']} list-group`} ref={rootElemRef}>
<CustomTreeItem
key={initialItemNode.page.path}
targetPathOrId={targetPathOrId}
Expand Down
3 changes: 3 additions & 0 deletions apps/app/src/components/PageSelectModal/PageSelectModal.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.grw-page-select-modal-wrapper {
height: 50vh;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

これどこで使っているの？

Copy link
Contributor Author

@WNomunomu WNomunomu Feb 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PageSelectModalのPageSelectModalWrapperコンポーネントのheightを設定するために使っています。
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

scoped css にしてください

48 changes: 37 additions & 11 deletions apps/app/src/components/PageSelectModal/PageSelectModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { FC } from 'react';
import { Suspense, useState, useCallback } from 'react';
import {
Suspense, useState, useCallback, memo,
} from 'react';

import nodePath from 'path';

Expand All @@ -16,9 +18,29 @@ import { useCurrentPagePath, useCurrentPageId, useSWRxCurrentPage } from '~/stor
import { ItemsTree } from '../ItemsTree';
import ItemsTreeContentSkeleton from '../ItemsTree/ItemsTreeContentSkeleton';
import { usePagePathRenameHandler } from '../PageEditor/page-path-rename-utils';
import { StickyStretchableScroller } from '../StickyStretchableScroller';

import { TreeItemForModal } from './TreeItemForModal';

import 'simplebar';
import 'simplebar/dist/simplebar.css';

const TreeForModalWrapper = memo((props: { children: JSX.Element }) => {

const { children } = props;

const calcViewHeight = useCallback(() => {
return window.innerHeight / 2;
}, []);

return (
<div className="grw-page-select-modal-wrapper">
<div data-simplebar>
{ children }
</div>
</div>
);
});

export const PageSelectModal: FC = () => {
const {
Expand Down Expand Up @@ -83,17 +105,21 @@ export const PageSelectModal: FC = () => {
size="sm"
>
<ModalHeader toggle={closeModal}>{t('page_select_modal.select_page_location')}</ModalHeader>
<ModalBody>
<ModalBody className="p-0">
<Suspense fallback={<ItemsTreeContentSkeleton />}>
<ItemsTree
CustomTreeItem={TreeItemForModal}
isEnableActions={!isGuestUser}
isReadOnlyUser={!!isReadOnlyUser}
targetPath={path}
targetPathOrId={targetPathOrId}
targetAndAncestorsData={targetAndAncestorsData}
onClickTreeItem={onClickTreeItem}
/>
<TreeForModalWrapper>
<div className="p-3">
<ItemsTree
CustomTreeItem={TreeItemForModal}
isEnableActions={!isGuestUser}
isReadOnlyUser={!!isReadOnlyUser}
targetPath={path}
targetPathOrId={targetPathOrId}
targetAndAncestorsData={targetAndAncestorsData}
onClickTreeItem={onClickTreeItem}
/>
</div>
</TreeForModalWrapper>
</Suspense>
</ModalBody>
<ModalFooter>
Expand Down
5 changes: 2 additions & 3 deletions apps/app/src/components/Sidebar/PageTree/PageTreeSubstance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const PageTreeContent = memo(({ isWipPageShown }: PageTreeContentProps) =
const path = currentPath || '/';

return (
<>
<div className="py-3">
<ItemsTree
isEnableActions={!isGuestUser}
isReadOnlyUser={!!isReadOnlyUser}
Expand All @@ -116,15 +116,14 @@ export const PageTreeContent = memo(({ isWipPageShown }: PageTreeContentProps) =
targetAndAncestorsData={targetAndAncestorsData}
CustomTreeItem={PageTreeItem}
/>

{!isGuestUser && !isReadOnlyUser && migrationStatus?.migratablePagesCount != null && migrationStatus.migratablePagesCount !== 0 && (
<div className="grw-pagetree-footer border-top py-3 w-100">
<div className="private-legacy-pages-link px-3 py-2">
<PrivateLegacyPagesLink />
</div>
</div>
)}
</>
</div>
);
});

Expand Down
Loading