IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v2.6.0' into bugfix/Bug69117

Browse Source
This commit is contained in:
Viktor Fomin 2024-07-12 15:44:45 +03:00
commit 5666c478b2
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/doceditor/src/app/(root)/page.tsx
View File

@ -25,6 +25,10 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import type { Metadata } from "next"; import type { Metadata } from "next";
import { headers } from "next/headers";
import { getSelectorsByUserAgent } from "react-device-detect";
import { BRAND_NAME } from "@docspace/shared/constants"; import { BRAND_NAME } from "@docspace/shared/constants";
import { getData } from "@/utils/actions"; import { getData } from "@/utils/actions";
@ -51,6 +55,17 @@ async function Page({ searchParams }: RootPageProps) {
const { fileId, fileid, version, doc, action, share, editorType, error } = const { fileId, fileid, version, doc, action, share, editorType, error } =
searchParams ?? initialSearchParams; searchParams ?? initialSearchParams;
const hdrs = headers();
let type = editorType;
const ua = hdrs.get("user-agent");
if (ua && !type) {
const { isMobile } = getSelectorsByUserAgent(ua);
if (isMobile) type = "mobile";
}
const startDate = new Date(); const startDate = new Date();
const data = await getData( const data = await getData(
@ -59,7 +74,7 @@ async function Page({ searchParams }: RootPageProps) {
doc, doc,
action, action,
share, share,
editorType, type,
); );
const timer = new Date().getTime() - startDate.getTime(); const timer = new Date().getTime() - startDate.getTime();

2
packages/shared/package.json
View File

@ -48,7 +48,7 @@
"react-autosize-textarea": "^7.1.0", "react-autosize-textarea": "^7.1.0",
"react-content-loader": "^5.1.4", "react-content-loader": "^5.1.4",
"react-countdown": "2.3.5", "react-countdown": "2.3.5",
"react-device-detect": "^1.17.0", "react-device-detect": "^2.2.3",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-draggable": "^4.4.6", "react-draggable": "^4.4.6",
"react-dropzone": "^11.7.1", "react-dropzone": "^11.7.1",

25
yarn.lock
View File

@ -2856,7 +2856,7 @@ __metadata:
react-autosize-textarea: "npm:^7.1.0" react-autosize-textarea: "npm:^7.1.0"
react-content-loader: "npm:^5.1.4" react-content-loader: "npm:^5.1.4"
react-countdown: "npm:2.3.5" react-countdown: "npm:2.3.5"
react-device-detect: "npm:^1.17.0" react-device-detect: "npm:^2.2.3"
react-docgen-typescript-plugin: "npm:^1.0.5" react-docgen-typescript-plugin: "npm:^1.0.5"
react-dom: "npm:^18.2.0" react-dom: "npm:^18.2.0"
react-draggable: "npm:^4.4.6" react-draggable: "npm:^4.4.6"
@ -23206,15 +23206,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"react-device-detect@npm:^1.17.0": "react-device-detect@npm:^2.2.3":
version: 1.17.0 version: 2.2.3
resolution: "react-device-detect@npm:1.17.0" resolution: "react-device-detect@npm:2.2.3"
dependencies: dependencies:
ua-parser-js: "npm:^0.7.24" ua-parser-js: "npm:^1.0.33"
peerDependencies: peerDependencies:
react: ">= 0.14.0 < 18.0.0" react: ">= 0.14.0"
react-dom: ">= 0.14.0 < 18.0.0" react-dom: ">= 0.14.0"
checksum: 10/7a108095222057653a68bbee5d3ef208b110440a9a78790fb41737f0dec684250a5fa98da8a0e8da4443da49a29272eb6d6eb157999d4c06187f6af27b79d38d checksum: 10/7152e2b216b3bb6fd75c7859d3441b89658695c629a13c5d374f076756705650be585d5c4dc19d9d34908ef1b61f19b52f1055d74dd7104b77d1b6f897ee09e0
languageName: node languageName: node
linkType: hard linkType: hard
@ -27205,13 +27205,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ua-parser-js@npm:^0.7.24, ua-parser-js@npm:^0.7.9": "ua-parser-js@npm:^0.7.9":
version: 0.7.37 version: 0.7.37
resolution: "ua-parser-js@npm:0.7.37" resolution: "ua-parser-js@npm:0.7.37"
checksum: 10/a50e8f7ee5618822670443b05e33ab184e3186d3f88c4761cdf65cf264219c626b74ee6cf96146091d9738c61412afe2788eeda75ef98f71a69a81495abe20ff checksum: 10/a50e8f7ee5618822670443b05e33ab184e3186d3f88c4761cdf65cf264219c626b74ee6cf96146091d9738c61412afe2788eeda75ef98f71a69a81495abe20ff
languageName: node languageName: node
linkType: hard linkType: hard
"ua-parser-js@npm:^1.0.33":
version: 1.0.38
resolution: "ua-parser-js@npm:1.0.38"
checksum: 10/f2345e9bd0f9c5f85bcaa434535fae88f4bb891538e568106f0225b2c2937fbfbeb5782bd22320d07b6b3d68b350b8861574c1d7af072ff9b2362fb72d326fd9
languageName: node
linkType: hard
"ua-parser-js@npm:^1.0.35": "ua-parser-js@npm:^1.0.35":
version: 1.0.37 version: 1.0.37
resolution: "ua-parser-js@npm:1.0.37" resolution: "ua-parser-js@npm:1.0.37"