Merge branch '2.x' into dev

2020-12-26 15:52:18 +08:00
parent 455b9e6d44 ed2eaf005c
commit 037b6b8c10
10 changed files with 96 additions and 31 deletions
@@ -21,7 +21,9 @@ export default createComponent({
      const style = {};
      const { vertical } = parent.props;

-      style[vertical ? 'height' : 'width'] = `${parent.size.value}px`;
+      if (parent.size.value) {
+        style[vertical ? 'height' : 'width'] = `${parent.size.value}px`;
+      }

      if (state.offset) {
        style.transform = `translate${vertical ? 'Y' : 'X'}(${state.offset}px)`;