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: viewer anchor adjustments #3546

Merged
merged 7 commits into from
Aug 4, 2023
Merged

fix: viewer anchor adjustments #3546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8719f65
fix: suppress events targeting ViewerAnchor
haakonflatval-cognite Aug 3, 2023
d3fb285
fix: make sure ViewerAnchor appears when first mounted
haakonflatval-cognite Aug 3, 2023
73ff2d0
chore: revert to exporting vanilla ViewerAnchor
haakonflatval-cognite Aug 3, 2023
1594c06
fix: don't suppress, lint fix
haakonflatval-cognite Aug 3, 2023
5f9fdfb
fix: show working example with translation and no suppress-error
haakonflatval-cognite Aug 3, 2023
3e5b91f
fix: remove unnecessary prop
haakonflatval-cognite Aug 3, 2023
a86e6ce
fix: don't stop up-pointer events
haakonflatval-cognite Aug 4, 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
29 changes: 19 additions & 10 deletions react-components/src/components/ViewerAnchor/ViewerAnchor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright 2023 Cognite AS
*/

import { useEffect, useRef, type ReactElement, type RefObject, useState } from 'react';
import { useEffect, useRef, type ReactElement, type RefObject, useState, useCallback } from 'react';
import { Vector2, type Vector3 } from 'three';

import { useReveal } from '../RevealContainer/RevealContext';
Expand All @@ -22,20 +22,29 @@ export const ViewerAnchor = ({ position, children }: ViewerAnchorProps): ReactEl
const [divTranslation, setDivTranslation] = useState(new Vector2());
const [visible, setVisible] = useState(false);

const cameraChanged = (cameraPosition: Vector3, cameraTarget: Vector3): void => {
const cameraDirection = cameraTarget.clone().sub(cameraPosition).normalize();
const elementDirection = position.clone().sub(cameraPosition).normalize();
const cameraChanged = useCallback(
(cameraPosition: Vector3, cameraTarget: Vector3): void => {
const cameraDirection = cameraTarget.clone().sub(cameraPosition).normalize();
const elementDirection = position.clone().sub(cameraPosition).normalize();

setVisible(elementDirection.dot(cameraDirection) > 0);
setVisible(elementDirection.dot(cameraDirection) > 0);

const screenSpacePosition = viewer.worldToScreen(position.clone());
if (screenSpacePosition !== null) {
setDivTranslation(screenSpacePosition);
}
};
const screenSpacePosition = viewer.worldToScreen(position.clone());
if (screenSpacePosition !== null) {
setDivTranslation(screenSpacePosition);
}
},
[viewer, position]
);

useEffect(() => {
viewer.cameraManager.on('cameraChange', cameraChanged);

cameraChanged(
viewer.cameraManager.getCameraState().position,
viewer.cameraManager.getCameraState().target
);

return () => {
viewer.cameraManager.off('cameraChange', cameraChanged);
};
Expand Down
2 changes: 0 additions & 2 deletions react-components/src/higher-order-components/withSuppressRevealEvents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ export function withSuppressRevealEvents<T extends JSX.IntrinsicAttributes>(
}

div.addEventListener('pointerdown', stopPropagation);
div.addEventListener('pointerup', stopPropagation);
div.addEventListener('pointermove', stopPropagation);
div.addEventListener('wheel', stopPropagation);

return () => {
div.removeEventListener('pointerdown', stopPropagation);
div.removeEventListener('pointerup', stopPropagation);
div.removeEventListener('pointermove', stopPropagation);
div.removeEventListener('wheel', stopPropagation);
};
Expand Down
14 changes: 9 additions & 5 deletions react-components/stories/ViewerAnchor.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
* Copyright 2023 Cognite AS
*/
import type { Meta, StoryObj } from '@storybook/react';
import { Reveal3DResources, RevealContainer } from '../src';
import { Reveal3DResources, RevealContainer, withSuppressRevealEvents } from '../src';
import { Color, Vector3 } from 'three';
import { CameraController, ViewerAnchor } from '../src/';
import { createSdkByUrlToken } from './utilities/createSdkByUrlToken';
import styled from 'styled-components';

const meta = {
title: 'Example/ViewerAnchor',
Expand All @@ -31,8 +32,9 @@ export const Main: Story = {
]
},
render: ({ resources, styling, fdmAssetMappingConfig }) => {
const position = new Vector3(50, 30, 50);
const position = new Vector3(25, 0, -25);
const position2 = new Vector3();
const SuppressedDiv = withSuppressRevealEvents(styled.div``);

return (
<RevealContainer
Expand All @@ -50,7 +52,7 @@ export const Main: Story = {
fdmAssetMappingConfig={fdmAssetMappingConfig}
/>
<ViewerAnchor position={position}>
<p
<div
style={{
backgroundColor: 'turquoise',
padding: '10px',
Expand All @@ -59,8 +61,10 @@ export const Main: Story = {
maxWidth: '300px',
transform: 'translate(-50%, calc(-100% - 50px))'
}}>
This label is stuck at position {position.toArray().join(',')}
</p>
<SuppressedDiv>
<p>This label is stuck at position {position.toArray().join(',')}</p>
</SuppressedDiv>
</div>
</ViewerAnchor>
<ViewerAnchor position={position2}>
<p
Expand Down
Loading