Use ancestor origins when available.

pull/3192/head
Mitja Bezenšek 2024-04-23 12:21:33 +02:00
rodzic 952fe910d3
commit 10009a0403
2 zmienionych plików z 30 dodań i 19 usunięć

Wyświetl plik

@ -74,6 +74,23 @@ async function getSnapshotLink(
})
}
function getTopLevelOrigin() {
let url: string
if (isInIframe()) {
const ancestorOrigins = window.location.ancestorOrigins
// ancestorOrigins is not supported in Firefox
if (ancestorOrigins && ancestorOrigins.length > 0) {
url = ancestorOrigins[ancestorOrigins.length - 1]
} else {
url = document.referrer
}
} else {
url = document.location.href
}
return new URL(url).origin
}
export function useSharing(): TLUiOverrides {
const navigate = useNavigate()
const id = useSearchParams()[0].get('id') ?? undefined
@ -107,19 +124,13 @@ export function useSharing(): TLUiOverrides {
const data = await getRoomData(editor, addToast, msg, uploadFileToAsset)
if (!data) return
const topLevelUrl = new URL(
window.location != window.parent.location
? document.referrer
: document.location.href
)
const res = await fetch(SNAPSHOT_UPLOAD_URL, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
origin: topLevelUrl.origin,
origin: getTopLevelOrigin(),
snapshot: {
schema: editor.store.schema.serialize(),
snapshot: data,

Wyświetl plik

@ -3829,6 +3829,15 @@
"kind": "Content",
"text": " | typeof "
},
{
"kind": "Reference",
"text": "DrawShapeTool",
"canonicalReference": "tldraw!DrawShapeTool:class"
},
{
"kind": "Content",
"text": " | typeof "
},
{
"kind": "Reference",
"text": "FrameShapeTool",
@ -3847,15 +3856,6 @@
"kind": "Content",
"text": " | typeof "
},
{
"kind": "Reference",
"text": "HighlightShapeTool",
"canonicalReference": "tldraw!HighlightShapeTool:class"
},
{
"kind": "Content",
"text": " | typeof "
},
{
"kind": "Reference",
"text": "LineShapeTool",
@ -4490,7 +4490,7 @@
{
"kind": "Reference",
"text": "Idle",
"canonicalReference": "tldraw!~Idle_3:class"
"canonicalReference": "tldraw!~Idle_2:class"
},
{
"kind": "Content",
@ -7891,7 +7891,7 @@
{
"kind": "Reference",
"text": "Idle",
"canonicalReference": "tldraw!~Idle_2:class"
"canonicalReference": "tldraw!~Idle_3:class"
},
{
"kind": "Content",
@ -9721,7 +9721,7 @@
{
"kind": "Reference",
"text": "Idle",
"canonicalReference": "tldraw!~Idle_3:class"
"canonicalReference": "tldraw!~Idle_2:class"
},
{
"kind": "Content",