Skip to content

Commit 58a4d85

Browse files
committed
use v24 react renderer
1 parent f81637e commit 58a4d85

File tree

7 files changed

+126
-33
lines changed

7 files changed

+126
-33
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ node_modules
2222

2323
__pycache__
2424

25-
examples/**/data
25+
examples/**/data
26+
examples/nuscenes_data

dist/index.umd.js

Lines changed: 26 additions & 1 deletion
Large diffs are not rendered by default.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@fiftyone/relay": "portal:../../fiftyone/app/packages/relay",
2121
"@fiftyone/state": "portal:../../fiftyone/app/packages/state",
2222
"@fiftyone/utilities": "portal:../../fiftyone/app/packages/utilities",
23-
"@rerun-io/web-viewer": "^0.20.1",
23+
"@rerun-io/web-viewer": "^0.24.0",
2424
"lru-cache": "^11.0.1",
2525
"react": "^18.2.0",
2626
"react-dom": "^18.2.0",

src/RerunPanel.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getFieldsWithEmbeddedDocType } from "@fiftyone/utilities";
33
import React, { useMemo } from "react";
44
import { useRecoilValue } from "recoil";
55
import { CustomErrorBoundary } from "./CustomErrorBoundary";
6-
import { RrdIframeRenderer } from "./RrdIframeRenderer";
6+
import { RerunReactRenderer } from "./RerunReactRenderer";
77

88
export const RerunFileDescriptor = {
99
EMBEDDED_DOC_TYPE: "fiftyone.utils.rerun.RrdFile",
@@ -57,9 +57,7 @@ export const RerunViewer = React.memo(() => {
5757

5858
return (
5959
<CustomErrorBoundary>
60-
{/* use iframe until versioned web viewer renderer is more stable, note: vite will not bundle any rerun deps */}
61-
{/* <RrdWebViewerRenderer url={rrdParams.url} version={rrdParams.version} /> */}
62-
<RrdIframeRenderer url={rrdParams.url} />
60+
<RerunReactRenderer url={rrdParams.url} version={rrdParams.version} />
6361
</CustomErrorBoundary>
6462
);
6563
});

src/RerunReactRenderer.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import React from "react";
2+
import WebViewer from "@rerun-io/web-viewer-react";
3+
4+
export const RerunReactRenderer = React.memo(
5+
({ url, version }: { url: string; version: string }) => {
6+
switch (version) {
7+
// todo: implement versioned renderers
8+
default:
9+
return <WebViewer rrd={url} width="100%" height="100%" />;
10+
}
11+
}
12+
);

src/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ fop.registerComponent({
1717
panelOptions: {
1818
surfaces: "modal",
1919
helpMarkdown: `Rereun viewer for FiftyOne`,
20+
isNew: false,
2021
},
2122
});

yarn.lock

Lines changed: 82 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,9 @@ __metadata:
566566
languageName: node
567567
linkType: hard
568568

569-
"@fiftyone/components@portal:../../fiftyone/app/packages/components::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
569+
"@fiftyone/components@portal:../fiftyone/app/packages/components::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
570570
version: 0.0.0-use.local
571-
resolution: "@fiftyone/components@portal:../../fiftyone/app/packages/components::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
571+
resolution: "@fiftyone/components@portal:../fiftyone/app/packages/components::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
572572
dependencies:
573573
"@emotion/react": "npm:^11.10.4"
574574
"@emotion/styled": "npm:^11.10.4"
@@ -585,6 +585,7 @@ __metadata:
585585
react-syntax-highlighter: "npm:^15.5.0"
586586
react-use: "npm:^17.5.1"
587587
peerDependencies:
588+
jotai: "*"
588589
re-resizable: "*"
589590
react: "*"
590591
react-relay: "*"
@@ -593,13 +594,14 @@ __metadata:
593594
languageName: node
594595
linkType: soft
595596

596-
"@fiftyone/looker@portal:../../fiftyone/app/packages/looker::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
597+
"@fiftyone/looker@portal:../fiftyone/app/packages/looker::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
597598
version: 0.0.0-use.local
598-
resolution: "@fiftyone/looker@portal:../../fiftyone/app/packages/looker::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
599+
resolution: "@fiftyone/looker@portal:../fiftyone/app/packages/looker::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
599600
dependencies:
600601
"@ungap/event-target": "npm:^0.2.2"
601602
"@xmldom/xmldom": "npm:^0.8.6"
602603
copy-to-clipboard: "npm:^3.3.1"
604+
fast-png: "npm:^6.2.0"
603605
immutable: "npm:^4.0.0-rc.12"
604606
lodash: "npm:^4.17.21"
605607
lru-cache: "npm:^11.0.1"
@@ -611,26 +613,26 @@ __metadata:
611613
languageName: node
612614
linkType: soft
613615

614-
"@fiftyone/operators@portal:../../fiftyone/app/packages/operators::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
616+
"@fiftyone/operators@portal:../fiftyone/app/packages/operators::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
615617
version: 0.0.0-use.local
616-
resolution: "@fiftyone/operators@portal:../../fiftyone/app/packages/operators::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
618+
resolution: "@fiftyone/operators@portal:../fiftyone/app/packages/operators::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
617619
peerDependencies:
618620
"@mui/icons-material": "*"
619621
"@mui/material": "*"
620622
languageName: node
621623
linkType: soft
622624

623-
"@fiftyone/plugins@portal:../../fiftyone/app/packages/plugins::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
625+
"@fiftyone/plugins@portal:../fiftyone/app/packages/plugins::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
624626
version: 0.0.0-use.local
625-
resolution: "@fiftyone/plugins@portal:../../fiftyone/app/packages/plugins::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
627+
resolution: "@fiftyone/plugins@portal:../fiftyone/app/packages/plugins::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
626628
dependencies:
627629
moment: "npm:^2.29.4"
628630
languageName: node
629631
linkType: soft
630632

631-
"@fiftyone/relay@portal:../../fiftyone/app/packages/relay::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
633+
"@fiftyone/relay@portal:../fiftyone/app/packages/relay::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
632634
version: 0.0.0-use.local
633-
resolution: "@fiftyone/relay@portal:../../fiftyone/app/packages/relay::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
635+
resolution: "@fiftyone/relay@portal:../fiftyone/app/packages/relay::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
634636
dependencies:
635637
"@recoiljs/refine": "npm:^0.1.1"
636638
react-relay: "npm:^14.1.0"
@@ -642,14 +644,15 @@ __metadata:
642644
version: 0.0.0-use.local
643645
resolution: "@fiftyone/rerun-plugin@workspace:."
644646
dependencies:
645-
"@fiftyone/components": "portal:../../fiftyone/app/packages/components"
646-
"@fiftyone/looker": "portal:../../fiftyone/app/packages/looker"
647-
"@fiftyone/operators": "portal:../../fiftyone/app/packages/operators"
648-
"@fiftyone/plugins": "portal:../../fiftyone/app/packages/plugins"
649-
"@fiftyone/relay": "portal:../../fiftyone/app/packages/relay"
650-
"@fiftyone/state": "portal:../../fiftyone/app/packages/state"
651-
"@fiftyone/utilities": "portal:../../fiftyone/app/packages/utilities"
652-
"@rerun-io/web-viewer": "npm:^0.20.1"
647+
"@fiftyone/components": "portal:../fiftyone/app/packages/components"
648+
"@fiftyone/looker": "portal:../fiftyone/app/packages/looker"
649+
"@fiftyone/operators": "portal:../fiftyone/app/packages/operators"
650+
"@fiftyone/plugins": "portal:../fiftyone/app/packages/plugins"
651+
"@fiftyone/relay": "portal:../fiftyone/app/packages/relay"
652+
"@fiftyone/state": "portal:../fiftyone/app/packages/state"
653+
"@fiftyone/utilities": "portal:../fiftyone/app/packages/utilities"
654+
"@rerun-io/web-viewer": "npm:^0.24.0"
655+
"@rerun-io/web-viewer-react": "npm:^0.24.0"
653656
"@rollup/plugin-node-resolve": "npm:^15.3.0"
654657
"@types/node": "npm:^22.7.6"
655658
"@vitejs/plugin-react": "npm:^4.3.3"
@@ -666,9 +669,9 @@ __metadata:
666669
languageName: unknown
667670
linkType: soft
668671

669-
"@fiftyone/state@portal:../../fiftyone/app/packages/state::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
672+
"@fiftyone/state@portal:../fiftyone/app/packages/state::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
670673
version: 0.0.0-use.local
671-
resolution: "@fiftyone/state@portal:../../fiftyone/app/packages/state::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
674+
resolution: "@fiftyone/state@portal:../fiftyone/app/packages/state::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
672675
dependencies:
673676
"@fiftyone/looker": "npm:*"
674677
"@fiftyone/relay": "npm:*"
@@ -685,9 +688,9 @@ __metadata:
685688
languageName: node
686689
linkType: soft
687690

688-
"@fiftyone/utilities@portal:../../fiftyone/app/packages/utilities::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
691+
"@fiftyone/utilities@portal:../fiftyone/app/packages/utilities::locator=%40fiftyone%2Frerun-plugin%40workspace%3A.":
689692
version: 0.0.0-use.local
690-
resolution: "@fiftyone/utilities@portal:../../fiftyone/app/packages/utilities::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
693+
resolution: "@fiftyone/utilities@portal:../fiftyone/app/packages/utilities::locator=%40fiftyone%2Frerun-plugin%40workspace%3A."
691694
dependencies:
692695
"@microsoft/fetch-event-source": "npm:^2.0.1"
693696
fetch-retry: "npm:^5.0.3"
@@ -1088,10 +1091,21 @@ __metadata:
10881091
languageName: node
10891092
linkType: hard
10901093

1091-
"@rerun-io/web-viewer@npm:^0.20.1":
1092-
version: 0.20.1
1093-
resolution: "@rerun-io/web-viewer@npm:0.20.1"
1094-
checksum: 10c0/181f303d6e909b0bae215d427c1c0a2a90e12861db7215f34c832d96b8d936da39fe2e1f28fbafbeab1ae2c8c0ad79192e3a7befbb58817a98476ea368a7c544
1094+
"@rerun-io/web-viewer-react@npm:^0.24.0":
1095+
version: 0.24.0
1096+
resolution: "@rerun-io/web-viewer-react@npm:0.24.0"
1097+
dependencies:
1098+
"@rerun-io/web-viewer": "npm:0.24.0"
1099+
"@types/react": "npm:^18.2.33"
1100+
react: "npm:^18.2.0"
1101+
checksum: 10c0/458b0da657cf51b94a2e6a427875d14a0083af35b6636405120c6d7786eb017258e4a5b42926f530e814fa6e0f347c9e2b7a115a3531eed6c7fb38c036dc7213
1102+
languageName: node
1103+
linkType: hard
1104+
1105+
"@rerun-io/web-viewer@npm:0.24.0, @rerun-io/web-viewer@npm:^0.24.0":
1106+
version: 0.24.0
1107+
resolution: "@rerun-io/web-viewer@npm:0.24.0"
1108+
checksum: 10c0/b7d4d6b8fd2fc83924fed17c316629c0c450d967ca6136eabb9e48f5585e50eb0c131d9924a460159d11a567caf04028e79dc5f87f169dbaddc6d879993ea74c
10951109
languageName: node
10961110
linkType: hard
10971111

@@ -1475,6 +1489,13 @@ __metadata:
14751489
languageName: node
14761490
linkType: hard
14771491

1492+
"@types/pako@npm:^2.0.3":
1493+
version: 2.0.3
1494+
resolution: "@types/pako@npm:2.0.3"
1495+
checksum: 10c0/45119ac3c4e8a77317c35493327039b74e333562f06ce038048228918d8ddfaa7958125aab960d1565b3861046022754c414dba1eecb210c44a32c415956bee2
1496+
languageName: node
1497+
linkType: hard
1498+
14781499
"@types/parse-json@npm:^4.0.0":
14791500
version: 4.0.2
14801501
resolution: "@types/parse-json@npm:4.0.2"
@@ -1508,6 +1529,16 @@ __metadata:
15081529
languageName: node
15091530
linkType: hard
15101531

1532+
"@types/react@npm:^18.2.33":
1533+
version: 18.3.23
1534+
resolution: "@types/react@npm:18.3.23"
1535+
dependencies:
1536+
"@types/prop-types": "npm:*"
1537+
csstype: "npm:^3.0.2"
1538+
checksum: 10c0/49331800b76572eb2992a5c44801dbf8c612a5f99c8f4e4200f06c7de6f3a6e9455c661784a6c5469df96fa45622cb4a9d0982c44e6a0d5719be5f2ef1f545ed
1539+
languageName: node
1540+
linkType: hard
1541+
15111542
"@types/resolve@npm:1.20.2":
15121543
version: 1.20.2
15131544
resolution: "@types/resolve@npm:1.20.2"
@@ -2135,6 +2166,17 @@ __metadata:
21352166
languageName: node
21362167
linkType: hard
21372168

2169+
"fast-png@npm:^6.2.0":
2170+
version: 6.4.0
2171+
resolution: "fast-png@npm:6.4.0"
2172+
dependencies:
2173+
"@types/pako": "npm:^2.0.3"
2174+
iobuffer: "npm:^5.3.2"
2175+
pako: "npm:^2.1.0"
2176+
checksum: 10c0/bca27a09d56a5ead536b11c1ddccf4fe44c7c0af88a8faefab6a397527d9c71b00c09b2055d0108807c438c50719dd2acbd7217ef88785b500888db26fa0358a
2177+
languageName: node
2178+
linkType: hard
2179+
21382180
"fast-shallow-equal@npm:^1.0.0":
21392181
version: 1.0.0
21402182
resolution: "fast-shallow-equal@npm:1.0.0"
@@ -2489,6 +2531,13 @@ __metadata:
24892531
languageName: node
24902532
linkType: hard
24912533

2534+
"iobuffer@npm:^5.3.2":
2535+
version: 5.4.0
2536+
resolution: "iobuffer@npm:5.4.0"
2537+
checksum: 10c0/1b3f9a5ea158bc63f038b374b42832acdb9db13ea9cfa4ed78723f30894986442f6c033dff4ae2fdf34724bf0fe432e3b86c11ca82049568c58b8d7fb47a6ac2
2538+
languageName: node
2539+
linkType: hard
2540+
24922541
"ip-address@npm:^9.0.5":
24932542
version: 9.0.5
24942543
resolution: "ip-address@npm:9.0.5"
@@ -2983,6 +3032,13 @@ __metadata:
29833032
languageName: node
29843033
linkType: hard
29853034

3035+
"pako@npm:^2.1.0":
3036+
version: 2.1.0
3037+
resolution: "pako@npm:2.1.0"
3038+
checksum: 10c0/8e8646581410654b50eb22a5dfd71159cae98145bd5086c9a7a816ec0370b5f72b4648d08674624b3870a521e6a3daffd6c2f7bc00fdefc7063c9d8232ff5116
3039+
languageName: node
3040+
linkType: hard
3041+
29863042
"parent-module@npm:^1.0.0":
29873043
version: 1.0.1
29883044
resolution: "parent-module@npm:1.0.1"

0 commit comments

Comments
 (0)