Merge pull request #18351 from Scroody/fix-warnings
Fix: Warnings when creating a new meeting
This commit is contained in:
commit
5bb012a6a9
@ -403,7 +403,7 @@ class ActionsDropdown extends PureComponent {
|
||||
<BBBMenu
|
||||
customStyles={!isMobile ? customStyles : null}
|
||||
accessKey={OPEN_ACTIONS_AK}
|
||||
trigger={
|
||||
trigger={(
|
||||
<Styled.HideDropdownButton
|
||||
open={isDropdownOpen}
|
||||
hideLabel
|
||||
@ -416,7 +416,7 @@ class ActionsDropdown extends PureComponent {
|
||||
circle
|
||||
onClick={() => null}
|
||||
/>
|
||||
}
|
||||
)}
|
||||
actions={children}
|
||||
opts={{
|
||||
id: 'actions-dropdown-menu',
|
||||
|
@ -82,7 +82,7 @@ const ReactionsButton = (props) => {
|
||||
keepMounted: true,
|
||||
transitionDuration: 0,
|
||||
elevation: 3,
|
||||
getContentAnchorEl: null,
|
||||
getcontentanchorel: null,
|
||||
anchorOrigin: { vertical: 'top', horizontal: 'center' },
|
||||
transformOrigin: { vertical: 'bottom', horizontal: 'center' },
|
||||
}}
|
||||
|
@ -92,14 +92,16 @@ const AppContainer = (props) => {
|
||||
|
||||
const { focusedId } = cameraDock;
|
||||
|
||||
if(
|
||||
layoutContextDispatch
|
||||
&& (typeof meetingLayout != "undefined")
|
||||
&& (layoutType.current != meetingLayout)
|
||||
useEffect(() => {
|
||||
if (
|
||||
layoutContextDispatch
|
||||
&& (typeof meetingLayout !== 'undefined')
|
||||
&& (layoutType.current !== meetingLayout)
|
||||
) {
|
||||
layoutType.current = meetingLayout;
|
||||
MediaService.setPresentationIsOpen(layoutContextDispatch, true);
|
||||
}
|
||||
}
|
||||
}, [meetingLayout, layoutContextDispatch, layoutType]);
|
||||
|
||||
const horizontalPosition = cameraDock.position === 'contentLeft' || cameraDock.position === 'contentRight';
|
||||
// this is not exactly right yet
|
||||
@ -140,7 +142,8 @@ const AppContainer = (props) => {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
MediaService.buildLayoutWhenPresentationAreaIsDisabled(layoutContextDispatch)});
|
||||
MediaService.buildLayoutWhenPresentationAreaIsDisabled(layoutContextDispatch)
|
||||
});
|
||||
|
||||
return currentUserId
|
||||
? (
|
||||
|
@ -100,7 +100,7 @@ class BBBMenu extends React.Component {
|
||||
const { actions, selectedEmoji, intl } = this.props;
|
||||
|
||||
return actions?.map(a => {
|
||||
const { dataTest, label, onClick, key, disabled, accessKey, description, selected } = a;
|
||||
const { dataTest, label, onClick, key, disabled, description, selected } = a;
|
||||
const emojiSelected = key?.toLowerCase()?.includes(selectedEmoji?.toLowerCase());
|
||||
|
||||
let customStyles = {
|
||||
@ -143,7 +143,7 @@ class BBBMenu extends React.Component {
|
||||
</Styled.BBBMenuItem>,
|
||||
a.divider && <Divider disabled />
|
||||
];
|
||||
});
|
||||
}) ?? [];
|
||||
}
|
||||
|
||||
render() {
|
||||
@ -247,18 +247,7 @@ BBBMenu.propTypes = {
|
||||
|
||||
trigger: PropTypes.element.isRequired,
|
||||
|
||||
actions: PropTypes.arrayOf(PropTypes.shape({
|
||||
key: PropTypes.string.isRequired,
|
||||
label: PropTypes.string.isRequired,
|
||||
onClick: PropTypes.func,
|
||||
icon: PropTypes.string,
|
||||
iconRight: PropTypes.string,
|
||||
disabled: PropTypes.bool,
|
||||
divider: PropTypes.bool,
|
||||
dividerTop: PropTypes.bool,
|
||||
accessKey: PropTypes.string,
|
||||
dataTest: PropTypes.string,
|
||||
})).isRequired,
|
||||
actions: PropTypes.array.isRequired,
|
||||
|
||||
onCloseCallback: PropTypes.func,
|
||||
dataTest: PropTypes.string,
|
||||
|
@ -19,7 +19,7 @@ const BaseModal = (props) => {
|
||||
}, []);
|
||||
useEffect(() => {
|
||||
// Only add event listener if name is specified
|
||||
if (!modalName) return;
|
||||
if (!modalName) return () => null;
|
||||
|
||||
const closeEventName = `CLOSE_MODAL_${modalName.toUpperCase()}`;
|
||||
|
||||
@ -28,7 +28,7 @@ const BaseModal = (props) => {
|
||||
|
||||
// Remove listener on unmount
|
||||
return () => {
|
||||
document.removeEventListener(closeEventName, closeEventHandler);
|
||||
document.removeEventListener(closeEventName, closeEventHandler);
|
||||
};
|
||||
}, []);
|
||||
const priorityValue = priority || 'low';
|
||||
|
@ -114,7 +114,7 @@ const Adapter = () => {
|
||||
}, [usingUsersContext]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!Meteor.status().connected) return;
|
||||
if (!Meteor.status().connected) return () => null;
|
||||
setSync(false);
|
||||
dispatch({
|
||||
type: ACTIONS.CLEAR_ALL,
|
||||
|
@ -20,7 +20,6 @@ const Adapter = () => {
|
||||
},
|
||||
});
|
||||
}, []);
|
||||
return null;
|
||||
};
|
||||
|
||||
export default Adapter;
|
||||
|
@ -64,7 +64,7 @@ const CustomLayout = (props) => {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (deviceType === null) return;
|
||||
if (deviceType === null) return () => null;
|
||||
|
||||
if (deviceType !== prevDeviceType) {
|
||||
// reset layout if deviceType changed
|
||||
|
@ -64,7 +64,7 @@ const PresentationFocusLayout = (props) => {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (deviceType === null) return;
|
||||
if (deviceType === null) return () => null;
|
||||
|
||||
if (deviceType !== prevDeviceType) {
|
||||
// reset layout if deviceType changed
|
||||
|
@ -59,7 +59,7 @@ const SmartLayout = (props) => {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (deviceType === null) return;
|
||||
if (deviceType === null) return () => null;
|
||||
|
||||
if (deviceType !== prevDeviceType) {
|
||||
// reset layout if deviceType changed
|
||||
|
@ -67,7 +67,7 @@ const VideoFocusLayout = (props) => {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (deviceType === null) return;
|
||||
if (deviceType === null) return () => null;
|
||||
|
||||
if (deviceType !== prevDeviceType) {
|
||||
// reset layout if deviceType changed
|
||||
|
@ -139,7 +139,7 @@ class PresentationDownloadDropdown extends PureComponent {
|
||||
keepMounted: true,
|
||||
transitionDuration: 0,
|
||||
elevation: 2,
|
||||
getContentAnchorEl: null,
|
||||
getcontentanchorel: null,
|
||||
fullwidth: 'true',
|
||||
anchorOrigin: { vertical: 'bottom', horizontal: isRTL ? 'right' : 'left' },
|
||||
transformOrigin: { vertical: 'top', horizontal: isRTL ? 'right' : 'left' },
|
||||
|
@ -65,9 +65,6 @@ const SidebarContent = (props) => {
|
||||
}
|
||||
}, [width, height]);
|
||||
|
||||
useEffect(() => {
|
||||
}, [resizeStartWidth, resizeStartHeight]);
|
||||
|
||||
const setSidebarContentSize = (dWidth, dHeight) => {
|
||||
const newWidth = resizeStartWidth + dWidth;
|
||||
const newHeight = resizeStartHeight + dHeight;
|
||||
|
@ -46,9 +46,6 @@ const SidebarNavigation = (props) => {
|
||||
if (!isResizing) setResizableWidth(width);
|
||||
}, [width]);
|
||||
|
||||
useEffect(() => {
|
||||
}, [resizeStartWidth]);
|
||||
|
||||
const setSidebarNavWidth = (dWidth) => {
|
||||
const newWidth = resizeStartWidth + dWidth;
|
||||
|
||||
|
@ -13,8 +13,6 @@ import SubscriptionRegistry, { subscriptionReactivity } from '../../services/sub
|
||||
import { isChatEnabled } from '/imports/ui/services/features';
|
||||
|
||||
const CHAT_CONFIG = Meteor.settings.public.chat;
|
||||
const PUBLIC_GROUP_CHAT_ID = CHAT_CONFIG.public_group_id;
|
||||
const PUBLIC_CHAT_TYPE = CHAT_CONFIG.type_public;
|
||||
const TYPING_INDICATOR_ENABLED = CHAT_CONFIG.typingIndicator.enabled;
|
||||
const SUBSCRIPTIONS = [
|
||||
'users', 'meetings', 'polls', 'presentations', 'slides', 'slide-positions', 'captions',
|
||||
|
@ -12,13 +12,10 @@ const trackName = Meteor.settings.public.timer.music;
|
||||
const TAB_TIMER_INDICATOR = Meteor.settings.public.timer.tabIndicator;
|
||||
|
||||
const propTypes = {
|
||||
intl: PropTypes.shape({
|
||||
formatMessage: PropTypes.func.isRequired,
|
||||
}).isRequired,
|
||||
timer: PropTypes.shape({
|
||||
stopwatch: PropTypes.bool,
|
||||
running: PropTypes.bool,
|
||||
time: PropTypes.string,
|
||||
time: PropTypes.number,
|
||||
accumulated: PropTypes.number,
|
||||
timestamp: PropTypes.number,
|
||||
}).isRequired,
|
||||
@ -28,7 +25,7 @@ const propTypes = {
|
||||
sidebarContentIsOpen: PropTypes.bool.isRequired,
|
||||
timeOffset: PropTypes.number.isRequired,
|
||||
isModerator: PropTypes.bool.isRequired,
|
||||
currentTrack: PropTypes.string.isRequired,
|
||||
currentTrack: PropTypes.bool.isRequired,
|
||||
};
|
||||
|
||||
class Indicator extends Component {
|
||||
|
@ -12,7 +12,7 @@ export const usePreviousValue = (value) => {
|
||||
ref.current = value;
|
||||
});
|
||||
return ref.current;
|
||||
}
|
||||
};
|
||||
|
||||
export default {
|
||||
usePreviousValue,
|
||||
|
@ -14,7 +14,6 @@ import Settings from '/imports/ui/services/settings';
|
||||
|
||||
const ENABLE_WEBCAM_SELECTOR_BUTTON = Meteor.settings.public.app.enableWebcamSelectorButton;
|
||||
const ENABLE_CAMERA_BRIGHTNESS = Meteor.settings.public.app.enableCameraBrightness;
|
||||
const isSelfViewDisabled = Settings.application.selfViewDisable;
|
||||
|
||||
const intlMessages = defineMessages({
|
||||
videoSettings: {
|
||||
|
Loading…
Reference in New Issue
Block a user