luisgulo/focalboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usages of element's computed style in Firefox: (#822)

Browse Source 
- don't use shorthands like `borderLeft` or `font` because they are empty strings
  - construct font string that is required for setting into canvas context from
    individual font properties if `font` property is empty string

Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Co-authored-by: Jesús Espino <jespinog@gmail.com>
This commit is contained in:
kamre 2021-08-03 02:31:17 +07:00 committed by GitHub
parent e6ff1d8aa6
commit 3c41630af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/src/utils.ts
View File

@ -86,7 +86,7 @@ class Utils {
myResults.padding += element.clientWidth
myResults.padding += Utils.getHorizontalBorder(style)
myResults.padding += Utils.getHorizontalMargin(style)
myResults.fontDescriptor = style.font
myResults.fontDescriptor = Utils.getFontString(style)
} else {
switch (element.className) {
case IconClass:
@ -97,7 +97,7 @@ class Utils {
case OpenButtonClass:
break
default: {
myResults.fontDescriptor = style.font
myResults.fontDescriptor = Utils.getFontString(style)
myResults.padding += Utils.getTotalHorizontalPadding(style)
const childResults = Utils.getFontAndPaddingFromChildren(element.children, myResults.padding)
if (childResults.fontDescriptor !== '') {
@ -111,12 +111,25 @@ class Utils {
return myResults
}
private static getFontString(style: CSSStyleDeclaration): string {
if (style.font) {
return style.font
}
const {fontStyle, fontVariant, fontWeight, fontSize, lineHeight, fontFamily} = style
const props = [fontStyle, fontVariant, fontWeight]
if (fontSize) {
props.push(lineHeight ? `${fontSize} / ${lineHeight}` : fontSize)
}
props.push(fontFamily)
return props.join(' ')
}
private static getHorizontalMargin(style: CSSStyleDeclaration): number {
return parseInt(style.marginLeft, 10) + parseInt(style.marginRight, 10)
}
private static getHorizontalBorder(style: CSSStyleDeclaration): number {
return parseInt(style.borderLeft, 10) + parseInt(style.borderRight, 10)
return parseInt(style.borderLeftWidth, 10) + parseInt(style.borderRightWidth, 10)
}
private static getHorizontalPadding(style: CSSStyleDeclaration): number {