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(react-components): camera state when Home button is clicked in active 360 image mode #4727

Merged
merged 3 commits into from
Aug 28, 2024
Merged

fix(react-components): camera state when Home button is clicked in active 360 image mode #4727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b628157
fixed camera state when Home button is selected in active 360 image mode
pramodcog Aug 28, 2024
b24100a
update Home button position in topbar
pramodcog Aug 28, 2024
083f9aa
bump version to 0.55.8
pramodcog Aug 28, 2024
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
2 changes: 1 addition & 1 deletion react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cognite/reveal-react-components",
"version": "0.55.7",
"version": "0.55.8",
"exports": {
".": {
"import": "./dist/index.js",
Expand Down
7 changes: 6 additions & 1 deletion react-components/src/components/RevealToolbar/ResetCameraButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Button, Tooltip as CogsTooltip } from '@cognite/cogs.js';
import { useTranslation } from '../i18n/I18n';
import { useCameraNavigation } from '../../hooks/useCameraNavigation';
import { useSceneDefaultCamera } from '../../hooks/useSceneDefaultCamera';
import { useReveal } from '../RevealCanvas/ViewerContext';

type ResetCameraButtonProps = {
sceneExternalId?: string;
Expand All @@ -18,16 +19,20 @@ export const ResetCameraButton = ({
sceneSpaceId
}: ResetCameraButtonProps): ReactElement => {
const { t } = useTranslation();
const viewer = useReveal();
const cameraNavigation = useCameraNavigation();
const resetToDefaultSceneCamera = useSceneDefaultCamera(sceneExternalId, sceneSpaceId);

const resetCameraToHomePosition = useCallback(() => {
if (viewer.get360ImageCollections() !== undefined) {
viewer.exit360Image();
}
if (sceneExternalId !== undefined && sceneSpaceId !== undefined) {
resetToDefaultSceneCamera.fitCameraToSceneDefault();
return;
}
cameraNavigation.fitCameraToAllModels();
}, [sceneExternalId, sceneSpaceId, cameraNavigation, resetToDefaultSceneCamera]);
}, [sceneExternalId, sceneSpaceId, cameraNavigation, resetToDefaultSceneCamera, viewer]);

return (
<CogsTooltip
Expand Down
2 changes: 2 additions & 0 deletions react-components/src/components/RevealTopbar/RevealTopbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Divider } from '@cognite/cogs.js';
import { SetOrbitOrFirstPersonControlsType } from '../RevealToolbar/SetFlexibleControlsType';
import { RuleBasedOutputsButton } from '../RevealToolbar/RuleBasedOutputsButton';
import { LayersButtonStrip } from '../RevealToolbar/LayersContainer/LayersButtonsStrip';
import { ResetCameraButton } from '../RevealToolbar/ResetCameraButton';

export type CustomTopbarContent = CustomToolbarContent & { topbarContent?: ReactNode };

Expand All @@ -35,6 +36,7 @@ const DefaultContentWrapper = (props: CustomTopbarContent): ReactElement => {
lowQualitySettings={props.lowFidelitySettings}
highQualitySettings={props.highFidelitySettings}
/>
<ResetCameraButton />
</FlexSection>
</>
);
Expand Down
Loading