feat(base/ui): updated BUTTON_TYPES imports based upon native or web

react/features/base/dialog/components/web/ModalHeader.tsx

@@ -18,7 +18,7 @@ import { translate } from '../../../i18n/functions';
 import { IconCloseLarge } from '../../../icons/svg';
 import { withPixelLineHeight } from '../../../styles/functions.web';
 import Button from '../../../ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../ui/constants';
+import { BUTTON_TYPES } from '../../../ui/constants.web';
 
 const TitleIcon = ({ appearance }: { appearance?: 'danger' | 'warning'; }) => {
     if (!appearance) {

react/features/base/dialog/components/web/StatelessDialog.tsx

@@ -7,7 +7,7 @@ import { WithTranslation } from 'react-i18next';
 
 import { translate } from '../../../i18n/functions';
 import Button from '../../../ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../ui/constants';
+import { BUTTON_TYPES } from '../../../ui/constants.web';
 import type { DialogProps } from '../../constants';
 
 import ModalHeader from './ModalHeader';

react/features/base/ui/components/native/Button.tsx

@@ -6,7 +6,7 @@ import {
     TouchableRipple
 } from 'react-native-paper';
 
-import { BUTTON_MODES, BUTTON_TYPES } from '../../constants';
+import { BUTTON_MODES, BUTTON_TYPES } from '../../constants.native';
 import BaseTheme from '../BaseTheme.native';
 import { IButtonProps } from '../types';
 

react/features/base/ui/components/native/IconButton.tsx

@@ -6,7 +6,7 @@ import Icon from '../../../icons/components/Icon';
 // @ts-ignore
 import styles from '../../../react/components/native/styles';
 import { IIconButtonProps } from '../../../react/types';
-import { BUTTON_TYPES } from '../../constants';
+import { BUTTON_TYPES } from '../../constants.native';
 import BaseTheme from '../BaseTheme.native';
 
 

react/features/base/ui/components/types.ts

@@ -1,6 +1,6 @@
 import { GestureResponderEvent } from 'react-native';
 
-import { BUTTON_TYPES } from '../constants';
+import { BUTTON_TYPES } from '../constants.any';
 
 export interface IButtonProps {
 

react/features/base/ui/components/web/Button.tsx

@@ -5,7 +5,7 @@ import { makeStyles } from 'tss-react/mui';
 
 import Icon from '../../../icons/components/Icon';
 import { withPixelLineHeight } from '../../../styles/functions.web';
-import { BUTTON_TYPES } from '../../constants';
+import { BUTTON_TYPES } from '../../constants.web';
 import { IButtonProps } from '../types';
 
 interface IProps extends IButtonProps {

react/features/conference/components/native/LonelyMeetingExperience.js

@@ -7,7 +7,7 @@ import { Icon, IconAddUser } from '../../../base/icons';
 import { getParticipantCountWithFake } from '../../../base/participants';
 import { connect } from '../../../base/redux';
 import Button from '../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
 import { doInvitePeople } from '../../../invite/actions.native';
 

react/features/conference/components/native/carmode/EndMeetingButton.tsx

@@ -4,10 +4,9 @@ import { useDispatch } from 'react-redux';
 
 import { createToolbarEvent } from '../../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../../analytics/functions';
-// @ts-ignore
-import { appNavigate } from '../../../../app/actions';
+import { appNavigate } from '../../../../app/actions.native';
 import Button from '../../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../base/ui/constants.native';
 
 import EndMeetingIcon from './EndMeetingIcon';
 // @ts-ignore

react/features/conference/components/native/carmode/SoundDeviceButton.tsx

@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
 
 import { openSheet } from '../../../../base/dialog/actions';
 import Button from '../../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../base/ui/constants.native';
 // @ts-ignore
 import AudioRoutePickerDialog from '../../../../mobile/audio-mode/components/AudioRoutePickerDialog';
 

react/features/deep-linking/components/DeepLinkingDesktopPage.web.js

@@ -9,7 +9,7 @@ import { isSupportedBrowser } from '../../base/environment';
 import { translate } from '../../base/i18n';
 import { connect } from '../../base/redux';
 import Button from '../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../base/ui/constants';
+import { BUTTON_TYPES } from '../../base/ui/constants.web';
 import {
     openDesktopApp,
     openWebApp

react/features/lobby/components/native/LobbyScreen.js

@@ -10,7 +10,7 @@ import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { BrandingImageBackground } from '../../../dynamic-branding/components/native';
 import { LargeVideo } from '../../../large-video/components';
 import { navigate }

react/features/participants-pane/components/breakout-rooms/components/native/AddBreakoutRoomButton.tsx

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 
 import Button from '../../../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../../base/ui/constants.native';
 import { createBreakoutRoom } from '../../../../../breakout-rooms/actions';
 
 // @ts-ignore

react/features/participants-pane/components/breakout-rooms/components/native/AutoAssignButton.tsx

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 
 import Button from '../../../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../../base/ui/constants.native';
 import { autoAssignToBreakoutRooms } from '../../../../../breakout-rooms/actions';
 
 // @ts-ignore

react/features/participants-pane/components/breakout-rooms/components/native/LeaveBreakoutRoomButton.tsx

@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
 import { createBreakoutRoomsEvent } from '../../../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../../../analytics/functions';
 import Button from '../../../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../../base/ui/constants.native';
 import { moveToRoom } from '../../../../../breakout-rooms/actions';
 
 // @ts-ignore

react/features/participants-pane/components/breakout-rooms/components/web/AddBreakoutRoomButton.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 
 import Button from '../../../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../../base/ui/constants.web';
 import { createBreakoutRoom } from '../../../../../breakout-rooms/actions';
 
 export const AddBreakoutRoomButton = () => {

react/features/participants-pane/components/breakout-rooms/components/web/AutoAssignButton.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 
 import Button from '../../../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../../base/ui/constants.web';
 import { autoAssignToBreakoutRooms } from '../../../../../breakout-rooms/actions';
 
 export const AutoAssignButton = () => {

react/features/participants-pane/components/breakout-rooms/components/web/LeaveButton.tsx

@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
 import { createBreakoutRoomsEvent } from '../../../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../../../analytics/functions';
 import Button from '../../../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../../base/ui/constants.web';
 import { moveToRoom } from '../../../../../breakout-rooms/actions';
 
 export const LeaveButton = () => {

react/features/participants-pane/components/native/LobbyParticipantItem.js

@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
 
 import { hasRaisedHand } from '../../../base/participants';
 import Button from '../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { approveKnockingParticipant } from '../../../lobby/actions.native';
 import { showContextMenuReject } from '../../actions.native';
 import { MEDIA_STATE } from '../../constants';

react/features/participants-pane/components/native/LobbyParticipantList.js

@@ -6,7 +6,7 @@ import { ScrollView, Text, View } from 'react-native';
 import { useDispatch, useSelector } from 'react-redux';
 
 import Button from '../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { admitMultiple } from '../../../lobby/actions.native';
 import { getKnockingParticipants, getLobbyEnabled } from '../../../lobby/functions';
 

react/features/participants-pane/components/native/MeetingParticipantList.js

@@ -10,7 +10,7 @@ import { getLocalParticipant, getParticipantCountWithFake, getRemoteParticipants
 import { connect } from '../../../base/redux';
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { getBreakoutRooms, getCurrentRoomId } from '../../../breakout-rooms/functions';
 import { doInvitePeople } from '../../../invite/actions.native';
 import { participantMatchesSearch, shouldRenderInviteButton } from '../../functions';

react/features/participants-pane/components/native/ParticipantsPaneFooter.tsx

@@ -7,7 +7,7 @@ import { openDialog, openSheet } from '../../../base/dialog/actions';
 import { IconDotsHorizontal } from '../../../base/icons/svg';
 import Button from '../../../base/ui/components/native/Button';
 import IconButton from '../../../base/ui/components/native/IconButton';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 // @ts-ignore
 import MuteEveryoneDialog from '../../../video-menu/components/native/MuteEveryoneDialog';
 import { isMoreActionsVisible, isMuteAllVisible } from '../../functions';

react/features/participants-pane/components/web/InviteButton.tsx

@@ -6,7 +6,7 @@ import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../analytics/functions';
 import { IconAddUser } from '../../../base/icons/svg';
 import Button from '../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { beginAddPeople } from '../../../invite';

react/features/participants-pane/components/web/LobbyParticipantItem.tsx

@@ -1,3 +1,5 @@
+// eslint-disable-next-line lines-around-comment
+
 import { Theme } from '@mui/material';
 import React, { useCallback, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -10,7 +12,7 @@ import { IParticipant } from '../../../base/participants/types';
 import Button from '../../../base/ui/components/web/Button';
 import ContextMenu from '../../../base/ui/components/web/ContextMenu';
 import ContextMenuItemGroup from '../../../base/ui/components/web/ContextMenuItemGroup';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 // eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { showLobbyChatButton } from '../../../lobby/functions';

react/features/participants-pane/components/web/ParticipantsPane.tsx

@@ -12,12 +12,12 @@ import { IconCloseLarge, IconDotsHorizontal } from '../../../base/icons/svg';
 import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import Button from '../../../base/ui/components/web/Button';
 import ClickableIcon from '../../../base/ui/components/web/ClickableIcon';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 import { findAncestorByClass } from '../../../base/ui/functions.web';
 import { isAddBreakoutRoomButtonVisible } from '../../../breakout-rooms/functions';
 // @ts-ignore
 import { MuteEveryoneDialog } from '../../../video-menu/components/';
-import { close } from '../../actions';
+import { close } from '../../actions.web';
 import {
     getParticipantsPaneOpen,
     isMoreActionsVisible,

react/features/polls/components/native/PollAnswer.tsx

@@ -6,7 +6,7 @@ import { useSelector } from 'react-redux';
 import { getLocalParticipant } from '../../../base/participants/functions';
 import Button from '../../../base/ui/components/native/Button';
 import Switch from '../../../base/ui/components/native/Switch';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { isSubmitAnswerDisabled } from '../../functions';
 import AbstractPollAnswer, { AbstractProps } from '../AbstractPollAnswer';
 

react/features/polls/components/native/PollCreate.js

@@ -4,7 +4,7 @@ import { Divider, TouchableRipple } from 'react-native-paper';
 
 import Button from '../../../base/ui/components/native/Button';
 import Input from '../../../base/ui/components/native/Input';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import styles
     from '../../../settings/components/native/styles';
 import { ANSWERS_LIMIT, CHAR_LIMIT } from '../../constants';

react/features/polls/components/native/PollsPane.js

@@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
 
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import Button from '../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { getUnreadPollCount } from '../../functions';
 import AbstractPollsPane from '../AbstractPollsPane';
 import type { AbstractProps } from '../AbstractPollsPane';

react/features/polls/components/web/PollAnswer.tsx

@@ -5,7 +5,7 @@ import { makeStyles } from 'tss-react/mui';
 
 import Button from '../../../base/ui/components/web/Button';
 import Checkbox from '../../../base/ui/components/web/Checkbox';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 import { isSubmitAnswerDisabled } from '../../functions';
 import AbstractPollAnswer, { AbstractProps } from '../AbstractPollAnswer';
 

react/features/polls/components/web/PollCreate.tsx

@@ -8,7 +8,7 @@ import { IconBurger } from '../../../base/icons/svg';
 // @ts-ignore
 import { Tooltip } from '../../../base/tooltip';
 import Button from '../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 import { ANSWERS_LIMIT, CHAR_LIMIT } from '../../constants';
 // @ts-ignore
 import AbstractPollCreate from '../AbstractPollCreate';

react/features/reactions/components/native/RaiseHandButton.js

@@ -18,7 +18,7 @@ import {
 import { connect } from '../../../base/redux';
 import { type AbstractButtonProps } from '../../../base/toolbox/components';
 import Button from '../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 
 import styles from './styles';
 

react/features/recording/components/Recording/native/HighlightDialog.js

@@ -5,7 +5,7 @@ import { batch, useDispatch } from 'react-redux';
 
 import { BottomSheet, hideSheet } from '../../../../base/dialog';
 import Button from '../../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../base/ui/constants.native';
 import { highlightMeetingMoment } from '../../../actions.any';
 import styles from '../styles.native';
 

react/features/recording/components/Recording/native/StartRecordingDialogContent.tsx

@@ -9,7 +9,7 @@ import { LoadingIndicator } from '../../../../base/react';
 import { connect } from '../../../../base/redux/functions';
 import Button from '../../../../base/ui/components/native/Button';
 import Switch from '../../../../base/ui/components/native/Switch';
-import { BUTTON_TYPES } from '../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../base/ui/constants.native';
 import { RECORDING_TYPES } from '../../../constants';
 // @ts-ignore
 import { getRecordingDurationEstimation } from '../../../functions';

react/features/recording/components/Recording/web/StartRecordingDialogContent.tsx

@@ -12,7 +12,7 @@ import {
 import { connect } from '../../../../base/redux/functions';
 import Button from '../../../../base/ui/components/web/Button';
 import Switch from '../../../../base/ui/components/web/Switch';
-import { BUTTON_TYPES } from '../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../base/ui/constants.web';
 import { RECORDING_TYPES } from '../../../constants';
 // @ts-ignore
 import { getRecordingDurationEstimation } from '../../../functions';

react/features/security/components/security-dialog/native/SecurityDialog.js

@@ -13,7 +13,7 @@ import { connect } from '../../../../base/redux';
 import Button from '../../../../base/ui/components/native/Button';
 import Input from '../../../../base/ui/components/native/Input';
 import Switch from '../../../../base/ui/components/native/Switch';
-import { BUTTON_TYPES } from '../../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../../base/ui/constants.native';
 import { copyText } from '../../../../base/util/copyText.native';
 import { isInBreakoutRoom } from '../../../../breakout-rooms/functions';
 import { toggleLobbyMode } from '../../../../lobby/actions.any';

react/features/toolbox/components/native/HangupMenu.tsx

@@ -18,7 +18,7 @@ import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
 import { PARTICIPANT_ROLE } from '../../../base/participants/constants';
 import { getLocalParticipant } from '../../../base/participants/functions';
 import Button from '../../../base/ui/components/native/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 import { moveToRoom } from '../../../breakout-rooms/actions';
 import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
 

react/features/toolbox/components/native/HangupMenuButton.tsx

@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
 import { openSheet } from '../../../base/dialog/actions';
 import { IconHangup } from '../../../base/icons/svg';
 import IconButton from '../../../base/ui/components/native/IconButton';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.native';
 
 import HangupMenu from './HangupMenu';
 

react/features/toolbox/components/web/EndConferenceButton.tsx

@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { endConference } from '../../../base/conference/actions';
 import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import Button from '../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 import { isInBreakoutRoom } from '../../../breakout-rooms/functions';
 
 /**

react/features/toolbox/components/web/LeaveConferenceButton.tsx

@@ -6,7 +6,7 @@ import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../analytics/functions';
 import { leaveConference } from '../../../base/conference/actions';
 import Button from '../../../base/ui/components/web/Button';
-import { BUTTON_TYPES } from '../../../base/ui/constants';
+import { BUTTON_TYPES } from '../../../base/ui/constants.web';
 
 /**
  * Button to leave the conference.