Approach to solve issue changed.
This commit is contained in:
parent
0f64f5ba1a
commit
09286137c2
@ -56,12 +56,6 @@ const Chat = (props) => {
|
|||||||
width,
|
width,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const [isMenuOpen, setMenuOpen] = useState(false);
|
|
||||||
|
|
||||||
const handleToggleMenu = () => {
|
|
||||||
setMenuOpen((prevState) => !prevState);
|
|
||||||
};
|
|
||||||
|
|
||||||
const userSentMessage = UserSentMessageCollection.findOne({ userId: Auth.userID, sent: true });
|
const userSentMessage = UserSentMessageCollection.findOne({ userId: Auth.userID, sent: true });
|
||||||
const { isChrome } = browserInfo;
|
const { isChrome } = browserInfo;
|
||||||
|
|
||||||
@ -73,7 +67,6 @@ const Chat = (props) => {
|
|||||||
<Styled.Chat
|
<Styled.Chat
|
||||||
isChrome={isChrome}
|
isChrome={isChrome}
|
||||||
data-test={isPublicChat ? 'publicChat' : 'privateChat'}
|
data-test={isPublicChat ? 'publicChat' : 'privateChat'}
|
||||||
className={isMenuOpen ? '' : 'no-padding'}
|
|
||||||
>
|
>
|
||||||
<Header
|
<Header
|
||||||
data-test="chatTitle"
|
data-test="chatTitle"
|
||||||
@ -83,7 +76,6 @@ const Chat = (props) => {
|
|||||||
'data-test': isPublicChat ? 'hidePublicChat' : 'hidePrivateChat',
|
'data-test': isPublicChat ? 'hidePublicChat' : 'hidePrivateChat',
|
||||||
label: title,
|
label: title,
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
handleToggleMenu;
|
|
||||||
layoutContextDispatch({
|
layoutContextDispatch({
|
||||||
type: ACTIONS.SET_SIDEBAR_CONTENT_IS_OPEN,
|
type: ACTIONS.SET_SIDEBAR_CONTENT_IS_OPEN,
|
||||||
value: false,
|
value: false,
|
||||||
|
@ -145,7 +145,7 @@ const CustomLayout = (props) => {
|
|||||||
sidebarNavPanel: sidebarNavigationInput.sidebarNavPanel,
|
sidebarNavPanel: sidebarNavigationInput.sidebarNavPanel,
|
||||||
},
|
},
|
||||||
sidebarContent: {
|
sidebarContent: {
|
||||||
isOpen: false,
|
isOpen: true,
|
||||||
sidebarContentPanel: sidebarContentInput.sidebarContentPanel,
|
sidebarContentPanel: sidebarContentInput.sidebarContentPanel,
|
||||||
},
|
},
|
||||||
sidebarContentHorizontalResizer: {
|
sidebarContentHorizontalResizer: {
|
||||||
|
@ -264,7 +264,7 @@ class SettingsDropdown extends PureComponent {
|
|||||||
icon: 'popout_window',
|
icon: 'popout_window',
|
||||||
label: intl.formatMessage(intlMessages.openAppLabel),
|
label: intl.formatMessage(intlMessages.openAppLabel),
|
||||||
onClick: () => mountModal(<MobileAppModal />),
|
onClick: () => mountModal(<MobileAppModal />),
|
||||||
}
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,11 +65,6 @@ const Notes = ({
|
|||||||
shouldShowSharedNotesOnPresentationArea,
|
shouldShowSharedNotesOnPresentationArea,
|
||||||
}) => {
|
}) => {
|
||||||
const [shouldRenderNotes, setShouldRenderNotes] = useState(false);
|
const [shouldRenderNotes, setShouldRenderNotes] = useState(false);
|
||||||
const [isNotesOpen, setNotesOpen] = useState(false);
|
|
||||||
|
|
||||||
const handleToggleNotes = () => {
|
|
||||||
setNotesOpen((prevState) => !prevState);
|
|
||||||
};
|
|
||||||
|
|
||||||
const { isChrome } = browserInfo;
|
const { isChrome } = browserInfo;
|
||||||
const isOnMediaArea = area === 'media';
|
const isOnMediaArea = area === 'media';
|
||||||
@ -177,13 +172,11 @@ const Notes = ({
|
|||||||
data-test="notes"
|
data-test="notes"
|
||||||
isChrome={isChrome}
|
isChrome={isChrome}
|
||||||
style={style}
|
style={style}
|
||||||
className={isNotesOpen ? '' : 'no-padding'}
|
|
||||||
>
|
>
|
||||||
{!isOnMediaArea ? (
|
{!isOnMediaArea ? (
|
||||||
<Header
|
<Header
|
||||||
leftButtonProps={{
|
leftButtonProps={{
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
handleToggleNotes;
|
|
||||||
layoutContextDispatch({
|
layoutContextDispatch({
|
||||||
type: ACTIONS.SET_SIDEBAR_CONTENT_IS_OPEN,
|
type: ACTIONS.SET_SIDEBAR_CONTENT_IS_OPEN,
|
||||||
value: false,
|
value: false,
|
||||||
|
@ -56,17 +56,11 @@ const SidebarContent = (props) => {
|
|||||||
const [isResizing, setIsResizing] = useState(false);
|
const [isResizing, setIsResizing] = useState(false);
|
||||||
const [resizeStartWidth, setResizeStartWidth] = useState(0);
|
const [resizeStartWidth, setResizeStartWidth] = useState(0);
|
||||||
const [resizeStartHeight, setResizeStartHeight] = useState(0);
|
const [resizeStartHeight, setResizeStartHeight] = useState(0);
|
||||||
const [isPollOpen, setPollOpen] = useState(false);
|
|
||||||
|
|
||||||
const handleTogglePoll = () => {
|
|
||||||
setPollOpen((prevState) => !prevState);
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isResizing) {
|
if (!isResizing) {
|
||||||
setResizableWidth(width);
|
setResizableWidth(width);
|
||||||
setResizableHeight(height);
|
setResizableHeight(height);
|
||||||
handleTogglePoll;
|
|
||||||
}
|
}
|
||||||
}, [width, height]);
|
}, [width, height]);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user