Sfoglia il codice sorgente

fix(thumbnails, rn) Hide empty indicators container on native (#11019)

factor2
Robert Pintilii 3 anni fa
parent
commit
fde33b72d0
Nessun account collegato all'indirizzo email del committer

+ 2
- 2
react/features/display-name/components/native/DisplayNameLabel.js Vedi File

@@ -69,12 +69,12 @@ class DisplayNameLabel extends Component<Props> {
69 69
  * }}
70 70
  */
71 71
 function _mapStateToProps(state: Object, ownProps: Props) {
72
-    const { participantId } = ownProps;
72
+    const { participantId, contained } = ownProps;
73 73
     const participant = getParticipantById(state, participantId);
74 74
 
75 75
     return {
76 76
         _participantName: getParticipantDisplayName(state, participantId),
77
-        _render: participant && !participant?.local && !participant?.isFakeParticipant
77
+        _render: participant && (!participant?.local || contained) && !participant?.isFakeParticipant
78 78
     };
79 79
 }
80 80
 

+ 2
- 2
react/features/display-name/components/native/styles.js Vedi File

@@ -12,8 +12,8 @@ export default {
12 12
     },
13 13
 
14 14
     displayNamePadding: {
15
-        paddingHorizontal: BaseTheme.spacing[2],
16
-        paddingVertical: BaseTheme.spacing[1]
15
+        padding: BaseTheme.spacing[1],
16
+        paddingRight: 6
17 17
     },
18 18
 
19 19
     displayNameText: {

+ 4
- 2
react/features/filmstrip/components/native/Thumbnail.js Vedi File

@@ -224,8 +224,10 @@ class Thumbnail extends PureComponent<Props> {
224 224
             indicators.push(<Container
225 225
                 key = 'bottom-indicators'
226 226
                 style = { styles.thumbnailIndicatorContainer }>
227
-                { audioMuted && <AudioMutedIndicator /> }
228
-                { renderModeratorIndicator && <ModeratorIndicator />}
227
+                <Container style = { (audioMuted || renderModeratorIndicator) && styles.bottomIndicatorsContainer }>
228
+                    { audioMuted && <AudioMutedIndicator /> }
229
+                    { renderModeratorIndicator && <ModeratorIndicator />}
230
+                </Container>
229 231
                 {
230 232
                     renderDisplayName && <DisplayNameLabel
231 233
                         contained = { true }

+ 7
- 1
react/features/filmstrip/components/native/styles.js Vedi File

@@ -134,7 +134,13 @@ export default {
134 134
         position: 'absolute',
135 135
         maxWidth: '95%',
136 136
         overflow: 'hidden',
137
-        ...indicatorContainer
137
+        ...indicatorContainer,
138
+        padding: 0
139
+    },
140
+
141
+    bottomIndicatorsContainer: {
142
+        padding: 2,
143
+        flexDirection: 'row'
138 144
     },
139 145
 
140 146
     thumbnailTopIndicatorContainer: {

Loading…
Annulla
Salva