@aks-dev/easyui 1.0.108 → 1.0.111

package/lib/Hud/PopoverView/PopoverView.tsx

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-09-09 10:57:45
+ * @LastEditTime: 2022-10-28 12:10:20
  * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/PopoverView.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
@@ -41,7 +41,7 @@ export const PopoverView = React.forwardRef<PopoverViewOptions.RefAttributes, {}
         return null;
 
     return (
-        <TouchableOpacity activeOpacity={1} style={[styles.container, options?.style]} onPress={e => {
+        <TouchableOpacity activeOpacity={1} style={[styles.container, options?.style]} disabled={options?.disabled} onPress={e => {
             setVisible(false);
             setOptions(undefined)
             // e.stopPropagation()

package/lib/Hud/PopoverView/index.d.ts

@@ -3,8 +3,8 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-09-09 10:57:07
- * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/index.ts
+ * @LastEditTime: 2022-10-28 12:09:52
+ * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/index.d.ts
  */
 import * as React from 'react'
 
@@ -14,6 +14,7 @@ import {StyleProp,ViewStyle} from 'react-native'
 export type PopoverViewOptions = {
     content: React.ReactNode;
     style: StyleProp<ViewStyle>;
+    disabled:boolean;
 }
 
 

package/lib/MenuView/MenuView.tsx

@@ -215,8 +215,10 @@ export default (props: MenuProps) => {
     }
 
     return (
-        <TouchableOpacity ref={containerRef as any} onPress={e => show()} style={props.style} >
-            {props.children}
-        </TouchableOpacity>
+        <TouchableOpacity
+            ref={containerRef as any}
+            onPress={e => show()}
+            {...props}
+        />
     )
 }

package/lib/Modal/Modal.tsx

@@ -2,11 +2,10 @@
  * @Author: shiguo
  * @Date: 2022-04-26 11:30:34
  * @LastEditors: shiguo
- * @LastEditTime: 2022-04-26 14:34:52
- * @FilePath: /@aks/easy/lib/Modal/Modal.tsx
+ * @LastEditTime: 2022-10-27 16:37:32
+ * @FilePath: /@aks-dev/easyui/lib/Modal/Modal.tsx
  */
 
 
 
-
-export { default as Modal, ModalProps } from 'react-native-modal'
+export { default as Modal, ModalProps } from 'react-native-modal'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.108",
+  "version": "1.0.111",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/screen/px2sp.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2021-04-27 10:40:36
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-18 11:27:22
+ * @LastEditTime: 2022-10-28 17:14:14
  * @FilePath: /@aks-dev/easyui/screen/px2sp.ts
  */
 import { Dimensions, PixelRatio } from 'react-native';
@@ -11,6 +11,13 @@ const width = Dimensions.get('window').width;      //设备的宽度
 const height = Dimensions.get('window').height;    //设备的高度
 
 export const px2sp = (size: number) => {
+
+// console.log({
+//     pixelRatio,
+//     width,
+//     height
+// })
+
     if (pixelRatio === 2) {
         // iphone 5s and older Androids
         if (width < 360) {
@@ -53,16 +60,16 @@ export const px2sp = (size: number) => {
             // Catch other smaller android height sizings
         }
         if (height < 667) {
-            return size * 1.2;
+            return size * 1.15;//older:1.20
             // catch in-between size Androids and scale font up
             // a tad but not too much
         }
         if (height >= 667 && height <= 735) {
-            return size * 1.25;
+            return size * 1.20;//older:1.25
         }
         // catch larger phablet devices
 
-        return size * 1.3;
+        return size * 1.25;//older:1.30
     }
     // if older device ie pixelRatio !== 2 || 3 || 3.5
     return size;