fix(hippy-react-web): scroll-view style should be called by formatWeb…

…S… (#233) * fix(hippy-react-web): formatWebStyle for ScrollView Co-authored-by: zehuiguan <[email protected]>
Tencent · Apr 22, 2020 · 9db12a4 · 9db12a4
1 parent ee65c8e
commit 9db12a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/hippy-react-web/src/components/scroll-view.tsx b/packages/hippy-react-web/src/components/scroll-view.tsx
@@ -77,8 +77,8 @@ export class ScrollView extends React.Component {
       WebkitOverflowScrolling: 'touch',
     };
     const newStyle = horizontal
-      ? Object.assign({}, style, iOSTouchStyle, styles.baseHorizontal)
-      : Object.assign({}, style, iOSTouchStyle, styles.baseVertical);
+      ? { ...formatWebStyle(style), ...iOSTouchStyle, ...styles.baseHorizontal }
+      : { ...formatWebStyle(style), ...iOSTouchStyle, ...styles.baseVertical };
     newProps.style = formatWebStyle(newStyle);
     if (typeof newProps.onScroll === 'function') {
       const onScrollFunc = newProps.onScroll;