You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-11-04 11:51:45 +03:00 
			
		
		
		
	Fix field tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
		@@ -81,6 +81,18 @@ limitations under the License.
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// These tooltips use an older style with a chevron
 | 
				
			||||||
 | 
					.mx_Field_tooltip {
 | 
				
			||||||
 | 
					    background-color: $menu-bg-color;
 | 
				
			||||||
 | 
					    color: $primary-fg-color;
 | 
				
			||||||
 | 
					    border: 1px solid $menu-border-color;
 | 
				
			||||||
 | 
					    text-align: unset;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    .mx_Tooltip_chevron {
 | 
				
			||||||
 | 
					        display: unset;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.mx_Tooltip_title {
 | 
					.mx_Tooltip_title {
 | 
				
			||||||
    font-weight: 600;
 | 
					    font-weight: 600;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -248,6 +248,7 @@ export default class Field extends React.PureComponent<PropShapes, IState> {
 | 
				
			|||||||
                tooltipClassName={classNames("mx_Field_tooltip", tooltipClassName)}
 | 
					                tooltipClassName={classNames("mx_Field_tooltip", tooltipClassName)}
 | 
				
			||||||
                visible={(this.state.focused && this.props.forceTooltipVisible) || this.state.feedbackVisible}
 | 
					                visible={(this.state.focused && this.props.forceTooltipVisible) || this.state.feedbackVisible}
 | 
				
			||||||
                label={tooltipContent || this.state.feedback}
 | 
					                label={tooltipContent || this.state.feedback}
 | 
				
			||||||
 | 
					                forceOnRight
 | 
				
			||||||
            />;
 | 
					            />;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,6 +35,7 @@ interface IProps {
 | 
				
			|||||||
        visible?: boolean;
 | 
					        visible?: boolean;
 | 
				
			||||||
        // the react element to put into the tooltip
 | 
					        // the react element to put into the tooltip
 | 
				
			||||||
        label: React.ReactNode;
 | 
					        label: React.ReactNode;
 | 
				
			||||||
 | 
					        forceOnRight?: boolean;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default class Tooltip extends React.Component<IProps> {
 | 
					export default class Tooltip extends React.Component<IProps> {
 | 
				
			||||||
@@ -82,7 +83,7 @@ export default class Tooltip extends React.Component<IProps> {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        style.top = (parentBox.top - 2) + window.pageYOffset + offset;
 | 
					        style.top = (parentBox.top - 2) + window.pageYOffset + offset;
 | 
				
			||||||
        if (parentBox.right > window.innerWidth / 2) {
 | 
					        if (!this.props.forceOnRight && parentBox.right > window.innerWidth / 2) {
 | 
				
			||||||
            style.right = window.innerWidth - parentBox.right - window.pageXOffset - 8;
 | 
					            style.right = window.innerWidth - parentBox.right - window.pageXOffset - 8;
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            style.left = parentBox.right + window.pageXOffset + 6;
 | 
					            style.left = parentBox.right + window.pageXOffset + 6;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user