Skip to content

feat: Always render dataproxy children #2809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

feat: Always render dataproxy children #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cozy-dataproxy-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"babel-plugin-module-resolver": "^4.0.0",
"babel-plugin-tsconfig-paths": "^1.0.3",
"babel-preset-cozy-app": "^2.8.1",
"cozy-client": "^54.0.0",
"cozy-client": "^60.2.0",
"cozy-device-helper": "^4.0.0",
"cozy-flags": "^4.7.0",
"cozy-intent": "^2.30.0",
Expand Down Expand Up @@ -51,7 +51,7 @@
".": "./dist/index.js"
},
"peerDependencies": {
"cozy-client": ">=54.0.0",
"cozy-client": ">=60.2.0",
"cozy-device-helper": ">=3.7.1",
"cozy-flags": ">=4.6.1",
"cozy-intent": ">=2.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cozy-dataproxy-lib/src/dataproxy/DataProxyProvider.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export const DataProxyProvider = React.memo(({ children }) => {

return (
<DataProxyContext.Provider value={dataProxy || {}}>
{(dataProxyServicesAvailable === false || dataProxy) && children}
{children}
{iframeUrl ? (
<iframe
id="DataProxy"
Expand Down
43 changes: 41 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16663,6 +16663,45 @@ __metadata:
languageName: node
linkType: hard

"cozy-client@npm:^60.2.0":
version: 60.3.0
resolution: "cozy-client@npm:60.3.0"
dependencies:
"@cozy/minilog": "npm:1.0.0"
"@fastify/deepmerge": "npm:^2.0.2"
"@types/jest": "npm:^26.0.20"
"@types/lodash": "npm:^4.14.170"
btoa: "npm:^1.2.1"
cozy-stack-client: "npm:^60.1.0"
date-fns: "npm:2.29.3"
fast-deep-equal: "npm:^3.1.3"
json-stable-stringify: "npm:^1.0.1"
lodash: "npm:^4.17.13"
microee: "npm:^0.0.6"
node-fetch: "npm:^2.6.1"
node-polyglot: "npm:2.4.2"
open: "npm:7.4.2"
prop-types: "npm:^15.6.2"
react-redux: "npm:^7.2.0"
redux: "npm:3 || 4"
redux-thunk: "npm:^2.3.0"
server-destroy: "npm:^1.0.1"
sift: "npm:^6.0.0"
url-search-params-polyfill: "npm:^8.0.0"
peerDependencies:
cozy-device-helper: ">=2.1.0"
cozy-flags: ">2.8.6"
cozy-intent: ">=2.23.0"
cozy-logger: ">1.7.0"
react: ^16.7.0
react-native: ~0.63.5
react-native-google-play-integrity: ^1.1.0
react-native-inappbrowser-reborn: ^3.5.1
react-native-ios11-devicecheck: ^0.0.3
checksum: 10c0/77fe471ecf767cdc8041e59fd3de1566c3d8c9cf8e1a7e8c97e8502c62138cc0bffb88d5f75f2dc6d84076e1d5296254db5c6f1b3c5249158a7b0f1d940557a3
languageName: node
linkType: hard

"cozy-client@npm:^60.5.0":
version: 60.5.0
resolution: "cozy-client@npm:60.5.0"
Expand Down Expand Up @@ -16714,7 +16753,7 @@ __metadata:
babel-plugin-tsconfig-paths: "npm:^1.0.3"
babel-preset-cozy-app: "npm:^2.8.1"
comlink: "npm:4.4.1"
cozy-client: "npm:^54.0.0"
cozy-client: "npm:^60.2.0"
cozy-device-helper: "npm:^4.0.0"
cozy-flags: "npm:^4.7.0"
cozy-intent: "npm:^2.30.0"
Expand All @@ -16730,7 +16769,7 @@ __metadata:
react-router-dom: "npm:6.14.2"
typescript: "npm:5.5.2"
peerDependencies:
cozy-client: ">=54.0.0"
cozy-client: ">=60.2.0"
cozy-device-helper: ">=3.7.1"
cozy-flags: ">=4.6.1"
cozy-intent: ">=2.26.0"
Expand Down
Loading