Skip to content

Commit 310e82d

Browse files
authored
MOO-1598 - main | fix: replaced safe area view package from another reliable third party (#211)
2 parents 337880e + 5157f9c commit 310e82d

File tree

6 files changed

+51
-10
lines changed

6 files changed

+51
-10
lines changed

packages/pluggableWidgets/safe-area-view-native/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
## Fixed
10+
11+
- We fixed the issue where the user closed popup, safe area view wasn't working properly.
12+
913
## [2.3.0] - 2024-12-3
1014

1115
### Changed

packages/pluggableWidgets/safe-area-view-native/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "safe-area-view-native",
33
"widgetName": "SafeAreaView",
4-
"version": "2.3.0",
4+
"version": "3.0.0",
55
"license": "Apache-2.0",
66
"repository": {
77
"type": "git",
@@ -20,7 +20,8 @@
2020
},
2121
"dependencies": {
2222
"@mendix/piw-native-utils-internal": "*",
23-
"@mendix/piw-utils-internal": "*"
23+
"@mendix/piw-utils-internal": "*",
24+
"react-native-safe-area-context": "4.11.0"
2425
},
2526
"devDependencies": {
2627
"@mendix/pluggable-widgets-tools": "~10.0.1",

packages/pluggableWidgets/safe-area-view-native/src/SafeAreaView.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { createElement } from "react";
2-
import { SafeAreaView as ReactSaveAreaView, View } from "react-native";
2+
import { View } from "react-native";
3+
import { SafeAreaView as ReactSaveAreaView } from "react-native-safe-area-context";
34
import { flattenStyles } from "@mendix/piw-native-utils-internal";
45

56
import { SafeAreaViewStyle, defaultSafeAreaViewStyle } from "./ui/Styles";

packages/pluggableWidgets/safe-area-view-native/src/__tests__/__snapshots__/SafeAreaView.spec.tsx.snap

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Safe area view renders with content 1`] = `
4-
<View
4+
<RNCSafeAreaView
5+
edges={
6+
{
7+
"bottom": "additive",
8+
"left": "additive",
9+
"right": "additive",
10+
"top": "additive",
11+
}
12+
}
513
pointerEvents="box-none"
614
style={
715
{
@@ -23,11 +31,19 @@ exports[`Safe area view renders with content 1`] = `
2331
Content
2432
</Text>
2533
</View>
26-
</View>
34+
</RNCSafeAreaView>
2735
`;
2836

2937
exports[`Safe area view renders with custom styling 1`] = `
30-
<View
38+
<RNCSafeAreaView
39+
edges={
40+
{
41+
"bottom": "additive",
42+
"left": "additive",
43+
"right": "additive",
44+
"top": "additive",
45+
}
46+
}
3147
pointerEvents="box-none"
3248
style={
3349
{
@@ -50,11 +66,19 @@ exports[`Safe area view renders with custom styling 1`] = `
5066
Content
5167
</Text>
5268
</View>
53-
</View>
69+
</RNCSafeAreaView>
5470
`;
5571

5672
exports[`Safe area view renders without content 1`] = `
57-
<View
73+
<RNCSafeAreaView
74+
edges={
75+
{
76+
"bottom": "additive",
77+
"left": "additive",
78+
"right": "additive",
79+
"top": "additive",
80+
}
81+
}
5882
pointerEvents="box-none"
5983
style={
6084
{
@@ -72,5 +96,5 @@ exports[`Safe area view renders without content 1`] = `
7296
}
7397
}
7498
/>
75-
</View>
99+
</RNCSafeAreaView>
76100
`;

packages/pluggableWidgets/safe-area-view-native/src/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<package xmlns="http://www.mendix.com/package/1.0/">
3-
<clientModule name="SafeAreaView" version="2.3.0" xmlns="http://www.mendix.com/clientModule/1.0/">
3+
<clientModule name="SafeAreaView" version="3.0.0" xmlns="http://www.mendix.com/clientModule/1.0/">
44
<widgetFiles>
55
<widgetFile path="SafeAreaView.xml" />
66
</widgetFiles>

yarn.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16031,6 +16031,16 @@ __metadata:
1603116031
languageName: node
1603216032
linkType: hard
1603316033

16034+
"react-native-safe-area-context@npm:4.11.0":
16035+
version: 4.11.0
16036+
resolution: "react-native-safe-area-context@npm:4.11.0"
16037+
peerDependencies:
16038+
react: "*"
16039+
react-native: "*"
16040+
checksum: 10/f2e616ad3087ebf1ad34f90f4eadc2d6865d3d56bba83bcfb9d04020b4344d892e347b7f55dcd996c4d2edf21b589a5ce710a52e62a7bd86597ed34d130599b2
16041+
languageName: node
16042+
linkType: hard
16043+
1603416044
"react-native-schedule-exact-alarm-permission@npm:^0.1.3":
1603516045
version: 0.1.4
1603616046
resolution: "react-native-schedule-exact-alarm-permission@npm:0.1.4"
@@ -16994,6 +17004,7 @@ __metadata:
1699417004
"@mendix/piw-utils-internal": "npm:*"
1699517005
"@mendix/pluggable-widgets-tools": "npm:~10.0.1"
1699617006
eslint: "npm:^7.32.0"
17007+
react-native-safe-area-context: "npm:4.11.0"
1699717008
languageName: unknown
1699817009
linkType: soft
1699917010

0 commit comments

Comments
 (0)