diff --git a/src/core/view/components/scroll-view/index.vue b/src/core/view/components/scroll-view/index.vue index 0dbf4af4c3a950cf620f072916cd782a84fba286..e577c411f1b46170a6c2cb282968bbf7afec2883 100644 --- a/src/core/view/components/scroll-view/index.vue +++ b/src/core/view/components/scroll-view/index.vue @@ -9,7 +9,10 @@ :style="{'overflow-x': scrollX?'auto':'hidden','overflow-y': scrollY?'auto':'hidden'}" class="uni-scroll-view" > -
+
import scroller from 'uni-mixins/scroller/index' import { - supportsPassive, - disableScrollBounce + supportsPassive, + disableScrollBounce } from 'uni-shared' const passiveOptions = supportsPassive ? { passive: true } : false - -// const PULLING = 'pulling' -// const REFRESHING = 'refreshing' + +// const PULLING = 'pulling' +// const REFRESHING = 'refreshing' export default { name: 'ScrollView', @@ -529,38 +532,43 @@ uni-scroll-view[hidden] { max-height: inherit; } +.uni-scroll-view-content { + width: 100%; + height: 100%; +} + .uni-scroll-view-refresher { position: relative; overflow: hidden; } - -.uni-scroll-view-refresh { - position: absolute; - top: 0; - left: 0; + +.uni-scroll-view-refresh { + position: absolute; + top: 0; + left: 0; right: 0; bottom: 0; display: flex; - flex-direction: row; - justify-content: center; - align-items: center; -} - -.uni-scroll-view-refresh-inner { - display: flex; - align-items: center; - justify-content: center; - line-height: 0; - width: 40px; - height: 40px; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.uni-scroll-view-refresh-inner { + display: flex; + align-items: center; + justify-content: center; + line-height: 0; + width: 40px; + height: 40px; border-radius: 50%; background-color: #fff; - box-shadow: 0 1px 6px rgba(0, 0, 0, .117647), 0 1px 4px rgba(0, 0, 0, .117647); -} - -.uni-scroll-view-refresh__spinner { - transform-origin: center center; - animation: uni-scroll-view-refresh-rotate 2s linear infinite; + box-shadow: 0 1px 6px rgba(0, 0, 0, .117647), 0 1px 4px rgba(0, 0, 0, .117647); +} + +.uni-scroll-view-refresh__spinner { + transform-origin: center center; + animation: uni-scroll-view-refresh-rotate 2s linear infinite; } .uni-scroll-view-refresh__spinner > circle { @@ -568,31 +576,31 @@ uni-scroll-view[hidden] { stroke-linecap: round; animation: uni-scroll-view-refresh-dash 2s linear infinite; } - -@keyframes uni-scroll-view-refresh-rotate { - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -} - -@keyframes uni-scroll-view-refresh-dash { - 0% { - stroke-dasharray: 1, 200; - stroke-dashoffset: 0; - } - - 50% { - stroke-dasharray: 89, 200; - stroke-dashoffset: -35px; - } - - 100% { - stroke-dasharray: 89, 200; - stroke-dashoffset: -124px; - } + +@keyframes uni-scroll-view-refresh-rotate { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } +} + +@keyframes uni-scroll-view-refresh-dash { + 0% { + stroke-dasharray: 1, 200; + stroke-dashoffset: 0; + } + + 50% { + stroke-dasharray: 89, 200; + stroke-dashoffset: -35px; + } + + 100% { + stroke-dasharray: 89, 200; + stroke-dashoffset: -124px; + } }