Skip to content
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

Jump to bottom

fix: camera state when hidden page is rendered #1819

Merged
merged 13 commits into from
Dec 8, 2023
Merged

fix: camera state when hidden page is rendered #1819

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0cff58
Adding a tab'ed story
w1nklr Nov 28, 2023
3dc7223
Memoize viewPortMargins and deckGLLayers
w1nklr Dec 1, 2023
61e6bf1
Add effect to retrieve size from deck ref
w1nklr Dec 5, 2023
16d4a22
Move global bounding box handling to React reducer.
w1nklr Dec 4, 2023
753c6cb
Move camera computation to useMemo
w1nklr Dec 5, 2023
ec157c8
Fix lint and prettier
w1nklr Dec 7, 2023
e18f86d
Fix lint on story.
w1nklr Dec 7, 2023
0c928bd
Update test snapshot
w1nklr Dec 7, 2023
c5018f2
Fix annoying react error message during test_correctness
w1nklr Dec 7, 2023
57d1db9
Merge branch 'master' into fix_deck
nilscb Dec 7, 2023
8e8c7de
Merge branch 'master' into fix_deck
nilscb Dec 7, 2023
ec7ba46
Fix react warning in the new story
w1nklr Dec 7, 2023
825dd1b
Fix lint error
w1nklr Dec 7, 2023
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
15 changes: 7 additions & 8 deletions typescript/packages/subsurface-viewer/src/SubsurfaceViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ export interface SubsurfaceViewerProps {
id: string;
resources?: Record<string, unknown>;
layers?: Record<string, unknown>[] | LayersList;

bounds?: [number, number, number, number] | BoundsAccessor;
cameraPosition?: ViewStateType | undefined;
triggerHome?: number;

views?: ViewsType;
coords?: {
visible?: boolean | null;
Expand Down Expand Up @@ -96,10 +100,6 @@ export interface SubsurfaceViewerProps {
onDragStart?: (info: PickingInfo, event: MjolnirGestureEvent) => void;
onDragEnd?: (info: PickingInfo, event: MjolnirGestureEvent) => void;

/**
* If changed will reset camera to default position.
*/
triggerHome?: number;
triggerResetMultipleWells?: number;
/**
* Range selection of the current well
Expand All @@ -113,7 +113,6 @@ export interface SubsurfaceViewerProps {
* Override default tooltip with a callback.
*/
getTooltip?: TooltipCallback;
cameraPosition?: ViewStateType | undefined;

lights?: LightsType;

Expand All @@ -125,6 +124,8 @@ const SubsurfaceViewer: React.FC<SubsurfaceViewerProps> = ({
resources,
layers,
bounds,
cameraPosition,
triggerHome,
views,
coords,
scale,
Expand All @@ -136,12 +137,10 @@ const SubsurfaceViewer: React.FC<SubsurfaceViewerProps> = ({
onMouseEvent,
selection,
getTooltip,
cameraPosition,
getCameraPosition,
isRenderedCallback: isRenderedCallback,
isRenderedCallback,
onDragStart,
onDragEnd,
triggerHome,
triggerResetMultipleWells,
lights,
children,
Expand Down
Loading