zumerlab
diff --git a/‎__tests__/utils.css.test.js‎
Lines changed: 16 additions & 0 deletions b/‎__tests__/utils.css.test.js‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎src/utils/css.js‎
Lines changed: 18 additions & 4 deletions b/‎src/utils/css.js‎
Lines changed: 18 additions & 4 deletions
@@ -9,6 +9,22 @@ describe('getStyle', () => {
  expect(style).toBeInstanceOf(CSSStyleDeclaration)
  document.body.removeChild(el)
  })
+
+ it('never returns undefined for elements', () => {
+ const el = document.createElement('div')
+ document.body.appendChild(el)
+ const style = getStyle(el)
+ expect(style).not.toBeUndefined()
+ document.body.removeChild(el)
+ })
+
+ it('never returns undefined for pseudos', () => {
+ const el = document.createElement('div')
+ document.body.appendChild(el)
+ const pseudoStyle = getStyle(el, '::before')
+ expect(pseudoStyle).not.toBeUndefined()
+ document.body.removeChild(el)
+ })
 })
 
 describe('parseContent', () => {
 
@@ -270,20 +270,34 @@ export function getStyle(el, pseudo = null) {
  const win = typeof window !== 'undefined' ? window : null
  return win ? win.getComputedStyle(el, pseudo) : null
  }
-
  let map = cache.computedStyle.get(el)
  if (!map) {
  map = new Map()
  cache.computedStyle.set(el, map)
  }
 
- if (!map.has(pseudo)) {
+ let style = map.get(pseudo)
+
+ if (!style) {
  const win = getWindowForElement(el)
  const st = win ? win.getComputedStyle(el, pseudo) : null
- if (st) map.set(pseudo, st)
+ if (st) {
+ map.set(pseudo, st)
+ style = st
+ } else if (typeof window !== 'undefined' && typeof window.getComputedStyle === 'function') {
+ try {
+ const fallback = window.getComputedStyle(el, pseudo)
+ if (fallback) {
+ style = fallback
+ map.set(pseudo, fallback)
+ }
+ } catch {
+ // ignore and leave style as null
+ }
+ }
  }
 
- return map.get(pseudo)
+ return style
 }
 
 /**