@etsoo/materialui 1.5.16 → 1.5.17
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.
|
@@ -29,7 +29,7 @@ export interface ScrollerListExInnerItemRendererProps<T> extends ListChildCompon
|
|
|
29
29
|
* 2. Static sets
|
|
30
30
|
* 3. Dynamic left & right margin calculation
|
|
31
31
|
*/
|
|
32
|
-
export type ScrollerListExItemSize = ((index: number) => [number, number] | [number, number, object]) | [number, number] | [number, object, number?];
|
|
32
|
+
export type ScrollerListExItemSize = ((index: number) => [number, number] | [number, number, object]) | [number, number] | [number, object, (number | string)?];
|
|
33
33
|
/**
|
|
34
34
|
* Extended ScrollerList Props
|
|
35
35
|
*/
|
|
@@ -58,7 +58,8 @@ const defaultMargin = (margin, horizon) => {
|
|
|
58
58
|
marginBottom: half
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
-
if (horizon >= 0)
|
|
61
|
+
if ((typeof horizon === "number" && horizon >= 0) ||
|
|
62
|
+
(typeof horizon === "string" && /^-?\d+/.test(horizon))) {
|
|
62
63
|
return {
|
|
63
64
|
marginLeft: horizon,
|
|
64
65
|
marginRight: horizon,
|
|
@@ -29,7 +29,7 @@ export interface ScrollerListExInnerItemRendererProps<T> extends ListChildCompon
|
|
|
29
29
|
* 2. Static sets
|
|
30
30
|
* 3. Dynamic left & right margin calculation
|
|
31
31
|
*/
|
|
32
|
-
export type ScrollerListExItemSize = ((index: number) => [number, number] | [number, number, object]) | [number, number] | [number, object, number?];
|
|
32
|
+
export type ScrollerListExItemSize = ((index: number) => [number, number] | [number, number, object]) | [number, number] | [number, object, (number | string)?];
|
|
33
33
|
/**
|
|
34
34
|
* Extended ScrollerList Props
|
|
35
35
|
*/
|
|
@@ -52,7 +52,8 @@ const defaultMargin = (margin, horizon) => {
|
|
|
52
52
|
marginBottom: half
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
|
-
if (horizon >= 0)
|
|
55
|
+
if ((typeof horizon === "number" && horizon >= 0) ||
|
|
56
|
+
(typeof horizon === "string" && /^-?\d+/.test(horizon))) {
|
|
56
57
|
return {
|
|
57
58
|
marginLeft: horizon,
|
|
58
59
|
marginRight: horizon,
|
package/package.json
CHANGED
package/src/ScrollerListEx.tsx
CHANGED
|
@@ -48,7 +48,7 @@ const createGridStyle = (
|
|
|
48
48
|
|
|
49
49
|
// Default margin
|
|
50
50
|
// horizon: null means full horizontal margin, -1 means all half, >=0 means left/right
|
|
51
|
-
const defaultMargin = (margin: object, horizon?: number) => {
|
|
51
|
+
const defaultMargin = (margin: object, horizon?: number | string) => {
|
|
52
52
|
const half = MUGlobal.half(margin);
|
|
53
53
|
|
|
54
54
|
if (horizon == null) {
|
|
@@ -61,7 +61,10 @@ const defaultMargin = (margin: object, horizon?: number) => {
|
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
if (
|
|
64
|
+
if (
|
|
65
|
+
(typeof horizon === "number" && horizon >= 0) ||
|
|
66
|
+
(typeof horizon === "string" && /^-?\d+/.test(horizon))
|
|
67
|
+
) {
|
|
65
68
|
return {
|
|
66
69
|
marginLeft: horizon,
|
|
67
70
|
marginRight: horizon,
|
|
@@ -113,7 +116,7 @@ export interface ScrollerListExInnerItemRendererProps<T>
|
|
|
113
116
|
export type ScrollerListExItemSize =
|
|
114
117
|
| ((index: number) => [number, number] | [number, number, object])
|
|
115
118
|
| [number, number]
|
|
116
|
-
| [number, object, number?];
|
|
119
|
+
| [number, object, (number | string)?];
|
|
117
120
|
|
|
118
121
|
/**
|
|
119
122
|
* Extended ScrollerList Props
|