@draftbit/core 50.2.2-8f086c.2 → 50.2.2
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/lib/commonjs/components/ActivityIndicator.js +1 -1
- package/lib/typescript/src/components/ActivityIndicator.d.ts +1 -0
- package/lib/typescript/src/components/ActivityIndicator.js +16 -9
- package/lib/typescript/src/components/ActivityIndicator.js.map +1 -1
- package/lib/typescript/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/components/ActivityIndicator.js +16 -9
- package/src/components/ActivityIndicator.js.map +1 -1
- package/src/components/ActivityIndicator.tsx +26 -11
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@draftbit/core",
|
|
3
|
-
"version": "50.2.2
|
|
3
|
+
"version": "50.2.2",
|
|
4
4
|
"description": "Core (non-native) Components",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"types": "lib/typescript/src/index.d.ts",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@date-io/date-fns": "^1.3.13",
|
|
43
43
|
"@draftbit/react-theme-provider": "^2.1.1",
|
|
44
|
-
"@draftbit/theme": "
|
|
44
|
+
"@draftbit/theme": "50.2.2",
|
|
45
45
|
"@expo/vector-icons": "^14.0.0",
|
|
46
46
|
"@gorhom/bottom-sheet": "5.0.0-alpha.7",
|
|
47
47
|
"@material-ui/core": "^4.11.0",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
],
|
|
119
119
|
"testEnvironment": "node"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "fc584384026b412a7213229468ba320f832a7cfe"
|
|
122
122
|
}
|
|
@@ -4,6 +4,7 @@ import { withTheme } from "@draftbit/theme";
|
|
|
4
4
|
import { Bounce, Chase, Circle, CircleFade, Flow, Fold, Grid, Plane, Pulse, Swing, Wander, Wave, } from "react-native-animated-spinkit";
|
|
5
5
|
export var ActivityIndicatorType;
|
|
6
6
|
(function (ActivityIndicatorType) {
|
|
7
|
+
ActivityIndicatorType["default"] = "default";
|
|
7
8
|
ActivityIndicatorType["plane"] = "plane";
|
|
8
9
|
ActivityIndicatorType["chase"] = "chase";
|
|
9
10
|
ActivityIndicatorType["bounce"] = "bounce";
|
|
@@ -45,23 +46,29 @@ const getScaleLevel = (size) => {
|
|
|
45
46
|
return size / smallActivityIndicatorSize;
|
|
46
47
|
return size === "large" ? 2 : 1;
|
|
47
48
|
};
|
|
48
|
-
const ActivityIndicator = ({
|
|
49
|
+
const ActivityIndicator = ({ theme, color = theme.colors.branding.primary, type = ActivityIndicatorType.default, size = "small", style, ...rest }) => {
|
|
49
50
|
const sizeNumber = getLoadingSizeNumber(size);
|
|
50
51
|
const spinnerColor = color !== null && color !== void 0 ? color : theme.colors.branding.primary;
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
// Handle display spinner type
|
|
53
|
+
if (type !== ActivityIndicatorType.default) {
|
|
54
|
+
if (type && SPINNER_COMPONENTS[type]) {
|
|
55
|
+
const SpinnerComponent = SPINNER_COMPONENTS[type];
|
|
56
|
+
return (React.createElement(SpinnerComponent, { size: sizeNumber, color: spinnerColor, style: style }));
|
|
57
|
+
}
|
|
54
58
|
}
|
|
55
59
|
// This is due to limitations with iOS UIActivityIndicator
|
|
56
60
|
// Refer: https://github.com/facebook/react-native/issues/12250
|
|
57
61
|
const scaleLevel = getScaleLevel(size);
|
|
58
62
|
if (Platform.OS === "ios") {
|
|
59
|
-
return (React.createElement(View, { style:
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
+
return (React.createElement(View, { style: [
|
|
64
|
+
style,
|
|
65
|
+
{
|
|
66
|
+
transform: [{ scale: scaleLevel }],
|
|
67
|
+
},
|
|
68
|
+
] },
|
|
69
|
+
React.createElement(ActivityIndicatorRN, { animating: true, hidesWhenStopped: true, size: "small", color: spinnerColor, ...rest })));
|
|
63
70
|
}
|
|
64
|
-
return (React.createElement(ActivityIndicatorRN, { animating: true, hidesWhenStopped: true, size: size, color:
|
|
71
|
+
return (React.createElement(ActivityIndicatorRN, { animating: true, hidesWhenStopped: true, size: size, color: spinnerColor, style: style, ...rest }));
|
|
65
72
|
};
|
|
66
73
|
export default withTheme(ActivityIndicator);
|
|
67
74
|
//# sourceMappingURL=ActivityIndicator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActivityIndicator.js","sourceRoot":"","sources":["ActivityIndicator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,iBAAiB,IAAI,mBAAmB,EACxC,IAAI,EACJ,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,IAAI,GACL,MAAM,+BAA+B,CAAC;AAEvC,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"ActivityIndicator.js","sourceRoot":"","sources":["ActivityIndicator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGL,iBAAiB,IAAI,mBAAmB,EACxC,IAAI,EACJ,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACL,MAAM,EACN,KAAK,EACL,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAM,EACN,IAAI,GACL,MAAM,+BAA+B,CAAC;AAEvC,MAAM,CAAN,IAAY,qBAcX;AAdD,WAAY,qBAAqB;IAC/B,4CAAmB,CAAA;IACnB,wCAAe,CAAA;IACf,wCAAe,CAAA;IACf,0CAAiB,CAAA;IACjB,sCAAa,CAAA;IACb,wCAAe,CAAA;IACf,sCAAa,CAAA;IACb,wCAAe,CAAA;IACf,0CAAiB,CAAA;IACjB,kDAAyB,CAAA;IACzB,sCAAa,CAAA;IACb,sCAAa,CAAA;IACb,0CAAiB,CAAA;AACnB,CAAC,EAdW,qBAAqB,KAArB,qBAAqB,QAchC;AAUD,MAAM,kBAAkB,GAAG;IACzB,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,KAAK;IACpC,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,KAAK;IACpC,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM;IACtC,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI;IAClC,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,KAAK;IACpC,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI;IAClC,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,KAAK;IACpC,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM;IACtC,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,UAAU;IAC9C,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI;IAClC,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI;IAClC,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,MAAM;CACvC,CAAC;AAEF,MAAM,0BAA0B,GAAG,EAAE,CAAC;AACtC,MAAM,0BAA0B,GAAG,EAAE,CAAC;AAEtC,MAAM,oBAAoB,GAAG,CAAC,IAAiC,EAAU,EAAE;IACzE,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,OAAO,IAAI,KAAK,OAAO;QACrB,CAAC,CAAC,0BAA0B;QAC5B,CAAC,CAAC,0BAA0B,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAiC,EAAU,EAAE;IAClE,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,GAAG,0BAA0B,CAAC;IACvE,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAA6C,CAAC,EACnE,KAAK,EACL,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EACrC,IAAI,GAAG,qBAAqB,CAAC,OAAO,EACpC,IAAI,GAAG,OAAO,EACd,KAAK,EACL,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,UAAU,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,YAAY,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAE5D,8BAA8B;IAC9B,IAAI,IAAI,KAAK,qBAAqB,CAAC,OAAO,EAAE;QAC1C,IAAI,IAAI,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE;YACpC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAClD,OAAO,CACL,oBAAC,gBAAgB,IACf,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,KAAK,GACZ,CACH,CAAC;SACH;KACF;IAED,0DAA0D;IAC1D,+DAA+D;IAC/D,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE;QACzB,OAAO,CACL,oBAAC,IAAI,IACH,KAAK,EAAE;gBACL,KAAK;gBACL;oBACE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;iBACnC;aACF;YAED,oBAAC,mBAAmB,IAClB,SAAS,EAAE,IAAI,EACf,gBAAgB,EAAE,IAAI,EACtB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,YAAY,KACf,IAAI,GACR,CACG,CACR,CAAC;KACH;IACD,OAAO,CACL,oBAAC,mBAAmB,IAClB,SAAS,EAAE,IAAI,EACf,gBAAgB,EAAE,IAAI,EACtB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,KAAK,KACR,IAAI,GACR,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
} from "react-native-animated-spinkit";
|
|
25
25
|
|
|
26
26
|
export enum ActivityIndicatorType {
|
|
27
|
+
default = "default",
|
|
27
28
|
plane = "plane",
|
|
28
29
|
chase = "chase",
|
|
29
30
|
bounce = "bounce",
|
|
@@ -77,18 +78,28 @@ const getScaleLevel = (size?: number | "small" | "large"): number => {
|
|
|
77
78
|
};
|
|
78
79
|
|
|
79
80
|
const ActivityIndicator: React.FC<React.PropsWithChildren<Props>> = ({
|
|
80
|
-
color,
|
|
81
81
|
theme,
|
|
82
|
-
|
|
83
|
-
|
|
82
|
+
color = theme.colors.branding.primary,
|
|
83
|
+
type = ActivityIndicatorType.default,
|
|
84
|
+
size = "small",
|
|
85
|
+
style,
|
|
84
86
|
...rest
|
|
85
87
|
}) => {
|
|
86
88
|
const sizeNumber = getLoadingSizeNumber(size);
|
|
87
89
|
const spinnerColor = color ?? theme.colors.branding.primary;
|
|
88
90
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
91
|
+
// Handle display spinner type
|
|
92
|
+
if (type !== ActivityIndicatorType.default) {
|
|
93
|
+
if (type && SPINNER_COMPONENTS[type]) {
|
|
94
|
+
const SpinnerComponent = SPINNER_COMPONENTS[type];
|
|
95
|
+
return (
|
|
96
|
+
<SpinnerComponent
|
|
97
|
+
size={sizeNumber}
|
|
98
|
+
color={spinnerColor}
|
|
99
|
+
style={style}
|
|
100
|
+
/>
|
|
101
|
+
);
|
|
102
|
+
}
|
|
92
103
|
}
|
|
93
104
|
|
|
94
105
|
// This is due to limitations with iOS UIActivityIndicator
|
|
@@ -97,15 +108,18 @@ const ActivityIndicator: React.FC<React.PropsWithChildren<Props>> = ({
|
|
|
97
108
|
if (Platform.OS === "ios") {
|
|
98
109
|
return (
|
|
99
110
|
<View
|
|
100
|
-
style={
|
|
101
|
-
|
|
102
|
-
|
|
111
|
+
style={[
|
|
112
|
+
style,
|
|
113
|
+
{
|
|
114
|
+
transform: [{ scale: scaleLevel }],
|
|
115
|
+
},
|
|
116
|
+
]}
|
|
103
117
|
>
|
|
104
118
|
<ActivityIndicatorRN
|
|
105
119
|
animating={true}
|
|
106
120
|
hidesWhenStopped={true}
|
|
107
121
|
size={"small"}
|
|
108
|
-
color={
|
|
122
|
+
color={spinnerColor}
|
|
109
123
|
{...rest}
|
|
110
124
|
/>
|
|
111
125
|
</View>
|
|
@@ -116,7 +130,8 @@ const ActivityIndicator: React.FC<React.PropsWithChildren<Props>> = ({
|
|
|
116
130
|
animating={true}
|
|
117
131
|
hidesWhenStopped={true}
|
|
118
132
|
size={size}
|
|
119
|
-
color={
|
|
133
|
+
color={spinnerColor}
|
|
134
|
+
style={style}
|
|
120
135
|
{...rest}
|
|
121
136
|
/>
|
|
122
137
|
);
|