From 59a6eb5661736135d7a3eb14861697dcac6fbb51 Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 13 Apr 2022 18:16:00 +0800 Subject: [PATCH] fix: do not handle false + move into lower branch --- packages/runtime-dom/__tests__/patchStyle.spec.ts | 4 ++-- packages/runtime-dom/src/modules/style.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/runtime-dom/__tests__/patchStyle.spec.ts b/packages/runtime-dom/__tests__/patchStyle.spec.ts index 4e7d4e42b48..409d6936eaf 100644 --- a/packages/runtime-dom/__tests__/patchStyle.spec.ts +++ b/packages/runtime-dom/__tests__/patchStyle.spec.ts @@ -39,15 +39,15 @@ describe(`runtime-dom: style patching`, () => { const el = document.createElement('div') patchProp(el, 'style', null, { color: undefined, - '--color': false, borderRadius: null }) expect(el.style.cssText.replace(/\s/g, '')).toBe('') + patchProp( el, 'style', { color: 'red' }, - { color: undefined, '--color': false, borderRadius: false } + { color: null, borderRadius: undefined } ) expect(el.style.cssText.replace(/\s/g, '')).toBe('') }) diff --git a/packages/runtime-dom/src/modules/style.ts b/packages/runtime-dom/src/modules/style.ts index 1816623bfeb..f4924ea2ec6 100644 --- a/packages/runtime-dom/src/modules/style.ts +++ b/packages/runtime-dom/src/modules/style.ts @@ -42,10 +42,10 @@ function setStyle( name: string, val: string | string[] ) { - val = val == null || (val as any) === false ? '' : val if (isArray(val)) { val.forEach(v => setStyle(style, name, v)) } else { + if (val == null) val = '' if (name.startsWith('--')) { // custom property definition style.setProperty(name, val)