@gm-mobile/mp 3.9.3-beta.10 → 3.9.3-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/mp",
-  "version": "3.9.3-beta.10",
+  "version": "3.9.3-beta.14",
   "description": "",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-react": "^3.9.3-beta.10",
-    "@gm-mobile/c-tool": "^3.9.3-beta.10",
-    "@gm-mobile/locales": "^3.9.3-beta.10"
+    "@gm-mobile/c-react": "^3.9.3-beta.14",
+    "@gm-mobile/c-tool": "^3.9.3-beta.14",
+    "@gm-mobile/locales": "^3.9.3-beta.14"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "319aa341cee95047c299feaa5206711113b4c092"
+  "gitHead": "b0fbd70d9632ca882d1954d95153705a3f7663c0"
 }

package/src/component/page/base.tsx

@@ -20,6 +20,7 @@ interface PageProps extends HtmlHTMLAttributes<HTMLDivElement> {
   safeBottom?: boolean
   /** 用于放置绝对定位组件 */
   extra?: ReactNode
+  onRefresh?: () => Promise<any>
 }
 
 const Page: FC<PageProps> = ({

package/src/component/page/page.tsx

@@ -1,15 +1,23 @@
 import React, { useEffect, useRef, FC, useState, ReactNode } from 'react'
-import { LayoutRoot, LayoutRootV1 } from '@gm-mobile/c-react'
+import { Flex, LayoutRoot, LayoutRootV1 } from '@gm-mobile/c-react'
 import { ScrollView } from '@tarojs/components'
-import PageBase, { PageProps as PageMPProps } from './base'
+import PageBase, { PageProps } from './base'
+import { debounce } from 'lodash'
 
-const PageMP: FC<
-  PageMPProps & {
-    onRefresh?: () => Promise<any>
-  }
-> = ({ children, onRefresh, ...props }) => {
+interface PageMPProps extends PageProps {
+  onRefresh?: () => Promise<any>
+  onLoadMore?: () => Promise<any>
+}
+
+const PageMP: FC<PageMPProps> = ({
+  children,
+  onRefresh,
+  onLoadMore,
+  ...props
+}) => {
   const [state, setState] = useState({
     refreshing: false,
+    loadingMore: false,
   })
   const refLoading = useRef<boolean | undefined>(false)
   useEffect(() => {
@@ -44,6 +52,29 @@ const PageMP: FC<
         }
       })
     },
+    loadMore: debounce(
+      async () => {
+        setState((state) => {
+          return {
+            ...state,
+            refreshing: true,
+          }
+        })
+        try {
+          onLoadMore && (await onLoadMore())
+        } catch (err) {
+          console.error(err)
+        }
+        setState((state) => {
+          return {
+            ...state,
+            refreshing: false,
+          }
+        })
+      },
+      1000,
+      { leading: true }
+    ),
   }
 
   return (
@@ -53,13 +84,26 @@ const PageMP: FC<
           <ScrollView
             className='m-flex'
             style={{ height: '100%' }}
+            enableBackToTop
             scrollY
             refresherEnabled
+            scrollWithAnimation
             refresherBackground='transparent'
             refresherTriggered={state.refreshing}
-            onRefresherRefresh={methods.refresh}
+            lowerThreshold={50}
+            onRefresherRefresh={() => methods.refresh()}
+            onScrollToLower={() => methods.loadMore()}
           >
             {children}
+            {state.loadingMore && (
+              <Flex
+                className='loading-more m-margin-tb-20 m-text-placeholder'
+                alignCenter
+                justifyCenter
+              >
+                加载中...
+              </Flex>
+            )}
           </ScrollView>
         )}
         {!onRefresh && children}

package/src/component/safe_bottom/safe_bottom.tsx

@@ -12,7 +12,7 @@ const SafeBottomMP: FC<SafeBottomMPProps> = memo(
 
     return (
       <View className={classNames(className)} {...rest}>
-        {React.cloneElement(children as React.ReactElement, {
+        {React.cloneElement((children as React.ReactElement) || <View />, {
           style: {
             paddingBottom:
               paddingBottom > 0 ? `${paddingBottom}px!important` : undefined,