@codeleap/mobile 2.2.11 → 2.3.1
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/dist/components/List/styles.js +1 -1
- package/dist/components/List/styles.js.map +1 -1
- package/dist/utils/theme.d.ts +1 -0
- package/dist/utils/theme.js +7 -2
- package/dist/utils/theme.js.map +1 -1
- package/package.json +2 -1
- package/src/components/List/styles.ts +1 -1
- package/src/utils/theme.ts +4 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/components/List/styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,2CAAkE;AAIlE,IAAM,eAAe,GAAG,IAAA,oCAA2B,GAAmB,CAAA;AAEzD,QAAA,UAAU,GAAG;IACxB,OAAO,EAAE,eAAe,CAAC,UAAC,KAAK;QAC7B,IAAM,aAAa,GAAG,qBAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACjD,6BACK,aAAa,KAChB,SAAS,EAAE;gBACT,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../src/components/List/styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,2CAAkE;AAIlE,IAAM,eAAe,GAAG,IAAA,oCAA2B,GAAmB,CAAA;AAEzD,QAAA,UAAU,GAAG;IACxB,OAAO,EAAE,eAAe,CAAC,UAAC,KAAK;QAC7B,IAAM,aAAa,GAAG,qBAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACjD,6BACK,aAAa,KAChB,SAAS,EAAE;gBACT,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;aAC/B,IACF;IACH,CAAC,CAAC;CACH,CAAA"}
|
package/dist/utils/theme.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ declare type AppValues = {
|
|
|
5
5
|
export declare function getMobileThemeValues(initialWindowMetrics: any, values: AppValues): {
|
|
6
6
|
pixel: number;
|
|
7
7
|
hasNotch: boolean;
|
|
8
|
+
hasIsland: boolean;
|
|
8
9
|
prefersConstantNavigationBar: boolean;
|
|
9
10
|
safeAreaTop: number;
|
|
10
11
|
safeAreaBottom: number;
|
package/dist/utils/theme.js
CHANGED
|
@@ -10,18 +10,23 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
13
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
17
|
exports.getMobileThemeValues = void 0;
|
|
15
18
|
var react_native_1 = require("react-native");
|
|
19
|
+
var react_native_device_info_1 = __importDefault(require("react-native-device-info"));
|
|
16
20
|
function getMobileThemeValues(initialWindowMetrics, values) {
|
|
17
21
|
var _a, _b;
|
|
18
22
|
var screenDimensions = react_native_1.Dimensions.get('screen');
|
|
19
23
|
var hasNotch = react_native_1.Platform.OS === 'ios' ? (react_native_1.Dimensions.get('window').height >= 812) : (((_a = initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) === null || _a === void 0 ? void 0 : _a.top) > 24 || react_native_1.StatusBar.currentHeight > 24);
|
|
24
|
+
var hasIsland = react_native_device_info_1.default.hasDynamicIsland();
|
|
20
25
|
var bottomNavHeight = react_native_1.Platform.OS === 'android' ? (_b = initialWindowMetrics === null || initialWindowMetrics === void 0 ? void 0 : initialWindowMetrics.insets) === null || _b === void 0 ? void 0 : _b.bottom : 0;
|
|
21
26
|
var prefersConstantNavigationBar = bottomNavHeight > 0;
|
|
22
|
-
var safeAreaTop = react_native_1.Platform.OS === 'ios' ? (hasNotch ? 34 : 20) : react_native_1.StatusBar.currentHeight;
|
|
27
|
+
var safeAreaTop = react_native_1.Platform.OS === 'ios' ? (hasNotch ? 34 + (hasIsland ? 12 : 0) : 20) : react_native_1.StatusBar.currentHeight;
|
|
23
28
|
var safeAreaBottom = (hasNotch && !prefersConstantNavigationBar ? 20 : 0);
|
|
24
|
-
return __assign(__assign({}, screenDimensions), { pixel: react_native_1.StyleSheet.hairlineWidth, hasNotch: hasNotch, prefersConstantNavigationBar: prefersConstantNavigationBar, safeAreaTop: safeAreaTop, safeAreaBottom: safeAreaBottom, keyboardVerticalOffset: react_native_1.Platform.OS === 'ios' ? 57 : 47, get headerHeight() { return values.headerHeight + safeAreaTop; },
|
|
29
|
+
return __assign(__assign({}, screenDimensions), { pixel: react_native_1.StyleSheet.hairlineWidth, hasNotch: hasNotch, hasIsland: hasIsland, prefersConstantNavigationBar: prefersConstantNavigationBar, safeAreaTop: safeAreaTop, safeAreaBottom: safeAreaBottom, keyboardVerticalOffset: react_native_1.Platform.OS === 'ios' ? 57 : 47, get headerHeight() { return values.headerHeight + safeAreaTop; },
|
|
25
30
|
get tabBarHeight() { return values.tabBarHeight + (prefersConstantNavigationBar ? 0 : this.safeAreaBottom); }, bottomNavHeight: bottomNavHeight, get window() {
|
|
26
31
|
return {
|
|
27
32
|
height: screenDimensions.height - (bottomNavHeight + safeAreaTop),
|
package/dist/utils/theme.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/utils/theme.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/utils/theme.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAA0E;AAC1E,sFAAiD;AAOjD,SAAgB,oBAAoB,CAAC,oBAAoB,EAAE,MAAiB;;IAC1E,IAAM,gBAAgB,GAAG,yBAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAEjD,IAAM,QAAQ,GAAG,uBAAQ,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,yBAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,0CAAE,GAAG,IAAG,EAAE,IAAI,wBAAS,CAAC,aAAa,GAAG,EAAE,CAAC,CAAA;IAC5J,IAAM,SAAS,GAAG,kCAAU,CAAC,gBAAgB,EAAE,CAAA;IAC/C,IAAM,eAAe,GAAG,uBAAQ,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,MAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,0CAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5F,IAAM,4BAA4B,GAAG,eAAe,GAAG,CAAC,CAAA;IAExD,IAAM,WAAW,GAAG,uBAAQ,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,wBAAS,CAAC,aAAa,CAAA;IAEjH,IAAM,cAAc,GAAG,CAAC,QAAQ,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3E,6BACK,gBAAgB,KAEnB,KAAK,EAAE,yBAAU,CAAC,aAAa,EAC/B,QAAQ,UAAA,EACR,SAAS,WAAA,EACT,4BAA4B,8BAAA,EAC5B,WAAW,aAAA,EACX,cAAc,gBAAA,EACd,sBAAsB,EAAE,uBAAQ,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EACvD,IAAI,YAAY,KAAK,OAAO,MAAM,CAAC,YAAY,GAAG,WAAW,CAAA,CAAC,CAAC;QAC/D,IAAI,YAAY,KAAK,OAAO,MAAM,CAAC,YAAY,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA,CAAC,CAAC,EAC5G,eAAe,iBAAA,EACf,IAAI,MAAM;YACR,OAAO;gBACL,MAAM,EAAE,gBAAgB,CAAC,MAAM,GAAG,CAAC,eAAe,GAAG,WAAW,CAAC;gBACjE,KAAK,EAAE,gBAAgB,CAAC,KAAK;aAC9B,CAAA;QACH,CAAC,EACD,WAAW,EAAE;YACX,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG;gBACb,IAAI,EAAE,QAAQ;aACf;SACF,EACD,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE;aACX;YACD,OAAO,EAAE;gBACP,MAAM,EAAE,EAAE;aACX;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE;aACX;SACF,IACF;AACH,CAAC;AAjDD,oDAiDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codeleap/mobile",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.1",
|
|
4
4
|
"main": "src/index.ts",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"repository": {
|
|
@@ -44,6 +44,7 @@
|
|
|
44
44
|
"@miblanchard/react-native-slider": "^2.1.0",
|
|
45
45
|
"date-fns": "^2.28.0",
|
|
46
46
|
"react-native-animatable": "^1.3.3",
|
|
47
|
+
"react-native-device-info": "^10.3.0",
|
|
47
48
|
"react-native-masked-text": "^1.13.0",
|
|
48
49
|
"react-native-pose": "^0.9.1",
|
|
49
50
|
"react-native-super-grid": "^4.4.2",
|
package/src/utils/theme.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Platform, Dimensions, StatusBar, StyleSheet } from 'react-native'
|
|
2
|
+
import DeviceInfo from 'react-native-device-info'
|
|
2
3
|
|
|
3
4
|
type AppValues = {
|
|
4
5
|
headerHeight: number
|
|
@@ -9,11 +10,12 @@ export function getMobileThemeValues(initialWindowMetrics, values: AppValues) {
|
|
|
9
10
|
const screenDimensions = Dimensions.get('screen')
|
|
10
11
|
|
|
11
12
|
const hasNotch = Platform.OS === 'ios' ? (Dimensions.get('window').height >= 812) : (initialWindowMetrics?.insets?.top > 24 || StatusBar.currentHeight > 24)
|
|
13
|
+
const hasIsland = DeviceInfo.hasDynamicIsland()
|
|
12
14
|
const bottomNavHeight = Platform.OS === 'android' ? initialWindowMetrics?.insets?.bottom : 0
|
|
13
15
|
|
|
14
16
|
const prefersConstantNavigationBar = bottomNavHeight > 0
|
|
15
17
|
|
|
16
|
-
const safeAreaTop = Platform.OS === 'ios' ? (hasNotch ? 34 : 20) : StatusBar.currentHeight
|
|
18
|
+
const safeAreaTop = Platform.OS === 'ios' ? (hasNotch ? 34 + (hasIsland ? 12 : 0) : 20) : StatusBar.currentHeight
|
|
17
19
|
|
|
18
20
|
const safeAreaBottom = (hasNotch && !prefersConstantNavigationBar ? 20 : 0)
|
|
19
21
|
return {
|
|
@@ -21,6 +23,7 @@ export function getMobileThemeValues(initialWindowMetrics, values: AppValues) {
|
|
|
21
23
|
|
|
22
24
|
pixel: StyleSheet.hairlineWidth,
|
|
23
25
|
hasNotch,
|
|
26
|
+
hasIsland,
|
|
24
27
|
prefersConstantNavigationBar,
|
|
25
28
|
safeAreaTop,
|
|
26
29
|
safeAreaBottom,
|