8000 Make share dialog scrollable by apoorv-mishra · Pull Request #7344 · outline/outline · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make share dialog scrollable #7344

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

Merged
merged 5 commits into from
Aug 4, 2024
Merged

Make share dialog scrollable #7344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2f95a9
fix: make share dialog scrollable
apoorv-mishra Aug 2, 2024
fb7e569
fix: rename
apoorv-mishra Aug 2, 2024
be5dd33
fix: mobile
apoorv-mishra Aug 3, 2024
a1b9175
fix: useMaxHeight margin calculation
tommoor Aug 4, 2024
153e61f
cleanup
tommoor Aug 4, 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
79 changes: 65 additions & 14 deletions ...aring/Collection/CollectionMemberList.tsx → .../Sharing/Collection/AccessControlList.tsx
View file
Open in desktop
subtitle={t("Everyone in the workspace")}
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { observer } from "mobx-react";
import { GroupIcon } from "outline-icons";
import { GroupIcon, UserIcon } from "outline-icons";
import * as React from "react";
import { useTranslation } from "react-i18next";
import { useTheme } from "styled-components";
import styled, { useTheme } from "styled-components";
import Squircle from "@shared/components/Squircle";
import { CollectionPermission } from "@shared/types";
import Collection from "~/models/Collection";
import Avatar, { AvatarSize } from "~/components/Avatar/Avatar";
import InputMemberPermissionSelect from "~/components/InputMemberPermissionSelect";
import InputSelectPermission from "~/components/InputSelectPermission";
import Scrollable from "~/components/Scrollable";
import useMaxHeight from "~/hooks/useMaxHeight";
import usePolicy from "~/hooks/usePolicy";
import useRequest from "~/hooks/useRequest";
import useStores from "~/hooks/useStores";
Expand All @@ -23,32 +25,43 @@ type Props = {
invitedInSession: string[];
};

function CollectionMemberList({ collection, invitedInSession }: Props) {
export function AccessControlList({ collection, invitedInSession }: Props) {
const { memberships, groupMemberships } = useStores();
const can = usePolicy(collection);
const { t } = useTranslation();
const theme = useTheme();
const collectionId = collection.id;

const { request: fetchMemberships } = useRequest(
const { request: fetchMemberships, data: membershipData } = useRequest(
React.useCallback(
() => memberships.fetchAll({ id: collectionId }),
[memberships, collectionId]
)
);

const { request: fetchGroupMemberships } = useRequest(
React.useCallback(
() => groupMemberships.fetchAll({ id: collectionId }),
[groupMemberships, collectionId]
)
);
const { request: fetchGroupMemberships, data: groupMembershipData } =
useRequest(
React.useCallback(
() => groupMemberships.fetchAll({ id: collectionId }),
[groupMemberships, collectionId]
)
);

React.useEffect(() => {
void fetchMemberships();
void fetchGroupMemberships();
}, [fetchMemberships, fetchGroupMemberships]);

const containerRef = React.useRef<HTMLDivElement | null>(null);
const { maxHeight, calcMaxHeight } = useMaxHeight({
elementRef: containerRef,
maxViewportPercentage: 70,
});

React.useEffect(() => {
calcMaxHeight();
});

const permissions = React.useMemo(
() =>
[
Expand All @@ -73,8 +86,43 @@ function CollectionMemberList({ collection, invitedInSession }: Props) {
[t]
);

if (!membershipData || !groupMembershipData) {
return null;
}

return (
<>
<ScrollableContainer
ref={containerRef}
hiddenScrollbars
style={{ maxHeight }}
>
<ListItem
image={
<Squircle color={theme.accent} size={AvatarSize.Medium}>
<UserIcon color={theme.accentText} size={16} />
</Squircle>
}
title={t("All members")}
actions={
<div style={{ marginRight: -8 }}>
<InputSelectPermission
style={{ margin: 0 }}
>
value: CollectionPermission | typeof EmptySelectValue
) => {
void collection.save({
permission: value === EmptySelectValue ? null : value,
});
}}
disabled={!can.update}
value={collection?.permission}
labelHidden
nude
/>
</div>
}
/>
{groupMemberships
.inCollection(collection.id)
.sort((a, b) =>
Expand Down Expand Up @@ -173,8 +221,11 @@ function CollectionMemberList({ collection, invitedInSession }: Props) {
}
/>
))}
</>
</ScrollableContainer>
);
}

export default observer(CollectionMemberList);
const ScrollableContainer = styled(Scrollable)`
padding: 12px 24px;
margin: -12px -24px;
`;
41 changes: 4 additions & 37 deletions app/components/Sharing/Collection/SharePopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
import { isEmail } from "class-validator";
import { m } from "framer-motion";
import { observer } from "mobx-react";
import { BackIcon, UserIcon } from "outline-icons";
import { BackIcon } from "outline-icons";
import * as React from "react";
import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import { useTheme } from "styled-components";
import Squircle from "@shared/components/Squircle";
import { CollectionPermission } from "@shared/types";
import Collection from "~/models/Collection";
import Group from "~/models/Group";
import User from "~/models/User";
import Avatar, { AvatarSize } from "~/components/Avatar/Avatar";
import InputSelectPermission from "~/components/InputSelectPermission";
import NudeButton from "~/components/NudeButton";
import { createAction } from "~/actions";
import { UserSection } from "~/actions/sections";
Expand All @@ -22,15 +19,14 @@ import useKeyDown from "~/hooks/useKeyDown";
import usePolicy from "~/hooks/usePolicy";
import usePrevious from "~/hooks/usePrevious";
import useStores from "~/hooks/useStores";
import { EmptySelectValue, Permission } from "~/types";
import { Permission } from "~/types";
import { collectionPath, urlify } from "~/utils/routeHelpers";
import { Wrapper, presence } from "../components";
import { CopyLinkButton } from "../components/CopyLinkButton";
import { ListItem } from "../components/ListItem";
import { PermissionAction } from "../components/PermissionAction";
import { SearchInput } from "../components/SearchInput";
import { Suggestions } from "../components/Suggestions";
import CollectionMemberList from "./CollectionMemberList";
import { AccessControlList } from "./AccessControlList";

type Props = {
/** The collection to share. */
Expand All @@ -42,7 +38,6 @@ type Props = {
};

function SharePopover({ collection, visible, onRequestClose }: Props) {
const theme = useTheme();
const team = useCurrentTeam();
const { groupMemberships, users, groups, memberships } = useStores();
const { t } = useTranslation();
Expand Down Expand Up @@ -367,35 +362,7 @@ function SharePopover({ collection, visible, onRequestClose }: Props) {
)}

<div style={{ display: picker ? "none" : "block" }}>
<ListItem
image={
<Squircle color={theme.accent} size={AvatarSize.Medium}>
<UserIcon color={theme.accentText} size={16} />
</Squircle>
}
title={t("All members")}
subtitle={t("Everyone in the workspace")}
actions={
<div style={{ marginRight: -8 }}>
<InputSelectPermission
style={{ margin: 0 }}
>
value: CollectionPermission | typeof EmptySelectValue
) => {
void collection.save({
permission: value === EmptySelectValue ? null : value,
});
}}
disabled={!can.update}
value={collection?.permission}
labelHidden
nude
/>
</div>
}
/>
Comment on lines -370 to -396
Copy link
Member Author

Choose a reason for hiding this comment

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

Note that these dispersed list items had to be colocated within a single component so as to wrap everything up inside a scrollable container.


<CollectionMemberList
<AccessControlList
collection={collection}
invitedInSession={invitedInSession}
/>
Expand Down
Loading
Loading
BB6
0