@beppla/tapas-ui 1.4.17 → 1.4.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/commonjs/Drawer/Drawer.js +4 -0
- package/commonjs/Drawer/Drawer.js.map +1 -1
- package/commonjs/Drawer/SCROLLVIEW_FIX.md +127 -0
- package/commonjs/Dropdown/CustomDropdown.js +39 -8
- package/commonjs/Dropdown/CustomDropdown.js.map +1 -1
- package/commonjs/Pagination/DROPDOWN_IMPROVEMENTS.md +305 -0
- package/commonjs/Pagination/Pagination.js +7 -3
- package/commonjs/Pagination/Pagination.js.map +1 -1
- package/module/Drawer/Drawer.js +4 -0
- package/module/Drawer/Drawer.js.map +1 -1
- package/module/Drawer/SCROLLVIEW_FIX.md +127 -0
- package/module/Dropdown/CustomDropdown.js +39 -8
- package/module/Dropdown/CustomDropdown.js.map +1 -1
- package/module/Pagination/DROPDOWN_IMPROVEMENTS.md +305 -0
- package/module/Pagination/Pagination.js +7 -3
- package/module/Pagination/Pagination.js.map +1 -1
- package/package.json +1 -1
- package/typescript/Drawer/Drawer.d.ts.map +1 -1
- package/typescript/Dropdown/CustomDropdown.d.ts +2 -1
- package/typescript/Dropdown/CustomDropdown.d.ts.map +1 -1
- package/typescript/Pagination/Pagination.d.ts.map +1 -1
|
@@ -49,6 +49,9 @@ const useStyles = (0, _themed.makeStyles)(theme => ({
|
|
|
49
49
|
fontFamily: theme.fonts.fontFamily,
|
|
50
50
|
paddingBottom: theme.spacing.tpMd
|
|
51
51
|
},
|
|
52
|
+
containerStyle: {
|
|
53
|
+
flexGrow: 1
|
|
54
|
+
},
|
|
52
55
|
title: {
|
|
53
56
|
fontFamily: theme.fonts.fontFamily,
|
|
54
57
|
fontSize: theme.fonts.h4,
|
|
@@ -169,6 +172,7 @@ const Drawer = ({
|
|
|
169
172
|
})
|
|
170
173
|
}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.ScrollView, {
|
|
171
174
|
style: [styles.middleSection, middleSectionStyle],
|
|
175
|
+
contentContainerStyle: styles.containerStyle,
|
|
172
176
|
children: [component, children]
|
|
173
177
|
}), showFooter && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
|
|
174
178
|
style: [styles.footer],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_themed","require","_reactNative","_reactNativeSafeAreaContext","_react","_interopRequireDefault","_Button","_TapasIcon","_Status","_jsxRuntime","e","__esModule","default","useStyles","makeStyles","theme","overlay","width","Platform","OS","height","position","top","right","justifyContent","alignItems","paddingVertical","paddingHorizontal","borderTopRightRadius","borderBottomRightRadius","flx","display","flexDirection","header","spacing","tpRg","middleSection","flex","fontFamily","fonts","paddingBottom","tpMd","title","fontSize","h4","letterSpacing","letterSpacingS","color","colors","primary","fontWeight","weightM","clear","sizeM","grey3","footer","sizeS","borderTopColor","borderTopWidth","leftButton","leftButtonText","rightButton","marginLeft","tpXs","icon","rightButtonText","Drawer","visible","onClear","clearText","onClose","titleIcon","titleIconOnPress","titleStatus","statusType","overlayStyle","children","showHeader","showFooter","middleSectionStyle","leftButtonTextStyle","rightButtonStyle","leftButtonOnPress","rightButtonOnPress","component","footerComponent","headerComponent","clearDisable","testID","props","styles","getSaveArea","insets","useSafeAreaInsets","paddingTop","jsxs","Overlay","isVisible","onBackdropPress","jsx","View","style","Fragment","gap","TouchableOpacity","onPress","name","size","Text","mode","type","tag","disabled","ScrollView","_default","exports","withTheme"],"sourceRoot":"../../../components","sources":["Drawer/Drawer.tsx"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AASA,IAAAE,2BAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAC,sBAAA,CAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAD,sBAAA,CAAAJ,OAAA;AACA,IAAAM,UAAA,GAAAF,sBAAA,CAAAJ,OAAA;AACA,IAAAO,OAAA,GAAAH,sBAAA,CAAAJ,OAAA;AAAuD,IAAAQ,WAAA,GAAAR,OAAA;AAAA,SAAAI,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AA8BvD,MAAMG,SAAS,GAAG,IAAAC,kBAAU,EAAEC,KAAK,KAAM;EACvCC,OAAO,EAAE;IACPC,KAAK,EAAEC,qBAAQ,CAACC,EAAE,KAAK,KAAK,GAAG,KAAK,GAAG,MAAM;IAC7CC,MAAM,EAAE,MAAM;IACdC,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE,CAAC;IACNC,KAAK,EAAE,CAAC;IACRC,cAAc,EAAE,QAAQ;IACxBC,UAAU,EAAE,UAAU;IACtBC,eAAe,EAAE,CAAC;IAClBC,iBAAiB,EAAE,CAAC;IACpBC,oBAAoB,EAAE,CAAC;IACvBC,uBAAuB,EAAE;EAC3B,CAAC;EACDC,GAAG,EAAE;IACHC,OAAO,EAAE,MAAM;IACfC,aAAa,EAAE,KAAK;IACpBP,UAAU,EAAE,QAAQ;IACpBD,cAAc,EAAE;EAClB,CAAC;EACDS,MAAM,EAAE;IACNF,OAAO,EAAE,MAAM;IACfC,aAAa,EAAE,KAAK;IACpBR,cAAc,EAAE,eAAe;IAC/BJ,MAAM,EAAE,EAAE;IACVH,KAAK,EAAE,MAAM;IACbQ,UAAU,EAAE,QAAQ;IACpBE,iBAAiB,EAAEZ,KAAK,CAACmB,OAAO,CAACC;EACnC,CAAC;EACDC,aAAa,EAAE;IACbC,IAAI,EAAE,CAAC;IACPpB,KAAK,EAAE,MAAM;IACbU,iBAAiB,EAAEZ,KAAK,CAACmB,OAAO,CAACC,IAAI;IACrCG,UAAU,EAAEvB,KAAK,CAACwB,KAAK,CAACD,UAAU;IAClCE,aAAa,EAAEzB,KAAK,CAACmB,OAAO,CAACO;EAC/B,CAAC;EACDC,KAAK,EAAE;
|
|
1
|
+
{"version":3,"names":["_themed","require","_reactNative","_reactNativeSafeAreaContext","_react","_interopRequireDefault","_Button","_TapasIcon","_Status","_jsxRuntime","e","__esModule","default","useStyles","makeStyles","theme","overlay","width","Platform","OS","height","position","top","right","justifyContent","alignItems","paddingVertical","paddingHorizontal","borderTopRightRadius","borderBottomRightRadius","flx","display","flexDirection","header","spacing","tpRg","middleSection","flex","fontFamily","fonts","paddingBottom","tpMd","containerStyle","flexGrow","title","fontSize","h4","letterSpacing","letterSpacingS","color","colors","primary","fontWeight","weightM","clear","sizeM","grey3","footer","sizeS","borderTopColor","borderTopWidth","leftButton","leftButtonText","rightButton","marginLeft","tpXs","icon","rightButtonText","Drawer","visible","onClear","clearText","onClose","titleIcon","titleIconOnPress","titleStatus","statusType","overlayStyle","children","showHeader","showFooter","middleSectionStyle","leftButtonTextStyle","rightButtonStyle","leftButtonOnPress","rightButtonOnPress","component","footerComponent","headerComponent","clearDisable","testID","props","styles","getSaveArea","insets","useSafeAreaInsets","paddingTop","jsxs","Overlay","isVisible","onBackdropPress","jsx","View","style","Fragment","gap","TouchableOpacity","onPress","name","size","Text","mode","type","tag","disabled","ScrollView","contentContainerStyle","_default","exports","withTheme"],"sourceRoot":"../../../components","sources":["Drawer/Drawer.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
# Drawer ScrollView 布局修复
|
|
2
|
+
|
|
3
|
+
## 问题描述
|
|
4
|
+
|
|
5
|
+
之前 Drawer 组件的 ScrollView 在某些情况下,内容高度不足时无法填充整个可用空间,导致布局不理想。
|
|
6
|
+
|
|
7
|
+
## 解决方案
|
|
8
|
+
|
|
9
|
+
### 修改内容
|
|
10
|
+
|
|
11
|
+
为 ScrollView 添加 `contentContainerStyle`,使用 `flexGrow: 1` 确保内容容器能够填充整个 ScrollView。
|
|
12
|
+
|
|
13
|
+
```typescript
|
|
14
|
+
<ScrollView
|
|
15
|
+
style={[styles.middleSection, middleSectionStyle]}
|
|
16
|
+
contentContainerStyle={styles.containerStyle} // ✨ 新增
|
|
17
|
+
>
|
|
18
|
+
{component}
|
|
19
|
+
{children}
|
|
20
|
+
</ScrollView>
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
### 样式定义
|
|
24
|
+
|
|
25
|
+
```typescript
|
|
26
|
+
containerStyle: {
|
|
27
|
+
flexGrow: 1, // 让内容容器至少填充整个 ScrollView
|
|
28
|
+
}
|
|
29
|
+
```
|
|
30
|
+
|
|
31
|
+
## 技术说明
|
|
32
|
+
|
|
33
|
+
### `flex: 1` vs `flexGrow: 1`
|
|
34
|
+
|
|
35
|
+
在 ScrollView 的 `contentContainerStyle` 中:
|
|
36
|
+
|
|
37
|
+
- ❌ **不要使用 `flex: 1`**
|
|
38
|
+
- `flex: 1` 是 `flex-grow: 1`, `flex-shrink: 1`, `flex-basis: 0` 的简写
|
|
39
|
+
- 会让内容容器强制占据固定高度,可能破坏滚动行为
|
|
40
|
+
- 在内容超出时会导致布局问题
|
|
41
|
+
|
|
42
|
+
- ✅ **使用 `flexGrow: 1`**
|
|
43
|
+
- 允许内容容器增长以填充可用空间
|
|
44
|
+
- 当内容少时,容器会扩展填充 ScrollView
|
|
45
|
+
- 当内容多时,容器自然增长,保持滚动功能正常
|
|
46
|
+
- 不会影响 `flex-shrink` 和 `flex-basis` 的默认行为
|
|
47
|
+
|
|
48
|
+
### ScrollView 的两个样式属性
|
|
49
|
+
|
|
50
|
+
```typescript
|
|
51
|
+
// 外层容器样式(ScrollView 本身)
|
|
52
|
+
style={{
|
|
53
|
+
flex: 1, // ✅ 正确:让 ScrollView 占满可用空间
|
|
54
|
+
paddingHorizontal: 16,
|
|
55
|
+
}}
|
|
56
|
+
|
|
57
|
+
// 内层内容容器样式(包裹 children)
|
|
58
|
+
contentContainerStyle={{
|
|
59
|
+
flexGrow: 1, // ✅ 正确:让内容至少填充 ScrollView
|
|
60
|
+
paddingBottom: 20, // 内容的 padding
|
|
61
|
+
}}
|
|
62
|
+
```
|
|
63
|
+
|
|
64
|
+
## 使用场景
|
|
65
|
+
|
|
66
|
+
这个修复特别适用于:
|
|
67
|
+
|
|
68
|
+
1. **内容较少时**: 确保内容垂直居中或填充整个抽屉
|
|
69
|
+
2. **动态内容**: 内容高度可能变化的场景
|
|
70
|
+
3. **表单布局**: 需要底部按钮始终在底部的情况
|
|
71
|
+
4. **空状态**: 显示空状态提示时保持良好布局
|
|
72
|
+
|
|
73
|
+
## 示例
|
|
74
|
+
|
|
75
|
+
### 修复前
|
|
76
|
+
|
|
77
|
+
```typescript
|
|
78
|
+
// 内容少时,ScrollView 内容不填充,底部有空白
|
|
79
|
+
<Drawer visible={true}>
|
|
80
|
+
<Text>少量内容</Text>
|
|
81
|
+
</Drawer>
|
|
82
|
+
```
|
|
83
|
+
|
|
84
|
+
### 修复后
|
|
85
|
+
|
|
86
|
+
```typescript
|
|
87
|
+
// 内容少时,ScrollView 内容填充整个可用空间
|
|
88
|
+
<Drawer visible={true}>
|
|
89
|
+
<Text>少量内容</Text>
|
|
90
|
+
{/* 内容会填充整个抽屉高度 */}
|
|
91
|
+
</Drawer>
|
|
92
|
+
```
|
|
93
|
+
|
|
94
|
+
## React Native ScrollView 官方文档
|
|
95
|
+
|
|
96
|
+
根据 React Native 官方文档:
|
|
97
|
+
|
|
98
|
+
> `contentContainerStyle`: These styles will be applied to the scroll view content container which wraps all of the child views.
|
|
99
|
+
|
|
100
|
+
推荐使用:
|
|
101
|
+
- `flexGrow: 1` - 让内容至少填充容器
|
|
102
|
+
- `paddingBottom` - 内容底部间距
|
|
103
|
+
- `alignItems` - 内容对齐方式
|
|
104
|
+
|
|
105
|
+
## 注意事项
|
|
106
|
+
|
|
107
|
+
1. **不要在 contentContainerStyle 中使用 `flex: 1`**
|
|
108
|
+
- 会导致滚动行为异常
|
|
109
|
+
- 在 Web 上可能引起布局问题
|
|
110
|
+
|
|
111
|
+
2. **保持 style 中的 `flex: 1`**
|
|
112
|
+
- ScrollView 本身需要 `flex: 1` 来占据可用空间
|
|
113
|
+
- 这是在 `middleSection` 样式中定义的
|
|
114
|
+
|
|
115
|
+
3. **Web 平台兼容性**
|
|
116
|
+
- 使用 `flexGrow: 1` 在 Web 和原生平台都能正常工作
|
|
117
|
+
- 确保跨平台一致性
|
|
118
|
+
|
|
119
|
+
## 相关资源
|
|
120
|
+
|
|
121
|
+
- [React Native ScrollView 文档](https://reactnative.dev/docs/scrollview)
|
|
122
|
+
- [Flexbox 布局指南](https://css-tricks.com/snippets/css/a-guide-to-flexbox/)
|
|
123
|
+
- [React Native 布局最佳实践](https://reactnative.dev/docs/flexbox)
|
|
124
|
+
|
|
125
|
+
## 版本历史
|
|
126
|
+
|
|
127
|
+
- **v1.4.18**: 修复 ScrollView 内容容器布局,使用 `flexGrow: 1`
|
|
@@ -66,12 +66,10 @@ const useStyles = (0, _themed.makeStyles)(theme => ({
|
|
|
66
66
|
},
|
|
67
67
|
subContainer: {
|
|
68
68
|
marginTop: 8,
|
|
69
|
-
// 移除 marginTop,避免与 top: 40 冲突
|
|
70
69
|
display: 'flex',
|
|
71
70
|
flexDirection: 'column',
|
|
72
71
|
backgroundColor: theme.colors.white,
|
|
73
72
|
borderRadius: theme.radius.rounded,
|
|
74
|
-
flex: 1,
|
|
75
73
|
elevation: 8,
|
|
76
74
|
shadowColor: 'rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0.12)',
|
|
77
75
|
shadowOffset: {
|
|
@@ -83,8 +81,9 @@ const useStyles = (0, _themed.makeStyles)(theme => ({
|
|
|
83
81
|
overflow: 'hidden',
|
|
84
82
|
position: 'absolute',
|
|
85
83
|
top: 40,
|
|
86
|
-
|
|
87
|
-
|
|
84
|
+
zIndex: 9999,
|
|
85
|
+
// 确保不影响主体布局
|
|
86
|
+
pointerEvents: 'auto'
|
|
88
87
|
},
|
|
89
88
|
backdropStyle: {
|
|
90
89
|
backgroundColor: 'rgba(0, 0, 0, 0.6)'
|
|
@@ -120,13 +119,34 @@ const CustomDropdown = ({
|
|
|
120
119
|
subContainerLeft,
|
|
121
120
|
showSearchBar,
|
|
122
121
|
sheetTitlePros,
|
|
122
|
+
dropdownBackgroundColor,
|
|
123
123
|
...props
|
|
124
124
|
}) => {
|
|
125
125
|
const styles = useStyles(props);
|
|
126
|
+
const buttonRef = _react.default.useRef(null);
|
|
127
|
+
const [autoPosition, setAutoPosition] = _react.default.useState('down');
|
|
126
128
|
const handlePress = event => {
|
|
127
129
|
event.stopPropagation();
|
|
128
130
|
onPress && onPress();
|
|
129
131
|
};
|
|
132
|
+
|
|
133
|
+
// 自动检测可用空间,决定向上还是向下显示
|
|
134
|
+
(0, _react.useEffect)(() => {
|
|
135
|
+
if (isVisible && subContainerPosition === 'auto' && buttonRef.current && _reactNative.Platform.OS === 'web') {
|
|
136
|
+
buttonRef.current.measure((_x, _y, _width, height, _pageX, pageY) => {
|
|
137
|
+
const windowHeight = window.innerHeight;
|
|
138
|
+
const spaceBelow = windowHeight - pageY - height;
|
|
139
|
+
const spaceAbove = pageY;
|
|
140
|
+
|
|
141
|
+
// 如果下方空间不足,且上方空间更大,则向上显示
|
|
142
|
+
if (spaceBelow < subHeight && spaceAbove > spaceBelow) {
|
|
143
|
+
setAutoPosition('up');
|
|
144
|
+
} else {
|
|
145
|
+
setAutoPosition('down');
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
}, [isVisible, subContainerPosition, subHeight]);
|
|
130
150
|
(0, _react.useEffect)(() => {
|
|
131
151
|
const handleClickOutside = () => {
|
|
132
152
|
if (isVisible) {
|
|
@@ -141,6 +161,11 @@ const CustomDropdown = ({
|
|
|
141
161
|
};
|
|
142
162
|
}, [isVisible]);
|
|
143
163
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
|
|
164
|
+
ref: buttonRef,
|
|
165
|
+
style: {
|
|
166
|
+
position: 'relative',
|
|
167
|
+
zIndex: isVisible ? 9999 : 1
|
|
168
|
+
},
|
|
144
169
|
children: [props.customButton ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
|
|
145
170
|
children: props.customButton
|
|
146
171
|
}) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.Button
|
|
@@ -194,18 +219,24 @@ const CustomDropdown = ({
|
|
|
194
219
|
}]
|
|
195
220
|
})]
|
|
196
221
|
}), !_common.isMobile && isVisible && (() => {
|
|
197
|
-
//
|
|
222
|
+
// 判断最终位置:auto 模式根据检测结果,否则根据 position 参数
|
|
223
|
+
const isUpPosition = subContainerPosition === 'auto' ? autoPosition === 'up' : subContainerPosition === 'upLeft' || subContainerPosition === 'upRight' || subContainerPosition === 'upCenter';
|
|
224
|
+
|
|
198
225
|
// 计算默认的 top 和 left 值
|
|
199
|
-
const defaultTop =
|
|
200
|
-
const defaultLeft = subContainerPosition === 'center' ? -(subWidth - width) / 2 : subContainerPosition === '
|
|
226
|
+
const defaultTop = isUpPosition ? -(subHeight + (showSearchBar ? 66 : 16)) : undefined;
|
|
227
|
+
const defaultLeft = subContainerPosition === 'center' || subContainerPosition === 'auto' && autoPosition === 'down' ? -(subWidth - width) / 2 : subContainerPosition === 'upCenter' ? -(subWidth - width) / 2 : subContainerPosition === 'right' || subContainerPosition === 'upRight' ? undefined : 0;
|
|
201
228
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
|
|
202
229
|
style: [styles.subContainer,
|
|
230
|
+
// 自定义背景色
|
|
231
|
+
dropdownBackgroundColor ? {
|
|
232
|
+
backgroundColor: dropdownBackgroundColor
|
|
233
|
+
} : {},
|
|
203
234
|
// 应用默认的位置样式(如果没有自定义值)
|
|
204
235
|
subContainerTop === undefined && defaultTop !== undefined ? {
|
|
205
236
|
top: defaultTop
|
|
206
237
|
} : {}, subContainerLeft === undefined && defaultLeft !== undefined ? {
|
|
207
238
|
left: defaultLeft
|
|
208
|
-
} : {}, subContainerPosition === 'right' && subContainerLeft === undefined ? {
|
|
239
|
+
} : {}, (subContainerPosition === 'right' || subContainerPosition === 'upRight') && subContainerLeft === undefined ? {
|
|
209
240
|
right: 0
|
|
210
241
|
} : {},
|
|
211
242
|
// 应用自定义的 top 和 left 值(优先级最高)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_themed","_Button","_TapasIcon","_interopRequireDefault","_SheetTitle","_common","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","SUB_CONTAINER_HEIGHT","SUB_CONTAINER_WIDTH","useStyles","makeStyles","theme","buttonContainer","backgroundColor","color","colors","primary","height","minWidth","maxHeight","paddingLeft","paddingRight","justifyContent","borderWidth","borderColor","grey2","buttonDisabled","grey4","buttonHovered","buttonSelected","title","fontSize","fontWeight","fonts","weightR","iconExpanded","transform","titleExpanded","dropdownIcon","secondary","subContainer","marginTop","display","flexDirection","white","borderRadius","radius","rounded","flex","elevation","shadowColor","shadowOffset","width","shadowOpacity","shadowRadius","overflow","position","top","zIndex","backdropStyle","bottomSheetContainer","bottom","left","right","borderTopLeftRadius","borderTopRightRadius","scrollView","CustomDropdown","children","isVisible","icon","value","onPress","onClose","subWidth","subHeight","subContainerPosition","subContainerStyle","subContainerTop","subContainerLeft","showSearchBar","sheetTitlePros","props","styles","handlePress","event","stopPropagation","useEffect","handleClickOutside","Platform","OS","document","addEventListener","removeEventListener","jsxs","View","customButton","jsx","Button","hoverStyle","dropdownButtonStyle","buttonStyle","dropdownButtonSelectedStyle","disabled","titleStyle","textExpandedStyle","type","Text","style","name","iconExpandedStyle","opacity","isMobile","defaultTop","undefined","defaultLeft","BottomSheet","containerStyle","onBackdropPress","ScrollView","scrollViewStyle","onPointerEnter","keyboardShouldPersistTaps","keyboardDismissMode","_default","exports","withTheme"],"sourceRoot":"../../../components","sources":["Dropdown/CustomDropdown.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_themed","_Button","_TapasIcon","_interopRequireDefault","_SheetTitle","_common","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","SUB_CONTAINER_HEIGHT","SUB_CONTAINER_WIDTH","useStyles","makeStyles","theme","buttonContainer","backgroundColor","color","colors","primary","height","minWidth","maxHeight","paddingLeft","paddingRight","justifyContent","borderWidth","borderColor","grey2","buttonDisabled","grey4","buttonHovered","buttonSelected","title","fontSize","fontWeight","fonts","weightR","iconExpanded","transform","titleExpanded","dropdownIcon","secondary","subContainer","marginTop","display","flexDirection","white","borderRadius","radius","rounded","elevation","shadowColor","shadowOffset","width","shadowOpacity","shadowRadius","overflow","position","top","zIndex","pointerEvents","backdropStyle","bottomSheetContainer","bottom","left","right","borderTopLeftRadius","borderTopRightRadius","scrollView","CustomDropdown","children","isVisible","icon","value","onPress","onClose","subWidth","subHeight","subContainerPosition","subContainerStyle","subContainerTop","subContainerLeft","showSearchBar","sheetTitlePros","dropdownBackgroundColor","props","styles","buttonRef","React","useRef","autoPosition","setAutoPosition","useState","handlePress","event","stopPropagation","useEffect","current","Platform","OS","measure","_x","_y","_width","_pageX","pageY","windowHeight","window","innerHeight","spaceBelow","spaceAbove","handleClickOutside","document","addEventListener","removeEventListener","jsxs","View","ref","style","customButton","jsx","Button","hoverStyle","dropdownButtonStyle","buttonStyle","dropdownButtonSelectedStyle","disabled","titleStyle","textExpandedStyle","type","Text","name","iconExpandedStyle","opacity","isMobile","isUpPosition","defaultTop","undefined","defaultLeft","BottomSheet","containerStyle","onBackdropPress","ScrollView","scrollViewStyle","onPointerEnter","keyboardShouldPersistTaps","keyboardDismissMode","_default","exports","withTheme"],"sourceRoot":"../../../components","sources":["Dropdown/CustomDropdown.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,305 @@
|
|
|
1
|
+
# Pagination 下拉框优化
|
|
2
|
+
|
|
3
|
+
## 版本 1.4.19 更新内容
|
|
4
|
+
|
|
5
|
+
### 主要改进
|
|
6
|
+
|
|
7
|
+
1. **自动位置检测** - 下拉框会自动检测可用空间,智能决定向上或向下显示
|
|
8
|
+
2. **背景色同步** - 下拉框背景色自动继承 Pagination 的背景色
|
|
9
|
+
3. **布局优化** - 修复下拉框展开时挤压文字的问题
|
|
10
|
+
|
|
11
|
+
## 向下兼容性 ✅
|
|
12
|
+
|
|
13
|
+
### 完全向下兼容
|
|
14
|
+
|
|
15
|
+
所有修改都是**向下兼容**的,不会破坏现有代码:
|
|
16
|
+
|
|
17
|
+
| 修改项 | 类型 | 影响 | 兼容性 |
|
|
18
|
+
|--------|------|------|--------|
|
|
19
|
+
| `pageSizePosition` 默认值 | 从 `undefined` 改为 `'auto'` | 行为改进 | ✅ 完全兼容 |
|
|
20
|
+
| `dropdownBackgroundColor` | 新增可选参数 | 无影响 | ✅ 完全兼容 |
|
|
21
|
+
| `TDropdownPosition` 新增 `'auto'` | 类型扩展 | 无影响 | ✅ 完全兼容 |
|
|
22
|
+
| z-index 提升 | 从 1000 → 9999 | 更好的层级 | ✅ 完全兼容 |
|
|
23
|
+
|
|
24
|
+
### 迁移说明
|
|
25
|
+
|
|
26
|
+
**不需要任何代码修改**!现有代码可以直接升级。
|
|
27
|
+
|
|
28
|
+
```typescript
|
|
29
|
+
// 现有代码无需修改
|
|
30
|
+
<Pagination
|
|
31
|
+
totalCount="Total: 20"
|
|
32
|
+
pageParams={pageParams}
|
|
33
|
+
onPageChange={handlePageChange}
|
|
34
|
+
/>
|
|
35
|
+
|
|
36
|
+
// 可选:使用新功能
|
|
37
|
+
<Pagination
|
|
38
|
+
totalCount="Total: 20"
|
|
39
|
+
pageParams={pageParams}
|
|
40
|
+
backgroundColor="#F5F5F5" // 下拉框会自动继承
|
|
41
|
+
pageSizePosition="auto" // 自动检测位置(默认值)
|
|
42
|
+
onPageChange={handlePageChange}
|
|
43
|
+
/>
|
|
44
|
+
```
|
|
45
|
+
|
|
46
|
+
## 父级样式要求
|
|
47
|
+
|
|
48
|
+
### ⚠️ 重要:容器要求
|
|
49
|
+
|
|
50
|
+
TapasPagination 使用**绝对定位**的下拉框,需要满足以下条件:
|
|
51
|
+
|
|
52
|
+
#### 1. 父容器需要有定位上下文
|
|
53
|
+
|
|
54
|
+
```typescript
|
|
55
|
+
// ✅ 正确:父容器有 position
|
|
56
|
+
<View style={{ position: 'relative' }}>
|
|
57
|
+
<Pagination {...props} />
|
|
58
|
+
</View>
|
|
59
|
+
|
|
60
|
+
// ✅ 正确:使用 flex 容器
|
|
61
|
+
<View style={{ display: 'flex', flexDirection: 'column' }}>
|
|
62
|
+
<Pagination {...props} />
|
|
63
|
+
</View>
|
|
64
|
+
|
|
65
|
+
// ❌ 错误:可能导致下拉框定位异常
|
|
66
|
+
<View>
|
|
67
|
+
<Pagination {...props} />
|
|
68
|
+
</View>
|
|
69
|
+
```
|
|
70
|
+
|
|
71
|
+
#### 2. 父容器需要有足够的 z-index 空间
|
|
72
|
+
|
|
73
|
+
```typescript
|
|
74
|
+
// ✅ 正确:确保父容器 z-index 不会限制下拉框
|
|
75
|
+
<View style={{ position: 'relative', zIndex: 10 }}>
|
|
76
|
+
<Pagination {...props} /> {/* 下拉框 z-index: 9999 */}
|
|
77
|
+
</View>
|
|
78
|
+
|
|
79
|
+
// ❌ 错误:父容器 z-index 过高可能被其他元素遮挡
|
|
80
|
+
<View style={{ position: 'relative', zIndex: 99999 }}>
|
|
81
|
+
<Pagination {...props} />
|
|
82
|
+
</View>
|
|
83
|
+
```
|
|
84
|
+
|
|
85
|
+
#### 3. 避免 overflow: hidden 裁剪
|
|
86
|
+
|
|
87
|
+
```typescript
|
|
88
|
+
// ✅ 正确:允许下拉框溢出
|
|
89
|
+
<View style={{ position: 'relative', overflow: 'visible' }}>
|
|
90
|
+
<Pagination {...props} />
|
|
91
|
+
</View>
|
|
92
|
+
|
|
93
|
+
// ❌ 错误:下拉框会被裁剪
|
|
94
|
+
<View style={{ overflow: 'hidden' }}>
|
|
95
|
+
<Pagination {...props} />
|
|
96
|
+
</View>
|
|
97
|
+
```
|
|
98
|
+
|
|
99
|
+
### 推荐的父容器配置
|
|
100
|
+
|
|
101
|
+
```typescript
|
|
102
|
+
// 完美的父容器配置
|
|
103
|
+
<View style={{
|
|
104
|
+
position: 'relative',
|
|
105
|
+
overflow: 'visible', // 允许下拉框溢出
|
|
106
|
+
zIndex: 1, // 合理的层级
|
|
107
|
+
minHeight: 48, // Pagination 的最小高度
|
|
108
|
+
}}>
|
|
109
|
+
<Pagination
|
|
110
|
+
totalCount="Total: 20"
|
|
111
|
+
pageParams={pageParams}
|
|
112
|
+
backgroundColor="#FFFFFF"
|
|
113
|
+
pageSizePosition="auto" // 自动检测空间
|
|
114
|
+
/>
|
|
115
|
+
</View>
|
|
116
|
+
```
|
|
117
|
+
|
|
118
|
+
## 新功能详解
|
|
119
|
+
|
|
120
|
+
### 1. 自动位置检测 (`auto`)
|
|
121
|
+
|
|
122
|
+
下拉框会智能检测可用空间:
|
|
123
|
+
|
|
124
|
+
```typescript
|
|
125
|
+
<Pagination
|
|
126
|
+
totalCount="Total: 100"
|
|
127
|
+
pageParams={pageParams}
|
|
128
|
+
pageSizePosition="auto" // 默认值,自动检测
|
|
129
|
+
/>
|
|
130
|
+
```
|
|
131
|
+
|
|
132
|
+
**工作原理**:
|
|
133
|
+
- 检测按钮下方可用空间
|
|
134
|
+
- 检测按钮上方可用空间
|
|
135
|
+
- 如果下方空间不足且上方空间更大,向上展开
|
|
136
|
+
- 否则向下展开
|
|
137
|
+
|
|
138
|
+
### 2. 背景色自动继承
|
|
139
|
+
|
|
140
|
+
```typescript
|
|
141
|
+
<Pagination
|
|
142
|
+
totalCount="Total: 100"
|
|
143
|
+
pageParams={pageParams}
|
|
144
|
+
backgroundColor="#E3F2FD" // 下拉框自动使用相同背景色
|
|
145
|
+
/>
|
|
146
|
+
```
|
|
147
|
+
|
|
148
|
+
### 3. 手动控制位置(依然支持)
|
|
149
|
+
|
|
150
|
+
```typescript
|
|
151
|
+
<Pagination
|
|
152
|
+
totalCount="Total: 100"
|
|
153
|
+
pageParams={pageParams}
|
|
154
|
+
pageSizePosition="upCenter" // 强制向上居中
|
|
155
|
+
/>
|
|
156
|
+
```
|
|
157
|
+
|
|
158
|
+
支持的位置:
|
|
159
|
+
- `'auto'` - 自动检测(推荐,默认)
|
|
160
|
+
- `'upCenter'` - 向上居中
|
|
161
|
+
- `'upLeft'` - 向上左对齐
|
|
162
|
+
- `'upRight'` - 向上右对齐
|
|
163
|
+
- `'center'` - 向下居中
|
|
164
|
+
- `'left'` - 向下左对齐
|
|
165
|
+
- `'right'` - 向下右对齐
|
|
166
|
+
|
|
167
|
+
## 常见问题
|
|
168
|
+
|
|
169
|
+
### Q: 下拉框被裁剪了怎么办?
|
|
170
|
+
|
|
171
|
+
A: 检查父容器是否有 `overflow: 'hidden'`,改为 `overflow: 'visible'`
|
|
172
|
+
|
|
173
|
+
```typescript
|
|
174
|
+
// 修复前
|
|
175
|
+
<View style={{ overflow: 'hidden' }}>
|
|
176
|
+
<Pagination {...props} />
|
|
177
|
+
</View>
|
|
178
|
+
|
|
179
|
+
// 修复后
|
|
180
|
+
<View style={{ overflow: 'visible' }}>
|
|
181
|
+
<Pagination {...props} />
|
|
182
|
+
</View>
|
|
183
|
+
```
|
|
184
|
+
|
|
185
|
+
### Q: 下拉框定位异常怎么办?
|
|
186
|
+
|
|
187
|
+
A: 确保父容器有 `position: 'relative'`
|
|
188
|
+
|
|
189
|
+
```typescript
|
|
190
|
+
<View style={{ position: 'relative' }}>
|
|
191
|
+
<Pagination {...props} />
|
|
192
|
+
</View>
|
|
193
|
+
```
|
|
194
|
+
|
|
195
|
+
### Q: 下拉框被其他元素遮挡怎么办?
|
|
196
|
+
|
|
197
|
+
A: 检查其他元素的 z-index,确保不超过 9999
|
|
198
|
+
|
|
199
|
+
```typescript
|
|
200
|
+
// 其他浮动元素
|
|
201
|
+
<View style={{ position: 'absolute', zIndex: 999 }}>
|
|
202
|
+
{/* z-index < 9999,不会遮挡下拉框 */}
|
|
203
|
+
</View>
|
|
204
|
+
```
|
|
205
|
+
|
|
206
|
+
### Q: 如何禁用自动检测?
|
|
207
|
+
|
|
208
|
+
A: 手动指定位置
|
|
209
|
+
|
|
210
|
+
```typescript
|
|
211
|
+
<Pagination
|
|
212
|
+
totalCount="Total: 100"
|
|
213
|
+
pageParams={pageParams}
|
|
214
|
+
pageSizePosition="upCenter" // 强制向上
|
|
215
|
+
/>
|
|
216
|
+
```
|
|
217
|
+
|
|
218
|
+
## 性能考虑
|
|
219
|
+
|
|
220
|
+
自动位置检测仅在 Web 平台生效:
|
|
221
|
+
- **Web**: 使用 `measure` API 检测空间
|
|
222
|
+
- **移动端**: 使用 BottomSheet,无需检测
|
|
223
|
+
|
|
224
|
+
## 最佳实践
|
|
225
|
+
|
|
226
|
+
### 1. 表格底部的分页器
|
|
227
|
+
|
|
228
|
+
```typescript
|
|
229
|
+
<View style={{ position: 'relative', overflow: 'visible' }}>
|
|
230
|
+
<DataTable data={data} />
|
|
231
|
+
<Pagination
|
|
232
|
+
totalCount={`Total: ${total}`}
|
|
233
|
+
pageParams={pageParams}
|
|
234
|
+
pageSizePosition="auto" // 自动检测
|
|
235
|
+
/>
|
|
236
|
+
</View>
|
|
237
|
+
```
|
|
238
|
+
|
|
239
|
+
### 2. 固定在页面底部
|
|
240
|
+
|
|
241
|
+
```typescript
|
|
242
|
+
<View style={{
|
|
243
|
+
position: 'fixed',
|
|
244
|
+
bottom: 0,
|
|
245
|
+
left: 0,
|
|
246
|
+
right: 0,
|
|
247
|
+
backgroundColor: '#FFF',
|
|
248
|
+
zIndex: 100,
|
|
249
|
+
}}>
|
|
250
|
+
<Pagination
|
|
251
|
+
totalCount={`Total: ${total}`}
|
|
252
|
+
pageParams={pageParams}
|
|
253
|
+
pageSizePosition="upCenter" // 固定在底部时强制向上
|
|
254
|
+
/>
|
|
255
|
+
</View>
|
|
256
|
+
```
|
|
257
|
+
|
|
258
|
+
### 3. 自定义样式容器
|
|
259
|
+
|
|
260
|
+
```typescript
|
|
261
|
+
<View style={{
|
|
262
|
+
position: 'relative',
|
|
263
|
+
overflow: 'visible',
|
|
264
|
+
padding: 16,
|
|
265
|
+
borderRadius: 8,
|
|
266
|
+
boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
|
|
267
|
+
}}>
|
|
268
|
+
<Pagination
|
|
269
|
+
totalCount={`Total: ${total}`}
|
|
270
|
+
pageParams={pageParams}
|
|
271
|
+
backgroundColor="transparent" // 透明背景
|
|
272
|
+
/>
|
|
273
|
+
</View>
|
|
274
|
+
```
|
|
275
|
+
|
|
276
|
+
## 技术细节
|
|
277
|
+
|
|
278
|
+
### z-index 层级
|
|
279
|
+
|
|
280
|
+
```
|
|
281
|
+
App Container z-index: 0
|
|
282
|
+
└─ Content z-index: 1
|
|
283
|
+
└─ Pagination z-index: 1
|
|
284
|
+
└─ Dropdown (展开) z-index: 9999
|
|
285
|
+
```
|
|
286
|
+
|
|
287
|
+
### 自动检测算法
|
|
288
|
+
|
|
289
|
+
```typescript
|
|
290
|
+
if (spaceBelow < dropdownHeight && spaceAbove > spaceBelow) {
|
|
291
|
+
// 下方空间不足 且 上方空间更大 → 向上
|
|
292
|
+
position = 'up';
|
|
293
|
+
} else {
|
|
294
|
+
// 其他情况 → 向下
|
|
295
|
+
position = 'down';
|
|
296
|
+
}
|
|
297
|
+
```
|
|
298
|
+
|
|
299
|
+
## 版本历史
|
|
300
|
+
|
|
301
|
+
- **v1.4.19**:
|
|
302
|
+
- 新增自动位置检测
|
|
303
|
+
- 背景色自动继承
|
|
304
|
+
- 修复展开时挤压文字问题
|
|
305
|
+
- 提升 z-index 避免遮挡
|
|
@@ -119,7 +119,8 @@ const Pagination = props => {
|
|
|
119
119
|
visibleTotalCount = !_common.isMobile,
|
|
120
120
|
onPageSizeChange,
|
|
121
121
|
onPageChange,
|
|
122
|
-
backgroundColor
|
|
122
|
+
backgroundColor,
|
|
123
|
+
pageSizePosition = 'auto'
|
|
123
124
|
} = props;
|
|
124
125
|
const [isVisible, setIsVisible] = _react.default.useState(false);
|
|
125
126
|
const [pageGroup, setPageGroup] = _react.default.useState({
|
|
@@ -251,12 +252,15 @@ const Pagination = props => {
|
|
|
251
252
|
textExpandedStyle: styles.textExpandedStyle
|
|
252
253
|
// @ts-ignore
|
|
253
254
|
,
|
|
254
|
-
iconExpandedStyle: styles.textExpandedStyle
|
|
255
|
+
iconExpandedStyle: styles.textExpandedStyle
|
|
256
|
+
// @ts-ignore
|
|
257
|
+
,
|
|
258
|
+
dropdownBackgroundColor: backgroundColor || undefined,
|
|
255
259
|
onChange: item => {
|
|
256
260
|
selectedItem(item);
|
|
257
261
|
onPageSizeChange && onPageSizeChange(item);
|
|
258
262
|
},
|
|
259
|
-
subContainerPosition:
|
|
263
|
+
subContainerPosition: pageSizePosition,
|
|
260
264
|
isVisible: isVisible,
|
|
261
265
|
onClose: () => {
|
|
262
266
|
setIsVisible(!isVisible);
|