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

fix: made Group Chat Modal More Persistent #1339

Merged
merged 6 commits into from
Jul 2, 2024
Merged

fix: made Group Chat Modal More Persistent #1339

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7b85ab
fix: made Group Chat Modal More Persistent
abhishek-01k Jun 4, 2024
d6322c0
fix: prop issue fixed for UpdateUserProfileModal file as well
abhishek-01k Jun 7, 2024
0a9606a
fix: added closeModalOnClickAway to ChatView and UserProfile component
abhishek-01k Jun 12, 2024
adde0f0
fix: changed the name of the Modal ClickAway in Group Info and User P…
abhishek-01k Jun 24, 2024
9a48606
fix: pulled alpha changes to resolve conflicts on this branch
abhishek-01k Jul 1, 2024
490eddf
fix: changed the name of modal clickaway prop for user profile and ch…
abhishek-01k Jul 1, 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
4,826 changes: 1,711 additions & 3,115 deletions packages/restapi/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export interface IChatProfileUserInfo {
// Exported Functions
export const ChatProfile: React.FC<IChatProfile> = ({
chatId,
closeGroupInfoModalOnClickAway,
abhishek-01k marked this conversation as resolved.
Show resolved Hide resolved
groupInfoModalBackground = MODAL_BACKGROUND_TYPE.OVERLAY,
groupInfoModalPositionType = MODAL_POSITION_TYPE.GLOBAL,
chatProfileRightHelperComponent = null,
Expand Down Expand Up @@ -332,6 +333,7 @@ export const ChatProfile: React.FC<IChatProfile> = ({
<GroupInfoModal
theme={theme}
setModal={setModal}
closeModalOnClickAway={closeGroupInfoModalOnClickAway}
groupInfo={initialized.groupInfo!}
chatProfileInfo={initialized.profile}
setGroupInfo={(mutatedGroupInfo) =>
Expand Down
5 changes: 4 additions & 1 deletion packages/uiweb/src/lib/components/chat/ChatProfile/ChatProfileInfoModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ type GroupSectionProps = GroupInfoModalProps & {
type GroupInfoModalProps = {
theme: IChatTheme;
setModal: React.Dispatch<React.SetStateAction<boolean>>;
closeModalOnClickAway?: boolean;
groupInfo: Group;
setGroupInfo: React.Dispatch<React.SetStateAction<Group | null>>;
chatProfileInfo?: IChatProfileUserInfo;
Expand Down Expand Up @@ -461,6 +462,7 @@ const GroupInformation = ({
export const GroupInfoModal = ({
theme,
setModal,
closeModalOnClickAway,
setGroupInfo,
groupInfo,
chatProfileInfo,
Expand Down Expand Up @@ -927,7 +929,8 @@ export const GroupInfoModal = ({
if (chatProfileInfo) {
return (
<Modal
clickawayClose={onClose}
onClose={onClose}
closeonClickAway={closeModalOnClickAway}
modalBackground={groupInfoModalBackground}
modalPositionType={groupInfoModalPositionType}
>
Expand Down
6 changes: 4 additions & 2 deletions packages/uiweb/src/lib/components/chat/ChatView/ChatViewComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export const ChatViewComponent: React.FC<IChatViewComponentProps> = (options: IC
chatProfileRightHelperComponent = null,
chatProfileLeftHelperComponent = null,
welcomeComponent = null,
closeGroupInfoModalOnClickAway = false
} = options || {};

const { user } = useChatData();
Expand Down Expand Up @@ -109,6 +110,7 @@ export const ChatViewComponent: React.FC<IChatViewComponentProps> = (options: IC
>
<ChatProfile
key={chatId}
closeGroupInfoModalOnClickAway={closeGroupInfoModalOnClickAway}
chatProfileRightHelperComponent={chatProfileRightHelperComponent}
chatProfileLeftHelperComponent={chatProfileLeftHelperComponent}
chatId={initialized.derivedChatId}
Expand Down Expand Up @@ -170,12 +172,12 @@ export const ChatViewComponent: React.FC<IChatViewComponentProps> = (options: IC
};

//styles
const Conatiner = styled(Section)<IThemeProps>`
const Conatiner = styled(Section) <IThemeProps>`
border: ${(props) => props.theme.border?.chatViewComponent};
box-sizing: border-box;
`;

const ChatViewSection = styled(Section)<IThemeProps>`
const ChatViewSection = styled(Section) <IThemeProps>`
@media (${device.mobileL}) {
margin: 0;
}
Expand Down
4 changes: 3 additions & 1 deletion packages/uiweb/src/lib/components/chat/CreateGroup/CreateGroupModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export interface GroupInputDetailsType {

export const CreateGroupModal: React.FC<CreateGroupModalProps> = ({
onClose,
closeModalOnClickAway = false,
modalBackground = MODAL_BACKGROUND_TYPE.OVERLAY,
modalPositionType = MODAL_POSITION_TYPE.GLOBAL,
onSuccess,
Expand Down Expand Up @@ -257,7 +258,8 @@ export const CreateGroupModal: React.FC<CreateGroupModalProps> = ({

return (
<Modal
clickawayClose={onClose}
onClose={onClose} // onClose function to close the modal
closeonClickAway={closeModalOnClickAway} // boolean to handle the onClick activity of the user
modalBackground={modalBackground}
modalPositionType={modalPositionType}
>
Expand Down
5 changes: 4 additions & 1 deletion packages/uiweb/src/lib/components/chat/UserProfile/UpdateUserProfileModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type UpdateUserProfileModalProps = {
userProfile: IUser;
setUserProfile: React.Dispatch<React.SetStateAction<IUser | undefined>>;
setModal: React.Dispatch<React.SetStateAction<boolean>>;
closeProfileModalOnClickAway?: boolean;
updateUserProfileModalBackground?: ModalBackgroundType;
updateUserProfileModalPositionType?: ModalPositionType;
};
Expand All @@ -33,6 +34,7 @@ export interface UserProfileType {
export const UpdateUserProfileModal = ({
theme,
setModal,
closeProfileModalOnClickAway,
userProfile,
setUserProfile,
updateUserProfileModalBackground = MODAL_BACKGROUND_TYPE.OVERLAY,
Expand Down Expand Up @@ -161,7 +163,8 @@ export const UpdateUserProfileModal = ({

return (
<Modal
clickawayClose={onClose}
onClose={onClose}
closeonClickAway={closeProfileModalOnClickAway}
modalBackground={updateUserProfileModalBackground}
modalPositionType={updateUserProfileModalPositionType}
>
Expand Down
4 changes: 3 additions & 1 deletion packages/uiweb/src/lib/components/chat/UserProfile/UserProfile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export const UserProfile: React.FC<UserProfileProps> = ({
updateUserProfileModalBackground = MODAL_BACKGROUND_TYPE.OVERLAY,
updateUserProfileModalPositionType = MODAL_POSITION_TYPE.GLOBAL,
onUserProfileUpdateModalOpen,
closeProfileModalOnClickAway = false
abhishek-01k marked this conversation as resolved.
Show resolved Hide resolved
}) => {
const { user } = useChatData();
const [userProfile, setUserProfile] = useState<IUser>();
Expand Down Expand Up @@ -143,6 +144,7 @@ export const UserProfile: React.FC<UserProfileProps> = ({
<UpdateUserProfileModal
theme={theme}
setModal={setShowUpdateUserProfileModal}
closeProfileModalOnClickAway={closeProfileModalOnClickAway}
abhishek-01k marked this conversation as resolved.
Show resolved Hide resolved
userProfile={userProfile!}
setUserProfile={setUserProfile}
updateUserProfileModalBackground={updateUserProfileModalBackground}
Expand All @@ -155,7 +157,7 @@ export const UserProfile: React.FC<UserProfileProps> = ({
};

//styles
const Conatiner = styled(Section)<IThemeProps>`
const Conatiner = styled(Section) <IThemeProps>`
border: ${(props) => props.theme.border?.userProfile};
box-sizing: border-box;
`;
Expand Down
4 changes: 4 additions & 0 deletions packages/uiweb/src/lib/components/chat/exportedTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ export interface IChatViewComponentProps {
chatProfileRightHelperComponent?: React.ReactNode;
chatProfileLeftHelperComponent?: React.ReactNode;
welcomeComponent?: React.ReactNode;
closeGroupInfoModalOnClickAway?: boolean;
}

export interface IChatProfile {
chatId: string;
closeGroupInfoModalOnClickAway?: boolean;
groupInfoModalBackground?: ModalBackgroundType;
groupInfoModalPositionType?: ModalPositionType;
chatProfileRightHelperComponent?: React.ReactNode;
Expand Down Expand Up @@ -172,6 +174,7 @@ export interface User {

export interface CreateGroupModalProps {
onClose: () => void;
closeModalOnClickAway?: boolean;
modalBackground?: ModalBackgroundType;
modalPositionType?: ModalPositionType;
onSuccess?: (group: GroupInfoDTO | GroupDTO | undefined) => void;
Expand All @@ -181,6 +184,7 @@ export interface UserProfileProps {
updateUserProfileModalBackground?: ModalBackgroundType;
updateUserProfileModalPositionType?: ModalPositionType;
onUserProfileUpdateModalOpen?: (open: boolean) => void;
closeProfileModalOnClickAway?: boolean;
}

export interface ModalButtonProps {
Expand Down
17 changes: 10 additions & 7 deletions packages/uiweb/src/lib/components/chat/reusables/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import { device } from '../../../config';

interface IModalProps {
width?: string;
clickawayClose?: () => void;
onClose?: () => void;
closeonClickAway?: boolean;
children: any;
theme?: IChatTheme;
modalBackground?: ModalBackgroundType;
Expand All @@ -31,13 +32,13 @@ interface IModalHeader {
title: string;
}

const ClickawayCloseModal = ({ children, clickawayClose, width }: IModalProps) => {
const ClickawayCloseModal = ({ children, onClose, width, closeonClickAway }: IModalProps) => {
const modalRef = useRef(null);
const theme = useContext(ThemeContext);

useClickAway(modalRef, () => {
if (clickawayClose) {
clickawayClose();
if (onClose && closeonClickAway) {
onClose();
}
});

Expand All @@ -53,7 +54,8 @@ const ClickawayCloseModal = ({ children, clickawayClose, width }: IModalProps) =
};

export const Modal = ({
clickawayClose,
onClose,
closeonClickAway,
children,
width,
modalBackground = MODAL_BACKGROUND_TYPE.OVERLAY,
Expand All @@ -66,10 +68,11 @@ export const Modal = ({
modalBackground={modalBackground}
modalPositionType={modalPositionType}
>
{clickawayClose ? (
{closeonClickAway ? (
<ClickawayCloseModal
clickawayClose={clickawayClose}
onClose={onClose}
width={width}
closeonClickAway={closeonClickAway}
>
{children}
</ClickawayCloseModal>
Expand Down
Loading
Loading