taro-react-uilib 1.3.4-4 → 1.3.4-6
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/CHANGELOG.md +18 -0
- package/dist/components/Tabbar/tabbar/Tabbar.js +1 -1
- package/dist/components/Tabbar/tabbar/Tabbar.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/index.umd.js +1 -1
- package/dist/index.umd.js.map +1 -1
- package/dist/styles/components/captcha.scss +1 -1
- package/dist/styles/components/tabbar.scss +6 -2
- package/lib/components/Tabbar/tabbar/Tabbar.js +14 -4
- package/lib/components/Tabbar/tabbar/Tabbar.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
#{$xh-prefix}-tabbar {
|
|
5
|
+
display: flex;
|
|
6
|
+
flex-direction: column;
|
|
7
|
+
overflow: hidden;
|
|
8
|
+
height: 100%;
|
|
5
9
|
&-nav {
|
|
6
10
|
display: flex;
|
|
7
11
|
align-items: center;
|
|
@@ -28,10 +32,10 @@
|
|
|
28
32
|
}
|
|
29
33
|
}
|
|
30
34
|
&-content {
|
|
31
|
-
overflow:
|
|
35
|
+
overflow-y: scroll;
|
|
32
36
|
&-item {
|
|
37
|
+
overflow: hidden;
|
|
33
38
|
width: 750px;
|
|
34
|
-
padding: 0 40px;
|
|
35
39
|
float: left;
|
|
36
40
|
box-sizing: border-box;
|
|
37
41
|
}
|
|
@@ -8,11 +8,13 @@ const XHTabs = props => {
|
|
|
8
8
|
const [selectIndex, setSelectIndex] = useState(initIndex);
|
|
9
9
|
const [tabWdith, setTabWdith] = useState(0);
|
|
10
10
|
const [tabContentHeight, setTabContentHeight] = useState(0);
|
|
11
|
+
const [tabSlotHeight, setTabSlotHeight] = useState(0);
|
|
11
12
|
useEffect(() => {
|
|
12
13
|
const timer = setTimeout(() => {
|
|
13
14
|
const query = createSelectorQuery();
|
|
14
15
|
query.selectAll(".xh-tabbar-nav-item").boundingClientRect();
|
|
15
16
|
query.selectAll(".xh-tabbar-content-item").boundingClientRect();
|
|
17
|
+
query.selectAll(".xh-tabbar-content-slot").boundingClientRect();
|
|
16
18
|
query.exec(res => {
|
|
17
19
|
if (!res[0][selectIndex])
|
|
18
20
|
return;
|
|
@@ -20,8 +22,10 @@ const XHTabs = props => {
|
|
|
20
22
|
setTabWdith(width);
|
|
21
23
|
if (!res[1][selectIndex])
|
|
22
24
|
return;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
setTabContentHeight(res[1][selectIndex].height);
|
|
26
|
+
if (!res[2][selectIndex])
|
|
27
|
+
return;
|
|
28
|
+
setTabSlotHeight(res[2][selectIndex].height);
|
|
25
29
|
clearTimeout(timer);
|
|
26
30
|
});
|
|
27
31
|
}, 300);
|
|
@@ -31,11 +35,15 @@ const XHTabs = props => {
|
|
|
31
35
|
setSelectIndex(index);
|
|
32
36
|
const query = createSelectorQuery();
|
|
33
37
|
query.selectAll(".xh-tabbar-content-item").boundingClientRect();
|
|
38
|
+
query.selectAll(".xh-tabbar-content-slot").boundingClientRect();
|
|
34
39
|
query.exec(res => {
|
|
35
40
|
if (!res[0][index])
|
|
36
41
|
return;
|
|
37
42
|
const height = res[0][index].height;
|
|
38
43
|
setTabContentHeight(height);
|
|
44
|
+
if (!res[1][selectIndex])
|
|
45
|
+
return;
|
|
46
|
+
setTabSlotHeight(res[1][selectIndex].height);
|
|
39
47
|
});
|
|
40
48
|
onChange && onChange(index);
|
|
41
49
|
};
|
|
@@ -59,9 +67,11 @@ const XHTabs = props => {
|
|
|
59
67
|
renderLine()),
|
|
60
68
|
React.createElement(View, { className: "xh-tabbar-content", style: {
|
|
61
69
|
width: `${children.length * 100}%`,
|
|
62
|
-
height: tabContentHeight
|
|
70
|
+
height: tabContentHeight + tabSlotHeight
|
|
71
|
+
? `${tabContentHeight + tabSlotHeight}px`
|
|
72
|
+
: "auto",
|
|
63
73
|
} },
|
|
64
|
-
content && React.createElement(View,
|
|
74
|
+
content && React.createElement(View, { className: "xh-tabbar-content-slot" }, content),
|
|
65
75
|
children.map((child, index) => (React.createElement(View, { key: index, className: classNames("xh-tabbar-content-item", {
|
|
66
76
|
"xh-tabbar-content-item-dispaly": selectIndex !== index && !animated,
|
|
67
77
|
"xh-tabbar-content-item-active": selectIndex === index,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tabbar.js","sourceRoot":"","sources":["../../../../src/components/Tabbar/tabbar/Tabbar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAoB,SAAS,EAAE,QAAQ,EAAa,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AA+B7B,MAAM,MAAM,GAA4B,KAAK,CAAC,EAAE;IAC9C,MAAM,EACJ,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,KAAK,EAChB,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,SAAS,EACrB,gBAAgB,GAAG,MAAM,EACzB,iBAAiB,GAAG,MAAM,EAC1B,QAAQ,EACR,OAAO,GACR,GAAG,KAAK,CAAC;IAEV,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Tabbar.js","sourceRoot":"","sources":["../../../../src/components/Tabbar/tabbar/Tabbar.tsx"],"names":[],"mappings":"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"}
|