e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename util.scrollBarWidth()

Browse source
This commit is contained in:
Ken-Håvard Lieng 2017-03-30 04:18:25 +02:00
parent 9d5707dd3c
commit 80efb750f9
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/js/components/MessageBox.js
View file

@ -2,9 +2,9 @@ import React, { PureComponent } from 'react';
import { List } from 'react-virtualized/dist/commonjs/List';
import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer';
import Message from './Message';
import { scrollBarWidth } from '../util';
import { measureScrollBarWidth } from '../util';
const sbWidth = scrollBarWidth();
const scrollBarWidth = measureScrollBarWidth();
const listStyle = { padding: '7px 0', boxSizing: 'content-box' };
export default class MessageBox extends PureComponent {
@ -45,9 +45,9 @@ export default class MessageBox extends PureComponent {
}
// eslint-disable-next-line no-underscore-dangle
const c = this.list.Grid._scrollingContainer;
if (c.scrollHeight > c.clientHeight) {
wrapWidth -= sbWidth;
const container = this.list.Grid._scrollingContainer;
if (container.scrollHeight > container.clientHeight) {
wrapWidth -= scrollBarWidth;
}
if (this.wrapWidth !== wrapWidth) {

2
client/src/js/util/index.js
View file

@ -25,7 +25,7 @@ export function stringWidth(str, font) {
return ctx.measureText(str).width;
}
export function scrollBarWidth() {
export function measureScrollBarWidth() {
const outer = document.createElement('div');
outer.style.visibility = 'hidden';
outer.style.width = '100px';