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.

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

chore(react-components): small fixes and bump to 0.46.0 #4537

Merged
merged 10 commits into from
May 27, 2024
2 changes: 1 addition & 1 deletion react-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cognite/reveal-react-components",
"version": "0.45.1",
"version": "0.46.0",
"exports": {
".": {
"import": "./dist/index.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,18 @@ export class ToolControllers extends PointerEvents {
domElement.addEventListener('wheel', this._onWheel);
domElement.addEventListener('focus', this._onFocus);
domElement.addEventListener('blur', this._onBlur);
domElement.addEventListener('contextmenu', this._onContextMenu);
this._pointerEventsTarget.addEventListeners();
}

public removeEventListeners(): void {
const domElement = this._domElement;
domElement.removeEventListener('keydown', this._onKeyDown);
domElement.addEventListener('contextmenu', this._onContextMenu);
domElement.removeEventListener('keyup', this._onKeyUp);
domElement.removeEventListener('wheel', this._onWheel);
domElement.removeEventListener('focus', this._onFocus);
domElement.removeEventListener('blur', this._onBlur);
domElement.removeEventListener('contextmenu', this._onContextMenu);
this._pointerEventsTarget.removeEventListeners();
for (const commands of this._commands) {
commands.removeEventListeners();
Expand All @@ -194,8 +195,6 @@ export class ToolControllers extends PointerEvents {

private readonly _onKeyDown = (event: KeyboardEvent): void => {
this.onKey(event, true);
event.stopPropagation();
event.preventDefault();
};

private readonly _onContextMenu = (event: MouseEvent): void => {
Expand All @@ -205,8 +204,6 @@ export class ToolControllers extends PointerEvents {

private readonly _onKeyUp = (event: KeyboardEvent): void => {
this.onKey(event, false);
event.stopPropagation();
event.preventDefault();
};

private readonly _onWheel = async (event: WheelEvent): Promise<void> => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright 2023 Cognite AS
*/

import { type ReactElement, useState, useEffect } from 'react';
import { type ReactElement, useState, useEffect, useMemo } from 'react';
import { useRenderTarget } from '../RevealCanvas/ViewerContext';
import { Button, Tooltip as CogsTooltip, type IconType } from '@cognite/cogs.js';
import { useTranslation } from '../i18n/I18n';
Expand All @@ -17,9 +17,8 @@ export const CreateButton = (command: BaseCommand): ReactElement => {
export const CommandButton = ({ command }: { command: BaseCommand }): ReactElement => {
const renderTarget = useRenderTarget();
const { t } = useTranslation();
const [newCommand] = useState<BaseCommand>(getDefaultCommand(command, renderTarget));
const newCommand = useMemo<BaseCommand>(() => getDefaultCommand(command, renderTarget), []);

// These are redundant, but react fore me to add these to update
const [isChecked, setChecked] = useState<boolean>(false);
const [isEnabled, setEnabled] = useState<boolean>(true);
const [isVisible, setVisible] = useState<boolean>(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,14 @@ const useRevealFromKeepAlive = ({
function getOrInitializeRenderTarget(): RevealRenderTarget {
let renderTarget = revealKeepAliveData?.renderTargetRef.current;
if (renderTarget === undefined) {
const viewer = new Cognite3DViewer({ ...viewerOptions, sdk });
const viewer = new Cognite3DViewer({ ...viewerOptions, sdk, hasEventListeners: false });
renderTarget = new RevealRenderTarget(viewer);
if (revealKeepAliveData !== undefined) {
revealKeepAliveData.renderTargetRef.current = renderTarget;
}
}
renderTarget.viewer.setBackgroundColor({ color, alpha: 1 });
renderTarget.initialize();
setRenderTarget(renderTarget);
return renderTarget;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ describe(RevealCanvas.name, () => {
.setup((viewer) => viewer.domElement)
.returns(domElement)
.object();
}
},
initialize(): void {}
} as unknown as RevealRenderTarget);
const isRevealContainerMountedRef = useRef<boolean>(true);
const sceneLoadedRef = useRef<SceneIdentifiers | undefined>();
Expand Down
Loading