nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-23 14:40:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev

Browse Source
This commit is contained in:
Bill 2022-03-16 12:25:21 -04:00
commit b556723c1a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/navigator/views/room-info/NavigatorRoomInfoView.tsx
View File

@ -111,7 +111,7 @@ export const NavigatorRoomInfoView: FC<NavigatorRoomInfoViewProps> = props =>
<> <>
<Flex gap={ 2 } overflow="hidden"> <Flex gap={ 2 } overflow="hidden">
<LayoutRoomThumbnailView roomId={ roomInfoData.enteredGuestRoom.roomId } customUrl={ roomInfoData.enteredGuestRoom.officialRoomPicRef }> <LayoutRoomThumbnailView roomId={ roomInfoData.enteredGuestRoom.roomId } customUrl={ roomInfoData.enteredGuestRoom.officialRoomPicRef }>
{ hasPermission('settings') && <i className="icon icon-camera-small position-absolute b-0 r-0 m-1 cursor-pointer" onClick={ () => processAction('open_room_thumbnail_camera') } /> } { hasPermission('settings') && <i className="icon icon-camera-small position-absolute b-0 r-0 m-1 cursor-pointer top-0" onClick={ () => processAction('open_room_thumbnail_camera') } /> }
</LayoutRoomThumbnailView> </LayoutRoomThumbnailView>
<Column grow gap={ 1 } overflow="hidden"> <Column grow gap={ 1 } overflow="hidden">
<Flex gap={ 1 }> <Flex gap={ 1 }>

4
src/components/user-settings/UserSettingsView.tsx
View File

@ -4,7 +4,7 @@ import { FC, useCallback, useEffect, useState } from 'react';
import { LocalizeText, SendMessageComposer } from '../../api'; import { LocalizeText, SendMessageComposer } from '../../api';
import { Column, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../common'; import { Column, Flex, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../common';
import { UserSettingsUIEvent } from '../../events'; import { UserSettingsUIEvent } from '../../events';
import { DispatchUiEvent, UseMessageEventHook, UseUiEvent } from '../../hooks'; import { DispatchMainEvent, DispatchUiEvent, UseMessageEventHook, UseUiEvent } from '../../hooks';
export const UserSettingsView: FC<{}> = props => export const UserSettingsView: FC<{}> = props =>
{ {
@ -46,6 +46,7 @@ export const UserSettingsView: FC<{}> = props =>
settingsEvent.chatType = parser.chatType; settingsEvent.chatType = parser.chatType;
setUserSettings(settingsEvent); setUserSettings(settingsEvent);
DispatchMainEvent(settingsEvent);
}, []); }, []);
UseMessageEventHook(UserSettingsEvent, onUserSettingsEvent); UseMessageEventHook(UserSettingsEvent, onUserSettingsEvent);
@ -92,6 +93,7 @@ export const UserSettingsView: FC<{}> = props =>
} }
if(doUpdate) setUserSettings(clone); if(doUpdate) setUserSettings(clone);
DispatchMainEvent(clone)
}, [userSettings]); }, [userSettings]);
const saveRangeSlider = useCallback((type: string) => const saveRangeSlider = useCallback((type: string) =>